fix compilation with latest aversive

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

diff --git a/cmdline.c b/cmdline.c
index 5eafc1d..d9fd836 100644 (file)
--- a/cmdline.c
+++ b/cmdline.c
@@ -36,24 +36,37 @@
 #include "main.h"
 #include "cmdline.h"
 
+
+#ifdef USE_USB
 #include "DualVirtualSerial.h"
+#endif
 
 
+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)
 {
+       (void)f;
+#ifdef USE_USB
        CDC_Device_SendByte(&VirtualSerial1_CDC_Interface, (uint8_t)c);
+#else
+       uart_send(CMDLINE_UART, c);
+#endif
        return 0;
 }
 
-int usbserial1_dev_recv(FILE* f)
+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;
 
@@ -61,31 +74,42 @@ int usbserial1_dev_recv(FILE* f)
 }
 
 
-int usbserial2_dev_send(char c, 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;
 }
 
-int usbserial2_dev_recv(FILE* f)
+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;
 
        return c;
 }
 
-
 static void
 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,20 +122,21 @@ 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)
 {
-       usbserial1_dev_send(c, NULL);
+       cmdline_dev_send(c, NULL);
 }
 
 
 void cmdline_init(void)
 {
        rdline_init(&xbeeboard.rdl, write_char, valid_buffer, complete_buffer);
-       snprintf(xbeeboard.prompt, sizeof(xbeeboard.prompt), "mainboard > ");
+       snprintf_P(xbeeboard.prompt, sizeof(xbeeboard.prompt), PSTR("mainboard > "));
 }
 
 
@@ -170,7 +195,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;