diff options
author | Nils Wallménius <nils@rockbox.org> | 2009-11-07 10:48:05 +0000 |
---|---|---|
committer | Nils Wallménius <nils@rockbox.org> | 2009-11-07 10:48:05 +0000 |
commit | 109f182b0c16e2ebb50fbae746550730151d8913 (patch) | |
tree | 8d1977fda7754e992743e59a3e48a794623b0021 /firmware | |
parent | 9b6d3d74b380625f62fccb985043e864c648d330 (diff) | |
download | rockbox-109f182b0c16e2ebb50fbae746550730151d8913.tar.gz rockbox-109f182b0c16e2ebb50fbae746550730151d8913.zip |
Introduce new config header 'config-sim.h' that takes care of undefining things that shouldn't be defined for sims so that the target configs no longer need to have #ifndef SIMULATOR sections and to bring some consistency for what is and is not included for sims.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23547 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
58 files changed, 87 insertions, 236 deletions
diff --git a/firmware/export/config-c100.h b/firmware/export/config-c100.h index 5cc29e32f6..a332bf5670 100644 --- a/firmware/export/config-c100.h +++ b/firmware/export/config-c100.h | |||
@@ -95,8 +95,6 @@ | |||
95 | /* define this if the unit should not shut down on low battery. */ | 95 | /* define this if the unit should not shut down on low battery. */ |
96 | #define NO_LOW_BATTERY_SHUTDOWN | 96 | #define NO_LOW_BATTERY_SHUTDOWN |
97 | 97 | ||
98 | #ifndef SIMULATOR | ||
99 | |||
100 | /* Define this if you have a TCC770 */ | 98 | /* Define this if you have a TCC770 */ |
101 | #define CONFIG_CPU TCC770 | 99 | #define CONFIG_CPU TCC770 |
102 | 100 | ||
@@ -128,4 +126,3 @@ | |||
128 | 126 | ||
129 | #define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ | 127 | #define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ |
130 | 128 | ||
131 | #endif /* SIMULATOR */ | ||
diff --git a/firmware/export/config-c200.h b/firmware/export/config-c200.h index ab70396eef..45cfb8aee9 100644 --- a/firmware/export/config-c200.h +++ b/firmware/export/config-c200.h | |||
@@ -149,9 +149,6 @@ | |||
149 | #define CURRENT_BACKLIGHT 40 /* Screen is about 20, blue LEDs are another 20, so 40 if both */ | 149 | #define CURRENT_BACKLIGHT 40 /* Screen is about 20, blue LEDs are another 20, so 40 if both */ |
150 | #define CURRENT_RECORD 30 /* flash player, so this is just unboosted current*/ | 150 | #define CURRENT_RECORD 30 /* flash player, so this is just unboosted current*/ |
151 | 151 | ||
152 | /** Non-simulator section **/ | ||
153 | #ifndef SIMULATOR | ||
154 | |||
155 | /* Define this if you have a PortalPlayer PP5024 */ | 152 | /* Define this if you have a PortalPlayer PP5024 */ |
156 | #define CONFIG_CPU PP5022 | 153 | #define CONFIG_CPU PP5022 |
157 | 154 | ||
@@ -204,8 +201,6 @@ | |||
204 | 201 | ||
205 | #define INCLUDE_TIMEOUT_API | 202 | #define INCLUDE_TIMEOUT_API |
206 | 203 | ||
207 | #endif /* SIMULATOR */ | ||
208 | |||
209 | /* Default recording levels */ | 204 | /* Default recording levels */ |
210 | #define DEFAULT_REC_MIC_GAIN 23 | 205 | #define DEFAULT_REC_MIC_GAIN 23 |
211 | #define DEFAULT_REC_LEFT_GAIN 23 | 206 | #define DEFAULT_REC_LEFT_GAIN 23 |
diff --git a/firmware/export/config-c200v2.h b/firmware/export/config-c200v2.h index 2441fe01c5..65aebf245b 100644 --- a/firmware/export/config-c200v2.h +++ b/firmware/export/config-c200v2.h | |||
@@ -137,9 +137,6 @@ | |||
137 | /* define this if the unit can be powered or charged via USB */ | 137 | /* define this if the unit can be powered or charged via USB */ |
138 | #define HAVE_USB_POWER | 138 | #define HAVE_USB_POWER |
139 | 139 | ||
140 | /** Non-simulator section **/ | ||
141 | #ifndef SIMULATOR | ||
142 | |||
143 | /* Define this if you have a PortalPlayer PP5024 */ | 140 | /* Define this if you have a PortalPlayer PP5024 */ |
144 | #define CONFIG_CPU AS3525 | 141 | #define CONFIG_CPU AS3525 |
145 | 142 | ||
@@ -189,8 +186,6 @@ | |||
189 | 186 | ||
190 | #define INCLUDE_TIMEOUT_API | 187 | #define INCLUDE_TIMEOUT_API |
191 | 188 | ||
192 | #endif /* SIMULATOR */ | ||
193 | |||
194 | /** Port-specific settings **/ | 189 | /** Port-specific settings **/ |
195 | 190 | ||
196 | /* Main LCD backlight brightness range and defaults */ | 191 | /* Main LCD backlight brightness range and defaults */ |
diff --git a/firmware/export/config-clip.h b/firmware/export/config-clip.h index b57881f794..4fa5f94598 100644 --- a/firmware/export/config-clip.h +++ b/firmware/export/config-clip.h | |||
@@ -140,9 +140,6 @@ | |||
140 | /* define this if the unit can be powered or charged via USB */ | 140 | /* define this if the unit can be powered or charged via USB */ |
141 | #define HAVE_USB_POWER | 141 | #define HAVE_USB_POWER |
142 | 142 | ||
143 | /** Non-simulator section **/ | ||
144 | #ifndef SIMULATOR | ||
145 | |||
146 | /* Define this if you have a AMS AS3525 SoC */ | 143 | /* Define this if you have a AMS AS3525 SoC */ |
147 | #define CONFIG_CPU AS3525 | 144 | #define CONFIG_CPU AS3525 |
148 | 145 | ||
@@ -189,8 +186,6 @@ | |||
189 | 186 | ||
190 | #define INCLUDE_TIMEOUT_API | 187 | #define INCLUDE_TIMEOUT_API |
191 | 188 | ||
192 | #endif /* SIMULATOR */ | ||
193 | |||
194 | /** Port-specific settings **/ | 189 | /** Port-specific settings **/ |
195 | 190 | ||
196 | /* Main LCD backlight brightness range and defaults */ | 191 | /* Main LCD backlight brightness range and defaults */ |
diff --git a/firmware/export/config-cowond2.h b/firmware/export/config-cowond2.h index 45bf90bbd0..88c7ce5b8f 100644 --- a/firmware/export/config-cowond2.h +++ b/firmware/export/config-cowond2.h | |||
@@ -62,14 +62,10 @@ | |||
62 | /* define this if you have a flash memory storage */ | 62 | /* define this if you have a flash memory storage */ |
63 | #define HAVE_FLASH_STORAGE | 63 | #define HAVE_FLASH_STORAGE |
64 | 64 | ||
65 | #ifndef SIMULATOR | ||
66 | #define CONFIG_STORAGE (STORAGE_NAND | STORAGE_SD) | 65 | #define CONFIG_STORAGE (STORAGE_NAND | STORAGE_SD) |
67 | #define HAVE_MULTIDRIVE | 66 | #define HAVE_MULTIDRIVE |
68 | #define HAVE_HOTSWAP | 67 | #define HAVE_HOTSWAP |
69 | #define NUM_DRIVES 2 | 68 | #define NUM_DRIVES 2 |
70 | #else | ||
71 | #define CONFIG_STORAGE STORAGE_NAND | ||
72 | #endif | ||
73 | 69 | ||
74 | #define CONFIG_NAND NAND_TCC | 70 | #define CONFIG_NAND NAND_TCC |
75 | 71 | ||
@@ -150,7 +146,6 @@ | |||
150 | #define CURRENT_BACKLIGHT 30 /* TBD */ | 146 | #define CURRENT_BACKLIGHT 30 /* TBD */ |
151 | #define CURRENT_RECORD 0 /* no recording yet */ | 147 | #define CURRENT_RECORD 0 /* no recording yet */ |
152 | 148 | ||
153 | #ifndef SIMULATOR | ||
154 | /* Define this if you have a TCC7801 */ | 149 | /* Define this if you have a TCC7801 */ |
155 | #define CONFIG_CPU TCC7801 | 150 | #define CONFIG_CPU TCC7801 |
156 | 151 | ||
@@ -174,5 +169,3 @@ | |||
174 | #define BOOTFILE "rockbox." BOOTFILE_EXT | 169 | #define BOOTFILE "rockbox." BOOTFILE_EXT |
175 | #define BOOTDIR "/.rockbox" | 170 | #define BOOTDIR "/.rockbox" |
176 | 171 | ||
177 | |||
178 | #endif /* SIMULATOR */ | ||
diff --git a/firmware/export/config-creativezv.h b/firmware/export/config-creativezv.h index f396694339..5454038f0c 100644 --- a/firmware/export/config-creativezv.h +++ b/firmware/export/config-creativezv.h | |||
@@ -127,8 +127,6 @@ | |||
127 | /* Hardware controlled charging with monitoring */ | 127 | /* Hardware controlled charging with monitoring */ |
128 | //#define CONFIG_CHARGING CHARGING_MONITOR | 128 | //#define CONFIG_CHARGING CHARGING_MONITOR |
129 | 129 | ||
130 | #ifndef SIMULATOR | ||
131 | |||
132 | /* Define this if you have a TI TMS320DM320 */ | 130 | /* Define this if you have a TI TMS320DM320 */ |
133 | #define CONFIG_CPU DM320 | 131 | #define CONFIG_CPU DM320 |
134 | 132 | ||
@@ -144,9 +142,6 @@ | |||
144 | /* Define this if you have ATA power-off control */ | 142 | /* Define this if you have ATA power-off control */ |
145 | #define HAVE_ATA_POWER_OFF | 143 | #define HAVE_ATA_POWER_OFF |
146 | 144 | ||
147 | /* Virtual LED (icon) */ | ||
148 | #define CONFIG_LED LED_VIRTUAL | ||
149 | |||
150 | /* Offset ( in the firmware file's header ) to the file CRC */ | 145 | /* Offset ( in the firmware file's header ) to the file CRC */ |
151 | #define FIRMWARE_OFFSET_FILE_CRC 0 | 146 | #define FIRMWARE_OFFSET_FILE_CRC 0 |
152 | 147 | ||
@@ -167,4 +162,3 @@ | |||
167 | #define USB_PRODUCT_ID 0x4133 | 162 | #define USB_PRODUCT_ID 0x4133 |
168 | #define USB_NUM_ENDPOINTS 7 | 163 | #define USB_NUM_ENDPOINTS 7 |
169 | 164 | ||
170 | #endif /* SIMULATOR */ | ||
diff --git a/firmware/export/config-creativezvm.h b/firmware/export/config-creativezvm.h index 5eeaa7abcc..37d2eb48cf 100644 --- a/firmware/export/config-creativezvm.h +++ b/firmware/export/config-creativezvm.h | |||
@@ -128,8 +128,6 @@ | |||
128 | /* Hardware controlled charging with monitoring */ | 128 | /* Hardware controlled charging with monitoring */ |
129 | //#define CONFIG_CHARGING CHARGING_MONITOR | 129 | //#define CONFIG_CHARGING CHARGING_MONITOR |
130 | 130 | ||
131 | #ifndef SIMULATOR | ||
132 | |||
133 | /* Define this if you have a TI TMS320DM320 */ | 131 | /* Define this if you have a TI TMS320DM320 */ |
134 | #define CONFIG_CPU DM320 | 132 | #define CONFIG_CPU DM320 |
135 | 133 | ||
@@ -173,4 +171,3 @@ | |||
173 | #define BUTTON_DEBUG | 171 | #define BUTTON_DEBUG |
174 | */ | 172 | */ |
175 | 173 | ||
176 | #endif | ||
diff --git a/firmware/export/config-creativezvm60gb.h b/firmware/export/config-creativezvm60gb.h index 41e0be3542..e34515ca44 100644 --- a/firmware/export/config-creativezvm60gb.h +++ b/firmware/export/config-creativezvm60gb.h | |||
@@ -127,8 +127,6 @@ | |||
127 | /* Hardware controlled charging with monitoring */ | 127 | /* Hardware controlled charging with monitoring */ |
128 | //#define CONFIG_CHARGING CHARGING_MONITOR | 128 | //#define CONFIG_CHARGING CHARGING_MONITOR |
129 | 129 | ||
130 | #ifndef SIMULATOR | ||
131 | |||
132 | /* Define this if you have a TI TMS320DM320 */ | 130 | /* Define this if you have a TI TMS320DM320 */ |
133 | #define CONFIG_CPU DM320 | 131 | #define CONFIG_CPU DM320 |
134 | 132 | ||
@@ -165,4 +163,3 @@ | |||
165 | #define USB_PRODUCT_ID 0x4133 | 163 | #define USB_PRODUCT_ID 0x4133 |
166 | #define USB_NUM_ENDPOINTS 7 | 164 | #define USB_NUM_ENDPOINTS 7 |
167 | 165 | ||
168 | #endif /* SIMULATOR */ | ||
diff --git a/firmware/export/config-e200.h b/firmware/export/config-e200.h index 18de2f65f1..dd65e6a37d 100644 --- a/firmware/export/config-e200.h +++ b/firmware/export/config-e200.h | |||
@@ -143,9 +143,6 @@ | |||
143 | /* define this if the unit can be powered or charged via USB */ | 143 | /* define this if the unit can be powered or charged via USB */ |
144 | #define HAVE_USB_POWER | 144 | #define HAVE_USB_POWER |
145 | 145 | ||
146 | /** Non-simulator section **/ | ||
147 | #ifndef SIMULATOR | ||
148 | |||
149 | /* Define this if you have a PortalPlayer PP5024 */ | 146 | /* Define this if you have a PortalPlayer PP5024 */ |
150 | #define CONFIG_CPU PP5024 | 147 | #define CONFIG_CPU PP5024 |
151 | 148 | ||
@@ -198,9 +195,6 @@ | |||
198 | 195 | ||
199 | #define INCLUDE_TIMEOUT_API | 196 | #define INCLUDE_TIMEOUT_API |
200 | 197 | ||
201 | #endif /* SIMULATOR */ | ||
202 | |||
203 | |||
204 | /** Port-specific settings **/ | 198 | /** Port-specific settings **/ |
205 | 199 | ||
206 | /* Main LCD backlight brightness range and defaults */ | 200 | /* Main LCD backlight brightness range and defaults */ |
diff --git a/firmware/export/config-e200v2.h b/firmware/export/config-e200v2.h index 4dc3e43f2d..b4985ecd6d 100644 --- a/firmware/export/config-e200v2.h +++ b/firmware/export/config-e200v2.h | |||
@@ -145,9 +145,6 @@ | |||
145 | /* define this if the unit can be powered or charged via USB */ | 145 | /* define this if the unit can be powered or charged via USB */ |
146 | #define HAVE_USB_POWER | 146 | #define HAVE_USB_POWER |
147 | 147 | ||
148 | /** Non-simulator section **/ | ||
149 | #ifndef SIMULATOR | ||
150 | |||
151 | /* Define this if you have an AMS AS3525*/ | 148 | /* Define this if you have an AMS AS3525*/ |
152 | #define CONFIG_CPU AS3525 | 149 | #define CONFIG_CPU AS3525 |
153 | 150 | ||
@@ -206,8 +203,6 @@ | |||
206 | 203 | ||
207 | #define INCLUDE_TIMEOUT_API | 204 | #define INCLUDE_TIMEOUT_API |
208 | 205 | ||
209 | #endif /* SIMULATOR */ | ||
210 | |||
211 | /* Default recording levels */ | 206 | /* Default recording levels */ |
212 | #define DEFAULT_REC_MIC_GAIN 23 | 207 | #define DEFAULT_REC_MIC_GAIN 23 |
213 | #define DEFAULT_REC_LEFT_GAIN 23 | 208 | #define DEFAULT_REC_LEFT_GAIN 23 |
diff --git a/firmware/export/config-fmrecorder.h b/firmware/export/config-fmrecorder.h index acc1c74dcf..97dc52ebb5 100644 --- a/firmware/export/config-fmrecorder.h +++ b/firmware/export/config-fmrecorder.h | |||
@@ -98,8 +98,6 @@ | |||
98 | /* define this if the unit can be powered or charged via USB */ | 98 | /* define this if the unit can be powered or charged via USB */ |
99 | #define HAVE_USB_POWER | 99 | #define HAVE_USB_POWER |
100 | 100 | ||
101 | #ifndef SIMULATOR | ||
102 | |||
103 | /* Define this if you have a SH7034 */ | 101 | /* Define this if you have a SH7034 */ |
104 | #define CONFIG_CPU SH7034 | 102 | #define CONFIG_CPU SH7034 |
105 | 103 | ||
@@ -134,8 +132,6 @@ | |||
134 | #define BOOTFILE "ajbrec." BOOTFILE_EXT | 132 | #define BOOTFILE "ajbrec." BOOTFILE_EXT |
135 | #define BOOTDIR "/" | 133 | #define BOOTDIR "/" |
136 | 134 | ||
137 | #endif /* SIMULATOR */ | ||
138 | |||
139 | #define HAVE_LCD_CONTRAST | 135 | #define HAVE_LCD_CONTRAST |
140 | 136 | ||
141 | #define MIN_CONTRAST_SETTING 5 | 137 | #define MIN_CONTRAST_SETTING 5 |
diff --git a/firmware/export/config-fuze.h b/firmware/export/config-fuze.h index 2a438ec91b..e9b54e14fd 100644 --- a/firmware/export/config-fuze.h +++ b/firmware/export/config-fuze.h | |||
@@ -150,9 +150,6 @@ | |||
150 | /* define this if the unit can be powered or charged via USB */ | 150 | /* define this if the unit can be powered or charged via USB */ |
151 | #define HAVE_USB_POWER | 151 | #define HAVE_USB_POWER |
152 | 152 | ||
153 | /** Non-simulator section **/ | ||
154 | #ifndef SIMULATOR | ||
155 | |||
156 | /* Define this if you have an AMS AS3525*/ | 153 | /* Define this if you have an AMS AS3525*/ |
157 | #define CONFIG_CPU AS3525 | 154 | #define CONFIG_CPU AS3525 |
158 | 155 | ||
@@ -204,5 +201,3 @@ | |||
204 | 201 | ||
205 | #define INCLUDE_TIMEOUT_API | 202 | #define INCLUDE_TIMEOUT_API |
206 | 203 | ||
207 | #endif /* SIMULATOR */ | ||
208 | |||
diff --git a/firmware/export/config-gigabeat-s.h b/firmware/export/config-gigabeat-s.h index 36f874b72f..344c572e40 100644 --- a/firmware/export/config-gigabeat-s.h +++ b/firmware/export/config-gigabeat-s.h | |||
@@ -128,11 +128,6 @@ | |||
128 | #define HAVE_HEADPHONE_DETECTION | 128 | #define HAVE_HEADPHONE_DETECTION |
129 | #endif /* BOOTLOADER */ | 129 | #endif /* BOOTLOADER */ |
130 | 130 | ||
131 | #ifndef SIMULATOR | ||
132 | |||
133 | /* The LCD on a Gigabeat is 240x320 - it is portrait */ | ||
134 | #define HAVE_PORTRAIT_LCD | ||
135 | |||
136 | #define CONFIG_CPU IMX31L | 131 | #define CONFIG_CPU IMX31L |
137 | 132 | ||
138 | /* Define this if you want to use imx31l's i2c interface */ | 133 | /* Define this if you want to use imx31l's i2c interface */ |
@@ -221,4 +216,3 @@ | |||
221 | #define BOOTFILE "rockbox." BOOTFILE_EXT | 216 | #define BOOTFILE "rockbox." BOOTFILE_EXT |
222 | #define BOOTDIR "/.rockbox" | 217 | #define BOOTDIR "/.rockbox" |
223 | 218 | ||
224 | #endif | ||
diff --git a/firmware/export/config-gigabeat.h b/firmware/export/config-gigabeat.h index c4272205bc..a20a5d87ff 100644 --- a/firmware/export/config-gigabeat.h +++ b/firmware/export/config-gigabeat.h | |||
@@ -59,9 +59,7 @@ | |||
59 | 59 | ||
60 | #define HAVE_TOUCHPAD_SENSITIVITY_SETTING | 60 | #define HAVE_TOUCHPAD_SENSITIVITY_SETTING |
61 | 61 | ||
62 | #ifndef SIMULATOR | ||
63 | #define HAVE_HARDWARE_BEEP | 62 | #define HAVE_HARDWARE_BEEP |
64 | #endif | ||
65 | 63 | ||
66 | #endif /* BOOTLOADER */ | 64 | #endif /* BOOTLOADER */ |
67 | 65 | ||
@@ -140,11 +138,6 @@ | |||
140 | * when running */ | 138 | * when running */ |
141 | #define HAVE_BATTERY_SWITCH | 139 | #define HAVE_BATTERY_SWITCH |
142 | 140 | ||
143 | #ifndef SIMULATOR | ||
144 | |||
145 | /* The LCD on a Gigabeat is 240x320 - it is portrait */ | ||
146 | #define HAVE_PORTRAIT_LCD | ||
147 | |||
148 | #define HAVE_LCD_FLIP | 141 | #define HAVE_LCD_FLIP |
149 | 142 | ||
150 | /* Define this if your LCD can set contrast */ | 143 | /* Define this if your LCD can set contrast */ |
@@ -190,4 +183,3 @@ | |||
190 | #define BOOTFILE "rockbox." BOOTFILE_EXT | 183 | #define BOOTFILE "rockbox." BOOTFILE_EXT |
191 | #define BOOTDIR "/.rockbox" | 184 | #define BOOTDIR "/.rockbox" |
192 | 185 | ||
193 | #endif | ||
diff --git a/firmware/export/config-h10.h b/firmware/export/config-h10.h index 5ac12af3fc..6ad7a8ddc5 100644 --- a/firmware/export/config-h10.h +++ b/firmware/export/config-h10.h | |||
@@ -127,8 +127,6 @@ | |||
127 | /* define this if the unit can be powered or charged via USB */ | 127 | /* define this if the unit can be powered or charged via USB */ |
128 | #define HAVE_USB_POWER | 128 | #define HAVE_USB_POWER |
129 | 129 | ||
130 | #ifndef SIMULATOR | ||
131 | |||
132 | /* Define this if you have a PortalPlayer PP5020 */ | 130 | /* Define this if you have a PortalPlayer PP5020 */ |
133 | #define CONFIG_CPU PP5020 | 131 | #define CONFIG_CPU PP5020 |
134 | 132 | ||
@@ -185,4 +183,3 @@ | |||
185 | 183 | ||
186 | #define ICODE_ATTR_TREMOR_NOT_MDCT | 184 | #define ICODE_ATTR_TREMOR_NOT_MDCT |
187 | 185 | ||
188 | #endif | ||
diff --git a/firmware/export/config-h100.h b/firmware/export/config-h100.h index f06aaf8335..520079b8a0 100644 --- a/firmware/export/config-h100.h +++ b/firmware/export/config-h100.h | |||
@@ -133,8 +133,6 @@ | |||
133 | #define CURRENT_RECORD 105 /* additional current while recording */ | 133 | #define CURRENT_RECORD 105 /* additional current while recording */ |
134 | #define CURRENT_REMOTE 8 /* additional current when remote connected */ | 134 | #define CURRENT_REMOTE 8 /* additional current when remote connected */ |
135 | 135 | ||
136 | #ifndef SIMULATOR | ||
137 | |||
138 | /* Define this if you have a Motorola SCF5249 */ | 136 | /* Define this if you have a Motorola SCF5249 */ |
139 | #define CONFIG_CPU MCF5249 | 137 | #define CONFIG_CPU MCF5249 |
140 | 138 | ||
@@ -183,8 +181,6 @@ | |||
183 | /* Define this if the EEPROM chip is used */ | 181 | /* Define this if the EEPROM chip is used */ |
184 | #define HAVE_EEPROM_SETTINGS | 182 | #define HAVE_EEPROM_SETTINGS |
185 | 183 | ||
186 | #endif /* !SIMULATOR */ | ||
187 | |||
188 | /* Define bitmask of input sources - recordable bitmask can be defined | 184 | /* Define bitmask of input sources - recordable bitmask can be defined |
189 | explicitly if different */ | 185 | explicitly if different */ |
190 | #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN | \ | 186 | #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN | \ |
diff --git a/firmware/export/config-h300.h b/firmware/export/config-h300.h index 9fad6cc503..09fce49b10 100644 --- a/firmware/export/config-h300.h +++ b/firmware/export/config-h300.h | |||
@@ -139,8 +139,6 @@ | |||
139 | * if USB/MAIN power is discernable and hardware doesn't compel charging */ | 139 | * if USB/MAIN power is discernable and hardware doesn't compel charging */ |
140 | #define HAVE_USB_CHARGING_ENABLE | 140 | #define HAVE_USB_CHARGING_ENABLE |
141 | 141 | ||
142 | #ifndef SIMULATOR | ||
143 | |||
144 | /* Define this if you have a Motorola SCF5249 */ | 142 | /* Define this if you have a Motorola SCF5249 */ |
145 | #define CONFIG_CPU MCF5249 | 143 | #define CONFIG_CPU MCF5249 |
146 | 144 | ||
@@ -181,8 +179,6 @@ | |||
181 | /* Define this if there is an EEPROM chip */ | 179 | /* Define this if there is an EEPROM chip */ |
182 | #define HAVE_EEPROM | 180 | #define HAVE_EEPROM |
183 | 181 | ||
184 | #endif /* SIMULATOR */ | ||
185 | |||
186 | /* Define this for FM radio input available */ | 182 | /* Define this for FM radio input available */ |
187 | #define HAVE_FMRADIO_IN | 183 | #define HAVE_FMRADIO_IN |
188 | 184 | ||
diff --git a/firmware/export/config-hdd1630.h b/firmware/export/config-hdd1630.h index 1d7bff3ee6..f44f7d1729 100644 --- a/firmware/export/config-hdd1630.h +++ b/firmware/export/config-hdd1630.h | |||
@@ -141,8 +141,6 @@ | |||
141 | /* define this if the unit can be powered or charged via USB */ | 141 | /* define this if the unit can be powered or charged via USB */ |
142 | #define HAVE_USB_POWER | 142 | #define HAVE_USB_POWER |
143 | 143 | ||
144 | #ifndef SIMULATOR | ||
145 | |||
146 | /* Define this if you have a PortalPlayer PP5020 */ | 144 | /* Define this if you have a PortalPlayer PP5020 */ |
147 | #define CONFIG_CPU PP5022 | 145 | #define CONFIG_CPU PP5022 |
148 | 146 | ||
@@ -199,4 +197,3 @@ | |||
199 | 197 | ||
200 | #define ICODE_ATTR_TREMOR_NOT_MDCT | 198 | #define ICODE_ATTR_TREMOR_NOT_MDCT |
201 | 199 | ||
202 | #endif | ||
diff --git a/firmware/export/config-iaudio7.h b/firmware/export/config-iaudio7.h index 68393f1293..44a6f84b0a 100644 --- a/firmware/export/config-iaudio7.h +++ b/firmware/export/config-iaudio7.h | |||
@@ -133,8 +133,6 @@ | |||
133 | 133 | ||
134 | #define CONFIG_CHARGING CHARGING_SIMPLE | 134 | #define CONFIG_CHARGING CHARGING_SIMPLE |
135 | 135 | ||
136 | #ifndef SIMULATOR | ||
137 | |||
138 | /* Define this if you have a TCC770 */ | 136 | /* Define this if you have a TCC770 */ |
139 | #define CONFIG_CPU TCC770 | 137 | #define CONFIG_CPU TCC770 |
140 | 138 | ||
@@ -162,4 +160,3 @@ | |||
162 | 160 | ||
163 | #define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ | 161 | #define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ |
164 | 162 | ||
165 | #endif /* SIMULATOR */ | ||
diff --git a/firmware/export/config-iaudiom3.h b/firmware/export/config-iaudiom3.h index b3d7fb83b3..99c4605be0 100644 --- a/firmware/export/config-iaudiom3.h +++ b/firmware/export/config-iaudiom3.h | |||
@@ -117,8 +117,6 @@ | |||
117 | /* define current usage levels */ | 117 | /* define current usage levels */ |
118 | #define CURRENT_REMOTE 8 /* additional current when remote connected */ | 118 | #define CURRENT_REMOTE 8 /* additional current when remote connected */ |
119 | 119 | ||
120 | #ifndef SIMULATOR | ||
121 | |||
122 | /* Define this if your LCD can set contrast */ | 120 | /* Define this if your LCD can set contrast */ |
123 | #define HAVE_LCD_CONTRAST | 121 | #define HAVE_LCD_CONTRAST |
124 | 122 | ||
@@ -140,8 +138,8 @@ | |||
140 | /* Define this if you have ATA power-off control */ | 138 | /* Define this if you have ATA power-off control */ |
141 | #define HAVE_ATA_POWER_OFF | 139 | #define HAVE_ATA_POWER_OFF |
142 | 140 | ||
143 | /* Virtual LED (icon) */ | 141 | /* FIXME: implement hardware LED handling */ |
144 | #define CONFIG_LED LED_VIRTUAL /* FIXME: implement hardware LED handling */ | 142 | /* #define CONFIG_LED LED_REAL */ |
145 | 143 | ||
146 | /* Offset ( in the firmware file's header ) to the file CRC */ | 144 | /* Offset ( in the firmware file's header ) to the file CRC */ |
147 | #define FIRMWARE_OFFSET_FILE_CRC 0 | 145 | #define FIRMWARE_OFFSET_FILE_CRC 0 |
@@ -160,8 +158,6 @@ | |||
160 | #define FLASH_ENTRYPOINT 0x00001000 | 158 | #define FLASH_ENTRYPOINT 0x00001000 |
161 | #define FLASH_MAGIC 0xfbfbfbf1 | 159 | #define FLASH_MAGIC 0xfbfbfbf1 |
162 | 160 | ||
163 | #endif /* SIMULATOR */ | ||
164 | |||
165 | /* Define this for FM radio input available */ | 161 | /* Define this for FM radio input available */ |
166 | #define HAVE_FMRADIO_IN | 162 | #define HAVE_FMRADIO_IN |
167 | 163 | ||
diff --git a/firmware/export/config-iaudiom5.h b/firmware/export/config-iaudiom5.h index b10ac9ad09..00e07a92cd 100644 --- a/firmware/export/config-iaudiom5.h +++ b/firmware/export/config-iaudiom5.h | |||
@@ -136,8 +136,6 @@ | |||
136 | /* define current usage levels */ | 136 | /* define current usage levels */ |
137 | #define CURRENT_REMOTE 8 /* additional current when remote connected */ | 137 | #define CURRENT_REMOTE 8 /* additional current when remote connected */ |
138 | 138 | ||
139 | #ifndef SIMULATOR | ||
140 | |||
141 | /* Define this if your LCD can set contrast */ | 139 | /* Define this if your LCD can set contrast */ |
142 | #define HAVE_LCD_CONTRAST | 140 | #define HAVE_LCD_CONTRAST |
143 | 141 | ||
@@ -176,8 +174,6 @@ | |||
176 | #define FLASH_ENTRYPOINT 0x00001000 | 174 | #define FLASH_ENTRYPOINT 0x00001000 |
177 | #define FLASH_MAGIC 0xfbfbfbf1 | 175 | #define FLASH_MAGIC 0xfbfbfbf1 |
178 | 176 | ||
179 | #endif /* SIMULATOR */ | ||
180 | |||
181 | /** Port-specific settings **/ | 177 | /** Port-specific settings **/ |
182 | 178 | ||
183 | /* Main LCD contrast range and defaults */ | 179 | /* Main LCD contrast range and defaults */ |
diff --git a/firmware/export/config-iaudiox5.h b/firmware/export/config-iaudiox5.h index 0cf39325a4..a6b48b98a8 100644 --- a/firmware/export/config-iaudiox5.h +++ b/firmware/export/config-iaudiox5.h | |||
@@ -139,8 +139,6 @@ | |||
139 | /* define current usage levels */ | 139 | /* define current usage levels */ |
140 | #define CURRENT_REMOTE 8 /* additional current when remote connected */ | 140 | #define CURRENT_REMOTE 8 /* additional current when remote connected */ |
141 | 141 | ||
142 | #ifndef SIMULATOR | ||
143 | |||
144 | /* Define this if your LCD can set contrast */ | 142 | /* Define this if your LCD can set contrast */ |
145 | #define HAVE_LCD_CONTRAST | 143 | #define HAVE_LCD_CONTRAST |
146 | 144 | ||
@@ -182,8 +180,6 @@ | |||
182 | #define FLASH_ENTRYPOINT 0x00001000 | 180 | #define FLASH_ENTRYPOINT 0x00001000 |
183 | #define FLASH_MAGIC 0xfbfbfbf1 | 181 | #define FLASH_MAGIC 0xfbfbfbf1 |
184 | 182 | ||
185 | #endif /* SIMULATOR */ | ||
186 | |||
187 | /* Define this for FM radio input available */ | 183 | /* Define this for FM radio input available */ |
188 | #define HAVE_FMRADIO_IN | 184 | #define HAVE_FMRADIO_IN |
189 | 185 | ||
diff --git a/firmware/export/config-ifp7xx.h b/firmware/export/config-ifp7xx.h index 901f78f0ea..48a53f8c9d 100644 --- a/firmware/export/config-ifp7xx.h +++ b/firmware/export/config-ifp7xx.h | |||
@@ -76,8 +76,6 @@ | |||
76 | /* define this if the unit should not shut down on low battery. */ | 76 | /* define this if the unit should not shut down on low battery. */ |
77 | #define NO_LOW_BATTERY_SHUTDOWN | 77 | #define NO_LOW_BATTERY_SHUTDOWN |
78 | 78 | ||
79 | #ifndef SIMULATOR | ||
80 | |||
81 | /* Define this if you have a Philips PNX0101 */ | 79 | /* Define this if you have a Philips PNX0101 */ |
82 | #define CONFIG_CPU PNX0101 | 80 | #define CONFIG_CPU PNX0101 |
83 | 81 | ||
@@ -127,4 +125,3 @@ | |||
127 | 125 | ||
128 | #define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ | 126 | #define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ |
129 | 127 | ||
130 | #endif | ||
diff --git a/firmware/export/config-ipod1g2g.h b/firmware/export/config-ipod1g2g.h index 549af02fdc..835b75bd85 100644 --- a/firmware/export/config-ipod1g2g.h +++ b/firmware/export/config-ipod1g2g.h | |||
@@ -120,8 +120,6 @@ | |||
120 | /* FIXME: Don't shutdown on low battery until we have proper suspend. */ | 120 | /* FIXME: Don't shutdown on low battery until we have proper suspend. */ |
121 | #define NO_LOW_BATTERY_SHUTDOWN | 121 | #define NO_LOW_BATTERY_SHUTDOWN |
122 | 122 | ||
123 | #ifndef SIMULATOR | ||
124 | |||
125 | /* Define this if you have a PortalPlayer PP5002 */ | 123 | /* Define this if you have a PortalPlayer PP5002 */ |
126 | #define CONFIG_CPU PP5002 | 124 | #define CONFIG_CPU PP5002 |
127 | 125 | ||
@@ -168,4 +166,3 @@ | |||
168 | 166 | ||
169 | #define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ | 167 | #define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ |
170 | 168 | ||
171 | #endif /* SIMULATOR */ | ||
diff --git a/firmware/export/config-ipod3g.h b/firmware/export/config-ipod3g.h index 197f80fe72..7cab8846ef 100644 --- a/firmware/export/config-ipod3g.h +++ b/firmware/export/config-ipod3g.h | |||
@@ -124,8 +124,6 @@ | |||
124 | /* Hardware controlled charging? FIXME */ | 124 | /* Hardware controlled charging? FIXME */ |
125 | #define CONFIG_CHARGING CHARGING_SIMPLE | 125 | #define CONFIG_CHARGING CHARGING_SIMPLE |
126 | 126 | ||
127 | #ifndef SIMULATOR | ||
128 | |||
129 | /* Define this if you have a PortalPlayer PP5002 */ | 127 | /* Define this if you have a PortalPlayer PP5002 */ |
130 | #define CONFIG_CPU PP5002 | 128 | #define CONFIG_CPU PP5002 |
131 | 129 | ||
@@ -172,4 +170,3 @@ | |||
172 | 170 | ||
173 | #define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ | 171 | #define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ |
174 | 172 | ||
175 | #endif /* SIMULATOR */ | ||
diff --git a/firmware/export/config-ipod4g.h b/firmware/export/config-ipod4g.h index 232e0aa5a3..6195e0c1b6 100644 --- a/firmware/export/config-ipod4g.h +++ b/firmware/export/config-ipod4g.h | |||
@@ -141,8 +141,6 @@ | |||
141 | #define CURRENT_RECORD 35 /* FIXME: this needs adjusting */ | 141 | #define CURRENT_RECORD 35 /* FIXME: this needs adjusting */ |
142 | #endif | 142 | #endif |
143 | 143 | ||
144 | #ifndef SIMULATOR | ||
145 | |||
146 | /* Define this if you have a PortalPlayer PP5020 */ | 144 | /* Define this if you have a PortalPlayer PP5020 */ |
147 | #define CONFIG_CPU PP5020 | 145 | #define CONFIG_CPU PP5020 |
148 | 146 | ||
@@ -185,9 +183,6 @@ | |||
185 | #define USB_PRODUCT_ID 0x1203 | 183 | #define USB_PRODUCT_ID 0x1203 |
186 | #define HAVE_USB_HID_MOUSE | 184 | #define HAVE_USB_HID_MOUSE |
187 | 185 | ||
188 | /* Virtual LED (icon) */ | ||
189 | #define CONFIG_LED LED_VIRTUAL | ||
190 | |||
191 | /* Define this if you have adjustable CPU frequency */ | 186 | /* Define this if you have adjustable CPU frequency */ |
192 | #define HAVE_ADJUSTABLE_CPU_FREQ | 187 | #define HAVE_ADJUSTABLE_CPU_FREQ |
193 | 188 | ||
@@ -205,4 +200,3 @@ | |||
205 | 200 | ||
206 | #define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ | 201 | #define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ |
207 | 202 | ||
208 | #endif | ||
diff --git a/firmware/export/config-ipodcolor.h b/firmware/export/config-ipodcolor.h index 3254c0abfb..7c7897b67b 100644 --- a/firmware/export/config-ipodcolor.h +++ b/firmware/export/config-ipodcolor.h | |||
@@ -118,8 +118,6 @@ | |||
118 | /* define this if the unit can be powered or charged via USB */ | 118 | /* define this if the unit can be powered or charged via USB */ |
119 | #define HAVE_USB_POWER | 119 | #define HAVE_USB_POWER |
120 | 120 | ||
121 | #ifndef SIMULATOR | ||
122 | |||
123 | /* Define this if you have a PortalPlayer PP5020 */ | 121 | /* Define this if you have a PortalPlayer PP5020 */ |
124 | #define CONFIG_CPU PP5020 | 122 | #define CONFIG_CPU PP5020 |
125 | 123 | ||
@@ -177,4 +175,3 @@ | |||
177 | #define IPOD_ACCESSORY_PROTOCOL | 175 | #define IPOD_ACCESSORY_PROTOCOL |
178 | #define HAVE_SERIAL | 176 | #define HAVE_SERIAL |
179 | 177 | ||
180 | #endif | ||
diff --git a/firmware/export/config-ipodmini.h b/firmware/export/config-ipodmini.h index 9cf377f99a..be3ab2bc96 100644 --- a/firmware/export/config-ipodmini.h +++ b/firmware/export/config-ipodmini.h | |||
@@ -137,8 +137,6 @@ | |||
137 | /* define this if the unit can be powered or charged via USB */ | 137 | /* define this if the unit can be powered or charged via USB */ |
138 | #define HAVE_USB_POWER | 138 | #define HAVE_USB_POWER |
139 | 139 | ||
140 | #ifndef SIMULATOR | ||
141 | |||
142 | /* Define this if you have a PortalPlayer PP5020 */ | 140 | /* Define this if you have a PortalPlayer PP5020 */ |
143 | #define CONFIG_CPU PP5020 | 141 | #define CONFIG_CPU PP5020 |
144 | 142 | ||
@@ -192,4 +190,3 @@ | |||
192 | 190 | ||
193 | #define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ | 191 | #define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ |
194 | 192 | ||
195 | #endif | ||
diff --git a/firmware/export/config-ipodmini2g.h b/firmware/export/config-ipodmini2g.h index dcd3113d77..53476b177f 100644 --- a/firmware/export/config-ipodmini2g.h +++ b/firmware/export/config-ipodmini2g.h | |||
@@ -144,8 +144,6 @@ | |||
144 | /* define this if the unit can be powered or charged via USB */ | 144 | /* define this if the unit can be powered or charged via USB */ |
145 | #define HAVE_USB_POWER | 145 | #define HAVE_USB_POWER |
146 | 146 | ||
147 | #ifndef SIMULATOR | ||
148 | |||
149 | /* Define this if you have a PortalPlayer PP5022 */ | 147 | /* Define this if you have a PortalPlayer PP5022 */ |
150 | #define CONFIG_CPU PP5022 | 148 | #define CONFIG_CPU PP5022 |
151 | 149 | ||
@@ -202,4 +200,3 @@ | |||
202 | 200 | ||
203 | #define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ | 201 | #define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ |
204 | 202 | ||
205 | #endif | ||
diff --git a/firmware/export/config-ipodnano.h b/firmware/export/config-ipodnano.h index 005d2ffd9c..f1a4d6a65e 100644 --- a/firmware/export/config-ipodnano.h +++ b/firmware/export/config-ipodnano.h | |||
@@ -131,8 +131,6 @@ | |||
131 | #define CURRENT_RECORD 35 /* FIXME: this needs adjusting */ | 131 | #define CURRENT_RECORD 35 /* FIXME: this needs adjusting */ |
132 | #endif | 132 | #endif |
133 | 133 | ||
134 | #ifndef SIMULATOR | ||
135 | |||
136 | /* Define this if you have a PortalPlayer PP5022 */ | 134 | /* Define this if you have a PortalPlayer PP5022 */ |
137 | #define CONFIG_CPU PP5022 | 135 | #define CONFIG_CPU PP5022 |
138 | 136 | ||
@@ -187,4 +185,3 @@ | |||
187 | #define IPOD_ACCESSORY_PROTOCOL | 185 | #define IPOD_ACCESSORY_PROTOCOL |
188 | #define HAVE_SERIAL | 186 | #define HAVE_SERIAL |
189 | 187 | ||
190 | #endif | ||
diff --git a/firmware/export/config-ipodnano2g.h b/firmware/export/config-ipodnano2g.h index 59ab28cc21..bcc98e0da3 100644 --- a/firmware/export/config-ipodnano2g.h +++ b/firmware/export/config-ipodnano2g.h | |||
@@ -105,9 +105,7 @@ | |||
105 | /* Define the type of audio codec */ | 105 | /* Define the type of audio codec */ |
106 | #define HAVE_WM8975 | 106 | #define HAVE_WM8975 |
107 | 107 | ||
108 | #ifndef SIMULATOR | ||
109 | #define HAVE_PCM_DMA_ADDRESS | 108 | #define HAVE_PCM_DMA_ADDRESS |
110 | #endif | ||
111 | 109 | ||
112 | /* Define this for LCD backlight available */ | 110 | /* Define this for LCD backlight available */ |
113 | #define HAVE_BACKLIGHT | 111 | #define HAVE_BACKLIGHT |
@@ -134,8 +132,6 @@ | |||
134 | /* define this if the unit can be powered or charged via USB */ | 132 | /* define this if the unit can be powered or charged via USB */ |
135 | #define HAVE_USB_POWER | 133 | #define HAVE_USB_POWER |
136 | 134 | ||
137 | #ifndef SIMULATOR | ||
138 | |||
139 | /* Define this if your LCD can set contrast */ | 135 | /* Define this if your LCD can set contrast */ |
140 | //#define HAVE_LCD_CONTRAST | 136 | //#define HAVE_LCD_CONTRAST |
141 | 137 | ||
@@ -184,8 +180,6 @@ | |||
184 | #define FLASH_MAGIC 0xfbfbfbf1 | 180 | #define FLASH_MAGIC 0xfbfbfbf1 |
185 | #endif | 181 | #endif |
186 | 182 | ||
187 | #endif /* SIMULATOR */ | ||
188 | |||
189 | /* Define this for FM radio input available */ | 183 | /* Define this for FM radio input available */ |
190 | #define HAVE_FMRADIO_IN | 184 | #define HAVE_FMRADIO_IN |
191 | 185 | ||
diff --git a/firmware/export/config-ipodvideo.h b/firmware/export/config-ipodvideo.h index f760a5656f..9762e71a73 100644 --- a/firmware/export/config-ipodvideo.h +++ b/firmware/export/config-ipodvideo.h | |||
@@ -152,8 +152,6 @@ | |||
152 | #define CURRENT_RECORD 35 /* FIXME: this needs adjusting */ | 152 | #define CURRENT_RECORD 35 /* FIXME: this needs adjusting */ |
153 | #endif | 153 | #endif |
154 | 154 | ||
155 | #ifndef SIMULATOR | ||
156 | |||
157 | /* Define this if you have a PortalPlayer PP5022 */ | 155 | /* Define this if you have a PortalPlayer PP5022 */ |
158 | #define CONFIG_CPU PP5022 | 156 | #define CONFIG_CPU PP5022 |
159 | 157 | ||
@@ -196,9 +194,6 @@ | |||
196 | #define USB_PRODUCT_ID 0x1209 | 194 | #define USB_PRODUCT_ID 0x1209 |
197 | #define HAVE_USB_HID_MOUSE | 195 | #define HAVE_USB_HID_MOUSE |
198 | 196 | ||
199 | /* Virtual LED (icon) */ | ||
200 | #define CONFIG_LED LED_VIRTUAL | ||
201 | |||
202 | /* Define this if you have adjustable CPU frequency */ | 197 | /* Define this if you have adjustable CPU frequency */ |
203 | #define HAVE_ADJUSTABLE_CPU_FREQ | 198 | #define HAVE_ADJUSTABLE_CPU_FREQ |
204 | 199 | ||
@@ -222,4 +217,3 @@ | |||
222 | #define IPOD_ACCESSORY_PROTOCOL | 217 | #define IPOD_ACCESSORY_PROTOCOL |
223 | #define HAVE_SERIAL | 218 | #define HAVE_SERIAL |
224 | 219 | ||
225 | #endif | ||
diff --git a/firmware/export/config-logikdax.h b/firmware/export/config-logikdax.h index 8cfbbd8bd8..8fbd064306 100644 --- a/firmware/export/config-logikdax.h +++ b/firmware/export/config-logikdax.h | |||
@@ -103,8 +103,6 @@ | |||
103 | /* define this if the unit should not shut down on low battery. */ | 103 | /* define this if the unit should not shut down on low battery. */ |
104 | #define NO_LOW_BATTERY_SHUTDOWN | 104 | #define NO_LOW_BATTERY_SHUTDOWN |
105 | 105 | ||
106 | #ifndef SIMULATOR | ||
107 | |||
108 | /* Define this if you have a TCC773L */ | 106 | /* Define this if you have a TCC773L */ |
109 | #define CONFIG_CPU TCC773L | 107 | #define CONFIG_CPU TCC773L |
110 | 108 | ||
@@ -147,4 +145,3 @@ | |||
147 | 145 | ||
148 | #define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ | 146 | #define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ |
149 | 147 | ||
150 | #endif /* SIMULATOR */ | ||
diff --git a/firmware/export/config-lyre_proto1.h b/firmware/export/config-lyre_proto1.h index d157f5be2d..250b8e2c00 100644 --- a/firmware/export/config-lyre_proto1.h +++ b/firmware/export/config-lyre_proto1.h | |||
@@ -84,8 +84,6 @@ | |||
84 | #define BATTERY_CAPACITY_INC 100 /* capacity increment */ | 84 | #define BATTERY_CAPACITY_INC 100 /* capacity increment */ |
85 | #define BATTERY_TYPES_COUNT 1 /* only one type */ | 85 | #define BATTERY_TYPES_COUNT 1 /* only one type */ |
86 | 86 | ||
87 | #ifndef SIMULATOR | ||
88 | |||
89 | #define CONFIG_CPU AT91SAM9260 | 87 | #define CONFIG_CPU AT91SAM9260 |
90 | 88 | ||
91 | /* Define this to the CPU frequency */ | 89 | /* Define this to the CPU frequency */ |
@@ -103,4 +101,3 @@ | |||
103 | #define BOOTFILE "rockbox." BOOTFILE_EXT | 101 | #define BOOTFILE "rockbox." BOOTFILE_EXT |
104 | #define BOOTDIR "/.rockbox" | 102 | #define BOOTDIR "/.rockbox" |
105 | 103 | ||
106 | #endif | ||
diff --git a/firmware/export/config-m200.h b/firmware/export/config-m200.h index 3ec721cc7c..59f5ad7cfb 100644 --- a/firmware/export/config-m200.h +++ b/firmware/export/config-m200.h | |||
@@ -98,8 +98,6 @@ | |||
98 | /* define this if the unit should not shut down on low battery. */ | 98 | /* define this if the unit should not shut down on low battery. */ |
99 | #define NO_LOW_BATTERY_SHUTDOWN | 99 | #define NO_LOW_BATTERY_SHUTDOWN |
100 | 100 | ||
101 | #ifndef SIMULATOR | ||
102 | |||
103 | /* Define this if you have a TCC770 */ | 101 | /* Define this if you have a TCC770 */ |
104 | #define CONFIG_CPU TCC770 | 102 | #define CONFIG_CPU TCC770 |
105 | 103 | ||
@@ -133,4 +131,3 @@ | |||
133 | 131 | ||
134 | #define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ | 132 | #define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ |
135 | 133 | ||
136 | #endif /* SIMULATOR */ | ||
diff --git a/firmware/export/config-m200v4.h b/firmware/export/config-m200v4.h index b734f3e368..13dcec92ff 100644 --- a/firmware/export/config-m200v4.h +++ b/firmware/export/config-m200v4.h | |||
@@ -111,8 +111,6 @@ | |||
111 | /* define this if the unit should not shut down on low battery. */ | 111 | /* define this if the unit should not shut down on low battery. */ |
112 | #define NO_LOW_BATTERY_SHUTDOWN | 112 | #define NO_LOW_BATTERY_SHUTDOWN |
113 | 113 | ||
114 | #ifndef SIMULATOR | ||
115 | |||
116 | /* Define this if you have an AMS AS3525 */ | 114 | /* Define this if you have an AMS AS3525 */ |
117 | #define CONFIG_CPU AS3525 | 115 | #define CONFIG_CPU AS3525 |
118 | 116 | ||
@@ -162,4 +160,3 @@ | |||
162 | 160 | ||
163 | #define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ | 161 | #define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ |
164 | 162 | ||
165 | #endif /* SIMULATOR */ | ||
diff --git a/firmware/export/config-meizu-m3.h b/firmware/export/config-meizu-m3.h index 7da1759a61..12f2cfdfea 100644 --- a/firmware/export/config-meizu-m3.h +++ b/firmware/export/config-meizu-m3.h | |||
@@ -119,8 +119,6 @@ | |||
119 | /* Hardware controlled charging, software can monitor plug and charge state */ | 119 | /* Hardware controlled charging, software can monitor plug and charge state */ |
120 | #define CONFIG_CHARGING CHARGING_MONITOR | 120 | #define CONFIG_CHARGING CHARGING_MONITOR |
121 | 121 | ||
122 | #ifndef SIMULATOR | ||
123 | |||
124 | /* Define this if your LCD can set contrast */ | 122 | /* Define this if your LCD can set contrast */ |
125 | //#define HAVE_LCD_CONTRAST | 123 | //#define HAVE_LCD_CONTRAST |
126 | 124 | ||
@@ -162,8 +160,6 @@ | |||
162 | #define FLASH_ENTRYPOINT 0x00001000 | 160 | #define FLASH_ENTRYPOINT 0x00001000 |
163 | #define FLASH_MAGIC 0xfbfbfbf1 | 161 | #define FLASH_MAGIC 0xfbfbfbf1 |
164 | 162 | ||
165 | #endif /* SIMULATOR */ | ||
166 | |||
167 | /* Define this for FM radio input available */ | 163 | /* Define this for FM radio input available */ |
168 | #define HAVE_FMRADIO_IN | 164 | #define HAVE_FMRADIO_IN |
169 | 165 | ||
diff --git a/firmware/export/config-meizu-m6sl.h b/firmware/export/config-meizu-m6sl.h index 033dc619a0..ffa8903526 100644 --- a/firmware/export/config-meizu-m6sl.h +++ b/firmware/export/config-meizu-m6sl.h | |||
@@ -119,8 +119,6 @@ | |||
119 | /* Hardware controlled charging? FIXME */ | 119 | /* Hardware controlled charging? FIXME */ |
120 | #define CONFIG_CHARGING CHARGING_SIMPLE | 120 | #define CONFIG_CHARGING CHARGING_SIMPLE |
121 | 121 | ||
122 | #ifndef SIMULATOR | ||
123 | |||
124 | /* Define this if your LCD can set contrast */ | 122 | /* Define this if your LCD can set contrast */ |
125 | //#define HAVE_LCD_CONTRAST | 123 | //#define HAVE_LCD_CONTRAST |
126 | 124 | ||
@@ -162,8 +160,6 @@ | |||
162 | #define FLASH_ENTRYPOINT 0x00001000 | 160 | #define FLASH_ENTRYPOINT 0x00001000 |
163 | #define FLASH_MAGIC 0xfbfbfbf1 | 161 | #define FLASH_MAGIC 0xfbfbfbf1 |
164 | 162 | ||
165 | #endif /* SIMULATOR */ | ||
166 | |||
167 | /* Define this for FM radio input available */ | 163 | /* Define this for FM radio input available */ |
168 | #define HAVE_FMRADIO_IN | 164 | #define HAVE_FMRADIO_IN |
169 | 165 | ||
diff --git a/firmware/export/config-meizu-m6sp.h b/firmware/export/config-meizu-m6sp.h index 02f1f86d7a..0fc7264192 100644 --- a/firmware/export/config-meizu-m6sp.h +++ b/firmware/export/config-meizu-m6sp.h | |||
@@ -122,8 +122,6 @@ | |||
122 | /* Hardware controlled charging? FIXME */ | 122 | /* Hardware controlled charging? FIXME */ |
123 | #define CONFIG_CHARGING CHARGING_SIMPLE | 123 | #define CONFIG_CHARGING CHARGING_SIMPLE |
124 | 124 | ||
125 | #ifndef SIMULATOR | ||
126 | |||
127 | /* Define this if your LCD can set contrast */ | 125 | /* Define this if your LCD can set contrast */ |
128 | //#define HAVE_LCD_CONTRAST | 126 | //#define HAVE_LCD_CONTRAST |
129 | 127 | ||
@@ -165,8 +163,6 @@ | |||
165 | #define FLASH_ENTRYPOINT 0x00001000 | 163 | #define FLASH_ENTRYPOINT 0x00001000 |
166 | #define FLASH_MAGIC 0xfbfbfbf1 | 164 | #define FLASH_MAGIC 0xfbfbfbf1 |
167 | 165 | ||
168 | #endif /* SIMULATOR */ | ||
169 | |||
170 | /* Define this for FM radio input available */ | 166 | /* Define this for FM radio input available */ |
171 | #define HAVE_FMRADIO_IN | 167 | #define HAVE_FMRADIO_IN |
172 | 168 | ||
diff --git a/firmware/export/config-mini2440.h b/firmware/export/config-mini2440.h index f08d4875ef..739489becd 100644 --- a/firmware/export/config-mini2440.h +++ b/firmware/export/config-mini2440.h | |||
@@ -120,10 +120,6 @@ | |||
120 | /* The number of bytes reserved for loadable plugins */ | 120 | /* The number of bytes reserved for loadable plugins */ |
121 | #define PLUGIN_BUFFER_SIZE 0x100000 | 121 | #define PLUGIN_BUFFER_SIZE 0x100000 |
122 | 122 | ||
123 | |||
124 | /***************************************************************************/ | ||
125 | #ifndef SIMULATOR | ||
126 | |||
127 | #define CONFIG_CPU S3C2440 | 123 | #define CONFIG_CPU S3C2440 |
128 | 124 | ||
129 | /* Define this to the CPU frequency */ | 125 | /* Define this to the CPU frequency */ |
@@ -158,5 +154,3 @@ | |||
158 | #define BOOTFILE "rockbox." BOOTFILE_EXT | 154 | #define BOOTFILE "rockbox." BOOTFILE_EXT |
159 | #define BOOTDIR "/.rockbox" | 155 | #define BOOTDIR "/.rockbox" |
160 | 156 | ||
161 | #endif | ||
162 | /***************************************************************************/ | ||
diff --git a/firmware/export/config-mrobe100.h b/firmware/export/config-mrobe100.h index c348770188..5a2790062d 100644 --- a/firmware/export/config-mrobe100.h +++ b/firmware/export/config-mrobe100.h | |||
@@ -123,8 +123,6 @@ | |||
123 | 123 | ||
124 | #define BATTERY_CAPACITY_DEFAULT 720 /* default battery capacity */ | 124 | #define BATTERY_CAPACITY_DEFAULT 720 /* default battery capacity */ |
125 | 125 | ||
126 | #ifndef SIMULATOR | ||
127 | |||
128 | /* Define this if you have a PortalPlayer PP5020 */ | 126 | /* Define this if you have a PortalPlayer PP5020 */ |
129 | #define CONFIG_CPU PP5020 | 127 | #define CONFIG_CPU PP5020 |
130 | 128 | ||
@@ -199,4 +197,3 @@ | |||
199 | 197 | ||
200 | #define ICODE_ATTR_TREMOR_NOT_MDCT | 198 | #define ICODE_ATTR_TREMOR_NOT_MDCT |
201 | 199 | ||
202 | #endif | ||
diff --git a/firmware/export/config-mrobe500.h b/firmware/export/config-mrobe500.h index 9d04aac125..7b73fe7ad6 100644 --- a/firmware/export/config-mrobe500.h +++ b/firmware/export/config-mrobe500.h | |||
@@ -199,8 +199,6 @@ | |||
199 | /* Define this if you have a Texas Instruments TSC2100 touch screen */ | 199 | /* Define this if you have a Texas Instruments TSC2100 touch screen */ |
200 | #define HAVE_TSC2100 | 200 | #define HAVE_TSC2100 |
201 | 201 | ||
202 | #if !defined(SIMULATOR) | ||
203 | |||
204 | /* M66591 register base */ | 202 | /* M66591 register base */ |
205 | #define M66591_BASE 0x60000000 | 203 | #define M66591_BASE 0x60000000 |
206 | 204 | ||
@@ -252,4 +250,3 @@ | |||
252 | 250 | ||
253 | #define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ | 251 | #define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ |
254 | 252 | ||
255 | #endif | ||
diff --git a/firmware/export/config-ondavx747.h b/firmware/export/config-ondavx747.h index dee18663d1..c4fc39bfc0 100644 --- a/firmware/export/config-ondavx747.h +++ b/firmware/export/config-ondavx747.h | |||
@@ -140,9 +140,7 @@ | |||
140 | #define HAVE_SW_TONE_CONTROLS | 140 | #define HAVE_SW_TONE_CONTROLS |
141 | 141 | ||
142 | /* has no volume control, so we use the software ones */ | 142 | /* has no volume control, so we use the software ones */ |
143 | #ifndef SIMULATOR | ||
144 | #define HAVE_SW_VOLUME_CONTROL | 143 | #define HAVE_SW_VOLUME_CONTROL |
145 | #endif | ||
146 | 144 | ||
147 | /* software controlled volume ranges from -73 -> 0 dB, other than that | 145 | /* software controlled volume ranges from -73 -> 0 dB, other than that |
148 | is controlled by hardware */ | 146 | is controlled by hardware */ |
@@ -169,8 +167,6 @@ | |||
169 | 167 | ||
170 | #define CFG_EXTAL 12000000 /* EXT clock: 12 Mhz */ | 168 | #define CFG_EXTAL 12000000 /* EXT clock: 12 Mhz */ |
171 | 169 | ||
172 | #ifndef SIMULATOR | ||
173 | |||
174 | #define CONFIG_STORAGE (STORAGE_NAND | STORAGE_SD) | 170 | #define CONFIG_STORAGE (STORAGE_NAND | STORAGE_SD) |
175 | #define NUM_DRIVES 2 | 171 | #define NUM_DRIVES 2 |
176 | 172 | ||
@@ -217,4 +213,3 @@ | |||
217 | #define USB_VENDOR_ID 0x07C4 | 213 | #define USB_VENDOR_ID 0x07C4 |
218 | #define USB_PRODUCT_ID 0xA4A5 | 214 | #define USB_PRODUCT_ID 0xA4A5 |
219 | 215 | ||
220 | #endif | ||
diff --git a/firmware/export/config-ondavx767.h b/firmware/export/config-ondavx767.h index cc0ce10151..661d3e9e5e 100644 --- a/firmware/export/config-ondavx767.h +++ b/firmware/export/config-ondavx767.h | |||
@@ -133,8 +133,6 @@ | |||
133 | /* Hardware controlled charging with monitoring */ | 133 | /* Hardware controlled charging with monitoring */ |
134 | //#define CONFIG_CHARGING CHARGING_MONITOR | 134 | //#define CONFIG_CHARGING CHARGING_MONITOR |
135 | 135 | ||
136 | #ifndef SIMULATOR | ||
137 | |||
138 | /* Define this if you have a Ingenic JZ4740 */ | 136 | /* Define this if you have a Ingenic JZ4740 */ |
139 | #define CONFIG_CPU JZ4732 | 137 | #define CONFIG_CPU JZ4732 |
140 | 138 | ||
@@ -167,4 +165,3 @@ | |||
167 | #define USB_VENDOR_ID 0x07C4 | 165 | #define USB_VENDOR_ID 0x07C4 |
168 | #define USB_PRODUCT_ID 0xA4A5 | 166 | #define USB_PRODUCT_ID 0xA4A5 |
169 | 167 | ||
170 | #endif | ||
diff --git a/firmware/export/config-ondiofm.h b/firmware/export/config-ondiofm.h index 7a2b30dbf1..b14f113244 100644 --- a/firmware/export/config-ondiofm.h +++ b/firmware/export/config-ondiofm.h | |||
@@ -79,8 +79,6 @@ | |||
79 | #define CURRENT_USB 1 /* host powered in USB mode; avoid zero-div */ | 79 | #define CURRENT_USB 1 /* host powered in USB mode; avoid zero-div */ |
80 | #define CURRENT_BACKLIGHT 0 /* no backlight */ | 80 | #define CURRENT_BACKLIGHT 0 /* no backlight */ |
81 | 81 | ||
82 | #ifndef SIMULATOR | ||
83 | |||
84 | /* Define this if you have a SH7034 */ | 82 | /* Define this if you have a SH7034 */ |
85 | #define CONFIG_CPU SH7034 | 83 | #define CONFIG_CPU SH7034 |
86 | 84 | ||
@@ -134,8 +132,6 @@ | |||
134 | #define BOOTFILE "ajbrec." BOOTFILE_EXT | 132 | #define BOOTFILE "ajbrec." BOOTFILE_EXT |
135 | #define BOOTDIR "/" | 133 | #define BOOTDIR "/" |
136 | 134 | ||
137 | #endif /* SIMULATOR */ | ||
138 | |||
139 | #define HAVE_LCD_CONTRAST | 135 | #define HAVE_LCD_CONTRAST |
140 | 136 | ||
141 | #define MIN_CONTRAST_SETTING 5 | 137 | #define MIN_CONTRAST_SETTING 5 |
diff --git a/firmware/export/config-ondiosp.h b/firmware/export/config-ondiosp.h index 134f7e3cfa..452b47b78e 100644 --- a/firmware/export/config-ondiosp.h +++ b/firmware/export/config-ondiosp.h | |||
@@ -66,8 +66,6 @@ | |||
66 | #define CURRENT_USB 1 /* host powered in USB mode; avoid zero-div */ | 66 | #define CURRENT_USB 1 /* host powered in USB mode; avoid zero-div */ |
67 | #define CURRENT_BACKLIGHT 0 /* no backlight */ | 67 | #define CURRENT_BACKLIGHT 0 /* no backlight */ |
68 | 68 | ||
69 | #ifndef SIMULATOR | ||
70 | |||
71 | /* Define this if you have a SH7034 */ | 69 | /* Define this if you have a SH7034 */ |
72 | #define CONFIG_CPU SH7034 | 70 | #define CONFIG_CPU SH7034 |
73 | 71 | ||
@@ -118,8 +116,6 @@ | |||
118 | #define BOOTFILE "ajbrec." BOOTFILE_EXT | 116 | #define BOOTFILE "ajbrec." BOOTFILE_EXT |
119 | #define BOOTDIR "/" | 117 | #define BOOTDIR "/" |
120 | 118 | ||
121 | #endif /* SIMULATOR */ | ||
122 | |||
123 | #define HAVE_LCD_CONTRAST | 119 | #define HAVE_LCD_CONTRAST |
124 | 120 | ||
125 | #define MIN_CONTRAST_SETTING 5 | 121 | #define MIN_CONTRAST_SETTING 5 |
diff --git a/firmware/export/config-player.h b/firmware/export/config-player.h index 5f6cf17fbe..c60ee6a071 100644 --- a/firmware/export/config-player.h +++ b/firmware/export/config-player.h | |||
@@ -58,8 +58,6 @@ | |||
58 | /* Hardware controlled charging */ | 58 | /* Hardware controlled charging */ |
59 | #define CONFIG_CHARGING CHARGING_SIMPLE | 59 | #define CONFIG_CHARGING CHARGING_SIMPLE |
60 | 60 | ||
61 | #ifndef SIMULATOR | ||
62 | |||
63 | /* Define this if you have a SH7034 */ | 61 | /* Define this if you have a SH7034 */ |
64 | #define CONFIG_CPU SH7034 | 62 | #define CONFIG_CPU SH7034 |
65 | 63 | ||
@@ -97,8 +95,6 @@ | |||
97 | #define BOOTFILE "archos." BOOTFILE_EXT | 95 | #define BOOTFILE "archos." BOOTFILE_EXT |
98 | #define BOOTDIR "/" | 96 | #define BOOTDIR "/" |
99 | 97 | ||
100 | #endif /* SIMULATOR */ | ||
101 | |||
102 | #define HAVE_LCD_CONTRAST | 98 | #define HAVE_LCD_CONTRAST |
103 | 99 | ||
104 | #define MIN_CONTRAST_SETTING 5 | 100 | #define MIN_CONTRAST_SETTING 5 |
diff --git a/firmware/export/config-recorder.h b/firmware/export/config-recorder.h index 74a7ce7cdc..88ff2c2006 100644 --- a/firmware/export/config-recorder.h +++ b/firmware/export/config-recorder.h | |||
@@ -87,8 +87,6 @@ | |||
87 | /* Software controlled charging */ | 87 | /* Software controlled charging */ |
88 | #define CONFIG_CHARGING CHARGING_TARGET | 88 | #define CONFIG_CHARGING CHARGING_TARGET |
89 | 89 | ||
90 | #ifndef SIMULATOR | ||
91 | |||
92 | /* Define this if you have a SH7034 */ | 90 | /* Define this if you have a SH7034 */ |
93 | #define CONFIG_CPU SH7034 | 91 | #define CONFIG_CPU SH7034 |
94 | 92 | ||
@@ -123,8 +121,6 @@ | |||
123 | #define BOOTFILE "ajbrec." BOOTFILE_EXT | 121 | #define BOOTFILE "ajbrec." BOOTFILE_EXT |
124 | #define BOOTDIR "/" | 122 | #define BOOTDIR "/" |
125 | 123 | ||
126 | #endif /* SIMULATOR */ | ||
127 | |||
128 | #define HAVE_LCD_CONTRAST | 124 | #define HAVE_LCD_CONTRAST |
129 | 125 | ||
130 | #define MIN_CONTRAST_SETTING 5 | 126 | #define MIN_CONTRAST_SETTING 5 |
diff --git a/firmware/export/config-recorderv2.h b/firmware/export/config-recorderv2.h index 5ca9459750..6a5564487e 100644 --- a/firmware/export/config-recorderv2.h +++ b/firmware/export/config-recorderv2.h | |||
@@ -93,8 +93,6 @@ | |||
93 | /* define this if the unit can be powered or charged via USB */ | 93 | /* define this if the unit can be powered or charged via USB */ |
94 | #define HAVE_USB_POWER | 94 | #define HAVE_USB_POWER |
95 | 95 | ||
96 | #ifndef SIMULATOR | ||
97 | |||
98 | /* Define this if you have a SH7034 */ | 96 | /* Define this if you have a SH7034 */ |
99 | #define CONFIG_CPU SH7034 | 97 | #define CONFIG_CPU SH7034 |
100 | 98 | ||
@@ -134,8 +132,6 @@ | |||
134 | #define BOOTFILE "ajbrec." BOOTFILE_EXT | 132 | #define BOOTFILE "ajbrec." BOOTFILE_EXT |
135 | #define BOOTDIR "/" | 133 | #define BOOTDIR "/" |
136 | 134 | ||
137 | #endif /* SIMULATOR */ | ||
138 | |||
139 | #define HAVE_LCD_CONTRAST | 135 | #define HAVE_LCD_CONTRAST |
140 | 136 | ||
141 | #define MIN_CONTRAST_SETTING 5 | 137 | #define MIN_CONTRAST_SETTING 5 |
diff --git a/firmware/export/config-sa9200.h b/firmware/export/config-sa9200.h index 2ab538e98c..ce233184cb 100644 --- a/firmware/export/config-sa9200.h +++ b/firmware/export/config-sa9200.h | |||
@@ -134,9 +134,6 @@ | |||
134 | /* define this if the unit can be powered or charged via USB */ | 134 | /* define this if the unit can be powered or charged via USB */ |
135 | #define HAVE_USB_POWER | 135 | #define HAVE_USB_POWER |
136 | 136 | ||
137 | /** Non-simulator section **/ | ||
138 | #ifndef SIMULATOR | ||
139 | |||
140 | /* Define this if you have a PortalPlayer PP5024 */ | 137 | /* Define this if you have a PortalPlayer PP5024 */ |
141 | #define CONFIG_CPU PP5024 | 138 | #define CONFIG_CPU PP5024 |
142 | 139 | ||
@@ -194,4 +191,3 @@ | |||
194 | 191 | ||
195 | #define INCLUDE_TIMEOUT_API | 192 | #define INCLUDE_TIMEOUT_API |
196 | 193 | ||
197 | #endif /* SIMULATOR */ | ||
diff --git a/firmware/export/config-sim.h b/firmware/export/config-sim.h new file mode 100644 index 0000000000..0656da3ac4 --- /dev/null +++ b/firmware/export/config-sim.h | |||
@@ -0,0 +1,80 @@ | |||
1 | /* This config file is for all simulators, and is used in addition to the | ||
2 | target specific configs */ | ||
3 | |||
4 | #undef CONFIG_CPU | ||
5 | |||
6 | #undef HAVE_FMADC | ||
7 | |||
8 | #undef NEED_ATA_POWER_BATT_MEASURE | ||
9 | |||
10 | #undef CONFIG_I2C | ||
11 | |||
12 | #undef HAVE_PCM_DMA_ADDRESS | ||
13 | |||
14 | #undef FLASH_SIZE | ||
15 | |||
16 | #undef CPU_FREQ | ||
17 | |||
18 | #undef HAVE_ATA_POWER_OFF | ||
19 | |||
20 | #undef CONFIG_LCD | ||
21 | |||
22 | #undef CONFIG_LED | ||
23 | |||
24 | #undef ROM_START | ||
25 | |||
26 | #undef FIRMWARE_OFFSET_FILE_LENGTH | ||
27 | #undef FIRMWARE_OFFSET_FILE_CRC | ||
28 | #undef FIRMWARE_OFFSET_FILE_DATA | ||
29 | |||
30 | #undef AMS_OF_SIZE | ||
31 | |||
32 | #undef HAVE_MULTIDRIVE | ||
33 | #undef NUM_DRIVES | ||
34 | #undef HAVE_HOTSWAP | ||
35 | |||
36 | #undef CONFIG_STORAGE | ||
37 | |||
38 | #undef CONFIG_USBOTG | ||
39 | |||
40 | #undef USB_HANDLED_BY_OF | ||
41 | |||
42 | #undef HAVE_USBSTACK | ||
43 | #undef USE_ROCKBOX_USB | ||
44 | #undef USB_VENDOR_ID | ||
45 | #undef USB_PRODUCT_ID | ||
46 | #undef USB_NUM_ENDPOINTS | ||
47 | #undef HAVE_USB_HID_MOUSE | ||
48 | |||
49 | #undef HAVE_ADJUSTABLE_CPU_FREQ | ||
50 | |||
51 | #undef MI4_FORMAT | ||
52 | #undef BOOTFILE_EXT | ||
53 | #undef BOOTFILE | ||
54 | #undef BOOTDIR | ||
55 | |||
56 | #undef BOOTLOADER_ENTRYPOINT | ||
57 | |||
58 | #undef FLASH_ENTRYPOINT | ||
59 | |||
60 | #undef FLASH_MAGIC | ||
61 | |||
62 | #undef HAVE_EEPROM | ||
63 | #undef HAVE_EEPROM_SETTINGS | ||
64 | |||
65 | #undef HAVE_HARDWARE_BEEP | ||
66 | |||
67 | #undef HAVE_POWEROFF_WHILE_CHARGING | ||
68 | |||
69 | #undef INCLUDE_TIMEOUT_API | ||
70 | |||
71 | #undef HAVE_FLASHED_ROCKBOX | ||
72 | |||
73 | #undef IPOD_ACCESSORY_PROTOCOL | ||
74 | |||
75 | #undef HAVE_WHEEL_POSITION | ||
76 | |||
77 | #undef HAVE_LCD_MODES | ||
78 | |||
79 | #undef HAVE_SPEAKER | ||
80 | |||
diff --git a/firmware/export/config-tpj1022.h b/firmware/export/config-tpj1022.h index cdb1eb93ac..89e3d6dff1 100644 --- a/firmware/export/config-tpj1022.h +++ b/firmware/export/config-tpj1022.h | |||
@@ -88,8 +88,6 @@ | |||
88 | /* define this if the unit can be powered or charged via USB */ | 88 | /* define this if the unit can be powered or charged via USB */ |
89 | /*#define HAVE_USB_POWER*/ | 89 | /*#define HAVE_USB_POWER*/ |
90 | 90 | ||
91 | #ifndef SIMULATOR | ||
92 | |||
93 | /* Define this if you have a PortalPlayer PP5020 */ | 91 | /* Define this if you have a PortalPlayer PP5020 */ |
94 | #define CONFIG_CPU PP5020 | 92 | #define CONFIG_CPU PP5020 |
95 | 93 | ||
@@ -139,4 +137,3 @@ | |||
139 | #define BOOTFILE "rockbox." BOOTFILE_EXT | 137 | #define BOOTFILE "rockbox." BOOTFILE_EXT |
140 | #define BOOTDIR "/.rockbox" | 138 | #define BOOTDIR "/.rockbox" |
141 | 139 | ||
142 | #endif | ||
diff --git a/firmware/export/config-view.h b/firmware/export/config-view.h index 4ba5d916ba..7b13bf74ba 100644 --- a/firmware/export/config-view.h +++ b/firmware/export/config-view.h | |||
@@ -135,9 +135,6 @@ | |||
135 | /* define this if the unit can be powered or charged via USB */ | 135 | /* define this if the unit can be powered or charged via USB */ |
136 | #define HAVE_USB_POWER | 136 | #define HAVE_USB_POWER |
137 | 137 | ||
138 | /** Non-simulator section **/ | ||
139 | #ifndef SIMULATOR | ||
140 | |||
141 | /* Define this if you have a PortalPlayer PP5024 */ | 138 | /* Define this if you have a PortalPlayer PP5024 */ |
142 | #define CONFIG_CPU PP6100 | 139 | #define CONFIG_CPU PP6100 |
143 | 140 | ||
@@ -190,8 +187,6 @@ | |||
190 | 187 | ||
191 | #define INCLUDE_TIMEOUT_API | 188 | #define INCLUDE_TIMEOUT_API |
192 | 189 | ||
193 | #endif /* SIMULATOR */ | ||
194 | |||
195 | /** Port-specific settings **/ | 190 | /** Port-specific settings **/ |
196 | 191 | ||
197 | /* Main LCD backlight brightness range and defaults */ | 192 | /* Main LCD backlight brightness range and defaults */ |
diff --git a/firmware/export/config-yh820.h b/firmware/export/config-yh820.h index 4005ec0267..4968960803 100644 --- a/firmware/export/config-yh820.h +++ b/firmware/export/config-yh820.h | |||
@@ -106,9 +106,7 @@ | |||
106 | #define CONFIG_STORAGE STORAGE_ATA | 106 | #define CONFIG_STORAGE STORAGE_ATA |
107 | 107 | ||
108 | /* We're able to shut off power to the HDD */ | 108 | /* We're able to shut off power to the HDD */ |
109 | #ifndef SIMULATOR | ||
110 | /* todo #define HAVE_ATA_POWER_OFF */ | 109 | /* todo #define HAVE_ATA_POWER_OFF */ |
111 | #endif | ||
112 | 110 | ||
113 | /* Define this if you have a software controlled poweroff */ | 111 | /* Define this if you have a software controlled poweroff */ |
114 | #define HAVE_SW_POWEROFF | 112 | #define HAVE_SW_POWEROFF |
@@ -139,8 +137,6 @@ | |||
139 | /* define this if the unit can be powered or charged via USB */ | 137 | /* define this if the unit can be powered or charged via USB */ |
140 | #define HAVE_USB_POWER | 138 | #define HAVE_USB_POWER |
141 | 139 | ||
142 | #ifndef SIMULATOR | ||
143 | |||
144 | /* Define this if you have a PortalPlayer PP5020 */ | 140 | /* Define this if you have a PortalPlayer PP5020 */ |
145 | #define CONFIG_CPU PP5020 | 141 | #define CONFIG_CPU PP5020 |
146 | 142 | ||
@@ -185,4 +181,3 @@ | |||
185 | 181 | ||
186 | #define ICODE_ATTR_TREMOR_NOT_MDCT | 182 | #define ICODE_ATTR_TREMOR_NOT_MDCT |
187 | 183 | ||
188 | #endif /* !SIMULATOR */ | ||
diff --git a/firmware/export/config-yh920.h b/firmware/export/config-yh920.h index e5a0fc8f71..310fa1374c 100644 --- a/firmware/export/config-yh920.h +++ b/firmware/export/config-yh920.h | |||
@@ -113,9 +113,7 @@ | |||
113 | #define CONFIG_STORAGE STORAGE_ATA | 113 | #define CONFIG_STORAGE STORAGE_ATA |
114 | 114 | ||
115 | /* We're able to shut off power to the HDD */ | 115 | /* We're able to shut off power to the HDD */ |
116 | #ifndef SIMULATOR | ||
117 | /* todo #define HAVE_ATA_POWER_OFF */ | 116 | /* todo #define HAVE_ATA_POWER_OFF */ |
118 | #endif | ||
119 | 117 | ||
120 | /* Define this if you have a software controlled poweroff */ | 118 | /* Define this if you have a software controlled poweroff */ |
121 | #define HAVE_SW_POWEROFF | 119 | #define HAVE_SW_POWEROFF |
@@ -146,8 +144,6 @@ | |||
146 | /* define this if the unit can be powered or charged via USB */ | 144 | /* define this if the unit can be powered or charged via USB */ |
147 | #define HAVE_USB_POWER | 145 | #define HAVE_USB_POWER |
148 | 146 | ||
149 | #ifndef SIMULATOR | ||
150 | |||
151 | /* Define this if you have a PortalPlayer PP5020 */ | 147 | /* Define this if you have a PortalPlayer PP5020 */ |
152 | #define CONFIG_CPU PP5020 | 148 | #define CONFIG_CPU PP5020 |
153 | 149 | ||
@@ -191,4 +187,3 @@ | |||
191 | 187 | ||
192 | #define ICODE_ATTR_TREMOR_NOT_MDCT | 188 | #define ICODE_ATTR_TREMOR_NOT_MDCT |
193 | 189 | ||
194 | #endif /* !SIMULATOR */ | ||
diff --git a/firmware/export/config-yh925.h b/firmware/export/config-yh925.h index 4119118678..55d46ae1e1 100644 --- a/firmware/export/config-yh925.h +++ b/firmware/export/config-yh925.h | |||
@@ -110,9 +110,7 @@ | |||
110 | #define CONFIG_STORAGE STORAGE_ATA | 110 | #define CONFIG_STORAGE STORAGE_ATA |
111 | 111 | ||
112 | /* We're able to shut off power to the HDD */ | 112 | /* We're able to shut off power to the HDD */ |
113 | #ifndef SIMULATOR | ||
114 | /* todo #define HAVE_ATA_POWER_OFF */ | 113 | /* todo #define HAVE_ATA_POWER_OFF */ |
115 | #endif | ||
116 | 114 | ||
117 | /* Define this if you have a software controlled poweroff */ | 115 | /* Define this if you have a software controlled poweroff */ |
118 | #define HAVE_SW_POWEROFF | 116 | #define HAVE_SW_POWEROFF |
@@ -143,8 +141,6 @@ | |||
143 | /* define this if the unit can be powered or charged via USB */ | 141 | /* define this if the unit can be powered or charged via USB */ |
144 | #define HAVE_USB_POWER | 142 | #define HAVE_USB_POWER |
145 | 143 | ||
146 | #ifndef SIMULATOR | ||
147 | |||
148 | /* Define this if you have a PortalPlayer PP5020 */ | 144 | /* Define this if you have a PortalPlayer PP5020 */ |
149 | #define CONFIG_CPU PP5020 | 145 | #define CONFIG_CPU PP5020 |
150 | 146 | ||
@@ -189,4 +185,3 @@ | |||
189 | 185 | ||
190 | #define ICODE_ATTR_TREMOR_NOT_MDCT | 186 | #define ICODE_ATTR_TREMOR_NOT_MDCT |
191 | 187 | ||
192 | #endif /* !SIMULATOR */ | ||
diff --git a/firmware/export/config-yps3.h b/firmware/export/config-yps3.h index cd7cf5050a..fd8fde6f6c 100644 --- a/firmware/export/config-yps3.h +++ b/firmware/export/config-yps3.h | |||
@@ -121,8 +121,6 @@ | |||
121 | /* Hardware controlled charging, software can monitor plug and charge state */ | 121 | /* Hardware controlled charging, software can monitor plug and charge state */ |
122 | #define CONFIG_CHARGING CHARGING_MONITOR | 122 | #define CONFIG_CHARGING CHARGING_MONITOR |
123 | 123 | ||
124 | #ifndef SIMULATOR | ||
125 | |||
126 | /* Define this if your LCD can set contrast */ | 124 | /* Define this if your LCD can set contrast */ |
127 | //#define HAVE_LCD_CONTRAST | 125 | //#define HAVE_LCD_CONTRAST |
128 | 126 | ||
@@ -167,8 +165,6 @@ | |||
167 | //#define FLASH_ENTRYPOINT 0x00001000 | 165 | //#define FLASH_ENTRYPOINT 0x00001000 |
168 | //#define FLASH_MAGIC 0xfbfbfbf1 | 166 | //#define FLASH_MAGIC 0xfbfbfbf1 |
169 | 167 | ||
170 | #endif /* SIMULATOR */ | ||
171 | |||
172 | /* Define this for FM radio input available */ | 168 | /* Define this for FM radio input available */ |
173 | #define HAVE_FMRADIO_IN | 169 | #define HAVE_FMRADIO_IN |
174 | 170 | ||
diff --git a/firmware/export/config.h b/firmware/export/config.h index adc03d54f8..bb1c5eab19 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h | |||
@@ -403,6 +403,11 @@ Lyre prototype 1 */ | |||
403 | /* no known platform */ | 403 | /* no known platform */ |
404 | #endif | 404 | #endif |
405 | 405 | ||
406 | /* keep this include after the target configs */ | ||
407 | #ifdef SIMULATOR | ||
408 | #include "config-sim.h" | ||
409 | #endif | ||
410 | |||
406 | /* setup basic macros from capability masks */ | 411 | /* setup basic macros from capability masks */ |
407 | #include "config_caps.h" | 412 | #include "config_caps.h" |
408 | 413 | ||