From 38aa9e8fe624fd1be33a8aa7091db24ecc672609 Mon Sep 17 00:00:00 2001 From: Srinivas Kandagatla Date: Fri, 11 Dec 2015 16:28:18 +0000 Subject: [PATCH] uart.c: make use of no_bus_mux flag This patch makes use of no_bus_mux flag in mraa_board_t to skip unnessary mux checks. Signed-off-by: Srinivas Kandagatla Signed-off-by: Brendan Le Foll --- src/uart/uart.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/src/uart/uart.c b/src/uart/uart.c index 5fc0cc1..499af93 100644 --- a/src/uart/uart.c +++ b/src/uart/uart.c @@ -152,22 +152,24 @@ mraa_uart_init(int index) return NULL; } - int pos = plat->uart_dev[index].rx; - if (pos >= 0) { - if (plat->pins[pos].uart.mux_total > 0) { - if (mraa_setup_mux_mapped(plat->pins[pos].uart) != MRAA_SUCCESS) { - syslog(LOG_ERR, "uart: failed to setup muxes for RX pin"); - return NULL; + if (!plat->no_bus_mux) { + int pos = plat->uart_dev[index].rx; + if (pos >= 0) { + if (plat->pins[pos].uart.mux_total > 0) { + if (mraa_setup_mux_mapped(plat->pins[pos].uart) != MRAA_SUCCESS) { + syslog(LOG_ERR, "uart: failed to setup muxes for RX pin"); + return NULL; + } } } - } - pos = plat->uart_dev[index].tx; - if (pos >= 0) { - if (plat->pins[pos].uart.mux_total > 0) { - if (mraa_setup_mux_mapped(plat->pins[pos].uart) != MRAA_SUCCESS) { - syslog(LOG_ERR, "uart: failed to setup muxes for TX pin"); - return NULL; + pos = plat->uart_dev[index].tx; + if (pos >= 0) { + if (plat->pins[pos].uart.mux_total > 0) { + if (mraa_setup_mux_mapped(plat->pins[pos].uart) != MRAA_SUCCESS) { + syslog(LOG_ERR, "uart: failed to setup muxes for TX pin"); + return NULL; + } } } } -- 2.7.4