altos: Simplify discovery of log end position

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

diff --git a/src/kernel/ao_log.c b/src/kernel/ao_log.c
index f0816aeeeb07365836c29627ccd84ed10c275660..2167d145d2ecd7211832ce01879fcd68bcc3bb17 100644 (file)
--- a/src/kernel/ao_log.c
+++ b/src/kernel/ao_log.c
@@ -292,28 +292,28 @@ ao_log_scan(void)
        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;