X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fkernel%2Fao_log.c;h=53d6666929021c37e686074c64700fea699dae59;hb=c49bd3cb0c31a51fae79ddc92237cc309be9a242;hp=1119cce41f6aeb7378427e400b5dafb871484734;hpb=c6e57291d91f1f6c4de5c54a5cfd3eef66d9f830;p=fw%2Faltos diff --git a/src/kernel/ao_log.c b/src/kernel/ao_log.c index 1119cce4..53d66669 100644 --- a/src/kernel/ao_log.c +++ b/src/kernel/ao_log.c @@ -29,7 +29,7 @@ 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; +uint16_t ao_flight_number; void ao_log_flush(void) @@ -77,7 +77,7 @@ ao_log_write_erase(uint8_t pos) 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)); } @@ -111,6 +111,27 @@ ao_log_erase_mark(void) 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 @@ -159,56 +180,37 @@ ao_log_check_data(void) return 1; } -uint8_t -ao_log_check_clear(void) -{ - uint8_t *b = (uint8_t *) &ao_log_data; - uint8_t i; - - for (i = 0; i < sizeof (ao_log_type); i++) { - if (*b++ != 0xff) - return 0; - } - return 1; -} - -int16_t +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 -(int16_t) (slot + 1); - - if (ao_log_check_clear()) - return 0; + return -(int32_t) (slot + 1); if (!ao_log_check_data() || ao_log_data.type != AO_LOG_FLIGHT) - return -(int16_t) (slot + 1); + return -(int32_t) (slot + 1); - return ao_log_data.u.flight.flight; + return (int32_t) 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 +static uint16_t ao_log_max_flight(void) { uint8_t log_slot; uint8_t log_slots; - int16_t log_flight; - int16_t max_flight = 0; + int32_t log_flight; + uint16_t max_flight = 0; /* Scan the log space looking for the biggest flight number */ log_slots = ao_log_slots(); @@ -217,38 +219,21 @@ ao_log_max_flight(void) if (log_flight <= 0) continue; if (max_flight == 0 || log_flight > max_flight) - max_flight = log_flight; + max_flight = (uint16_t) log_flight; } return max_flight; } -static void +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 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 @@ -298,36 +283,37 @@ ao_log_scan(void) 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; @@ -354,12 +340,12 @@ ao_log_scan(void) /* 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) @@ -405,42 +391,46 @@ ao_log_full(void) static struct ao_task ao_log_task; #endif -void +static void ao_log_list(void) { uint8_t slot; uint8_t slots; - int16_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 +static void ao_log_delete(void) { uint8_t slot; uint8_t slots; - int16_t cmd_flight = 1; + int32_t cmd_flight = 1; ao_cmd_white(); if (ao_cmd_lex_c == '-') { cmd_flight = -1; ao_cmd_lex(); } - ao_cmd_decimal(); + cmd_flight *= (int32_t) 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 */ @@ -450,16 +440,18 @@ ao_log_delete(void) #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); + printf("No such flight: %ld\n", cmd_flight); } const struct ao_cmds ao_log_cmds[] = {