X-Git-Url: http://git.droids-corp.org/?p=protos%2Fxbee-avr.git;a=blobdiff_plain;f=cmdline.c;h=0b0c6068d7e734e6b387b1df9d5b56673051ee3e;hp=36d1f31c30ac7738fead500833e64329ed62eef3;hb=f74db5fd03bcd38af3ca533e7531dd70454dfaaf;hpb=1a0d8b2d8fb17cf4b2c845c52b22dc932efa080b

diff --git a/cmdline.c b/cmdline.c
index 36d1f31..0b0c606 100644
--- a/cmdline.c
+++ b/cmdline.c
@@ -36,24 +36,23 @@
 #include "main.h"
 #include "cmdline.h"
 
-#include "DualVirtualSerial.h"
 
+extern const parse_ctx_t PROGMEM main_ctx[];
 
 
-/******** See in commands.c for the list of commands. */
-extern parse_pgm_ctx_t main_ctx[];
-
-int usbserial1_dev_send(char c, FILE* f)
+int cmdline_dev_send(char c, FILE* f)
 {
-	CDC_Device_SendByte(&VirtualSerial1_CDC_Interface, (uint8_t)c);
+	(void)f;
+	uart_send(CMDLINE_UART, c);
 	return 0;
 }
 
-int usbserial1_dev_recv(FILE* f)
+int cmdline_dev_recv(FILE* f)
 {
 	int16_t c;
-	/* non-blocking ! */
-	c = CDC_Device_ReceiveByte(&VirtualSerial1_CDC_Interface);
+
+	(void)f;
+	c = uart_recv_nowait(CMDLINE_UART);
 	if (c < 0)
 		return _FDEV_EOF;
 
@@ -61,31 +60,32 @@ int usbserial1_dev_recv(FILE* f)
 }
 
 
-int usbserial2_dev_send(char c, FILE* f)
+int xbee_dev_send(char c, FILE* f)
 {
-	CDC_Device_SendByte(&VirtualSerial2_CDC_Interface, (uint8_t)c);
+	(void)f;
+	uart_send(XBEE_UART, c);
 	return 0;
 }
 
-int usbserial2_dev_recv(FILE* f)
+int xbee_dev_recv(FILE* f)
 {
 	int16_t c;
 
-	/* non-blocking ! */
-	c = CDC_Device_ReceiveByte(&VirtualSerial2_CDC_Interface);
+	(void)f;
+	c = uart_recv_nowait(XBEE_UART);
 	if (c < 0)
 		return _FDEV_EOF;
 
 	return c;
 }
 
-
-static void
-valid_buffer(const char *buf, uint8_t size)
+void cmdline_valid_buffer(const char *buf, uint8_t size)
 {
 	int8_t ret;
+	PGM_P ctx = (PGM_P)main_ctx;
 
-	ret = parse(main_ctx, buf);
+	(void)size;
+	ret = parse(ctx, buf);
 	if (ret == PARSE_AMBIGUOUS)
 		printf_P(PSTR("Ambiguous command\r\n"));
 	else if (ret == PARSE_NOMATCH)
@@ -98,19 +98,20 @@ static int8_t
 complete_buffer(const char *buf, char *dstbuf, uint8_t dstsize,
 		int16_t *state)
 {
-	return complete(main_ctx, buf, state, dstbuf, dstsize);
+	PGM_P ctx = (PGM_P)main_ctx;
+	return complete(ctx, buf, state, dstbuf, dstsize);
 }
 
 
-static void write_char(char c)
+void cmdline_write_char(char c)
 {
-	usbserial1_dev_send(c, NULL);
+	cmdline_dev_send(c, NULL);
 }
 
 
 void cmdline_init(void)
 {
-	rdline_init(&xbeeboard.rdl, write_char, valid_buffer, complete_buffer);
+	rdline_init(&xbeeboard.rdl, cmdline_write_char, cmdline_valid_buffer, complete_buffer);
 	snprintf_P(xbeeboard.prompt, sizeof(xbeeboard.prompt), PSTR("mainboard > "));
 }
 
@@ -126,8 +127,10 @@ void emergency(char c)
 		i++;
 	else if ( !(i == 1 && c == 'p') )
 		i = 0;
-	if (i == 3)
-		bootloader();
+	if (i == 3) {
+		//bootloader();
+		reset();
+	}
 }
 
 /* log function, add a command to configure
@@ -170,7 +173,7 @@ int cmdline_poll(void)
 	int8_t ret, same = 0;
 	int16_t c;
 
-	c = CDC_Device_ReceiveByte(&VirtualSerial1_CDC_Interface);
+	c = cmdline_dev_recv(NULL);
 	if (c < 0)
 		return -1;