X-Git-Url: http://git.droids-corp.org/?p=protos%2Fxbee-avr.git;a=blobdiff_plain;f=cmdline.h;fp=cmdline.h;h=508d0267ae49910f2069b9e5431ccce76f1b06e4;hp=958660a6c42bf5b78d1f2b325d44eb54b30886e9;hb=0e1c93804369af27043c82ccc778c42bf54a9bd4;hpb=1a0d8b2d8fb17cf4b2c845c52b22dc932efa080b

diff --git a/cmdline.h b/cmdline.h
index 958660a..508d026 100644
--- a/cmdline.h
+++ b/cmdline.h
@@ -21,7 +21,12 @@
  */
 
 
+#ifdef USE_USB
 #include "DualVirtualSerial.h"
+#else
+#define CMDLINE_UART 0
+#define XBEE_UART 2
+#endif
 
 void cmdline_init(void);
 
@@ -34,24 +39,36 @@ void mylog(struct error * e, ...);
 /* poll cmdline */
 int cmdline_poll(void);
 
-int usbserial1_dev_send(char c, FILE* f);
-int usbserial1_dev_recv(FILE* f);
+int cmdline_dev_send(char c, FILE* f);
+int cmdline_dev_recv(FILE* f);
 
-int usbserial2_dev_send(char c, FILE* f);
-int usbserial2_dev_recv(FILE* f);
+int xbee_dev_send(char c, FILE* f);
+int xbee_dev_recv(FILE* f);
 
 static inline uint8_t cmdline_keypressed(void) {
+#ifdef USE_USB
 	return (CDC_Device_ReceiveByte(&VirtualSerial1_CDC_Interface) >= 0);
+#else
+	return (uart_recv_nowait(CMDLINE_UART) != -1);
+#endif
 }
 
 static inline int16_t cmdline_getchar(void) {
+#ifdef USE_USB
 	return CDC_Device_ReceiveByte(&VirtualSerial1_CDC_Interface);
+#else
+	return uart_recv_nowait(CMDLINE_UART);
+#endif
 }
 
 static inline uint8_t cmdline_getchar_wait(void) {
+#ifdef USE_USB
 	int16_t c;
 	do {
 		c = CDC_Device_ReceiveByte(&VirtualSerial1_CDC_Interface);
 	} while (c < 0);
 	return c;
+#else
+	return uart_recv(CMDLINE_UART);
+#endif
 }