From c5c6fac96e348578a3436a07d75effd4abbc19f2 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Fri, 13 May 2011 01:33:49 -0700
Subject: [PATCH] altos-avr: Enable command processor over serial line in demo

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src-avr/ao_cmd.c          | 7 +++++--
 src-avr/ao_demo.c         | 3 ++-
 src-avr/ao_product.c      | 2 +-
 src-avr/avr-demo/Makefile | 4 +++-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src-avr/ao_cmd.c b/src-avr/ao_cmd.c
index 86ec1fe0..131c3d89 100644
--- a/src-avr/ao_cmd.c
+++ b/src-avr/ao_cmd.c
@@ -32,7 +32,7 @@ static void
 put_string(char *s)
 {
 	__xdata char	c;
-	while (c = *s++)
+	while ((c = *s++))
 		putchar(c);
 }
 
@@ -186,12 +186,14 @@ ao_match_word(__code char *word)
 	return 1;
 }
 
+#if 0
 static void
 eol(void)
 {
 	while (ao_cmd_lex_c != '\n')
 		ao_cmd_lex();
 }
+#endif
 
 static void
 echo(void)
@@ -220,7 +222,7 @@ version(void)
 {
 	printf("manufacturer     %s\n", ao_manufacturer);
 	printf("product          %s\n", ao_product);
-	printf("serial-number    %u\n", ao_romconfig.serial_number);
+//	printf("serial-number    %u\n", ao_romconfig.serial_number);
 	printf("software-version %s\n", ao_version);
 }
 
@@ -255,6 +257,7 @@ report(void)
 	case ao_cmd_syntax_error:
 		puts("Syntax error");
 		ao_cmd_status = 0;
+	default:
 		break;
 	}
 }
diff --git a/src-avr/ao_demo.c b/src-avr/ao_demo.c
index 3f25be50..a9632080 100644
--- a/src-avr/ao_demo.c
+++ b/src-avr/ao_demo.c
@@ -40,8 +40,9 @@ main(void)
 //	ao_debug_init();
 	ao_led_init(LEDS_AVAILABLE);
 	ao_timer_init();
+	ao_cmd_init();
 
-	ao_add_task(&demo_task, ao_demo, "demo");
+//	ao_add_task(&demo_task, ao_demo, "demo");
 	/* Turn on the LED until the system is stable */
 	ao_start_scheduler();
 	return 0;
diff --git a/src-avr/ao_product.c b/src-avr/ao_product.c
index 54ba2a14..420f14db 100644
--- a/src-avr/ao_product.c
+++ b/src-avr/ao_product.c
@@ -16,7 +16,7 @@
  */
 
 #include "ao.h"
-#include PRODUCT_DEFS
+#include "ao_product.h"
 
 /* Defines which mark this particular AltOS product */
 
diff --git a/src-avr/avr-demo/Makefile b/src-avr/avr-demo/Makefile
index 49824ca5..ba30adfc 100644
--- a/src-avr/avr-demo/Makefile
+++ b/src-avr/avr-demo/Makefile
@@ -35,8 +35,10 @@ INC = \
 # Common AltOS sources
 #
 ALTOS_SRC = \
+	ao_cmd.c \
 	ao_mutex.c \
 	ao_panic.c \
+	ao_product.c \
 	ao_serial_avr.c \
 	ao_stdio.c \
 	ao_task.c \
@@ -96,4 +98,4 @@ install:
 
 uninstall:
 
-$(OBJ): ao.h
\ No newline at end of file
+$(OBJ): ao.h ao_product.h
\ No newline at end of file
-- 
2.47.2