X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fkernel%2Fao_gps_report_metrum.c;h=e5839b36a88a50e1122ccef696ab02e3c4945e33;hb=HEAD;hp=508f151950bd9730e76b0f2ca1a3b02932f0868c;hpb=1085ec5d57e0ed5d132f2bbdac1a0b6a32c0ab4a;p=fw%2Faltos

diff --git a/src/kernel/ao_gps_report_metrum.c b/src/kernel/ao_gps_report_metrum.c
index 508f1519..e7529ee2 100644
--- a/src/kernel/ao_gps_report_metrum.c
+++ b/src/kernel/ao_gps_report_metrum.c
@@ -19,12 +19,12 @@
 #include "ao.h"
 #include "ao_log.h"
 
-void
+static 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;
@@ -34,20 +34,20 @@ ao_gps_report_metrum(void)
 			ao_sleep(&ao_gps_new);
 		ao_mutex_get(&ao_gps_mutex);
 		if (new & AO_GPS_NEW_DATA)
-			ao_xmemcpy(&gps_data, &ao_gps_data, sizeof (ao_gps_data));
+			memcpy(&gps_data, &ao_gps_data, sizeof (ao_gps_data));
 		if (new & AO_GPS_NEW_TRACKING)
-			ao_xmemcpy(&gps_tracking_data, &ao_gps_tracking_data, sizeof (ao_gps_tracking_data));
+			memcpy(&gps_tracking_data, &ao_gps_tracking_data, sizeof (ao_gps_tracking_data));
 		ao_gps_new = 0;
 		ao_mutex_put(&ao_gps_mutex);
 
 		if ((new & AO_GPS_NEW_DATA) && (gps_data.flags & AO_GPS_VALID)) {
-			gps_log.tick = ao_gps_tick;
+			gps_log.tick = (uint16_t) ao_gps_tick;
 			gps_log.type = AO_LOG_GPS_POS;
 			gps_log.u.gps.latitude = gps_data.latitude;
 			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;
@@ -58,12 +58,12 @@ 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)) {
 			gps_log.type = AO_LOG_GPS_SAT;
-			gps_log.tick = ao_gps_tick;
+			gps_log.tick = (uint16_t) ao_gps_tick;
 			i = 0;
 			for (c = 0; c < n; c++) {
 				svid = gps_tracking_data.sats[c].svid;
@@ -71,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;
@@ -82,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)