X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcc1111%2Fao_arch.h;h=704ae4f911c2db6356bce656e893c79f02d7d0f6;hb=627b904b36e129ff2ead436a626699abfc3b3211;hp=847ac1a65ec1e438df2a884e1c271c1a7cf08346;hpb=1f2b75518169c4f2da9762de46bf1d9a71a04d17;p=fw%2Faltos

diff --git a/src/cc1111/ao_arch.h b/src/cc1111/ao_arch.h
index 847ac1a6..704ae4f9 100644
--- a/src/cc1111/ao_arch.h
+++ b/src/cc1111/ao_arch.h
@@ -199,7 +199,6 @@ extern __code __at (0x00a6) uint32_t ao_radio_cal;
 #define ao_arch_critical(b) __critical { b }
 
 struct ao_adc {
-	uint16_t	tick;		/* tick when the sample was read */
 	int16_t		accel;		/* accelerometer */
 	int16_t		pres;		/* pressure sensor */
 	int16_t		temp;		/* temperature sensor */
@@ -208,7 +207,7 @@ struct ao_adc {
 	int16_t		sense_m;	/* main continuity sense */
 };
 
-#define AO_ADC_RING	32
+#define AO_DATA_RING	32
 
 /* ao_button.c */
 #ifdef HAS_BUTTON
@@ -294,4 +293,34 @@ ao_dma_abort(uint8_t id);
 void
 ao_dma_isr(void) ao_arch_interrupt(8);
 
+/* ao_adc.c */
+
+#if HAS_ADC
+/* The A/D interrupt handler */
+void
+ao_adc_isr(void) ao_arch_interrupt(1);
+#endif
+
+#if HAS_USB
+/* USB interrupt handler */
+void
+ao_usb_isr(void) ao_arch_interrupt(6);
+#endif
+
+#if HAS_SERIAL_0
+void
+ao_serial0_rx_isr(void) ao_arch_interrupt(2);
+
+void
+ao_serial0_tx_isr(void) ao_arch_interrupt(7);
+#endif
+
+#if HAS_SERIAL_1
+void
+ao_serial1_rx_isr(void) ao_arch_interrupt(3);
+
+void
+ao_serial1_tx_isr(void) ao_arch_interrupt(14);
+#endif
+
 #endif /* _AO_ARCH_H_ */