X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fao.h;h=b6a987e302f1bc1b2b13a70214dd1a35a284cfe1;hp=226f9a2248dd0425ebed6bf27593d245ce796384;hb=0e67b6890dd3a06665239f8dfd2e69266d055e46;hpb=44fb71ca3e5bccd5f601fc5a2d5da7292050b1d6

diff --git a/src/ao.h b/src/ao.h
index 226f9a22..b6a987e3 100644
--- a/src/ao.h
+++ b/src/ao.h
@@ -1079,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 {
@@ -1104,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);
@@ -1160,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
@@ -1367,9 +1368,17 @@ ao_packet_slave_init(uint8_t enable);
 
 /* ao_btm.c */
 
-/* Shared by USB, so the USB code calls this function */
+/* 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);
+ao_btm_isr(void)
+#if BT_LINK_ON_P1
+	__interrupt 15
+#endif
+	;
+
 
 void
 ao_btm_init(void);