Merge branch 'master-fixes' into stm-flash-fixes

[fw/altos] / src / core / ao.h

diff --git a/src/core/ao.h b/src/core/ao.h
index 977e10b87d2716d5a2817b4d51dcbd3215f8bd14..0ad3e4aa6504b68774fdbd7b487a59385ff9a4f2 100644 (file)
--- a/src/core/ao.h
+++ b/src/core/ao.h
@@ -45,6 +45,8 @@
 
 #if HAS_TASK
 #include <ao_task.h>
+#else
+#include <ao_notask.h>
 #endif
 
 /*
@@ -144,6 +146,9 @@ extern __pdata uint32_t ao_cmd_lex_u32;
 extern __pdata char    ao_cmd_lex_c;
 extern __pdata enum ao_cmd_status ao_cmd_status;
 
+void
+ao_put_string(__code char *s);
+
 void
 ao_cmd_lex(void);
 
@@ -508,6 +513,8 @@ ao_telemetry_tiny_init(void);
 
 extern __xdata uint8_t ao_radio_dma;
 
+extern __xdata int8_t  ao_radio_rssi;
+
 #ifdef PKT_APPEND_STATUS_1_CRC_OK
 #define AO_RADIO_STATUS_CRC_OK PKT_APPEND_STATUS_1_CRC_OK
 #else
@@ -532,7 +539,7 @@ ao_radio_send(const __xdata void *d, uint8_t size) __reentrant;
 
 #if HAS_RADIO_RECV
 uint8_t
-ao_radio_recv(__xdata void *d, uint8_t size) __reentrant;
+ao_radio_recv(__xdata void *d, uint8_t size, uint8_t timeout) __reentrant;
 
 void
 ao_radio_recv_abort(void);