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

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

diff --git a/src/kernel/ao_log_tiny.c b/src/kernel/ao_log_tiny.c
index 0b8e39d6aa4d74dc9cad9d6861ac1a8972b062e3..530031113842fada7915070db8429e00ca394b7c 100644 (file)
--- 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
@@ -41,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))
 
@@ -102,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++;
@@ -150,7 +150,7 @@ ao_log(void)
 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);