projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Add support for 115200 baud serial rates
[fw/altos]
/
src
/
cc1111
/
ao_serial.c
diff --git
a/src/cc1111/ao_serial.c
b/src/cc1111/ao_serial.c
index 2a93bf523852dc98a255b0baea7a3a8f9b7111ba..8913a9b075333d1532064d5357aebd90051d7369 100644
(file)
--- a/
src/cc1111/ao_serial.c
+++ b/
src/cc1111/ao_serial.c
@@
-34,8
+34,14
@@
const __code struct ao_serial_speed ao_serial_speeds[] = {
/* .baud = */ 59,
/* .gcr = */ (11 << UxGCR_BAUD_E_SHIFT) | UxGCR_ORDER_LSB
},
/* .baud = */ 59,
/* .gcr = */ (11 << UxGCR_BAUD_E_SHIFT) | UxGCR_ORDER_LSB
},
+ /* [AO_SERIAL_SPEED_115200] = */ {
+ /* .baud = */ 59,
+ /* .gcr = */ (12 << UxGCR_BAUD_E_SHIFT) | UxGCR_ORDER_LSB
+ },
};
};
+#define AO_SERIAL_SPEED_MAX AO_SERIAL_SPEED_115200
+
#if HAS_SERIAL_0
volatile __xdata struct ao_fifo ao_serial0_rx_fifo;
#if HAS_SERIAL_0
volatile __xdata struct ao_fifo ao_serial0_rx_fifo;
@@
-116,7
+122,7
@@
void
ao_serial0_set_speed(uint8_t speed)
{
ao_serial0_drain();
ao_serial0_set_speed(uint8_t speed)
{
ao_serial0_drain();
- if (speed > AO_SERIAL_SPEED_
57600
)
+ if (speed > AO_SERIAL_SPEED_
MAX
)
return;
U0UCR |= UxUCR_FLUSH;
U0BAUD = ao_serial_speeds[speed].baud;
return;
U0UCR |= UxUCR_FLUSH;
U0BAUD = ao_serial_speeds[speed].baud;
@@
-204,7
+210,7
@@
void
ao_serial1_set_speed(uint8_t speed)
{
ao_serial1_drain();
ao_serial1_set_speed(uint8_t speed)
{
ao_serial1_drain();
- if (speed > AO_SERIAL_SPEED_
57600
)
+ if (speed > AO_SERIAL_SPEED_
MAX
)
return;
U1UCR |= UxUCR_FLUSH;
U1BAUD = ao_serial_speeds[speed].baud;
return;
U1UCR |= UxUCR_FLUSH;
U1BAUD = ao_serial_speeds[speed].baud;