altos: Fix gcc compiler warnings in GPS code

unused variables and mis-matches in printf format codes.

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

diff --git a/src/core/ao_gps_print.c b/src/core/ao_gps_print.c
index fcdedd30a762ce9ee3d22a7c1eb46f577af99e8c..47c945d78b80f578622505f770af284dacf5a7d1 100644 (file)
--- a/src/core/ao_gps_print.c
+++ b/src/core/ao_gps_print.c
@@ -40,8 +40,8 @@ ao_gps_print(__xdata struct ao_gps_orig *gps_data) __reentrant
        printf(AO_TELEM_GPS_LATITUDE " %ld "
               AO_TELEM_GPS_LONGITUDE " %ld "
               AO_TELEM_GPS_ALTITUDE " %d ",
-              gps_data->latitude,
-              gps_data->longitude,
+              (long) gps_data->latitude,
+              (long) gps_data->longitude,
               gps_data->altitude);
 
        if (gps_data->flags & AO_GPS_DATE_VALID)

diff --git a/src/drivers/ao_gps_skytraq.c b/src/drivers/ao_gps_skytraq.c
index 84616a05d0a8729de7e7379387e7cf898424dd5f..d80da97ca6ea44a2cd2828380afa55eda19f0a0b 100644 (file)
--- a/src/drivers/ao_gps_skytraq.c
+++ b/src/drivers/ao_gps_skytraq.c
@@ -480,7 +480,7 @@ gps_dump(void) __reentrant
        ao_mutex_get(&ao_gps_mutex);
        printf ("Date: %02d/%02d/%02d\n", ao_gps_data.year, ao_gps_data.month, ao_gps_data.day);
        printf ("Time: %02d:%02d:%02d\n", ao_gps_data.hour, ao_gps_data.minute, ao_gps_data.second);
-       printf ("Lat/Lon: %ld %ld\n", ao_gps_data.latitude, ao_gps_data.longitude);
+       printf ("Lat/Lon: %ld %ld\n", (long) ao_gps_data.latitude, (long) ao_gps_data.longitude);
        printf ("Alt: %d\n", ao_gps_data.altitude);
        printf ("Flags: 0x%x\n", ao_gps_data.flags);
        printf ("Sats: %d", ao_gps_tracking_data.channels);

diff --git a/src/test/ao_gps_test.c b/src/test/ao_gps_test.c
index 4d4012df10b54e11ed7d1d9f26681ac649faf246..d75a12ecbfad77bf5a4f75d65a02a4200fd217f0 100644 (file)
--- a/src/test/ao_gps_test.c
+++ b/src/test/ao_gps_test.c
@@ -21,6 +21,7 @@
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <unistd.h>
 #include <fcntl.h>
 #define AO_GPS_NUM_SAT_MASK    (0xf << 0)
 #define AO_GPS_NUM_SAT_SHIFT   (0)
@@ -220,6 +221,8 @@ check_sirf_message(char *from, uint8_t *msg, int len)
                get_u16(h_v_error);
 
 
+               (void) mag_var;
+               (void) id;
                printf ("Geodetic Navigation Data (41):\n");
                printf ("\tNav valid %04x\n", nav_valid);
                printf ("\tNav type %04x\n", nav_type);
@@ -257,6 +260,7 @@ check_sirf_message(char *from, uint8_t *msg, int len)
                get_u32(gps_tow);
                get_u8(channels);
 
+               (void) id;
                printf ("Measured Tracker Data (4):\n");
                printf ("GPS week: %d\n", gps_week);
                printf ("GPS time of week: %d\n", gps_tow);
@@ -368,10 +372,11 @@ ao_serial1_putchar(char c)
                i = write(ao_gps_fd, &c, 1);
                if (i == 1) {
                        if ((uint8_t) c == 0xb3 || c == '\r') {
-                               static const struct timespec delay = {
+/*                             static const struct timespec delay = {
                                        .tv_sec = 0,
                                        .tv_nsec = 100 * 1000 * 1000
                                };
+*/
                                tcdrain(ao_gps_fd);
 //                             nanosleep(&delay, NULL);
                        }

diff --git a/src/test/ao_gps_test_skytraq.c b/src/test/ao_gps_test_skytraq.c
index 88bed3054ff9d985dba2a8acce1ad71c992d112b..846daa9443825b02fc322b9ca1d6f9fe5b806d36 100644 (file)
--- a/src/test/ao_gps_test_skytraq.c
+++ b/src/test/ao_gps_test_skytraq.c
@@ -22,6 +22,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+#include <unistd.h>
 #define AO_GPS_NUM_SAT_MASK    (0xf << 0)
 #define AO_GPS_NUM_SAT_SHIFT   (0)
 
@@ -87,6 +88,7 @@ ao_mutex_put(uint8_t *mutex)
 static int
 ao_gps_fd;
 
+#if 0
 static void
 ao_dbg_char(char c)
 {
@@ -102,6 +104,7 @@ ao_dbg_char(char c)
        }
        write(1, line, strlen(line));
 }
+#endif
 
 #define QUEUE_LEN      4096
 
@@ -222,6 +225,8 @@ check_skytraq_message(char *from, uint8_t *msg, int len)
                get_u16(h_v_error);
 
 
+               (void) mag_var;
+               (void) id;
                printf ("Geodetic Navigation Data (41):\n");
                printf ("\tNav valid %04x\n", nav_valid);
                printf ("\tNav type %04x\n", nav_type);
@@ -259,6 +264,7 @@ check_skytraq_message(char *from, uint8_t *msg, int len)
                get_u32(gps_tow);
                get_u8(channels);
 
+               (void) id;
                printf ("Measured Tracker Data (4):\n");
                printf ("GPS week: %d\n", gps_week);
                printf ("GPS time of week: %d\n", gps_tow);
@@ -371,10 +377,11 @@ ao_serial1_putchar(char c)
                i = write(ao_gps_fd, &c, 1);
                if (i == 1) {
                        if ((uint8_t) c == 0xb3 || c == '\r') {
-                               static const struct timespec delay = {
+/*                             static const struct timespec delay = {
                                        .tv_sec = 0,
                                        .tv_nsec = 100 * 1000 * 1000
                                };
+*/
                                tcdrain(ao_gps_fd);
 //                             nanosleep(&delay, NULL);
                        }
@@ -422,8 +429,6 @@ ao_serial1_set_speed(uint8_t speed)
 void
 ao_dump_state(void *wchan)
 {
-       double  lat, lon;
-       int     i;
        if (wchan == &ao_gps_data)
                ao_gps_print(&ao_gps_data);
        else
@@ -487,4 +492,5 @@ main (int argc, char **argv)
                exit (1);
        }
        ao_gps();
+       return 0;
 }