X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fkernel%2Fao.h;h=f44b0e9e380c260941580465f86c9c336cc97903;hb=d0c0dec140b8fa847704c9a22a39d254445188b9;hp=fd1d12765a5d3513240514f8184b18cf00fd779b;hpb=c6e57291d91f1f6c4de5c54a5cfd3eef66d9f830;p=fw%2Faltos

diff --git a/src/kernel/ao.h b/src/kernel/ao.h
index fd1d1276..f44b0e9e 100644
--- a/src/kernel/ao.h
+++ b/src/kernel/ao.h
@@ -23,6 +23,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stddef.h>
+#include <stdbool.h>
 #include <ao_pins.h>
 #include <ao_arch.h>
 
@@ -35,9 +36,6 @@
 extern int ao_putchar(char c);
 extern char ao_getchar(void);
 
-#define TRUE 1
-#define FALSE 0
-
 #ifndef HAS_TASK
 #define HAS_TASK	1
 #endif
@@ -77,19 +75,34 @@ typedef AO_PORT_TYPE ao_port_t;
 #define AO_PANIC_SELF_TEST_HMC5883	0x40 | 2	/* Self test failure */
 #define AO_PANIC_SELF_TEST_MPU6000	0x40 | 3	/* Self test failure */
 #define AO_PANIC_SELF_TEST_MPU9250	0x40 | 3	/* Self test failure */
+#define AO_PANIC_SELF_TEST_BMX160	0x40 | 3	/* Self test failure */
 #define AO_PANIC_SELF_TEST_MS5607	0x40 | 4	/* Self test failure */
+#define AO_PANIC_SELF_TEST_ADS124S0X	0x40 | 5	/* Self test failure */
 
 /* Stop the operating system, beeping and blinking the reason */
 void
 ao_panic(uint8_t reason);
 
+/*
+ * ao_romconfig.c
+ */
+
+#define AO_ROMCONFIG_VERSION	2
+
+extern AO_ROMCONFIG_SYMBOL uint16_t ao_romconfig_version;
+extern AO_ROMCONFIG_SYMBOL uint16_t ao_romconfig_check;
+extern AO_ROMCONFIG_SYMBOL uint16_t ao_serial_number;
+#if HAS_RADIO
+extern AO_ROMCONFIG_SYMBOL uint32_t ao_radio_cal;
+#endif
+
 /*
  * ao_timer.c
  */
 
 #ifndef AO_TICK_TYPE
-#define AO_TICK_TYPE	uint16_t
-#define AO_TICK_SIGNED	int16_t
+#define AO_TICK_TYPE	uint32_t
+#define AO_TICK_SIGNED	int32_t
 #endif
 
 extern volatile AO_TICK_TYPE ao_tick_count;
@@ -105,6 +118,10 @@ extern volatile AO_TICK_TYPE ao_tick_count;
 AO_TICK_TYPE
 ao_time(void);
 
+/* Returns the current time in ns */
+uint64_t
+ao_time_ns(void);
+
 /* Suspend the current task until ticks time has passed */
 void
 ao_delay(uint16_t ticks);
@@ -113,10 +130,6 @@ ao_delay(uint16_t ticks);
 void
 ao_timer_set_adc_interval(uint8_t interval);
 
-/* Timer interrupt */
-void
-ao_timer_isr(void) ao_arch_interrupt(9);
-
 /* Initialize the timer */
 void
 ao_timer_init(void);
@@ -160,8 +173,6 @@ enum ao_cmd_status {
 	ao_cmd_syntax_error = 2,
 };
 
-extern uint16_t ao_cmd_lex_i;
-extern uint32_t ao_cmd_lex_u32;
 extern char	ao_cmd_lex_c;
 extern enum ao_cmd_status ao_cmd_status;
 
@@ -169,7 +180,7 @@ void
 ao_put_string(const char *s);
 
 void
-ao_cmd_readline(void);
+ao_cmd_readline(const char *prompt);
 
 char
 ao_cmd_lex(void);
@@ -189,13 +200,13 @@ ao_cmd_white(void);
 int8_t
 ao_cmd_hexchar(char c);
 
-void
+uint8_t
 ao_cmd_hexbyte(void);
 
-void
+uint32_t
 ao_cmd_hex(void);
 
-void
+uint32_t
 ao_cmd_decimal(void);
 
 /* Read a single hex nibble off stdin. */
@@ -238,7 +249,7 @@ ao_cmd_filter(void);
 #include <ao_beep.h>
 #endif
 
-#if LEDS_AVAILABLE
+#if LEDS_AVAILABLE || HAS_LED
 #include <ao_led.h>
 #endif
 
@@ -585,9 +596,6 @@ extern int8_t	ao_radio_rssi;
 #define HAS_RADIO_RATE	HAS_RADIO
 #endif
 
-void
-ao_radio_general_isr(void) ao_arch_interrupt(16);
-
 #if HAS_RADIO_XMIT
 void
 ao_radio_send(const void *d, uint8_t size);
@@ -741,9 +749,6 @@ enum ao_igniter {
 	ao_igniter_main = 1
 };
 
-void
-ao_ignite(enum ao_igniter igniter);
-
 enum ao_igniter_status {
 	ao_igniter_unknown,	/* unknown status (ambiguous voltage) */
 	ao_igniter_ready,	/* continuity detected */
@@ -930,12 +935,6 @@ ao_log_single(void);
 
 #define AO_TELEPYRO_NUM_ADC	9
 
-#ifndef ao_xmemcpy
-#define ao_xmemcpy(d,s,c) memcpy(d,s,c)
-#define ao_xmemset(d,v,c) memset(d,v,c)
-#define ao_xmemcmp(d,s,c) memcmp(d,s,c)
-#endif
-
 /*
  * ao_terraui.c
  */
@@ -948,9 +947,6 @@ ao_terraui_init(void);
  */
 
 #ifdef BATTERY_PIN
-void
-ao_battery_isr(void) ao_arch_interrupt(1);
-
 uint16_t
 ao_battery_get(void);