X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fao_serial.c;h=dd383fca18ff141a5ffd7c0af0f923f746437eca;hp=1e3ea3e39b2cd26852d30b18f5a8c5c095070f18;hb=8cdf4fb051c22b35c251d90bc288551f7c2898bf;hpb=33b0b6f2f2e07de105619a7b463226d2813152ab

diff --git a/src/ao_serial.c b/src/ao_serial.c
index 1e3ea3e3..dd383fca 100644
--- 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
-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);
@@ -42,7 +42,7 @@ ao_serial_tx1_start(void)
 }
 
 void
-ao_serial_tx1_isr(void) interrupt 14
+ao_serial_tx1_isr(void) __interrupt 14
 {
 	UTX1IF = 0;
 	ao_serial_tx1_started = 0;
@@ -85,16 +85,6 @@ ao_serial_drain(void) __critical
 		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)
 {
@@ -102,18 +92,9 @@ monitor_serial(void)
 	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[] = {
-	{ '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 {