altos/cc1111: Fix serial 0 option 2 pins definitions

tx/rx are 4/5, rts/cts are 2/3

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/src/cc1111/Makefile.cc1111 b/src/cc1111/Makefile.cc1111
index f7ecce33d019597ad9d25a95bbacdc268db78b75..bfd444ddc1621cc23d06c155ed493d84ae5782ad 100644 (file)
--- a/src/cc1111/Makefile.cc1111
+++ b/src/cc1111/Makefile.cc1111
@@ -2,7 +2,7 @@ CC=sdcc
 
 CFLAGS=--model-small --debug --opt-code-speed -DCODESIZE=$(CODESIZE)
 
-CFLAGS += $(PRODUCT_DEF) -I. -I.. -I../core -I../cc1111 -I../driver -I../product
+CFLAGS += $(PRODUCT_DEF) -I. -I.. -I../core -I../cc1111 -I../drivers -I../product
 
 CODESIZE ?= 0x8000
 

diff --git a/src/cc1111/ao_serial.c b/src/cc1111/ao_serial.c
index 00c85ff3fa268e7b31caab8fa999a4f665c02cd5..d90103b0f09e6b64c585d62339990dc44651a4a4 100644 (file)
--- a/src/cc1111/ao_serial.c
+++ b/src/cc1111/ao_serial.c
@@ -236,9 +236,9 @@ ao_serial_init(void)
                (P2SEL_PRI3P1_USART0 | P2SEL_PRI0P1_USART0);
 
        /* Make the USART pins be controlled by the USART */
-       P1SEL |= (1 << 2) | (1 << 3);
-#if HAS_SERIAL_0_HW_FLOW
        P1SEL |= (1 << 5) | (1 << 4);
+#if HAS_SERIAL_0_HW_FLOW
+       P1SEL |= (1 << 3) | (1 << 2);
 #endif
 #endif