diff options
author | Daniel Stenberg <daniel@haxx.se> | 2007-02-17 21:15:06 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2007-02-17 21:15:06 +0000 |
commit | 64a0fb8fd9a02a390d065c266420f8ad056bba19 (patch) | |
tree | 4aaf4ff5fcb83c41d132fe5a0c1e639fa7f9252b | |
parent | ab0752c9c05eb1135e9d548e3fab36d13b75ebb9 (diff) | |
download | rockbox-64a0fb8fd9a02a390d065c266420f8ad056bba19.tar.gz rockbox-64a0fb8fd9a02a390d065c266420f8ad056bba19.zip |
avoid using #if on undefined symbols, in preparation for -Wundef
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12357 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/export/config.h | 3 | ||||
-rw-r--r-- | firmware/export/lcd.h | 3 | ||||
-rw-r--r-- | firmware/export/pcm_sampr.h | 4 | ||||
-rw-r--r-- | firmware/panic.c | 2 |
4 files changed, 9 insertions, 3 deletions
diff --git a/firmware/export/config.h b/firmware/export/config.h index 4d7a3aecdf..6a5c881013 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h | |||
@@ -77,6 +77,7 @@ | |||
77 | #define BATT_LPCS355385 1550 /* iriver h10 20Gb - SKC LPCS355385 */ | 77 | #define BATT_LPCS355385 1550 /* iriver h10 20Gb - SKC LPCS355385 */ |
78 | #define BATT_BP009 820 /* iriver H10 5/6Gb - iriver BP009 */ | 78 | #define BATT_BP009 820 /* iriver H10 5/6Gb - iriver BP009 */ |
79 | #define BATT_LIION830 830 /* Toshiba Gigabeat Fxx and Xxx series MK11-2740 */ | 79 | #define BATT_LIION830 830 /* Toshiba Gigabeat Fxx and Xxx series MK11-2740 */ |
80 | #define BATT_1AA 333 /* iRiver iFP: Alkaline, NiHM */ | ||
80 | 81 | ||
81 | /* CONFIG_CHARGING */ | 82 | /* CONFIG_CHARGING */ |
82 | #define CHARGING_SIMPLE 1 /* Simple, hardware controlled charging */ | 83 | #define CHARGING_SIMPLE 1 /* Simple, hardware controlled charging */ |
@@ -217,7 +218,7 @@ | |||
217 | 218 | ||
218 | /* Enable the directory cache and tagcache in RAM if we have | 219 | /* Enable the directory cache and tagcache in RAM if we have |
219 | * plenty of RAM. Both features can be enabled independently. */ | 220 | * plenty of RAM. Both features can be enabled independently. */ |
220 | #if (MEMORYSIZE > 8 || MEM > 8) && !defined(BOOTLOADER) | 221 | #if defined(MEMORYSIZE) && (MEMORYSIZE > 8 || MEM > 8) && !defined(BOOTLOADER) |
221 | #define HAVE_DIRCACHE | 222 | #define HAVE_DIRCACHE |
222 | #ifdef HAVE_TAGCACHE | 223 | #ifdef HAVE_TAGCACHE |
223 | #define HAVE_TC_RAMCACHE | 224 | #define HAVE_TC_RAMCACHE |
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h index 37ad2b0cc2..fecf3f5426 100644 --- a/firmware/export/lcd.h +++ b/firmware/export/lcd.h | |||
@@ -151,7 +151,8 @@ typedef void lcd_fastpixelfunc_type(fb_data *address); | |||
151 | 151 | ||
152 | #ifdef HAVE_LCD_BITMAP | 152 | #ifdef HAVE_LCD_BITMAP |
153 | 153 | ||
154 | #if defined(HAVE_LCD_COLOR) && LCD_REMOTE_DEPTH > 1 | 154 | #if defined(HAVE_LCD_COLOR) && defined(LCD_REMOTE_DEPTH) && \ |
155 | LCD_REMOTE_DEPTH > 1 | ||
155 | /* Just return color for screens use */ | 156 | /* Just return color for screens use */ |
156 | static inline unsigned lcd_color_to_native(unsigned color) | 157 | static inline unsigned lcd_color_to_native(unsigned color) |
157 | { return color; } | 158 | { return color; } |
diff --git a/firmware/export/pcm_sampr.h b/firmware/export/pcm_sampr.h index c4a399b62f..4f6d5ddf93 100644 --- a/firmware/export/pcm_sampr.h +++ b/firmware/export/pcm_sampr.h | |||
@@ -20,6 +20,10 @@ | |||
20 | #ifndef PCM_SAMPR_H | 20 | #ifndef PCM_SAMPR_H |
21 | #define PCM_SAMPR_H | 21 | #define PCM_SAMPR_H |
22 | 22 | ||
23 | #ifndef HW_SAMPR_CAPS | ||
24 | #define HW_SAMPR_CAPS 0 /* if not defined, we define to 0 */ | ||
25 | #endif | ||
26 | |||
23 | /* These must be macros for comparison with SAMPR_CAP_* flags by the | 27 | /* These must be macros for comparison with SAMPR_CAP_* flags by the |
24 | preprocessor. Add samplerate index in descending order renumbering | 28 | preprocessor. Add samplerate index in descending order renumbering |
25 | the ones later in the list if any */ | 29 | the ones later in the list if any */ |
diff --git a/firmware/panic.c b/firmware/panic.c index 736d4bbf24..aaac9ba87b 100644 --- a/firmware/panic.c +++ b/firmware/panic.c | |||
@@ -102,7 +102,7 @@ void panicf( const char *fmt, ...) | |||
102 | /* try to restart firmware if ON is pressed */ | 102 | /* try to restart firmware if ON is pressed */ |
103 | #ifdef IRIVER_H100_SERIES | 103 | #ifdef IRIVER_H100_SERIES |
104 | if ((GPIO1_READ & 0x22) == 0) /* check for ON button and !hold */ | 104 | if ((GPIO1_READ & 0x22) == 0) /* check for ON button and !hold */ |
105 | #elif IRIVER_H300_SERIES | 105 | #elif defined(IRIVER_H300_SERIES) |
106 | if ((GPIO1_READ & 0x22) == 0) /* check for ON button and !hold */ | 106 | if ((GPIO1_READ & 0x22) == 0) /* check for ON button and !hold */ |
107 | #elif CONFIG_CPU == SH7034 | 107 | #elif CONFIG_CPU == SH7034 |
108 | #if CONFIG_KEYPAD == PLAYER_PAD | 108 | #if CONFIG_KEYPAD == PLAYER_PAD |