X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Favr%2Fao_arch.h;h=d3454f917fc6f75aa32d5879d2d3d9a4cf821198;hb=c4b8aff07d5366cef2c7209729f6cd22fa67de0c;hp=f8c7f042a1954ebc7287adacc531fe9be7b0ab74;hpb=f2e5ffd839fe5be99359e4c86a96f03148bac698;p=fw%2Faltos

diff --git a/src/avr/ao_arch.h b/src/avr/ao_arch.h
index f8c7f042..d3454f91 100644
--- a/src/avr/ao_arch.h
+++ b/src/avr/ao_arch.h
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -47,12 +48,6 @@
 
 #define ao_arch_naked_declare	__attribute__((naked))
 #define ao_arch_naked_define
-#define __pdata
-#define __data
-#define __xdata
-#define __code const
-#define __reentrant
-#define __critical
 #define __interrupt(n)
 #define __at(n)
 
@@ -83,27 +78,25 @@ extern uint8_t	ao_cpu_sleep_disable;
 
 #define ao_arch_task_globals	uint8_t ao_cpu_sleep_disable;
 
-#define ao_arch_task_members\
-	uint8_t *sp;			/* saved stack pointer */
-
-#define ao_arch_init_stack(task, start) do {			\
-	uint8_t		*sp = task->stack + AO_STACK_SIZE - 1;	\
-	uint16_t	a = (uint16_t) start; 			\
-	int		i;					\
-								\
-	/* Return address */					\
-	AVR_PUSH8(sp, a);					\
-	AVR_PUSH8(sp, (a >> 8));				\
-								\
-	/* Clear register values */				\
-	i = 32;							\
-	while (i--)						\
-		AVR_PUSH8(sp, 0);				\
-								\
-	/* SREG with interrupts enabled */			\
-	AVR_PUSH8(sp, 0x80);					\
-	task->sp = sp;						\
-} while (0);
+#define ao_arch_init_stack(task, start) \
+	do {								\
+		uint8_t		*sp = task->stack8 + AO_STACK_SIZE - 1;	\
+		uint16_t	a = (uint16_t) start; 			\
+		int		i;					\
+									\
+		/* Return address */					\
+		AVR_PUSH8(sp, a);					\
+		AVR_PUSH8(sp, (a >> 8));				\
+									\
+		/* Clear register values */				\
+		i = 32;							\
+		while (i--)						\
+			AVR_PUSH8(sp, 0);				\
+									\
+		/* SREG with interrupts enabled */			\
+		AVR_PUSH8(sp, 0x80);					\
+		task->sp8 = sp;						\
+	} while (0);
 	
 #define ao_arch_save_regs() do {					\
 		asm("push r31" "\n\t" "push r30");			\
@@ -120,7 +113,7 @@ extern uint8_t	ao_cpu_sleep_disable;
 		uint8_t	sp_l, sp_h;					\
 		asm("in %0,__SP_L__" : "=&r" (sp_l) );			\
 		asm("in %0,__SP_H__" : "=&r" (sp_h) );			\
-		ao_cur_task->sp = (uint8_t *) ((uint16_t) sp_l | ((uint16_t) sp_h << 8)); \
+		ao_cur_task->sp8 = (uint8_t *) ((uint16_t) sp_l | ((uint16_t) sp_h << 8)); \
 	} while (0)
 
 #define ao_arch_isr_stack()	/* nothing */
@@ -145,8 +138,8 @@ extern uint8_t	ao_cpu_sleep_disable;
 
 #define ao_arch_restore_stack() do { \
 		uint8_t	sp_l, sp_h;					\
-		sp_l = (uint16_t) ao_cur_task->sp;			\
-		sp_h = ((uint16_t) ao_cur_task->sp) >> 8;		\
+		sp_l = (uint16_t) ao_cur_task->sp8;			\
+		sp_h = ((uint16_t) ao_cur_task->sp8) >> 8;		\
 		asm("out __SP_H__,%0" : : "r" (sp_h) );			\
 		asm("out __SP_L__,%0" : : "r" (sp_l) );			\
 		asm("pop r0"	"\n\t"					\