diff options
| author | Keith Packard <keithp@keithp.com> | 2011-05-11 08:16:29 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-05-11 08:16:29 -0700 |
| commit | fef945e36c2397dd39b68995ed8d2ab81a4d24cd (patch) | |
| tree | 32260e89ee5bb0f77d56acb5c6b558b55154636f /src/ao_serial.c | |
| parent | 4c6fddf6f6ea7247291272af39966ab94260fb01 (diff) | |
| parent | 479bdffa35d0b8d4e48868c8d20f3cb1549521ab (diff) | |
Merge branch 'telebt' into telescience
Diffstat (limited to 'src/ao_serial.c')
| -rw-r--r-- | src/ao_serial.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/src/ao_serial.c b/src/ao_serial.c index 9c0b798d..2e7dad7b 100644 --- a/src/ao_serial.c +++ b/src/ao_serial.c @@ -127,6 +127,18 @@ ao_serial_set_speed(uint8_t speed) void ao_serial_init(void) { +#if HAS_SERIAL_1_ALT_1 + /* Set up the USART pin assignment */ + PERCFG = (PERCFG & ~PERCFG_U1CFG_ALT_MASK) | PERCFG_U1CFG_ALT_1; + + P2DIR = (P2DIR & ~P2DIR_PRIP0_MASK) | P2DIR_PRIP0_USART1_USART0; + + /* Make the USART pins be controlled by the USART */ + P0SEL |= (1 << 5) | (1 << 4); +#if HAS_SERIAL_1_HW_FLOW + P0SEL |= (1 << 3) | (1 << 2); +#endif +#else /* Set up the USART pin assignment */ PERCFG = (PERCFG & ~PERCFG_U1CFG_ALT_MASK) | PERCFG_U1CFG_ALT_2; @@ -135,6 +147,8 @@ ao_serial_init(void) /* Make the USART pins be controlled by the USART */ P1SEL |= (1 << 6) | (1 << 7); + P1SEL |= (1 << 5) | (1 << 4); +#endif /* UART mode with receiver enabled */ U1CSR = (UxCSR_MODE_UART | UxCSR_RE); @@ -144,7 +158,11 @@ ao_serial_init(void) /* Reasonable serial parameters */ U1UCR = (UxUCR_FLUSH | +#if HAS_SERIAL_1_HW_FLOW + UxUCR_FLOW_ENABLE | +#else UxUCR_FLOW_DISABLE | +#endif UxUCR_D9_EVEN_PARITY | UxUCR_BIT9_8_BITS | UxUCR_PARITY_DISABLE | |