Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

13 files changed, 44 insertions, 556 deletions

diff --git a/src/product/Makefile.teledongle b/src/product/Makefile.teledongle
deleted file mode 100644
index b7c28987..00000000
--- a/src/product/Makefile.teledongle
+++ /dev/null
@@ -1,98 +0,0 @@
-#
-# TeleDongle build file
-#
-# The various teledongle versions differ only
-# in minor pin variations
-# so the per-board makefiles simply define
-# TD_VER, TD_DEF and include
-# this file
-
-vpath %.c ..:../kernel:../cc1111:../drivers:../product
-vpath %.h ..:../kernel:../cc1111:../drivers:../product
-vpath ao-make-product.5c ../util
-
-ifndef VERSION
-include ../Version
-endif
-
-INC = \
-	ao.h \
-	ao_pins.h \
-	ao_arch.h \
-	ao_arch_funcs.h \
-	cc1111.h \
-	ao_product.h
-
-CORE_SRC = \
-	ao_cmd.c \
-	ao_config.c \
-	ao_gps_print.c \
-	ao_monitor.c \
-	ao_mutex.c \
-	ao_panic.c \
-	ao_rssi.c \
-	ao_state.c \
-	ao_stdio.c \
-	ao_task.c \
-	ao_freq.c
-
-CC1111_SRC = \
-	ao_dbg.c \
-	ao_dma.c \
-	ao_led.c \
-	ao_packet.c \
-	ao_packet_master.c \
-	ao_radio.c \
-	ao_send_packet.c \
-	ao_romconfig.c \
-	ao_string.c \
-	ao_timer.c \
-	ao_usb.c \
-	_bp.c
-
-DRIVER_SRC =
-
-PRODUCT_SRC = \
-	ao_teledongle.c
-
-SRC = \
-	$(CORE_SRC) \
-	$(CC1111_SRC) \
-	$(DRIVER_SRC) \
-	$(PRODUCT_SRC)
-
-PROGNAME = teledongle-v$(TD_VER)
-PROG = $(PROGNAME)-$(VERSION).ihx
-PRODUCT=TeleDongle-v$(TD_VER)
-PRODUCT_DEF=-DTELEDONGLE_V_$(TD_DEF)
-IDPRODUCT=0x000c
-
-include ../cc1111/Makefile.cc1111
-
-NICKLE=nickle
-CHECK_STACK=sh ../util/check-stack
-
-V=0
-# The user has explicitly enabled quiet compilation.
-ifeq ($(V),0)
-quiet = @printf "  $1 $2 $@\n"; $($1)
-endif
-# Otherwise, print the full command line.
-quiet ?= $($1)
-
-all: $(PROG)
-
-$(PROG): $(REL) Makefile
-	$(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(REL)
-	$(call quiet,CHECK_STACK) ../cc1111/ao_arch.h $(PMEM) || rm $@
-
-ao_product.h: ao-make-product.5c ../Version
-	$(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
-
-distclean:	clean
-
-clean: clean-cc1111
-
-install:
-
-uninstall:
diff --git a/src/product/Makefile.telelaunch b/src/product/Makefile.telelaunch
deleted file mode 100644
index 7311c21e..00000000
--- a/src/product/Makefile.telelaunch
+++ /dev/null
@@ -1,100 +0,0 @@
-#
-# TeleLaunch build file
-#
-# define TELELAUNCH_VER, TELELAUNCH_DEF
-# this file
-
-vpath %.c ..:../kernel:../cc1111:../drivers:../product
-vpath %.h ..:../kernel:../cc1111:../drivers:../product
-vpath ao-make-product.5c ../util
-
-ifndef VERSION
-include ../Version
-endif
-
-INC = \
-	ao.h \
-	ao_pins.h \
-	ao_arch.h \
-	ao_arch_funcs.h \
-	cc1111.h \
-	ao_product.h
-
-CORE_SRC = \
-	ao_cmd.c \
-	ao_config.c \
-	ao_convert.c \
-	ao_launch.c \
-	ao_mutex.c \
-	ao_panic.c \
-	ao_stdio.c \
-	ao_storage.c \
-	ao_task.c \
-	ao_freq.c
-
-CC1111_SRC = \
-	ao_adc.c \
-	ao_aes.c \
-	ao_beep.c \
-	ao_dbg.c \
-	ao_dma.c \
-	ao_ignite.c \
-	ao_intflash.c \
-	ao_led.c \
-	ao_radio.c \
-	ao_radio_cmac.c \
-	ao_romconfig.c \
-	ao_serial.c \
-	ao_spi.c \
-	ao_string.c \
-	ao_timer.c \
-	ao_usb.c \
-	_bp.c
-
-DRIVER_SRC =
-
-PRODUCT_SRC = \
-	ao_telelaunch.c
-
-SRC = \
-	$(CORE_SRC) \
-	$(CC1111_SRC) \
-	$(DRIVER_SRC) \
-	$(PRODUCT_SRC)
-
-PROGNAME = telelaunch-v$(TELELAUNCH_VER)
-PROG = $(PROGNAME)-$(VERSION).ihx
-PRODUCT=TeleLaunch-v$(TELELAUNCH_VER)
-PRODUCT_DEF=-DTELELAUNCH_V_$(TELELAUNCH_DEF)
-IDPRODUCT=0x000f
-CODESIZE=0x6700
-
-include ../cc1111/Makefile.cc1111
-
-NICKLE=nickle
-CHECK_STACK=sh ../util/check-stack
-
-V=0
-# The user has explicitly enabled quiet compilation.
-ifeq ($(V),0)
-quiet = @printf "  $1 $2 $@\n"; $($1)
-endif
-# Otherwise, print the full command line.
-quiet ?= $($1)
-
-all: $(PROG)
-
-$(PROG): $(REL) Makefile
-	$(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(REL)
-	$(call quiet,CHECK_STACK) ../cc1111/ao_arch.h $(PMEM)  || rm $@
-
-ao_product.h: ao-make-product.5c ../Version
-	$(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
-
-distclean:	clean
-
-clean: clean-cc1111
-
-install:
-
-uninstall:
diff --git a/src/product/Makefile.telemetrum b/src/product/Makefile.telemetrum
deleted file mode 100644
index e9b144c0..00000000
--- a/src/product/Makefile.telemetrum
+++ /dev/null
@@ -1,113 +0,0 @@
-#
-# TeleMetrum build file
-#
-# The various telemetrum versions differ only
-# in which flash and GPS drivers are included,
-# so the per-board makefiles simply define
-# TM_VER, TM_DEF, TM_INC and TM_SRC and include
-# this file
-
-vpath %.c .:..:../kernel:../cc1111:../drivers:../product
-vpath %.h .:..:../kernel:../cc1111:../drivers:../product
-vpath ao-make-product.5c ../util
-
-ifndef VERSION
-include ../Version
-endif
-
-INC = \
-	ao.h \
-	ao_pins.h \
-	ao_arch.h \
-	ao_arch_funcs.h \
-	cc1111.h \
-	altitude.h \
-	ao_kalman.h \
-	ao_product.h \
-	ao_telemetry.h \
-	$(TM_INC)
-
-CORE_SRC = \
-	ao_cmd.c \
-	ao_config.c \
-	ao_convert.c \
-	ao_gps_report.c \
-	ao_mutex.c \
-	ao_panic.c \
-	ao_stdio.c \
-	ao_storage.c \
-	ao_task.c \
-	ao_flight.c \
-	ao_sample.c \
-	ao_kalman.c \
-	ao_log.c \
-	ao_log_big.c \
-	ao_report.c \
-	ao_telemetry.c \
-	ao_freq.c
-
-CC1111_SRC = \
-	ao_adc.c \
-	ao_beep.c \
-	ao_dbg.c \
-	ao_dma.c \
-	ao_ignite.c \
-	ao_led.c \
-	ao_packet.c \
-	ao_packet_slave.c \
-	ao_radio.c \
-	ao_romconfig.c \
-	ao_serial.c \
-	ao_string.c \
-	ao_spi.c \
-	ao_timer.c \
-	ao_usb.c \
-	_bp.c
-
-DRIVER_SRC = \
-	$(TM_SRC)
-
-PRODUCT_SRC = \
-	ao_telemetrum.c
-
-SRC = \
-	$(CORE_SRC) \
-	$(CC1111_SRC) \
-	$(DRIVER_SRC) \
-	$(PRODUCT_SRC)
-
-PROGNAME = telemetrum-v$(TM_VER)$(TM_EXTRA)
-PROG = $(PROGNAME)-$(VERSION).ihx
-PRODUCT=TeleMetrum-v$(TM_VER)
-PRODUCT_DEF=-DTELEMETRUM_V_$(TM_DEF)
-IDPRODUCT=0x000b
-
-include ../cc1111/Makefile.cc1111
-
-NICKLE=nickle
-CHECK_STACK=sh ../util/check-stack
-
-V=0
-# The user has explicitly enabled quiet compilation.
-ifeq ($(V),0)
-quiet = @printf "  $1 $2 $@\n"; $($1)
-endif
-# Otherwise, print the full command line.
-quiet ?= $($1)
-
-all: $(PROG)
-
-$(PROG): $(REL) Makefile
-	$(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(REL)
-	$(call quiet,CHECK_STACK) ../cc1111/ao_arch.h $(PMEM) || rm $@
-
-ao_product.h: ao-make-product.5c ../Version
-	$(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
-
-distclean:	clean
-
-clean: clean-cc1111
-
-install:
-
-uninstall:
diff --git a/src/product/Makefile.telemini b/src/product/Makefile.telemini
deleted file mode 100644
index ff8b9d56..00000000
--- a/src/product/Makefile.telemini
+++ /dev/null
@@ -1,101 +0,0 @@
-#
-# TeleMini build file
-#
-# Define TELEMINI_VER and TELEMINI_DEF and then
-# include this file
-
-vpath %.c ..:../kernel:../cc1111:../drivers:../product
-vpath %.h ..:../kernel:../cc1111:../drivers:../product
-vpath ao-make-product.5c ../util
-
-ifndef VERSION
-include ../Version
-endif
-
-INC = \
-	ao.h \
-	ao_pins.h \
-	ao_arch.h \
-	ao_arch_funcs.h \
-	cc1111.h \
-	ao_product.h
-
-CORE_SRC = \
-	ao_cmd.c \
-	ao_config.c \
-	ao_convert.c \
-	ao_flight.c \
-	ao_kalman.c \
-	ao_log.c \
-	ao_log_tiny.c \
-	ao_mutex.c \
-	ao_panic.c \
-	ao_report.c \
-	ao_sample.c \
-	ao_stdio.c \
-	ao_storage.c \
-	ao_task.c \
-	ao_telemetry.c \
-	ao_freq.c
-
-CC1111_SRC = \
-	ao_adc.c \
-	ao_dma.c \
-	ao_ignite.c \
-	ao_intflash.c \
-	ao_led.c \
-	ao_packet.c \
-	ao_packet_slave.c \
-	ao_radio.c \
-	ao_romconfig.c \
-	ao_string.c \
-	ao_timer.c \
-	_bp.c
-
-DRIVER_SRC =
-
-PRODUCT_SRC = \
-	ao_telemini.c
-
-SRC = \
-	$(CORE_SRC) \
-	$(CC1111_SRC) \
-	$(DRIVER_SRC) \
-	$(PRODUCT_SRC)
-
-PROGNAME = telemini-v$(TELEMINI_VER)
-PROG = $(PROGNAME)-$(VERSION).ihx
-PRODUCT=TeleMini-v$(TELEMINI_VER)
-PRODUCT_DEF=-DTELEMINI_V_$(TELEMINI_DEF)
-IDPRODUCT=0x000a
-CODESIZE=0x6700
-
-include ../cc1111/Makefile.cc1111
-
-NICKLE=nickle
-CHECK_STACK=sh ../util/check-stack
-
-V=0
-# The user has explicitly enabled quiet compilation.
-ifeq ($(V),0)
-quiet = @printf "  $1 $2 $@\n"; $($1)
-endif
-# Otherwise, print the full command line.
-quiet ?= $($1)
-
-all: $(PROG)
-
-$(PROG): $(REL) Makefile
-	$(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(REL)
-	$(call quiet,CHECK_STACK) ../cc1111/ao_arch.h $(PMEM) || rm $@
-
-ao_product.h: ao-make-product.5c ../Version
-	$(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
-
-distclean:	clean
-
-clean: clean-cc1111
-
-install:
-
-uninstall:
diff --git a/src/product/Makefile.telenano b/src/product/Makefile.telenano
deleted file mode 100644
index e1e350a6..00000000
--- a/src/product/Makefile.telenano
+++ /dev/null
@@ -1,100 +0,0 @@
-#
-# TeleNano build file
-#
-# Define TELENANO_VER and TELENANO_DEF and then
-# include this file
-
-vpath %.c ..:../kernel:../cc1111:../drivers:../product
-vpath %.h ..:../kernel:../cc1111:../drivers:../product
-vpath ao-make-product.5c ../util
-
-ifndef VERSION
-include ../Version
-endif
-
-INC = \
-	ao.h \
-	ao_pins.h \
-	ao_arch.h \
-	ao_arch_funcs.h \
-	cc1111.h \
-	ao_product.h
-
-CORE_SRC = \
-	ao_cmd.c \
-	ao_config.c \
-	ao_convert.c \
-	ao_flight_nano.c \
-	ao_kalman.c \
-	ao_log.c \
-	ao_log_tiny.c \
-	ao_mutex.c \
-	ao_panic.c \
-	ao_report.c \
-	ao_sample.c \
-	ao_stdio.c \
-	ao_storage.c \
-	ao_task.c \
-	ao_telemetry.c \
-	ao_freq.c
-
-CC1111_SRC = \
-	ao_adc.c \
-	ao_dma.c \
-	ao_intflash.c \
-	ao_led.c \
-	ao_packet.c \
-	ao_packet_slave.c \
-	ao_radio.c \
-	ao_romconfig.c \
-	ao_string.c \
-	ao_timer.c \
-	_bp.c
-
-DRIVER_SRC =
-
-PRODUCT_SRC = \
-	ao_telenano.c
-
-SRC = \
-	$(CORE_SRC) \
-	$(CC1111_SRC) \
-	$(DRIVER_SRC) \
-	$(PRODUCT_SRC)
-
-PROGNAME = telenano-v$(TELENANO_VER)
-PROG = $(PROGNAME)-$(VERSION).ihx
-PRODUCT=TeleNano-v$(TELENANO_VER)
-PRODUCT_DEF=-DTELENANO_V_$(TELENANO_DEF)
-IDPRODUCT=0x000a
-CODESIZE=0x6700
-
-include ../cc1111/Makefile.cc1111
-
-NICKLE=nickle
-CHECK_STACK=sh ../util/check-stack
-
-V=0
-# The user has explicitly enabled quiet compilation.
-ifeq ($(V),0)
-quiet = @printf "  $1 $2 $@\n"; $($1)
-endif
-# Otherwise, print the full command line.
-quiet ?= $($1)
-
-all: $(PROG)
-
-$(PROG): $(REL) Makefile
-	$(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(REL)
-	$(call quiet,CHECK_STACK) ../cc1111/ao_arch.h $(PMEM) || rm $@
-
-ao_product.h: ao-make-product.5c ../Version
-	$(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
-
-distclean:	clean
-
-clean: clean-cc1111
-
-install:
-
-uninstall:
diff --git a/src/product/ao_flash_task.c b/src/product/ao_flash_task.c
index 1f0edb05..a680ca18 100644
--- a/src/product/ao_flash_task.c
+++ b/src/product/ao_flash_task.c
@@ -29,7 +29,7 @@ ao_panic(uint8_t reason)
 }
 
 void
-ao_put_string(__code char *s)
+ao_put_string(const char *s)
 {
 	char	c;
 	while ((c = *s++)) {
diff --git a/src/product/ao_micropeak.c b/src/product/ao_micropeak.c
index 8aac79cd..8fed3069 100644
--- a/src/product/ao_micropeak.c
+++ b/src/product/ao_micropeak.c
@@ -57,7 +57,7 @@ ao_pips(void)
 int
 main(void)
 {
-	ao_led_init(LEDS_AVAILABLE);
+	ao_led_init();
 	ao_timer_init();
 
 	/* Init external hardware */
diff --git a/src/product/ao_telemetrum.c b/src/product/ao_telemetrum.c
index a10cb384..1266fee7 100644
--- a/src/product/ao_telemetrum.c
+++ b/src/product/ao_telemetrum.c
@@ -60,7 +60,7 @@ main(void)
 	ao_gps_report_init();
 	ao_telemetry_init();
 	ao_radio_init();
-	ao_packet_slave_init(FALSE);
+	ao_packet_slave_init(false);
 	ao_igniter_init();
 #if HAS_DBG
 	ao_dbg_init();
diff --git a/src/product/ao_telemini.c b/src/product/ao_telemini.c
index 14414a48..d9cb676b 100644
--- a/src/product/ao_telemini.c
+++ b/src/product/ao_telemini.c
@@ -56,7 +56,7 @@ main(void)
 	ao_report_init();
 	ao_telemetry_init();
 	ao_radio_init();
-	ao_packet_slave_init(TRUE);
+	ao_packet_slave_init(true);
 	ao_igniter_init();
 	ao_config_init();
 	ao_start_scheduler();
diff --git a/src/product/ao_telenano.c b/src/product/ao_telenano.c
index ac08979f..1b04edc5 100644
--- a/src/product/ao_telenano.c
+++ b/src/product/ao_telenano.c
@@ -40,7 +40,7 @@ main(void)
 	ao_report_init();
 	ao_telemetry_init();
 	ao_radio_init();
-	ao_packet_slave_init(TRUE);
+	ao_packet_slave_init(true);
 	ao_config_init();
 	ao_start_scheduler();
 }
diff --git a/src/product/ao_teleterra.c b/src/product/ao_teleterra.c
index 0142f9e3..ae129233 100644
--- a/src/product/ao_teleterra.c
+++ b/src/product/ao_teleterra.c
@@ -34,7 +34,7 @@ main(void)
 	ao_cmd_init();
 	ao_usb_init();
 	ao_serial_init();
-	ao_monitor_init(AO_LED_GREEN, TRUE);
+	ao_monitor_init(AO_LED_GREEN, true);
 	ao_radio_init();
 	ao_config_init();
 	ao_start_scheduler();
diff --git a/src/product/ao_terraui.c b/src/product/ao_terraui.c
index c2bbc30e..3a989f5a 100644
--- a/src/product/ao_terraui.c
+++ b/src/product/ao_terraui.c
@@ -20,15 +20,15 @@
 #include <ao_flight.h>
 #include <math.h>
 
-static __xdata struct ao_telemetry_sensor		ao_tel_sensor;
-static __xdata struct ao_telemetry_location		ao_tel_location;
-static __xdata struct ao_telemetry_configuration	ao_tel_config;
-static __xdata int16_t 					ao_tel_max_speed;
-static __xdata int16_t					ao_tel_max_height;
+static struct ao_telemetry_sensor		ao_tel_sensor;
+static struct ao_telemetry_location		ao_tel_location;
+static struct ao_telemetry_configuration	ao_tel_config;
+static int16_t 					ao_tel_max_speed;
+static int16_t					ao_tel_max_height;
 static int8_t ao_tel_rssi;
 
-static __xdata char ao_lcd_line[17];
-static __xdata char ao_state_name[] = "SIPBFCDMLI";
+static char ao_lcd_line[17];
+static char ao_state_name[] = "SIPBFCDMLI";
 
 static void
 ao_terraui_line(uint8_t addr)
@@ -85,7 +85,7 @@ ao_terraui_logging(void)
 	return '-';
 }
 
-static __code char ao_progress[4] = { '\011', '\012', '\014', '\013' };
+static const char ao_progress[4] = { '\011', '\012', '\014', '\013' };
 
 static uint8_t	ao_telem_progress;
 static uint8_t	ao_gps_progress;
@@ -165,7 +165,7 @@ static int16_t mag(int32_t d)
 static int32_t
 dist(int32_t d)
 {
-	__pdata uint32_t m;
+	uint32_t m;
 	uint8_t neg = 0;
 
 	if (d < 0) {
@@ -184,7 +184,7 @@ dist(int32_t d)
 	return d;
 }
 
-static __code uint8_t cos_table[] = {
+static const uint8_t cos_table[] = {
    0, /*  0 */
    0, /*  1 */
    0, /*  2 */
@@ -242,7 +242,7 @@ static __code uint8_t cos_table[] = {
    1, /* 54 */
 };
 
-static __code uint8_t tan_table[] = {
+static const uint8_t tan_table[] = {
     0, /*  0 */
     4, /*  1 */
     9, /*  2 */
@@ -290,7 +290,7 @@ static __code uint8_t tan_table[] = {
   247, /* 44 */
 };
 	
-int16_t ao_atan2(int32_t dy, int32_t dx) __reentrant
+int16_t ao_atan2(int32_t dy, int32_t dx) 
 {
 	int8_t	m = 1;
 	int16_t	a = 0;
@@ -334,10 +334,10 @@ int16_t ao_atan2(int32_t dy, int32_t dx) __reentrant
 	return t * m + a;
 }
 
-static __pdata int32_t	lon_dist, lat_dist;
-static __pdata uint32_t	ground_dist, range;
-static __pdata uint8_t dist_in_km;
-static __pdata int16_t bearing, elevation;
+static int32_t	lon_dist, lat_dist;
+static uint32_t	ground_dist, range;
+static uint8_t dist_in_km;
+static int16_t bearing, elevation;
 
 static void
 ao_terraui_lat_dist(void)
@@ -346,7 +346,7 @@ ao_terraui_lat_dist(void)
 }
 
 static void
-ao_terraui_lon_dist(void) __reentrant
+ao_terraui_lon_dist(void) 
 {
 	uint8_t	c = cos_table[ao_gps_data.latitude >> 24];
 	lon_dist = ao_tel_location.longitude;
@@ -418,7 +418,7 @@ ao_terraui_recover(void)
 }
 
 static void
-ao_terraui_coord(int32_t c, char plus, char minus, char extra) __reentrant
+ao_terraui_coord(int32_t c, char plus, char minus, char extra) 
 {
 	uint16_t	d;
 	uint8_t		m;
@@ -448,7 +448,7 @@ ao_terraui_remote(void)
 }
 
 static void
-ao_terraui_local(void) __reentrant
+ao_terraui_local(void) 
 {
 	ao_terraui_coord(ao_gps_data.latitude, 'n', 's',
 			 ao_terraui_local_gps());
@@ -457,11 +457,11 @@ ao_terraui_local(void) __reentrant
 	ao_terraui_line(AO_LCD_ADDR(1,0));
 }
 
-static __pdata uint8_t ao_set_freq;
-static __pdata uint32_t ao_set_freq_orig;
+static uint8_t ao_set_freq;
+static uint32_t ao_set_freq_orig;
 
 static void
-ao_terraui_freq(void) __reentrant
+ao_terraui_freq(void) 
 {
 	uint16_t	MHz;
 	uint16_t	frac;
@@ -508,7 +508,7 @@ ao_terraui_freq_button(char b) {
 	ao_radio_recv_abort();
 }
 
-static __code void (*__code ao_terraui_page[])(void) = {
+static const void (*const ao_terraui_page[])(void) = {
 	ao_terraui_startup,
 	ao_terraui_info,
 	ao_terraui_pad,
@@ -521,8 +521,8 @@ static __code void (*__code ao_terraui_page[])(void) = {
 
 #define NUM_PAGE	(sizeof (ao_terraui_page)/sizeof (ao_terraui_page[0]))
 
-static __pdata uint8_t ao_current_page = 0;
-static __pdata uint8_t ao_shown_about = 3;
+static uint8_t ao_current_page = 0;
+static uint8_t ao_shown_about = 3;
 
 static void
 ao_terraui(void)
@@ -575,7 +575,7 @@ ao_terraui(void)
 	}
 }
 
-__xdata static struct ao_task ao_terraui_task;
+static struct ao_task ao_terraui_task;
 
 static void
 ao_terramonitor(void)
@@ -588,7 +588,7 @@ ao_terramonitor(void)
 	     monitor = ao_monitor_ring_next(monitor))
 	{
 		while (monitor == ao_monitor_head)
-			ao_sleep(DATA_TO_XDATA(&ao_monitor_head));
+			ao_sleep(&ao_monitor_head);
 		if (ao_monitoring != sizeof (union ao_telemetry_all))
 			continue;
 		if (!(ao_monitor_ring[monitor].all.status & PKT_APPEND_STATUS_1_CRC_OK))
@@ -619,7 +619,7 @@ ao_terramonitor(void)
 	}
 }
 
-__xdata static struct ao_task ao_terramonitor_task;
+static struct ao_task ao_terramonitor_task;
 
 static void
 ao_terragps(void)
@@ -634,7 +634,7 @@ ao_terragps(void)
 	}
 }
 
-__xdata static struct ao_task ao_terragps_task;
+static struct ao_task ao_terragps_task;
 
 void
 ao_terraui_init(void)
diff --git a/src/product/ao_test.c b/src/product/ao_test.c
index d1c60804..5db36293 100644
--- a/src/product/ao_test.c
+++ b/src/product/ao_test.c
@@ -18,13 +18,13 @@
 
 #include "ao.h"
 
-struct ao_task __xdata blink_0_task;
-struct ao_task __xdata blink_1_task;
-struct ao_task __xdata wakeup_task;
-struct ao_task __xdata beep_task;
-struct ao_task __xdata echo_task;
+struct ao_task blink_0_task;
+struct ao_task blink_1_task;
+struct ao_task wakeup_task;
+struct ao_task beep_task;
+struct ao_task echo_task;
 
-void delay(int n) __reentrant
+void delay(int n) 
 {
 	uint8_t	j = 0;
 	while (--n)
@@ -32,7 +32,7 @@ void delay(int n) __reentrant
 			ao_yield();
 }
 
-static __xdata uint8_t blink_chan;
+static uint8_t blink_chan;
 
 void
 blink_0(void)
@@ -51,7 +51,7 @@ blink_0(void)
 void
 blink_1(void)
 {
-	static __xdata struct ao_adc adc;
+	static struct ao_adc adc;
 
 	for (;;) {
 		ao_sleep(&ao_adc_head);
@@ -75,7 +75,7 @@ wakeup(void)
 void
 beep(void)
 {
-	static __xdata struct ao_adc adc;
+	static struct ao_adc adc;
 
 	for (;;) {
 		ao_delay(AO_SEC_TO_TICKS(1));