X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fcc1111%2Fao_arch.h;h=e6c27a1e23d60371bd5afe72dde68d1bd6752420;hb=614ab6a991258a5caad0ca12ae35d0288a5b7503;hp=f0f0daae4260b80f0bad7efa18127595f0f880b3;hpb=da330c5975b9f565d059ef8084dfdacc20f34246;p=fw%2Faltos

diff --git a/src/cc1111/ao_arch.h b/src/cc1111/ao_arch.h
index f0f0daae..e6c27a1e 100644
--- a/src/cc1111/ao_arch.h
+++ b/src/cc1111/ao_arch.h
@@ -27,6 +27,12 @@
 /* Convert a __data pointer into an __xdata pointer */
 #define DATA_TO_XDATA(a)	((void __xdata *) ((uint8_t) (a) | 0xff00))
 
+/* Code and xdata use the same address space */
+#define CODE_TO_XDATA(a)	((__xdata void *) ((uint16_t) (a)))
+
+/* Pdata lives at the start of xdata */
+#define PDATA_TO_XDATA(a)	((void __xdata *) ((uint8_t) (a) | 0xf000))
+
 /* Stack runs from above the allocated __data space to 0xfe, which avoids
  * writing to 0xff as that triggers the stack overflow indicator
  */
@@ -39,7 +45,7 @@
 	ao_delay(AO_SEC_TO_TICKS(2));				\
 	} while (0)
 	
-#define ao_arch_nop()	_asm nop _endasm
+#define ao_arch_nop()	__asm nop __endasm
 #define ao_arch_interrupt(n)	__interrupt n
 
 #define ao_arch_naked_declare	__naked
@@ -100,7 +106,7 @@ extern __code __at (0x00a6) uint32_t ao_radio_cal;
 /* Save current context */
 
 #define ao_arch_save_regs()						\
-	_asm								\
+	__asm								\
 	/* Push ACC first, as when restoring the context it must be restored \
 	 * last (it is used to set the IE register). */			\
 	push	ACC							\
@@ -119,11 +125,11 @@ extern __code __at (0x00a6) uint32_t ao_radio_cal;
 	push	ar0							\
 	push	ar1							\
 	push	PSW							\
-	_endasm;							\
+	__endasm;							\
 	PSW = 0;							\
-	_asm								\
+	__asm								\
 	push	_bp							\
-	_endasm
+	__endasm
 
 #define ao_arch_save_stack() { 						\
 		uint8_t stack_len;					\
@@ -160,7 +166,7 @@ extern __code __at (0x00a6) uint32_t ao_radio_cal;
 			*stack_ptr++ = *save_ptr++;			\
 		while (--stack_len);					\
 									\
-		_asm							\
+		__asm							\
 		pop		_bp					\
 		pop		PSW					\
 		pop		ar1					\
@@ -187,7 +193,7 @@ extern __code __at (0x00a6) uint32_t ao_radio_cal;
 		/* Finally pop off the ACC, which was the first register saved. */ \
 		pop		ACC					\
 		ret							\
-		_endasm;						\
+		__endasm;						\
 }
 
 #define ao_arch_critical(b) __critical { b }
@@ -225,21 +231,24 @@ ao_button_init(void);
 char
 ao_button_get(void) __critical;
 
+void
+ao_button_clear(void) __critical;
+
 /* ao_string.c */
 
 void
-_ao_xmemcpy(__xdata uint8_t *dst, __xdata uint8_t *src, uint8_t count);
+_ao_xmemcpy(__xdata void *dst, __xdata void *src, uint8_t count);
 
-#define ao_xmemcpy(d,s,c) _ao_xmemcpy((__xdata uint8_t *) (d), (__xdata uint8_t *) (s), (c))
+#define ao_xmemcpy(d,s,c) _ao_xmemcpy(d,s,c)
 
 void
-_ao_xmemset(__xdata uint8_t *dst, uint8_t value, uint8_t count);
+_ao_xmemset(__xdata void *dst, uint8_t value, uint8_t count);
 
-#define ao_xmemset(d,v,c) _ao_xmemset((__xdata uint8_t *) (d), (v), (c))
+#define ao_xmemset(d,v,c) _ao_xmemset(d,v,c)
 
 int8_t
-_ao_xmemcmp(__xdata uint8_t *a, __xdata uint8_t *b, uint8_t count);
+_ao_xmemcmp(__xdata void *a, __xdata void *b, uint8_t count);
 
-#define ao_xmemcmp(d,s,c) _ao_xmemcmp((__xdata uint8_t *) (d), (__xdata uint8_t *) (s), (c))
+#define ao_xmemcmp(d,s,c) _ao_xmemcmp((d), (s), (c))
 
 #endif /* _AO_ARCH_H_ */