altos: Move old AO_LAUNCH defines to cc1111/ao_launch.h

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

diff --git a/src/kernel/ao.h b/src/kernel/ao.h
index 50fd065f4dd5da38bd916853348edf23cf766814..e56fbb2e4acec01b99a3ce4af8e37147fffc49bf 100644 (file)
--- a/src/kernel/ao.h
+++ b/src/kernel/ao.h
@@ -170,6 +170,9 @@ void
 ao_put_string(__code char *s);
 
 void
+ao_cmd_readline(void);
+
+char
 ao_cmd_lex(void);
 
 void
@@ -640,6 +643,12 @@ ao_radio_continuity(uint8_t c);
 void
 ao_radio_rdf_abort(void);
 
+void
+ao_radio_test_on(void);
+
+void
+ao_radio_test_off(void);
+
 void
 ao_radio_init(void);
 
@@ -847,33 +856,6 @@ struct ao_fifo {
 #include <ao_aes.h>
 #endif
 
-/* ao_launch.c */
-
-struct ao_launch_command {
-       uint16_t        tick;
-       uint16_t        serial;
-       uint8_t         cmd;
-       uint8_t         channel;
-       uint16_t        unused;
-};
-
-#define AO_LAUNCH_QUERY                1
-
-struct ao_launch_query {
-       uint16_t        tick;
-       uint16_t        serial;
-       uint8_t         channel;
-       uint8_t         valid;
-       uint8_t         arm_status;
-       uint8_t         igniter_status;
-};
-
-#define AO_LAUNCH_ARM          2
-#define AO_LAUNCH_FIRE         3
-
-void
-ao_launch_init(void);
-
 /*
  * ao_log_single.c
  */