diff options
author | Marcoen Hirschberg <marcoen@gmail.com> | 2008-03-27 10:58:36 +0000 |
---|---|---|
committer | Marcoen Hirschberg <marcoen@gmail.com> | 2008-03-27 10:58:36 +0000 |
commit | be40427baeacb88e27a4d8117addd60ca1fbc4c7 (patch) | |
tree | 32b8f07d1800d44c7af52d6539232f6af0019573 | |
parent | 2364bc213c9dd58c9e4c3faee28b766482f4de8b (diff) | |
download | rockbox-be40427baeacb88e27a4d8117addd60ca1fbc4c7.tar.gz rockbox-be40427baeacb88e27a4d8117addd60ca1fbc4c7.zip |
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
27 files changed, 79 insertions, 1 deletions
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 | |||
114 | #ifdef HAVE_FLASH_DISK | 114 | #ifdef HAVE_FLASH_DISK |
115 | drivers/ata_flash.c | 115 | drivers/ata_flash.c |
116 | #else /* !HAVE_FLASH_DISK */ | 116 | #else /* !HAVE_FLASH_DISK */ |
117 | #if !defined(SANSA_E200) && !defined(SANSA_C200) && !defined(LOGIK_DAX) && !defined(IAUDIO_7) && !defined(COWON_D2) | 117 | #ifdef HAVE_ATA |
118 | drivers/ata.c | 118 | drivers/ata.c |
119 | #endif /* SANSA_E200 */ | 119 | #endif /* SANSA_E200 */ |
120 | #endif /* HAVE_FLASH_DISK */ | 120 | #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 @@ | |||
29 | /* For Rolo and boot loader */ | 29 | /* For Rolo and boot loader */ |
30 | #define MODEL_NUMBER 35 | 30 | #define MODEL_NUMBER 35 |
31 | 31 | ||
32 | /* define this if you use an ATA controller */ | ||
33 | #define HAVE_ATA | ||
34 | |||
32 | /* define this if you have a bitmap LCD display */ | 35 | /* define this if you have a bitmap LCD display */ |
33 | #define HAVE_LCD_BITMAP | 36 | #define HAVE_LCD_BITMAP |
34 | 37 | ||
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 @@ | |||
1 | /* define this if you use an ATA controller */ | ||
2 | #define HAVE_ATA | ||
3 | |||
1 | /* define this if you have recording possibility */ | 4 | /* define this if you have recording possibility */ |
2 | #define HAVE_RECORDING | 5 | #define HAVE_RECORDING |
3 | 6 | ||
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 @@ | |||
10 | /* For Rolo and boot loader */ | 10 | /* For Rolo and boot loader */ |
11 | #define MODEL_NUMBER 21 | 11 | #define MODEL_NUMBER 21 |
12 | 12 | ||
13 | /* define this if you use an ATA controller */ | ||
14 | #define HAVE_ATA | ||
15 | |||
13 | /* define this if you have a bitmap LCD display */ | 16 | /* define this if you have a bitmap LCD display */ |
14 | #define HAVE_LCD_BITMAP | 17 | #define HAVE_LCD_BITMAP |
15 | 18 | ||
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 @@ | |||
8 | /* For Rolo and boot loader */ | 8 | /* For Rolo and boot loader */ |
9 | #define MODEL_NUMBER 18 | 9 | #define MODEL_NUMBER 18 |
10 | 10 | ||
11 | /* define this if you use an ATA controller */ | ||
12 | #define HAVE_ATA | ||
13 | |||
11 | /* define this if you have a bitmap LCD display */ | 14 | /* define this if you have a bitmap LCD display */ |
12 | #define HAVE_LCD_BITMAP | 15 | #define HAVE_LCD_BITMAP |
13 | 16 | ||
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 @@ | |||
8 | #define MODEL_NUMBER 13 | 8 | #define MODEL_NUMBER 13 |
9 | #define MODEL_NAME "iriver H10 20GB" | 9 | #define MODEL_NAME "iriver H10 20GB" |
10 | 10 | ||
11 | /* define this if you use an ATA controller */ | ||
12 | #define HAVE_ATA | ||
13 | |||
11 | /* define this if you have recording possibility */ | 14 | /* define this if you have recording possibility */ |
12 | #define HAVE_RECORDING | 15 | #define HAVE_RECORDING |
13 | /* Define bitmask of input sources - recordable bitmask can be defined | 16 | /* 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 @@ | |||
12 | /* For Rolo and boot loader */ | 12 | /* For Rolo and boot loader */ |
13 | #define MODEL_NUMBER 1 | 13 | #define MODEL_NUMBER 1 |
14 | 14 | ||
15 | /* define this if you use an ATA controller */ | ||
16 | #define HAVE_ATA | ||
17 | |||
15 | /* define this if you have a bitmap LCD display */ | 18 | /* define this if you have a bitmap LCD display */ |
16 | #define HAVE_LCD_BITMAP | 19 | #define HAVE_LCD_BITMAP |
17 | 20 | ||
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 @@ | |||
8 | #define MODEL_NUMBER 14 | 8 | #define MODEL_NUMBER 14 |
9 | #define MODEL_NAME "iriver H10 5/6GB" | 9 | #define MODEL_NAME "iriver H10 5/6GB" |
10 | 10 | ||
11 | /* define this if you use an ATA controller */ | ||
12 | #define HAVE_ATA | ||
13 | |||
11 | /* define this if you have recording possibility */ | 14 | /* define this if you have recording possibility */ |
12 | #define HAVE_RECORDING | 15 | #define HAVE_RECORDING |
13 | /* Define bitmask of input sources - recordable bitmask can be defined | 16 | /* 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 @@ | |||
7 | /* For Rolo and boot loader */ | 7 | /* For Rolo and boot loader */ |
8 | #define MODEL_NUMBER 0 | 8 | #define MODEL_NUMBER 0 |
9 | 9 | ||
10 | /* define this if you use an ATA controller */ | ||
11 | #define HAVE_ATA | ||
12 | |||
10 | /* define this if you have a bitmap LCD display */ | 13 | /* define this if you have a bitmap LCD display */ |
11 | #define HAVE_LCD_BITMAP | 14 | #define HAVE_LCD_BITMAP |
12 | 15 | ||
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 @@ | |||
7 | /* For Rolo and boot loader */ | 7 | /* For Rolo and boot loader */ |
8 | #define MODEL_NUMBER 2 | 8 | #define MODEL_NUMBER 2 |
9 | 9 | ||
10 | /* define this if you use an ATA controller */ | ||
11 | #define HAVE_ATA | ||
12 | |||
10 | /* define this if you have a bitmap LCD display */ | 13 | /* define this if you have a bitmap LCD display */ |
11 | #define HAVE_LCD_BITMAP | 14 | #define HAVE_LCD_BITMAP |
12 | 15 | ||
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 @@ | |||
6 | /* For Rolo and boot loader */ | 6 | /* For Rolo and boot loader */ |
7 | #define MODEL_NUMBER 25 | 7 | #define MODEL_NUMBER 25 |
8 | 8 | ||
9 | /* define this if you use an ATA controller */ | ||
10 | #define HAVE_ATA | ||
11 | |||
9 | /* define this if you have recording possibility */ | 12 | /* define this if you have recording possibility */ |
10 | #define HAVE_RECORDING | 13 | #define HAVE_RECORDING |
11 | 14 | ||
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 @@ | |||
6 | /* For Rolo and boot loader */ | 6 | /* For Rolo and boot loader */ |
7 | #define MODEL_NUMBER 17 | 7 | #define MODEL_NUMBER 17 |
8 | 8 | ||
9 | /* define this if you use an ATA controller */ | ||
10 | #define HAVE_ATA | ||
11 | |||
9 | /* define this if you have recording possibility */ | 12 | /* define this if you have recording possibility */ |
10 | #define HAVE_RECORDING | 13 | #define HAVE_RECORDING |
11 | 14 | ||
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 @@ | |||
6 | /* For Rolo and boot loader */ | 6 | /* For Rolo and boot loader */ |
7 | #define MODEL_NUMBER 10 | 7 | #define MODEL_NUMBER 10 |
8 | 8 | ||
9 | /* define this if you use an ATA controller */ | ||
10 | #define HAVE_ATA | ||
11 | |||
9 | /* define this if you have recording possibility */ | 12 | /* define this if you have recording possibility */ |
10 | #define HAVE_RECORDING | 13 | #define HAVE_RECORDING |
11 | 14 | ||
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 @@ | |||
8 | /* For Rolo and boot loader */ | 8 | /* For Rolo and boot loader */ |
9 | #define MODEL_NUMBER 19 | 9 | #define MODEL_NUMBER 19 |
10 | 10 | ||
11 | /* define this if you use an ATA controller */ | ||
12 | #define HAVE_ATA | ||
13 | |||
11 | /* define this if you have recording possibility */ | 14 | /* define this if you have recording possibility */ |
12 | /*#define HAVE_RECORDING*/ | 15 | /*#define HAVE_RECORDING*/ |
13 | 16 | ||
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 @@ | |||
9 | /* For Rolo and boot loader */ | 9 | /* For Rolo and boot loader */ |
10 | #define MODEL_NUMBER 7 | 10 | #define MODEL_NUMBER 7 |
11 | 11 | ||
12 | /* define this if you use an ATA controller */ | ||
13 | #define HAVE_ATA | ||
14 | |||
12 | /* define this if you have recording possibility */ | 15 | /* define this if you have recording possibility */ |
13 | /*#define HAVE_RECORDING*/ | 16 | /*#define HAVE_RECORDING*/ |
14 | 17 | ||
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 @@ | |||
8 | /* For Rolo and boot loader */ | 8 | /* For Rolo and boot loader */ |
9 | #define MODEL_NUMBER 8 | 9 | #define MODEL_NUMBER 8 |
10 | 10 | ||
11 | /* define this if you use an ATA controller */ | ||
12 | #define HAVE_ATA | ||
13 | |||
11 | /* define this if you have recording possibility */ | 14 | /* define this if you have recording possibility */ |
12 | #define HAVE_RECORDING | 15 | #define HAVE_RECORDING |
13 | 16 | ||
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 @@ | |||
8 | /* For Rolo and boot loader */ | 8 | /* For Rolo and boot loader */ |
9 | #define MODEL_NUMBER 3 | 9 | #define MODEL_NUMBER 3 |
10 | 10 | ||
11 | /* define this if you use an ATA controller */ | ||
12 | #define HAVE_ATA | ||
13 | |||
11 | /* define this if you have recording possibility */ | 14 | /* define this if you have recording possibility */ |
12 | #define HAVE_RECORDING | 15 | #define HAVE_RECORDING |
13 | 16 | ||
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 @@ | |||
8 | /* For Rolo and boot loader */ | 8 | /* For Rolo and boot loader */ |
9 | #define MODEL_NUMBER 9 /* TODO: change to 9 */ | 9 | #define MODEL_NUMBER 9 /* TODO: change to 9 */ |
10 | 10 | ||
11 | /* define this if you use an ATA controller */ | ||
12 | #define HAVE_ATA | ||
13 | |||
11 | /* define this if you have recording possibility */ | 14 | /* define this if you have recording possibility */ |
12 | /*#define HAVE_RECORDING*/ | 15 | /*#define HAVE_RECORDING*/ |
13 | 16 | ||
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 @@ | |||
8 | /* For Rolo and boot loader */ | 8 | /* For Rolo and boot loader */ |
9 | #define MODEL_NUMBER 11 | 9 | #define MODEL_NUMBER 11 |
10 | 10 | ||
11 | /* define this if you use an ATA controller */ | ||
12 | #define HAVE_ATA | ||
13 | |||
11 | /* define this if you have recording possibility */ | 14 | /* define this if you have recording possibility */ |
12 | /*#define HAVE_RECORDING*/ | 15 | /*#define HAVE_RECORDING*/ |
13 | 16 | ||
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 @@ | |||
8 | /* For Rolo and boot loader */ | 8 | /* For Rolo and boot loader */ |
9 | #define MODEL_NUMBER 4 | 9 | #define MODEL_NUMBER 4 |
10 | 10 | ||
11 | /* define this if you use an ATA controller */ | ||
12 | #define HAVE_ATA | ||
13 | |||
11 | /* define this if you have recording possibility */ | 14 | /* define this if you have recording possibility */ |
12 | #define HAVE_RECORDING | 15 | #define HAVE_RECORDING |
13 | 16 | ||
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 @@ | |||
8 | /* For Rolo and boot loader */ | 8 | /* For Rolo and boot loader */ |
9 | #define MODEL_NUMBER 5 | 9 | #define MODEL_NUMBER 5 |
10 | 10 | ||
11 | /* define this if you use an ATA controller */ | ||
12 | #define HAVE_ATA | ||
13 | |||
11 | /* define this if you have recording possibility */ | 14 | /* define this if you have recording possibility */ |
12 | #define HAVE_RECORDING | 15 | #define HAVE_RECORDING |
13 | 16 | ||
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 @@ | |||
10 | #define MODEL_NUMBER 23 | 10 | #define MODEL_NUMBER 23 |
11 | #define MODEL_NAME "Olympus m:robe MR-100" | 11 | #define MODEL_NAME "Olympus m:robe MR-100" |
12 | 12 | ||
13 | /* define this if you use an ATA controller */ | ||
14 | #define HAVE_ATA | ||
15 | |||
13 | /* define this if you have a bitmap LCD display */ | 16 | /* define this if you have a bitmap LCD display */ |
14 | #define HAVE_LCD_BITMAP | 17 | #define HAVE_LCD_BITMAP |
15 | 18 | ||
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 @@ | |||
29 | /* For Rolo and boot loader */ | 29 | /* For Rolo and boot loader */ |
30 | #define MODEL_NUMBER 22 | 30 | #define MODEL_NUMBER 22 |
31 | 31 | ||
32 | /* define this if you use an ATA controller */ | ||
33 | #define HAVE_ATA | ||
34 | |||
32 | /* define this if you have a bitmap LCD display */ | 35 | /* define this if you have a bitmap LCD display */ |
33 | #define HAVE_LCD_BITMAP | 36 | #define HAVE_LCD_BITMAP |
34 | 37 | ||
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 @@ | |||
1 | /* define this if you use an ATA controller */ | ||
2 | #define HAVE_ATA | ||
3 | |||
1 | /* define this if you have a charcell LCD display */ | 4 | /* define this if you have a charcell LCD display */ |
2 | #define HAVE_LCD_CHARCELLS | 5 | #define HAVE_LCD_CHARCELLS |
3 | 6 | ||
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 @@ | |||
1 | /* define this if you use an ATA controller */ | ||
2 | #define HAVE_ATA | ||
3 | |||
1 | /* define this if you have recording possibility */ | 4 | /* define this if you have recording possibility */ |
2 | #define HAVE_RECORDING | 5 | #define HAVE_RECORDING |
3 | 6 | ||
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 @@ | |||
1 | /* define this if you use an ATA controller */ | ||
2 | #define HAVE_ATA | ||
3 | |||
1 | /* define this if you have recording possibility */ | 4 | /* define this if you have recording possibility */ |
2 | #define HAVE_RECORDING | 5 | #define HAVE_RECORDING |
3 | 6 | ||
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 @@ | |||
7 | /* For Rolo and boot loader */ | 7 | /* For Rolo and boot loader */ |
8 | #define MODEL_NUMBER 15 | 8 | #define MODEL_NUMBER 15 |
9 | 9 | ||
10 | /* define this if you use an ATA controller */ | ||
11 | #define HAVE_ATA | ||
12 | |||
10 | /* define this if you have recording possibility */ | 13 | /* define this if you have recording possibility */ |
11 | /*#define HAVE_RECORDING*/ /* TODO: add support for this */ | 14 | /*#define HAVE_RECORDING*/ /* TODO: add support for this */ |
12 | 15 | ||