altos/avr: Make ao_arch_critical argument be a statement
[fw/altos] / src / avr / ao_arch.h
index 2b56681457e1aee74852aaabb519bf2be97499b1..2be4abeece26db527dd25b6ccbd9193d139e7b2b 100644 (file)
 #ifndef _AO_ARCH_H_
 #define _AO_ARCH_H_
 
-#include "avr.h"
+#include <stdio.h>
+#include <avr/io.h>
+#include <avr/interrupt.h>
+#include <avr/sleep.h>
 
+#ifdef AVR_DEMO
+#define TEENSY 1
+#endif
+
+#if TEENSY
+#define F_CPU 16000000UL       // 16 MHz
+#else
+#define F_CPU  8000000UL       // 8 MHz
+#endif
 
 /*
  * AVR definitions and code fragments for AltOS
 
 /* Various definitions to make GCC look more like SDCC */
 
-#define __naked __attribute__((naked))
+#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 */
 
+#define ao_arch_nop()          asm("nop")
+
+#define ao_arch_interrupt(n)   /* nothing */
+
+#undef putchar
+#undef getchar
+#define putchar(c)     ao_putchar(c)
+#define getchar                ao_getchar
+
+extern void putchar(char c);
+extern char getchar(void);
+extern void ao_avr_stdio_init(void);
+
+extern const 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;
+
+#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_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"); \
+               cli();                                                  \
+               asm("in r0, __SREG__" "\n\t" "push r0");                \
+               sei();                                                  \
+       } 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 */
+
+#define ao_arch_cpu_idle() do {                        \
+               if (!ao_cpu_sleep_disable)      \
+                       sleep_cpu();            \
+       } 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;               \
+               cli();                                                  \
+               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_TELESCIENCE_NUM_ADC 12
+
+struct ao_adc {
+       uint16_t        tick;           /* tick when the sample was read */
+       uint16_t        adc[AO_TELESCIENCE_NUM_ADC];    /* samples */
+};
+
+#define AO_ADC_RING    16
+
 #endif /* _AO_ARCH_H_ */
+