X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fkernel%2Fao_log.c;h=dc3b6486caabea5355753cea8e446fd1eb213dac;hp=d9c3e00f6ce2fb98a40016e161230aae88a02b5e;hb=bb7522acf040f41740ecd059e3d5d2480b652420;hpb=8117ba3553789a2bae9beb92fbe9e14e3cc79389

diff --git a/src/kernel/ao_log.c b/src/kernel/ao_log.c
index d9c3e00f..dc3b6486 100644
--- a/src/kernel/ao_log.c
+++ b/src/kernel/ao_log.c
@@ -18,6 +18,9 @@
 #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;
@@ -139,19 +142,39 @@ ao_log_max_flight(void)
 	return max_flight;
 }
 
-void
-ao_log_scan(void) __reentrant
+static void
+ao_log_erase(uint8_t slot) __reentrant
 {
-	uint8_t		log_slot;
-	uint8_t		log_slots;
-	uint8_t		log_want;
+	uint32_t log_current_pos, log_end_pos;
 
-	ao_config_get();
+	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;
+	}
+}
 
-	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) __reentrant
+{
+	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
@@ -167,6 +190,74 @@ ao_log_scan(void) __reentrant
 	}
 	if (ao_flight_number == 0)
 		ao_flight_number = 1;
+}
+
+void
+ao_log_scan(void) __reentrant
+{
+	uint8_t		log_slot;
+	uint8_t		log_slots;
+#if !FLIGHT_LOG_APPEND
+	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)
+				ao_log_erase(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;
+
+	if (ao_flight_number) {
+		uint32_t	full = ao_log_current_pos;
+		uint32_t	empty = ao_log_end_pos - 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;
+
+			if (ao_log_current_pos == full) {
+				if (ao_log_check(ao_log_current_pos))
+					ao_log_current_pos += ao_log_size;
+				break;
+			}
+			if (ao_log_current_pos == empty)
+				break;
+
+			if (ao_log_check(ao_log_current_pos)) {
+				full = ao_log_current_pos;
+			} else {
+				empty = ao_log_current_pos;
+			}
+		}
+	} else {
+		ao_log_find_max_erase_flight();
+	}
+#else
+
+	if (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
@@ -187,7 +278,7 @@ ao_log_scan(void) __reentrant
 		if (++log_slot >= log_slots)
 			log_slot = 0;
 	} while (log_slot != log_want);
-
+#endif
 	ao_wakeup(&ao_flight_number);
 }
 
@@ -261,28 +352,13 @@ ao_log_delete(void) __reentrant
 	if (ao_cmd_lex_i) {
 		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;
-				}
+#if HAS_TRACKER
+				ao_tracker_erase_start(ao_cmd_lex_i);
+#endif
+				ao_log_erase(slot);
+#if HAS_TRACKER
+				ao_tracker_erase_end();
+#endif
 				puts("Erased");
 				return;
 			}