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/drivers/ata.c | |
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/drivers/ata.c')
-rw-r--r-- | firmware/drivers/ata.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/firmware/drivers/ata.c b/firmware/drivers/ata.c index 309a155eb6..f567a4bb8a 100644 --- a/firmware/drivers/ata.c +++ b/firmware/drivers/ata.c | |||
@@ -32,7 +32,7 @@ | |||
32 | #include "power.h" | 32 | #include "power.h" |
33 | #include "string.h" | 33 | #include "string.h" |
34 | #include "ata_idle_notify.h" | 34 | #include "ata_idle_notify.h" |
35 | #include "ata-target.h" | 35 | #include "ata-driver.h" |
36 | #include "ata-defines.h" | 36 | #include "ata-defines.h" |
37 | #include "storage.h" | 37 | #include "storage.h" |
38 | 38 | ||
@@ -240,8 +240,6 @@ STATICIRAM ICODE_ATTR int wait_for_rdy(void) | |||
240 | return 0; /* timeout */ | 240 | return 0; /* timeout */ |
241 | } | 241 | } |
242 | #else | 242 | #else |
243 | extern int ata_wait_for_bsy(void); | ||
244 | extern int ata_wait_for_rdy(void); | ||
245 | #define wait_for_bsy ata_wait_for_bsy | 243 | #define wait_for_bsy ata_wait_for_bsy |
246 | #define wait_for_rdy ata_wait_for_rdy | 244 | #define wait_for_rdy ata_wait_for_rdy |
247 | #endif | 245 | #endif |
@@ -1265,7 +1263,7 @@ static int set_features(void) | |||
1265 | } | 1263 | } |
1266 | } | 1264 | } |
1267 | 1265 | ||
1268 | #ifdef ATA_SET_DEVICE_FEATURES | 1266 | #ifdef ATA_SET_PIO_TIMING |
1269 | ata_set_pio_timings(pio_mode); | 1267 | ata_set_pio_timings(pio_mode); |
1270 | #endif | 1268 | #endif |
1271 | 1269 | ||