altos: Rename telemetry to telemetry_orig

[fw/altos] / src / ao.h

diff --git a/src/ao.h b/src/ao.h
index 9b375894e0f20cd4c41aeaf110b88bbaed52324e..b6a987e302f1bc1b2b13a70214dd1a35a284cfe1 100644 (file)
--- 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
@@ -1078,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 {
@@ -1103,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);
@@ -1159,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
@@ -1193,7 +1195,7 @@ extern __xdata uint8_t ao_stdin_ready;
 uint8_t
 ao_echo(void);
 
-void
+int8_t
 ao_add_stdio(char (*pollchar)(void),
             void (*putchar)(char) __reentrant,
             void (*flush)(void)) __reentrant;
@@ -1366,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);