Skip to content

L
linux
Commit 1ff590db authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files
Options

[PATCH] USB: kl5kusb105: add support for new tty tiocmget and tiocmset functions.

parent 7b369697
Show whitespace changes
Inline Side-by-side
Showing with 59 additions and 53 deletions
drivers/usb/serial/kl5kusb105.c
View file @ 1ff590db
...@@ -105,6 +105,11 @@ static void klsi_105_unthrottle (struct usb_serial_port *port); ...@@ -105,6 +105,11 @@ static void klsi_105_unthrottle (struct usb_serial_port *port);
static void klsi_105_break_ctl (struct usb_serial_port *port, static void klsi_105_break_ctl (struct usb_serial_port *port,
int break_state ); int break_state );
*/ */
static int klsi_105_tiocmget (struct usb_serial_port *port,
struct file *file);
static int klsi_105_tiocmset (struct usb_serial_port *port,
struct file *file, unsigned int set,
unsigned int clear);
/* /*
* All of the device info needed for the KLSI converters. * All of the device info needed for the KLSI converters.
...@@ -143,6 +148,8 @@ static struct usb_serial_device_type kl5kusb105d_device = { ...@@ -143,6 +148,8 @@ static struct usb_serial_device_type kl5kusb105d_device = {
.ioctl = klsi_105_ioctl, .ioctl = klsi_105_ioctl,
.set_termios = klsi_105_set_termios, .set_termios = klsi_105_set_termios,
/*.break_ctl = klsi_105_break_ctl,*/ /*.break_ctl = klsi_105_break_ctl,*/
.tiocmget = klsi_105_tiocmget,
.tiocmset = klsi_105_tiocmset,
.attach = klsi_105_startup, .attach = klsi_105_startup,
.shutdown = klsi_105_shutdown, .shutdown = klsi_105_shutdown,
.throttle = klsi_105_throttle, .throttle = klsi_105_throttle,
...@@ -879,68 +886,67 @@ static void mct_u232_break_ctl( struct usb_serial_port *port, int break_state ) ...@@ -879,68 +886,67 @@ static void mct_u232_break_ctl( struct usb_serial_port *port, int break_state )
} /* mct_u232_break_ctl */ } /* mct_u232_break_ctl */
#endif #endif
static int klsi_105_ioctl (struct usb_serial_port *port, struct file * file, static int klsi_105_tiocmget (struct usb_serial_port *port, struct file *file)
unsigned int cmd, unsigned long arg)
{ {
struct usb_serial *serial = port->serial; struct usb_serial *serial = port->serial;
struct klsi_105_private *priv = usb_get_serial_port_data(port); struct klsi_105_private *priv = usb_get_serial_port_data(port);
int mask;
unsigned long flags; unsigned long flags;
dbg("%scmd=0x%x", __FUNCTION__, cmd);
/* Based on code from acm.c and others */
switch (cmd) {
case TIOCMGET: {
int rc; int rc;
unsigned long line_state; unsigned long line_state;
dbg("%s - TIOCMGET request, just guessing", __FUNCTION__); dbg("%s - request, just guessing", __FUNCTION__);
rc = klsi_105_get_line_state(serial, &line_state); rc = klsi_105_get_line_state(serial, &line_state);
if (rc < 0) { if (rc < 0) {
err("Reading line control failed (error = %d)", rc); err("Reading line control failed (error = %d)", rc);
/* better return value? EAGAIN? */ /* better return value? EAGAIN? */
return -ENOIOCTLCMD; return rc;
} }
spin_lock_irqsave (&priv->lock, flags); spin_lock_irqsave (&priv->lock, flags);
priv->line_state = line_state; priv->line_state = line_state;
spin_unlock_irqrestore (&priv->lock, flags); spin_unlock_irqrestore (&priv->lock, flags);
dbg("%s - read line state 0x%lx", __FUNCTION__, line_state); dbg("%s - read line state 0x%lx", __FUNCTION__, line_state);
return put_user(line_state, (unsigned long *) arg); return (int)line_state;
}; }
case TIOCMSET: /* Turns on and off the lines as specified by the mask */ static int klsi_105_tiocmset (struct usb_serial_port *port, struct file *file,
case TIOCMBIS: /* turns on (Sets) the lines as specified by the mask */ unsigned int set, unsigned int clear)
case TIOCMBIC: /* turns off (Clears) the lines as specified by the mask */ {
if (get_user(mask, (unsigned long *) arg)) int retval = -EINVAL;
return -EFAULT;
if ((cmd == TIOCMSET) || (mask & TIOCM_RTS)) { dbg("%s", __FUNCTION__);
/* RTS needs set */
if( ((cmd == TIOCMSET) && (mask & TIOCM_RTS)) ||
(cmd == TIOCMBIS) )
dbg("%s - set RTS not handled", __FUNCTION__);
/* priv->control_state |= TIOCM_RTS; */
else
dbg("%s - clear RTS not handled", __FUNCTION__);
/* priv->control_state &= ~TIOCM_RTS; */
}
if ((cmd == TIOCMSET) || (mask & TIOCM_DTR)) { /* if this ever gets implemented, it should be done something like this:
/* DTR needs set */ struct usb_serial *serial = port->serial;
if( ((cmd == TIOCMSET) && (mask & TIOCM_DTR)) || struct klsi_105_private *priv = usb_get_serial_port_data(port);
(cmd == TIOCMBIS) ) unsigned long flags;
dbg("%s - set DTR not handled", __FUNCTION__); int control;
/* priv->control_state |= TIOCM_DTR; */
else
dbg("%s - clear DTR not handled", __FUNCTION__);
/* priv->control_state &= ~TIOCM_DTR; */
}
/*
mct_u232_set_modem_ctrl(serial, priv->control_state);
*/
break;
spin_lock_irqsave (&priv->lock, flags);
if (set & TIOCM_RTS)
priv->control_state |= TIOCM_RTS;
if (set & TIOCM_DTR)
priv->control_state |= TIOCM_DTR;
if (clear & TIOCM_RTS)
priv->control_state &= ~TIOCM_RTS;
if (clear & TIOCM_DTR)
priv->control_state &= ~TIOCM_DTR;
control = priv->control_state;
spin_unlock_irqrestore (&priv->lock, flags);
retval = mct_u232_set_modem_ctrl(serial, control);
*/
return retval;
}
static int klsi_105_ioctl (struct usb_serial_port *port, struct file * file,
unsigned int cmd, unsigned long arg)
{
struct klsi_105_private *priv = usb_get_serial_port_data(port);
dbg("%scmd=0x%x", __FUNCTION__, cmd);
/* Based on code from acm.c and others */
switch (cmd) {
case TIOCMIWAIT: case TIOCMIWAIT:
/* wait for any of the 4 modem inputs (DCD,RI,DSR,CTS)*/ /* wait for any of the 4 modem inputs (DCD,RI,DSR,CTS)*/
/* TODO */ /* TODO */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7