git.droids-corp.org
/
protos
/
xbee-avr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
support lolo's board
[protos/xbee-avr.git]
/
cmdline.h
diff --git
a/cmdline.h
b/cmdline.h
index
958660a
..
508d026
100644
(file)
--- a/
cmdline.h
+++ b/
cmdline.h
@@
-21,7
+21,12
@@
*/
*/
+#ifdef USE_USB
#include "DualVirtualSerial.h"
#include "DualVirtualSerial.h"
+#else
+#define CMDLINE_UART 0
+#define XBEE_UART 2
+#endif
void cmdline_init(void);
void cmdline_init(void);
@@
-34,24
+39,36
@@
void mylog(struct error * e, ...);
/* poll cmdline */
int cmdline_poll(void);
/* 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) {
static inline uint8_t cmdline_keypressed(void) {
+#ifdef USE_USB
return (CDC_Device_ReceiveByte(&VirtualSerial1_CDC_Interface) >= 0);
return (CDC_Device_ReceiveByte(&VirtualSerial1_CDC_Interface) >= 0);
+#else
+ return (uart_recv_nowait(CMDLINE_UART) != -1);
+#endif
}
static inline int16_t cmdline_getchar(void) {
}
static inline int16_t cmdline_getchar(void) {
+#ifdef USE_USB
return CDC_Device_ReceiveByte(&VirtualSerial1_CDC_Interface);
return CDC_Device_ReceiveByte(&VirtualSerial1_CDC_Interface);
+#else
+ return uart_recv_nowait(CMDLINE_UART);
+#endif
}
static inline uint8_t cmdline_getchar_wait(void) {
}
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;
int16_t c;
do {
c = CDC_Device_ReceiveByte(&VirtualSerial1_CDC_Interface);
} while (c < 0);
return c;
+#else
+ return uart_recv(CMDLINE_UART);
+#endif
}
}