From: Greg KH <greg@kroah.com>
To: linux-usb-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] More USB fixes for 2.5.68
Date: Thu, 24 Apr 2003 16:47:33 -0700 [thread overview]
Message-ID: <10512280531918@kroah.com> (raw)
In-Reply-To: <10512280533869@kroah.com>
ChangeSet 1.1165.2.16, 2003/04/23 17:48:28-07:00, greg@kroah.com
[PATCH] USB: mct_u232: add support for new tty tiocmget and tiocmset functions.
drivers/usb/serial/mct_u232.c | 82 ++++++++++++++++++++++--------------------
1 files changed, 43 insertions(+), 39 deletions(-)
diff -Nru a/drivers/usb/serial/mct_u232.c b/drivers/usb/serial/mct_u232.c
--- a/drivers/usb/serial/mct_u232.c Thu Apr 24 16:21:10 2003
+++ b/drivers/usb/serial/mct_u232.c Thu Apr 24 16:21:10 2003
@@ -125,7 +125,11 @@
unsigned long arg);
static void mct_u232_break_ctl (struct usb_serial_port *port,
int break_state );
-
+static int mct_u232_tiocmget (struct usb_serial_port *port,
+ struct file *file);
+static int mct_u232_tiocmset (struct usb_serial_port *port,
+ struct file *file, unsigned int set,
+ unsigned int clear);
/*
* All of the device info needed for the MCT USB-RS232 converter.
*/
@@ -165,6 +169,8 @@
.ioctl = mct_u232_ioctl,
.set_termios = mct_u232_set_termios,
.break_ctl = mct_u232_break_ctl,
+ .tiocmget = mct_u232_tiocmget,
+ .tiocmset = mct_u232_tiocmset,
.attach = mct_u232_startup,
.shutdown = mct_u232_shutdown,
};
@@ -773,57 +779,55 @@
} /* mct_u232_break_ctl */
-static int mct_u232_ioctl (struct usb_serial_port *port, struct file * file,
- unsigned int cmd, unsigned long arg)
+static int mct_u232_tiocmget (struct usb_serial_port *port, struct file *file)
+{
+ struct mct_u232_private *priv = usb_get_serial_port_data(port);
+ unsigned long control_state;
+ unsigned long flags;
+
+ dbg("%s", __FUNCTION__);
+
+ spin_lock_irqsave(&priv->lock, flags);
+ control_state = priv->control_state;
+ spin_unlock_irqrestore(&priv->lock, flags);
+
+ return control_state;
+}
+
+static int mct_u232_tiocmset (struct usb_serial_port *port, struct file *file,
+ unsigned int set, unsigned int clear)
{
struct usb_serial *serial = port->serial;
struct mct_u232_private *priv = usb_get_serial_port_data(port);
- int mask;
unsigned long control_state;
unsigned long flags;
- dbg("%scmd=0x%x", __FUNCTION__, cmd);
+ dbg("%s", __FUNCTION__);
spin_lock_irqsave(&priv->lock, flags);
control_state = priv->control_state;
+
+ if (set & TIOCM_RTS)
+ control_state |= TIOCM_RTS;
+ if (set & TIOCM_DTR)
+ control_state |= TIOCM_DTR;
+ if (clear & TIOCM_RTS)
+ control_state &= ~TIOCM_RTS;
+ if (clear & TIOCM_DTR)
+ control_state &= ~TIOCM_DTR;
+
+ priv->control_state = control_state;
spin_unlock_irqrestore(&priv->lock, flags);
+ return mct_u232_set_modem_ctrl(serial, control_state);
+}
+
+static int mct_u232_ioctl (struct usb_serial_port *port, struct file * file,
+ unsigned int cmd, unsigned long arg)
+{
+ dbg("%scmd=0x%x", __FUNCTION__, cmd);
/* Based on code from acm.c and others */
switch (cmd) {
- case TIOCMGET:
- return put_user(control_state, (unsigned long *) arg);
- break;
-
- case TIOCMSET: /* Turns on and off the lines as specified by the mask */
- case TIOCMBIS: /* turns on (Sets) the lines as specified by the mask */
- case TIOCMBIC: /* turns off (Clears) the lines as specified by the mask */
- if (get_user(mask, (unsigned long *) arg))
- return -EFAULT;
-
- if ((cmd == TIOCMSET) || (mask & TIOCM_RTS)) {
- /* RTS needs set */
- if( ((cmd == TIOCMSET) && (mask & TIOCM_RTS)) ||
- (cmd == TIOCMBIS) )
- control_state |= TIOCM_RTS;
- else
- control_state &= ~TIOCM_RTS;
- }
-
- if ((cmd == TIOCMSET) || (mask & TIOCM_DTR)) {
- /* DTR needs set */
- if( ((cmd == TIOCMSET) && (mask & TIOCM_DTR)) ||
- (cmd == TIOCMBIS) )
- control_state |= TIOCM_DTR;
- else
- control_state &= ~TIOCM_DTR;
- }
- mct_u232_set_modem_ctrl(serial, control_state);
-
- spin_lock_irqsave(&priv->lock, flags);
- priv->control_state = control_state;
- spin_unlock_irqrestore(&priv->lock, flags);
- break;
-
case TIOCMIWAIT:
/* wait for any of the 4 modem inputs (DCD,RI,DSR,CTS)*/
/* TODO */
next prev parent reply other threads:[~2003-04-24 23:34 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-04-24 23:46 [BK PATCH] USB changes for 2.5.68 Greg KH
2003-04-24 23:47 ` [PATCH] More USB fixes " Greg KH
2003-04-24 23:47 ` Greg KH
2003-04-24 23:47 ` Greg KH
2003-04-24 23:47 ` Greg KH
2003-04-24 23:47 ` Greg KH
2003-04-24 23:47 ` Greg KH
2003-04-24 23:47 ` Greg KH
2003-04-24 23:47 ` Greg KH
2003-04-24 23:47 ` Greg KH
2003-04-24 23:47 ` Greg KH
2003-04-24 23:47 ` Greg KH
2003-04-24 23:47 ` Greg KH
2003-04-24 23:47 ` Greg KH
2003-04-24 23:47 ` Greg KH
2003-04-24 23:47 ` Greg KH
2003-04-24 23:47 ` Greg KH [this message]
2003-04-24 23:47 ` Greg KH
2003-04-24 23:47 ` Greg KH
2003-04-24 23:47 ` Greg KH
2003-04-24 23:47 ` Greg KH
2003-04-25 4:14 ` [BK PATCH] USB changes " Greg KH
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=10512280531918@kroah.com \
--to=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb-devel@lists.sourceforge.net \
/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;
as well as URLs for NNTP newsgroup(s).