UART refactoring

diff --git a/modules/neuron_spi/src/unipi_common.h b/modules/neuron_spi/src/unipi_common.h
index 1b6fe16e4f777dc07ebef85ca2753b0b7bfb3f98..f7646a3df72baa21f564c275c53e58ac2c9c241d 100644 (file)
--- a/modules/neuron_spi/src/unipi_common.h
+++ b/modules/neuron_spi/src/unipi_common.h
@@ -124,6 +124,7 @@ struct neuronspi_port
        u8                                                      dev_port;
        u8                                                      parmrk_enabled;
        u64                                                     parmrk_frame_delay;
+       s32                                                     baud;
 };
 
 struct neuronspi_uart_data

diff --git a/modules/neuron_spi/src/unipi_spi.c b/modules/neuron_spi/src/unipi_spi.c
index ef7b033cbabe44b69d3e4d1d7d3f5d94a3d1c019..d58c5c42036ef91e34af2282f220876a63f29d5a 100644 (file)
--- a/modules/neuron_spi/src/unipi_spi.c
+++ b/modules/neuron_spi/src/unipi_spi.c
@@ -494,7 +494,6 @@ void neuronspi_spi_iio_sec_ai_read_current(struct iio_dev *indio_dev, struct iio
        }
 }
 
-
 void neuronspi_spi_iio_sec_ai_read_resistance(struct iio_dev *indio_dev, struct iio_chan_spec const *ch, int *val, int *val2, long mask)
 {
        struct neuronspi_sec_ai_data *ai_data = iio_priv(indio_dev);
@@ -517,7 +516,6 @@ void neuronspi_spi_iio_sec_ai_read_resistance(struct iio_dev *indio_dev, struct
        }
 }
 
