7 files changed, 123 insertions, 0 deletions
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_cmd.c b/src/core/ao_cmd.c
index 6eed08d9..188b8bb4 100644
--- a/src/core/ao_cmd.c
+++ b/src/core/ao_cmd.c
@@ -16,6 +16,7 @@
  */
 
 #include "ao.h"
+#include "ao_task.h"
 
 __pdata uint16_t ao_cmd_lex_i;
 __pdata uint32_t ao_cmd_lex_u32;
@@ -262,6 +263,11 @@ ao_reboot(void)
 	ao_panic(AO_PANIC_REBOOT);
 }
 
+#ifndef HAS_VERSION
+#define HAS_VERSION 1
+#endif
+
+#if HAS_VERSION
 static void
 version(void)
 {
@@ -289,6 +295,7 @@ version(void)
 #endif
 	printf("software-version %s\n", ao_version);
 }
+#endif
 
 #ifndef NUM_CMDS
 #define NUM_CMDS	11
@@ -378,14 +385,33 @@ ao_cmd(void)
 	}
 }
 
+#if HAS_BOOT_LOADER
+
+#include <ao_boot.h>
+
+static void
+ao_loader(void)
+{
+	flush();
+	ao_boot_loader();
+}
+#endif
+
 __xdata struct ao_task ao_cmd_task;
 
 __code struct ao_cmds	ao_base_cmds[] = {
 	{ help,		"?\0Help" },
+#if HAS_TASK_INFO
 	{ ao_task_info,	"T\0Tasks" },
+#endif
 	{ echo,		"E <0 off, 1 on>\0Echo" },
 	{ ao_reboot,	"r eboot\0Reboot" },
+#if HAS_VERSION
 	{ version,	"v\0Version" },
+#endif
+#if HAS_BOOT_LOADER
+	{ ao_loader,	"X\0Switch to boot loader" },
+#endif
 	{ 0,	NULL },
 };
 
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/core/ao_stdio.c b/src/core/ao_stdio.c
index 977d74b1..cd144d6b 100644
--- a/src/core/ao_stdio.c
+++ b/src/core/ao_stdio.c
@@ -66,8 +66,15 @@
 #define AO_NUM_STDIOS	(HAS_USB + PACKET_HAS_SLAVE + USE_SERIAL_STDIN)
 
 __xdata struct ao_stdio ao_stdios[AO_NUM_STDIOS];
+
+#if AO_NUM_STDIOS > 1
 __pdata int8_t ao_cur_stdio;
 __pdata int8_t ao_num_stdios;
+#else
+__pdata int8_t ao_cur_stdio;
+#define ao_cur_stdio	0
+#define ao_num_stdios	0
+#endif
 
 void
 putchar(char c)
@@ -107,12 +114,16 @@ getchar(void) __reentrant
 		c = ao_stdios[stdio]._pollchar();
 		if (c != AO_READ_AGAIN)
 			break;
+#if AO_NUM_STDIOS > 1
 		if (++stdio == ao_num_stdios)
 			stdio = 0;
 		if (stdio == ao_cur_stdio)
+#endif
 			ao_sleep(&ao_stdin_ready);
 	}
+#if AO_NUM_STDIOS > 1
 	ao_cur_stdio = stdio;
+#endif
 	ao_arch_release_interrupts();
 	return c;
 }
@@ -128,11 +139,17 @@ ao_add_stdio(int (*_pollchar)(void),
 	     void (*putchar)(char),
 	     void (*flush)(void)) __reentrant
 {
+#if AO_NUM_STDIOS > 1
 	if (ao_num_stdios == AO_NUM_STDIOS)
 		ao_panic(AO_PANIC_STDIO);
+#endif
 	ao_stdios[ao_num_stdios]._pollchar = _pollchar;
 	ao_stdios[ao_num_stdios].putchar = putchar;
 	ao_stdios[ao_num_stdios].flush = flush;
 	ao_stdios[ao_num_stdios].echo = 1;
+#if AO_NUM_STDIOS > 1
 	return ao_num_stdios++;
+#else
+	return 0;
+#endif
 }
diff --git a/src/core/ao_task.c b/src/core/ao_task.c
index c24c9929..0aad6508 100644
--- a/src/core/ao_task.c
+++ b/src/core/ao_task.c
@@ -512,6 +512,7 @@ ao_exit(void)
 	/* we'll never get back here */
 }
 
+#if HAS_TASK_INFO
 void
 ao_task_info(void)
 {
@@ -528,6 +529,7 @@ ao_task_info(void)
 	ao_task_validate();
 #endif
 }
+#endif
 
 void
 ao_start_scheduler(void)
diff --git a/src/core/ao_task.h b/src/core/ao_task.h
index 50bfb220..1a4b5b6b 100644
--- a/src/core/ao_task.h
+++ b/src/core/ao_task.h
@@ -21,6 +21,10 @@
 #include <ao_list.h>
 #endif
 
+#ifndef HAS_TASK_INFO
+#define HAS_TASK_INFO 1
+#endif
+
 /* An AltOS task */
 struct ao_task {
 	__xdata void *wchan;		/* current wait channel (NULL if running) */