projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
AltosSiteMap: add autoscroll and grabndrag scroll
[fw/altos]
/
src
/
ao_serial.c
diff --git
a/src/ao_serial.c
b/src/ao_serial.c
index 1e3ea3e39b2cd26852d30b18f5a8c5c095070f18..a48734c2f22793a957fb9575f6f5d0d2e0d21c26 100644
(file)
--- a/
src/ao_serial.c
+++ b/
src/ao_serial.c
@@
-21,7
+21,7
@@
volatile __xdata struct ao_fifo ao_usart1_rx_fifo;
volatile __xdata struct ao_fifo ao_usart1_tx_fifo;
void
volatile __xdata struct ao_fifo ao_usart1_tx_fifo;
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);
{
if (!ao_fifo_full(ao_usart1_rx_fifo))
ao_fifo_insert(ao_usart1_rx_fifo, U1DBUF);
@@
-42,7
+42,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;
@@
-85,16
+85,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
+92,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" },
{ 'M', monitor_serial, "M <enable> Monitor serial data" },
- { 'B', serial_baud, "B <0 = 4800, 1 = 57600> Set serial baud rate" },
- { 0, send_serial, NULL },
+ { 0, monitor_serial, NULL },
};
static const struct {
};
static const struct {