summaryrefslogtreecommitdiff
path: root/src/kernel/ao_flight.c
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2018-08-15 17:34:20 -0700
committerKeith Packard <keithp@keithp.com>2018-10-13 08:22:50 -0700
commit6023ff81f1bbd240169b9548209133d3b02d475f (patch)
tree4526e7ac4386cbd73ebea1d896548dd2997d2bbb /src/kernel/ao_flight.c
parente2e2182a6ae6c8a7290fb5f7bbb7f8e0a863ba99 (diff)
altos: Remove *_TO_DATA macros
Now that we don't support 8051, we don't need these Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'src/kernel/ao_flight.c')
-rw-r--r--src/kernel/ao_flight.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/kernel/ao_flight.c b/src/kernel/ao_flight.c
index c2700d20..170396ff 100644
--- a/src/kernel/ao_flight.c
+++ b/src/kernel/ao_flight.c
@@ -175,7 +175,7 @@ ao_flight(void)
#endif
}
/* wakeup threads due to state change */
- ao_wakeup(DATA_TO_XDATA(&ao_flight_state));
+ ao_wakeup(&ao_flight_state);
break;
case ao_flight_pad:
@@ -219,7 +219,7 @@ ao_flight(void)
ao_wakeup(&ao_gps_new);
#endif
- ao_wakeup(DATA_TO_XDATA(&ao_flight_state));
+ ao_wakeup(&ao_flight_state);
}
break;
case ao_flight_boost:
@@ -244,7 +244,7 @@ ao_flight(void)
ao_flight_state = ao_flight_coast;
#endif
++ao_motor_number;
- ao_wakeup(DATA_TO_XDATA(&ao_flight_state));
+ ao_wakeup(&ao_flight_state);
}
break;
#if HAS_ACCEL
@@ -257,7 +257,7 @@ ao_flight(void)
if (ao_speed < AO_MS_TO_SPEED(AO_MAX_BARO_SPEED))
{
ao_flight_state = ao_flight_coast;
- ao_wakeup(DATA_TO_XDATA(&ao_flight_state));
+ ao_wakeup(&ao_flight_state);
} else
goto check_re_boost;
break;
@@ -306,7 +306,7 @@ ao_flight(void)
/* and enter drogue state */
ao_flight_state = ao_flight_drogue;
- ao_wakeup(DATA_TO_XDATA(&ao_flight_state));
+ ao_wakeup(&ao_flight_state);
}
#if HAS_ACCEL
else {
@@ -315,7 +315,7 @@ ao_flight(void)
if (ao_coast_avg_accel > AO_MSS_TO_ACCEL(20)) {
ao_boost_tick = ao_sample_tick;
ao_flight_state = ao_flight_boost;
- ao_wakeup(DATA_TO_XDATA(&ao_flight_state));
+ ao_wakeup(&ao_flight_state);
}
}
#endif
@@ -352,7 +352,7 @@ ao_flight(void)
ao_interval_min_height = ao_interval_max_height = ao_avg_height;
ao_flight_state = ao_flight_main;
- ao_wakeup(DATA_TO_XDATA(&ao_flight_state));
+ ao_wakeup(&ao_flight_state);
}
break;
@@ -379,7 +379,7 @@ ao_flight(void)
ao_timer_set_adc_interval(0);
#endif
- ao_wakeup(DATA_TO_XDATA(&ao_flight_state));
+ ao_wakeup(&ao_flight_state);
}
ao_interval_min_height = ao_interval_max_height = ao_avg_height;
ao_interval_end = ao_sample_tick + AO_INTERVAL_TICKS;