FS#12418 - Merge prototypes from ata-target.h files into new file ata-driver.h. After this change:

- ata.h is for users of ata.c
- ata-driver.h is for functions implemented by target-specific code and used by ata.c
- ata-target.h is for target-specific defines


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31182 a1c6a512-1295-4272-9138-f99709370657

6 files changed, 4 insertions, 16 deletions

diff --git a/firmware/target/coldfire/ata-target.h b/firmware/target/coldfire/ata-target.h
index 1a223e1eae..405dbcafe5 100644
--- a/firmware/target/coldfire/ata-target.h
+++ b/firmware/target/coldfire/ata-target.h
@@ -42,11 +42,5 @@
 #define ATA_IN8(reg) ((reg) >> 8)
 #define ATA_IN16(reg) (swap16(reg))
 
-void ata_reset(void);
-void ata_enable(bool on);
-void ata_device_init(void);
-bool ata_is_coldstart(void);
 
-void copy_read_sectors(unsigned char* buf, int wordcount);
-void copy_write_sectors(const unsigned char* buf, int wordcount);
 #endif
diff --git a/firmware/target/coldfire/iaudio/ata-iaudio.c b/firmware/target/coldfire/iaudio/ata-iaudio.c
index 4a70456ed2..91b6c87093 100644
--- a/firmware/target/coldfire/iaudio/ata-iaudio.c
+++ b/firmware/target/coldfire/iaudio/ata-iaudio.c
@@ -25,7 +25,7 @@
 #include "system.h"
 #include "power.h"
 #include "pcf50606.h"
-#include "ata-target.h"
+#include "ata-driver.h"
 
 void ata_reset(void)
 {
diff --git a/firmware/target/coldfire/iaudio/m3/ata-m3.c b/firmware/target/coldfire/iaudio/m3/ata-m3.c
index d82ca5a857..b3630798cf 100644
--- a/firmware/target/coldfire/iaudio/m3/ata-m3.c
+++ b/firmware/target/coldfire/iaudio/m3/ata-m3.c
@@ -25,7 +25,7 @@
 #include "kernel.h"
 #include "system.h"
 #include "power.h"
-#include "ata-target.h"
+#include "ata-driver.h"
 
 void ata_reset(void)
 {
diff --git a/firmware/target/coldfire/iriver/ata-iriver.c b/firmware/target/coldfire/iriver/ata-iriver.c
index d16943172c..1b8f475c4c 100644
--- a/firmware/target/coldfire/iriver/ata-iriver.c
+++ b/firmware/target/coldfire/iriver/ata-iriver.c
@@ -25,7 +25,7 @@
 #include "system.h"
 #include "power.h"
 #include "pcf50606.h"
-#include "ata-target.h"
+#include "ata-driver.h"
 
 void ata_reset(void)
 {
diff --git a/firmware/target/coldfire/mpio/ata-mpio.c b/firmware/target/coldfire/mpio/ata-mpio.c
index cf4276b5a0..af082640bf 100644
--- a/firmware/target/coldfire/mpio/ata-mpio.c
+++ b/firmware/target/coldfire/mpio/ata-mpio.c
@@ -25,7 +25,7 @@
 #include "kernel.h"
 #include "system.h"
 #include "power.h"
-#include "ata-target.h"
+#include "ata-driver.h"
 
 void ata_reset(void)
 {
diff --git a/firmware/target/coldfire/mpio/ata-target.h b/firmware/target/coldfire/mpio/ata-target.h
index b2c8f15417..095a7fc1bd 100644
--- a/firmware/target/coldfire/mpio/ata-target.h
+++ b/firmware/target/coldfire/mpio/ata-target.h
@@ -36,11 +36,5 @@
 #define ATA_SELECT      (*((volatile unsigned short*)(ATA_IOBASE + 0x2c)))
 #define ATA_COMMAND     (*((volatile unsigned short*)(ATA_IOBASE + 0x2e)))
 
-void ata_reset(void);
-void ata_enable(bool on);
-void ata_device_init(void);
-bool ata_is_coldstart(void);
 
-void copy_read_sectors(unsigned char* buf, int wordcount);
-void copy_write_sectors(const unsigned char* buf, int wordcount);
 #endif