diff options
author | Steve Markgraf <steve@steve-m.de> | 2013-01-03 22:44:00 +0100 |
---|---|---|
committer | Sylvain Munaut <tnt@246tNt.com> | 2013-01-05 18:38:42 +0100 |
commit | 21bc3b8db014b5579eb9dd960feb87f24ea1e857 (patch) | |
tree | 63e1cbff820cacc4c5efd1f1640f00557a2f5ca7 /src/target/firmware/include | |
parent | e340681c5bbcb9f904b0058d7f69f80ab2d32cc5 (diff) |
fw: introduce per-board uart mapping
Signed-off-by: Steve Markgraf <steve@steve-m.de>
Diffstat (limited to 'src/target/firmware/include')
-rw-r--r-- | src/target/firmware/include/comm/sercomm.h | 10 | ||||
-rw-r--r-- | src/target/firmware/include/console.h | 5 | ||||
-rw-r--r-- | src/target/firmware/include/uart.h | 5 |
3 files changed, 13 insertions, 7 deletions
diff --git a/src/target/firmware/include/comm/sercomm.h b/src/target/firmware/include/comm/sercomm.h index 54256b5a..a474c61a 100644 --- a/src/target/firmware/include/comm/sercomm.h +++ b/src/target/firmware/include/comm/sercomm.h @@ -1,12 +1,8 @@ #ifndef _SERCOMM_H #define _SERCOMM_H -/* SERCOMM layer on UART1 (modem UART) */ - #include <osmocom/core/msgb.h> -#define SERCOMM_UART_NR 1 - #define HDLC_FLAG 0x7E #define HDLC_ESCAPE 0x7D @@ -25,6 +21,12 @@ enum sercomm_dlci { _SC_DLCI_MAX }; +#ifndef HOST_BUILD +/* helper functions for target */ +void sercomm_bind_uart(int uart); +int sercomm_get_uart(void); +#endif + void sercomm_init(void); int sercomm_initialized(void); diff --git a/src/target/firmware/include/console.h b/src/target/firmware/include/console.h index 7146e990..cd27155e 100644 --- a/src/target/firmware/include/console.h +++ b/src/target/firmware/include/console.h @@ -10,9 +10,8 @@ int cons_puts(const char *s); int cons_putchar(char c); int cons_rb_flush(void); void cons_init(void); - -/* We want the console on UART 0 (IRDA UART) */ -#define CONS_UART_NR 0 +void cons_bind_uart(int uart); +int cons_get_uart(void); /* Size of the static ring-buffer that we keep for console print messages */ #define CONS_RB_SIZE 4096 diff --git a/src/target/firmware/include/uart.h b/src/target/firmware/include/uart.h index 81d7a156..870a0968 100644 --- a/src/target/firmware/include/uart.h +++ b/src/target/firmware/include/uart.h @@ -13,6 +13,11 @@ enum uart_baudrate { UART_921600, }; +enum uart_id { + UART_IRDA, + UART_MODEM, +}; + void uart_init(uint8_t uart, uint8_t interrupts); void uart_putchar_wait(uint8_t uart, int c); int uart_putchar_nb(uint8_t uart, int c); |