X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Flpc%2Fao_serial_lpc.c;h=b0d5fcbc577003cc8076a73684f4f86d6abe2624;hb=530894f508874f4cb3db644ca9ca679ed704f964;hp=b34de70498c948d6ec772aeb13da38b293660c5f;hpb=aa2948803d33dbee6f1eab30370178252df2b56d;p=fw%2Faltos diff --git a/src/lpc/ao_serial_lpc.c b/src/lpc/ao_serial_lpc.c index b34de704..b0d5fcbc 100644 --- a/src/lpc/ao_serial_lpc.c +++ b/src/lpc/ao_serial_lpc.c @@ -71,7 +71,7 @@ lpc_usart_isr(void) } int -_ao_serial_pollchar(void) +_ao_serial0_pollchar(void) { int c; @@ -86,18 +86,18 @@ _ao_serial_pollchar(void) } char -ao_serial_getchar(void) +ao_serial0_getchar(void) { int c; ao_arch_block_interrupts(); - while ((c = _ao_serial_pollchar()) == AO_READ_AGAIN) + while ((c = _ao_serial0_pollchar()) == AO_READ_AGAIN) ao_sleep(&ao_usart_rx_fifo); ao_arch_release_interrupts(); return (char) c; } void -ao_serial_putchar(char c) +ao_serial0_putchar(char c) { ao_arch_block_interrupts(); while (ao_fifo_full(ao_usart_tx_fifo)) @@ -108,7 +108,7 @@ ao_serial_putchar(char c) } void -ao_serial_drain(void) +ao_serial0_drain(void) { ao_arch_block_interrupts(); while (!ao_fifo_empty(ao_usart_tx_fifo)) @@ -119,7 +119,7 @@ ao_serial_drain(void) #include "ao_serial_lpc.h" void -ao_serial_set_speed(uint8_t speed) +ao_serial0_set_speed(uint8_t speed) { if (speed > AO_SERIAL_SPEED_115200) return; @@ -197,7 +197,7 @@ ao_serial_init(void) lpc_usart.hden = ((0 << LPC_USART_HDEN_HDEN)); /* Set baud rate */ - ao_serial_set_speed(AO_SERIAL_SPEED_9600); + ao_serial0_set_speed(AO_SERIAL_SPEED_9600); /* Enable interrupts */ lpc_usart.ier = ((1 << LPC_USART_IER_RBRINTEN) | @@ -206,8 +206,8 @@ ao_serial_init(void) lpc_nvic_set_enable(LPC_ISR_USART_POS); lpc_nvic_set_priority(LPC_ISR_USART_POS, 0); #if USE_SERIAL_0_STDIN - ao_add_stdio(_ao_serial_pollchar, - ao_serial_putchar, + ao_add_stdio(_ao_serial0_pollchar, + ao_serial0_putchar, NULL); #endif }