From 19d1cacb1a63c306d842f81127d382512c49a062 Mon Sep 17 00:00:00 2001 From: Frank Gevaerts Date: Fri, 31 Oct 2008 21:25:04 +0000 Subject: cleanup storage defines git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18950 a1c6a512-1295-4272-9138-f99709370657 --- firmware/export/ata_idle_notify.h | 3 ++- firmware/export/config-c100.h | 4 ++++ firmware/export/config-c200.h | 2 +- firmware/export/config-clip.h | 2 +- firmware/export/config-cowond2.h | 4 ++++ firmware/export/config-creativezv.h | 2 +- firmware/export/config-creativezvm.h | 2 +- firmware/export/config-creativezvm60gb.h | 2 +- firmware/export/config-e200.h | 2 +- firmware/export/config-e200v2.h | 2 +- firmware/export/config-fmrecorder.h | 2 +- firmware/export/config-gigabeat-s.h | 2 +- firmware/export/config-gigabeat.h | 2 +- firmware/export/config-h10.h | 2 +- firmware/export/config-h100.h | 2 +- firmware/export/config-h10_5gb.h | 2 +- firmware/export/config-h120.h | 2 +- firmware/export/config-h300.h | 2 +- firmware/export/config-hdd1630.h | 2 +- firmware/export/config-iaudio7.h | 4 ++++ firmware/export/config-iaudiom3.h | 2 +- firmware/export/config-iaudiom5.h | 2 +- firmware/export/config-iaudiox5.h | 2 +- firmware/export/config-ifp7xx.h | 6 +++--- firmware/export/config-ipod1g2g.h | 2 +- firmware/export/config-ipod3g.h | 2 +- firmware/export/config-ipod4g.h | 2 +- firmware/export/config-ipodcolor.h | 2 +- firmware/export/config-ipodmini.h | 2 +- firmware/export/config-ipodmini2g.h | 2 +- firmware/export/config-ipodnano.h | 2 +- firmware/export/config-ipodvideo.h | 2 +- firmware/export/config-logikdax.h | 4 ++++ firmware/export/config-m200.h | 4 ++++ firmware/export/config-mrobe100.h | 2 +- firmware/export/config-mrobe500.h | 2 +- firmware/export/config-ondavx747.h | 2 +- firmware/export/config-ondavx767.h | 2 +- firmware/export/config-ondiofm.h | 2 +- firmware/export/config-ondiosp.h | 2 +- firmware/export/config-player.h | 2 +- firmware/export/config-recorder.h | 2 +- firmware/export/config-recorderv2.h | 2 +- firmware/export/config-sa9200.h | 2 +- firmware/export/config-tpj1022.h | 2 +- firmware/export/config.h | 11 +++++++++-- firmware/export/hotswap.h | 4 ++-- firmware/export/powermgmt.h | 4 ++-- 48 files changed, 76 insertions(+), 48 deletions(-) (limited to 'firmware/export') diff --git a/firmware/export/ata_idle_notify.h b/firmware/export/ata_idle_notify.h index cfbba6f13d..aea2c92b06 100644 --- a/firmware/export/ata_idle_notify.h +++ b/firmware/export/ata_idle_notify.h @@ -44,7 +44,8 @@ enum { }; #define USING_ATA_CALLBACK !defined(SIMULATOR) \ - && !defined(HAVE_FLASH_DISK) \ + && ! ((CONFIG_STORAGE & STORAGE_NAND) \ + && (CONFIG_NAND & NAND_IFP7XX)) \ && !defined(BOOTLOADER) typedef bool (*ata_idle_notify)(void); diff --git a/firmware/export/config-c100.h b/firmware/export/config-c100.h index 5bf0fc83a6..9a2664202a 100644 --- a/firmware/export/config-c100.h +++ b/firmware/export/config-c100.h @@ -120,4 +120,8 @@ #define BOOTFILE "rockbox." BOOTFILE_EXT #define BOOTDIR "/" +#define CONFIG_STORAGE STORAGE_NAND + +#define CONFIG_NAND NAND_TCC + #endif /* SIMULATOR */ diff --git a/firmware/export/config-c200.h b/firmware/export/config-c200.h index 9a9198ee05..a96b9c7ef8 100644 --- a/firmware/export/config-c200.h +++ b/firmware/export/config-c200.h @@ -115,7 +115,7 @@ #define HAVE_FLASH_STORAGE /* define this if the flash memory uses the SecureDigital Memory Card protocol */ -#define HAVE_ATA_SD +#define CONFIG_STORAGE STORAGE_SD #define BATTERY_CAPACITY_DEFAULT 530 /* default battery capacity */ #define BATTERY_CAPACITY_MIN 530 /* min. capacity selectable */ diff --git a/firmware/export/config-clip.h b/firmware/export/config-clip.h index 01a08f3886..591ec1012a 100644 --- a/firmware/export/config-clip.h +++ b/firmware/export/config-clip.h @@ -95,7 +95,7 @@ #define HAVE_FLASH_STORAGE /* define this if the flash memory uses the SecureDigital Memory Card protocol */ -#define HAVE_ATA_SD +#define CONFIG_STORAGE STORAGE_SD #define BATTERY_CAPACITY_DEFAULT 750 /* default battery capacity */ #define BATTERY_CAPACITY_MIN 750 /* min. capacity selectable */ diff --git a/firmware/export/config-cowond2.h b/firmware/export/config-cowond2.h index d136caefb2..749eb0b882 100644 --- a/firmware/export/config-cowond2.h +++ b/firmware/export/config-cowond2.h @@ -145,4 +145,8 @@ #define BOOTFILE "rockbox." BOOTFILE_EXT #define BOOTDIR "/.rockbox" +#define CONFIG_STORAGE STORAGE_NAND + +#define CONFIG_NAND NAND_TCC + #endif /* SIMULATOR */ diff --git a/firmware/export/config-creativezv.h b/firmware/export/config-creativezv.h index e9cc2685b6..5f0336e538 100644 --- a/firmware/export/config-creativezv.h +++ b/firmware/export/config-creativezv.h @@ -37,7 +37,7 @@ #define MODEL_NUMBER 28 /* define this if you use an ATA controller */ -#define HAVE_ATA +#define CONFIG_STORAGE STORAGE_ATA /* define this if you have a bitmap LCD display */ #define HAVE_LCD_BITMAP diff --git a/firmware/export/config-creativezvm.h b/firmware/export/config-creativezvm.h index ec21500296..ea3cc871a5 100644 --- a/firmware/export/config-creativezvm.h +++ b/firmware/export/config-creativezvm.h @@ -37,7 +37,7 @@ #define MODEL_NUMBER 26 /* define this if you use an ATA controller */ -#define HAVE_ATA +#define CONFIG_STORAGE STORAGE_ATA /* define this if you have a bitmap LCD display */ #define HAVE_LCD_BITMAP diff --git a/firmware/export/config-creativezvm60gb.h b/firmware/export/config-creativezvm60gb.h index d1e1d80889..a0cf2ba918 100644 --- a/firmware/export/config-creativezvm60gb.h +++ b/firmware/export/config-creativezvm60gb.h @@ -37,7 +37,7 @@ #define MODEL_NUMBER 27 /* define this if you use an ATA controller */ -#define HAVE_ATA +#define CONFIG_STORAGE STORAGE_ATA /* define this if you have a bitmap LCD display */ #define HAVE_LCD_BITMAP diff --git a/firmware/export/config-e200.h b/firmware/export/config-e200.h index 745aa71735..075f490ee4 100644 --- a/firmware/export/config-e200.h +++ b/firmware/export/config-e200.h @@ -112,7 +112,7 @@ #define HAVE_FLASH_STORAGE /* define this if the flash memory uses the SecureDigital Memory Card protocol */ -#define HAVE_ATA_SD +#define CONFIG_STORAGE STORAGE_SD #define BATTERY_CAPACITY_DEFAULT 750 /* default battery capacity */ #define BATTERY_CAPACITY_MIN 750 /* min. capacity selectable */ diff --git a/firmware/export/config-e200v2.h b/firmware/export/config-e200v2.h index 0dc87d4123..c51bac0a9f 100644 --- a/firmware/export/config-e200v2.h +++ b/firmware/export/config-e200v2.h @@ -115,7 +115,7 @@ #define HAVE_FLASH_STORAGE /* define this if the flash memory uses the SecureDigital Memory Card protocol */ -#define HAVE_ATA_SD +#define CONFIG_STORAGE STORAGE_SD #define BATTERY_CAPACITY_DEFAULT 750 /* default battery capacity */ #define BATTERY_CAPACITY_MIN 750 /* min. capacity selectable */ diff --git a/firmware/export/config-fmrecorder.h b/firmware/export/config-fmrecorder.h index 1908f6a29d..716bc98e09 100644 --- a/firmware/export/config-fmrecorder.h +++ b/firmware/export/config-fmrecorder.h @@ -1,5 +1,5 @@ /* define this if you use an ATA controller */ -#define HAVE_ATA +#define CONFIG_STORAGE STORAGE_ATA #define MODEL_NAME "Archos FM Recorder" diff --git a/firmware/export/config-gigabeat-s.h b/firmware/export/config-gigabeat-s.h index 7f36bce7dd..007fd7d2f4 100644 --- a/firmware/export/config-gigabeat-s.h +++ b/firmware/export/config-gigabeat-s.h @@ -13,7 +13,7 @@ #define MODEL_NUMBER 21 /* define this if you use an ATA controller */ -#define HAVE_ATA +#define CONFIG_STORAGE STORAGE_ATA /* define this if you have a bitmap LCD display */ #define HAVE_LCD_BITMAP diff --git a/firmware/export/config-gigabeat.h b/firmware/export/config-gigabeat.h index f4910bfcb0..0c5462400b 100644 --- a/firmware/export/config-gigabeat.h +++ b/firmware/export/config-gigabeat.h @@ -11,7 +11,7 @@ #define MODEL_NUMBER 18 /* define this if you use an ATA controller */ -#define HAVE_ATA +#define CONFIG_STORAGE STORAGE_ATA /* define this if you have a bitmap LCD display */ #define HAVE_LCD_BITMAP diff --git a/firmware/export/config-h10.h b/firmware/export/config-h10.h index 8504ffd25a..2056fd4fcf 100644 --- a/firmware/export/config-h10.h +++ b/firmware/export/config-h10.h @@ -9,7 +9,7 @@ #define MODEL_NAME "iriver H10 20GB" /* define this if you use an ATA controller */ -#define HAVE_ATA +#define CONFIG_STORAGE STORAGE_ATA /* define this if you have recording possibility */ #define HAVE_RECORDING diff --git a/firmware/export/config-h100.h b/firmware/export/config-h100.h index 641709f639..9c327f11fd 100644 --- a/firmware/export/config-h100.h +++ b/firmware/export/config-h100.h @@ -15,7 +15,7 @@ #define MODEL_NUMBER 1 /* define this if you use an ATA controller */ -#define HAVE_ATA +#define CONFIG_STORAGE STORAGE_ATA /* define this if you have a bitmap LCD display */ #define HAVE_LCD_BITMAP diff --git a/firmware/export/config-h10_5gb.h b/firmware/export/config-h10_5gb.h index fa1e37229a..40acdc6efe 100644 --- a/firmware/export/config-h10_5gb.h +++ b/firmware/export/config-h10_5gb.h @@ -9,7 +9,7 @@ #define MODEL_NAME "iriver H10 5/6GB" /* define this if you use an ATA controller */ -#define HAVE_ATA +#define CONFIG_STORAGE STORAGE_ATA /* define this if you have recording possibility */ #define HAVE_RECORDING diff --git a/firmware/export/config-h120.h b/firmware/export/config-h120.h index 6177347664..d81fa07d93 100644 --- a/firmware/export/config-h120.h +++ b/firmware/export/config-h120.h @@ -10,7 +10,7 @@ #define MODEL_NUMBER 0 /* define this if you use an ATA controller */ -#define HAVE_ATA +#define CONFIG_STORAGE STORAGE_ATA /* define this if you have a bitmap LCD display */ #define HAVE_LCD_BITMAP diff --git a/firmware/export/config-h300.h b/firmware/export/config-h300.h index 0b305747cf..f45b694fe0 100644 --- a/firmware/export/config-h300.h +++ b/firmware/export/config-h300.h @@ -10,7 +10,7 @@ #define MODEL_NUMBER 2 /* define this if you use an ATA controller */ -#define HAVE_ATA +#define CONFIG_STORAGE STORAGE_ATA /* define this if you have a bitmap LCD display */ #define HAVE_LCD_BITMAP diff --git a/firmware/export/config-hdd1630.h b/firmware/export/config-hdd1630.h index 810902e487..7ee3f11355 100755 --- a/firmware/export/config-hdd1630.h +++ b/firmware/export/config-hdd1630.h @@ -9,7 +9,7 @@ #define MODEL_NAME "Philips GoGear HDD1630" /* define this if you use an ATA controller */ -#define HAVE_ATA +#define CONFIG_STORAGE STORAGE_ATA /* define this if you have recording possibility */ /* #define HAVE_RECORDING */ diff --git a/firmware/export/config-iaudio7.h b/firmware/export/config-iaudio7.h index cce357ec4b..ca6212d305 100644 --- a/firmware/export/config-iaudio7.h +++ b/firmware/export/config-iaudio7.h @@ -155,6 +155,10 @@ #define BOOTFILE "rockbox." BOOTFILE_EXT #define BOOTDIR "/" +#define CONFIG_STORAGE STORAGE_NAND + +#define CONFIG_NAND NAND_TCC + #ifdef BOOTLOADER #define TCCBOOT #endif diff --git a/firmware/export/config-iaudiom3.h b/firmware/export/config-iaudiom3.h index 8ebd5cb8b6..f4ced651d0 100644 --- a/firmware/export/config-iaudiom3.h +++ b/firmware/export/config-iaudiom3.h @@ -9,7 +9,7 @@ #define MODEL_NAME "iAudio M3" /* define this if you use an ATA controller */ -#define HAVE_ATA +#define CONFIG_STORAGE STORAGE_ATA /* define this if you have recording possibility */ #define HAVE_RECORDING diff --git a/firmware/export/config-iaudiom5.h b/firmware/export/config-iaudiom5.h index 027ffb61e5..5ec6b77862 100644 --- a/firmware/export/config-iaudiom5.h +++ b/firmware/export/config-iaudiom5.h @@ -9,7 +9,7 @@ #define MODEL_NAME "iAudio M5" /* define this if you use an ATA controller */ -#define HAVE_ATA +#define CONFIG_STORAGE STORAGE_ATA /* define this if you have recording possibility */ #define HAVE_RECORDING diff --git a/firmware/export/config-iaudiox5.h b/firmware/export/config-iaudiox5.h index 5ea3dcd73c..cdae55af4f 100644 --- a/firmware/export/config-iaudiox5.h +++ b/firmware/export/config-iaudiox5.h @@ -9,7 +9,7 @@ #define MODEL_NAME "iAudio X5" /* define this if you use an ATA controller */ -#define HAVE_ATA +#define CONFIG_STORAGE STORAGE_ATA /* define this if you have recording possibility */ #define HAVE_RECORDING diff --git a/firmware/export/config-ifp7xx.h b/firmware/export/config-ifp7xx.h index 6e6f9f4097..6a26a93da2 100644 --- a/firmware/export/config-ifp7xx.h +++ b/firmware/export/config-ifp7xx.h @@ -31,7 +31,9 @@ #define CONFIG_KEYPAD IRIVER_IFP7XX_PAD -#define CONFIG_FLASH FLASH_IFP7XX +#define CONFIG_STORAGE STORAGE_NAND + +#define CONFIG_NAND NAND_IFP7XX #define HAVE_FAT16SUPPORT @@ -50,8 +52,6 @@ /* Define this if you have the WM8975 audio codec */ /* #define HAVE_WM8975 */ -#define HAVE_FLASH_DISK - /* Virtual LED (icon) */ #define CONFIG_LED LED_VIRTUAL diff --git a/firmware/export/config-ipod1g2g.h b/firmware/export/config-ipod1g2g.h index ae810b14cb..4308d9c66c 100644 --- a/firmware/export/config-ipod1g2g.h +++ b/firmware/export/config-ipod1g2g.h @@ -11,7 +11,7 @@ #define MODEL_NUMBER 19 /* define this if you use an ATA controller */ -#define HAVE_ATA +#define CONFIG_STORAGE STORAGE_ATA /* define this if you have recording possibility #define HAVE_RECORDING */ diff --git a/firmware/export/config-ipod3g.h b/firmware/export/config-ipod3g.h index 3ca95c375c..f1550576d2 100644 --- a/firmware/export/config-ipod3g.h +++ b/firmware/export/config-ipod3g.h @@ -12,7 +12,7 @@ #define MODEL_NUMBER 7 /* define this if you use an ATA controller */ -#define HAVE_ATA +#define CONFIG_STORAGE STORAGE_ATA /* define this if you have recording possibility */ /*#define HAVE_RECORDING*/ diff --git a/firmware/export/config-ipod4g.h b/firmware/export/config-ipod4g.h index 4f0045fee8..4a2207d1d6 100644 --- a/firmware/export/config-ipod4g.h +++ b/firmware/export/config-ipod4g.h @@ -11,7 +11,7 @@ #define MODEL_NUMBER 8 /* define this if you use an ATA controller */ -#define HAVE_ATA +#define CONFIG_STORAGE STORAGE_ATA /* define this if you have recording possibility */ #define HAVE_RECORDING diff --git a/firmware/export/config-ipodcolor.h b/firmware/export/config-ipodcolor.h index d23a03a00b..47b7a4eacf 100644 --- a/firmware/export/config-ipodcolor.h +++ b/firmware/export/config-ipodcolor.h @@ -11,7 +11,7 @@ #define MODEL_NUMBER 3 /* define this if you use an ATA controller */ -#define HAVE_ATA +#define CONFIG_STORAGE STORAGE_ATA /* define this if you have recording possibility */ #define HAVE_RECORDING diff --git a/firmware/export/config-ipodmini.h b/firmware/export/config-ipodmini.h index 8477e497b4..c2d6376706 100644 --- a/firmware/export/config-ipodmini.h +++ b/firmware/export/config-ipodmini.h @@ -11,7 +11,7 @@ #define MODEL_NUMBER 9 /* define this if you use an ATA controller */ -#define HAVE_ATA +#define CONFIG_STORAGE STORAGE_ATA /* define this if you have recording possibility */ /*#define HAVE_RECORDING*/ diff --git a/firmware/export/config-ipodmini2g.h b/firmware/export/config-ipodmini2g.h index 5e7bdb0d09..6d6ebf1a9a 100644 --- a/firmware/export/config-ipodmini2g.h +++ b/firmware/export/config-ipodmini2g.h @@ -11,7 +11,7 @@ #define MODEL_NUMBER 11 /* define this if you use an ATA controller */ -#define HAVE_ATA +#define CONFIG_STORAGE STORAGE_ATA /* define this if you have recording possibility */ /*#define HAVE_RECORDING*/ diff --git a/firmware/export/config-ipodnano.h b/firmware/export/config-ipodnano.h index 0750d55557..7d6515fc0f 100644 --- a/firmware/export/config-ipodnano.h +++ b/firmware/export/config-ipodnano.h @@ -11,7 +11,7 @@ #define MODEL_NUMBER 4 /* define this if you use an ATA controller */ -#define HAVE_ATA +#define CONFIG_STORAGE STORAGE_ATA /* define this if you have recording possibility */ #define HAVE_RECORDING diff --git a/firmware/export/config-ipodvideo.h b/firmware/export/config-ipodvideo.h index c7a248e532..fa6ddd304f 100644 --- a/firmware/export/config-ipodvideo.h +++ b/firmware/export/config-ipodvideo.h @@ -11,7 +11,7 @@ #define MODEL_NUMBER 5 /* define this if you use an ATA controller */ -#define HAVE_ATA +#define CONFIG_STORAGE STORAGE_ATA /* define this if you have recording possibility */ #define HAVE_RECORDING diff --git a/firmware/export/config-logikdax.h b/firmware/export/config-logikdax.h index f9ee4b94a0..160058ff7f 100644 --- a/firmware/export/config-logikdax.h +++ b/firmware/export/config-logikdax.h @@ -139,4 +139,8 @@ #define ICODE_ATTR_ALAC #define IBSS_ATTR_SHORTEN_DECODED0 +#define CONFIG_STORAGE STORAGE_NAND + +#define CONFIG_NAND NAND_TCC + #endif /* SIMULATOR */ diff --git a/firmware/export/config-m200.h b/firmware/export/config-m200.h index 2733ad577d..b3b71ee778 100644 --- a/firmware/export/config-m200.h +++ b/firmware/export/config-m200.h @@ -124,4 +124,8 @@ #define ICODE_ATTR_ALAC #define IBSS_ATTR_SHORTEN_DECODED0 +#define CONFIG_STORAGE STORAGE_NAND + +#define CONFIG_NAND NAND_TCC + #endif /* SIMULATOR */ diff --git a/firmware/export/config-mrobe100.h b/firmware/export/config-mrobe100.h index 99e7757af8..051f15824f 100644 --- a/firmware/export/config-mrobe100.h +++ b/firmware/export/config-mrobe100.h @@ -9,7 +9,7 @@ #define MODEL_NAME "Olympus m:robe MR-100" /* define this if you use an ATA controller */ -#define HAVE_ATA +#define CONFIG_STORAGE STORAGE_ATA /* define this if you have a bitmap LCD display */ #define HAVE_LCD_BITMAP diff --git a/firmware/export/config-mrobe500.h b/firmware/export/config-mrobe500.h index 8e20c9478c..572d018328 100644 --- a/firmware/export/config-mrobe500.h +++ b/firmware/export/config-mrobe500.h @@ -33,7 +33,7 @@ #define MODEL_NUMBER 22 /* define this if you use an ATA controller */ -#define HAVE_ATA +#define CONFIG_STORAGE STORAGE_ATA /* define this if you have a bitmap LCD display */ #define HAVE_LCD_BITMAP diff --git a/firmware/export/config-ondavx747.h b/firmware/export/config-ondavx747.h index 12deb9cf71..38bc5d7b01 100644 --- a/firmware/export/config-ondavx747.h +++ b/firmware/export/config-ondavx747.h @@ -34,7 +34,7 @@ #define MODEL_NUMBER 35 /* define this if you use an ATA controller */ -//#define HAVE_ATA +//#define CONFIG_STORAGE STORAGE_ATA /* define this if you have a bitmap LCD display */ #define HAVE_LCD_BITMAP diff --git a/firmware/export/config-ondavx767.h b/firmware/export/config-ondavx767.h index 9c2d237b01..bbead76137 100644 --- a/firmware/export/config-ondavx767.h +++ b/firmware/export/config-ondavx767.h @@ -34,7 +34,7 @@ #define MODEL_NUMBER 36 /* define this if you use an ATA controller */ -//#define HAVE_ATA +//#define CONFIG_STORAGE STORAGE_ATA /* define this if you have a bitmap LCD display */ #define HAVE_LCD_BITMAP diff --git a/firmware/export/config-ondiofm.h b/firmware/export/config-ondiofm.h index 8d3b040745..634433fcdb 100644 --- a/firmware/export/config-ondiofm.h +++ b/firmware/export/config-ondiofm.h @@ -106,7 +106,7 @@ #define HAVE_ONDIO_ADC /* Define this for MMC support instead of ATA harddisk */ -#define HAVE_MMC +#define CONFIG_STORAGE STORAGE_MMC /* Define this to support mounting FAT16 partitions */ #define HAVE_FAT16SUPPORT diff --git a/firmware/export/config-ondiosp.h b/firmware/export/config-ondiosp.h index fc99bf459d..3443b839b6 100644 --- a/firmware/export/config-ondiosp.h +++ b/firmware/export/config-ondiosp.h @@ -89,7 +89,7 @@ #define HAVE_ONDIO_ADC /* Define this for MMC support instead of ATA harddisk */ -#define HAVE_MMC +#define CONFIG_STORAGE STORAGE_MMC /* Define this to support mounting FAT16 partitions */ #define HAVE_FAT16SUPPORT diff --git a/firmware/export/config-player.h b/firmware/export/config-player.h index d94ca82735..9008212a17 100644 --- a/firmware/export/config-player.h +++ b/firmware/export/config-player.h @@ -1,5 +1,5 @@ /* define this if you use an ATA controller */ -#define HAVE_ATA +#define CONFIG_STORAGE STORAGE_ATA #define MODEL_NAME "Archos Player/Studio" diff --git a/firmware/export/config-recorder.h b/firmware/export/config-recorder.h index f6ddb88af6..e5fa3361cc 100644 --- a/firmware/export/config-recorder.h +++ b/firmware/export/config-recorder.h @@ -1,5 +1,5 @@ /* define this if you use an ATA controller */ -#define HAVE_ATA +#define CONFIG_STORAGE STORAGE_ATA #define MODEL_NAME "Archos Recorder" diff --git a/firmware/export/config-recorderv2.h b/firmware/export/config-recorderv2.h index 5d62ec464c..3244f19f1d 100644 --- a/firmware/export/config-recorderv2.h +++ b/firmware/export/config-recorderv2.h @@ -1,5 +1,5 @@ /* define this if you use an ATA controller */ -#define HAVE_ATA +#define CONFIG_STORAGE STORAGE_ATA #define MODEL_NAME "Archos Recorder v2" diff --git a/firmware/export/config-sa9200.h b/firmware/export/config-sa9200.h index 433e28db82..b9fd4575bc 100755 --- a/firmware/export/config-sa9200.h +++ b/firmware/export/config-sa9200.h @@ -94,7 +94,7 @@ #define HAVE_FLASH_STORAGE /* define this if the flash memory uses the SecureDigital Memory Card protocol */ -#define HAVE_ATA_SD +#define CONFIG_STORAGE STORAGE_SD #define BATTERY_CAPACITY_DEFAULT 750 /* default battery capacity */ #define BATTERY_CAPACITY_MIN 750 /* min. capacity selectable */ diff --git a/firmware/export/config-tpj1022.h b/firmware/export/config-tpj1022.h index 1b49e0ebb9..6cc85fdfc9 100644 --- a/firmware/export/config-tpj1022.h +++ b/firmware/export/config-tpj1022.h @@ -10,7 +10,7 @@ #define MODEL_NUMBER 15 /* define this if you use an ATA controller */ -#define HAVE_ATA +#define CONFIG_STORAGE STORAGE_ATA /* define this if you have recording possibility */ /*#define HAVE_RECORDING*/ /* TODO: add support for this */ diff --git a/firmware/export/config.h b/firmware/export/config.h index 01141f3866..c12f6ce4d2 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h @@ -28,6 +28,12 @@ /* symbolic names for multiple choice configurations: */ +/* CONFIG_STORAGE (note these are combineable bit-flags) */ +#define STORAGE_ATA 0x01 +#define STORAGE_MMC 0x02 +#define STORAGE_SD 0x04 +#define STORAGE_NAND 0x08 + /* CONFIG_TUNER (note these are combineable bit-flags) */ #define S1A0903X01 0x01 /* Samsung */ #define TEA5767 0x02 /* Philips */ @@ -180,8 +186,9 @@ #define LED_VIRTUAL 2 /* Virtual LED (icon) (Archos Ondio) */ /* else HW controlled LED (iRiver H1x0) */ -/* CONFIG_FLASH */ -#define FLASH_IFP7XX 1 +/* CONFIG_NAND */ +#define NAND_IFP7XX 1 +#define NAND_TCC 2 /* CONFIG_RTC */ #define RTC_M41ST84W 1 /* Archos Recorder */ diff --git a/firmware/export/hotswap.h b/firmware/export/hotswap.h index d01c467adf..6872ca86db 100644 --- a/firmware/export/hotswap.h +++ b/firmware/export/hotswap.h @@ -41,14 +41,14 @@ typedef struct unsigned int blocksize; /* block size in bytes */ } tCardInfo; -#ifdef HAVE_ATA_SD +#if (CONFIG_STORAGE & STORAGE_SD) #include "ata-sd-target.h" #define card_detect card_detect_target #define card_get_info card_get_info_target #ifdef HAVE_HOTSWAP #define card_enable_monitoring card_enable_monitoring_target #endif -#else /* HAVE_MMC */ +#else /* STORAGE_MMC */ #include "ata_mmc.h" #define card_detect mmc_detect #define card_get_info mmc_card_info diff --git a/firmware/export/powermgmt.h b/firmware/export/powermgmt.h index acdee22a12..70c4b70d7a 100644 --- a/firmware/export/powermgmt.h +++ b/firmware/export/powermgmt.h @@ -142,7 +142,7 @@ extern int trickle_sec; /* trickle charge: How many seconds per minute #define CURRENT_USB 500 /* usual current in mA in USB mode */ #ifdef HAVE_REMOTE_LCD # define CURRENT_REMOTE 8 /* add. current when H100-remote connected */ -#endif /* HAVE_MMC */ +#endif /* HAVE_REMOTE_LCD */ # define CURRENT_MIN_CHG 70 /* minimum charge current */ # define MIN_CHG_V 8500 /* at 8.5v charger voltage get CURRENT_MIN_CHG */ @@ -152,7 +152,7 @@ extern int trickle_sec; /* trickle charge: How many seconds per minute # define CURRENT_MAX_CHG 350 /* maximum charging current */ # endif # define MAX_CHG_V 10250 /* anything over 10.25v gives CURRENT_MAX_CHG */ -#endif /* not HAVE_MMC */ +#endif /* not ONDIO */ extern unsigned short power_history[POWER_HISTORY_LEN]; extern const unsigned short battery_level_dangerous[BATTERY_TYPES_COUNT]; -- cgit v1.2.3