Restored functions with incompatible signature to the null function

diff --git a/modules/unipi/src/unipi_uart.c b/modules/unipi/src/unipi_uart.c
index 8069f574b8cf523c566e386c9a69657f7f3cfc15..c2db95e25e467584928105969dbda8e3dc7a2edf 100644 (file)
--- a/modules/unipi/src/unipi_uart.c
+++ b/modules/unipi/src/unipi_uart.c
@@ -633,6 +633,14 @@ void neuronspi_uart_power(struct uart_port *port, s32 on)
 {
     /* Do nothing */
 }
+void neuronspi_uart_set_mctrl(struct uart_port *port, u32 mctrl)
+{
+    /* Do nothing */
+}
+void neuronspi_uart_break_ctl(struct uart_port *port, int break_state)
+{
+    /* Do nothing */
+}
 void neuronspi_uart_null_void(struct uart_port *port)
 {
        /* Do nothing */

diff --git a/modules/unipi/src/unipi_uart.h b/modules/unipi/src/unipi_uart.h
index 38d7fd6d8cab1ca6e3a005c76baea57d67c1aa8f..a03cb4b103dafefd8208ce5d866671c0d34cd4a3 100644 (file)
--- a/modules/unipi/src/unipi_uart.h
+++ b/modules/unipi/src/unipi_uart.h
@@ -39,6 +39,8 @@
 void neuronspi_uart_start_tx(struct uart_port *port);
 void neuronspi_uart_set_termios(struct uart_port *port, struct ktermios *termios, struct ktermios *old);
 u32 neuronspi_uart_tx_empty(struct uart_port *port);
+void neuronspi_uart_break_ctl(struct uart_port *port, int break_state);
+void neuronspi_uart_set_mctrl(struct uart_port *port, u32 mctrl);
 void neuronspi_uart_shutdown(struct uart_port *port);
 s32 neuronspi_uart_startup(struct uart_port *port);
 s32 neuronspi_uart_request_port(struct uart_port *port);
@@ -78,12 +80,12 @@ extern struct uart_driver* neuronspi_uart;
 static const struct uart_ops neuronspi_uart_ops =
 {
        .tx_empty                       = neuronspi_uart_tx_empty,
-       .set_mctrl                      = neuronspi_uart_null_void,
+       .set_mctrl                      = neuronspi_uart_set_mctrl,
        .get_mctrl                      = neuronspi_uart_get_mctrl,
        .stop_tx                        = neuronspi_uart_null_void,
        .start_tx                       = neuronspi_uart_start_tx,
        .stop_rx                        = neuronspi_uart_null_void,
-       .break_ctl                      = neuronspi_uart_null_void,
+       .break_ctl                      = neuronspi_uart_break_ctl,
        .startup                        = neuronspi_uart_startup,
        .shutdown                       = neuronspi_uart_shutdown,
        .set_termios            = neuronspi_uart_set_termios,

diff --git a/version.txt b/version.txt
index f60607b6493fc273da397606a754d0d14cde919d..1c89c6b4aaa6e33790b50ddfbc5e483f4f689c5b 100644 (file)
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-Repository:neuron-kernel ActiveBranch:[uart_timeout] PrecedingRelease:v.0.12 PrecedingRevision:60(daa0535) LatestCommit:Wed Jun 27 14:11:20 CEST 2018
+Repository:neuron-kernel ActiveBranch:[uart_timeout] PrecedingRelease:v.0.12 PrecedingRevision:61(4d7f91f) LatestCommit:Wed Jun 27 14:17:00 CEST 2018