X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fao.h;h=5b174947c57ba893a74ae56e43dacffbaf132f92;hp=b43f5ecd1132f190bda58524834d6fa8a585f570;hb=3ffaa5d1c00b28be20fd4a26deb7bd41d953e92a;hpb=84c93bb2fc4558a5e4654794ba90e730a84eaf67

diff --git a/src/ao.h b/src/ao.h
index b43f5ecd..5b174947 100644
--- a/src/ao.h
+++ b/src/ao.h
@@ -43,7 +43,7 @@ struct ao_task {
 	__xdata void *wchan;		/* current wait channel (NULL if running) */
 	uint16_t alarm;			/* abort ao_sleep time */
 	uint8_t	stack_count;		/* amount of saved stack */
-	uint8_t task_id;		/* index in the task array */
+	uint8_t task_id;		/* unique id */
 	__code char *name;		/* task name */
 	uint8_t	stack[AO_STACK_SIZE];	/* saved stack */
 };
@@ -79,7 +79,7 @@ ao_alarm(uint16_t delay);
 
 /* Yield the processor to another task */
 void
-ao_yield(void) _naked;
+ao_yield(void) __naked;
 
 /* Add a task to the run queue */
 void
@@ -110,6 +110,7 @@ ao_start_scheduler(void);
 #define AO_PANIC_STDIO		7	/* Too many stdio handlers registered */
 #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 */
 
 /* Stop the operating system, beeping and blinking the reason */
 void
@@ -138,7 +139,7 @@ ao_timer_set_adc_interval(uint8_t interval) __critical;
 
 /* Timer interrupt */
 void
-ao_timer_isr(void) interrupt 9;
+ao_timer_isr(void) __interrupt 9;
 
 /* Initialize the timer */
 void
@@ -197,7 +198,7 @@ ao_adc_get(__xdata struct ao_adc *packet);
 /* The A/D interrupt handler */
 
 void
-ao_adc_isr(void) interrupt 1;
+ao_adc_isr(void) __interrupt 1;
 
 /* Initialize the A/D converter */
 void
@@ -263,8 +264,6 @@ ao_beep_init(void);
  */
 
 #define AO_LED_NONE	0
-#define AO_LED_GREEN	1
-#define AO_LED_RED	2
 
 /* Turn on the specified LEDs */
 void
@@ -290,6 +289,18 @@ ao_led_for(uint8_t colors, uint16_t ticks) __reentrant;
 void
 ao_led_init(uint8_t enable);
 
+/*
+ * ao_romconfig.c
+ */
+
+#define AO_ROMCONFIG_VERSION	2
+
+extern __code __at (0x00a0) uint16_t ao_romconfig_version;
+extern __code __at (0x00a2) uint16_t ao_romconfig_check;
+extern __code __at (0x00a4) uint16_t ao_serial_number;
+extern __code __at (0x00a6) uint32_t ao_radio_cal;
+extern __code __at (0x00aa) uint8_t ao_usb_descriptors [];
+
 /*
  * ao_usb.c
  */
@@ -314,7 +325,7 @@ ao_usb_flush(void);
 
 /* USB interrupt handler */
 void
-ao_usb_isr(void) interrupt 6;
+ao_usb_isr(void) __interrupt 6;
 
 /* Enable the USB controller */
 void
@@ -414,7 +425,7 @@ ao_dma_abort(uint8_t id);
 
 /* DMA interrupt routine */
 void
-ao_dma_isr(void) interrupt 8;
+ao_dma_isr(void) __interrupt 8;
 
 /*
  * ao_mutex.c
@@ -553,6 +564,7 @@ struct ao_log_record {
 			uint8_t		year;
 			uint8_t		month;
 			uint8_t		day;
+			uint8_t		extra;
 		} gps_date;
 		struct {
 			uint16_t	d0;
@@ -562,8 +574,8 @@ struct ao_log_record {
 };
 
 /* Write a record to the eeprom log */
-void
-ao_log_data(struct ao_log_record *log);
+uint8_t
+ao_log_data(__xdata struct ao_log_record *log) __reentrant;
 
 /* Flush the log */
 void
@@ -710,10 +722,10 @@ ao_dbg_init(void);
 
 #if HAS_SERIAL_1
 void
-ao_serial_rx1_isr(void) interrupt 3;
+ao_serial_rx1_isr(void) __interrupt 3;
 
 void
-ao_serial_tx1_isr(void) interrupt 14;
+ao_serial_tx1_isr(void) __interrupt 14;
 
 char
 ao_serial_getchar(void) __critical;
@@ -769,9 +781,11 @@ struct ao_gps_sat_data {
 	uint8_t		c_n_1;
 };
 
+#define AO_MAX_GPS_TRACKING	12
+
 struct ao_gps_tracking_data {
 	uint8_t			channels;
-	struct ao_gps_sat_data	sats[12];
+	struct ao_gps_sat_data	sats[AO_MAX_GPS_TRACKING];
 };
 
 extern __xdata uint8_t ao_gps_mutex;
@@ -805,7 +819,7 @@ ao_gps_report_init(void);
  */
 
 #define AO_MAX_CALLSIGN		8
-#define AO_TELEMETRY_VERSION	2
+#define AO_TELEMETRY_VERSION	3
 
 struct ao_telemetry {
 	uint8_t			addr;
@@ -849,7 +863,7 @@ extern __xdata uint8_t ao_radio_done;
 extern __xdata uint8_t ao_radio_mutex;
 
 void
-ao_radio_general_isr(void) interrupt 16;
+ao_radio_general_isr(void) __interrupt 16;
 
 void
 ao_radio_get(void);
@@ -998,8 +1012,7 @@ ao_rssi_init(uint8_t rssi_led);
  * each instance of a product
  */
 
-extern const uint8_t ao_usb_descriptors [];
-extern const uint16_t ao_serial_number;
+extern __code __at(0x00aa) uint8_t ao_usb_descriptors [];
 extern const char ao_version[];
 extern const char ao_manufacturer[];
 extern const char ao_product[];
@@ -1035,7 +1048,7 @@ struct ao_fifo {
  * Packet-based command interface
  */
 
-#define AO_PACKET_MAX	8
+#define AO_PACKET_MAX		64
 #define AO_PACKET_SYN		(uint8_t) 0xff
 
 struct ao_packet {
@@ -1044,6 +1057,7 @@ struct ao_packet {
 	uint8_t		seq;
 	uint8_t		ack;
 	uint8_t		d[AO_PACKET_MAX];
+	uint8_t		callsign[AO_MAX_CALLSIGN];
 };
 
 struct ao_packet_recv {