summaryrefslogtreecommitdiffstats
path: root/firmware/target/arm/s3c2440
diff options
context:
space:
mode:
authorBoris Gjenero <dreamlayers@rockbox.org>2011-12-08 21:23:53 +0000
committerBoris Gjenero <dreamlayers@rockbox.org>2011-12-08 21:23:53 +0000
commite4dbcc414b4b91ceb6b5e80a4ad49e4270fee096 (patch)
tree3165e08718b10840ac466821664852be8ba6d784 /firmware/target/arm/s3c2440
parentd09818d745835653c2f7ff24547101c0833800d4 (diff)
downloadrockbox-e4dbcc414b4b91ceb6b5e80a4ad49e4270fee096.tar.gz
rockbox-e4dbcc414b4b91ceb6b5e80a4ad49e4270fee096.tar.bz2
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/s3c2440')
-rw-r--r--firmware/target/arm/s3c2440/gigabeat-fx/ata-meg-fx.c3
-rw-r--r--firmware/target/arm/s3c2440/gigabeat-fx/ata-target.h4
2 files changed, 1 insertions, 6 deletions
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/ata-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/ata-meg-fx.c
index 8cd0260fe4..89b00bbd1d 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/ata-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/ata-meg-fx.c
@@ -26,8 +26,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/s3c2440/gigabeat-fx/ata-target.h b/firmware/target/arm/s3c2440/gigabeat-fx/ata-target.h
index 95cbaa11cf..7ca7d77c4f 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/ata-target.h
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/ata-target.h
@@ -30,7 +30,6 @@
#define PREFER_C_WRITING
#if !defined(BOOTLOADER)
#define ATA_OPTIMIZED_READING
-void copy_read_sectors(unsigned char* buf, int wordcount);
#endif
#define ATA_IOBASE 0x18000000
@@ -44,8 +43,5 @@ void copy_read_sectors(unsigned char* buf, int wordcount);
#define ATA_COMMAND (*((volatile unsigned char*)(ATA_IOBASE + 0x0E)))
#define ATA_CONTROL (*((volatile unsigned char*)(0x20000000 + 0x1C)))
-void ata_reset(void);
-void ata_device_init(void);
-bool ata_is_coldstart(void);
#endif