merge

[aversive.git] / modules / comm / uart / uart_host.c

diff --git a/modules/comm/uart/uart_host.c b/modules/comm/uart/uart_host.c
index 8c58c44..bd6aeed 100644 (file)
--- a/modules/comm/uart/uart_host.c
+++ b/modules/comm/uart/uart_host.c
@@ -24,7 +24,6 @@
 #include <uart.h>
 #include <uart_private.h>
 
-
 /* this file os a stub for host */
 
 void uart_init(void)
@@ -35,13 +34,29 @@ void uart_init(void)
 event *rx_event[UART_HW_NUM];
 event *tx_event[UART_HW_NUM];
 
+void uart_host_rx_event(char c)
+{
+       /* only one uart */
+       if (rx_event[0])
+               rx_event[0](c);
+}
+
+void uart_host_tx_event(char c)
+{
+       /* only one uart */
+       if (tx_event[0])
+               tx_event[0](c);
+}
+
 int8_t uart_setconf(uint8_t num, struct uart_config *u)
 {
+       /* XXX todo */
        return 0;
 }
 
 void uart_getconf(uint8_t num, struct uart_config *u)
 {
+       return;
 }
 
 int uart_recv(uint8_t num)
@@ -49,22 +64,18 @@ int uart_recv(uint8_t num)
        return getchar();
 }
 
-int uart_send_nowait(uint8_t num, char c)
+/* XXX should not wait */
+int uart_recv_nowait(uint8_t num)
 {
-       return putchar(c);
+       return getchar();
 }
 
-int uart_send(uint8_t num, char c)
+int uart_send_nowait(uint8_t num, char c)
 {
-       return put_char(c);
-}
-
-void uart_register_tx_event(uint8_t num, void (*f)(char))
-{ 
-       tx_event = f;
+       return putchar(c);
 }
 
-void uart_register_rx_event(uint8_t num, void (*f)(char))
+int uart_send(uint8_t num, char c)
 {
-       rx_event = f;
+       return putchar(c);
 }