altos: gps serial routines are called ao_gps_*, not ao_ublox_*

This caused the u-blox driver to use serial port 1 instead of the
project-specified serial port.

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/src/drivers/ao_gps_ublox.c b/src/drivers/ao_gps_ublox.c
index 56a4da16b3aacb6a646e4e03b7201aa19820ee2a..80869561b6465f9eb2879b89ccddd2f222c8d7ba 100644 (file)
--- a/src/drivers/ao_gps_ublox.c
+++ b/src/drivers/ao_gps_ublox.c
@@ -39,13 +39,7 @@ struct ao_ublox_cksum {
 static __pdata struct ao_ublox_cksum ao_ublox_cksum;
 static __pdata uint16_t ao_ublox_len;
 
-#ifndef ao_ublox_getchar
-#define ao_ublox_getchar       ao_serial1_getchar
-#define ao_ublox_putchar       ao_serial1_putchar
-#define ao_ublox_set_speed     ao_serial1_set_speed
-#endif
-
-#define ao_ublox_byte()        ((uint8_t) ao_ublox_getchar())
+#define ao_ublox_byte()        ((uint8_t) ao_gps_getchar())
 
 static inline void add_cksum(struct ao_ublox_cksum *cksum, uint8_t c)
 {
@@ -61,7 +55,7 @@ static void ao_ublox_init_cksum(void)
 static void ao_ublox_put_u8(uint8_t c)
 {
        add_cksum(&ao_ublox_cksum, c);
-       ao_ublox_putchar(c);
+       ao_gps_putchar(c);
 }
 
 static void ao_ublox_put_i8(int8_t c)
@@ -408,14 +402,14 @@ ao_gps_setup(void)
 
        ao_delay(AO_SEC_TO_TICKS(3));
 
-       ao_ublox_set_speed(AO_SERIAL_SPEED_9600);
+       ao_gps_set_speed(AO_SERIAL_SPEED_9600);
 
        /*
         * A bunch of nulls so the start bit
         * is clear
         */
        for (i = 0; i < 64; i++)
-               ao_ublox_putchar(0x00);
+               ao_gps_putchar(0x00);
 
        /*
         * Send the baud-rate setting and protocol-setting
@@ -423,27 +417,27 @@ ao_gps_setup(void)
         */
        for (k = 0; k < 3; k++)
                for (i = 0; i < sizeof (ao_gps_set_nmea); i++)
-                       ao_ublox_putchar(ao_gps_set_nmea[i]);
+                       ao_gps_putchar(ao_gps_set_nmea[i]);
 
        /*
         * Increase the baud rate
         */
-       ao_ublox_set_speed(AO_SERIAL_SPEED_57600);
+       ao_gps_set_speed(AO_SERIAL_SPEED_57600);
 
        /*
         * Pad with nulls to give the chip
         * time to see the baud rate switch
         */
        for (i = 0; i < 64; i++)
-               ao_ublox_putchar(0x00);
+               ao_gps_putchar(0x00);
 }
 
 static void
 ao_ublox_putstart(uint8_t class, uint8_t id, uint16_t len)
 {
        ao_ublox_init_cksum();
-       ao_ublox_putchar(0xb5);
-       ao_ublox_putchar(0x62);
+       ao_gps_putchar(0xb5);
+       ao_gps_putchar(0x62);
        ao_ublox_put_u8(class);
        ao_ublox_put_u8(id);
        ao_ublox_put_u8(len);
@@ -453,8 +447,8 @@ ao_ublox_putstart(uint8_t class, uint8_t id, uint16_t len)
 static void
 ao_ublox_putend(void)
 {
-       ao_ublox_putchar(ao_ublox_cksum.a);
-       ao_ublox_putchar(ao_ublox_cksum.b);
+       ao_gps_putchar(ao_ublox_cksum.a);
+       ao_gps_putchar(ao_ublox_cksum.b);
 }
 
 static void

diff --git a/src/test/ao_gps_test_ublox.c b/src/test/ao_gps_test_ublox.c
index afd4dba414f45b14a3012db4adcfaa0744ad9bee..a0e04cb6a8659b802c81b6e149731020ca9df868 100644 (file)
--- a/src/test/ao_gps_test_ublox.c
+++ b/src/test/ao_gps_test_ublox.c
@@ -130,7 +130,7 @@ static uint16_t     recv_len;
 static void check_ublox_message(char *which, uint8_t *msg);
 
 char
-ao_serial1_getchar(void)
+ao_gps_getchar(void)
 {
        char    c;
        uint8_t uc;
@@ -163,7 +163,7 @@ static int  message_len;
 static uint16_t        send_len;
 
 void
-ao_serial1_putchar(char c)
+ao_gps_putchar(char c)
 {
        int     i;
        uint8_t uc = (uint8_t) c;
@@ -196,7 +196,7 @@ ao_serial1_putchar(char c)
 #define AO_SERIAL_SPEED_115200 3
 
 static void
-ao_serial1_set_speed(uint8_t speed)
+ao_gps_set_speed(uint8_t speed)
 {
        int     fd = ao_gps_fd;
        struct termios  termios;