diff options
author | Mark Arigo <markarigo@gmail.com> | 2008-05-13 01:53:19 +0000 |
---|---|---|
committer | Mark Arigo <markarigo@gmail.com> | 2008-05-13 01:53:19 +0000 |
commit | 76567482215b9d786ba329072b715729ea506b7e (patch) | |
tree | 18632252c5d0c0edd71cb76ad6d39dc26c33861f | |
parent | 1ab5caff29de51c09cd1c77de06610e199739967 (diff) | |
download | rockbox-76567482215b9d786ba329072b715729ea506b7e.tar.gz rockbox-76567482215b9d786ba329072b715729ea506b7e.zip |
Preparing for the Philips SA9200 part 1. Move the Sansa ADC & ATA drivers up one level.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17487 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/SOURCES | 8 | ||||
-rw-r--r-- | firmware/export/hotswap.h | 2 | ||||
-rw-r--r-- | firmware/target/arm/adc-as3514.c (renamed from firmware/target/arm/sandisk/adc-c200_e200.c) | 0 | ||||
-rw-r--r-- | firmware/target/arm/ata-sd-pp.c (renamed from firmware/target/arm/sandisk/ata-c200_e200.c) | 3 | ||||
-rw-r--r-- | firmware/target/arm/ata-sd-target.h (renamed from firmware/target/arm/sandisk/hotswap-target.h) | 4 |
5 files changed, 8 insertions, 9 deletions
diff --git a/firmware/SOURCES b/firmware/SOURCES index ecd5e69c22..b577110109 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES | |||
@@ -434,9 +434,9 @@ target/sh/archos/ondio/fmradio_i2c-ondio.c | |||
434 | #ifdef SANSA_E200 | 434 | #ifdef SANSA_E200 |
435 | #ifndef SIMULATOR | 435 | #ifndef SIMULATOR |
436 | target/arm/lcd-as-memframe.S | 436 | target/arm/lcd-as-memframe.S |
437 | target/arm/sandisk/ata-c200_e200.c | 437 | target/arm/ata-sd-pp.c |
438 | target/arm/sandisk/sansa-e200/lcd-e200.c | 438 | target/arm/sandisk/sansa-e200/lcd-e200.c |
439 | target/arm/sandisk/adc-c200_e200.c | 439 | target/arm/adc-as3514.c |
440 | target/arm/sandisk/backlight-c200_e200.c | 440 | target/arm/sandisk/backlight-c200_e200.c |
441 | target/arm/usb-fw-pp502x.c | 441 | target/arm/usb-fw-pp502x.c |
442 | target/arm/sandisk/sansa-e200/button-e200.c | 442 | target/arm/sandisk/sansa-e200/button-e200.c |
@@ -451,10 +451,10 @@ target/arm/sandisk/audio-c200_e200.c | |||
451 | 451 | ||
452 | #ifdef SANSA_C200 | 452 | #ifdef SANSA_C200 |
453 | #ifndef SIMULATOR | 453 | #ifndef SIMULATOR |
454 | target/arm/sandisk/ata-c200_e200.c | 454 | target/arm/ata-sd-pp.c |
455 | target/arm/sandisk/sansa-c200/lcd-c200.c | 455 | target/arm/sandisk/sansa-c200/lcd-c200.c |
456 | target/arm/sandisk/sansa-c200/lcd-as-c200.S | 456 | target/arm/sandisk/sansa-c200/lcd-as-c200.S |
457 | target/arm/sandisk/adc-c200_e200.c | 457 | target/arm/adc-as3514.c |
458 | target/arm/sandisk/backlight-c200_e200.c | 458 | target/arm/sandisk/backlight-c200_e200.c |
459 | target/arm/usb-fw-pp502x.c | 459 | target/arm/usb-fw-pp502x.c |
460 | target/arm/sandisk/sansa-c200/button-c200.c | 460 | target/arm/sandisk/sansa-c200/button-c200.c |
diff --git a/firmware/export/hotswap.h b/firmware/export/hotswap.h index 66dfb9b180..7f0aa80fda 100644 --- a/firmware/export/hotswap.h +++ b/firmware/export/hotswap.h | |||
@@ -41,7 +41,7 @@ typedef struct | |||
41 | 41 | ||
42 | #ifdef TARGET_TREE | 42 | #ifdef TARGET_TREE |
43 | #ifdef HAVE_HOTSWAP | 43 | #ifdef HAVE_HOTSWAP |
44 | #include "hotswap-target.h" | 44 | #include "ata-sd-target.h" |
45 | #endif | 45 | #endif |
46 | #define card_detect card_detect_target | 46 | #define card_detect card_detect_target |
47 | #define card_get_info card_get_info_target | 47 | #define card_get_info card_get_info_target |
diff --git a/firmware/target/arm/sandisk/adc-c200_e200.c b/firmware/target/arm/adc-as3514.c index dcf6cba26e..dcf6cba26e 100644 --- a/firmware/target/arm/sandisk/adc-c200_e200.c +++ b/firmware/target/arm/adc-as3514.c | |||
diff --git a/firmware/target/arm/sandisk/ata-c200_e200.c b/firmware/target/arm/ata-sd-pp.c index 08183c5265..8c7ebcddc7 100644 --- a/firmware/target/arm/sandisk/ata-c200_e200.c +++ b/firmware/target/arm/ata-sd-pp.c | |||
@@ -19,9 +19,8 @@ | |||
19 | #include "fat.h" | 19 | #include "fat.h" |
20 | #include "hotswap.h" | 20 | #include "hotswap.h" |
21 | #ifdef BOOTLOADER | 21 | #ifdef BOOTLOADER |
22 | #include "hotswap-target.h" | 22 | #include "ata-sd-target.h" |
23 | #endif | 23 | #endif |
24 | #include "ata-target.h" | ||
25 | #include "ata_idle_notify.h" | 24 | #include "ata_idle_notify.h" |
26 | #include "system.h" | 25 | #include "system.h" |
27 | #include <string.h> | 26 | #include <string.h> |
diff --git a/firmware/target/arm/sandisk/hotswap-target.h b/firmware/target/arm/ata-sd-target.h index c7cd2b8d4f..dce2ca9030 100644 --- a/firmware/target/arm/sandisk/hotswap-target.h +++ b/firmware/target/arm/ata-sd-target.h | |||
@@ -16,8 +16,8 @@ | |||
16 | * KIND, either express or implied. | 16 | * KIND, either express or implied. |
17 | * | 17 | * |
18 | ****************************************************************************/ | 18 | ****************************************************************************/ |
19 | #ifndef HOTSWAP_TARGET_H | 19 | #ifndef ATA_SD_TARGET_H |
20 | #define HOTSWAP_TARGET_H | 20 | #define ATA_SD_TARGET_H |
21 | 21 | ||
22 | #include "inttypes.h" | 22 | #include "inttypes.h" |
23 | 23 | ||