projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Remove 8051-ism from ao_usb.h
[fw/altos]
/
src
/
kernel
/
ao_report.c
diff --git
a/src/kernel/ao_report.c
b/src/kernel/ao_report.c
index 73f87cdd16c05762bdd15933a0a6185c58b4fe64..08967af8450f3f2701b82e3c3df146e801dfa5e1 100644
(file)
--- a/
src/kernel/ao_report.c
+++ b/
src/kernel/ao_report.c
@@
-58,7
+58,7
@@
static const uint8_t flight_reports[] = {
#endif
#define pause(time) ao_delay(time)
#endif
#define pause(time) ao_delay(time)
-static
__pdata
enum ao_flight_state ao_report_state;
+static enum ao_flight_state ao_report_state;
/*
* Farnsworth spacing
/*
* Farnsworth spacing
@@
-115,7
+115,7
@@
static __pdata enum ao_flight_state ao_report_state;
*/
static void
*/
static void
-ao_report_beep(void)
__reentrant
+ao_report_beep(void)
{
uint8_t r = flight_reports[ao_flight_state];
uint8_t l = r & 7;
{
uint8_t r = flight_reports[ao_flight_state];
uint8_t l = r & 7;
@@
-134,7
+134,7
@@
ao_report_beep(void) __reentrant
}
static void
}
static void
-ao_report_digit(uint8_t digit)
__reentrant
+ao_report_digit(uint8_t digit)
{
if (!digit) {
mid(AO_MS_TO_TICKS(500));
{
if (!digit) {
mid(AO_MS_TO_TICKS(500));
@@
-151,8
+151,8
@@
ao_report_digit(uint8_t digit) __reentrant
static void
ao_report_number(int16_t n)
{
static void
ao_report_number(int16_t n)
{
-
__xdata
uint8_t digits[10];
-
__pdata
uint8_t ndigits, i;
+ uint8_t digits[10];
+ uint8_t ndigits, i;
if (n < 0)
n = 0;
if (n < 0)
n = 0;
@@
-178,7
+178,7
@@
ao_report_altitude(void)
static void
ao_report_battery(void)
{
static void
ao_report_battery(void)
{
-
__xdata
struct ao_data packet;
+ struct ao_data packet;
for (;;) {
ao_data_get(&packet);
if (packet.adc.v_batt != 0)
for (;;) {
ao_data_get(&packet);
if (packet.adc.v_batt != 0)
@@
-204,7
+204,7
@@
ao_report_igniter(void)
}
static void
}
static void
-ao_report_continuity(void)
__reentrant
+ao_report_continuity(void)
{
uint8_t c;
{
uint8_t c;
@@
-285,7
+285,7
@@
ao_report(void)
}
}
}
}
-static
__xdata
struct ao_task ao_report_task;
+static struct ao_task ao_report_task;
void
ao_report_init(void)
void
ao_report_init(void)