Fix GPL version at 2

[fw/altos] / ao_log.c

diff --git a/ao_log.c b/ao_log.c
index 65196ae25f17bdac47075b2c7a6910ee13e3fd3e..fedd9850e7b0f852e5f7aed87a4c7909c2d84f0a 100644 (file)
--- a/ao_log.c
+++ b/ao_log.c
@@ -3,8 +3,7 @@
  *
  * 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; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation; version 2 of the License.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -121,7 +120,7 @@ ao_log(void)
                ao_sleep(&ao_log_running);
        
        log.type = AO_LOG_FLIGHT;
-       log.tick = ao_flight_state_tick;
+       log.tick = ao_flight_tick;
        log.u.flight.serial = 0;
        log.u.flight.flight = ao_log_dump_flight + 1;
        ao_log_data(&log);
@@ -130,7 +129,7 @@ ao_log(void)
                if (ao_flight_state != ao_log_state) {
                        ao_log_state = ao_flight_state;
                        log.type = AO_LOG_STATE;
-                       log.tick = ao_flight_state_tick;
+                       log.tick = ao_flight_tick;
                        log.u.state.state = ao_log_state;
                        log.u.state.reason = 0;
                        ao_log_data(&log);
@@ -172,6 +171,13 @@ ao_log_start(void)
        ao_wakeup(&ao_log_running);
 }
 
+void
+ao_log_stop(void)
+{
+       ao_log_running = 0;
+       ao_log_flush();
+}
+
 static __xdata struct ao_task ao_log_task;
 
 void