#include <ao_tracker.h>
#endif
-__xdata uint8_t ao_log_mutex;
-__pdata uint32_t ao_log_current_pos;
-__pdata uint32_t ao_log_end_pos;
-__pdata uint32_t ao_log_start_pos;
-__xdata uint8_t ao_log_running;
-__pdata enum ao_flight_state ao_log_state;
-__xdata int16_t ao_flight_number;
+uint8_t ao_log_mutex;
+uint32_t ao_log_current_pos;
+uint32_t ao_log_end_pos;
+uint32_t ao_log_start_pos;
+uint8_t ao_log_running;
+enum ao_flight_state ao_log_state;
+int16_t ao_flight_number;
void
ao_log_flush(void)
uint16_t flight;
};
-static __xdata struct ao_log_erase erase;
+static struct ao_log_erase erase;
#ifndef LOG_MAX_ERASE
#define LOG_MAX_ERASE 16
ao_config_put();
}
+/* Position of first flight record in slot */
+static uint32_t
+ao_log_pos(uint8_t slot)
+{
+ return ((slot) * ao_config.flight_log_max);
+}
+
+/* Start of erase block containing first flight record */
+static uint32_t
+ao_log_pos_block_start(uint8_t slot)
+{
+ return ao_log_pos(slot) & ~(ao_storage_block - 1);
+}
+
+/* End of erase block containing last flight record */
+static uint32_t
+ao_log_pos_block_end(uint8_t slot)
+{
+ return ao_log_pos_block_start(slot + 1);
+}
+
#ifndef AO_LOG_UNCOMMON
/*
* Common logging functions which depend on the type of the log data
* structure.
*/
-__xdata ao_log_type log;
+ao_log_type ao_log_data;
static uint8_t
-ao_log_csum(__xdata uint8_t *b) __reentrant
+ao_log_csum(uint8_t *b)
{
uint8_t sum = 0x5a;
uint8_t i;
}
uint8_t
-ao_log_write(__xdata ao_log_type *log) __reentrant
+ao_log_write(ao_log_type *log)
{
uint8_t wrote = 0;
/* set checksum */
log->csum = 0;
- log->csum = ao_log_csum((__xdata uint8_t *) log);
+ log->csum = ao_log_csum((uint8_t *) log);
ao_mutex_get(&ao_log_mutex); {
if (ao_log_current_pos >= ao_log_end_pos && ao_log_running)
ao_log_stop();
uint8_t
ao_log_check_data(void)
{
- if (ao_log_csum((uint8_t *) &log) != 0)
+ if (ao_log_csum((uint8_t *) &ao_log_data) != 0)
return 0;
return 1;
}
-uint8_t
-ao_log_check_clear(void)
-{
- uint8_t *b = (uint8_t *) &log;
- uint8_t i;
-
- for (i = 0; i < sizeof (ao_log_type); i++) {
- if (*b++ != 0xff)
- return 0;
- }
- return 1;
-}
-
int16_t
ao_log_flight(uint8_t slot)
{
+ if (ao_storage_is_erased(ao_log_pos_block_start(slot)))
+ return 0;
+
if (!ao_storage_read(ao_log_pos(slot),
- &log,
+ &ao_log_data,
sizeof (ao_log_type)))
return -(int16_t) (slot + 1);
- if (ao_log_check_clear())
- return 0;
-
- if (!ao_log_check_data() || log.type != AO_LOG_FLIGHT)
+ if (!ao_log_check_data() || ao_log_data.type != AO_LOG_FLIGHT)
return -(int16_t) (slot + 1);
- return log.u.flight.flight;
+ return ao_log_data.u.flight.flight;
}
#endif
static uint8_t
-ao_log_slots()
+ao_log_slots(void)
{
return (uint8_t) (ao_storage_log_max / ao_config.flight_log_max);
}
-uint32_t
-ao_log_pos(uint8_t slot)
-{
- return ((slot) * ao_config.flight_log_max);
-}
-
static int16_t
ao_log_max_flight(void)
{
return max_flight;
}
-static void
-ao_log_erase(uint8_t slot) __reentrant
+static uint8_t
+ao_log_erase(uint8_t slot)
{
- uint32_t log_current_pos, log_end_pos;
+ uint32_t start_pos;
+ uint32_t end_pos;
ao_log_erase_mark();
- log_current_pos = ao_log_pos(slot);
- log_end_pos = log_current_pos + ao_config.flight_log_max;
- while (log_current_pos < log_end_pos) {
- uint8_t i;
- static __xdata uint8_t b;
-
- /*
- * Check to see if we've reached the end of
- * the used memory to avoid re-erasing the same
- * memory over and over again
- */
- for (i = 0; i < 16; i++) {
- if (ao_storage_read(log_current_pos + i, &b, 1))
- if (b != 0xff)
- break;
- }
- if (i == 16)
- break;
- ao_storage_erase(log_current_pos);
- log_current_pos += ao_storage_block;
- }
+ start_pos = ao_log_pos_block_start(slot);
+ end_pos = ao_log_pos_block_end(slot);
+ return ao_storage_erase(start_pos, end_pos - start_pos);
}
static void
-ao_log_find_max_erase_flight(void) __reentrant
+ao_log_find_max_erase_flight(void)
{
uint8_t log_slot;
}
uint8_t
-ao_log_scan(void) __reentrant
+ao_log_scan(void)
{
uint8_t log_slot;
uint8_t log_slots;
log_slots = ao_log_slots();
for (log_slot = 1; log_slot < log_slots; log_slot++) {
if (ao_log_flight(log_slot) != 0)
- ao_log_erase(log_slot);
+ if (!ao_log_erase(log_slot))
+ printf("erase %d failed\n", log_slot);
}
ao_config_log_fix_append();
}
ao_log_current_pos = ao_log_pos(0);
- ao_log_end_pos = ao_log_current_pos + ao_storage_log_max;
+ ao_log_end_pos = ao_log_pos_block_end(0);
if (ao_flight_number) {
- uint32_t full = ao_log_current_pos;
- uint32_t empty = ao_log_end_pos - AO_LOG_SIZE;
+ uint32_t full = (ao_log_current_pos) / AO_LOG_SIZE;
+ uint32_t empty = (ao_log_end_pos - AO_LOG_SIZE) / AO_LOG_SIZE;
/* If there's already a flight started, then find the
* end of it
*/
for (;;) {
- ao_log_current_pos = (full + empty) >> 1;
- ao_log_current_pos -= ao_log_current_pos % AO_LOG_SIZE;
+ uint32_t current = (full + empty) >> 1;
+ ao_log_current_pos = current * AO_LOG_SIZE;
- if (ao_log_current_pos == full) {
+ if (current == full) {
if (ao_log_check(ao_log_current_pos) != AO_LOG_EMPTY)
ao_log_current_pos += AO_LOG_SIZE;
break;
}
- if (ao_log_current_pos == empty)
+ if (current == empty)
break;
if (ao_log_check(ao_log_current_pos) != AO_LOG_EMPTY) {
- full = ao_log_current_pos;
+ full = current;
} else {
- empty = ao_log_current_pos;
+ empty = current;
}
}
ret = 1;
do {
if (ao_log_flight(log_slot) == 0) {
ao_log_current_pos = ao_log_pos(log_slot);
- ao_log_end_pos = ao_log_current_pos + ao_config.flight_log_max;
+ ao_log_end_pos = ao_log_pos_block_end(log_slot);
break;
}
if (++log_slot >= log_slots)
#endif
#if LOG_ADC
-static __xdata struct ao_task ao_log_task;
+static struct ao_task ao_log_task;
#endif
-void
-ao_log_list(void) __reentrant
+static void
+ao_log_list(void)
{
uint8_t slot;
uint8_t slots;
printf ("flight %d start %x end %x\n",
flight,
(uint16_t) (ao_log_pos(slot) >> 8),
- (uint16_t) (ao_log_pos(slot+1) >> 8));
+ (uint16_t) (ao_log_pos_block_end(slot) >> 8));
+ else
+ printf ("slot %d start %x end %x\n",
+ slot,
+ (uint16_t) (ao_log_pos(slot) >> 8),
+ (uint16_t) (ao_log_pos_block_end(slot) >> 8));
}
printf ("done\n");
}
-void
-ao_log_delete(void) __reentrant
+static void
+ao_log_delete(void)
{
uint8_t slot;
uint8_t slots;
cmd_flight = -1;
ao_cmd_lex();
}
- ao_cmd_decimal();
+ cmd_flight *= ao_cmd_decimal();
if (ao_cmd_status != ao_cmd_success)
return;
- cmd_flight *= (int16_t) ao_cmd_lex_i;
slots = ao_log_slots();
/* Look for the flight log matching the requested flight */
#if HAS_TRACKER
ao_tracker_erase_start(cmd_flight);
#endif
- ao_log_erase(slot);
+ if (ao_log_erase(slot))
+ puts("Erased");
+ else
+ puts("Failed to erase");
#if HAS_TRACKER
ao_tracker_erase_end();
#endif
- puts("Erased");
return;
}
}
printf("No such flight: %d\n", cmd_flight);
}
-__code struct ao_cmds ao_log_cmds[] = {
+const struct ao_cmds ao_log_cmds[] = {
{ ao_log_list, "l\0List logs" },
{ ao_log_delete, "d <flight-number>\0Delete flight" },
{ 0, NULL },
projects / fw / altos / blobdiff