summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBarry Wardell <rockbox@barrywardell.net>2006-09-25 17:03:18 +0000
committerBarry Wardell <rockbox@barrywardell.net>2006-09-25 17:03:18 +0000
commit2404913f45e06fae60d15ed2bf3cfcd5e739ab51 (patch)
tree63972a1b05724fd84483879fc64d621d4b17fe21
parentd5429307d519bd4a44e021e940c38f2d43fdd130 (diff)
downloadrockbox-2404913f45e06fae60d15ed2bf3cfcd5e739ab51.zip
rockbox-2404913f45e06fae60d15ed2bf3cfcd5e739ab51.tar.gz
rockbox-2404913f45e06fae60d15ed2bf3cfcd5e739ab51.tar.bz2
rockbox-2404913f45e06fae60d15ed2bf3cfcd5e739ab51.tar.xz
Enable LCD invert setting in the menu for all targets that support it. This adds the menu option to H10 20GB and X5 builds.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11048 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/settings_menu.c6
-rw-r--r--firmware/export/config-fmrecorder.h3
-rw-r--r--firmware/export/config-gmini120.h3
-rw-r--r--firmware/export/config-gminisp.h3
-rw-r--r--firmware/export/config-h10.h3
-rw-r--r--firmware/export/config-h100.h3
-rw-r--r--firmware/export/config-h120.h3
-rw-r--r--firmware/export/config-iaudiox5.h3
-rw-r--r--firmware/export/config-ipod3g.h3
-rw-r--r--firmware/export/config-ipod4g.h3
-rw-r--r--firmware/export/config-ipodmini.h3
-rwxr-xr-xfirmware/export/config-ipodmini2g.h3
-rw-r--r--firmware/export/config-ondiofm.h3
-rw-r--r--firmware/export/config-ondiosp.h3
-rw-r--r--firmware/export/config-recorder.h3
-rw-r--r--firmware/export/config-recorderv2.h3
16 files changed, 48 insertions, 3 deletions
diff --git a/apps/settings_menu.c b/apps/settings_menu.c
index ab19c82..8f9fbe1 100644
--- a/apps/settings_menu.c
+++ b/apps/settings_menu.c
@@ -344,7 +344,7 @@ static bool contrast(void)
#endif /* HAVE_LCD_CONTRAST */
#ifdef HAVE_LCD_BITMAP
-#ifndef HAVE_LCD_COLOR
+#ifdef HAVE_LCD_INVERT
/**
* Menu to set LCD Mode (normal/inverse)
*/
@@ -357,7 +357,7 @@ static bool invert(void)
lcd_set_invert_display);
return rc;
}
-#endif /* HAVE_LCD_COLOR */
+#endif /* HAVE_LCD_INVERT */
#ifdef HAVE_LCD_FLIP
/**
@@ -1868,7 +1868,7 @@ static bool lcd_settings_menu(void)
{ ID2P(LANG_CONTRAST), contrast },
#endif
#ifdef HAVE_LCD_BITMAP
-#ifndef HAVE_LCD_COLOR
+#ifdef HAVE_LCD_INVERT
{ ID2P(LANG_INVERT), invert },
#endif
#ifdef HAVE_LCD_FLIP
diff --git a/firmware/export/config-fmrecorder.h b/firmware/export/config-fmrecorder.h
index 4009d33..995ca36 100644
--- a/firmware/export/config-fmrecorder.h
+++ b/firmware/export/config-fmrecorder.h
@@ -7,6 +7,9 @@
/* define this if you can flip your LCD */
#define HAVE_LCD_FLIP
+/* define this if you can invert the colours on your LCD */
+#define HAVE_LCD_INVERT
+
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
diff --git a/firmware/export/config-gmini120.h b/firmware/export/config-gmini120.h
index 66ba7af..5aed9a5 100644
--- a/firmware/export/config-gmini120.h
+++ b/firmware/export/config-gmini120.h
@@ -7,6 +7,9 @@
/* define this if you have a bitmap LCD display */
#define HAVE_LCD_BITMAP 1
+/* define this if you can invert the colours on your LCD */
+#define HAVE_LCD_INVERT
+
/* define this if you have a real-time clock */
#define CONFIG_RTC RTC_M41ST84W
diff --git a/firmware/export/config-gminisp.h b/firmware/export/config-gminisp.h
index 8df7b0f..b309c17 100644
--- a/firmware/export/config-gminisp.h
+++ b/firmware/export/config-gminisp.h
@@ -4,6 +4,9 @@
/* define this if you have a bitmap LCD display */
#define HAVE_LCD_BITMAP 1
+/* define this if you can invert the colours on your LCD */
+#define HAVE_LCD_INVERT
+
/* LCD dimensions */
#define LCD_WIDTH 128
#define LCD_HEIGHT 64
diff --git a/firmware/export/config-h10.h b/firmware/export/config-h10.h
index df778e2..921e31c 100644
--- a/firmware/export/config-h10.h
+++ b/firmware/export/config-h10.h
@@ -31,6 +31,9 @@
/* define this if you can flip your LCD */
#define HAVE_LCD_FLIP
+/* define this if you can invert the colours on your LCD */
+#define HAVE_LCD_INVERT
+
/* #define IRAM_LCDFRAMEBUFFER IDATA_ATTR *//* put the lcd frame buffer in IRAM */
#define CONFIG_KEYPAD IRIVER_H10_PAD
diff --git a/firmware/export/config-h100.h b/firmware/export/config-h100.h
index f150e56..aacb30d 100644
--- a/firmware/export/config-h100.h
+++ b/firmware/export/config-h100.h
@@ -16,6 +16,9 @@
/* define this if you can flip your LCD */
#define HAVE_LCD_FLIP
+/* define this if you can invert the colours on your LCD */
+#define HAVE_LCD_INVERT
+
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
diff --git a/firmware/export/config-h120.h b/firmware/export/config-h120.h
index 5ef7f86..79ad613 100644
--- a/firmware/export/config-h120.h
+++ b/firmware/export/config-h120.h
@@ -12,6 +12,9 @@
/* define this if you can flip your LCD */
#define HAVE_LCD_FLIP
+/* define this if you can invert the colours on your LCD */
+#define HAVE_LCD_INVERT
+
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
diff --git a/firmware/export/config-iaudiox5.h b/firmware/export/config-iaudiox5.h
index cbb9992..c3cd157 100644
--- a/firmware/export/config-iaudiox5.h
+++ b/firmware/export/config-iaudiox5.h
@@ -15,6 +15,9 @@
/* define this if you have a colour LCD */
#define HAVE_LCD_COLOR 1
+/* define this if you can invert the colours on your LCD */
+#define HAVE_LCD_INVERT
+
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
diff --git a/firmware/export/config-ipod3g.h b/firmware/export/config-ipod3g.h
index 7a7000c..2f008e1 100644
--- a/firmware/export/config-ipod3g.h
+++ b/firmware/export/config-ipod3g.h
@@ -12,6 +12,9 @@
/* define this if you have a bitmap LCD display */
#define HAVE_LCD_BITMAP 1
+/* define this if you can invert the colours on your LCD */
+#define HAVE_LCD_INVERT
+
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
diff --git a/firmware/export/config-ipod4g.h b/firmware/export/config-ipod4g.h
index 163d91c..a5f1867 100644
--- a/firmware/export/config-ipod4g.h
+++ b/firmware/export/config-ipod4g.h
@@ -12,6 +12,9 @@
/* define this if you have a bitmap LCD display */
#define HAVE_LCD_BITMAP 1
+/* define this if you can invert the colours on your LCD */
+#define HAVE_LCD_INVERT
+
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
diff --git a/firmware/export/config-ipodmini.h b/firmware/export/config-ipodmini.h
index 12bc658..f6d51ae 100644
--- a/firmware/export/config-ipodmini.h
+++ b/firmware/export/config-ipodmini.h
@@ -12,6 +12,9 @@
/* define this if you have a bitmap LCD display */
#define HAVE_LCD_BITMAP 1
+/* define this if you can invert the colours on your LCD */
+#define HAVE_LCD_INVERT
+
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
diff --git a/firmware/export/config-ipodmini2g.h b/firmware/export/config-ipodmini2g.h
index 2b2e967..a7e1a3a 100755
--- a/firmware/export/config-ipodmini2g.h
+++ b/firmware/export/config-ipodmini2g.h
@@ -12,6 +12,9 @@
/* define this if you have a bitmap LCD display */
#define HAVE_LCD_BITMAP 1
+/* define this if you can invert the colours on your LCD */
+#define HAVE_LCD_INVERT
+
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
diff --git a/firmware/export/config-ondiofm.h b/firmware/export/config-ondiofm.h
index ec20929..745b1ba 100644
--- a/firmware/export/config-ondiofm.h
+++ b/firmware/export/config-ondiofm.h
@@ -7,6 +7,9 @@
/* define this if you can flip your LCD */
#define HAVE_LCD_FLIP
+/* define this if you can invert the colours on your LCD */
+#define HAVE_LCD_INVERT
+
/* LCD dimensions */
#define LCD_WIDTH 112
#define LCD_HEIGHT 64
diff --git a/firmware/export/config-ondiosp.h b/firmware/export/config-ondiosp.h
index c6b70e3..19c59c3 100644
--- a/firmware/export/config-ondiosp.h
+++ b/firmware/export/config-ondiosp.h
@@ -4,6 +4,9 @@
/* define this if you can flip your LCD */
#define HAVE_LCD_FLIP
+/* define this if you can invert the colours on your LCD */
+#define HAVE_LCD_INVERT
+
/* LCD dimensions */
#define LCD_WIDTH 112
#define LCD_HEIGHT 64
diff --git a/firmware/export/config-recorder.h b/firmware/export/config-recorder.h
index 854b1c1..ca9d1f3 100644
--- a/firmware/export/config-recorder.h
+++ b/firmware/export/config-recorder.h
@@ -7,6 +7,9 @@
/* define this if you can flip your LCD */
#define HAVE_LCD_FLIP
+/* define this if you can invert the colours on your LCD */
+#define HAVE_LCD_INVERT
+
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
diff --git a/firmware/export/config-recorderv2.h b/firmware/export/config-recorderv2.h
index 09823cf..4f06820 100644
--- a/firmware/export/config-recorderv2.h
+++ b/firmware/export/config-recorderv2.h
@@ -7,6 +7,9 @@
/* define this if you can flip your LCD */
#define HAVE_LCD_FLIP
+/* define this if you can invert the colours on your LCD */
+#define HAVE_LCD_INVERT
+
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN