X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fcc1111%2Fao_arch.h;h=fcac331be55363d3d9a6a4fffb17432acc546283;hb=d1f9121593fe30b924223e89ef4d596b5bec2b25;hp=06b04b93651d75fcad23fd40433ad3a0d9fd5622;hpb=a5d873d47b3b16ca32559b4de668bf07b25eddb0;p=fw%2Faltos

diff --git a/src/cc1111/ao_arch.h b/src/cc1111/ao_arch.h
index 06b04b93..fcac331b 100644
--- a/src/cc1111/ao_arch.h
+++ b/src/cc1111/ao_arch.h
@@ -112,9 +112,7 @@ extern AO_ROMCONFIG_SYMBOL(0x00a6) uint32_t ao_radio_cal;
 	/* Push ACC first, as when restoring the context it must be restored \
 	 * last (it is used to set the IE register). */			\
 	push	ACC							\
-	/* Store the IE register then enable interrupts. */		\
 	push	_IEN0							\
-	setb	_EA							\
 	push	DPL							\
 	push	DPH							\
 	push	b							\
@@ -147,11 +145,18 @@ extern AO_ROMCONFIG_SYMBOL(0x00a6) uint32_t ao_radio_cal;
 		while (--stack_len);					\
 	}
 
-#define ao_arch_isr_stack()						\
-	/* Empty the stack; might as well let interrupts have the whole thing */ \
-	(SP = AO_STACK_START - 1)
+/* Empty the stack; might as well let interrupts have the whole thing */
+#define ao_arch_isr_stack()		(SP = AO_STACK_START - 1)
 
-#define ao_arch_cpu_idle()	(PCON = PCON_IDLE)
+#define ao_arch_block_interrupts()	__asm clr _EA __endasm
+#define ao_arch_release_interrupts()	__asm setb _EA __endasm
+
+/* Idle the CPU, waking when an interrupt occurs */
+#define ao_arch_wait_interrupt() do {		\
+		ao_arch_release_interrupts();	\
+		(PCON = PCON_IDLE);		\
+		ao_arch_block_interrupts();	\
+	} while (0)
 
 #define ao_arch_restore_stack() {					\
 		uint8_t stack_len;					\
@@ -192,7 +197,7 @@ extern AO_ROMCONFIG_SYMBOL(0x00a6) uint32_t ao_radio_cal;
 		0098$:							\
 			SETB		_EA				\
 		0099$:							\
-		/* Finally pop off the ACC, which was the first register saved. */ \
+		/* Finally restore ACC, which was the first register saved. */ \
 		pop		ACC					\
 		ret							\
 		__endasm;						\
@@ -200,18 +205,6 @@ extern AO_ROMCONFIG_SYMBOL(0x00a6) uint32_t ao_radio_cal;
 
 #define ao_arch_critical(b) __critical { b }
 
-struct ao_adc {
-	int16_t		accel;		/* accelerometer */
-	int16_t		pres;		/* pressure sensor */
-	int16_t		temp;		/* temperature sensor */
-	int16_t		v_batt;		/* battery voltage */
-	int16_t		sense_d;	/* drogue continuity sense */
-	int16_t		sense_m;	/* main continuity sense */
-#if HAS_ACCEL_REF
-	uint16_t	accel_ref;	/* acceleration reference */
-#endif
-};
-
 #define AO_DATA_RING	32
 
 /* ao_button.c */
@@ -241,17 +234,17 @@ ao_button_clear(void) __critical;
 /* ao_string.c */
 
 void
-_ao_xmemcpy(__xdata void *dst, __xdata void *src, uint8_t count);
+_ao_xmemcpy(__xdata void *dst, __xdata void *src, uint16_t count);
 
 #define ao_xmemcpy(d,s,c) _ao_xmemcpy(d,s,c)
 
 void
-_ao_xmemset(__xdata void *dst, uint8_t value, uint8_t count);
+_ao_xmemset(__xdata void *dst, uint8_t value, uint16_t count);
 
 #define ao_xmemset(d,v,c) _ao_xmemset(d,v,c)
 
 int8_t
-_ao_xmemcmp(__xdata void *a, __xdata void *b, uint8_t count);
+_ao_xmemcmp(__xdata void *a, __xdata void *b, uint16_t count);
 
 #define ao_xmemcmp(d,s,c) _ao_xmemcmp((d), (s), (c))
 
@@ -328,4 +321,11 @@ void
 ao_serial1_tx_isr(void) ao_arch_interrupt(14);
 #endif
 
+#if HAS_EXTI_0
+void
+ao_p0_isr(void) __interrupt(13);
+#endif
+
+#define AO_ADC_MAX	32767
+
 #endif /* _AO_ARCH_H_ */