X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Favr%2Fao_arch.h;h=6166c50e67f489fddae53c10b1182349adad1e71;hp=51a65880be51717745ce88360580f469adb952c4;hb=0686a7b8aec524d81bda4c572549a3a068ce0eed;hpb=e9fab7dc99a0e7c22b511c5919adf7df85213252

diff --git a/src/avr/ao_arch.h b/src/avr/ao_arch.h
index 51a65880..6166c50e 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
@@ -18,8 +19,10 @@
 #ifndef _AO_ARCH_H_
 #define _AO_ARCH_H_
 
+#include <stdio.h>
 #include <avr/io.h>
 #include <avr/interrupt.h>
+#include <avr/sleep.h>
 
 #ifdef AVR_DEMO
 #define TEENSY 1
@@ -35,19 +38,18 @@
  * AVR definitions and code fragments for AltOS
  */
 
-#define AO_STACK_SIZE	128
+#ifndef AO_STACK_SIZE
+#define AO_STACK_SIZE	116
+#endif
+
+#define AO_PORT_TYPE	uint8_t
 
 /* Various definitions to make GCC look more like SDCC */
 
 #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)
 
 #define ao_arch_reboot()	/* XXX */
 
@@ -62,8 +64,22 @@
 
 extern void putchar(char c);
 extern char getchar(void);
+extern void ao_avr_stdio_init(void);
+
+#define AO_ROMCONFIG_VERSION	2
+
+#define AO_ROMCONFIG_SYMBOL(a) const
+
+extern AO_ROMCONFIG_SYMBOL(0) uint16_t ao_serial_number;
+
+#define AVR_PUSH8(stack, val)	(*((stack)--) = (val))
+
+extern uint8_t	ao_cpu_sleep_disable;
+
+#define ao_arch_task_globals	uint8_t ao_cpu_sleep_disable;
 
-extern int ao_serial_number;
+#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;	\
@@ -71,29 +87,81 @@ extern int ao_serial_number;
 	int		i;					\
 								\
 	/* Return address */					\
-	PUSH8(sp, a);						\
-	PUSH8(sp, (a >> 8));					\
+	AVR_PUSH8(sp, a);					\
+	AVR_PUSH8(sp, (a >> 8));				\
 								\
 	/* Clear register values */				\
 	i = 32;							\
 	while (i--)						\
-		PUSH8(sp, 0);					\
+		AVR_PUSH8(sp, 0);				\
 								\
 	/* SREG with interrupts enabled */			\
-	PUSH8(sp, 0x80);					\
+	AVR_PUSH8(sp, 0x80);					\
 	task->sp = sp;						\
 } while (0);
 	
-#define ao_arch_save_context() do {			\
-	asm("push r31" "\n\t" "push r30"); \
-	asm("push r29" "\n\t" "push r28" "\n\t" "push r27" "\n\t" "push r26" "\n\t" "push r25"); \
-	asm("push r24" "\n\t" "push r23" "\n\t" "push r22" "\n\t" "push r21" "\n\t" "push r20"); \
-	asm("push r19" "\n\t" "push r18" "\n\t" "push r17" "\n\t" "push r16" "\n\t" "push r15"); \
-	asm("push r14" "\n\t" "push r13" "\n\t" "push r12" "\n\t" "push r11" "\n\t" "push r10"); \
-	asm("push r9" "\n\t" "push r8" "\n\t" "push r7" "\n\t" "push r6" "\n\t" "push r5"); \
-	asm("push r4" "\n\t" "push r3" "\n\t" "push r2" "\n\t" "push r1" "\n\t" "push r0"); \
-	asm("in r0, __SREG__" "\n\t" "push r0"); \
-	sei(); \
+#define ao_arch_save_regs() do {					\
+		asm("push r31" "\n\t" "push r30");			\
+		asm("push r29" "\n\t" "push r28" "\n\t" "push r27" "\n\t" "push r26" "\n\t" "push r25"); \
+		asm("push r24" "\n\t" "push r23" "\n\t" "push r22" "\n\t" "push r21" "\n\t" "push r20"); \
+		asm("push r19" "\n\t" "push r18" "\n\t" "push r17" "\n\t" "push r16" "\n\t" "push r15"); \
+		asm("push r14" "\n\t" "push r13" "\n\t" "push r12" "\n\t" "push r11" "\n\t" "push r10"); \
+		asm("push r9" "\n\t" "push r8" "\n\t" "push r7" "\n\t" "push r6" "\n\t" "push r5"); \
+		asm("push r4" "\n\t" "push r3" "\n\t" "push r2" "\n\t" "push r1" "\n\t" "push r0"); \
+		asm("in r0, __SREG__" "\n\t" "push r0");		\
 	} while (0)
 
+#define ao_arch_save_stack() do {					\
+		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)); \
+	} while (0)
+
+#define ao_arch_isr_stack()	/* nothing */
+
+/* Idle the CPU (if possible) waiting for an interrupt. Enabling
+ * interrupts and sleeping the CPU must be adjacent to eliminate race
+ * conditions. In all cases, we execute a single nop with interrupts
+ * enabled
+ */
+#define ao_arch_wait_interrupt() do {		\
+		if (!ao_cpu_sleep_disable) {	\
+			sleep_enable();		\
+			sei();			\
+			sleep_cpu();		\
+			sleep_disable();	\
+		} else {			\
+			sei();			\
+		}				\
+		ao_arch_nop();			\
+		cli();				\
+	} while (0)
+
+#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;		\
+		asm("out __SP_H__,%0" : : "r" (sp_h) );			\
+		asm("out __SP_L__,%0" : : "r" (sp_l) );			\
+		asm("pop r0"	"\n\t"					\
+		    "out __SREG__, r0");				\
+		asm("pop r0" "\n\t" "pop r1" "\n\t" "pop r2" "\n\t" "pop r3" "\n\t" "pop r4"); \
+		asm("pop r5" "\n\t" "pop r6" "\n\t" "pop r7" "\n\t" "pop r8" "\n\t" "pop r9"); \
+		asm("pop r10" "\n\t" "pop r11" "\n\t" "pop r12" "\n\t" "pop r13" "\n\t" "pop r14"); \
+		asm("pop r15" "\n\t" "pop r16" "\n\t" "pop r17" "\n\t" "pop r18" "\n\t" "pop r19"); \
+		asm("pop r20" "\n\t" "pop r21" "\n\t" "pop r22" "\n\t" "pop r23" "\n\t" "pop r24"); \
+		asm("pop r25" "\n\t" "pop r26" "\n\t" "pop r27" "\n\t" "pop r28" "\n\t" "pop r29"); \
+		asm("pop r30" "\n\t" "pop r31");			\
+		asm("ret");						\
+	} while(0)
+
+#define ao_arch_critical(b) do { cli(); do { b } while (0); sei(); } while (0)
+
+#define ao_arch_block_interrupts()	cli()
+#define ao_arch_release_interrupts()	sei()
+
+#define AO_TELESCIENCE_NUM_ADC	12
+
 #endif /* _AO_ARCH_H_ */
+