From 6f3bbb11880f45284f1f094990ffa32a66bf4560 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Mon, 22 Apr 2013 20:24:48 -0500
Subject: [PATCH] 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>
---
 src/attiny/ao_arch.h                |  2 +-
 src/core/ao.h                       |  2 ++
 src/{micropeak => core}/ao_notask.c |  2 +-
 src/core/ao_notask.h                | 27 +++++++++++++++++++++++++++
 4 files changed, 31 insertions(+), 2 deletions(-)
 rename src/{micropeak => core}/ao_notask.c (97%)
 create mode 100644 src/core/ao_notask.h

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/micropeak/ao_notask.c b/src/core/ao_notask.c
similarity index 97%
rename from src/micropeak/ao_notask.c
rename to src/core/ao_notask.c
index 0aef9cf3..a41712d2 100644
--- a/src/micropeak/ao_notask.c
+++ b/src/core/ao_notask.c
@@ -24,7 +24,7 @@ ao_sleep(__xdata void *wchan)
 {
 #if 1
 	ao_wchan = wchan;
-	ao_arch_cpu_idle();
+	ao_arch_wait_interrupt();
 #else
 	uint8_t	sreg;
 
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_ */
-- 
2.30.2