X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fkernel%2Fao.h;h=520f6ef201f5698235745469fafa9973d3bccaca;hb=e91409e8076769b184bbfad35829c1e9f1015bad;hp=e56fbb2e4acec01b99a3ce4af8e37147fffc49bf;hpb=b6b58aa2fbae1e7782b5a0b700544efe319fe34e;p=fw%2Faltos

diff --git a/src/kernel/ao.h b/src/kernel/ao.h
index e56fbb2e..520f6ef2 100644
--- a/src/kernel/ao.h
+++ b/src/kernel/ao.h
@@ -26,20 +26,18 @@
 #include <ao_pins.h>
 #include <ao_arch.h>
 
+/* replace stdio macros with direct calls to our functions */
+#undef putchar
+#undef getchar
+#define putchar(c)	ao_putchar(c)
+#define getchar		ao_getchar
+
+extern int ao_putchar(char c);
+extern char ao_getchar(void);
+
 #define TRUE 1
 #define FALSE 0
 
-/* Convert a __data pointer into an __xdata pointer */
-#ifndef DATA_TO_XDATA
-#define DATA_TO_XDATA(a)	(a)
-#endif
-#ifndef PDATA_TO_XDATA
-#define PDATA_TO_XDATA(a)	(a)
-#endif
-#ifndef CODE_TO_XDATA
-#define CODE_TO_XDATA(a)	(a)
-#endif
-
 #ifndef HAS_TASK
 #define HAS_TASK	1
 #endif
@@ -78,6 +76,7 @@ typedef AO_PORT_TYPE ao_port_t;
 #define AO_PANIC_SELF_TEST_CC1120	0x40 | 1	/* Self test failure */
 #define AO_PANIC_SELF_TEST_HMC5883	0x40 | 2	/* Self test failure */
 #define AO_PANIC_SELF_TEST_MPU6000	0x40 | 3	/* Self test failure */
+#define AO_PANIC_SELF_TEST_MPU9250	0x40 | 3	/* Self test failure */
 #define AO_PANIC_SELF_TEST_MS5607	0x40 | 4	/* Self test failure */
 
 /* Stop the operating system, beeping and blinking the reason */
@@ -217,6 +216,9 @@ ao_cmd_register(const __code struct ao_cmds *cmds);
 void
 ao_cmd_init(void);
 
+void
+ao_cmd(void);
+
 #if HAS_CMD_FILTER
 /*
  * Provided by an external module to filter raw command lines
@@ -658,7 +660,7 @@ ao_radio_init(void);
 
 #if HAS_MONITOR
 
-extern const char const * const ao_state_names[];
+extern const char * const ao_state_names[];
 
 #define AO_MONITOR_RING	8