altos: Switch ao_log.c and ao_log_big.c __xdata to __pdata

[fw/altos] / src / ao_log_big.c

diff --git a/src/ao_log_big.c b/src/ao_log_big.c
index 8379ab5f1e36488463db092f93a2933a2b6bf21c..74d94c4baae9802855e2bb6acb233d2a38a16cb5 100644 (file)
--- a/src/ao_log_big.c
+++ b/src/ao_log_big.c
@@ -60,7 +60,7 @@ ao_log_dump_check_data(void)
        return 1;
 }
 
-static __xdata uint8_t ao_log_adc_pos;
+static __data uint8_t  ao_log_adc_pos;
 
 /* a hack to make sure that ao_log_records fill the eeprom block in even units */
 typedef uint8_t check_log_size[1-(256 % sizeof(struct ao_log_record))] ;
@@ -72,8 +72,7 @@ typedef uint8_t check_log_size[1-(256 % sizeof(struct ao_log_record))] ;
 void
 ao_log(void)
 {
-       uint16_t        next_sensor;
-       uint16_t        next_other;
+       __pdata uint16_t        next_sensor, next_other;
 
        ao_storage_setup();
 
@@ -83,7 +82,7 @@ ao_log(void)
                ao_sleep(&ao_log_running);
 
        log.type = AO_LOG_FLIGHT;
-       next_other = next_sensor = log.tick = ao_flight_tick;
+       log.tick = ao_sample_tick;
 #if HAS_ACCEL
        log.u.flight.ground_accel = ao_ground_accel;
 #endif
@@ -93,17 +92,19 @@ ao_log(void)
        /* Write the whole contents of the ring to the log
         * when starting up.
         */
-       ao_log_adc_pos = ao_adc_ring_next(ao_flight_adc);
+       ao_log_adc_pos = ao_adc_ring_next(ao_sample_adc);
+       next_other = next_sensor = ao_adc_ring[ao_log_adc_pos].tick;
+       ao_log_state = ao_flight_startup;
        for (;;) {
                /* Write samples to EEPROM */
-               while (ao_log_adc_pos != ao_flight_adc) {
+               while (ao_log_adc_pos != ao_sample_adc) {
                        log.tick = ao_adc_ring[ao_log_adc_pos].tick;
                        if ((int16_t) (log.tick - next_sensor) >= 0) {
                                log.type = AO_LOG_SENSOR;
                                log.u.sensor.accel = ao_adc_ring[ao_log_adc_pos].accel;
                                log.u.sensor.pres = ao_adc_ring[ao_log_adc_pos].pres;
                                ao_log_data(&log);
-                               if (ao_flight_state <= ao_flight_coast)
+                               if (ao_log_state <= ao_flight_coast)
                                        next_sensor = log.tick + AO_SENSOR_INTERVAL_ASCENT;
                                else
                                        next_sensor = log.tick + AO_SENSOR_INTERVAL_DESCENT;
@@ -120,18 +121,18 @@ ao_log(void)
                                next_other = log.tick + AO_OTHER_INTERVAL;
                        }
                        ao_log_adc_pos = ao_adc_ring_next(ao_log_adc_pos);
-                       /* Write state change to EEPROM */
-                       if (ao_flight_state != ao_log_state) {
-                               ao_log_state = ao_flight_state;
-                               log.type = AO_LOG_STATE;
-                               log.tick = ao_flight_tick;
-                               log.u.state.state = ao_log_state;
-                               log.u.state.reason = 0;
-                               ao_log_data(&log);
-
-                               if (ao_log_state == ao_flight_landed)
-                                       ao_log_stop();
-                       }
+               }
+               /* Write state change to EEPROM */
+               if (ao_flight_state != ao_log_state) {
+                       ao_log_state = ao_flight_state;
+                       log.type = AO_LOG_STATE;
+                       log.tick = ao_sample_tick;
+                       log.u.state.state = ao_log_state;
+                       log.u.state.reason = 0;
+                       ao_log_data(&log);
+
+                       if (ao_log_state == ao_flight_landed)
+                               ao_log_stop();
                }
 
                /* Wait for a while */