From e4dbcc414b4b91ceb6b5e80a4ad49e4270fee096 Mon Sep 17 00:00:00 2001 From: Boris Gjenero Date: Thu, 8 Dec 2011 21:23:53 +0000 Subject: 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 --- firmware/target/arm/tms320dm320/creative-zvm/ata-creativezvm.c | 2 +- firmware/target/arm/tms320dm320/creative-zvm/ata-target.h | 6 ------ firmware/target/arm/tms320dm320/creative-zvm/dma-creativezvm.c | 2 +- firmware/target/arm/tms320dm320/mrobe-500/ata-mr500.c | 3 +-- firmware/target/arm/tms320dm320/mrobe-500/ata-target.h | 5 ----- 5 files changed, 3 insertions(+), 15 deletions(-) (limited to 'firmware/target/arm/tms320dm320') 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 @@ #include "system.h" #include "power.h" #include "panic.h" -#include "ata-target.h" +#include "ata-driver.h" #include "dm320.h" #include "ata.h" #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 @@ #define copy_read_sectors dma_ata_read #define copy_write_sectors dma_ata_write */ -void copy_read_sectors(const unsigned char* buf, int wordcount); -void copy_write_sectors(const unsigned char* buf, int wordcount); /* Nasty hack, but Creative is nasty... */ #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, #define ATA_COMMAND (*((volatile unsigned char*)(ATA_IOBASE+0xE))) #define ATA_CONTROL (*((volatile unsigned char*)(ATA_IOBASE+0x800C))) -void ata_reset(void); -void ata_device_init(void); -bool ata_is_coldstart(void); -void ide_power_enable(bool on); #ifdef BOOTLOADER int load_minifs_file(char* filename, unsigned char* location); #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 @@ #include "dma-target.h" #include "dm320.h" #include "ata.h" -#include "ata-target.h" +#include "ata-driver.h" #include "ata-defines.h" #include 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 @@ #include "power.h" #include "panic.h" #include "pcf50606.h" -#include "ata.h" -#include "ata-target.h" +#include "ata-driver.h" #include "backlight-target.h" /* 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 @@ #define ATA_OPTIMIZED_READING #define ATA_OPTIMIZED_WRITING -void copy_read_sectors(const unsigned char* buf, int wordcount); -void copy_write_sectors(const unsigned char* buf, int wordcount); #endif #define ATA_IOBASE 0x50000000 @@ -49,8 +47,5 @@ void copy_write_sectors(const unsigned char* buf, int wordcount); #define ATA_COMMAND (*((volatile unsigned char*)(REGISTER_OFFSET + (0x07 << IDE_SHIFT)))) #define ATA_CONTROL (*((volatile unsigned char*)(CONTROL_OFFSET + (0x06 << IDE_SHIFT)))) -void ata_reset(void); -void ata_device_init(void); -bool ata_is_coldstart(void); #endif -- cgit v1.2.3