diff options
| author | Miika Pekkarinen <miipekk@ihme.org> | 2005-11-19 10:09:06 +0000 |
|---|---|---|
| committer | Miika Pekkarinen <miipekk@ihme.org> | 2005-11-19 10:09:06 +0000 |
| commit | b2a99528e3c32ba060fb340a75422ee4b498c160 (patch) | |
| tree | 6145a9e0d04a59352982a5a1c61acd2fa6cea504 | |
| parent | 354a00627e530bd854e57126f28c67b77dfd52b6 (diff) | |
| download | rockbox-b2a99528e3c32ba060fb340a75422ee4b498c160.zip rockbox-b2a99528e3c32ba060fb340a75422ee4b498c160.tar.gz rockbox-b2a99528e3c32ba060fb340a75422ee4b498c160.tar.bz2 rockbox-b2a99528e3c32ba060fb340a75422ee4b498c160.tar.xz | |
Removed the separate #ifndef SIMULATOR defines.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7989 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | firmware/export/config-h100.h | 6 | ||||
| -rw-r--r-- | firmware/export/config-h120.h | 14 |
2 files changed, 9 insertions, 11 deletions
diff --git a/firmware/export/config-h100.h b/firmware/export/config-h100.h index b9336a7..ef13380 100644 --- a/firmware/export/config-h100.h +++ b/firmware/export/config-h100.h @@ -35,9 +35,6 @@ /* Define this if you have an remote lcd */ #define HAVE_REMOTE_LCD -#ifndef SIMULATOR -#define HAVE_REMOTE_LCD_TICKING -#endif #define CONFIG_LCD LCD_S1D15E06 @@ -63,6 +60,9 @@ /* Define this if you want to use coldfire's i2c interface */ #define CONFIG_I2C I2C_COLDFIRE +/* Define if we have a hardware defect that causes ticking on the audio line */ +#define HAVE_REMOTE_LCD_TICKING + /* Type of mobile power */ #define CONFIG_BATTERY BATT_LIPOL1300 diff --git a/firmware/export/config-h120.h b/firmware/export/config-h120.h index dc5e924..d67973c 100644 --- a/firmware/export/config-h120.h +++ b/firmware/export/config-h120.h @@ -6,11 +6,6 @@ /* For Rolo and boot loader */ #define MODEL_NUMBER 0 -/* define this if you have recording possibility */ -#ifndef SIMULATOR -#define HAVE_RECORDING 1 -#endif - /* define this if you have a bitmap LCD display */ #define HAVE_LCD_BITMAP 1 @@ -33,9 +28,6 @@ /* Define this if you have an remote lcd */ #define HAVE_REMOTE_LCD -#ifndef SIMULATOR -#define HAVE_REMOTE_LCD_TICKING -#endif #define CONFIG_LCD LCD_S1D15E06 @@ -65,6 +57,12 @@ #define BATTERY_SCALE_FACTOR 16665 /* FIX: this value is picked at random */ +/* define this if you have recording possibility */ +#define HAVE_RECORDING 1 + +/* Define if we have a hardware defect that causes ticking on the audio line */ +#define HAVE_REMOTE_LCD_TICKING + /* Define this if the platform can charge batteries */ #define HAVE_CHARGING 1 |