X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fkernel%2Fao_host.h;h=c974a9fe5f1e37c89261245bfa3ab945d1b8bdbf;hp=a7fa5ec2fa4d498a1220093a86f4ea1579792fef;hb=HEAD;hpb=1085ec5d57e0ed5d132f2bbdac1a0b6a32c0ab4a

diff --git a/src/kernel/ao_host.h b/src/kernel/ao_host.h
index a7fa5ec2..30df8edc 100644
--- a/src/kernel/ao_host.h
+++ b/src/kernel/ao_host.h
@@ -32,7 +32,7 @@
  * One set of samples read from the A/D converter
  */
 struct ao_adc {
-	uint16_t	tick;		/* tick when the sample was read */
+	AO_TICK_TYPE	tick;		/* tick when the sample was read */
 	int16_t		accel;		/* accelerometer */
 	int16_t		pres;		/* pressure sensor */
 	int16_t		temp;		/* temperature sensor */
@@ -41,16 +41,6 @@ struct ao_adc {
 	int16_t		sense_m;	/* main continuity sense */
 };
 
-#define __pdata
-#define __data
-#define __xdata
-#define __code
-#define __reentrant
-
-#define DATA_TO_XDATA(a)	(a)
-#define PDATA_TO_XDATA(a)	(a)
-#define CODE_TO_XDATA(a)	(a)
-
 enum ao_flight_state {
 	ao_flight_startup = 0,
 	ao_flight_idle = 1,
@@ -91,12 +81,20 @@ struct ao_task {
 	int dummy;
 };
 
+enum ao_igniter_status {
+	ao_igniter_unknown,	/* unknown status (ambiguous voltage) */
+	ao_igniter_ready,	/* continuity detected */
+	ao_igniter_active,	/* igniter firing */
+	ao_igniter_open,	/* open circuit detected */
+};
+
 #define ao_add_task(t,f,n)
 
 #define ao_log_start()
 #define ao_log_stop()
 
 #define AO_MS_TO_TICKS(ms)	((ms) / 10)
+#define AO_NS_TO_TICKS(ns)	((ns) / (10000000L))
 #define AO_SEC_TO_TICKS(s)	((s) * 100)
 
 #define AO_FLIGHT_TEST
@@ -111,7 +109,7 @@ ao_dump_state(void *wchan);
 void
 ao_sleep(void *wchan);
 
-const char const * const ao_state_names[] = {
+const char * const ao_state_names[] = {
 	"startup", "idle", "pad", "boost", "fast",
 	"coast", "drogue", "main", "landed", "invalid"
 };
@@ -131,6 +129,6 @@ struct ao_config {
 
 struct ao_config ao_config = { 250, 16000 };
 
-#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)
+#define memcpy(d,s,c) memcpy(d,s,c)
+#define memset(d,v,c) memset(d,v,c)
+#define memcmp(d,s,c) memcmp(d,s,c)