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

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
 #ifdef SANSA_E200
 #ifndef SIMULATOR
 target/arm/lcd-as-memframe.S
-target/arm/sandisk/ata-c200_e200.c
+target/arm/ata-sd-pp.c
 target/arm/sandisk/sansa-e200/lcd-e200.c
-target/arm/sandisk/adc-c200_e200.c
+target/arm/adc-as3514.c
 target/arm/sandisk/backlight-c200_e200.c
 target/arm/usb-fw-pp502x.c
 target/arm/sandisk/sansa-e200/button-e200.c
@@ -451,10 +451,10 @@ target/arm/sandisk/audio-c200_e200.c
 
 #ifdef SANSA_C200
 #ifndef SIMULATOR
-target/arm/sandisk/ata-c200_e200.c
+target/arm/ata-sd-pp.c
 target/arm/sandisk/sansa-c200/lcd-c200.c
 target/arm/sandisk/sansa-c200/lcd-as-c200.S
-target/arm/sandisk/adc-c200_e200.c
+target/arm/adc-as3514.c
 target/arm/sandisk/backlight-c200_e200.c
 target/arm/usb-fw-pp502x.c
 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
 
 #ifdef TARGET_TREE
 #ifdef HAVE_HOTSWAP
-#include "hotswap-target.h"
+#include "ata-sd-target.h"
 #endif
 #define card_detect            card_detect_target
 #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 @@
 #include "fat.h"
 #include "hotswap.h"
 #ifdef BOOTLOADER
-#include "hotswap-target.h"
+#include "ata-sd-target.h"
 #endif
-#include "ata-target.h"
 #include "ata_idle_notify.h"
 #include "system.h"
 #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 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
-#ifndef HOTSWAP_TARGET_H
-#define HOTSWAP_TARGET_H
+#ifndef ATA_SD_TARGET_H
+#define ATA_SD_TARGET_H
 
 #include "inttypes.h"