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

These were getting accidentally used by ao_pad.c

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/src/cc1111/ao_launch.c b/src/cc1111/ao_launch.c
index 4f0a0c1400252b48fbf7f980f11e96194e0cb234..76d6d13b3392daa667156de26184b95dd8c92cc7 100644 (file)
--- a/src/cc1111/ao_launch.c
+++ b/src/cc1111/ao_launch.c
@@ -17,6 +17,7 @@
  */
 
 #include <ao.h>
+#include <ao_launch.h>
 #include <ao_radio_cmac.h>
 
 __xdata uint16_t ao_launch_ignite;

diff --git a/src/cc1111/ao_launch.h b/src/cc1111/ao_launch.h
new file mode 100644 (file)
index 0000000..966b5ce
--- /dev/null
+++ b/src/cc1111/ao_launch.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright © 2017 Keith Packard <keithp@keithp.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ */
+
+#ifndef _AO_LAUNCH_H_
+#define _AO_LAUNCH_H_
+/* 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);
+
+#endif /* _AO_LAUNCH_H_ */

diff --git a/src/kernel/ao.h b/src/kernel/ao.h
index 9ab7991b9b26af5860ee7b4eda98946a55391335..e56fbb2e4acec01b99a3ce4af8e37147fffc49bf 100644 (file)
--- a/src/kernel/ao.h
+++ b/src/kernel/ao.h
@@ -856,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
  */