aboutsummaryrefslogtreecommitdiffstats
path: root/firmware/microblaze/lib/hal_uart.c
diff options
context:
space:
mode:
authorNick Foster <nick@nerdnetworks.org>2010-08-16 16:09:52 -0700
committerNick Foster <nick@nerdnetworks.org>2010-08-16 16:11:45 -0700
commit40faee2e6d87f7364a0c0c2cf310f1483c0331cf (patch)
tree990d061eb15272ed995dcfd8982082840473399b /firmware/microblaze/lib/hal_uart.c
parentf626a4f21d7301e573bcb601f16bf6ba38352c34 (diff)
downloaduhd-40faee2e6d87f7364a0c0c2cf310f1483c0331cf.tar.gz
uhd-40faee2e6d87f7364a0c0c2cf310f1483c0331cf.tar.bz2
uhd-40faee2e6d87f7364a0c0c2cf310f1483c0331cf.zip
Finished GPS driver, more or less.
Should detect any 115kbaud GPS on the serial port, as long as it outputs GPRMC packets. Tweaked the serial driver for a stupid off-by-one mistake.
Diffstat (limited to 'firmware/microblaze/lib/hal_uart.c')
-rw-r--r--firmware/microblaze/lib/hal_uart.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/firmware/microblaze/lib/hal_uart.c b/firmware/microblaze/lib/hal_uart.c
index 0ac6abd69..7836240fe 100644
--- a/firmware/microblaze/lib/hal_uart.c
+++ b/firmware/microblaze/lib/hal_uart.c
@@ -108,7 +108,7 @@ hal_uart_getc_timeout(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
+ return (timeout >= HAL_UART_TIMEOUT_MS) ? -1 : uart_regs[u].rxchar; //return -1 if nothing there, cause fngets to quit
}
int hal_uart_rx_flush(hal_uart_name_t u)