X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fao.h;h=b6a987e302f1bc1b2b13a70214dd1a35a284cfe1;hp=77f3259ee5ca5e22186c2662773314ce14cd2122;hb=0e67b6890dd3a06665239f8dfd2e69266d055e46;hpb=01952da35a57ae4da062facb26b3c6d7de29190f

diff --git a/src/ao.h b/src/ao.h
index 77f3259e..b6a987e3 100644
--- a/src/ao.h
+++ b/src/ao.h
@@ -107,6 +107,7 @@ ao_start_scheduler(void);
 #define AO_PANIC_REBOOT		8	/* Reboot failed */
 #define AO_PANIC_FLASH		9	/* Invalid flash part (or wrong blocksize) */
 #define AO_PANIC_USB		10	/* Trying to send USB packet while busy */
+#define AO_PANIC_BT		11	/* Communications with bluetooth device failed */
 
 /* Stop the operating system, beeping and blinking the reason */
 void
@@ -935,6 +936,9 @@ ao_serial_set_stdin(uint8_t stdin);
 void
 ao_serial_putchar(char c) __critical;
 
+void
+ao_serial_drain(void) __critical;
+
 #define AO_SERIAL_SPEED_4800	0
 #define AO_SERIAL_SPEED_9600	1
 #define AO_SERIAL_SPEED_19200	2
@@ -1075,10 +1079,11 @@ struct ao_telemetry_tiny {
 /*
  * ao_radio_recv tacks on rssi and status bytes
  */
-struct ao_telemetry_recv {
-	struct ao_telemetry	telemetry;
-	int8_t			rssi;
-	uint8_t			status;
+
+struct ao_telemetry_orig_recv {
+	struct ao_telemetry_orig	telemetry_orig;
+	int8_t				rssi;
+	uint8_t				status;
 };
 
 struct ao_telemetry_tiny_recv {
@@ -1100,7 +1105,7 @@ void
 ao_rdf_set(uint8_t rdf);
 
 void
-ao_telemetry_init(void);
+ao_telemetry_orig_init(void);
 
 void
 ao_telemetry_tiny_init(void);
@@ -1156,7 +1161,7 @@ void
 ao_monitor(void);
 
 #define AO_MONITORING_OFF	0
-#define AO_MONITORING_FULL	1
+#define AO_MONITORING_ORIG	1
 #define AO_MONITORING_TINY	2
 
 void
@@ -1175,8 +1180,10 @@ struct ao_stdio {
 	char	(*pollchar)(void);
 	void	(*putchar)(char c) __reentrant;
 	void	(*flush)(void);
+	uint8_t	echo;
 };
 
+extern __xdata struct ao_stdio ao_stdios[];
 extern __data int8_t ao_cur_stdio;
 extern __data int8_t ao_num_stdios;
 
@@ -1185,7 +1192,10 @@ flush(void);
 
 extern __xdata uint8_t ao_stdin_ready;
 
-void
+uint8_t
+ao_echo(void);
+
+int8_t
 ao_add_stdio(char (*pollchar)(void),
 	     void (*putchar)(char) __reentrant,
 	     void (*flush)(void)) __reentrant;
@@ -1358,6 +1368,18 @@ ao_packet_slave_init(uint8_t enable);
 
 /* ao_btm.c */
 
+/* If bt_link is on P2, this interrupt is shared by USB, so the USB
+ * code calls this function. Otherwise, it's a regular ISR.
+ */
+
+void
+ao_btm_isr(void)
+#if BT_LINK_ON_P1
+	__interrupt 15
+#endif
+	;
+
+
 void
 ao_btm_init(void);