X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fcore%2Fao.h;h=548e87381525161692844c03b476defe1bf7e1e4;hp=6d617cfc89a2793631029f170dfcba62d6371b34;hb=6dea353e732b6e19586c844796bc3bb848cc92f8;hpb=561175afebc63ec3d2f8f7305235c9812ceaf501

diff --git a/src/core/ao.h b/src/core/ao.h
index 6d617cfc..548e8738 100644
--- a/src/core/ao.h
+++ b/src/core/ao.h
@@ -94,7 +94,7 @@ extern volatile __data AO_TICK_TYPE ao_tick_count;
 #define AO_SEC_TO_TICKS(s)	((s) * AO_HERTZ)
 
 /* Returns the current time in ticks */
-uint16_t
+AO_TICK_TYPE
 ao_time(void);
 
 /* Suspend the current task until ticks time has passed */
@@ -144,6 +144,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);
 
@@ -544,13 +547,13 @@ ao_radio_test(uint8_t on);
 typedef int16_t (*ao_radio_fill_func)(uint8_t *buffer, int16_t len);
 
 void
-ao_radio_send_lots(ao_radio_fill_func fill);
+ao_radio_send_aprs(ao_radio_fill_func fill);
 
 /*
  * ao_radio_pa
  */
 
-#if AO_RADIO_HAS_PA
+#if HAS_RADIO_AMP
 void
 ao_radio_pa_on(void);
 
@@ -638,7 +641,7 @@ ao_monitor_init(void) __reentrant;
 #define AO_READ_AGAIN	(-1)
 
 struct ao_stdio {
-	int	(*pollchar)(void);
+	int	(*_pollchar)(void);	/* Called with interrupts blocked */
 	void	(*putchar)(char c) __reentrant;
 	void	(*flush)(void);
 	uint8_t	echo;
@@ -715,7 +718,7 @@ extern __xdata uint8_t ao_force_freq;
 #endif
 
 #define AO_CONFIG_MAJOR	1
-#define AO_CONFIG_MINOR	13
+#define AO_CONFIG_MINOR	14
 
 #define AO_AES_LEN 16
 
@@ -743,6 +746,12 @@ struct ao_config {
 	struct ao_pyro	pyro[AO_PYRO_NUM];	/* minor version 12 */
 #endif
 	uint16_t	aprs_interval;		/* minor version 13 */
+#if HAS_RADIO_POWER
+	uint8_t		radio_power;		/* minor version 14 */
+#endif
+#if HAS_RADIO_AMP
+	uint8_t		radio_amp;		/* minor version 14 */
+#endif
 };
 
 #define AO_IGNITE_MODE_DUAL		0