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/tms320dm320 | |
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/tms320dm320')
5 files changed, 3 insertions, 15 deletions
diff --git a/firmware/target/arm/tms320dm320/creative-zvm/ata-creativezvm.c b/firmware/target/arm/tms320dm320/creative-zvm/ata-creativezvm.c index ad10502f2d..4ff39e2a9e 100644 --- a/firmware/target/arm/tms320dm320/creative-zvm/ata-creativezvm.c +++ b/firmware/target/arm/tms320dm320/creative-zvm/ata-creativezvm.c | |||
@@ -26,7 +26,7 @@ | |||
26 | #include "system.h" | 26 | #include "system.h" |
27 | #include "power.h" | 27 | #include "power.h" |
28 | #include "panic.h" | 28 | #include "panic.h" |
29 | #include "ata-target.h" | 29 | #include "ata-driver.h" |
30 | #include "dm320.h" | 30 | #include "dm320.h" |
31 | #include "ata.h" | 31 | #include "ata.h" |
32 | #include "string.h" | 32 | #include "string.h" |
diff --git a/firmware/target/arm/tms320dm320/creative-zvm/ata-target.h b/firmware/target/arm/tms320dm320/creative-zvm/ata-target.h index 1a1648983d..5b66d192a5 100644 --- a/firmware/target/arm/tms320dm320/creative-zvm/ata-target.h +++ b/firmware/target/arm/tms320dm320/creative-zvm/ata-target.h | |||
@@ -32,8 +32,6 @@ | |||
32 | #define copy_read_sectors dma_ata_read | 32 | #define copy_read_sectors dma_ata_read |
33 | #define copy_write_sectors dma_ata_write | 33 | #define copy_write_sectors dma_ata_write |
34 | */ | 34 | */ |
35 | void copy_read_sectors(const unsigned char* buf, int wordcount); | ||
36 | void copy_write_sectors(const unsigned char* buf, int wordcount); | ||
37 | 35 | ||
38 | /* Nasty hack, but Creative is nasty... */ | 36 | /* Nasty hack, but Creative is nasty... */ |
39 | #define ata_read_sectors _ata_read_sectors | 37 | #define ata_read_sectors _ata_read_sectors |
@@ -53,10 +51,6 @@ extern int _ata_write_sectors(IF_MD2(int drive,) unsigned long start, int count, | |||
53 | #define ATA_COMMAND (*((volatile unsigned char*)(ATA_IOBASE+0xE))) | 51 | #define ATA_COMMAND (*((volatile unsigned char*)(ATA_IOBASE+0xE))) |
54 | #define ATA_CONTROL (*((volatile unsigned char*)(ATA_IOBASE+0x800C))) | 52 | #define ATA_CONTROL (*((volatile unsigned char*)(ATA_IOBASE+0x800C))) |
55 | 53 | ||
56 | void ata_reset(void); | ||
57 | void ata_device_init(void); | ||
58 | bool ata_is_coldstart(void); | ||
59 | void ide_power_enable(bool on); | ||
60 | #ifdef BOOTLOADER | 54 | #ifdef BOOTLOADER |
61 | int load_minifs_file(char* filename, unsigned char* location); | 55 | int load_minifs_file(char* filename, unsigned char* location); |
62 | #endif | 56 | #endif |
diff --git a/firmware/target/arm/tms320dm320/creative-zvm/dma-creativezvm.c b/firmware/target/arm/tms320dm320/creative-zvm/dma-creativezvm.c index 6a74ff5e57..418a28ff09 100644 --- a/firmware/target/arm/tms320dm320/creative-zvm/dma-creativezvm.c +++ b/firmware/target/arm/tms320dm320/creative-zvm/dma-creativezvm.c | |||
@@ -26,7 +26,7 @@ | |||
26 | #include "dma-target.h" | 26 | #include "dma-target.h" |
27 | #include "dm320.h" | 27 | #include "dm320.h" |
28 | #include "ata.h" | 28 | #include "ata.h" |
29 | #include "ata-target.h" | 29 | #include "ata-driver.h" |
30 | #include "ata-defines.h" | 30 | #include "ata-defines.h" |
31 | #include <stdbool.h> | 31 | #include <stdbool.h> |
32 | 32 | ||
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/ata-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/ata-mr500.c index 59f8464d76..1abe0843b3 100644 --- a/firmware/target/arm/tms320dm320/mrobe-500/ata-mr500.c +++ b/firmware/target/arm/tms320dm320/mrobe-500/ata-mr500.c | |||
@@ -27,8 +27,7 @@ | |||
27 | #include "power.h" | 27 | #include "power.h" |
28 | #include "panic.h" | 28 | #include "panic.h" |
29 | #include "pcf50606.h" | 29 | #include "pcf50606.h" |
30 | #include "ata.h" | 30 | #include "ata-driver.h" |
31 | #include "ata-target.h" | ||
32 | #include "backlight-target.h" | 31 | #include "backlight-target.h" |
33 | 32 | ||
34 | /* ARESET on C7C68300 and RESET on ATA interface (Active Low) */ | 33 | /* ARESET on C7C68300 and RESET on ATA interface (Active Low) */ |
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/ata-target.h b/firmware/target/arm/tms320dm320/mrobe-500/ata-target.h index ca75876259..564ff3031f 100644 --- a/firmware/target/arm/tms320dm320/mrobe-500/ata-target.h +++ b/firmware/target/arm/tms320dm320/mrobe-500/ata-target.h | |||
@@ -31,8 +31,6 @@ | |||
31 | #define ATA_OPTIMIZED_READING | 31 | #define ATA_OPTIMIZED_READING |
32 | #define ATA_OPTIMIZED_WRITING | 32 | #define ATA_OPTIMIZED_WRITING |
33 | 33 | ||
34 | void copy_read_sectors(const unsigned char* buf, int wordcount); | ||
35 | void copy_write_sectors(const unsigned char* buf, int wordcount); | ||
36 | #endif | 34 | #endif |
37 | 35 | ||
38 | #define ATA_IOBASE 0x50000000 | 36 | #define ATA_IOBASE 0x50000000 |
@@ -49,8 +47,5 @@ void copy_write_sectors(const unsigned char* buf, int wordcount); | |||
49 | #define ATA_COMMAND (*((volatile unsigned char*)(REGISTER_OFFSET + (0x07 << IDE_SHIFT)))) | 47 | #define ATA_COMMAND (*((volatile unsigned char*)(REGISTER_OFFSET + (0x07 << IDE_SHIFT)))) |
50 | #define ATA_CONTROL (*((volatile unsigned char*)(CONTROL_OFFSET + (0x06 << IDE_SHIFT)))) | 48 | #define ATA_CONTROL (*((volatile unsigned char*)(CONTROL_OFFSET + (0x06 << IDE_SHIFT)))) |
51 | 49 | ||
52 | void ata_reset(void); | ||
53 | void ata_device_init(void); | ||
54 | bool ata_is_coldstart(void); | ||
55 | 50 | ||
56 | #endif | 51 | #endif |