-
 void neuronspi_spi_iio_sec_ao_set_voltage(struct iio_dev *indio_dev, struct iio_chan_spec const *chan, int val, int val2, long mask)
 {
        struct neuronspi_sec_ao_data *ao_data = iio_priv(indio_dev);
@@ -528,7 +526,6 @@ void neuronspi_spi_iio_sec_ao_set_voltage(struct iio_dev *indio_dev, struct iio_
        regmap_write(n_spi->reg_map, n_spi->regstart_table->stm_ao_val_reg + ao_data->index, sec_true_val);
 }
 
-
 /*
  * NOTE: This function uses 64-bit fixed-point arithmetic,
  * which necessitates using the do_div macro to avoid unnecessary long/long division.
@@ -559,7 +556,6 @@ void neuronspi_spi_iio_stm_ai_read_voltage(struct iio_dev *iio_dev, struct iio_c
        stm_true_val += stm_v_off;
        do_div(stm_true_val, 10000);
        *val = stm_true_val;
-
 }
 
 void neuronspi_spi_iio_stm_ai_read_current(struct iio_dev *indio_dev, struct iio_chan_spec const *ch, int *val, int *val2, long mask)

diff --git a/modules/neuron_spi/src/unipi_uart.c b/modules/neuron_spi/src/unipi_uart.c
index 92d8b1777bfb04973ee245447f17c0bb4f80f8a9..ed549f03a27f7cf681749d5b06283253a3469e02 100644 (file)
--- a/modules/neuron_spi/src/unipi_uart.c
+++ b/modules/neuron_spi/src/unipi_uart.c
@@ -61,17 +61,29 @@ u32 neuronspi_uart_get_mctrl(struct uart_port *port)
 
 int    neuronspi_uart_ioctl (struct uart_port *port, unsigned int ioctl_code, unsigned long ioctl_arg)
 {
+       u8 *inp_buf, *outp_buf;
+       int write_length;
+       struct neuronspi_port *n_port;
+       struct spi_device *spi;
+       struct neuronspi_driver_data *n_spi;
+       n_port = to_neuronspi_port(port, port);
+       spi = neuronspi_s_dev[n_port->dev_index];
+       n_spi = spi_get_drvdata(spi);
        switch (ioctl_code) {
        case TIOCSETD: {
-               printk(KERN_INFO "NEURONSPI: IOCTL TIOCSETD\n");
+               printk(KERN_INFO "NEURONSPI: IOCTL TIOCSETD (processed via set_termios)\n");
                return 1;
        }
        case 0x5480: {
                printk(KERN_INFO "NEURONSPI: IOCTL 0x5480\n");
+               write_length = neuronspi_spi_compose_single_register_write(NEURONSPI_UART_TIMEOUT_REGISTER, &inp_buf, &outp_buf, (ioctl_arg * 1000000) / n_port->baud);
+               neuronspi_spi_send_message(spi, inp_buf, outp_buf, write_length, n_spi->ideal_frequency, 25, 1);
                return 1;
        }
        case 0x5481: {
                printk(KERN_INFO "NEURONSPI: IOCTL 0x5481\n");
+               write_length = neuronspi_spi_compose_single_register_write(NEURONSPI_UART_TIMEOUT_REGISTER, &inp_buf, &outp_buf, ioctl_arg);
+               neuronspi_spi_send_message(spi, inp_buf, outp_buf, write_length, n_spi->ideal_frequency, 25, 1);
                return 1;
        }
        default: {
@@ -82,23 +94,36 @@ int neuronspi_uart_ioctl (struct uart_port *port, unsigned int ioctl_code, unsig
 
 void neuronspi_uart_set_parmrk(struct uart_port *port, int to)
 {
+       u8 *inp_buf, *outp_buf;
+       int write_length;
        struct neuronspi_port *n_port;
+       struct spi_device *spi;
+       struct neuronspi_driver_data *n_spi;
        n_port = to_neuronspi_port(port, port);
+       spi = neuronspi_s_dev[n_port->dev_index];
+       n_spi = spi_get_drvdata(spi);
+       printk(KERN_INFO "NEURONSPI: SET PARMRK to %d\n", to);
+       write_length = neuronspi_spi_compose_single_register_write(NEURONSPI_UART_IFLAGS_REGISTER, &inp_buf, &outp_buf, to);
+       neuronspi_spi_send_message(spi, inp_buf, outp_buf, write_length, n_spi->ideal_frequency, 25, 1);
 }
 
 void neuronspi_uart_set_ldisc(struct uart_port *port, struct ktermios *kterm)
 {
+       u8 *inp_buf, *outp_buf;
+       int write_length;
        struct neuronspi_port *n_port;
+       struct spi_device *spi;
+       struct neuronspi_driver_data *n_spi;
        n_port = to_neuronspi_port(port, port);
-       if (kterm->c_line == N_PROFIBUS_FDL) {
-               printk(KERN_INFO "NEURONSPI: PROFIBUS discipline set/n");
-       }
-       return;
+       spi = neuronspi_s_dev[n_port->dev_index];
+       n_spi = spi_get_drvdata(spi);
+       printk(KERN_INFO "NEURONSPI: PROFIBUS discipline set\n");
+       write_length = neuronspi_spi_compose_single_register_write(NEURONSPI_UART_LDISC_REGISTER, &inp_buf, &outp_buf, kterm->c_line);
+       neuronspi_spi_send_message(spi, inp_buf, outp_buf, write_length, n_spi->ideal_frequency, 25, 1);
 }
 
 void neuronspi_uart_set_termios(struct uart_port *port, struct ktermios *termios, struct ktermios *old)
 {
-       s32 baud;
        struct neuronspi_port *n_port;
        n_port = to_neuronspi_port(port, port);
        if (old && old->c_iflag && old->c_iflag != termios->c_iflag) {
@@ -110,7 +135,7 @@ void neuronspi_uart_set_termios(struct uart_port *port, struct ktermios *termios
        neuronspi_spi_uart_set_cflag(neuronspi_s_dev[n_port->dev_index], n_port->dev_port, termios->c_cflag);
        if (old && termios && (old->c_iflag & PARMRK) != (termios->c_iflag & PARMRK)) {
                if (termios->c_iflag & PARMRK) {
-                       neuronspi_uart_set_parmrk(port, 1);             // TODO: Re-enable line discipline once finished
+                       neuronspi_uart_set_parmrk(port, 1);
                } else {
                        neuronspi_uart_set_parmrk(port, 0);
                }
@@ -121,8 +146,8 @@ void neuronspi_uart_set_termios(struct uart_port *port, struct ktermios *termios
                        neuronspi_uart_set_ldisc(port, termios);
                }
        }
-       baud = uart_get_baud_rate(port, termios, old, 2400, 115200);
-       uart_update_timeout(port, termios->c_cflag, baud);
+       n_port->baud = uart_get_baud_rate(port, termios, old, 2400, 115200);
+       uart_update_timeout(port, termios->c_cflag, n_port->baud);
 }
 
 s32 neuronspi_uart_config_rs485(struct uart_port *port, struct serial_rs485 *rs485)
@@ -131,8 +156,6 @@ s32 neuronspi_uart_config_rs485(struct uart_port *port, struct serial_rs485 *rs4
        return 0;
 }
 
-
-
 const char* neuronspi_uart_type(struct uart_port *port)
 {
        return port->type == PORT_NEURONSPI ? "NEURONSPI_NAME" : NULL;
@@ -182,7 +205,6 @@ s32 neuronspi_uart_alloc_line(void)
        return i;
 }
 
-
 void neuronspi_uart_handle_rx(struct neuronspi_port *port, u32 rxlen, u32 iir)
 {
        u32 ch, flag, bytes_read, i;
@@ -232,7 +254,6 @@ void neuronspi_uart_handle_tx(struct neuronspi_port *port)
                return;
        }
 
-
        /* Get length of data pending in circular buffer */
        to_send = uart_circ_chars_pending(xmit);
        if (likely(to_send)) {
@@ -252,9 +273,9 @@ void neuronspi_uart_handle_tx(struct neuronspi_port *port)
                neuronspi_uart_fifo_write(port, to_send);
        }
 
-
-       if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
+       if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) {
                uart_write_wakeup(&port->port);
+       }
 }
 
 void neuronspi_uart_handle_irq(struct neuronspi_uart_data *uart_data, u32 portno)
@@ -277,8 +298,9 @@ void neuronspi_uart_ist(struct kthread_work *ws)
 
 void neuronspi_uart_config_port(struct uart_port *port, int flags)
 {
-       if (flags & UART_CONFIG_TYPE)
+       if (flags & UART_CONFIG_TYPE) {
                port->type = PORT_NEURONSPI;
+       }
 }
 
 s32 neuronspi_uart_verify_port(struct uart_port *port,

diff --git a/modules/neuron_spi/src/unipi_uart.h b/modules/neuron_spi/src/unipi_uart.h
index f8bfb251d2d32da96746698182335c3b063ab79d..81a702dd1389a549c0bfb3025b7e4e568e8215da 100644 (file)
--- a/modules/neuron_spi/src/unipi_uart.h
+++ b/modules/neuron_spi/src/unipi_uart.h
@@ -46,7 +46,13 @@
 #include "unipi_common.h"
 #include "unipi_platform.h"
 
+/***************
+ * Definitions *
+ ***************/
 
+#define NEURONSPI_UART_IFLAGS_REGISTER         502
+#define NEURONSPI_UART_LDISC_REGISTER  503
+#define NEURONSPI_UART_TIMEOUT_REGISTER 504
 
 /*************************
  * Function Declarations *