diff options
author | Boris Gjenero <dreamlayers@rockbox.org> | 2011-12-08 21:23:53 +0000 |
---|---|---|
committer | Boris Gjenero <dreamlayers@rockbox.org> | 2011-12-08 21:23:53 +0000 |
commit | e4dbcc414b4b91ceb6b5e80a4ad49e4270fee096 (patch) | |
tree | 3165e08718b10840ac466821664852be8ba6d784 /firmware/target/coldfire | |
parent | d09818d745835653c2f7ff24547101c0833800d4 (diff) | |
download | rockbox-e4dbcc414b4b91ceb6b5e80a4ad49e4270fee096.tar.gz rockbox-e4dbcc414b4b91ceb6b5e80a4ad49e4270fee096.zip |
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
Diffstat (limited to 'firmware/target/coldfire')
-rw-r--r-- | firmware/target/coldfire/ata-target.h | 6 | ||||
-rw-r--r-- | firmware/target/coldfire/iaudio/ata-iaudio.c | 2 | ||||
-rw-r--r-- | firmware/target/coldfire/iaudio/m3/ata-m3.c | 2 | ||||
-rw-r--r-- | firmware/target/coldfire/iriver/ata-iriver.c | 2 | ||||
-rw-r--r-- | firmware/target/coldfire/mpio/ata-mpio.c | 2 | ||||
-rw-r--r-- | firmware/target/coldfire/mpio/ata-target.h | 6 |
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 @@ | |||
42 | #define ATA_IN8(reg) ((reg) >> 8) | 42 | #define ATA_IN8(reg) ((reg) >> 8) |
43 | #define ATA_IN16(reg) (swap16(reg)) | 43 | #define ATA_IN16(reg) (swap16(reg)) |
44 | 44 | ||
45 | void ata_reset(void); | ||
46 | void ata_enable(bool on); | ||
47 | void ata_device_init(void); | ||
48 | bool ata_is_coldstart(void); | ||
49 | 45 | ||
50 | void copy_read_sectors(unsigned char* buf, int wordcount); | ||
51 | void copy_write_sectors(const unsigned char* buf, int wordcount); | ||
52 | #endif | 46 | #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 @@ | |||
25 | #include "system.h" | 25 | #include "system.h" |
26 | #include "power.h" | 26 | #include "power.h" |
27 | #include "pcf50606.h" | 27 | #include "pcf50606.h" |
28 | #include "ata-target.h" | 28 | #include "ata-driver.h" |
29 | 29 | ||
30 | void ata_reset(void) | 30 | void ata_reset(void) |
31 | { | 31 | { |
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 @@ | |||
25 | #include "kernel.h" | 25 | #include "kernel.h" |
26 | #include "system.h" | 26 | #include "system.h" |
27 | #include "power.h" | 27 | #include "power.h" |
28 | #include "ata-target.h" | 28 | #include "ata-driver.h" |
29 | 29 | ||
30 | void ata_reset(void) | 30 | void ata_reset(void) |
31 | { | 31 | { |
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 @@ | |||
25 | #include "system.h" | 25 | #include "system.h" |
26 | #include "power.h" | 26 | #include "power.h" |
27 | #include "pcf50606.h" | 27 | #include "pcf50606.h" |
28 | #include "ata-target.h" | 28 | #include "ata-driver.h" |
29 | 29 | ||
30 | void ata_reset(void) | 30 | void ata_reset(void) |
31 | { | 31 | { |
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 @@ | |||
25 | #include "kernel.h" | 25 | #include "kernel.h" |
26 | #include "system.h" | 26 | #include "system.h" |
27 | #include "power.h" | 27 | #include "power.h" |
28 | #include "ata-target.h" | 28 | #include "ata-driver.h" |
29 | 29 | ||
30 | void ata_reset(void) | 30 | void ata_reset(void) |
31 | { | 31 | { |
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 @@ | |||
36 | #define ATA_SELECT (*((volatile unsigned short*)(ATA_IOBASE + 0x2c))) | 36 | #define ATA_SELECT (*((volatile unsigned short*)(ATA_IOBASE + 0x2c))) |
37 | #define ATA_COMMAND (*((volatile unsigned short*)(ATA_IOBASE + 0x2e))) | 37 | #define ATA_COMMAND (*((volatile unsigned short*)(ATA_IOBASE + 0x2e))) |
38 | 38 | ||
39 | void ata_reset(void); | ||
40 | void ata_enable(bool on); | ||
41 | void ata_device_init(void); | ||
42 | bool ata_is_coldstart(void); | ||
43 | 39 | ||
44 | void copy_read_sectors(unsigned char* buf, int wordcount); | ||
45 | void copy_write_sectors(const unsigned char* buf, int wordcount); | ||
46 | #endif | 40 | #endif |