From e8e0ca2c573189d14a98c4644aeac0b02a7b12a8 Mon Sep 17 00:00:00 2001 From: Dave Chapman Date: Sat, 12 Feb 2011 21:28:23 +0000 Subject: [PATCH] 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 --- firmware/drivers/serial.c | 6 ++---- 1 file 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) { int tmp; -#if (MODEL_NUMBER == 3) || (MODEL_NUMBER == 8) - +#if defined(IPOD_COLOR) || defined(IPOD_4G) /* Route the Tx/Rx pins. 4G Ipod??? */ outl(0x70000018, inl(0x70000018) & ~0xc00); -#elif (MODEL_NUMBER == 4) || (MODEL_NUMBER == 5) - +#elif defined(IPOD_NANO) || defined(IPOD_VIDEO) /* Route the Tx/Rx pins. 5G Ipod */ (*(volatile unsigned long *)(0x7000008C)) &= ~0x0C; GPO32_ENABLE &= ~0x0C;