Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88850789 authored by Peter Hung's avatar Peter Hung Committed by Johan Hovold
Browse files

USB: f81232: implement RX bulk-in EP 



The F81232 bulk-in is RX data + LSR channel, data format is
[LSR+Data][LSR+Data]..... , We had implemented in f81232_process_read_urb().

Signed-off-by: default avatarPeter Hung <hpeter+linux_kernel@gmail.com>
[johan: reword comment in process_read_urb ]
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parent b830d07d

drivers/usb/serial/f81232.c

+41 −34
Original line number Original line Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/uaccess.h>

#include <linux/uaccess.h>

#include <linux/usb.h>

#include <linux/usb.h>

#include <linux/usb/serial.h>

#include <linux/usb/serial.h>

#include <linux/serial_reg.h>





static const struct usb_device_id id_table[] = {

static const struct usb_device_id id_table[] = {

	{ USB_DEVICE(0x1934, 0x0706) },

	{ USB_DEVICE(0x1934, 0x0706) },
@@ -104,44 +105,50 @@ static void f81232_read_int_callback(struct urb *urb) 
static void f81232_process_read_urb(struct urb *urb)

static void f81232_process_read_urb(struct urb *urb)

{

{

	struct usb_serial_port *port = urb->context;

	struct usb_serial_port *port = urb->context;

	struct f81232_private *priv = usb_get_serial_port_data(port);

	unsigned char *data = urb->transfer_buffer;

	unsigned char *data = urb->transfer_buffer;

	char tty_flag = TTY_NORMAL;

	char tty_flag;

	unsigned long flags;

	unsigned int i;

	u8 line_status;

	u8 lsr;

	int i;





	/* update line status */

	/*

	spin_lock_irqsave(&priv->lock, flags);

	 * When opening the port we get a 1-byte packet with the current LSR,

	line_status = priv->modem_status;

	 * which we discard.

	priv->modem_status &= ~UART_STATE_TRANSIENT_MASK;

	 */

	spin_unlock_irqrestore(&priv->lock, flags);

	if ((urb->actual_length < 2) || (urb->actual_length % 2))



	if (!urb->actual_length)

		return;

		return;





	/* break takes precedence over parity, */

	/* bulk-in data: [LSR(1Byte)+DATA(1Byte)][LSR(1Byte)+DATA(1Byte)]... */

	/* which takes precedence over framing errors */



	if (line_status & UART_BREAK_ERROR)

	for (i = 0; i < urb->actual_length; i += 2) {

		tty_flag = TTY_NORMAL;

		lsr = data[i];



		if (lsr & UART_LSR_BRK_ERROR_BITS) {

			if (lsr & UART_LSR_BI) {

				tty_flag = TTY_BREAK;

				tty_flag = TTY_BREAK;

	else if (line_status & UART_PARITY_ERROR)

				port->icount.brk++;

				usb_serial_handle_break(port);

			} else if (lsr & UART_LSR_PE) {

				tty_flag = TTY_PARITY;

				tty_flag = TTY_PARITY;

	else if (line_status & UART_FRAME_ERROR)

				port->icount.parity++;

			} else if (lsr & UART_LSR_FE) {

				tty_flag = TTY_FRAME;

				tty_flag = TTY_FRAME;

	dev_dbg(&port->dev, "%s - tty_flag = %d\n", __func__, tty_flag);

				port->icount.frame++;

			}





	/* overrun is special, not associated with a char */

			if (lsr & UART_LSR_OE) {

	if (line_status & UART_OVERRUN_ERROR)

				port->icount.overrun++;

		tty_insert_flip_char(&port->port, 0, TTY_OVERRUN);

				tty_insert_flip_char(&port->port, 0,

						TTY_OVERRUN);

			}

		}





		if (port->port.console && port->sysrq) {

		if (port->port.console && port->sysrq) {

		for (i = 0; i < urb->actual_length; ++i)

			if (usb_serial_handle_sysrq_char(port, data[i + 1]))

			if (!usb_serial_handle_sysrq_char(port, data[i]))

				continue;

				tty_insert_flip_char(&port->port, data[i],

		}

						tty_flag);



	} else {

		tty_insert_flip_char(&port->port, data[i + 1], tty_flag);

		tty_insert_flip_string_fixed_flag(&port->port, data, tty_flag,

							urb->actual_length);

	}

	}





	tty_flip_buffer_push(&port->port);

	tty_flip_buffer_push(&port->port);