aboutsummaryrefslogtreecommitdiffstats
path: root/firmware/zpu/lib/hal_uart.h
diff options
context:
space:
mode:
authorNick Foster <nick@nerdnetworks.org>2011-01-17 14:51:06 -0800
committerNick Foster <nick@nerdnetworks.org>2011-01-17 14:51:06 -0800
commitcaa911aa270ee4aef7244f3159b9fd402a454069 (patch)
tree57e85e00e9727aade1a4dafaa6da98eb5e2b4b6c /firmware/zpu/lib/hal_uart.h
parentd521bd1c28acf0ca159f8c84a8189bef11fdf65d (diff)
downloaduhd-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.h')
-rw-r--r--firmware/zpu/lib/hal_uart.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/firmware/zpu/lib/hal_uart.h b/firmware/zpu/lib/hal_uart.h
index 758c8cb5e..793aface0 100644
--- a/firmware/zpu/lib/hal_uart.h
+++ b/firmware/zpu/lib/hal_uart.h
@@ -27,8 +27,6 @@
#define DEFAULT_UART UART_DEBUG //which UART printf, gets, etc. use
-#define HAL_UART_TIMEOUT_MS 300
-
typedef enum {
US_9600 = 0,
US_19200 = 1,
@@ -85,9 +83,9 @@ void hal_uart_putc_nowait(hal_uart_name_t u, int ch);
int hal_uart_getc(hal_uart_name_t u);
/*
- * \brief Blocking read of next char from serial port with timeout
+ * \brief Non-blocking read of next char from serial port, return -1 if nothing available
*/
-int hal_uart_getc_timeout(hal_uart_name_t u);
+int hal_uart_getc_noblock(hal_uart_name_t u);
int hal_uart_rx_flush(hal_uart_name_t u);