diff options
author | andypotter <liveboxandy@gmail.com> | 2013-04-15 20:09:39 +0100 |
---|---|---|
committer | Marcin Bukat <marcin.bukat@gmail.com> | 2013-04-25 21:02:09 +0200 |
commit | ecaa40166000e3d6b49542d42804127c0a6079e2 (patch) | |
tree | 35ce073fb6d63f90fa3be39aa7433907327b8998 /firmware/target | |
parent | 354c9894062886443e1c53cc4dc5669a1d72a5f4 (diff) | |
download | rockbox-ecaa40166000e3d6b49542d42804127c0a6079e2.tar.gz rockbox-ecaa40166000e3d6b49542d42804127c0a6079e2.zip |
Add Serial Port 1 support for iPod Photo/Color/4G/Mini2G
Based on FS#9920 by Ryan Press with changes to selection logic so
that it works on my iPod Photo. Should also work on iPod Color/4G
and Mini2G. Moved all target specific code from
firmware/drivers/serial.c into new file
firmware/target/arm/pp/uart-pp.c in the same manner as other
target specific uart code.
Update to fix build error on ipodmini2g by adding defines in config file.
Removed unwanted whitespace
Tested on iPod Photo.
Change-Id: Ia5539563966198e06372d70b5adf2ef78882f863
Reviewed-on: http://gerrit.rockbox.org/455
Reviewed-by: andypotter <liveboxandy@gmail.com>
Tested-by: andypotter <liveboxandy@gmail.com>
Reviewed-by: Marcin Bukat <marcin.bukat@gmail.com>
Diffstat (limited to 'firmware/target')
-rw-r--r-- | firmware/target/arm/pp/system-pp502x.c | 20 | ||||
-rw-r--r-- | firmware/target/arm/pp/uart-pp.c | 265 |
2 files changed, 274 insertions, 11 deletions
diff --git a/firmware/target/arm/pp/system-pp502x.c b/firmware/target/arm/pp/system-pp502x.c index d3331bf9f4..af2e6d7761 100644 --- a/firmware/target/arm/pp/system-pp502x.c +++ b/firmware/target/arm/pp/system-pp502x.c | |||
@@ -32,7 +32,7 @@ | |||
32 | #if !defined(BOOTLOADER) || defined(HAVE_BOOTLOADER_USB_MODE) | 32 | #if !defined(BOOTLOADER) || defined(HAVE_BOOTLOADER_USB_MODE) |
33 | extern void TIMER1(void); | 33 | extern void TIMER1(void); |
34 | extern void TIMER2(void); | 34 | extern void TIMER2(void); |
35 | extern void SERIAL0(void); | 35 | extern void SERIAL_ISR(void); |
36 | 36 | ||
37 | #if defined(HAVE_ADJUSTABLE_CPU_FREQ) && (NUM_CORES > 1) | 37 | #if defined(HAVE_ADJUSTABLE_CPU_FREQ) && (NUM_CORES > 1) |
38 | static struct corelock cpufreq_cl SHAREDBSS_ATTR; | 38 | static struct corelock cpufreq_cl SHAREDBSS_ATTR; |
@@ -126,7 +126,6 @@ void __attribute__((interrupt("IRQ"))) irq_handler(void) | |||
126 | button_int(); | 126 | button_int(); |
127 | if (GPIOD_INT_STAT & 0x80) | 127 | if (GPIOD_INT_STAT & 0x80) |
128 | headphones_int(); | 128 | headphones_int(); |
129 | |||
130 | } | 129 | } |
131 | else if (CPU_HI_INT_STAT & GPIO2_MASK) { | 130 | else if (CPU_HI_INT_STAT & GPIO2_MASK) { |
132 | if (GPIOL_INT_STAT & 0x04) | 131 | if (GPIOL_INT_STAT & 0x04) |
@@ -169,8 +168,8 @@ void __attribute__((interrupt("IRQ"))) irq_handler(void) | |||
169 | /* end PBELL_VIBE500 */ | 168 | /* end PBELL_VIBE500 */ |
170 | #endif | 169 | #endif |
171 | #ifdef IPOD_ACCESSORY_PROTOCOL | 170 | #ifdef IPOD_ACCESSORY_PROTOCOL |
172 | else if (CPU_HI_INT_STAT & SER0_MASK) { | 171 | else if (CPU_HI_INT_STAT & (SER0_MASK | SER1_MASK)) { |
173 | SERIAL0(); | 172 | SERIAL_ISR(); |
174 | } | 173 | } |
175 | #endif | 174 | #endif |
176 | } else { | 175 | } else { |
@@ -310,7 +309,7 @@ void set_cpu_frequency(long frequency) | |||
310 | #else | 309 | #else |
311 | static void pp_set_cpu_frequency(long frequency) | 310 | static void pp_set_cpu_frequency(long frequency) |
312 | #endif | 311 | #endif |
313 | { | 312 | { |
314 | #if defined(HAVE_ADJUSTABLE_CPU_FREQ) && (NUM_CORES > 1) | 313 | #if defined(HAVE_ADJUSTABLE_CPU_FREQ) && (NUM_CORES > 1) |
315 | corelock_lock(&cpufreq_cl); | 314 | corelock_lock(&cpufreq_cl); |
316 | #endif | 315 | #endif |
@@ -334,7 +333,7 @@ static void pp_set_cpu_frequency(long frequency) | |||
334 | PLL_CONTROL &= ~0x80000000; /* disable PLL */ | 333 | PLL_CONTROL &= ~0x80000000; /* disable PLL */ |
335 | DEV_INIT2 &= ~INIT_PLL; /* disable PLL power */ | 334 | DEV_INIT2 &= ~INIT_PLL; /* disable PLL power */ |
336 | break; | 335 | break; |
337 | 336 | ||
338 | case CPUFREQ_MAX: | 337 | case CPUFREQ_MAX: |
339 | cpu_frequency = CPUFREQ_MAX; | 338 | cpu_frequency = CPUFREQ_MAX; |
340 | DEV_INIT2 |= INIT_PLL; /* enable PLL power */ | 339 | DEV_INIT2 |= INIT_PLL; /* enable PLL power */ |
@@ -379,7 +378,7 @@ static void pp_set_cpu_frequency(long frequency) | |||
379 | DEV_INIT2 &= ~INIT_PLL; /* disable PLL power */ | 378 | DEV_INIT2 &= ~INIT_PLL; /* disable PLL power */ |
380 | break; | 379 | break; |
381 | #else /******** CPUFREQ_NORMAL = 30MHz with PLL ********/ | 380 | #else /******** CPUFREQ_NORMAL = 30MHz with PLL ********/ |
382 | case CPUFREQ_NORMAL: | 381 | case CPUFREQ_NORMAL: |
383 | cpu_frequency = CPUFREQ_NORMAL; | 382 | cpu_frequency = CPUFREQ_NORMAL; |
384 | DEV_INIT2 |= INIT_PLL; /* enable PLL power */ | 383 | DEV_INIT2 |= INIT_PLL; /* enable PLL power */ |
385 | PLL_CONTROL |= 0x88000000; /* enable PLL */ | 384 | PLL_CONTROL |= 0x88000000; /* enable PLL */ |
@@ -421,7 +420,7 @@ static void pp_set_cpu_frequency(long frequency) | |||
421 | DEV_INIT2 &= ~INIT_PLL; /* disable PLL power */ | 420 | DEV_INIT2 &= ~INIT_PLL; /* disable PLL power */ |
422 | break; | 421 | break; |
423 | } | 422 | } |
424 | 423 | ||
425 | #if defined(HAVE_ADJUSTABLE_CPU_FREQ) && (NUM_CORES > 1) | 424 | #if defined(HAVE_ADJUSTABLE_CPU_FREQ) && (NUM_CORES > 1) |
426 | corelock_unlock(&cpufreq_cl); | 425 | corelock_unlock(&cpufreq_cl); |
427 | #endif | 426 | #endif |
@@ -447,7 +446,7 @@ void system_init(void) | |||
447 | DEV_RS2 = 0xffffdfff; | 446 | DEV_RS2 = 0xffffdfff; |
448 | DEV_RS = 0x00000000; | 447 | DEV_RS = 0x00000000; |
449 | DEV_RS2 = 0x00000000; | 448 | DEV_RS2 = 0x00000000; |
450 | #elif defined (IPOD_VIDEO) | 449 | #elif defined (IPOD_VIDEO) |
451 | /* set minimum startup configuration */ | 450 | /* set minimum startup configuration */ |
452 | DEV_EN = 0xc2000124; | 451 | DEV_EN = 0xc2000124; |
453 | DEV_EN2 = 0x00000000; | 452 | DEV_EN2 = 0x00000000; |
@@ -461,7 +460,7 @@ void system_init(void) | |||
461 | DEV_RS2 = 0xffffffff; | 460 | DEV_RS2 = 0xffffffff; |
462 | DEV_RS = 0x00000000; | 461 | DEV_RS = 0x00000000; |
463 | DEV_RS2 = 0x00000000; | 462 | DEV_RS2 = 0x00000000; |
464 | #elif defined (IPOD_NANO) | 463 | #elif defined (IPOD_NANO) |
465 | /* set minimum startup configuration */ | 464 | /* set minimum startup configuration */ |
466 | DEV_EN = 0xc2000124; | 465 | DEV_EN = 0xc2000124; |
467 | DEV_EN2 = 0x00002000; | 466 | DEV_EN2 = 0x00002000; |
@@ -625,4 +624,3 @@ int system_memory_guard(int newmode) | |||
625 | (void)newmode; | 624 | (void)newmode; |
626 | return 0; | 625 | return 0; |
627 | } | 626 | } |
628 | |||
diff --git a/firmware/target/arm/pp/uart-pp.c b/firmware/target/arm/pp/uart-pp.c new file mode 100644 index 0000000000..612ffdf77c --- /dev/null +++ b/firmware/target/arm/pp/uart-pp.c | |||
@@ -0,0 +1,265 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * $Id$ | ||
9 | * | ||
10 | * Copyright (C) 2002 by Alan Korr & Nick Robinson | ||
11 | * | ||
12 | * This program is free software; you can redistribute it and/or | ||
13 | * modify it under the terms of the GNU General Public License | ||
14 | * as published by the Free Software Foundation; either version 2 | ||
15 | * of the License, or (at your option) any later version. | ||
16 | * | ||
17 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | ||
18 | * KIND, either express or implied. | ||
19 | * | ||
20 | ****************************************************************************/ | ||
21 | #include <stdio.h> | ||
22 | #include <stdlib.h> | ||
23 | #include <stdarg.h> | ||
24 | #include "button.h" | ||
25 | #include "config.h" | ||
26 | #include "cpu.h" | ||
27 | #include "system.h" | ||
28 | #include "kernel.h" | ||
29 | #include "lcd.h" | ||
30 | #include "serial.h" | ||
31 | #include "iap.h" | ||
32 | |||
33 | #if defined(IPOD_ACCESSORY_PROTOCOL) | ||
34 | static int autobaud = 0; | ||
35 | volatile unsigned long * base_RBR, * base_THR, * base_LCR, * base_LSR, * base_DLL; | ||
36 | |||
37 | static void set_bitrate(unsigned int rate) | ||
38 | { | ||
39 | unsigned int divisor; | ||
40 | |||
41 | divisor = 24000000L / rate / 16; | ||
42 | *base_LCR = 0x80; /* Divisor latch enable */ | ||
43 | *base_DLL = (divisor >> 0) & 0xFF; | ||
44 | *base_LCR = 0x03; /* Divisor latch disable, 8-N-1 */ | ||
45 | } | ||
46 | |||
47 | void serial_setup (void) | ||
48 | { | ||
49 | int tmp; | ||
50 | |||
51 | #if defined(IPOD_COLOR) || defined(IPOD_4G) || defined(IPOD_MINI2G) | ||
52 | |||
53 | /* Route the Tx/Rx pins. 4G Ipod, ser1, dock connector */ | ||
54 | GPIO_CLEAR_BITWISE(GPIOD_ENABLE, 0x6); | ||
55 | GPIO_CLEAR_BITWISE(GPIOD_OUTPUT_EN, 0x6); | ||
56 | |||
57 | outl(0x70000018, inl(0x70000018) & ~0xc00); | ||
58 | |||
59 | base_RBR = &SER1_RBR; | ||
60 | base_THR = &SER1_THR; | ||
61 | base_LCR = &SER1_LCR; | ||
62 | base_LSR = &SER1_LSR; | ||
63 | base_DLL = &SER1_DLL; | ||
64 | |||
65 | DEV_EN |= DEV_SER1; | ||
66 | CPU_HI_INT_DIS = SER1_MASK; | ||
67 | |||
68 | DEV_RS |= DEV_SER1; | ||
69 | sleep(1); | ||
70 | DEV_RS &= ~DEV_SER1; | ||
71 | |||
72 | SER1_LCR = 0x80; /* Divisor latch enable */ | ||
73 | SER1_DLM = 0x00; | ||
74 | SER1_LCR = 0x03; /* Divisor latch disable, 8-N-1 */ | ||
75 | SER1_IER = 0x01; | ||
76 | |||
77 | SER1_FCR = 0x07; /* Tx+Rx FIFO reset and FIFO enable */ | ||
78 | |||
79 | CPU_INT_EN = HI_MASK; | ||
80 | CPU_HI_INT_EN = SER1_MASK; | ||
81 | tmp = SER1_RBR; | ||
82 | |||
83 | #elif defined(IPOD_NANO) || defined(IPOD_VIDEO) | ||
84 | /* Route the Tx/Rx pins. 5G Ipod */ | ||
85 | (*(volatile unsigned long *)(0x7000008C)) &= ~0x0C; | ||
86 | GPO32_ENABLE &= ~0x0C; | ||
87 | |||
88 | base_RBR = &SER0_RBR; | ||
89 | base_THR = &SER0_THR; | ||
90 | base_LCR = &SER0_LCR; | ||
91 | base_LSR = &SER0_LSR; | ||
92 | base_DLL = &SER0_DLL; | ||
93 | |||
94 | DEV_EN = DEV_EN | DEV_SER0; | ||
95 | CPU_HI_INT_DIS = SER0_MASK; | ||
96 | |||
97 | DEV_RS |= DEV_SER0; | ||
98 | sleep(1); | ||
99 | DEV_RS &= ~DEV_SER0; | ||
100 | |||
101 | SER0_LCR = 0x80; /* Divisor latch enable */ | ||
102 | SER0_DLM = 0x00; | ||
103 | SER0_LCR = 0x03; /* Divisor latch disable, 8-N-1 */ | ||
104 | SER0_IER = 0x01; | ||
105 | |||
106 | SER0_FCR = 0x07; /* Tx+Rx FIFO reset and FIFO enable */ | ||
107 | |||
108 | CPU_INT_EN = HI_MASK; | ||
109 | CPU_HI_INT_EN = SER0_MASK; | ||
110 | tmp = SER0_RBR; | ||
111 | |||
112 | #else | ||
113 | |||
114 | /* Default Route the Tx/Rx pins. 4G Ipod, ser0, top connector */ | ||
115 | |||
116 | GPIO_CLEAR_BITWISE(GPIOC_INT_EN, 0x8); | ||
117 | GPIO_CLEAR_BITWISE(GPIOC_INT_LEV, 0x8); | ||
118 | GPIOC_INT_CLR = 0x8; | ||
119 | |||
120 | base_RBR = &SER0_RBR; | ||
121 | base_THR = &SER0_THR; | ||
122 | base_LCR = &SER0_LCR; | ||
123 | base_LSR = &SER0_LSR; | ||
124 | base_DLL = &SER0_DLL; | ||
125 | |||
126 | DEV_EN |= DEV_SER0; | ||
127 | CPU_HI_INT_DIS = SER0_MASK; | ||
128 | |||
129 | DEV_RS |= DEV_SER0; | ||
130 | sleep(1); | ||
131 | DEV_RS &= ~DEV_SER0; | ||
132 | |||
133 | SER0_LCR = 0x80; /* Divisor latch enable */ | ||
134 | SER0_DLM = 0x00; | ||
135 | SER0_LCR = 0x03; /* Divisor latch disable, 8-N-1 */ | ||
136 | SER0_IER = 0x01; | ||
137 | |||
138 | SER0_FCR = 0x07; /* Tx+Rx FIFO reset and FIFO enable */ | ||
139 | |||
140 | CPU_INT_EN = HI_MASK; | ||
141 | CPU_HI_INT_EN = SER0_MASK; | ||
142 | tmp = SER0_RBR; | ||
143 | |||
144 | #endif | ||
145 | |||
146 | serial_bitrate(0); | ||
147 | } | ||
148 | |||
149 | void serial_bitrate(int rate) | ||
150 | { | ||
151 | if(rate == 0) | ||
152 | { | ||
153 | autobaud = 2; | ||
154 | set_bitrate(115200); | ||
155 | } | ||
156 | else | ||
157 | { | ||
158 | autobaud = 0; | ||
159 | set_bitrate(rate); | ||
160 | } | ||
161 | } | ||
162 | |||
163 | int tx_rdy(void) | ||
164 | { | ||
165 | if((*base_LSR & 0x20)) | ||
166 | return 1; | ||
167 | else | ||
168 | return 0; | ||
169 | } | ||
170 | |||
171 | static int rx_rdy(void) | ||
172 | { | ||
173 | if((*base_LSR & 0x1)) | ||
174 | return 1; | ||
175 | else | ||
176 | return 0; | ||
177 | } | ||
178 | |||
179 | void tx_writec(unsigned char c) | ||
180 | { | ||
181 | *base_THR =(int) c; | ||
182 | } | ||
183 | |||
184 | static unsigned char rx_readc(void) | ||
185 | { | ||
186 | return (*base_RBR & 0xFF); | ||
187 | } | ||
188 | |||
189 | void SERIAL_ISR(void) | ||
190 | { | ||
191 | static int badbaud = 0; | ||
192 | static bool newpkt = true; | ||
193 | char temp; | ||
194 | |||
195 | while(rx_rdy()) | ||
196 | { | ||
197 | temp = rx_readc(); | ||
198 | if (newpkt && autobaud > 0) | ||
199 | { | ||
200 | if (autobaud == 1) | ||
201 | { | ||
202 | switch (temp) | ||
203 | { | ||
204 | case 0xFF: | ||
205 | case 0x55: | ||
206 | break; | ||
207 | case 0xFC: | ||
208 | set_bitrate(19200); | ||
209 | temp = 0xFF; | ||
210 | break; | ||
211 | case 0xE0: | ||
212 | set_bitrate(9600); | ||
213 | temp = 0xFF; | ||
214 | break; | ||
215 | default: | ||
216 | badbaud++; | ||
217 | if (badbaud >= 6) /* Switch baud detection mode */ | ||
218 | { | ||
219 | autobaud = 2; | ||
220 | set_bitrate(115200); | ||
221 | badbaud = 0; | ||
222 | } else { | ||
223 | set_bitrate(57600); | ||
224 | } | ||
225 | continue; | ||
226 | } | ||
227 | } else { | ||
228 | switch (temp) | ||
229 | { | ||
230 | case 0xFF: | ||
231 | case 0x55: | ||
232 | break; | ||
233 | case 0xFE: | ||
234 | set_bitrate(57600); | ||
235 | temp = 0xFF; | ||
236 | break; | ||
237 | case 0xFC: | ||
238 | set_bitrate(38400); | ||
239 | temp = 0xFF; | ||
240 | break; | ||
241 | case 0xE0: | ||
242 | set_bitrate(19200); | ||
243 | temp = 0xFF; | ||
244 | break; | ||
245 | default: | ||
246 | badbaud++; | ||
247 | if (badbaud >= 6) /* Switch baud detection */ | ||
248 | { | ||
249 | autobaud = 1; | ||
250 | set_bitrate(57600); | ||
251 | badbaud = 0; | ||
252 | } else { | ||
253 | set_bitrate(115200); | ||
254 | } | ||
255 | continue; | ||
256 | } | ||
257 | } | ||
258 | } | ||
259 | bool pkt = iap_getc(temp); | ||
260 | if(newpkt && !pkt) | ||
261 | autobaud = 0; /* Found good baud */ | ||
262 | newpkt = pkt; | ||
263 | } | ||
264 | } | ||
265 | #endif | ||