diff options
Diffstat (limited to 'firmware/target/arm/tms320dm320/creative-zvm')
-rw-r--r-- | firmware/target/arm/tms320dm320/creative-zvm/ata-target.h | 26 | ||||
-rw-r--r-- | firmware/target/arm/tms320dm320/creative-zvm/dma-creativezvm.c | 6 |
2 files changed, 3 insertions, 29 deletions
diff --git a/firmware/target/arm/tms320dm320/creative-zvm/ata-target.h b/firmware/target/arm/tms320dm320/creative-zvm/ata-target.h index 46713e70c5..1a1648983d 100644 --- a/firmware/target/arm/tms320dm320/creative-zvm/ata-target.h +++ b/firmware/target/arm/tms320dm320/creative-zvm/ata-target.h | |||
@@ -53,32 +53,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))) | 53 | #define ATA_COMMAND (*((volatile unsigned char*)(ATA_IOBASE+0xE))) |
54 | #define ATA_CONTROL (*((volatile unsigned char*)(ATA_IOBASE+0x800C))) | 54 | #define ATA_CONTROL (*((volatile unsigned char*)(ATA_IOBASE+0x800C))) |
55 | 55 | ||
56 | #define STATUS_BSY 0x80 | ||
57 | #define STATUS_RDY 0x40 | ||
58 | #define STATUS_DF 0x20 | ||
59 | #define STATUS_DRQ 0x08 | ||
60 | #define STATUS_ERR 0x01 | ||
61 | #define ERROR_ABRT 0x04 | ||
62 | #define ERROR_IDNF 0x10 | ||
63 | |||
64 | #define WRITE_PATTERN1 0xa5 | ||
65 | #define WRITE_PATTERN2 0x5a | ||
66 | #define WRITE_PATTERN3 0xaa | ||
67 | #define WRITE_PATTERN4 0x55 | ||
68 | |||
69 | #define READ_PATTERN1 0xa5 | ||
70 | #define READ_PATTERN2 0x5a | ||
71 | #define READ_PATTERN3 0xaa | ||
72 | #define READ_PATTERN4 0x55 | ||
73 | |||
74 | #define READ_PATTERN1_MASK 0xff | ||
75 | #define READ_PATTERN2_MASK 0xff | ||
76 | #define READ_PATTERN3_MASK 0xff | ||
77 | #define READ_PATTERN4_MASK 0xff | ||
78 | |||
79 | #define SET_REG(reg,val) reg = (val) | ||
80 | #define SET_16BITREG(reg,val) reg = (val) | ||
81 | |||
82 | void ata_reset(void); | 56 | void ata_reset(void); |
83 | void ata_device_init(void); | 57 | void ata_device_init(void); |
84 | bool ata_is_coldstart(void); | 58 | bool ata_is_coldstart(void); |
diff --git a/firmware/target/arm/tms320dm320/creative-zvm/dma-creativezvm.c b/firmware/target/arm/tms320dm320/creative-zvm/dma-creativezvm.c index c229b9957a..514fdd5bd9 100644 --- a/firmware/target/arm/tms320dm320/creative-zvm/dma-creativezvm.c +++ b/firmware/target/arm/tms320dm320/creative-zvm/dma-creativezvm.c | |||
@@ -62,7 +62,7 @@ void dma_ata_read(unsigned char* buf, int shortcount) | |||
62 | while((unsigned long)buf & 0x1F) | 62 | while((unsigned long)buf & 0x1F) |
63 | { | 63 | { |
64 | unsigned short tmp; | 64 | unsigned short tmp; |
65 | tmp = ATA_DATA; | 65 | tmp = ATA_IN16(ATA_DATA); |
66 | *buf++ = tmp & 0xFF; | 66 | *buf++ = tmp & 0xFF; |
67 | *buf++ = tmp >> 8; | 67 | *buf++ = tmp >> 8; |
68 | shortcount--; | 68 | shortcount--; |
@@ -86,7 +86,7 @@ void dma_ata_read(unsigned char* buf, int shortcount) | |||
86 | if(shortcount % 2) | 86 | if(shortcount % 2) |
87 | { | 87 | { |
88 | unsigned short tmp; | 88 | unsigned short tmp; |
89 | tmp = ATA_DATA; | 89 | tmp = ATA_IN16(ATA_DATA); |
90 | *buf++ = tmp & 0xFF; | 90 | *buf++ = tmp & 0xFF; |
91 | *buf++ = tmp >> 8; | 91 | *buf++ = tmp >> 8; |
92 | } | 92 | } |
@@ -102,7 +102,7 @@ void dma_ata_write(unsigned char* buf, int wordcount) | |||
102 | unsigned short tmp; | 102 | unsigned short tmp; |
103 | tmp = (unsigned short) *buf++; | 103 | tmp = (unsigned short) *buf++; |
104 | tmp |= (unsigned short) *buf++ << 8; | 104 | tmp |= (unsigned short) *buf++ << 8; |
105 | SET_16BITREG(ATA_DATA, tmp); | 105 | ATA_OUT16(ATA_DATA, tmp); |
106 | wordcount--; | 106 | wordcount--; |
107 | } | 107 | } |
108 | 108 | ||