fw: introduce per-board uart mapping

Signed-off-by: Steve Markgraf <steve@steve-m.de>

8 files changed, 62 insertions, 41 deletions

diff --git a/src/target/firmware/board/compal_e86/init.c b/src/target/firmware/board/compal_e86/init.c
index 1280ddd5..336eb43b 100644
--- a/src/target/firmware/board/compal_e86/init.c
+++ b/src/target/firmware/board/compal_e86/init.c
@@ -108,14 +108,17 @@ void board_init(int with_irq)
 	if (with_irq)
 		irq_init();
 
-	/* initialize MODEM UART to be used for sercomm*/
-	uart_init(SERCOMM_UART_NR, with_irq);
-	uart_baudrate(SERCOMM_UART_NR, UART_115200);
+	sercomm_bind_uart(UART_MODEM);
+	cons_bind_uart(UART_IRDA);
+
+	/* initialize MODEM UART to be used for sercomm */
+	uart_init(UART_MODEM, with_irq);
+	uart_baudrate(UART_MODEM, UART_115200);
 
 	/* initialize IRDA UART to be used for old-school console code.
 	 * note: IRDA uart only accessible on C115 and C117 PCB */
-	uart_init(CONS_UART_NR, with_irq);
-	uart_baudrate(CONS_UART_NR, UART_115200);
+	uart_init(UART_IRDA, with_irq);
+	uart_baudrate(UART_IRDA, UART_115200);
 
 	/* Initialize hardware timers */
 	hwtimer_init();
diff --git a/src/target/firmware/board/compal_e88/init.c b/src/target/firmware/board/compal_e88/init.c
index 12ead876..21a23a16 100755
--- a/src/target/firmware/board/compal_e88/init.c
+++ b/src/target/firmware/board/compal_e88/init.c
@@ -103,14 +103,17 @@ void board_init(int with_irq)
 	if (with_irq)
 		irq_init();
 
-	/* initialize MODEM UART to be used for sercomm*/
-	uart_init(SERCOMM_UART_NR, with_irq);
-	uart_baudrate(SERCOMM_UART_NR, UART_115200);
+	sercomm_bind_uart(UART_MODEM);
+	cons_bind_uart(UART_IRDA);
+
+	/* initialize MODEM UART to be used for sercomm */
+	uart_init(UART_MODEM, with_irq);
+	uart_baudrate(UART_MODEM, UART_115200);
 
 	/* Initialize IRDA UART to be used for old-school console code.
 	 * note: IRDA uart only accessible on C115 and C117 PCB */
-	uart_init(CONS_UART_NR, with_irq);
-	uart_baudrate(CONS_UART_NR, UART_115200);
+	uart_init(UART_IRDA, with_irq);
+	uart_baudrate(UART_IRDA, UART_115200);
 
 	/* Initialize hardware timers */
 	hwtimer_init();
diff --git a/src/target/firmware/board/compal_e99/init.c b/src/target/firmware/board/compal_e99/init.c
index 8dab47c1..cb8d3217 100644
--- a/src/target/firmware/board/compal_e99/init.c
+++ b/src/target/firmware/board/compal_e99/init.c
@@ -108,14 +108,17 @@ void board_init(int with_irq)
 	if (with_irq)
 		irq_init();
 
-	/* initialize MODEM UART to be used for sercomm*/
-	uart_init(SERCOMM_UART_NR, with_irq);
-	uart_baudrate(SERCOMM_UART_NR, UART_115200);
+	sercomm_bind_uart(UART_MODEM);
+	cons_bind_uart(UART_IRDA);
+
+	/* initialize MODEM UART to be used for sercomm */
+	uart_init(UART_MODEM, with_irq);
+	uart_baudrate(UART_MODEM, UART_115200);
 
 	/* initialize IRDA UART to be used for old-school console code.
 	 * note: IRDA uart only accessible on C115 and C117 PCB */
-	uart_init(CONS_UART_NR, with_irq);
-	uart_baudrate(CONS_UART_NR, UART_115200);
+	uart_init(UART_IRDA, with_irq);
+	uart_baudrate(UART_IRDA, UART_115200);
 
 	/* Initialize hardware timers */
 	hwtimer_init();
diff --git a/src/target/firmware/board/gta0x/init.c b/src/target/firmware/board/gta0x/init.c
index ef75e7df..8b907e3c 100644
--- a/src/target/firmware/board/gta0x/init.c
+++ b/src/target/firmware/board/gta0x/init.c
@@ -101,14 +101,17 @@ void board_init(int with_irq)
 	if (with_irq)
 		irq_init();
 
-	/* initialize MODEM UART to be used for sercomm*/
-	uart_init(SERCOMM_UART_NR, with_irq);
-	uart_baudrate(SERCOMM_UART_NR, UART_115200);
+	sercomm_bind_uart(UART_MODEM);
+	cons_bind_uart(UART_IRDA);
+
+	/* initialize MODEM UART to be used for sercomm */
+	uart_init(UART_MODEM, with_irq);
+	uart_baudrate(UART_MODEM, UART_115200);
 
 	/* Initialize IRDA UART to be used for old-school console code.
 	 * note: IRDA uart only accessible on C115 and C117 PCB */
-	uart_init(CONS_UART_NR, with_irq);
-	uart_baudrate(CONS_UART_NR, UART_115200);
+	uart_init(UART_IRDA, with_irq);
+	uart_baudrate(UART_IRDA, UART_115200);
 
 	/* Initialize hardware timers */
 	hwtimer_init();
