Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / src / kernel / ao_flight.h

diff --git a/src/kernel/ao_flight.h b/src/kernel/ao_flight.h
index 01d21c119538701bccb08de33df65c93180e9ae1..af6b0c55bedd465ed209b8284d503808c35911f5 100644 (file)
--- a/src/kernel/ao_flight.h
+++ b/src/kernel/ao_flight.h
@@ -3,7 +3,8 @@
  *
  * 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
@@ -37,20 +38,21 @@ enum ao_flight_state {
        ao_flight_test = 10
 };
 
-extern __pdata enum ao_flight_state    ao_flight_state;
-extern __pdata uint16_t                        ao_boost_tick;
-extern __pdata uint16_t                        ao_motor_number;
+extern enum ao_flight_state    ao_flight_state;
+extern uint16_t                        ao_boost_tick;
+extern uint16_t                        ao_launch_tick;
+extern uint16_t                        ao_motor_number;
 
 #if HAS_IMU || HAS_MMA655X
 #define HAS_SENSOR_ERRORS      1
 #endif
 
 #if HAS_SENSOR_ERRORS
-extern __xdata uint8_t                 ao_sensor_errors;
+extern uint8_t                 ao_sensor_errors;
 #endif
 
-extern __pdata uint16_t                        ao_launch_time;
-extern __pdata uint8_t                 ao_flight_force_idle;
+extern uint16_t                        ao_launch_time;
+extern uint8_t                 ao_flight_force_idle;
 
 /* Flight thread */
 void