From 0318db19fa7ad19e495f4105892f9b77aae61b0d Mon Sep 17 00:00:00 2001 From: Tom Knot Date: Wed, 27 Jun 2018 14:16:59 +0200 Subject: [PATCH] Restored functions with incompatible signature to the null function --- modules/unipi/src/unipi_uart.c | 8 ++++++++ modules/unipi/src/unipi_uart.h | 6 ++++-- version.txt | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/modules/unipi/src/unipi_uart.c b/modules/unipi/src/unipi_uart.c index 8069f57..c2db95e 100644 --- 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 38d7fd6..a03cb4b 100644 --- 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 f60607b..1c89c6b 100644 --- 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 -- 2.34.1