diff options
| author | Nick Foster <nick@nerdnetworks.org> | 2011-01-17 14:51:06 -0800 |
|---|---|---|
| committer | Nick Foster <nick@nerdnetworks.org> | 2011-01-17 14:51:06 -0800 |
| commit | caa911aa270ee4aef7244f3159b9fd402a454069 (patch) | |
| tree | 57e85e00e9727aade1a4dafaa6da98eb5e2b4b6c /firmware/zpu/lib/hal_uart.c | |
| parent | d521bd1c28acf0ca159f8c84a8189bef11fdf65d (diff) | |
| download | uhd-caa911aa270ee4aef7244f3159b9fd402a454069.tar.gz uhd-caa911aa270ee4aef7244f3159b9fd402a454069.tar.bz2 uhd-caa911aa270ee4aef7244f3159b9fd402a454069.zip | |
next: fngets() fixed for GPS driver. polling/timeout moved to host side. small changes to GPS output text.
Diffstat (limited to 'firmware/zpu/lib/hal_uart.c')
| -rw-r--r-- | firmware/zpu/lib/hal_uart.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/firmware/zpu/lib/hal_uart.c b/firmware/zpu/lib/hal_uart.c index f0921f4f0..6a37cceb6 100644 --- a/firmware/zpu/lib/hal_uart.c +++ b/firmware/zpu/lib/hal_uart.c @@ -103,12 +103,13 @@ hal_uart_getc(hal_uart_name_t u) } int -hal_uart_getc_timeout(hal_uart_name_t u) +hal_uart_getc_noblock(hal_uart_name_t u) { - int timeout = 0; - while (((uart_regs[u].rxlevel) == 0) && (timeout++ < HAL_UART_TIMEOUT_MS)) - mdelay(1); - return (timeout >= HAL_UART_TIMEOUT_MS) ? -1 : uart_regs[u].rxchar; //return -1 if nothing there, cause fngets to quit +// int timeout = 0; +// while (((uart_regs[u].rxlevel) == 0) && (timeout++ < HAL_UART_TIMEOUT_MS)) +// mdelay(1); + if(uart_regs[u].rxlevel == 0) return 255; + return uart_regs[u].rxchar; } int hal_uart_rx_flush(hal_uart_name_t u) |