From: Eric Lammerts <eric@lammerts.org>
To: linux-kernel@vger.kernel.org
Cc: p.hardwick@option.com, greg@kroah.com, akpm@linux-foundation.org
Subject: [PATCH] nozomi DTR/RTS
Date: Fri, 24 Aug 2007 12:02:40 +0200 [thread overview]
Message-ID: <46CEACC0.5000908@lammerts.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 499 bytes --]
Hi,
I noticed that DTR toggling doesn't work with the nozomi driver
(TIOCMBIS/TIOCMBIC ioctls have no effect). This is a nuisance because
that makes it hard to get the modem back in command mode.
Attached patch adds a tty_ops->tiocmset function that makes it work.
Should we also rip out the TIOCMBIS/TIOCMBIC handling in ntty_ioctl()?
It doesn't seem to be used anyway.
Patch is against 2.6.23-rc3-mm1, but not tested with that. I tested it
with 2.6.18.4 and the pharscape.org driver.
Eric
[-- Attachment #2: nozomi-dtr-patch-2.6.23-rc3-mm1 --]
[-- Type: text/plain, Size: 1288 bytes --]
--- linux-2.6.23-rc3-mm1/drivers/char/nozomi.c.orig 2007-08-24 05:39:06.000000000 -0400
+++ linux-2.6.23-rc3-mm1/drivers/char/nozomi.c 2007-08-24 05:41:07.000000000 -0400
@@ -1930,12 +1930,16 @@
}
/* Sets io controls parameters */
-static int ntty_tiocmset(struct tty_struct *tty, struct file *file, u32 arg)
+static int ntty_tiocmset(struct tty_struct *tty, struct file *file,
+ unsigned int set, unsigned int clear)
{
struct port *port = (struct port *)tty->driver_data;
- set_rts(port->tty_index, (arg & TIOCM_RTS) ? 1 : 0);
- set_dtr(port->tty_index, (arg & TIOCM_DTR) ? 1 : 0);
+ if(set & TIOCM_RTS) set_rts(port->tty_index, 1);
+ else if(clear & TIOCM_RTS) set_rts(port->tty_index, 0);
+
+ if(set & TIOCM_DTR) set_dtr(port->tty_index, 1);
+ else if(clear & TIOCM_DTR) set_dtr(port->tty_index, 0);
return 0;
}
@@ -2039,7 +2043,7 @@
spin_unlock_irqrestore(&dc->spin_mutex, flags);
break;
case TIOCMSET:
- rval = ntty_tiocmset(tty, file, arg);
+ rval = ntty_tiocmset(tty, file, arg, ~arg);
break;
case TIOCMBIC:
if (get_user(mask, (unsigned long __user *)arg))
@@ -2152,6 +2156,7 @@
.set_termios = ntty_set_termios,
.chars_in_buffer = ntty_chars_in_buffer,
.put_char = ntty_put_char,
+ .tiocmset = ntty_tiocmset,
};
/* Initializes the tty */
next reply other threads:[~2007-08-24 10:09 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-24 10:02 Eric Lammerts [this message]
2007-08-24 10:45 ` [PATCH] nozomi DTR/RTS Alan Cox
2007-09-09 16:26 ` 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=46CEACC0.5000908@lammerts.org \
--to=eric@lammerts.org \
--cc=akpm@linux-foundation.org \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=p.hardwick@option.com \
/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