X-Git-Url: http://git.droids-corp.org/?p=protos%2Fxbee-avr.git;a=blobdiff_plain;f=cmdline.c;h=5745b9c60aabe01efa29f8ab2470d81b59e00d14;hp=d9fd8367c2a015e1c3df2e498d973149f13302dd;hb=8fcd09b3ebe4880910ea909e298f2eeb563ac6fe;hpb=57895b3bb2fe0582c589685b7df34f3968b346ec

diff --git a/cmdline.c b/cmdline.c
index d9fd836..5745b9c 100644
--- a/cmdline.c
+++ b/cmdline.c
@@ -37,22 +37,13 @@
 #include "cmdline.h"
 
 
-#ifdef USE_USB
-#include "DualVirtualSerial.h"
-#endif
-
-
 extern const parse_ctx_t PROGMEM main_ctx[];
 
 
 int cmdline_dev_send(char c, FILE* f)
 {
 	(void)f;
-#ifdef USE_USB
-	CDC_Device_SendByte(&VirtualSerial1_CDC_Interface, (uint8_t)c);
-#else
 	uart_send(CMDLINE_UART, c);
-#endif
 	return 0;
 }
 
@@ -61,12 +52,7 @@ int cmdline_dev_recv(FILE* f)
 	int16_t c;
 
 	(void)f;
-#ifdef USE_USB
-	/* non-blocking ! */
-	c = CDC_Device_ReceiveByte(&VirtualSerial1_CDC_Interface);
-#else
 	c = uart_recv_nowait(CMDLINE_UART);
-#endif
 	if (c < 0)
 		return _FDEV_EOF;
 
@@ -77,11 +63,7 @@ int cmdline_dev_recv(FILE* f)
 int xbee_dev_send(char c, FILE* f)
 {
 	(void)f;
-#ifdef USE_USB
-	CDC_Device_SendByte(&VirtualSerial2_CDC_Interface, (uint8_t)c);
-#else
 	uart_send(XBEE_UART, c);
-#endif
 	return 0;
 }
 
@@ -90,12 +72,7 @@ int xbee_dev_recv(FILE* f)
 	int16_t c;
 
 	(void)f;
-#ifdef USE_USB
-	/* non-blocking ! */
-	c = CDC_Device_ReceiveByte(&VirtualSerial2_CDC_Interface);
-#else
 	c = uart_recv_nowait(XBEE_UART);
-#endif
 	if (c < 0)
 		return _FDEV_EOF;
 
@@ -151,8 +128,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