Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / src / kernel / ao_gps_print.c

diff --git a/src/kernel/ao_gps_print.c b/src/kernel/ao_gps_print.c
index d26021da86b9511f340d9fbd203b730b3436b99d..6dfd1bdd9164d4271b39111525c32189b89a402c 100644 (file)
--- a/src/kernel/ao_gps_print.c
+++ b/src/kernel/ao_gps_print.c
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,12 +21,12 @@
 #endif
 #include "ao_telem.h"
 
-#ifndef AO_TELEMETRY_LOCATION_ALTITUDE
-#define AO_TELEMETRY_LOCATION_ALTITUDE(l)      ((l)->altitude)
+#ifndef AO_GPS_ORIG_ALTITUDE
+#define AO_GPS_ORIG_ALTITUDE(l)        ((l)->altitude)
 #endif
 
 void
-ao_gps_print(__xdata struct ao_gps_orig *gps_data) __reentrant
+ao_gps_print(struct ao_gps_orig *gps_data) 
 {
        char    state;
 
@@ -46,7 +47,7 @@ ao_gps_print(__xdata struct ao_gps_orig *gps_data) __reentrant
               AO_TELEM_GPS_ALTITUDE " %d ",
               (long) gps_data->latitude,
               (long) gps_data->longitude,
-              AO_TELEMETRY_LOCATION_ALTITUDE(gps_data));
+              AO_GPS_ORIG_ALTITUDE(gps_data));
 
        if (gps_data->flags & AO_GPS_DATE_VALID)
                printf(AO_TELEM_GPS_YEAR " %d "
@@ -81,10 +82,10 @@ ao_gps_print(__xdata struct ao_gps_orig *gps_data) __reentrant
 }
 
 void
-ao_gps_tracking_print(__xdata struct ao_gps_tracking_orig *gps_tracking_data) __reentrant
+ao_gps_tracking_print(struct ao_gps_tracking_orig *gps_tracking_data) 
 {
        uint8_t c, n, v;
-       __xdata struct ao_gps_sat_orig  *sat;
+       struct ao_gps_sat_orig  *sat;
 
        n = gps_tracking_data->channels;
        if (n == 0)