altos: Remove *_TO_DATA macros

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

diff --git a/src/kernel/ao_flight_nano.c b/src/kernel/ao_flight_nano.c
index 406d81adc5f1cde7d90763dcecfa3f3059114db1..797ea344e16c1851628f0d3a4cee077cb2c8d000 100644 (file)
--- a/src/kernel/ao_flight_nano.c
+++ b/src/kernel/ao_flight_nano.c
@@ -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
  *
  * 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
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of


@@ -69,7 +70,7 @@ ao_flight_nano(void)
                        ao_led_off(AO_LED_RED);
 
                        /* wakeup threads due to state change */
                        ao_led_off(AO_LED_RED);
 
                        /* wakeup threads due to state change */

-                       ao_wakeup(DATA_TO_XDATA(&ao_flight_state));
+                       ao_wakeup(&ao_flight_state);

                        break;
                case ao_flight_pad:
                        if (ao_height> AO_M_TO_HEIGHT(20)) {
                        break;
                case ao_flight_pad:
                        if (ao_height> AO_M_TO_HEIGHT(20)) {


@@ -79,7 +80,7 @@ ao_flight_nano(void)
                                /* start logging data */
                                ao_log_start();
 
                                /* start logging data */
                                ao_log_start();
 

-                               ao_wakeup(DATA_TO_XDATA(&ao_flight_state));
+                               ao_wakeup(&ao_flight_state);

                        }
                        break;
                case ao_flight_drogue:
                        }
                        break;
                case ao_flight_drogue:


@@ -100,7 +101,7 @@ ao_flight_nano(void)
 
                                        /* turn off the ADC capture */
                                        ao_timer_set_adc_interval(0);
 
                                        /* turn off the ADC capture */
                                        ao_timer_set_adc_interval(0);

-                                       ao_wakeup(DATA_TO_XDATA(&ao_flight_state));
+                                       ao_wakeup(&ao_flight_state);

                                }
                                ao_interval_min_height = ao_interval_max_height = ao_height;
                                ao_interval_end = ao_sample_tick + AO_INTERVAL_TICKS;
                                }
                                ao_interval_min_height = ao_interval_max_height = ao_height;
                                ao_interval_end = ao_sample_tick + AO_INTERVAL_TICKS;