diff options
Diffstat (limited to 'firmware/target/arm')
-rw-r--r-- | firmware/target/arm/tms320dm320/creative-zvm/dma-creativezvm.c | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/firmware/target/arm/tms320dm320/creative-zvm/dma-creativezvm.c b/firmware/target/arm/tms320dm320/creative-zvm/dma-creativezvm.c index a714df84a8..d99084db51 100644 --- a/firmware/target/arm/tms320dm320/creative-zvm/dma-creativezvm.c +++ b/firmware/target/arm/tms320dm320/creative-zvm/dma-creativezvm.c | |||
@@ -37,13 +37,6 @@ static struct wakeup transfer_completion_signal; | |||
37 | 37 | ||
38 | static bool dma_in_progress = false; | 38 | static bool dma_in_progress = false; |
39 | 39 | ||
40 | static int debugi = 0; | ||
41 | static void debugj(char* mes) | ||
42 | { | ||
43 | lcd_puts(0,debugi++,mes); | ||
44 | lcd_update(); | ||
45 | } | ||
46 | |||
47 | void MTC0(void) | 40 | void MTC0(void) |
48 | { | 41 | { |
49 | IO_INTC_IRQ1 = INTR_IRQ1_MTC0; | 42 | IO_INTC_IRQ1 = INTR_IRQ1_MTC0; |
@@ -60,16 +53,10 @@ void dma_start(const void* addr, size_t size) | |||
60 | 53 | ||
61 | #define ATA_DEST (ATA_IOBASE-CS1_START) | 54 | #define ATA_DEST (ATA_IOBASE-CS1_START) |
62 | void dma_ata_read(unsigned char* buf, int shortcount) | 55 | void dma_ata_read(unsigned char* buf, int shortcount) |
63 | { | 56 | { |
64 | char mes[30]; | ||
65 | snprintf(mes, 30, "read(0x%x, %d)", buf, shortcount); | ||
66 | debugj(mes); | ||
67 | |||
68 | if(dma_in_progress) | 57 | if(dma_in_progress) |
69 | wakeup_wait(&transfer_completion_signal, TIMEOUT_BLOCK); | 58 | wakeup_wait(&transfer_completion_signal, TIMEOUT_BLOCK); |
70 | 59 | ||
71 | if((unsigned long)buf & 0x1F) | ||
72 | debugj(" aligning"); | ||
73 | while((unsigned long)buf & 0x1F) | 60 | while((unsigned long)buf & 0x1F) |
74 | { | 61 | { |
75 | unsigned short tmp; | 62 | unsigned short tmp; |
@@ -94,17 +81,8 @@ void dma_ata_read(unsigned char* buf, int shortcount) | |||
94 | dma_in_progress = true; | 81 | dma_in_progress = true; |
95 | wakeup_wait(&transfer_completion_signal, TIMEOUT_BLOCK); | 82 | wakeup_wait(&transfer_completion_signal, TIMEOUT_BLOCK); |
96 | 83 | ||
97 | int i; | ||
98 | for(i = 0; i < 30; i++) | ||
99 | { | ||
100 | if(*buf++ != 0) | ||
101 | mes[i] = *buf; | ||
102 | } | ||
103 | debugj(mes); | ||
104 | |||
105 | if(shortcount % 2) | 84 | if(shortcount % 2) |
106 | { | 85 | { |
107 | debugj(" aligning"); | ||
108 | unsigned short tmp; | 86 | unsigned short tmp; |
109 | tmp = ATA_DATA; | 87 | tmp = ATA_DATA; |
110 | *buf++ = tmp & 0xFF; | 88 | *buf++ = tmp & 0xFF; |