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

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

diff --git a/src/kernel/ao_gps_report_mega.c b/src/kernel/ao_gps_report_mega.c
index 8a29865577b19a31ec0a7970031a69b20dd9dc4d..37f1beaa9b1d5d1314c87a7fe2f8b8926bd60d56 100644 (file)
--- a/src/kernel/ao_gps_report_mega.c
+++ b/src/kernel/ao_gps_report_mega.c
@@ -59,9 +59,9 @@ ao_gps_sparse_should_log(int32_t lat, int32_t lon, int16_t alt)
 void
 ao_gps_report_mega(void)
 {
-       static __xdata struct ao_log_mega               gps_log;
-       static __xdata struct ao_telemetry_location     gps_data;
-       static __xdata struct ao_telemetry_satellite    gps_tracking_data;
+       static struct ao_log_mega               gps_log;
+       static struct ao_telemetry_location     gps_data;
+       static struct ao_telemetry_satellite    gps_tracking_data;
        uint8_t new;
        uint8_t c, n, i;
 
@@ -105,7 +105,7 @@ ao_gps_report_mega(void)
                        gps_log.u.gps.hdop = gps_data.hdop;
                        gps_log.u.gps.vdop = gps_data.vdop;
                        gps_log.u.gps.mode = gps_data.mode;
-                       ao_log_mega(&gps_log);
+                       ao_log_write(&gps_log);
                }
                if ((new & AO_GPS_NEW_TRACKING) && (n = gps_tracking_data.channels) != 0) {
                        gps_log.tick = ao_gps_tick;
@@ -120,12 +120,12 @@ ao_gps_report_mega(void)
                                                break;
                                }
                        gps_log.u.gps_sat.channels = i;
-                       ao_log_mega(&gps_log);
+                       ao_log_write(&gps_log);
                }
        }
 }
 
-__xdata struct ao_task ao_gps_report_mega_task;
+struct ao_task ao_gps_report_mega_task;
 
 void
 ao_gps_report_mega_init(void)