X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao_serial.c;h=20bb4f9683a5c4ed3003a4147e5df9906e3b86a8;hp=215a301d0f32e25ef3163894a54b9253423cb1f3;hb=97cecb517cd7bf75e1219c76a93bfe6964c07052;hpb=022f83ca6fd589005d8eb3e25e633950fef69fa7 diff --git a/ao_serial.c b/ao_serial.c index 215a301d..20bb4f96 100644 --- a/ao_serial.c +++ b/ao_serial.c @@ -22,7 +22,7 @@ struct ao_fifo { uint8_t insert; uint8_t remove; - uint8_t fifo[SERIAL_FIFO]; + char fifo[SERIAL_FIFO]; }; volatile __xdata struct ao_fifo ao_usart1_rx_fifo; @@ -71,10 +71,10 @@ ao_serial_tx1_isr(void) interrupt 14 ao_wakeup(&ao_usart1_tx_fifo); } -uint8_t +char ao_serial_getchar(void) __critical { - uint8_t c; + char c; while (ao_fifo_empty(ao_usart1_rx_fifo)) ao_sleep(&ao_usart1_rx_fifo); ao_fifo_remove(ao_usart1_rx_fifo, c); @@ -82,7 +82,7 @@ ao_serial_getchar(void) __critical } void -ao_serial_putchar(uint8_t c) __critical +ao_serial_putchar(char c) __critical { while (ao_fifo_full(ao_usart1_tx_fifo)) ao_sleep(&ao_usart1_tx_fifo); @@ -90,6 +90,21 @@ ao_serial_putchar(uint8_t c) __critical ao_serial_tx1_start(); } +static void +send_serial(void) +{ + ao_cmd_white(); + while (ao_cmd_lex_c != '\n') { + ao_serial_putchar(ao_cmd_lex_c); + ao_cmd_lex(); + } +} + +__code struct ao_cmds ao_serial_cmds[] = { + { 'S', send_serial, "S Send data to serial line" }, + { 0, send_serial, NULL }, +}; + void ao_serial_init(void) { @@ -120,4 +135,6 @@ ao_serial_init(void) IEN0 |= IEN0_URX1IE; IEN2 |= IEN2_UTX1IE; + + ao_cmd_register(&ao_serial_cmds[0]); }