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

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

diff --git a/src/kernel/ao_gps_report_metrum.c b/src/kernel/ao_gps_report_metrum.c
index 8ce074fe33f97bb2ba7bc4d9119bce940ac06d8c..06863fe4844a05d08ccc98618b7d1efa141a22bb 100644 (file)
--- a/src/kernel/ao_gps_report_metrum.c
+++ b/src/kernel/ao_gps_report_metrum.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
@@ -21,9 +22,9 @@
 void
 ao_gps_report_metrum(void)
 {
-       static __xdata struct ao_log_metrum             gps_log;
-       static __xdata struct ao_telemetry_location     gps_data;
-       static __xdata struct ao_telemetry_satellite    gps_tracking_data;
+       static struct ao_log_metrum             gps_log;
+       static struct ao_telemetry_location     gps_data;
+       static struct ao_telemetry_satellite    gps_tracking_data;
        uint8_t c, n, i;
        uint8_t svid;
        uint8_t new;
@@ -46,7 +47,7 @@ ao_gps_report_metrum(void)
                        gps_log.u.gps.longitude = gps_data.longitude;
                        gps_log.u.gps.altitude_low = gps_data.altitude_low;
                        gps_log.u.gps.altitude_high = gps_data.altitude_high;
-                       ao_log_metrum(&gps_log);
+                       ao_log_write(&gps_log);
 
                        gps_log.type = AO_LOG_GPS_TIME;
                        gps_log.u.gps_time.hour = gps_data.hour;
@@ -57,7 +58,7 @@ ao_gps_report_metrum(void)
                        gps_log.u.gps_time.month = gps_data.month;
                        gps_log.u.gps_time.day = gps_data.day;
                        gps_log.u.gps_time.pdop = gps_data.pdop;
-                       ao_log_metrum(&gps_log);
+                       ao_log_write(&gps_log);
                }
 
                if ((new & AO_GPS_NEW_TRACKING) && (n = gps_tracking_data.channels)) {
@@ -70,7 +71,7 @@ ao_gps_report_metrum(void)
                                        if (i == 4) {
                                                gps_log.u.gps_sat.channels = i;
                                                gps_log.u.gps_sat.more = 1;
-                                               ao_log_metrum(&gps_log);
+                                               ao_log_write(&gps_log);
                                                i = 0;
                                        }
                                        gps_log.u.gps_sat.sats[i].svid = svid;
@@ -81,13 +82,13 @@ ao_gps_report_metrum(void)
                        if (i) {
                                gps_log.u.gps_sat.channels = i;
                                gps_log.u.gps_sat.more = 0;
-                               ao_log_metrum(&gps_log);
+                               ao_log_write(&gps_log);
                        }
                }
        }
 }
 
-__xdata struct ao_task ao_gps_report_metrum_task;
+struct ao_task ao_gps_report_metrum_task;
 
 void
 ao_gps_report_metrum_init(void)