projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosuilib: Wait for product data while scanning
[fw/altos]
/
src
/
cc1111
/
ao_serial.c
diff --git
a/src/cc1111/ao_serial.c
b/src/cc1111/ao_serial.c
index 8913a9b075333d1532064d5357aebd90051d7369..81727836d260e84ab88f3a1ae78c559296d9a525 100644
(file)
--- a/
src/cc1111/ao_serial.c
+++ b/
src/cc1111/ao_serial.c
@@
-92,7
+92,7
@@
ao_serial0_getchar(void) __critical
#if USE_SERIAL_0_STDIN
int
#if USE_SERIAL_0_STDIN
int
-ao_serial0_pollchar(void) __critical
+_ao_serial0_pollchar(void)
{
uint8_t c;
if (ao_fifo_empty(ao_serial0_rx_fifo))
{
uint8_t c;
if (ao_fifo_empty(ao_serial0_rx_fifo))
@@
-180,7
+180,7
@@
ao_serial1_getchar(void) __critical
#if USE_SERIAL_1_STDIN
int
#if USE_SERIAL_1_STDIN
int
-ao_serial1_pollchar(void) __critical
+_ao_serial1_pollchar(void)
{
uint8_t c;
if (ao_fifo_empty(ao_serial1_rx_fifo))
{
uint8_t c;
if (ao_fifo_empty(ao_serial1_rx_fifo))
@@
-271,7
+271,7
@@
ao_serial_init(void)
IEN0 |= IEN0_URX0IE;
IEN2 |= IEN2_UTX0IE;
#if USE_SERIAL_0_STDIN && !DELAY_SERIAL_0_STDIN
IEN0 |= IEN0_URX0IE;
IEN2 |= IEN2_UTX0IE;
#if USE_SERIAL_0_STDIN && !DELAY_SERIAL_0_STDIN
- ao_add_stdio(ao_serial0_pollchar,
+ ao_add_stdio(
_
ao_serial0_pollchar,
ao_serial0_putchar,
NULL);
#endif
ao_serial0_putchar,
NULL);
#endif
@@
-327,7
+327,7
@@
ao_serial_init(void)
IEN2 |= IEN2_UTX1IE;
#if USE_SERIAL_1_STDIN && !DELAY_SERIAL_1_STDIN
IEN2 |= IEN2_UTX1IE;
#if USE_SERIAL_1_STDIN && !DELAY_SERIAL_1_STDIN
- ao_add_stdio(ao_serial1_pollchar,
+ ao_add_stdio(
_
ao_serial1_pollchar,
ao_serial1_putchar,
NULL);
#endif
ao_serial1_putchar,
NULL);
#endif