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/arm/archos | |
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/arm/archos')
-rw-r--r-- | firmware/target/arm/archos/av300/ata-av300.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/archos/av300/ata-target.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/firmware/target/arm/archos/av300/ata-av300.c b/firmware/target/arm/archos/av300/ata-av300.c index 08bee15fe6..e8623e5f16 100644 --- a/firmware/target/arm/archos/av300/ata-av300.c +++ b/firmware/target/arm/archos/av300/ata-av300.c | |||
@@ -30,7 +30,7 @@ | |||
30 | 30 | ||
31 | #include <stdbool.h> | 31 | #include <stdbool.h> |
32 | #include "system.h" | 32 | #include "system.h" |
33 | #include "ata-target.h" | 33 | #include "ata-driver.h" |
34 | 34 | ||
35 | void ata_reset() | 35 | void ata_reset() |
36 | { | 36 | { |
diff --git a/firmware/target/arm/archos/av300/ata-target.h b/firmware/target/arm/archos/av300/ata-target.h index bc3a19a6b4..5732f17045 100644 --- a/firmware/target/arm/archos/av300/ata-target.h +++ b/firmware/target/arm/archos/av300/ata-target.h | |||
@@ -19,6 +19,9 @@ | |||
19 | * | 19 | * |
20 | ****************************************************************************/ | 20 | ****************************************************************************/ |
21 | 21 | ||
22 | #ifndef ATA_TARGET_H | ||
23 | #define ATA_TARGET_H | ||
24 | |||
22 | /* Plain C read & write loops */ | 25 | /* Plain C read & write loops */ |
23 | 26 | ||
24 | #define ATA_IOBASE 0x02400000 | 27 | #define ATA_IOBASE 0x02400000 |
@@ -33,7 +36,4 @@ | |||
33 | #define ATA_CONTROL (*((volatile unsigned char*)(ATA_IOBASE + 0x340))) | 36 | #define ATA_CONTROL (*((volatile unsigned char*)(ATA_IOBASE + 0x340))) |
34 | #define ATA_COMMAND (*((volatile unsigned char*)(ATA_IOBASE + 0x380))) | 37 | #define ATA_COMMAND (*((volatile unsigned char*)(ATA_IOBASE + 0x380))) |
35 | 38 | ||
36 | void ata_reset(void); | 39 | #endif /* ATA_TARGET_H */ |
37 | void ata_enable(bool on); | ||
38 | bool ata_is_coldstart(void); | ||
39 | void ata_device_init(void); | ||