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

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

diff --git a/src/kernel/ao_log_mini.c b/src/kernel/ao_log_mini.c
index d5735cdc4a8c66a0c7cc3c24a907ec967aaa64db..03bf2265e9b15b0ed160047b559273913a606f40 100644 (file)
--- a/src/kernel/ao_log_mini.c
+++ b/src/kernel/ao_log_mini.c
@@ -21,51 +21,7 @@
 #include <ao_data.h>
 #include <ao_flight.h>
 
-static __xdata struct ao_log_mini log;
-
-__code uint8_t ao_log_format = AO_LOG_FORMAT;
-
-static uint8_t
-ao_log_csum(__xdata uint8_t *b) __reentrant
-{
-       uint8_t sum = 0x5a;
-       uint8_t i;
-
-       for (i = 0; i < sizeof (struct ao_log_mini); i++)
-               sum += *b++;
-       return -sum;
-}
-
-uint8_t
-ao_log_mini(__xdata struct ao_log_mini *log) __reentrant
-{
-       uint8_t wrote = 0;
-       /* set checksum */
-       log->csum = 0;
-       log->csum = ao_log_csum((__xdata uint8_t *) log);
-       ao_mutex_get(&ao_log_mutex); {
-               if (ao_log_current_pos >= ao_log_end_pos && ao_log_running)
-                       ao_log_stop();
-               if (ao_log_running) {
-                       wrote = 1;
-                       ao_storage_write(ao_log_current_pos,
-                                        log,
-                                        sizeof (struct ao_log_mini));
-                       ao_log_current_pos += sizeof (struct ao_log_mini);
-               }
-       } ao_mutex_put(&ao_log_mutex);
-       return wrote;
-}
-
-static uint8_t
-ao_log_dump_check_data(void)
-{
-       if (ao_log_csum((uint8_t *) &log) != 0)
-               return 0;
-       return 1;
-}
-
-static __data uint8_t  ao_log_data_pos;
+static uint8_t ao_log_data_pos;
 
 /* a hack to make sure that ao_log_minis fill the eeprom block in even units */
 typedef uint8_t check_log_size[1-(256 % sizeof(struct ao_log_mini))] ;
@@ -78,7 +34,7 @@ typedef uint8_t check_log_size[1-(256 % sizeof(struct ao_log_mini))] ;
 void
 ao_log(void)
 {
-       __pdata uint16_t        next_sensor;
+       uint16_t        next_sensor;
 
        ao_storage_setup();
 
@@ -88,11 +44,11 @@ ao_log(void)
                ao_sleep(&ao_log_running);
 
 #if HAS_FLIGHT
-       log.type = AO_LOG_FLIGHT;
-       log.tick = ao_sample_tick;
-       log.u.flight.flight = ao_flight_number;
-       log.u.flight.ground_pres = ao_ground_pres;
-       ao_log_mini(&log);
+       ao_log_data.type = AO_LOG_FLIGHT;
+       ao_log_data.tick = ao_sample_tick;
+       ao_log_data.u.flight.flight = ao_flight_number;
+       ao_log_data.u.flight.ground_pres = ao_ground_pres;
+       ao_log_write(&ao_log_data);
 #endif
 
        /* Write the whole contents of the ring to the log
@@ -104,23 +60,23 @@ ao_log(void)
        for (;;) {
                /* Write samples to EEPROM */
                while (ao_log_data_pos != ao_data_head) {
-                       log.tick = ao_data_ring[ao_log_data_pos].tick;
-                       if ((int16_t) (log.tick - next_sensor) >= 0) {
-                               log.type = AO_LOG_SENSOR;
-                               ao_log_pack24(log.u.sensor.pres,
+                       ao_log_data.tick = ao_data_ring[ao_log_data_pos].tick;
+                       if ((int16_t) (ao_log_data.tick - next_sensor) >= 0) {
+                               ao_log_data.type = AO_LOG_SENSOR;
+                               ao_log_pack24(ao_log_data.u.sensor.pres,
                                              ao_data_ring[ao_log_data_pos].ms5607_raw.pres);
-                               ao_log_pack24(log.u.sensor.temp,
+                               ao_log_pack24(ao_log_data.u.sensor.temp,
                                              ao_data_ring[ao_log_data_pos].ms5607_raw.temp);
 #if AO_LOG_FORMAT != AO_LOG_FORMAT_DETHERM
-                               log.u.sensor.sense_a = ao_data_ring[ao_log_data_pos].adc.sense_a;
-                               log.u.sensor.sense_m = ao_data_ring[ao_log_data_pos].adc.sense_m;
-                               log.u.sensor.v_batt = ao_data_ring[ao_log_data_pos].adc.v_batt;
+                               ao_log_data.u.sensor.sense_a = ao_data_ring[ao_log_data_pos].adc.sense_a;
+                               ao_log_data.u.sensor.sense_m = ao_data_ring[ao_log_data_pos].adc.sense_m;
+                               ao_log_data.u.sensor.v_batt = ao_data_ring[ao_log_data_pos].adc.v_batt;
 #endif
-                               ao_log_mini(&log);
+                               ao_log_write(&ao_log_data);
                                if (ao_log_state <= ao_flight_coast)
-                                       next_sensor = log.tick + AO_SENSOR_INTERVAL_ASCENT;
+                                       next_sensor = ao_log_data.tick + AO_SENSOR_INTERVAL_ASCENT;
                                else
-                                       next_sensor = log.tick + AO_SENSOR_INTERVAL_DESCENT;
+                                       next_sensor = ao_log_data.tick + AO_SENSOR_INTERVAL_DESCENT;
                        }
                        ao_log_data_pos = ao_data_ring_next(ao_log_data_pos);
                }
@@ -128,11 +84,11 @@ ao_log(void)
                /* 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_time();
-                       log.u.state.state = ao_log_state;
-                       log.u.state.reason = 0;
-                       ao_log_mini(&log);
+                       ao_log_data.type = AO_LOG_STATE;
+                       ao_log_data.tick = ao_time();
+                       ao_log_data.u.state.state = ao_log_state;
+                       ao_log_data.u.state.reason = 0;
+                       ao_log_write(&ao_log_data);
 
                        if (ao_log_state == ao_flight_landed)
                                ao_log_stop();
@@ -149,16 +105,3 @@ ao_log(void)
                        ao_sleep(&ao_log_running);
        }
 }
-
-uint16_t
-ao_log_flight(uint8_t slot)
-{
-       if (!ao_storage_read(ao_log_pos(slot),
-                            &log,
-                            sizeof (struct ao_log_mini)))
-               return 0;
-
-       if (ao_log_dump_check_data() && log.type == AO_LOG_FLIGHT)
-               return log.u.flight.flight;
-       return 0;
-}