X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fkernel%2Fao_report.c;h=872dcd48cea9c237a6a1cf974f1980a5fab7dfe3;hb=2f87e182d9f0b3c2856f62149371ad70b16148cf;hp=af48b390daae0c0095c074dd6818aabc27e86d76;hpb=0bf267a6e2d401c8bd6a06d995e3d000777d622a;p=fw%2Faltos

diff --git a/src/kernel/ao_report.c b/src/kernel/ao_report.c
index af48b390..872dcd48 100644
--- 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)
 
-static __pdata enum ao_flight_state ao_report_state;
+static enum ao_flight_state ao_report_state;
 
 /*
  * Farnsworth spacing
@@ -115,7 +115,7 @@ static __pdata enum ao_flight_state ao_report_state;
  */
 
 static void
-ao_report_beep(void) __reentrant
+ao_report_beep(void) 
 {
 	uint8_t r = flight_reports[ao_flight_state];
 	uint8_t l = r & 7;
@@ -134,7 +134,7 @@ ao_report_beep(void) __reentrant
 }
 
 static void
-ao_report_digit(uint8_t digit) __reentrant
+ao_report_digit(uint8_t digit) 
 {
 	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)
 {
-	__xdata uint8_t	digits[10];
-	__pdata uint8_t ndigits, i;
+	uint8_t	digits[10];
+	uint8_t ndigits, i;
 
 	if (n < 0)
 		n = 0;
@@ -178,12 +178,12 @@ ao_report_altitude(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)
 			break;
-		ao_sleep(DATA_TO_XDATA(&ao_sample_data));
+		ao_sleep(&ao_sample_data);
 	}
 	ao_report_number(ao_battery_decivolt(packet.adc.v_batt));
 }
@@ -204,7 +204,7 @@ ao_report_igniter(void)
 }
 
 static void
-ao_report_continuity(void) __reentrant
+ao_report_continuity(void) 
 {
 	uint8_t	c;
 
@@ -251,7 +251,7 @@ ao_report_continuity(void) __reentrant
 }
 #endif
 
-void
+static void
 ao_report(void)
 {
 	for(;;) {
@@ -281,11 +281,11 @@ ao_report(void)
 		}
 #endif
 		while (ao_report_state == ao_flight_state)
-			ao_sleep(DATA_TO_XDATA(&ao_flight_state));
+			ao_sleep(&ao_flight_state);
 	}
 }
 
-static __xdata struct ao_task ao_report_task;
+static struct ao_task ao_report_task;
 
 void
 ao_report_init(void)