diff options
author | Barry Wardell <rockbox@barrywardell.net> | 2006-09-25 17:03:18 +0000 |
---|---|---|
committer | Barry Wardell <rockbox@barrywardell.net> | 2006-09-25 17:03:18 +0000 |
commit | 2404913f45e06fae60d15ed2bf3cfcd5e739ab51 (patch) | |
tree | 63972a1b05724fd84483879fc64d621d4b17fe21 | |
parent | d5429307d519bd4a44e021e940c38f2d43fdd130 (diff) | |
download | rockbox-2404913f45e06fae60d15ed2bf3cfcd5e739ab51.tar.gz rockbox-2404913f45e06fae60d15ed2bf3cfcd5e739ab51.zip |
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.c | 6 | ||||
-rw-r--r-- | firmware/export/config-fmrecorder.h | 3 | ||||
-rw-r--r-- | firmware/export/config-gmini120.h | 3 | ||||
-rw-r--r-- | firmware/export/config-gminisp.h | 3 | ||||
-rw-r--r-- | firmware/export/config-h10.h | 3 | ||||
-rw-r--r-- | firmware/export/config-h100.h | 3 | ||||
-rw-r--r-- | firmware/export/config-h120.h | 3 | ||||
-rw-r--r-- | firmware/export/config-iaudiox5.h | 3 | ||||
-rw-r--r-- | firmware/export/config-ipod3g.h | 3 | ||||
-rw-r--r-- | firmware/export/config-ipod4g.h | 3 | ||||
-rw-r--r-- | firmware/export/config-ipodmini.h | 3 | ||||
-rwxr-xr-x | firmware/export/config-ipodmini2g.h | 3 | ||||
-rw-r--r-- | firmware/export/config-ondiofm.h | 3 | ||||
-rw-r--r-- | firmware/export/config-ondiosp.h | 3 | ||||
-rw-r--r-- | firmware/export/config-recorder.h | 3 | ||||
-rw-r--r-- | firmware/export/config-recorderv2.h | 3 |
16 files changed, 48 insertions, 3 deletions
diff --git a/apps/settings_menu.c b/apps/settings_menu.c index ab19c820be..8f9fbe1c62 100644 --- a/apps/settings_menu.c +++ b/apps/settings_menu.c | |||
@@ -344,7 +344,7 @@ static bool contrast(void) | |||
344 | #endif /* HAVE_LCD_CONTRAST */ | 344 | #endif /* HAVE_LCD_CONTRAST */ |
345 | 345 | ||
346 | #ifdef HAVE_LCD_BITMAP | 346 | #ifdef HAVE_LCD_BITMAP |
347 | #ifndef HAVE_LCD_COLOR | 347 | #ifdef HAVE_LCD_INVERT |
348 | /** | 348 | /** |
349 | * Menu to set LCD Mode (normal/inverse) | 349 | * Menu to set LCD Mode (normal/inverse) |
350 | */ | 350 | */ |
@@ -357,7 +357,7 @@ static bool invert(void) | |||
357 | lcd_set_invert_display); | 357 | lcd_set_invert_display); |
358 | return rc; | 358 | return rc; |
359 | } | 359 | } |
360 | #endif /* HAVE_LCD_COLOR */ | 360 | #endif /* HAVE_LCD_INVERT */ |
361 | 361 | ||
362 | #ifdef HAVE_LCD_FLIP | 362 | #ifdef HAVE_LCD_FLIP |
363 | /** | 363 | /** |
@@ -1868,7 +1868,7 @@ static bool lcd_settings_menu(void) | |||
1868 | { ID2P(LANG_CONTRAST), contrast }, | 1868 | { ID2P(LANG_CONTRAST), contrast }, |
1869 | #endif | 1869 | #endif |
1870 | #ifdef HAVE_LCD_BITMAP | 1870 | #ifdef HAVE_LCD_BITMAP |
1871 | #ifndef HAVE_LCD_COLOR | 1871 | #ifdef HAVE_LCD_INVERT |
1872 | { ID2P(LANG_INVERT), invert }, | 1872 | { ID2P(LANG_INVERT), invert }, |
1873 | #endif | 1873 | #endif |
1874 | #ifdef HAVE_LCD_FLIP | 1874 | #ifdef HAVE_LCD_FLIP |
diff --git a/firmware/export/config-fmrecorder.h b/firmware/export/config-fmrecorder.h index 4009d334ab..995ca3658b 100644 --- a/firmware/export/config-fmrecorder.h +++ b/firmware/export/config-fmrecorder.h | |||
@@ -7,6 +7,9 @@ | |||
7 | /* define this if you can flip your LCD */ | 7 | /* define this if you can flip your LCD */ |
8 | #define HAVE_LCD_FLIP | 8 | #define HAVE_LCD_FLIP |
9 | 9 | ||
10 | /* define this if you can invert the colours on your LCD */ | ||
11 | #define HAVE_LCD_INVERT | ||
12 | |||
10 | /* define this if you have access to the quickscreen */ | 13 | /* define this if you have access to the quickscreen */ |
11 | #define HAVE_QUICKSCREEN | 14 | #define HAVE_QUICKSCREEN |
12 | /* define this if you have access to the pitchscreen */ | 15 | /* define this if you have access to the pitchscreen */ |
diff --git a/firmware/export/config-gmini120.h b/firmware/export/config-gmini120.h index 66ba7af09e..5aed9a5f7d 100644 --- a/firmware/export/config-gmini120.h +++ b/firmware/export/config-gmini120.h | |||
@@ -7,6 +7,9 @@ | |||
7 | /* define this if you have a bitmap LCD display */ | 7 | /* define this if you have a bitmap LCD display */ |
8 | #define HAVE_LCD_BITMAP 1 | 8 | #define HAVE_LCD_BITMAP 1 |
9 | 9 | ||
10 | /* define this if you can invert the colours on your LCD */ | ||
11 | #define HAVE_LCD_INVERT | ||
12 | |||
10 | /* define this if you have a real-time clock */ | 13 | /* define this if you have a real-time clock */ |
11 | #define CONFIG_RTC RTC_M41ST84W | 14 | #define CONFIG_RTC RTC_M41ST84W |
12 | 15 | ||
diff --git a/firmware/export/config-gminisp.h b/firmware/export/config-gminisp.h index 8df7b0f5a1..b309c173a9 100644 --- a/firmware/export/config-gminisp.h +++ b/firmware/export/config-gminisp.h | |||
@@ -4,6 +4,9 @@ | |||
4 | /* define this if you have a bitmap LCD display */ | 4 | /* define this if you have a bitmap LCD display */ |
5 | #define HAVE_LCD_BITMAP 1 | 5 | #define HAVE_LCD_BITMAP 1 |
6 | 6 | ||
7 | /* define this if you can invert the colours on your LCD */ | ||
8 | #define HAVE_LCD_INVERT | ||
9 | |||
7 | /* LCD dimensions */ | 10 | /* LCD dimensions */ |
8 | #define LCD_WIDTH 128 | 11 | #define LCD_WIDTH 128 |
9 | #define LCD_HEIGHT 64 | 12 | #define LCD_HEIGHT 64 |
diff --git a/firmware/export/config-h10.h b/firmware/export/config-h10.h index df778e24f0..921e31cf08 100644 --- a/firmware/export/config-h10.h +++ b/firmware/export/config-h10.h | |||
@@ -31,6 +31,9 @@ | |||
31 | /* define this if you can flip your LCD */ | 31 | /* define this if you can flip your LCD */ |
32 | #define HAVE_LCD_FLIP | 32 | #define HAVE_LCD_FLIP |
33 | 33 | ||
34 | /* define this if you can invert the colours on your LCD */ | ||
35 | #define HAVE_LCD_INVERT | ||
36 | |||
34 | /* #define IRAM_LCDFRAMEBUFFER IDATA_ATTR *//* put the lcd frame buffer in IRAM */ | 37 | /* #define IRAM_LCDFRAMEBUFFER IDATA_ATTR *//* put the lcd frame buffer in IRAM */ |
35 | 38 | ||
36 | #define CONFIG_KEYPAD IRIVER_H10_PAD | 39 | #define CONFIG_KEYPAD IRIVER_H10_PAD |
diff --git a/firmware/export/config-h100.h b/firmware/export/config-h100.h index f150e56ff0..aacb30dd44 100644 --- a/firmware/export/config-h100.h +++ b/firmware/export/config-h100.h | |||
@@ -16,6 +16,9 @@ | |||
16 | /* define this if you can flip your LCD */ | 16 | /* define this if you can flip your LCD */ |
17 | #define HAVE_LCD_FLIP | 17 | #define HAVE_LCD_FLIP |
18 | 18 | ||
19 | /* define this if you can invert the colours on your LCD */ | ||
20 | #define HAVE_LCD_INVERT | ||
21 | |||
19 | /* define this if you have access to the quickscreen */ | 22 | /* define this if you have access to the quickscreen */ |
20 | #define HAVE_QUICKSCREEN | 23 | #define HAVE_QUICKSCREEN |
21 | /* define this if you have access to the pitchscreen */ | 24 | /* define this if you have access to the pitchscreen */ |
diff --git a/firmware/export/config-h120.h b/firmware/export/config-h120.h index 5ef7f862f5..79ad613968 100644 --- a/firmware/export/config-h120.h +++ b/firmware/export/config-h120.h | |||
@@ -12,6 +12,9 @@ | |||
12 | /* define this if you can flip your LCD */ | 12 | /* define this if you can flip your LCD */ |
13 | #define HAVE_LCD_FLIP | 13 | #define HAVE_LCD_FLIP |
14 | 14 | ||
15 | /* define this if you can invert the colours on your LCD */ | ||
16 | #define HAVE_LCD_INVERT | ||
17 | |||
15 | /* define this if you have access to the quickscreen */ | 18 | /* define this if you have access to the quickscreen */ |
16 | #define HAVE_QUICKSCREEN | 19 | #define HAVE_QUICKSCREEN |
17 | /* define this if you have access to the pitchscreen */ | 20 | /* define this if you have access to the pitchscreen */ |
diff --git a/firmware/export/config-iaudiox5.h b/firmware/export/config-iaudiox5.h index cbb9992788..c3cd157781 100644 --- a/firmware/export/config-iaudiox5.h +++ b/firmware/export/config-iaudiox5.h | |||
@@ -15,6 +15,9 @@ | |||
15 | /* define this if you have a colour LCD */ | 15 | /* define this if you have a colour LCD */ |
16 | #define HAVE_LCD_COLOR 1 | 16 | #define HAVE_LCD_COLOR 1 |
17 | 17 | ||
18 | /* define this if you can invert the colours on your LCD */ | ||
19 | #define HAVE_LCD_INVERT | ||
20 | |||
18 | /* define this if you have access to the quickscreen */ | 21 | /* define this if you have access to the quickscreen */ |
19 | #define HAVE_QUICKSCREEN | 22 | #define HAVE_QUICKSCREEN |
20 | 23 | ||
diff --git a/firmware/export/config-ipod3g.h b/firmware/export/config-ipod3g.h index 7a7000c080..2f008e17c8 100644 --- a/firmware/export/config-ipod3g.h +++ b/firmware/export/config-ipod3g.h | |||
@@ -12,6 +12,9 @@ | |||
12 | /* define this if you have a bitmap LCD display */ | 12 | /* define this if you have a bitmap LCD display */ |
13 | #define HAVE_LCD_BITMAP 1 | 13 | #define HAVE_LCD_BITMAP 1 |
14 | 14 | ||
15 | /* define this if you can invert the colours on your LCD */ | ||
16 | #define HAVE_LCD_INVERT | ||
17 | |||
15 | /* define this if you have access to the quickscreen */ | 18 | /* define this if you have access to the quickscreen */ |
16 | #define HAVE_QUICKSCREEN | 19 | #define HAVE_QUICKSCREEN |
17 | /* define this if you have access to the pitchscreen */ | 20 | /* define this if you have access to the pitchscreen */ |
diff --git a/firmware/export/config-ipod4g.h b/firmware/export/config-ipod4g.h index 163d91c3db..a5f186782f 100644 --- a/firmware/export/config-ipod4g.h +++ b/firmware/export/config-ipod4g.h | |||
@@ -12,6 +12,9 @@ | |||
12 | /* define this if you have a bitmap LCD display */ | 12 | /* define this if you have a bitmap LCD display */ |
13 | #define HAVE_LCD_BITMAP 1 | 13 | #define HAVE_LCD_BITMAP 1 |
14 | 14 | ||
15 | /* define this if you can invert the colours on your LCD */ | ||
16 | #define HAVE_LCD_INVERT | ||
17 | |||
15 | /* define this if you have access to the quickscreen */ | 18 | /* define this if you have access to the quickscreen */ |
16 | #define HAVE_QUICKSCREEN | 19 | #define HAVE_QUICKSCREEN |
17 | /* define this if you have access to the pitchscreen */ | 20 | /* define this if you have access to the pitchscreen */ |
diff --git a/firmware/export/config-ipodmini.h b/firmware/export/config-ipodmini.h index 12bc658610..f6d51aefaa 100644 --- a/firmware/export/config-ipodmini.h +++ b/firmware/export/config-ipodmini.h | |||
@@ -12,6 +12,9 @@ | |||
12 | /* define this if you have a bitmap LCD display */ | 12 | /* define this if you have a bitmap LCD display */ |
13 | #define HAVE_LCD_BITMAP 1 | 13 | #define HAVE_LCD_BITMAP 1 |
14 | 14 | ||
15 | /* define this if you can invert the colours on your LCD */ | ||
16 | #define HAVE_LCD_INVERT | ||
17 | |||
15 | /* define this if you have access to the quickscreen */ | 18 | /* define this if you have access to the quickscreen */ |
16 | #define HAVE_QUICKSCREEN | 19 | #define HAVE_QUICKSCREEN |
17 | /* define this if you have access to the pitchscreen */ | 20 | /* define this if you have access to the pitchscreen */ |
diff --git a/firmware/export/config-ipodmini2g.h b/firmware/export/config-ipodmini2g.h index 2b2e967599..a7e1a3a5ee 100755 --- a/firmware/export/config-ipodmini2g.h +++ b/firmware/export/config-ipodmini2g.h | |||
@@ -12,6 +12,9 @@ | |||
12 | /* define this if you have a bitmap LCD display */ | 12 | /* define this if you have a bitmap LCD display */ |
13 | #define HAVE_LCD_BITMAP 1 | 13 | #define HAVE_LCD_BITMAP 1 |
14 | 14 | ||
15 | /* define this if you can invert the colours on your LCD */ | ||
16 | #define HAVE_LCD_INVERT | ||
17 | |||
15 | /* define this if you have access to the quickscreen */ | 18 | /* define this if you have access to the quickscreen */ |
16 | #define HAVE_QUICKSCREEN | 19 | #define HAVE_QUICKSCREEN |
17 | /* define this if you have access to the pitchscreen */ | 20 | /* define this if you have access to the pitchscreen */ |
diff --git a/firmware/export/config-ondiofm.h b/firmware/export/config-ondiofm.h index ec20929b62..745b1ba782 100644 --- a/firmware/export/config-ondiofm.h +++ b/firmware/export/config-ondiofm.h | |||
@@ -7,6 +7,9 @@ | |||
7 | /* define this if you can flip your LCD */ | 7 | /* define this if you can flip your LCD */ |
8 | #define HAVE_LCD_FLIP | 8 | #define HAVE_LCD_FLIP |
9 | 9 | ||
10 | /* define this if you can invert the colours on your LCD */ | ||
11 | #define HAVE_LCD_INVERT | ||
12 | |||
10 | /* LCD dimensions */ | 13 | /* LCD dimensions */ |
11 | #define LCD_WIDTH 112 | 14 | #define LCD_WIDTH 112 |
12 | #define LCD_HEIGHT 64 | 15 | #define LCD_HEIGHT 64 |
diff --git a/firmware/export/config-ondiosp.h b/firmware/export/config-ondiosp.h index c6b70e3685..19c59c3aca 100644 --- a/firmware/export/config-ondiosp.h +++ b/firmware/export/config-ondiosp.h | |||
@@ -4,6 +4,9 @@ | |||
4 | /* define this if you can flip your LCD */ | 4 | /* define this if you can flip your LCD */ |
5 | #define HAVE_LCD_FLIP | 5 | #define HAVE_LCD_FLIP |
6 | 6 | ||
7 | /* define this if you can invert the colours on your LCD */ | ||
8 | #define HAVE_LCD_INVERT | ||
9 | |||
7 | /* LCD dimensions */ | 10 | /* LCD dimensions */ |
8 | #define LCD_WIDTH 112 | 11 | #define LCD_WIDTH 112 |
9 | #define LCD_HEIGHT 64 | 12 | #define LCD_HEIGHT 64 |
diff --git a/firmware/export/config-recorder.h b/firmware/export/config-recorder.h index 854b1c1ade..ca9d1f3f04 100644 --- a/firmware/export/config-recorder.h +++ b/firmware/export/config-recorder.h | |||
@@ -7,6 +7,9 @@ | |||
7 | /* define this if you can flip your LCD */ | 7 | /* define this if you can flip your LCD */ |
8 | #define HAVE_LCD_FLIP | 8 | #define HAVE_LCD_FLIP |
9 | 9 | ||
10 | /* define this if you can invert the colours on your LCD */ | ||
11 | #define HAVE_LCD_INVERT | ||
12 | |||
10 | /* define this if you have access to the quickscreen */ | 13 | /* define this if you have access to the quickscreen */ |
11 | #define HAVE_QUICKSCREEN | 14 | #define HAVE_QUICKSCREEN |
12 | 15 | ||
diff --git a/firmware/export/config-recorderv2.h b/firmware/export/config-recorderv2.h index 09823cffb2..4f0682077f 100644 --- a/firmware/export/config-recorderv2.h +++ b/firmware/export/config-recorderv2.h | |||
@@ -7,6 +7,9 @@ | |||
7 | /* define this if you can flip your LCD */ | 7 | /* define this if you can flip your LCD */ |
8 | #define HAVE_LCD_FLIP | 8 | #define HAVE_LCD_FLIP |
9 | 9 | ||
10 | /* define this if you can invert the colours on your LCD */ | ||
11 | #define HAVE_LCD_INVERT | ||
12 | |||
10 | /* define this if you have access to the quickscreen */ | 13 | /* define this if you have access to the quickscreen */ |
11 | #define HAVE_QUICKSCREEN | 14 | #define HAVE_QUICKSCREEN |
12 | 15 | ||