summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2012-07-29 19:36:50 -0700
committerKeith Packard <keithp@keithp.com>2012-07-29 19:36:50 -0700
commit21e39811bd234c6f66ab7644864fcc1b8c316998 (patch)
tree5615600d70ab4b17dd04aa2b30e097126ae9d6f6 /src
parent743dca54012758d3ae54312d542b34afa88495cd (diff)
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>
Diffstat (limited to 'src')
-rw-r--r--src/cc1111/Makefile.cc11112
-rw-r--r--src/cc1111/ao_serial.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/cc1111/Makefile.cc1111 b/src/cc1111/Makefile.cc1111
index f7ecce33..bfd444dd 100644
--- 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 00c85ff3..d90103b0 100644
--- 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