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 50583f52929722d14575fd185bdc3fd95389d236..e2f14e7963a38333c3a2f8686130d99e27006f3e 100644 (file)
--- a/src/kernel/ao_host.h
+++ b/src/kernel/ao_host.h
@@ -41,16 +41,6 @@ struct ao_adc {
        int16_t         sense_m;        /* main continuity sense */
 };
 
-#define __pdata
-#define __data
-#define __xdata
-#define __code
-#define __reentrant
-
-#define DATA_TO_XDATA(a)       (a)
-#define PDATA_TO_XDATA(a)      (a)
-#define CODE_TO_XDATA(a)       (a)
-
 enum ao_flight_state {
        ao_flight_startup = 0,
        ao_flight_idle = 1,
@@ -131,6 +121,6 @@ struct ao_config {
 
 struct ao_config ao_config = { 250, 16000 };
 
-#define ao_xmemcpy(d,s,c) memcpy(d,s,c)
-#define ao_xmemset(d,v,c) memset(d,v,c)
-#define ao_xmemcmp(d,s,c) memcmp(d,s,c)
+#define memcpy(d,s,c) memcpy(d,s,c)
+#define memset(d,v,c) memset(d,v,c)
+#define memcmp(d,s,c) memcmp(d,s,c)