X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fkernel%2Fao_log_tiny.c;h=530031113842fada7915070db8429e00ca394b7c;hp=7769b7b5749773c3ffa51a42c90e138d83297172;hb=c6e57291d91f1f6c4de5c54a5cfd3eef66d9f830;hpb=1085ec5d57e0ed5d132f2bbdac1a0b6a32c0ab4a

diff --git a/src/kernel/ao_log_tiny.c b/src/kernel/ao_log_tiny.c
index 7769b7b5..53003111 100644
--- a/src/kernel/ao_log_tiny.c
+++ b/src/kernel/ao_log_tiny.c
@@ -18,7 +18,7 @@
 
 #include "ao.h"
 
-static __data uint16_t	ao_log_tiny_interval;
+static uint16_t	ao_log_tiny_interval;
 
 #define AO_LOG_TINY_INTERVAL_DEFAULT	AO_MS_TO_TICKS(1000)
 #if USE_FAST_ASCENT_LOG
@@ -29,8 +29,6 @@ static __data uint16_t	ao_log_tiny_interval;
 #define AO_PAD_RING	2
 #endif
 
-__code uint8_t ao_log_format = AO_LOG_FORMAT_TINY;
-
 void
 ao_log_tiny_set_interval(uint16_t ticks)
 {
@@ -43,13 +41,13 @@ static void ao_log_tiny_data(uint16_t d)
 	if (ao_log_current_pos >= ao_log_end_pos && ao_log_running)
 		ao_log_stop();
 	if (ao_log_running) {
-		ao_storage_write(ao_log_current_pos, DATA_TO_XDATA(&d), 2);
+		ao_storage_write(ao_log_current_pos, &d, 2);
 		ao_log_current_pos += 2;
 	}
 }
 
-static __xdata uint16_t ao_log_pad_ring[AO_PAD_RING];
-static __pdata uint8_t ao_log_pad_ring_pos;
+static uint16_t ao_log_pad_ring[AO_PAD_RING];
+static uint8_t ao_log_pad_ring_pos;
 
 #define ao_pad_ring_next(n)	(((n) + 1) & (AO_PAD_RING - 1))
 
@@ -104,7 +102,7 @@ ao_log(void)
 		/*
 		 * Add in pending sample data
 		 */
-		ao_sleep(DATA_TO_XDATA(&ao_sample_data));
+		ao_sleep(&ao_sample_data);
 		while (ao_log_data != ao_sample_data) {
 			sum += ao_data_pres(&ao_data_ring[ao_log_data]);
 			count++;
@@ -149,10 +147,10 @@ ao_log(void)
 	}
 }
 
-uint16_t
+int16_t
 ao_log_flight(uint8_t slot)
 {
-	static __xdata uint16_t flight;
+	static uint16_t flight;
 
 	(void) slot;
 	ao_storage_read(0, &flight, 2);