X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fkernel%2Fao_gps_report_mega.c;h=5724d11bd9fa108b923e00d87233128ac7848484;hb=8e73e5298206db0e781cc76ee151e96d29f29341;hp=85614b85bd3eea31ec2c773e85c146620adaa4a0;hpb=83929cd290279963b01b2ccd52c70d61bdeff6b0;p=fw%2Faltos

diff --git a/src/kernel/ao_gps_report_mega.c b/src/kernel/ao_gps_report_mega.c
index 85614b85..5724d11b 100644
--- 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;
 
@@ -70,9 +70,9 @@ ao_gps_report_mega(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);
 
@@ -85,7 +85,7 @@ ao_gps_report_mega(void)
 #endif
 		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_TIME;
 			gps_log.u.gps.latitude = gps_data.latitude;
 			gps_log.u.gps.longitude = gps_data.longitude;
@@ -108,7 +108,7 @@ ao_gps_report_mega(void)
 			ao_log_write(&gps_log);
 		}
 		if ((new & AO_GPS_NEW_TRACKING) && (n = gps_tracking_data.channels) != 0) {
-			gps_log.tick = ao_gps_tick;
+			gps_log.tick = (uint16_t) ao_gps_tick;
 			gps_log.type = AO_LOG_GPS_SAT;
 			i = 0;
 			for (c = 0; c < n; c++)
@@ -125,7 +125,7 @@ ao_gps_report_mega(void)
 	}
 }
 
-__xdata struct ao_task ao_gps_report_mega_task;
+struct ao_task ao_gps_report_mega_task;
 
 void
 ao_gps_report_mega_init(void)