From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759692AbbA3GPT (ORCPT ); Fri, 30 Jan 2015 01:15:19 -0500 Received: from mail-pa0-f49.google.com ([209.85.220.49]:50881 "EHLO mail-pa0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755530AbbA3GNw (ORCPT ); Fri, 30 Jan 2015 01:13:52 -0500 From: Peter Hung X-Google-Original-From: Peter Hung 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, Peter Hung Subject: [PATCH v4 4/7] usb: serial: reimplement RX bulk-in ep for F81232 Date: Fri, 30 Jan 2015 14:13:38 +0800 Message-Id: <1422598421-6236-4-git-send-email-hpeter+linux_kernel@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1422598421-6236-1-git-send-email-hpeter+linux_kernel@gmail.com> References: <1422598421-6236-1-git-send-email-hpeter+linux_kernel@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The F81232 bulk-in is RX data channel. Data format is [LSR+Data][LSR+Data]..... , We had reimplemented in this patch. Signed-off-by: Peter Hung --- drivers/usb/serial/f81232.c | 47 +++++++++++++++------------------------------ 1 file changed, 15 insertions(+), 32 deletions(-) diff --git a/drivers/usb/serial/f81232.c b/drivers/usb/serial/f81232.c index 274120d..12e1ae4 100644 --- a/drivers/usb/serial/f81232.c +++ b/drivers/usb/serial/f81232.c @@ -194,47 +194,30 @@ 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; + u8 line_status = 0; int i; - /* update line status */ - spin_lock_irqsave(&priv->lock, flags); - line_status = priv->line_status; - priv->line_status &= ~UART_STATE_TRANSIENT_MASK; - spin_unlock_irqrestore(&priv->lock, flags); - if (!urb->actual_length) 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)]... */ + + if (urb->actual_length >= 2) { + + for (i = 0 ; i < urb->actual_length ; i += 2) { + line_status |= data[i+0]; + tty_insert_flip_string_fixed_flag(&port->port, + &data[i+1], tty_flag, 1); + } + + if (unlikely(line_status & UART_LSR_OE)) + tty_insert_flip_char(&port->port, 0, TTY_OVERRUN); + + tty_flip_buffer_push(&port->port); } - tty_flip_buffer_push(&port->port); } static int set_control_lines(struct usb_device *dev, u8 value) -- 1.9.1