From: Keith Packard <keithp@keithp.com>
Date: Tue, 23 Apr 2013 01:24:48 +0000 (-0500)
Subject: altos: Move ao_notask to core
X-Git-Tag: 1.2.1~38
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=6f3bbb11880f45284f1f094990ffa32a66bf4560

altos: Move ao_notask to core

The STM flash loader wants to be taskless too, share this very simple
implementation of sleep/wakeup.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/src/attiny/ao_arch.h b/src/attiny/ao_arch.h
index 52bed981..8140dd30 100644
--- a/src/attiny/ao_arch.h
+++ b/src/attiny/ao_arch.h
@@ -55,7 +55,7 @@
 #define putchar(c)	ao_putchar(c)
 #define getchar		ao_getchar
 
-#define ao_arch_cpu_idle() do {			\
+#define ao_arch_wait_interrupt() do {		\
 		sleep_enable();			\
 		sei();				\
 		sleep_cpu();			\
diff --git a/src/core/ao.h b/src/core/ao.h
index 6bcb3664..0ad3e4aa 100644
--- a/src/core/ao.h
+++ b/src/core/ao.h
@@ -45,6 +45,8 @@
 
 #if HAS_TASK
 #include <ao_task.h>
+#else
+#include <ao_notask.h>
 #endif
 
 /*
diff --git a/src/core/ao_notask.c b/src/core/ao_notask.c
new file mode 100644
index 00000000..a41712d2
--- /dev/null
+++ b/src/core/ao_notask.c
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2012 Keith Packard <keithp@keithp.com>
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+#include <ao.h>
+
+static volatile void *ao_wchan;
+
+uint8_t
+ao_sleep(__xdata void *wchan)
+{
+#if 1
+	ao_wchan = wchan;
+	ao_arch_wait_interrupt();
+#else
+	uint8_t	sreg;
+
+	ao_wchan = wchan;
+	asm("in %0,__SREG__" : "=&r" (sreg));
+	sei();
+	while (ao_wchan)
+		ao_arch_cpu_idle();
+	asm("out __SREG__,%0" : : "r" (sreg));
+#endif
+	return 0;
+}
+
+void
+ao_wakeup(__xdata void *wchan)
+{
+	ao_wchan = 0;
+}
diff --git a/src/core/ao_notask.h b/src/core/ao_notask.h
new file mode 100644
index 00000000..6b6b5bb8
--- /dev/null
+++ b/src/core/ao_notask.h
@@ -0,0 +1,27 @@
+/*
+ * Copyright © 2012 Keith Packard <keithp@keithp.com>
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+#ifndef _AO_NOTASK_H_
+#define _AO_NOTASK_H_
+
+uint8_t
+ao_sleep(__xdata void *wchan);
+
+void
+ao_wakeup(__xdata void *wchan);
+
+#endif /* _AO_NOTASK_H_ */
diff --git a/src/micropeak/ao_notask.c b/src/micropeak/ao_notask.c
deleted file mode 100644
index 0aef9cf3..00000000
--- a/src/micropeak/ao_notask.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright © 2012 Keith Packard <keithp@keithp.com>
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-
-#include <ao.h>
-
-static volatile void *ao_wchan;
-
-uint8_t
-ao_sleep(__xdata void *wchan)
-{
-#if 1
-	ao_wchan = wchan;
-	ao_arch_cpu_idle();
-#else
-	uint8_t	sreg;
-
-	ao_wchan = wchan;
-	asm("in %0,__SREG__" : "=&r" (sreg));
-	sei();
-	while (ao_wchan)
-		ao_arch_cpu_idle();
-	asm("out __SREG__,%0" : : "r" (sreg));
-#endif
-	return 0;
-}
-
-void
-ao_wakeup(__xdata void *wchan)
-{
-	ao_wchan = 0;
-}