From: Grigori Goronzy <greg@chown.ath.cx>
To: Johan Hovold <johan@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
Grigori Goronzy <greg@chown.ath.cx>
Subject: [PATCH v2 14/14] USB: ch341: implement tx_empty callback
Date: Sat, 2 Apr 2016 19:07:23 +0200 [thread overview]
Message-ID: <1459616843-23829-15-git-send-email-greg@chown.ath.cx> (raw)
In-Reply-To: <1459616843-23829-1-git-send-email-greg@chown.ath.cx>
The status bit was found with USB captures of the Windows driver and
some luck. Tested on CH340G and CH341A.
Signed-off-by: Grigori Goronzy <greg@chown.ath.cx>
---
drivers/usb/serial/ch341.c | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c
index 6981e2ad..adf7d79 100644
--- a/drivers/usb/serial/ch341.c
+++ b/drivers/usb/serial/ch341.c
@@ -82,6 +82,8 @@
#define CH341_LCR_CS6 0x01
#define CH341_LCR_CS5 0x00
+#define CH341_STATUS_TXBUSY 0x01
+
static const struct usb_device_id id_table[] = {
{ USB_DEVICE(0x4348, 0x5523) },
{ USB_DEVICE(0x1a86, 0x7523) },
@@ -95,6 +97,7 @@ struct ch341_private {
unsigned baud_rate; /* set baud rate */
u8 line_control; /* set line control value RTS/DTR */
u8 line_status; /* active status of modem control inputs */
+ u8 uart_status; /* generic UART status bits */
};
static void ch341_set_termios(struct tty_struct *tty,
@@ -187,7 +190,8 @@ static int ch341_get_status(struct usb_device *dev, struct ch341_private *priv)
if (r == 2) {
r = 0;
spin_lock_irqsave(&priv->lock, flags);
- priv->line_status = (~(*buffer)) & CH341_BITS_MODEM_STAT;
+ priv->line_status = (~buffer[0]) & CH341_BITS_MODEM_STAT;
+ priv->uart_status = buffer[1];
spin_unlock_irqrestore(&priv->lock, flags);
} else {
r = -EPROTO;
@@ -198,6 +202,18 @@ out:
return r;
}
+static bool ch341_tx_empty(struct usb_serial_port *port)
+{
+ int r;
+ struct ch341_private *priv = usb_get_serial_port_data(port);
+
+ r = ch341_get_status(port->serial->dev, priv);
+ if (r < 0)
+ return true;
+
+ return !(priv->uart_status & CH341_STATUS_TXBUSY);
+}
+
/* -------------------------------------------------------------------------- */
static int ch341_configure(struct usb_device *dev, struct ch341_private *priv)
@@ -606,6 +622,7 @@ static struct usb_serial_driver ch341_device = {
.carrier_raised = ch341_carrier_raised,
.close = ch341_close,
.set_termios = ch341_set_termios,
+ .tx_empty = ch341_tx_empty,
.break_ctl = ch341_break_ctl,
.tiocmget = ch341_tiocmget,
.tiocmset = ch341_tiocmset,
--
1.9.1
next prev parent reply other threads:[~2016-04-02 17:17 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-02 17:07 Major improvements to the ch341 driver Grigori Goronzy
2016-04-02 17:07 ` [PATCH v2 01/14] USB: ch341: improve documentation Grigori Goronzy
2016-04-06 11:58 ` One Thousand Gnomes
2016-04-02 17:07 ` [PATCH v2 02/14] USB: ch341: fix error handling on resume Grigori Goronzy
2016-04-02 17:07 ` [PATCH v2 03/14] USB: ch341: add LCR register definitions Grigori Goronzy
2016-04-02 17:07 ` [PATCH v2 04/14] USB: ch341: add definitions for modem control Grigori Goronzy
2016-04-02 17:07 ` [PATCH v2 05/14] USB: ch341: fix USB buffer allocations Grigori Goronzy
2016-04-04 7:13 ` Oliver Neukum
2016-04-02 17:07 ` [PATCH v2 06/14] USB: ch341: reinitialize chip on reconfiguration Grigori Goronzy
2016-04-10 13:24 ` Clemens Ladisch
2016-04-02 17:07 ` [PATCH v2 07/14] USB: ch341: add support for parity, frame length, stop bits Grigori Goronzy
2016-04-03 15:58 ` Karl Palsson
2016-04-06 11:59 ` One Thousand Gnomes
2016-04-02 17:07 ` [PATCH v2 08/14] USB: ch341: add debug output for chip version Grigori Goronzy
2016-04-02 17:07 ` [PATCH v2 09/14] USB: ch341: add support for RTS/CTS flow control Grigori Goronzy
2016-04-02 17:07 ` [PATCH v2 10/14] USB: ch341: fix coding style Grigori Goronzy
2016-04-02 17:29 ` Joe Perches
2016-04-06 17:58 ` Grigori Goronzy
2016-04-06 18:10 ` Johan Hovold
2016-04-07 1:11 ` Grigori Goronzy
2016-04-02 17:07 ` [PATCH v2 11/14] USB: ch341: clean up messages Grigori Goronzy
2016-04-02 17:07 ` [PATCH v2 12/14] USB: ch341: improve B0 handling Grigori Goronzy
2016-04-02 17:07 ` [PATCH v2 13/14] USB: ch341: get rid of default configuration Grigori Goronzy
2016-04-02 17:07 ` Grigori Goronzy [this message]
2016-04-03 16:03 ` [PATCH v2 14/14] USB: ch341: implement tx_empty callback Karl Palsson
2016-04-06 18:03 ` Grigori Goronzy
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=1459616843-23829-15-git-send-email-greg@chown.ath.cx \
--to=greg@chown.ath.cx \
--cc=gregkh@linuxfoundation.org \
--cc=johan@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®