diff options
| author | Dave Chapman <dave@dchapman.com> | 2011-02-12 21:28:23 +0000 |
|---|---|---|
| committer | Dave Chapman <dave@dchapman.com> | 2011-02-12 21:28:23 +0000 |
| commit | e8e0ca2c573189d14a98c4644aeac0b02a7b12a8 (patch) | |
| tree | 50f7fc385da1cbd8c87d826746457b55b8a85a4a /firmware/drivers/serial.c | |
| parent | 50c727ce7a0064d9c56bc5a963f3fb1f32726276 (diff) | |
| download | rockbox-e8e0ca2c573189d14a98c4644aeac0b02a7b12a8.tar.gz rockbox-e8e0ca2c573189d14a98c4644aeac0b02a7b12a8.zip | |
Use target names instead of model numbers in #if statements - nowhere else uses MODEL_NUMBER.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29290 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/drivers/serial.c')
| -rw-r--r-- | firmware/drivers/serial.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/firmware/drivers/serial.c b/firmware/drivers/serial.c index eb2df9890b..26637f140c 100644 --- a/firmware/drivers/serial.c +++ b/firmware/drivers/serial.c | |||
| @@ -252,12 +252,10 @@ void serial_setup (void) | |||
| 252 | { | 252 | { |
| 253 | int tmp; | 253 | int tmp; |
| 254 | 254 | ||
| 255 | #if (MODEL_NUMBER == 3) || (MODEL_NUMBER == 8) | 255 | #if defined(IPOD_COLOR) || defined(IPOD_4G) |
| 256 | |||
| 257 | /* Route the Tx/Rx pins. 4G Ipod??? */ | 256 | /* Route the Tx/Rx pins. 4G Ipod??? */ |
| 258 | outl(0x70000018, inl(0x70000018) & ~0xc00); | 257 | outl(0x70000018, inl(0x70000018) & ~0xc00); |
| 259 | #elif (MODEL_NUMBER == 4) || (MODEL_NUMBER == 5) | 258 | #elif defined(IPOD_NANO) || defined(IPOD_VIDEO) |
| 260 | |||
| 261 | /* Route the Tx/Rx pins. 5G Ipod */ | 259 | /* Route the Tx/Rx pins. 5G Ipod */ |
| 262 | (*(volatile unsigned long *)(0x7000008C)) &= ~0x0C; | 260 | (*(volatile unsigned long *)(0x7000008C)) &= ~0x0C; |
| 263 | GPO32_ENABLE &= ~0x0C; | 261 | GPO32_ENABLE &= ~0x0C; |