From 797840a969fb20055dbf95c36e557d67533a8636 Mon Sep 17 00:00:00 2001 From: "R. Steve McKown" Date: Fri, 15 Jan 2010 08:32:26 -0700 Subject: [PATCH] Collapse two sections that are exactly the same. --- tos/chips/msp430/usci/HplMsp430UsciC.nc | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/tos/chips/msp430/usci/HplMsp430UsciC.nc b/tos/chips/msp430/usci/HplMsp430UsciC.nc index 051e6546..8bebd132 100644 --- a/tos/chips/msp430/usci/HplMsp430UsciC.nc +++ b/tos/chips/msp430/usci/HplMsp430UsciC.nc @@ -62,24 +62,7 @@ configuration HplMsp430UsciC { } } implementation { -#if defined(__MSP430_HAS_USCI_AB0__) - components new HplMsp430UsciRegP(UCA0CTL0_, UCA0CTL1_, UCA0BR0_, UCA0BR1_, - UCA0MCTL_, 0/*UCA0I2CIE_*/, UCA0STAT_, UCA0RXBUF_, UCA0TXBUF_, UCA0ABCTL_, - UCA0IRTCTL_, UCA0IRRCTL_, 0/*UCA0I2COA_*/, 0/*UCA0I2CSA_*/, IE2_, IFG2_, - UCA0RXIFG, UCA0TXIFG) - as RegA0P; - RegA0 = RegA0P.Registers; - - components new HplMsp430UsciRegP(UCB0CTL0_, UCB0CTL1_, UCB0BR0_, UCB0BR1_, - 0/*UCB0MCTL_*/, UCB0I2CIE_, UCB0STAT_, UCB0RXBUF_, UCB0TXBUF_, - 0/*UCB0ABCTL_*/, 0/*UCB0IRTCTL_*/, 0/*UCB0IRRCTL_*/, UCB0I2COA_, - UCB0I2CSA_, IE2_, IFG2_, UCB0RXIFG, UCB0TXIFG) as RegB0P; - RegB0 = RegB0P.Registers; - - components HplMsp430UsciInt0P as Int0P; - IntA0 = Int0P.IntA; - IntB0 = Int0P.IntB; -#elif defined(__MSP430_HAS_USCI__) +#if defined(__MSP430_HAS_USCI_AB0__) || defined(__MSP430_HAS_USCI__) components new HplMsp430UsciRegP(UCA0CTL0_, UCA0CTL1_, UCA0BR0_, UCA0BR1_, UCA0MCTL_, 0/*UCA0I2CIE_*/, UCA0STAT_, UCA0RXBUF_, UCA0TXBUF_, UCA0ABCTL_, UCA0IRTCTL_, UCA0IRRCTL_, 0/*UCA0I2COA_*/, 0/*UCA0I2CSA_*/, IE2_, IFG2_, -- 2.39.2