LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Peter Hung <hpeter@gmail.com>
To: johan@kernel.org
Cc: gregkh@linuxfoundation.org, linux-usb@vger.kernel.org,
	linux-kernel@vger.kernel.org, tom_tsai@fintek.com.tw,
	peter_hong@fintek.com.tw, hpeter@gmail.com,
	Peter Hung <hpeter+linux_kernel@gmail.com>
Subject: [PATCH V8 02/10] USB: f81232: implement RX bulk-in EP
Date: Thu, 26 Feb 2015 18:02:08 +0800	[thread overview]
Message-ID: <1424944936-7117-3-git-send-email-hpeter+linux_kernel@gmail.com> (raw)
In-Reply-To: <1424944936-7117-1-git-send-email-hpeter+linux_kernel@gmail.com>

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: Peter Hung <hpeter+linux_kernel@gmail.com>
---
 drivers/usb/serial/f81232.c | 71 +++++++++++++++++++++++----------------------
 1 file changed, 37 insertions(+), 34 deletions(-)

diff --git a/drivers/usb/serial/f81232.c b/drivers/usb/serial/f81232.c
index 669a2f2..25b1a47 100644
--- a/drivers/usb/serial/f81232.c
+++ b/drivers/usb/serial/f81232.c
@@ -23,6 +23,7 @@
 #include <linux/uaccess.h>
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
+#include <linux/serial_reg.h>
 
 static const struct usb_device_id id_table[] = {
 	{ USB_DEVICE(0x1934, 0x0706) },
@@ -104,44 +105,46 @@ exit:
 static void f81232_process_read_urb(struct urb *urb)
 {
 	struct usb_serial_port *port = urb->context;
-	struct f81232_private *priv = usb_get_serial_port_data(port);
 	unsigned char *data = urb->transfer_buffer;
-	char tty_flag = TTY_NORMAL;
-	unsigned long flags;
-	u8 line_status;
-	int i;
-
-	/* update line status */
-	spin_lock_irqsave(&priv->lock, flags);
-	line_status = priv->modem_status;
-	priv->modem_status &= ~UART_STATE_TRANSIENT_MASK;
-	spin_unlock_irqrestore(&priv->lock, flags);
+	char tty_flag;
+	unsigned int i;
+	u8 lsr;
 
-	if (!urb->actual_length)
+	if ((urb->actual_length < 2) || (urb->actual_length % 2))
 		return;
 
-	/* break takes precedence over parity, */
-	/* which takes precedence over framing errors */
-	if (line_status & UART_BREAK_ERROR)
-		tty_flag = TTY_BREAK;
-	else if (line_status & UART_PARITY_ERROR)
-		tty_flag = TTY_PARITY;
-	else if (line_status & UART_FRAME_ERROR)
-		tty_flag = TTY_FRAME;
-	dev_dbg(&port->dev, "%s - tty_flag = %d\n", __func__, tty_flag);
-
-	/* overrun is special, not associated with a char */
-	if (line_status & UART_OVERRUN_ERROR)
-		tty_insert_flip_char(&port->port, 0, TTY_OVERRUN);
-
-	if (port->port.console && port->sysrq) {
-		for (i = 0; i < urb->actual_length; ++i)
-			if (!usb_serial_handle_sysrq_char(port, data[i]))
-				tty_insert_flip_char(&port->port, data[i],
-						tty_flag);
-	} else {
-		tty_insert_flip_string_fixed_flag(&port->port, data, tty_flag,
-							urb->actual_length);
+	/* bulk-in data: [LSR(1Byte)+DATA(1Byte)][LSR(1Byte)+DATA(1Byte)]... */
+
+	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;
+				port->icount.brk++;
+				usb_serial_handle_break(port);
+			} else if (lsr & UART_LSR_PE) {
+				tty_flag = TTY_PARITY;
+				port->icount.parity++;
+			} else if (lsr & UART_LSR_FE) {
+				tty_flag = TTY_FRAME;
+				port->icount.frame++;
+			}
+
+			if (lsr & UART_LSR_OE) {
+				port->icount.overrun++;
+				tty_insert_flip_char(&port->port, 0,
+						TTY_OVERRUN);
+			}
+		}
+
+		if (port->port.console && port->sysrq) {
+			if (usb_serial_handle_sysrq_char(port, data[i + 1]))
+				continue;
+		}
+
+		tty_insert_flip_char(&port->port, data[i + 1], tty_flag);
 	}
 
 	tty_flip_buffer_push(&port->port);
-- 
1.9.1


  parent reply	other threads:[~2015-02-26 10:02 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-02-26 10:02 [PATCH V8 00/10] USB: f81232: V8 patches Peter Hung
2015-02-26 10:02 ` [PATCH V8 01/10] USB: f81232: rename private struct member name Peter Hung
2015-02-26 10:02 ` Peter Hung [this message]
2015-03-14 11:48   ` [PATCH V8 02/10] USB: f81232: implement RX bulk-in EP Johan Hovold
2015-03-16  2:53     ` Peter Hung
2015-03-16  8:52       ` Johan Hovold
2015-03-16  9:15         ` Peter Hung
2015-02-26 10:02 ` [PATCH V8 03/10] USB: f81232: change lock mechanism Peter Hung
2015-02-26 10:02 ` [PATCH V8 04/10] USB: f81232: implement read IIR/MSR with endpoint Peter Hung
2015-03-14 12:02   ` Johan Hovold
2015-03-16  3:08     ` Peter Hung
2015-03-16  8:55       ` Johan Hovold
2015-03-16  9:18         ` Peter Hung
2015-02-26 10:02 ` [PATCH V8 05/10] USB: f81232: implement MCR/MSR function Peter Hung
2015-03-14 12:09   ` Johan Hovold
2015-02-26 10:02 ` [PATCH V8 06/10] USB: f81232: implement port enable/disable method Peter Hung
2015-02-26 10:02 ` [PATCH V8 07/10] USB: f81232: implement set_termios() Peter Hung
2015-03-14 12:24   ` Johan Hovold
2015-02-26 10:02 ` [PATCH V8 08/10] USB: f81232: clarify f81232_ioctl() and fix Peter Hung
2015-03-14 12:27   ` Johan Hovold
2015-02-26 10:02 ` [PATCH V8 09/10] USB: f81232: cleanup non-used define Peter Hung
2015-02-26 10:02 ` [PATCH V8 10/10] USB: f81232: modify/add author Peter Hung
2015-03-05  5:59 ` [PATCH V8 00/10] USB: f81232: V8 patches Peter Hung
2015-03-05  7:03   ` Johan Hovold
2015-03-14 12:30     ` Johan Hovold

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1424944936-7117-3-git-send-email-hpeter+linux_kernel@gmail.com \
    --to=hpeter@gmail.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=hpeter+linux_kernel@gmail.com \
    --cc=johan@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=peter_hong@fintek.com.tw \
    --cc=tom_tsai@fintek.com.tw \
    --subject='Re: [PATCH V8 02/10] USB: f81232: implement RX bulk-in EP' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).