diff options
author | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2008-05-05 15:47:26 +0000 |
---|---|---|
committer | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2008-05-05 15:47:26 +0000 |
commit | e025cb1c3816cf755ed61484695dcabfdcf649b3 (patch) | |
tree | ed01d9547a314ae3d68064ebecdd94d8c4a61bb2 /firmware/target | |
parent | 6d12109ef7d1293810ffa3696f4dc66bcafb557b (diff) | |
download | rockbox-e025cb1c3816cf755ed61484695dcabfdcf649b3.tar.gz rockbox-e025cb1c3816cf755ed61484695dcabfdcf649b3.zip |
Split up DMA and ATA, but don't enable it (yet).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17386 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target')
4 files changed, 185 insertions, 72 deletions
diff --git a/firmware/target/arm/tms320dm320/creative-zvm/ata-creativezvm.c b/firmware/target/arm/tms320dm320/creative-zvm/ata-creativezvm.c index 252239b62b..e43c8008c3 100644 --- a/firmware/target/arm/tms320dm320/creative-zvm/ata-creativezvm.c +++ b/firmware/target/arm/tms320dm320/creative-zvm/ata-creativezvm.c | |||
@@ -92,79 +92,9 @@ bool ata_is_coldstart(void) | |||
92 | return true; | 92 | return true; |
93 | } | 93 | } |
94 | 94 | ||
95 | #if 0 /* Disabled as device crashes; probably due to SDRAM addresses aren't 32-bit aligned */ | ||
96 | #define CS1_START 0x50000000 | ||
97 | #define DEST_ADDR (ATA_IOBASE-CS1_START) | ||
98 | static struct wakeup transfer_completion_signal; | ||
99 | |||
100 | void MTC0(void) | ||
101 | { | ||
102 | IO_INTC_IRQ1 = 1 << IRQ_MTC0; | ||
103 | wakeup_signal(&transfer_completion_signal); | ||
104 | } | ||
105 | |||
106 | void copy_read_sectors(unsigned char* buf, int wordcount) | ||
107 | { | ||
108 | bool lasthalfword = false; | ||
109 | unsigned short tmp; | ||
110 | if(wordcount < 16) | ||
111 | { | ||
112 | _copy_read_sectors(buf, wordcount); | ||
113 | return; | ||
114 | } | ||
115 | else if((unsigned long)buf % 32) /* Not 32-byte aligned */ | ||
116 | { | ||
117 | unsigned char* bufend = buf + ((unsigned long)buf % 32); | ||
118 | if( ((unsigned long)buf % 32) % 2 ) | ||
119 | lasthalfword = true; | ||
120 | wordcount -= ((unsigned long)buf % 32) / 2; | ||
121 | do | ||
122 | { | ||
123 | tmp = ATA_DATA; | ||
124 | *buf++ = tmp >> 8; | ||
125 | *buf++ = tmp & 0xff; | ||
126 | } while (buf < bufend); /* tail loop is faster */ | ||
127 | } | ||
128 | IO_SDRAM_SDDMASEL = 0x0830; /* 32-byte burst mode transfer */ | ||
129 | IO_EMIF_AHBADDH = ((unsigned)buf >> 16) & ~(1 << 15); /* Set variable address */ | ||
130 | IO_EMIF_AHBADDL = (unsigned)buf & 0xFFFF; | ||
131 | IO_EMIF_DMAMTCSEL = 1; /* Select CS1 */ | ||
132 | IO_EMIF_MTCADDH = ( (1 << 15) | (DEST_ADDR >> 16) ); /* Set fixed address */ | ||
133 | IO_EMIF_MTCADDL = DEST_ADDR & 0xFFFF; | ||
134 | IO_EMIF_DMASIZE = wordcount*2; | ||
135 | IO_EMIF_DMACTL = 3; /* Select MTC->AHB and start transfer */ | ||
136 | //wakeup_wait(&transfer_completion_signal, TIMEOUT_BLOCK); | ||
137 | while(IO_EMIF_DMACTL & 1) | ||
138 | nop; | ||
139 | if(lasthalfword) | ||
140 | { | ||
141 | *buf += wordcount * 2; | ||
142 | tmp = ATA_DATA; | ||
143 | *buf++ = tmp >> 8; | ||
144 | *buf++ = tmp & 0xff; | ||
145 | } | ||
146 | } | ||
147 | void copy_write_sectors(const unsigned char* buf, int wordcount) | ||
148 | { | ||
149 | IO_EMIF_DMAMTCSEL = 1; /* Select CS1 */ | ||
150 | IO_SDRAM_SDDMASEL = 0x0820; /* Temporarily set to standard value */ | ||
151 | IO_EMIF_AHBADDH = ((int)buf >> 16) & ~(1 << 15); /* Set variable address */ | ||
152 | IO_EMIF_AHBADDL = (int)buf & 0xFFFF; | ||
153 | IO_EMIF_MTCADDH = ( (1 << 15) | (DEST_ADDR >> 16) ); /* Set fixed address */ | ||
154 | IO_EMIF_MTCADDL = DEST_ADDR & 0xFFFF; | ||
155 | IO_EMIF_DMASIZE = wordcount; | ||
156 | IO_EMIF_DMACTL = 1; /* Select AHB->MTC and start transfer */ | ||
157 | wakeup_wait(&transfer_completion_signal, TIMEOUT_BLOCK); | ||
158 | } | ||
159 | #endif | ||
160 | |||
161 | void ata_device_init(void) | 95 | void ata_device_init(void) |
162 | { | 96 | { |
163 | IO_INTC_EINT1 |= INTR_EINT1_EXT2; /* enable GIO2 interrupt */ | 97 | IO_INTC_EINT1 |= INTR_EINT1_EXT2; /* enable GIO2 interrupt */ |
164 | #if 0 | ||
165 | IO_INTC_EINT1 |= 1 << IRQ_MTC0; /* enable MTC interrupt */ | ||
166 | wakeup_init(&transfer_completion_signal); | ||
167 | #endif | ||
168 | //TODO: mimic OF inits... | 98 | //TODO: mimic OF inits... |
169 | return; | 99 | return; |
170 | } | 100 | } |
diff --git a/firmware/target/arm/tms320dm320/creative-zvm/ata-target.h b/firmware/target/arm/tms320dm320/creative-zvm/ata-target.h index 67bc9de101..18b144edd1 100644 --- a/firmware/target/arm/tms320dm320/creative-zvm/ata-target.h +++ b/firmware/target/arm/tms320dm320/creative-zvm/ata-target.h | |||
@@ -20,10 +20,15 @@ | |||
20 | #ifndef ATA_TARGET_H | 20 | #ifndef ATA_TARGET_H |
21 | #define ATA_TARGET_H | 21 | #define ATA_TARGET_H |
22 | 22 | ||
23 | /* ASM optimized reading and writing */ | 23 | /* DMA optimized reading and writing */ |
24 | #define ATA_OPTIMIZED_READING | 24 | #define ATA_OPTIMIZED_READING |
25 | #define ATA_OPTIMIZED_WRITING | 25 | #define ATA_OPTIMIZED_WRITING |
26 | void copy_read_sectors(unsigned char* buf, int wordcount); | 26 | /* |
27 | #include "dma-target.h" | ||
28 | #define copy_read_sectors dma_ata_read | ||
29 | #define copy_write_sectors dma_ata_write | ||
30 | */ | ||
31 | void copy_read_sectors(const unsigned char* buf, int wordcount); | ||
27 | void copy_write_sectors(const unsigned char* buf, int wordcount); | 32 | void copy_write_sectors(const unsigned char* buf, int wordcount); |
28 | 33 | ||
29 | /* General purpose memory region #1 */ | 34 | /* General purpose memory region #1 */ |
diff --git a/firmware/target/arm/tms320dm320/creative-zvm/dma-creativezvm.c b/firmware/target/arm/tms320dm320/creative-zvm/dma-creativezvm.c new file mode 100644 index 0000000000..a714df84a8 --- /dev/null +++ b/firmware/target/arm/tms320dm320/creative-zvm/dma-creativezvm.c | |||
@@ -0,0 +1,150 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * $Id$ | ||
9 | * | ||
10 | * Copyright (C) 2008 by Maurus Cuelenaere | ||
11 | * | ||
12 | * All files in this archive are subject to the GNU General Public License. | ||
13 | * See the file COPYING in the source tree root for full license agreement. | ||
14 | * | ||
15 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | ||
16 | * KIND, either express or implied. | ||
17 | * | ||
18 | ****************************************************************************/ | ||
19 | |||
20 | #include "config.h" | ||
21 | #include "kernel.h" | ||
22 | #include "thread.h" | ||
23 | #include "system.h" | ||
24 | #include "dma-target.h" | ||
25 | #include "dm320.h" | ||
26 | #include "ata-target.h" | ||
27 | #include <stdbool.h> | ||
28 | |||
29 | #define CS1_START 0x50000000 | ||
30 | #define CS2_START 0x60000000 | ||
31 | #define SDRAM_START 0x00900000 | ||
32 | #define FLASH_START 0x00100000 | ||
33 | #define CF_START 0x40000000 | ||
34 | #define SSFDC_START 0x48000000 | ||
35 | |||
36 | static struct wakeup transfer_completion_signal; | ||
37 | |||
38 | static bool dma_in_progress = false; | ||
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) | ||
48 | { | ||
49 | IO_INTC_IRQ1 = INTR_IRQ1_MTC0; | ||
50 | wakeup_signal(&transfer_completion_signal); | ||
51 | dma_in_progress = false; | ||
52 | } | ||
53 | |||
54 | void dma_start(const void* addr, size_t size) | ||
55 | { | ||
56 | /* Compatibility with Gigabeat S in dma_start.c */ | ||
57 | (void) addr; | ||
58 | (void) size; | ||
59 | } | ||
60 | |||
61 | #define ATA_DEST (ATA_IOBASE-CS1_START) | ||
62 | void dma_ata_read(unsigned char* buf, int shortcount) | ||
63 | { | ||
64 | char mes[30]; | ||
65 | snprintf(mes, 30, "read(0x%x, %d)", buf, shortcount); | ||
66 | debugj(mes); | ||
67 | |||
68 | if(dma_in_progress) | ||
69 | wakeup_wait(&transfer_completion_signal, TIMEOUT_BLOCK); | ||
70 | |||
71 | if((unsigned long)buf & 0x1F) | ||
72 | debugj(" aligning"); | ||
73 | while((unsigned long)buf & 0x1F) | ||
74 | { | ||
75 | unsigned short tmp; | ||
76 | tmp = ATA_DATA; | ||
77 | *buf++ = tmp & 0xFF; | ||
78 | *buf++ = tmp >> 8; | ||
79 | shortcount--; | ||
80 | } | ||
81 | |||
82 | if (!shortcount) | ||
83 | return; | ||
84 | |||
85 | IO_SDRAM_SDDMASEL = 0x0820; /* 32-byte burst mode transfer */ | ||
86 | IO_EMIF_DMAMTCSEL = 1; /* Select CS1 */ | ||
87 | IO_EMIF_AHBADDH = ((unsigned long)buf >> 16) & 0x7FFF; /* Set variable address */ | ||
88 | IO_EMIF_AHBADDL = (unsigned long)buf & 0xFFFF; | ||
89 | IO_EMIF_MTCADDH = ( (1 << 15) | (ATA_DEST >> 16) ); /* Set fixed address */ | ||
90 | IO_EMIF_MTCADDL = ATA_DEST & 0xFFFF; | ||
91 | IO_EMIF_DMASIZE = shortcount/2; /* 16-bits *2 = 1 word */ | ||
92 | IO_EMIF_DMACTL = 3; /* Select MTC->AHB and start transfer */ | ||
93 | |||
94 | dma_in_progress = true; | ||
95 | wakeup_wait(&transfer_completion_signal, TIMEOUT_BLOCK); | ||
96 | |||
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) | ||
106 | { | ||
107 | debugj(" aligning"); | ||
108 | unsigned short tmp; | ||
109 | tmp = ATA_DATA; | ||
110 | *buf++ = tmp & 0xFF; | ||
111 | *buf++ = tmp >> 8; | ||
112 | } | ||
113 | } | ||
114 | |||
115 | void dma_ata_write(unsigned char* buf, int wordcount) | ||
116 | { | ||
117 | if(dma_in_progress) | ||
118 | wakeup_wait(&transfer_completion_signal, TIMEOUT_BLOCK); | ||
119 | |||
120 | while((unsigned long)buf & 0x1F) | ||
121 | { | ||
122 | unsigned short tmp; | ||
123 | tmp = (unsigned short) *buf++; | ||
124 | tmp |= (unsigned short) *buf++ << 8; | ||
125 | SET_16BITREG(ATA_DATA, tmp); | ||
126 | wordcount--; | ||
127 | } | ||
128 | |||
129 | if (!wordcount) | ||
130 | return; | ||
131 | |||
132 | IO_SDRAM_SDDMASEL = 0x0830; /* 32-byte burst mode transfer */ | ||
133 | IO_EMIF_DMAMTCSEL = 1; /* Select CS1 */ | ||
134 | IO_EMIF_AHBADDH = ((unsigned long)buf >> 16) & ~(1 << 15); /* Set variable address */ | ||
135 | IO_EMIF_AHBADDL = (unsigned long)buf & 0xFFFF; | ||
136 | IO_EMIF_MTCADDH = ( (1 << 15) | (ATA_DEST >> 16) ); /* Set fixed address */ | ||
137 | IO_EMIF_MTCADDL = ATA_DEST & 0xFFFF; | ||
138 | IO_EMIF_DMASIZE = (wordcount+1)/2; | ||
139 | IO_EMIF_DMACTL = 1; /* Select AHB->MTC and start transfer */ | ||
140 | |||
141 | dma_in_progress = true; | ||
142 | wakeup_wait(&transfer_completion_signal, TIMEOUT_BLOCK); | ||
143 | } | ||
144 | |||
145 | void dma_init(void) | ||
146 | { | ||
147 | IO_INTC_EINT1 |= INTR_EINT1_MTC0; /* enable MTC interrupt */ | ||
148 | wakeup_init(&transfer_completion_signal); | ||
149 | dma_in_progress = false; | ||
150 | } | ||
diff --git a/firmware/target/arm/tms320dm320/creative-zvm/dma-target.h b/firmware/target/arm/tms320dm320/creative-zvm/dma-target.h new file mode 100644 index 0000000000..4573152a92 --- /dev/null +++ b/firmware/target/arm/tms320dm320/creative-zvm/dma-target.h | |||
@@ -0,0 +1,28 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * $Id$ | ||
9 | * | ||
10 | * Copyright (C) 2008 by Maurus Cuelenaere | ||
11 | * | ||
12 | * All files in this archive are subject to the GNU General Public License. | ||
13 | * See the file COPYING in the source tree root for full license agreement. | ||
14 | * | ||
15 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | ||
16 | * KIND, either express or implied. | ||
17 | * | ||
18 | ****************************************************************************/ | ||
19 | |||
20 | #ifndef DMA_TARGET_H | ||
21 | #define DMA_TARGET_H | ||
22 | |||
23 | void dma_start(const void* addr, size_t size); /* Compatibility with Gigabeat S in dma_start.c */ | ||
24 | void dma_ata_read(unsigned char* buf, int wordcount); | ||
25 | void dma_ata_write(unsigned char* buf, int wordcount); | ||
26 | void dma_init(void); | ||
27 | |||
28 | #endif | ||