projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Clean up serial initialization
[fw/altos]
/
src
/
ao_serial.c
diff --git
a/src/ao_serial.c
b/src/ao_serial.c
index b8e9d2bf3a3db377a91e70e4e679d13546cba121..9c0b798daf674cfcd894fe07db4eefa4c7cab236 100644
(file)
--- a/
src/ao_serial.c
+++ b/
src/ao_serial.c
@@
-20,10
+20,6
@@
volatile __xdata struct ao_fifo ao_usart1_rx_fifo;
volatile __xdata struct ao_fifo ao_usart1_tx_fifo;
volatile __xdata struct ao_fifo ao_usart1_rx_fifo;
volatile __xdata struct ao_fifo ao_usart1_tx_fifo;
-#if USE_SERIAL_STDIN
-__pdata uint8_t ao_serial_stdin;
-#endif
-
void
ao_serial_rx1_isr(void) __interrupt 3
{
void
ao_serial_rx1_isr(void) __interrupt 3
{
@@
-31,8
+27,7
@@
ao_serial_rx1_isr(void) __interrupt 3
ao_fifo_insert(ao_usart1_rx_fifo, U1DBUF);
ao_wakeup(&ao_usart1_rx_fifo);
#if USE_SERIAL_STDIN
ao_fifo_insert(ao_usart1_rx_fifo, U1DBUF);
ao_wakeup(&ao_usart1_rx_fifo);
#if USE_SERIAL_STDIN
- if (ao_serial_stdin)
- ao_wakeup(&ao_stdin_ready);
+ ao_wakeup(&ao_stdin_ready);
#endif
}
#endif
}
@@
-58,8
+53,6
@@
ao_serial_tx1_isr(void) __interrupt 14
ao_wakeup(&ao_usart1_tx_fifo);
}
ao_wakeup(&ao_usart1_tx_fifo);
}
-static __pdata serial_echo;
-
char
ao_serial_getchar(void) __critical
{
char
ao_serial_getchar(void) __critical
{
@@
-67,13
+60,6
@@
ao_serial_getchar(void) __critical
while (ao_fifo_empty(ao_usart1_rx_fifo))
ao_sleep(&ao_usart1_rx_fifo);
ao_fifo_remove(ao_usart1_rx_fifo, c);
while (ao_fifo_empty(ao_usart1_rx_fifo))
ao_sleep(&ao_usart1_rx_fifo);
ao_fifo_remove(ao_usart1_rx_fifo, c);
- if (serial_echo) {
- printf("%02x ", ((int) c) & 0xff);
- if (c >= ' ')
- putchar(c);
- putchar('\n');
- flush();
- }
return c;
}
return c;
}
@@
-82,22
+68,11
@@
char
ao_serial_pollchar(void) __critical
{
char c;
ao_serial_pollchar(void) __critical
{
char c;
-#if 0
- if (!ao_serial_stdin)
- return AO_READ_AGAIN;
-#endif
if (ao_fifo_empty(ao_usart1_rx_fifo))
return AO_READ_AGAIN;
ao_fifo_remove(ao_usart1_rx_fifo,c);
return c;
}
if (ao_fifo_empty(ao_usart1_rx_fifo))
return AO_READ_AGAIN;
ao_fifo_remove(ao_usart1_rx_fifo,c);
return c;
}
-
-void
-ao_serial_set_stdin(uint8_t stdin)
-{
- ao_serial_stdin = stdin;
-}
-
#endif
void
#endif
void
@@
-109,25
+84,13
@@
ao_serial_putchar(char c) __critical
ao_serial_tx1_start();
}
ao_serial_tx1_start();
}
-
static
void
+void
ao_serial_drain(void) __critical
{
while (!ao_fifo_empty(ao_usart1_tx_fifo))
ao_sleep(&ao_usart1_tx_fifo);
}
ao_serial_drain(void) __critical
{
while (!ao_fifo_empty(ao_usart1_tx_fifo))
ao_sleep(&ao_usart1_tx_fifo);
}
-static void
-monitor_serial(void)
-{
- ao_cmd_hex();
- serial_echo = ao_cmd_lex_i != 0;
-}
-
-__code struct ao_cmds ao_serial_cmds[] = {
- { monitor_serial, "M <enable>\0Monitor serial data" },
- { 0, NULL },
-};
-
static const struct {
uint8_t baud;
uint8_t gcr;
static const struct {
uint8_t baud;
uint8_t gcr;
@@
-156,6
+119,7
@@
ao_serial_set_speed(uint8_t speed)
ao_serial_drain();
if (speed > AO_SERIAL_SPEED_57600)
return;
ao_serial_drain();
if (speed > AO_SERIAL_SPEED_57600)
return;
+ U1UCR |= UxUCR_FLUSH;
U1BAUD = ao_serial_speeds[speed].baud;
U1GCR = ao_serial_speeds[speed].gcr;
}
U1BAUD = ao_serial_speeds[speed].baud;
U1GCR = ao_serial_speeds[speed].gcr;
}
@@
-166,7
+130,8
@@
ao_serial_init(void)
/* Set up the USART pin assignment */
PERCFG = (PERCFG & ~PERCFG_U1CFG_ALT_MASK) | PERCFG_U1CFG_ALT_2;
/* Set up the USART pin assignment */
PERCFG = (PERCFG & ~PERCFG_U1CFG_ALT_MASK) | PERCFG_U1CFG_ALT_2;
- /* ee has already set the P2SEL bits */
+ P2SEL = (P2SEL & ~(P2SEL_PRI3P1_MASK | P2SEL_PRI2P1_MASK)) |
+ (P2SEL_PRI3P1_USART1 | P2SEL_PRI2P1_USART1);
/* Make the USART pins be controlled by the USART */
P1SEL |= (1 << 6) | (1 << 7);
/* Make the USART pins be controlled by the USART */
P1SEL |= (1 << 6) | (1 << 7);
@@
-180,7
+145,7
@@
ao_serial_init(void)
/* Reasonable serial parameters */
U1UCR = (UxUCR_FLUSH |
UxUCR_FLOW_DISABLE |
/* Reasonable serial parameters */
U1UCR = (UxUCR_FLUSH |
UxUCR_FLOW_DISABLE |
- UxUCR_D9_
ODD
_PARITY |
+ UxUCR_D9_
EVEN
_PARITY |
UxUCR_BIT9_8_BITS |
UxUCR_PARITY_DISABLE |
UxUCR_SPB_1_STOP_BIT |
UxUCR_BIT9_8_BITS |
UxUCR_PARITY_DISABLE |
UxUCR_SPB_1_STOP_BIT |
@@
-189,13
+154,4
@@
ao_serial_init(void)
IEN0 |= IEN0_URX1IE;
IEN2 |= IEN2_UTX1IE;
IEN0 |= IEN0_URX1IE;
IEN2 |= IEN2_UTX1IE;
-
- ao_cmd_register(&ao_serial_cmds[0]);
-#if 0
-#if USE_SERIAL_STDIN
- ao_add_stdio(ao_serial_pollchar,
- ao_serial_putchar,
- NULL);
-#endif
-#endif
}
}