fix scheduler unit as we have a 12Mhz quartz

[protos/xbee-avr.git] / cmdline.h

diff --git a/cmdline.h b/cmdline.h
index 958660a..3b8bf50 100644 (file)
--- a/cmdline.h
+++ b/cmdline.h
@@ -21,7 +21,8 @@
  */
 
 
-#include "DualVirtualSerial.h"
+#define CMDLINE_UART 1
+#define XBEE_UART 0
 
 void cmdline_init(void);
 
@@ -34,24 +35,23 @@ 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) {
-       return (CDC_Device_ReceiveByte(&VirtualSerial1_CDC_Interface) >= 0);
+static inline uint8_t cmdline_keypressed(void)
+{
+       return (uart_recv_nowait(CMDLINE_UART) != -1);
 }
 
-static inline int16_t cmdline_getchar(void) {
-       return CDC_Device_ReceiveByte(&VirtualSerial1_CDC_Interface);
+static inline int16_t cmdline_getchar(void)
+{
+       return uart_recv_nowait(CMDLINE_UART);
 }
 
-static inline uint8_t cmdline_getchar_wait(void) {
-       int16_t c;
-       do {
-               c = CDC_Device_ReceiveByte(&VirtualSerial1_CDC_Interface);
-       } while (c < 0);
-       return c;
+static inline uint8_t cmdline_getchar_wait(void)
+{
+       return uart_recv(CMDLINE_UART);
 }