X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fkernel%2Fao.h;h=e56fbb2e4acec01b99a3ce4af8e37147fffc49bf;hb=b662ca4edd67a2e1e5712f97fb1ce909f19af625;hp=a794ba710e62d584d32ce57c5d131e85c379981d;hpb=36c6d74048283d27c890054814eee2cb39b7cbb7;p=fw%2Faltos

diff --git a/src/kernel/ao.h b/src/kernel/ao.h
index a794ba71..e56fbb2e 100644
--- a/src/kernel/ao.h
+++ b/src/kernel/ao.h
@@ -3,7 +3,8 @@
  *
  * 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; version 2 of the License
+ * 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
@@ -73,6 +74,7 @@ typedef AO_PORT_TYPE ao_port_t;
 #define AO_PANIC_EXTI		16	/* Mis-using exti API */
 #define AO_PANIC_FAST_TIMER	17	/* Mis-using fast timer API */
 #define AO_PANIC_ADC		18	/* Mis-using ADC interface */
+#define AO_PANIC_IRQ		19	/* interrupts not blocked */
 #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 */
@@ -168,6 +170,9 @@ void
 ao_put_string(__code char *s);
 
 void
+ao_cmd_readline(void);
+
+char
 ao_cmd_lex(void);
 
 void
@@ -638,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);
 
@@ -665,6 +676,7 @@ extern __xdata union ao_monitor ao_monitor_ring[AO_MONITOR_RING];
 #define ao_monitor_ring_next(n)	(((n) + 1) & (AO_MONITOR_RING - 1))
 #define ao_monitor_ring_prev(n)	(((n) - 1) & (AO_MONITOR_RING - 1))
 
+extern __xdata uint8_t ao_monitoring_mutex;
 extern __data uint8_t ao_monitoring;
 extern __data uint8_t ao_monitor_head;
 
@@ -820,6 +832,8 @@ struct ao_fifo {
 } while(0)
 
 #define ao_fifo_full(f)		((((f).insert + 1) & (AO_FIFO_SIZE-1)) == (f).remove)
+#define ao_fifo_mostly(f)	((((f).insert - (f).remove) & (AO_FIFO_SIZE-1)) >= (AO_FIFO_SIZE * 3 / 4))
+#define ao_fifo_barely(f)	((((f).insert - (f).remove) & (AO_FIFO_SIZE-1)) >= (AO_FIFO_SIZE * 1 / 4))
 #define ao_fifo_empty(f)	((f).insert == (f).remove)
 
 #if PACKET_HAS_MASTER || PACKET_HAS_SLAVE
@@ -842,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
  */