*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
#include "ao.h"
#include <ao_log.h>
#include <ao_config.h>
+#if HAS_TRACKER
+#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 uint16_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;
+uint16_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
if (pos == 0) {
uint8_t i;
for (i = 1; i < LOG_MAX_ERASE; i++) {
- erase.mark = ~LOG_ERASE_MARK;
+ erase.mark = (uint8_t) ~LOG_ERASE_MARK;
erase.flight = 0;
ao_config_write(ao_log_erase_pos(i), &erase, sizeof (erase));
}
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.
+ */
+
+ao_log_type ao_log_data;
+
static uint8_t
-ao_log_slots()
+ao_log_csum(uint8_t *b)
{
- return (uint8_t) (ao_storage_log_max / ao_config.flight_log_max);
+ uint8_t sum = 0x5a;
+ uint8_t i;
+
+ for (i = 0; i < sizeof (ao_log_type); i++)
+ sum += *b++;
+ return -sum;
}
-uint32_t
-ao_log_pos(uint8_t slot)
+uint8_t
+ao_log_write(ao_log_type *log)
{
- return ((slot) * ao_config.flight_log_max);
+ uint8_t wrote = 0;
+ /* set checksum */
+ log->csum = 0;
+ 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();
+ if (ao_log_running) {
+ wrote = 1;
+ ao_storage_write(ao_log_current_pos,
+ log,
+ sizeof (ao_log_type));
+ ao_log_current_pos += sizeof (ao_log_type);
+ }
+ } ao_mutex_put(&ao_log_mutex);
+ return wrote;
+}
+
+uint8_t
+ao_log_check_data(void)
+{
+ if (ao_log_csum((uint8_t *) &ao_log_data) != 0)
+ return 0;
+ return 1;
+}
+
+int32_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),
+ &ao_log_data,
+ sizeof (ao_log_type)))
+ return -(int32_t) (slot + 1);
+
+ if (!ao_log_check_data() || ao_log_data.type != AO_LOG_FLIGHT)
+ return -(int32_t) (slot + 1);
+
+ return (int32_t) ao_log_data.u.flight.flight;
+}
+#endif
+
+static uint8_t
+ao_log_slots(void)
+{
+ return (uint8_t) (ao_storage_log_max / ao_config.flight_log_max);
}
static uint16_t
{
uint8_t log_slot;
uint8_t log_slots;
- uint16_t log_flight;
+ int32_t log_flight;
uint16_t max_flight = 0;
/* Scan the log space looking for the biggest flight number */
log_slots = ao_log_slots();
for (log_slot = 0; log_slot < log_slots; log_slot++) {
log_flight = ao_log_flight(log_slot);
- if (!log_flight)
+ if (log_flight <= 0)
continue;
- if (max_flight == 0 || (int16_t) (log_flight - max_flight) > 0)
- max_flight = log_flight;
+ if (max_flight == 0 || log_flight > max_flight)
+ max_flight = (uint16_t) log_flight;
}
return max_flight;
}
-void
-ao_log_scan(void) __reentrant
+static uint8_t
+ao_log_erase(uint8_t slot)
{
- uint8_t log_slot;
- uint8_t log_slots;
- uint8_t log_want;
+ uint32_t start_pos;
+ uint32_t end_pos;
- ao_config_get();
+ ao_log_erase_mark();
+ 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);
+}
- ao_flight_number = ao_log_max_flight();
- if (ao_flight_number)
- if (++ao_flight_number == 0)
- ao_flight_number = 1;
+static void
+ao_log_find_max_erase_flight(void)
+{
+ uint8_t log_slot;
/* Now look through the log of flight numbers from erase operations and
* see if the last one is bigger than what we found above
}
if (ao_flight_number == 0)
ao_flight_number = 1;
+}
+
+uint8_t
+ao_log_scan(void)
+{
+ uint8_t log_slot;
+ uint8_t log_slots;
+#if FLIGHT_LOG_APPEND
+ uint8_t ret;
+#else
+ uint8_t log_want;
+#endif
+
+ ao_config_get();
+
+ /* Get any existing flight number */
+ ao_flight_number = ao_log_max_flight();
+
+#if FLIGHT_LOG_APPEND
+
+ /* Deal with older OS versions which stored multiple
+ * flights in rom by erasing everything after the first
+ * slot
+ */
+ if (ao_config.flight_log_max != ao_storage_log_max) {
+ log_slots = ao_log_slots();
+ for (log_slot = 1; log_slot < log_slots; log_slot++) {
+ if (ao_log_flight(log_slot) != 0)
+ 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_pos_block_end(0);
+
+ if (ao_flight_number) {
+ 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 (;;) {
+ uint32_t current = (full + empty) >> 1;
+ ao_log_current_pos = current * AO_LOG_SIZE;
+
+ if (current == full) {
+ if (ao_log_check(ao_log_current_pos) != AO_LOG_EMPTY)
+ ao_log_current_pos += AO_LOG_SIZE;
+ break;
+ }
+ if (current == empty)
+ break;
+
+ if (ao_log_check(ao_log_current_pos) != AO_LOG_EMPTY) {
+ full = current;
+ } else {
+ empty = current;
+ }
+ }
+ ret = 1;
+ } else {
+ ao_log_find_max_erase_flight();
+ ret = 0;
+ }
+ ao_wakeup(&ao_flight_number);
+ return ret;
+#else
+ if (ao_flight_number) {
+ ++ao_flight_number;
+ if (ao_flight_number <= 0)
+ ao_flight_number = 1;
+ }
+
+ ao_log_find_max_erase_flight();
/* With a flight number in hand, find a place to write a new log,
* use the target flight number to index the available log slots so
/* Find a log slot for the next flight, if available */
ao_log_current_pos = ao_log_end_pos = 0;
log_slots = ao_log_slots();
- log_want = (ao_flight_number - 1) % log_slots;
+ log_want = (uint8_t) ((ao_flight_number - 1) % log_slots);
log_slot = log_want;
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)
log_slot = 0;
} while (log_slot != log_want);
-
ao_wakeup(&ao_flight_number);
+ return 0;
+#endif
}
void
#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;
- uint16_t flight;
+ int32_t flight;
slots = ao_log_slots();
for (slot = 0; slot < slots; slot++)
{
flight = ao_log_flight(slot);
if (flight)
- printf ("flight %d start %x end %x\n",
+ printf ("flight %ld 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;
+ int32_t cmd_flight = 1;
- ao_cmd_decimal();
+ ao_cmd_white();
+ if (ao_cmd_lex_c == '-') {
+ cmd_flight = -1;
+ ao_cmd_lex();
+ }
+ cmd_flight *= (int32_t) ao_cmd_decimal();
if (ao_cmd_status != ao_cmd_success)
return;
slots = ao_log_slots();
/* Look for the flight log matching the requested flight */
- if (ao_cmd_lex_i) {
+ if (cmd_flight) {
for (slot = 0; slot < slots; slot++) {
- if (ao_log_flight(slot) == ao_cmd_lex_i) {
- ao_log_erase_mark();
- ao_log_current_pos = ao_log_pos(slot);
- ao_log_end_pos = ao_log_current_pos + ao_config.flight_log_max;
- while (ao_log_current_pos < ao_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(ao_log_current_pos + i, &b, 1))
- if (b != 0xff)
- break;
- }
- if (i == 16)
- break;
- ao_storage_erase(ao_log_current_pos);
- ao_log_current_pos += ao_storage_block;
- }
- puts("Erased");
+ if (ao_log_flight(slot) == cmd_flight) {
+#if HAS_TRACKER
+ ao_tracker_erase_start(cmd_flight);
+#endif
+ if (ao_log_erase(slot))
+ puts("Erased");
+ else
+ puts("Failed to erase");
+#if HAS_TRACKER
+ ao_tracker_erase_end();
+#endif
return;
}
}
}
- printf("No such flight: %d\n", ao_cmd_lex_i);
+ printf("No such flight: %ld\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 },