projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Provide for a pre-filter on commands
[fw/altos]
/
src
/
ao_serial.c
diff --git
a/src/ao_serial.c
b/src/ao_serial.c
index 1e3ea3e39b2cd26852d30b18f5a8c5c095070f18..b8e9d2bf3a3db377a91e70e4e679d13546cba121 100644
(file)
--- a/
src/ao_serial.c
+++ b/
src/ao_serial.c
@@
-20,12
+20,20
@@
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
void
-ao_serial_rx1_isr(void) interrupt 3
+ao_serial_rx1_isr(void)
__
interrupt 3
{
if (!ao_fifo_full(ao_usart1_rx_fifo))
ao_fifo_insert(ao_usart1_rx_fifo, U1DBUF);
ao_wakeup(&ao_usart1_rx_fifo);
{
if (!ao_fifo_full(ao_usart1_rx_fifo))
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);
+#endif
}
static __xdata uint8_t ao_serial_tx1_started;
}
static __xdata uint8_t ao_serial_tx1_started;
@@
-42,7
+50,7
@@
ao_serial_tx1_start(void)
}
void
}
void
-ao_serial_tx1_isr(void) interrupt 14
+ao_serial_tx1_isr(void)
__
interrupt 14
{
UTX1IF = 0;
ao_serial_tx1_started = 0;
{
UTX1IF = 0;
ao_serial_tx1_started = 0;
@@
-69,6
+77,29
@@
ao_serial_getchar(void) __critical
return c;
}
return c;
}
+#if USE_SERIAL_STDIN
+char
+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;
+}
+
+void
+ao_serial_set_stdin(uint8_t stdin)
+{
+ ao_serial_stdin = stdin;
+}
+
+#endif
+
void
ao_serial_putchar(char c) __critical
{
void
ao_serial_putchar(char c) __critical
{
@@
-85,16
+116,6
@@
ao_serial_drain(void) __critical
ao_sleep(&ao_usart1_tx_fifo);
}
ao_sleep(&ao_usart1_tx_fifo);
}
-static void
-send_serial(void)
-{
- ao_cmd_white();
- while (ao_cmd_lex_c != '\n') {
- ao_serial_putchar(ao_cmd_lex_c);
- ao_cmd_lex();
- }
-}
-
static void
monitor_serial(void)
{
static void
monitor_serial(void)
{
@@
-102,18
+123,9
@@
monitor_serial(void)
serial_echo = ao_cmd_lex_i != 0;
}
serial_echo = ao_cmd_lex_i != 0;
}
-static void
-serial_baud(void)
-{
- ao_cmd_hex();
- ao_serial_set_speed(ao_cmd_lex_i);
-}
-
__code struct ao_cmds ao_serial_cmds[] = {
__code struct ao_cmds ao_serial_cmds[] = {
- { 'S', send_serial, "S <data> Send data to serial line" },
- { 'M', monitor_serial, "M <enable> Monitor serial data" },
- { 'B', serial_baud, "B <0 = 4800, 1 = 57600> Set serial baud rate" },
- { 0, send_serial, NULL },
+ { monitor_serial, "M <enable>\0Monitor serial data" },
+ { 0, NULL },
};
static const struct {
};
static const struct {
@@
-128,6
+140,10
@@
static const struct {
/* .baud = */ 163,
/* .gcr = */ (8 << UxGCR_BAUD_E_SHIFT) | UxGCR_ORDER_LSB
},
/* .baud = */ 163,
/* .gcr = */ (8 << UxGCR_BAUD_E_SHIFT) | UxGCR_ORDER_LSB
},
+ /* [AO_SERIAL_SPEED_19200] = */ {
+ /* .baud = */ 163,
+ /* .gcr = */ (9 << UxGCR_BAUD_E_SHIFT) | UxGCR_ORDER_LSB
+ },
/* [AO_SERIAL_SPEED_57600] = */ {
/* .baud = */ 59,
/* .gcr = */ (11 << UxGCR_BAUD_E_SHIFT) | UxGCR_ORDER_LSB
/* [AO_SERIAL_SPEED_57600] = */ {
/* .baud = */ 59,
/* .gcr = */ (11 << UxGCR_BAUD_E_SHIFT) | UxGCR_ORDER_LSB
@@
-175,4
+191,11
@@
ao_serial_init(void)
IEN2 |= IEN2_UTX1IE;
ao_cmd_register(&ao_serial_cmds[0]);
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
}
}