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

[fw/altos] / src / kernel / ao_host.h

diff --git a/src/kernel/ao_host.h b/src/kernel/ao_host.h
index a7fa5ec2fa4d498a1220093a86f4ea1579792fef..592de54ce348b6dc96f1fdcb64e4eba8eb3fd9b3 100644 (file)
--- a/src/kernel/ao_host.h
+++ b/src/kernel/ao_host.h
@@ -41,15 +41,11 @@ struct ao_adc {
        int16_t         sense_m;        /* main continuity sense */
 };
 
-#define __pdata
-#define __data
-#define __xdata
-#define __code
-#define __reentrant
+#define const
 
-#define DATA_TO_XDATA(a)       (a)
-#define PDATA_TO_XDATA(a)      (a)
-#define CODE_TO_XDATA(a)       (a)
+#define a      (a)
+#define a      (a)
+#define a      (a)
 
 enum ao_flight_state {
        ao_flight_startup = 0,
@@ -111,7 +107,7 @@ ao_dump_state(void *wchan);
 void
 ao_sleep(void *wchan);
 
-const char const * const ao_state_names[] = {
+const char * const ao_state_names[] = {
        "startup", "idle", "pad", "boost", "fast",
        "coast", "drogue", "main", "landed", "invalid"
 };