diff --git a/src/target/firmware/board/mediatek/uart.c b/src/target/firmware/board/mediatek/uart.c
index 8e86b204..f9e3283b 100644
--- a/src/target/firmware/board/mediatek/uart.c
+++ b/src/target/firmware/board/mediatek/uart.c
@@ -191,7 +191,7 @@ static uint8_t uart_reg_read(int uart, enum uart_reg reg)
 
 static void uart_irq_handler_cons(__unused int irqnr)
 {
-	const uint8_t uart = CONS_UART_NR;
+	const uint8_t uart = cons_get_uart();
 	uint8_t iir;
 
 	//uart_putchar_nb(uart, 'U');
@@ -224,7 +224,7 @@ static void uart_irq_handler_cons(__unused int irqnr)
 
 static void uart_irq_handler_sercomm(__unused int irqnr)
 {
-	const uint8_t uart = SERCOMM_UART_NR;
+	const uint8_t uart = sercomm_get_uart();
 	uint8_t iir, ch;
 
 	//uart_putchar_nb(uart, 'U');
@@ -274,11 +274,13 @@ void uart_init(uint8_t uart, __unused uint8_t interrupts)
 	/* no interrupts, only polling so far */
 
 	uart_reg_write(uart, IER, 0x00);
-	if (uart == CONS_UART_NR) {
+	if (uart == cons_get_uart()) {
 		cons_init();
-	} else {
+	} else if (uart == sercomm_get_uart()) {
 		sercomm_init();
 		uart_irq_enable(uart, UART_IRQ_RX_CHAR, 1);
+	} else {
+		return;
 	}
 
 	uart_reg_write(uart, AUTOBAUD_EN, 0x00); /* disable AUTOBAUD */
@@ -301,7 +303,7 @@ void uart_init(uint8_t uart, __unused uint8_t interrupts)
 }
 
 void uart_poll(uint8_t uart) {
-	if(uart == CONS_UART_NR) {
+	if(uart == cons_get_uart()) {
 		uart_irq_handler_cons(0);
 	} else {
 		uart_irq_handler_sercomm(0);
diff --git a/src/target/firmware/board/mt62xx/init.c b/src/target/firmware/board/mt62xx/init.c
index e3daa37d..dae38cf4 100644
--- a/src/target/firmware/board/mt62xx/init.c
+++ b/src/target/firmware/board/mt62xx/init.c
@@ -133,7 +133,9 @@ void board_init(int with_irq)
 	pll_init();
 	memory_init();
 
-	/* Initialize UART without interrupts */
-	uart_init(SERCOMM_UART_NR, with_irq);
-	uart_baudrate(SERCOMM_UART_NR, UART_115200);
+	/* Initialize UART */
+	sercomm_bind_uart(UART_MODEM);
+	cons_bind_uart(UART_IRDA);
+	uart_init(UART_MODEM, with_irq);
+	uart_baudrate(UART_MODEM, UART_115200);
 }
diff --git a/src/target/firmware/board/pirelli_dpl10/init.c b/src/target/firmware/board/pirelli_dpl10/init.c
index 629e2273..d822b80c 100644
--- a/src/target/firmware/board/pirelli_dpl10/init.c
+++ b/src/target/firmware/board/pirelli_dpl10/init.c
@@ -112,14 +112,16 @@ void board_init(int with_irq)
 	if (with_irq)
 		irq_init();
 
-	/* initialize MODEM UART to be used for sercomm*/
-	uart_init(SERCOMM_UART_NR, with_irq);
-	uart_baudrate(SERCOMM_UART_NR, UART_115200);
-
-	/* Initialize IRDA UART to be used for old-school console code.
-	 * note: IRDA uart only accessible on C115 and C117 PCB */
-	uart_init(CONS_UART_NR, with_irq);
-	uart_baudrate(CONS_UART_NR, UART_115200);
+	sercomm_bind_uart(UART_IRDA);
+	cons_bind_uart(UART_MODEM);
+
+	/* initialize IRDA UART to be used for sercomm */
+	uart_init(UART_IRDA, with_irq);
+	uart_baudrate(UART_IRDA, UART_115200);
+
+	/* Initialize MODEM UART to be used for old-school console code. */
+	uart_init(UART_MODEM, with_irq);
+	uart_baudrate(UART_MODEM, UART_115200);
 
 	/* Initialize hardware timers */
 	hwtimer_init();
diff --git a/src/target/firmware/board/se_j100/init.c b/src/target/firmware/board/se_j100/init.c
index 284ff726..402684b0 100644
--- a/src/target/firmware/board/se_j100/init.c
+++ b/src/target/firmware/board/se_j100/init.c
@@ -108,14 +108,17 @@ void board_init(int with_irq)
 	if (with_irq)
 		irq_init();
 
-	/* initialize MODEM UART to be used for sercomm*/
-	uart_init(SERCOMM_UART_NR, with_irq);
-	uart_baudrate(SERCOMM_UART_NR, UART_115200);
+	sercomm_bind_uart(UART_MODEM);
+	cons_bind_uart(UART_IRDA);
+
+	/* initialize MODEM UART to be used for sercomm */
+	uart_init(UART_MODEM, with_irq);
+	uart_baudrate(UART_MODEM, UART_115200);
 
 	/* initialize IRDA UART to be used for old-school console code.
 	 * note: IRDA uart only accessible on C115 and C117 PCB */
-	uart_init(CONS_UART_NR, with_irq);
-	uart_baudrate(CONS_UART_NR, UART_115200);
+	uart_init(UART_IRDA, with_irq);
+	uart_baudrate(UART_IRDA, UART_115200);
 
 	/* Initialize hardware timers */
 	hwtimer_init();