Rework ATA driver to get rid of lots of target-specific constants and allow for non-memory-mapped task file registers.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28950 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 2 insertions, 29 deletions

diff --git a/firmware/target/arm/ata-target.h b/firmware/target/arm/ata-target.h
index c9d789d092..12415c33e8 100644
--- a/firmware/target/arm/ata-target.h
+++ b/firmware/target/arm/ata-target.h
@@ -32,43 +32,16 @@
 #define ATA_COMMAND     (*((volatile unsigned char*)(IDE_BASE + 0x1fc)))
 #define ATA_CONTROL     (*((volatile unsigned char*)(IDE_BASE + 0x3f8)))
 
-#define STATUS_BSY      0x80
-#define STATUS_RDY      0x40
-#define STATUS_DF       0x20
-#define STATUS_DRQ      0x08
-#define STATUS_ERR      0x01
-#define ERROR_ABRT      0x04
-#define ERROR_IDNF      0x10
-
-#define WRITE_PATTERN1  0xa5
-#define WRITE_PATTERN2  0x5a
-#define WRITE_PATTERN3  0xaa
-#define WRITE_PATTERN4  0x55
-
-#define READ_PATTERN1   0xa5
-#define READ_PATTERN2   0x5a
-#define READ_PATTERN3   0xaa
-#define READ_PATTERN4   0x55
-
-#define READ_PATTERN1_MASK 0xff
-#define READ_PATTERN2_MASK 0xff
-#define READ_PATTERN3_MASK 0xff
-#define READ_PATTERN4_MASK 0xff
-
 #if (CONFIG_CPU == PP5002)
 
-#define SET_REG(reg,val) do { reg = (val); \
+#define ATA_OUT8(reg,val) do { reg = (val); \
                               while (!(IDE_CFG_STATUS & 0x40)); \
-                         } while (0)
-#define SET_16BITREG(reg,val) reg = (val)
+                          } while (0)
 
 /* Plain C reading and writing. See comment in ata-as-arm.S */
 
 #elif defined CPU_PP502x
 
-#define SET_REG(reg,val) reg = (val)
-#define SET_16BITREG(reg,val) reg = (val)
-
 /* asm optimized reading and writing */
 #define ATA_OPTIMIZED_READING
 #define ATA_OPTIMIZED_WRITING