projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
stm32f1: Clean up some ADC definitions
[fw/altos]
/
src
/
kernel
/
ao_balloon.c
diff --git
a/src/kernel/ao_balloon.c
b/src/kernel/ao_balloon.c
index 47b69e25bb747d1b81981194fd29ee2f983034d7..a5be8c1632870d925b6afb9e98a9c52426d3dc1b 100644
(file)
--- a/
src/kernel/ao_balloon.c
+++ b/
src/kernel/ao_balloon.c
@@
-34,16
+34,16
@@
#if HAS_SENSOR_ERRORS
/* Any sensor can set this to mark the flight computer as 'broken' */
#if HAS_SENSOR_ERRORS
/* Any sensor can set this to mark the flight computer as 'broken' */
-
__xdata
uint8_t ao_sensor_errors;
+uint8_t ao_sensor_errors;
#endif
#endif
-
__pdata
uint16_t ao_motor_number; /* number of motors burned so far */
+uint16_t ao_motor_number; /* number of motors burned so far */
/* Main flight thread. */
/* Main flight thread. */
-
__pdata
enum ao_flight_state ao_flight_state; /* current flight state */
+enum ao_flight_state ao_flight_state; /* current flight state */
-
__pdata
uint8_t ao_flight_force_idle;
+uint8_t ao_flight_force_idle;
void
ao_flight(void)
void
ao_flight(void)
@@
-96,7
+96,7
@@
ao_flight(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:
break;
case ao_flight_pad:
@@
-118,7
+118,7
@@
ao_flight(void)
ao_wakeup(&ao_gps_new);
#endif
ao_wakeup(&ao_gps_new);
#endif
- ao_wakeup(
DATA_TO_XDATA(&ao_flight_state)
);
+ ao_wakeup(
&ao_flight_state
);
}
break;
default:
}
break;
default:
@@
-127,7
+127,7
@@
ao_flight(void)
}
}
}
}
-static
__xdata
struct ao_task flight_task;
+static struct ao_task flight_task;
void
ao_flight_init(void)
void
ao_flight_init(void)