diff options
| author | Nick Foster <nick@nerdnetworks.org> | 2010-08-16 16:09:52 -0700 |
|---|---|---|
| committer | Nick Foster <nick@nerdnetworks.org> | 2010-08-16 16:11:45 -0700 |
| commit | 40faee2e6d87f7364a0c0c2cf310f1483c0331cf (patch) | |
| tree | 990d061eb15272ed995dcfd8982082840473399b /firmware/microblaze/lib/hal_io.c | |
| parent | f626a4f21d7301e573bcb601f16bf6ba38352c34 (diff) | |
| download | uhd-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_io.c')
| -rw-r--r-- | firmware/microblaze/lib/hal_io.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/firmware/microblaze/lib/hal_io.c b/firmware/microblaze/lib/hal_io.c index 261c8cc2a..be4c570c7 100644 --- a/firmware/microblaze/lib/hal_io.c +++ b/firmware/microblaze/lib/hal_io.c @@ -237,10 +237,10 @@ int puts(const char *s) char * fgets(hal_uart_name_t u, char * const s) { - char *x = s; - while((*x=(char)hal_uart_getc(u)) != '\n') x++; - *x = 0; - return s; + char *x = s; + while((*x=(char)hal_uart_getc(u)) != '\n') x++; + *x = 0; + return s; } int @@ -248,8 +248,8 @@ fngets(hal_uart_name_t u, char * const s, int len) { char *x = s; while(((*x=(char)hal_uart_getc(u)) != '\n') && ((x-s) < len)) x++; - *x = 0; - return (x-s); + *x = 0; + return (x-s); } int @@ -258,8 +258,9 @@ fngets_timeout(hal_uart_name_t u, char * const s, int len) char *x = s; while(((*x=(char)hal_uart_getc_timeout(u)) != '\n') && (*x != -1) && ((x-s) < len)) x++; - *x = 0; - return (x-s); + *x = 0; + //printf("Returning from fngets() with string %d of length %d\n", s[0], x-s); + return (x-s); } char * |