From be40427baeacb88e27a4d8117addd60ca1fbc4c7 Mon Sep 17 00:00:00 2001 From: Marcoen Hirschberg Date: Thu, 27 Mar 2008 10:58:36 +0000 Subject: use HAVE_ATA to decide if ata.c should be compiled git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16842 a1c6a512-1295-4272-9138-f99709370657 --- firmware/SOURCES | 2 +- firmware/export/config-creativezvm.h | 3 +++ firmware/export/config-fmrecorder.h | 3 +++ firmware/export/config-gigabeat-s.h | 3 +++ firmware/export/config-gigabeat.h | 3 +++ firmware/export/config-h10.h | 3 +++ firmware/export/config-h100.h | 3 +++ firmware/export/config-h10_5gb.h | 3 +++ firmware/export/config-h120.h | 3 +++ firmware/export/config-h300.h | 3 +++ firmware/export/config-iaudiom3.h | 3 +++ firmware/export/config-iaudiom5.h | 3 +++ firmware/export/config-iaudiox5.h | 3 +++ firmware/export/config-ipod1g2g.h | 3 +++ firmware/export/config-ipod3g.h | 3 +++ firmware/export/config-ipod4g.h | 3 +++ firmware/export/config-ipodcolor.h | 3 +++ firmware/export/config-ipodmini.h | 3 +++ firmware/export/config-ipodmini2g.h | 3 +++ firmware/export/config-ipodnano.h | 3 +++ firmware/export/config-ipodvideo.h | 3 +++ firmware/export/config-mrobe100.h | 3 +++ firmware/export/config-mrobe500.h | 3 +++ firmware/export/config-player.h | 3 +++ firmware/export/config-recorder.h | 3 +++ firmware/export/config-recorderv2.h | 3 +++ firmware/export/config-tpj1022.h | 3 +++ 27 files changed, 79 insertions(+), 1 deletion(-) diff --git a/firmware/SOURCES b/firmware/SOURCES index 699460e0ec..8fe5661759 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES @@ -114,7 +114,7 @@ drivers/ata_mmc.c #ifdef HAVE_FLASH_DISK drivers/ata_flash.c #else /* !HAVE_FLASH_DISK */ -#if !defined(SANSA_E200) && !defined(SANSA_C200) && !defined(LOGIK_DAX) && !defined(IAUDIO_7) && !defined(COWON_D2) +#ifdef HAVE_ATA drivers/ata.c #endif /* SANSA_E200 */ #endif /* HAVE_FLASH_DISK */ diff --git a/firmware/export/config-creativezvm.h b/firmware/export/config-creativezvm.h index be393f62b7..0b91510146 100644 --- a/firmware/export/config-creativezvm.h +++ b/firmware/export/config-creativezvm.h @@ -29,6 +29,9 @@ /* For Rolo and boot loader */ #define MODEL_NUMBER 35 +/* define this if you use an ATA controller */ +#define HAVE_ATA + /* define this if you have a bitmap LCD display */ #define HAVE_LCD_BITMAP diff --git a/firmware/export/config-fmrecorder.h b/firmware/export/config-fmrecorder.h index 170bd27041..fd5b0e16bd 100644 --- a/firmware/export/config-fmrecorder.h +++ b/firmware/export/config-fmrecorder.h @@ -1,3 +1,6 @@ +/* define this if you use an ATA controller */ +#define HAVE_ATA + /* define this if you have recording possibility */ #define HAVE_RECORDING diff --git a/firmware/export/config-gigabeat-s.h b/firmware/export/config-gigabeat-s.h index ae85908994..970a882069 100644 --- a/firmware/export/config-gigabeat-s.h +++ b/firmware/export/config-gigabeat-s.h @@ -10,6 +10,9 @@ /* For Rolo and boot loader */ #define MODEL_NUMBER 21 +/* define this if you use an ATA controller */ +#define HAVE_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 70664262d8..a100a6a724 100644 --- a/firmware/export/config-gigabeat.h +++ b/firmware/export/config-gigabeat.h @@ -8,6 +8,9 @@ /* For Rolo and boot loader */ #define MODEL_NUMBER 18 +/* define this if you use an ATA controller */ +#define HAVE_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 c69b433503..f46eb76b5a 100644 --- a/firmware/export/config-h10.h +++ b/firmware/export/config-h10.h @@ -8,6 +8,9 @@ #define MODEL_NUMBER 13 #define MODEL_NAME "iriver H10 20GB" +/* define this if you use an ATA controller */ +#define HAVE_ATA + /* define this if you have recording possibility */ #define HAVE_RECORDING /* Define bitmask of input sources - recordable bitmask can be defined diff --git a/firmware/export/config-h100.h b/firmware/export/config-h100.h index 0ecc3a8139..987f9a686e 100644 --- a/firmware/export/config-h100.h +++ b/firmware/export/config-h100.h @@ -12,6 +12,9 @@ /* For Rolo and boot loader */ #define MODEL_NUMBER 1 +/* define this if you use an ATA controller */ +#define HAVE_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 efb62c03fb..e7c77e4f4d 100644 --- a/firmware/export/config-h10_5gb.h +++ b/firmware/export/config-h10_5gb.h @@ -8,6 +8,9 @@ #define MODEL_NUMBER 14 #define MODEL_NAME "iriver H10 5/6GB" +/* define this if you use an ATA controller */ +#define HAVE_ATA + /* define this if you have recording possibility */ #define HAVE_RECORDING /* Define bitmask of input sources - recordable bitmask can be defined diff --git a/firmware/export/config-h120.h b/firmware/export/config-h120.h index a7e31c341b..afb848898c 100644 --- a/firmware/export/config-h120.h +++ b/firmware/export/config-h120.h @@ -7,6 +7,9 @@ /* For Rolo and boot loader */ #define MODEL_NUMBER 0 +/* define this if you use an ATA controller */ +#define HAVE_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 de478aa163..c9b473a2f3 100644 --- a/firmware/export/config-h300.h +++ b/firmware/export/config-h300.h @@ -7,6 +7,9 @@ /* For Rolo and boot loader */ #define MODEL_NUMBER 2 +/* define this if you use an ATA controller */ +#define HAVE_ATA + /* define this if you have a bitmap LCD display */ #define HAVE_LCD_BITMAP diff --git a/firmware/export/config-iaudiom3.h b/firmware/export/config-iaudiom3.h index 67415b8d19..1541f7cee5 100644 --- a/firmware/export/config-iaudiom3.h +++ b/firmware/export/config-iaudiom3.h @@ -6,6 +6,9 @@ /* For Rolo and boot loader */ #define MODEL_NUMBER 25 +/* define this if you use an ATA controller */ +#define HAVE_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 9330315305..e54fb15231 100644 --- a/firmware/export/config-iaudiom5.h +++ b/firmware/export/config-iaudiom5.h @@ -6,6 +6,9 @@ /* For Rolo and boot loader */ #define MODEL_NUMBER 17 +/* define this if you use an ATA controller */ +#define HAVE_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 d6fe68b1ac..370d4fcd9a 100644 --- a/firmware/export/config-iaudiox5.h +++ b/firmware/export/config-iaudiox5.h @@ -6,6 +6,9 @@ /* For Rolo and boot loader */ #define MODEL_NUMBER 10 +/* define this if you use an ATA controller */ +#define HAVE_ATA + /* define this if you have recording possibility */ #define HAVE_RECORDING diff --git a/firmware/export/config-ipod1g2g.h b/firmware/export/config-ipod1g2g.h index a1a01a55ee..6781fe608f 100644 --- a/firmware/export/config-ipod1g2g.h +++ b/firmware/export/config-ipod1g2g.h @@ -8,6 +8,9 @@ /* For Rolo and boot loader */ #define MODEL_NUMBER 19 +/* define this if you use an ATA controller */ +#define HAVE_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 ed0a557299..4644a823a0 100644 --- a/firmware/export/config-ipod3g.h +++ b/firmware/export/config-ipod3g.h @@ -9,6 +9,9 @@ /* For Rolo and boot loader */ #define MODEL_NUMBER 7 +/* define this if you use an ATA controller */ +#define HAVE_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 ce2831f848..133b68257b 100644 --- a/firmware/export/config-ipod4g.h +++ b/firmware/export/config-ipod4g.h @@ -8,6 +8,9 @@ /* For Rolo and boot loader */ #define MODEL_NUMBER 8 +/* define this if you use an ATA controller */ +#define HAVE_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 3a9303a3be..5823af17bf 100644 --- a/firmware/export/config-ipodcolor.h +++ b/firmware/export/config-ipodcolor.h @@ -8,6 +8,9 @@ /* For Rolo and boot loader */ #define MODEL_NUMBER 3 +/* define this if you use an ATA controller */ +#define HAVE_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 f38de3e352..34632fa6a4 100644 --- a/firmware/export/config-ipodmini.h +++ b/firmware/export/config-ipodmini.h @@ -8,6 +8,9 @@ /* For Rolo and boot loader */ #define MODEL_NUMBER 9 /* TODO: change to 9 */ +/* define this if you use an ATA controller */ +#define HAVE_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 567ee0b361..124d0db772 100644 --- a/firmware/export/config-ipodmini2g.h +++ b/firmware/export/config-ipodmini2g.h @@ -8,6 +8,9 @@ /* For Rolo and boot loader */ #define MODEL_NUMBER 11 +/* define this if you use an ATA controller */ +#define HAVE_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 149e04d8f2..6a47247d21 100644 --- a/firmware/export/config-ipodnano.h +++ b/firmware/export/config-ipodnano.h @@ -8,6 +8,9 @@ /* For Rolo and boot loader */ #define MODEL_NUMBER 4 +/* define this if you use an ATA controller */ +#define HAVE_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 2013a8bb67..364ae65d3f 100644 --- a/firmware/export/config-ipodvideo.h +++ b/firmware/export/config-ipodvideo.h @@ -8,6 +8,9 @@ /* For Rolo and boot loader */ #define MODEL_NUMBER 5 +/* define this if you use an ATA controller */ +#define HAVE_ATA + /* define this if you have recording possibility */ #define HAVE_RECORDING diff --git a/firmware/export/config-mrobe100.h b/firmware/export/config-mrobe100.h index 570ca8505c..4ce2ab56bf 100644 --- a/firmware/export/config-mrobe100.h +++ b/firmware/export/config-mrobe100.h @@ -10,6 +10,9 @@ #define MODEL_NUMBER 23 #define MODEL_NAME "Olympus m:robe MR-100" +/* define this if you use an ATA controller */ +#define HAVE_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 53fc942856..44a5868b73 100644 --- a/firmware/export/config-mrobe500.h +++ b/firmware/export/config-mrobe500.h @@ -29,6 +29,9 @@ /* For Rolo and boot loader */ #define MODEL_NUMBER 22 +/* define this if you use an ATA controller */ +#define HAVE_ATA + /* define this if you have a bitmap LCD display */ #define HAVE_LCD_BITMAP diff --git a/firmware/export/config-player.h b/firmware/export/config-player.h index b9e3035951..94d5edf451 100644 --- a/firmware/export/config-player.h +++ b/firmware/export/config-player.h @@ -1,3 +1,6 @@ +/* define this if you use an ATA controller */ +#define HAVE_ATA + /* define this if you have a charcell LCD display */ #define HAVE_LCD_CHARCELLS diff --git a/firmware/export/config-recorder.h b/firmware/export/config-recorder.h index a5de2a809c..63b2d7b089 100644 --- a/firmware/export/config-recorder.h +++ b/firmware/export/config-recorder.h @@ -1,3 +1,6 @@ +/* define this if you use an ATA controller */ +#define HAVE_ATA + /* define this if you have recording possibility */ #define HAVE_RECORDING diff --git a/firmware/export/config-recorderv2.h b/firmware/export/config-recorderv2.h index f15879e41b..82f7e01541 100644 --- a/firmware/export/config-recorderv2.h +++ b/firmware/export/config-recorderv2.h @@ -1,3 +1,6 @@ +/* define this if you use an ATA controller */ +#define HAVE_ATA + /* define this if you have recording possibility */ #define HAVE_RECORDING diff --git a/firmware/export/config-tpj1022.h b/firmware/export/config-tpj1022.h index 067bb4f6f2..5a633ecee1 100644 --- a/firmware/export/config-tpj1022.h +++ b/firmware/export/config-tpj1022.h @@ -7,6 +7,9 @@ /* For Rolo and boot loader */ #define MODEL_NUMBER 15 +/* define this if you use an ATA controller */ +#define HAVE_ATA + /* define this if you have recording possibility */ /*#define HAVE_RECORDING*/ /* TODO: add support for this */ -- cgit v1.2.3