* [BK PATCH] USB changes for 2.5.68
@ 2003-04-24 23:46 Greg KH
2003-04-24 23:47 ` [PATCH] More USB fixes " Greg KH
2003-04-25 4:14 ` [BK PATCH] USB changes " Greg KH
0 siblings, 2 replies; 22+ messages in thread
From: Greg KH @ 2003-04-24 23:46 UTC (permalink / raw)
To: torvalds; +Cc: linux-usb-devel, linux-kernel
Hi,
Here are some USB changes and fixes for 2.5.68. The majority of these
changes are due to the tty core adding the tiocmset and tiocmget
functions instead of using the ioctl values. I've also included a small
patch to the tty core's tiocmset function that allows TIOCM_LOOP changes
to be seen by the tty drivers. Russell King has acked this change.
There are also some small bugfixes and compiler warning removal changes
in here too.
Please pull from: bk://kernel.bkbits.net/gregkh/linux/linus-2.5
Patches will be posted to linux-usb-devel as a follow-up thread for
those who want to see them.
thanks,
greg k-h
drivers/char/tty_io.c | 4
drivers/usb/class/cdc-acm.c | 120 +++++++++++----------
drivers/usb/class/usb-midi.c | 2
drivers/usb/core/hcd-pci.c | 16 +-
drivers/usb/core/hcd.c | 4
drivers/usb/core/usb.c | 14 +-
drivers/usb/misc/speedtch.c | 32 +++--
drivers/usb/net/kaweth.c | 2
drivers/usb/net/usbnet.c | 8 +
drivers/usb/serial/belkin_sa.c | 110 +++++++++++--------
drivers/usb/serial/digi_acceleport.c | 124 +++++++++++++--------
drivers/usb/serial/ftdi_sio.c | 193 +++++++++++++++------------------
drivers/usb/serial/io_edgeport.c | 80 +++++---------
drivers/usb/serial/io_tables.h | 8 +
drivers/usb/serial/io_ti.c | 82 +++++---------
drivers/usb/serial/keyspan.c | 68 +++++------
drivers/usb/serial/keyspan.h | 11 +
drivers/usb/serial/keyspan_pda.c | 94 +++++++---------
drivers/usb/serial/kl5kusb105.c | 112 ++++++++++---------
drivers/usb/serial/kobil_sct.c | 200 ++++++++++++++++++++---------------
drivers/usb/serial/mct_u232.c | 82 +++++++-------
drivers/usb/serial/pl2303.c | 142 ++++++++++++++----------
drivers/usb/serial/usb-serial.c | 94 ++++++++++++++++
drivers/usb/serial/usb-serial.h | 2
drivers/usb/serial/whiteheat.c | 184 +++++++++++++-------------------
25 files changed, 975 insertions(+), 813 deletions(-)
-----
Andrew Morton <akpm@digeo.com>:
o usb: minor usb stuff
David Brownell <david-b@pacbell.net>:
o usb: fix (rare?) disconnect
o USB: hcd-pci.c catch up to dev_printk changes
o USB: fix for deadlock in v2.5.67
Duncan Sands <baldrick@wanadoo.fr>:
o USB speedtouch: compile fix
o USB speedtouch: crc optimization
o USB speedtouch: bump the version number
Greg Kroah-Hartman <greg@kroah.com>:
o tty: let tiocmset pass TIOCM_LOOP changes to the tty drivers
o USB: add error reporting functionality to the pl2303 driver
o USB: whiteheat: add support for new tty tiocmget and tiocmset functions
o USB: pl2303: add support for new tty tiocmget and tiocmset functions
o USB: mct_u232: add support for new tty tiocmget and tiocmset functions
o USB: kobil_sct: add support for new tty tiocmget and tiocmset functions
o USB: kl5kusb105: add support for new tty tiocmget and tiocmset functions
o USB: keyspan_pda: add support for new tty tiocmget and tiocmset functions
o USB: ftdi_sio: add support for new tty tiocmget and tiocmset functions
o USB: digi_acceleport: add support for new tty tiocmget and tiocmset functions
o USB: belkin_sa: add support for new tty tiocmget and tiocmset functions
o USB: usb-serial core: add support for new tty tiocmget and tiocmset functions
o USB: cdc-acm: add support for new tty tiocmget and tiocmset functions
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH] More USB fixes for 2.5.68
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
0 siblings, 1 reply; 22+ messages in thread
From: Greg KH @ 2003-04-24 23:47 UTC (permalink / raw)
To: linux-usb-devel, linux-kernel
ChangeSet 1.1165.2.2, 2003/04/23 12:04:22-07:00, akpm@digeo.com
[PATCH] usb: minor usb stuff
- nail a couple of warnings
- usbnet is not compilable with gcc-2.95.3. Fix.
drivers/usb/class/usb-midi.c | 2 +-
drivers/usb/net/kaweth.c | 2 +-
drivers/usb/net/usbnet.c | 8 ++++++--
3 files changed, 8 insertions(+), 4 deletions(-)
diff -Nru a/drivers/usb/class/usb-midi.c b/drivers/usb/class/usb-midi.c
--- a/drivers/usb/class/usb-midi.c Thu Apr 24 16:28:38 2003
+++ b/drivers/usb/class/usb-midi.c Thu Apr 24 16:28:38 2003
@@ -820,7 +820,7 @@
struct list_head *devs, *mdevs;
struct usb_midi_state *s;
struct usb_mididev *m;
- int flags;
+ unsigned long flags;
int succeed = 0;
#if 0
diff -Nru a/drivers/usb/net/kaweth.c b/drivers/usb/net/kaweth.c
--- a/drivers/usb/net/kaweth.c Thu Apr 24 16:28:39 2003
+++ b/drivers/usb/net/kaweth.c Thu Apr 24 16:28:39 2003
@@ -744,7 +744,7 @@
}
}
- private_header = __skb_push(skb, 2);
+ private_header = (u16 *)__skb_push(skb, 2);
*private_header = cpu_to_le16(skb->len-2);
kaweth->tx_skb = skb;
diff -Nru a/drivers/usb/net/usbnet.c b/drivers/usb/net/usbnet.c
--- a/drivers/usb/net/usbnet.c Thu Apr 24 16:28:38 2003
+++ b/drivers/usb/net/usbnet.c Thu Apr 24 16:28:39 2003
@@ -314,8 +314,12 @@
: (in_interrupt () ? "in_interrupt" : "can sleep"))
#ifdef DEBUG
-#define devdbg(usbnet, fmt, arg...) \
- printk(KERN_DEBUG "%s: " fmt "\n" , (usbnet)->net.name, ## arg)
+#define devdbg(usbnet, fmt, arg...) \
+ do { \
+ printk(KERN_DEBUG "%s:", (usbnet)->net.name); \
+ printk(fmt, ## arg); \
+ printk("\n"); \
+ } while (0)
#else
#define devdbg(usbnet, fmt, arg...) do {} while(0)
#endif
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH] More USB fixes for 2.5.68
2003-04-24 23:47 ` Greg KH
@ 2003-04-24 23:47 ` Greg KH
2003-04-24 23:47 ` Greg KH
0 siblings, 1 reply; 22+ messages in thread
From: Greg KH @ 2003-04-24 23:47 UTC (permalink / raw)
To: linux-usb-devel, linux-kernel
ChangeSet 1.1165.2.3, 2003/04/23 12:05:10-07:00, david-b@pacbell.net
[PATCH] USB: hcd-pci.c catch up to dev_printk changes
The preceding patch to fix this was incomplete, since
it didn't work for the pure debug messages. And that
was because the DEBUG-vs-CONFIG_USB_DEBUG stuff changed
somewhere.
drivers/usb/core/hcd-pci.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff -Nru a/drivers/usb/core/hcd-pci.c b/drivers/usb/core/hcd-pci.c
--- a/drivers/usb/core/hcd-pci.c Thu Apr 24 16:28:14 2003
+++ b/drivers/usb/core/hcd-pci.c Thu Apr 24 16:28:14 2003
@@ -17,11 +17,6 @@
*/
#include <linux/config.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/pci.h>
-#include <asm/io.h>
-#include <asm/irq.h>
#ifdef CONFIG_USB_DEBUG
#define DEBUG
@@ -29,6 +24,11 @@
#undef DEBUG
#endif
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <asm/io.h>
+#include <asm/irq.h>
#include <linux/usb.h>
#include "hcd.h"
@@ -214,7 +214,7 @@
hub = hcd->self.root_hub;
hcd->state = USB_STATE_QUIESCING;
- dev_dbg (*hcd->controller, "roothub graceful disconnect\n");
+ dev_dbg (hcd->controller, "roothub graceful disconnect\n");
usb_disconnect (&hub);
hcd->driver->stop (hcd);
@@ -326,7 +326,7 @@
retval = -EBUSY;
if (hcd->state != USB_STATE_SUSPENDED) {
- dev_dbg (*hcd->controller, "can't resume, not suspended!\n");
+ dev_dbg (hcd->controller, "can't resume, not suspended!\n");
goto done;
}
hcd->state = USB_STATE_RESUMING;
@@ -336,7 +336,7 @@
retval = hcd->driver->resume (hcd);
if (!HCD_IS_RUNNING (hcd->state)) {
- dev_dbg (*hcd->controller, "resume fail, retval %d\n", retval);
+ dev_dbg (hcd->controller, "resume fail, retval %d\n", retval);
usb_hc_died (hcd);
// FIXME: recover, reset etc.
} else {
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH] More USB fixes for 2.5.68
2003-04-24 23:46 [BK PATCH] USB changes for 2.5.68 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
1 sibling, 1 reply; 22+ messages in thread
From: Greg KH @ 2003-04-24 23:47 UTC (permalink / raw)
To: linux-usb-devel, linux-kernel
ChangeSet 1.1110.2.1, 2003/04/18 16:11:42-07:00, david-b@pacbell.net
[PATCH] USB: fix for deadlock in v2.5.67
The patch below should resolve the keyboard problem -- just reorders two
lines so the lock isn't held after the device's records get deleted, so
the order is what it should always have been.
drivers/usb/core/hcd.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
diff -Nru a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
--- a/drivers/usb/core/hcd.c Thu Apr 24 16:29:16 2003
+++ b/drivers/usb/core/hcd.c Thu Apr 24 16:29:16 2003
@@ -961,8 +961,8 @@
spin_lock_irqsave (&hcd_data_lock, flags);
list_del_init (&urb->urb_list);
dev = urb->dev;
- usb_put_dev (dev);
spin_unlock_irqrestore (&hcd_data_lock, flags);
+ usb_put_dev (dev);
}
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH] More USB fixes for 2.5.68
2003-04-24 23:47 ` Greg KH
@ 2003-04-24 23:47 ` Greg KH
2003-04-24 23:47 ` Greg KH
0 siblings, 1 reply; 22+ messages in thread
From: Greg KH @ 2003-04-24 23:47 UTC (permalink / raw)
To: linux-usb-devel, linux-kernel
ChangeSet 1.1165.2.5, 2003/04/23 12:06:14-07:00, baldrick@wanadoo.fr
[PATCH] USB speedtouch: bump the version number
drivers/usb/misc/speedtch.c | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff -Nru a/drivers/usb/misc/speedtch.c b/drivers/usb/misc/speedtch.c
--- a/drivers/usb/misc/speedtch.c Thu Apr 24 16:27:00 2003
+++ b/drivers/usb/misc/speedtch.c Thu Apr 24 16:27:00 2003
@@ -20,7 +20,19 @@
******************************************************************************/
/*
- * Written by Johan Verrept (Johan.Verrept@advalvas.be)
+ * Written by Johan Verrept, maintained by Duncan Sands (duncan.sands@wanadoo.fr)
+ *
+ * 1.6: - No longer opens a connection if the firmware is not loaded
+ * - Added support for the speedtouch 330
+ * - Removed the limit on the number of devices
+ * - Module now autoloads on device plugin
+ * - Merged relevant parts of sarlib
+ * - Replaced the kernel thread with a tasklet
+ * - New packet transmission code
+ * - Changed proc file contents
+ * - Fixed all known SMP races
+ * - Many fixes and cleanups
+ * - Various fixes by Oliver Neukum (oliver@neukum.name)
*
* 1.5A: - Version for inclusion in 2.5 series kernel
* - Modifications by Richard Purdie (rpurdie@rpsys.net)
@@ -28,6 +40,7 @@
* udsl_usb_send_data_context->urb to a pointer and adding code
* to alloc and free it
* - remove_wait_queue() added to udsl_atm_processqueue_thread()
+ * - Duncan Sands (duncan.sands@wanadoo.fr) is the new maintainer
*
* 1.5: - fixed memory leak when atmsar_decode_aal5 returned NULL.
* (reported by stephen.robinson@zen.co.uk)
@@ -77,9 +90,9 @@
#define PACKETDEBUG(arg...)
#endif
-#define DRIVER_AUTHOR "Johan Verrept, Johan.Verrept@advalvas.be"
-#define DRIVER_DESC "Driver for the Alcatel SpeedTouch USB ADSL modem"
-#define DRIVER_VERSION "1.5A"
+#define DRIVER_AUTHOR "Johan Verrept, Duncan Sands <duncan.sands@wanadoo.fr>"
+#define DRIVER_DESC "Alcatel SpeedTouch USB driver"
+#define DRIVER_VERSION "1.6"
#define SPEEDTOUCH_VENDORID 0x06b9
#define SPEEDTOUCH_PRODUCTID 0x4061
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH] More USB fixes for 2.5.68
2003-04-24 23:47 ` Greg KH
@ 2003-04-24 23:47 ` Greg KH
2003-04-24 23:47 ` Greg KH
0 siblings, 1 reply; 22+ messages in thread
From: Greg KH @ 2003-04-24 23:47 UTC (permalink / raw)
To: linux-usb-devel, linux-kernel
ChangeSet 1.1165.2.7, 2003/04/23 12:07:03-07:00, baldrick@wanadoo.fr
[PATCH] USB speedtouch: compile fix
The rx_inuse field no longer exists.
drivers/usb/misc/speedtch.c | 3 +--
1 files changed, 1 insertion(+), 2 deletions(-)
diff -Nru a/drivers/usb/misc/speedtch.c b/drivers/usb/misc/speedtch.c
--- a/drivers/usb/misc/speedtch.c Thu Apr 24 16:25:26 2003
+++ b/drivers/usb/misc/speedtch.c Thu Apr 24 16:25:26 2003
@@ -579,8 +579,7 @@
atmsar_vcc->vcc->push (atmsar_vcc->vcc, new);
} else {
dbg
- ("dropping incoming packet : rx_inuse = %d, vcc->sk->rcvbuf = %d, skb->true_size = %d",
- atomic_read (&atmsar_vcc->vcc->rx_inuse),
+ ("dropping incoming packet : vcc->sk->rcvbuf = %d, skb->true_size = %d",
atmsar_vcc->vcc->sk->rcvbuf, new->truesize);
dev_kfree_skb (new);
}
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH] More USB fixes for 2.5.68
2003-04-24 23:47 ` Greg KH
@ 2003-04-24 23:47 ` Greg KH
2003-04-24 23:47 ` Greg KH
0 siblings, 1 reply; 22+ messages in thread
From: Greg KH @ 2003-04-24 23:47 UTC (permalink / raw)
To: linux-usb-devel, linux-kernel
ChangeSet 1.1165.2.6, 2003/04/23 12:06:40-07:00, baldrick@wanadoo.fr
[PATCH] USB speedtouch: crc optimization
drivers/usb/misc/speedtch.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff -Nru a/drivers/usb/misc/speedtch.c b/drivers/usb/misc/speedtch.c
--- a/drivers/usb/misc/speedtch.c Thu Apr 24 16:26:18 2003
+++ b/drivers/usb/misc/speedtch.c Thu Apr 24 16:26:18 2003
@@ -406,11 +406,12 @@
** encode **
*************/
+static const unsigned char zeros[ATM_CELL_PAYLOAD];
+
static void udsl_groom_skb (struct atm_vcc *vcc, struct sk_buff *skb)
{
struct udsl_control *ctrl = UDSL_SKB (skb);
- unsigned int i, zero_padding;
- unsigned char zero = 0;
+ unsigned int zero_padding;
u32 crc;
ctrl->atm_data.vcc = vcc;
@@ -436,8 +437,7 @@
ctrl->aal5_trailer [3] = skb->len;
crc = crc32_be (~0, skb->data, skb->len);
- for (i = 0; i < zero_padding; i++)
- crc = crc32_be (crc, &zero, 1);
+ crc = crc32_be (crc, zeros, zero_padding);
crc = crc32_be (crc, ctrl->aal5_trailer, 4);
crc = ~crc;
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH] More USB fixes for 2.5.68
2003-04-24 23:47 ` Greg KH
@ 2003-04-24 23:47 ` Greg KH
2003-04-24 23:47 ` Greg KH
0 siblings, 1 reply; 22+ messages in thread
From: Greg KH @ 2003-04-24 23:47 UTC (permalink / raw)
To: linux-usb-devel, linux-kernel
ChangeSet 1.1165.2.9, 2003/04/23 17:35:42-07:00, greg@kroah.com
[PATCH] USB: usb-serial core: add support for new tty tiocmget and tiocmset functions.
drivers/usb/serial/usb-serial.c | 47 ++++++++++++++++++++++++++++++++++++++++
drivers/usb/serial/usb-serial.h | 2 +
2 files changed, 49 insertions(+)
diff -Nru a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
--- a/drivers/usb/serial/usb-serial.c Thu Apr 24 16:24:17 2003
+++ b/drivers/usb/serial/usb-serial.c Thu Apr 24 16:24:17 2003
@@ -785,6 +785,51 @@
return ((count < begin+length-off) ? count : begin+length-off);
}
+static int serial_tiocmget (struct tty_struct *tty, struct file *file)
+{
+ struct usb_serial_port *port = (struct usb_serial_port *) tty->driver_data;
+ struct usb_serial *serial = get_usb_serial (port, __FUNCTION__);
+
+ if (!serial)
+ goto exit;
+
+ dbg("%s - port %d", __FUNCTION__, port->number);
+
+ if (!port->open_count) {
+ dbg("%s - port not open", __FUNCTION__);
+ goto exit;
+ }
+
+ if (serial->type->tiocmget)
+ return serial->type->tiocmget(port, file);
+
+exit:
+ return -EINVAL;
+}
+
+static int serial_tiocmset (struct tty_struct *tty, struct file *file,
+ unsigned int set, unsigned int clear)
+{
+ struct usb_serial_port *port = (struct usb_serial_port *) tty->driver_data;
+ struct usb_serial *serial = get_usb_serial (port, __FUNCTION__);
+
+ if (!serial)
+ goto exit;
+
+ dbg("%s - port %d", __FUNCTION__, port->number);
+
+ if (!port->open_count) {
+ dbg("%s - port not open", __FUNCTION__);
+ goto exit;
+ }
+
+ if (serial->type->tiocmset)
+ return serial->type->tiocmset(port, file, set, clear);
+
+exit:
+ return -EINVAL;
+}
+
void usb_serial_port_softint(void *private)
{
struct usb_serial_port *port = (struct usb_serial_port *)private;
@@ -1286,6 +1331,8 @@
.break_ctl = serial_break,
.chars_in_buffer = serial_chars_in_buffer,
.read_proc = serial_read_proc,
+ .tiocmget = serial_tiocmget,
+ .tiocmset = serial_tiocmset,
};
diff -Nru a/drivers/usb/serial/usb-serial.h b/drivers/usb/serial/usb-serial.h
--- a/drivers/usb/serial/usb-serial.h Thu Apr 24 16:24:17 2003
+++ b/drivers/usb/serial/usb-serial.h Thu Apr 24 16:24:17 2003
@@ -251,6 +251,8 @@
int (*chars_in_buffer) (struct usb_serial_port *port);
void (*throttle) (struct usb_serial_port *port);
void (*unthrottle) (struct usb_serial_port *port);
+ int (*tiocmget) (struct usb_serial_port *port, struct file *file);
+ int (*tiocmset) (struct usb_serial_port *port, struct file *file, unsigned int set, unsigned int clear);
void (*read_int_callback)(struct urb *urb, struct pt_regs *regs);
void (*read_bulk_callback)(struct urb *urb, struct pt_regs *regs);
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH] More USB fixes for 2.5.68
2003-04-24 23:47 ` Greg KH
@ 2003-04-24 23:47 ` Greg KH
2003-04-24 23:47 ` Greg KH
0 siblings, 1 reply; 22+ messages in thread
From: Greg KH @ 2003-04-24 23:47 UTC (permalink / raw)
To: linux-usb-devel, linux-kernel
ChangeSet 1.1165.2.4, 2003/04/23 12:05:40-07:00, david-b@pacbell.net
[PATCH] usb: fix (rare?) disconnect
It's not good to dereference pointers before checking
them for null. Seen once on a faulty device init,
which I don't think I'd ever seen before "in the wild".
(Caused by some other 2.5.68 strangeness.)
drivers/usb/core/usb.c | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff -Nru a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
--- a/drivers/usb/core/usb.c Thu Apr 24 16:27:39 2003
+++ b/drivers/usb/core/usb.c Thu Apr 24 16:27:39 2003
@@ -791,14 +791,22 @@
void usb_disconnect(struct usb_device **pdev)
{
struct usb_device *dev = *pdev;
- struct usb_bus *bus = dev->bus;
- struct usb_operations *ops = bus->op;
+ struct usb_bus *bus;
+ struct usb_operations *ops;
int i;
might_sleep ();
- if (!dev)
+ if (!dev) {
+ pr_debug ("%s nodev\n", __FUNCTION__);
return;
+ }
+ bus = dev->bus;
+ if (!bus) {
+ pr_debug ("%s nobus\n", __FUNCTION__);
+ return;
+ }
+ ops = bus->op;
*pdev = NULL;
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH] More USB fixes for 2.5.68
2003-04-24 23:47 ` Greg KH
@ 2003-04-24 23:47 ` Greg KH
2003-04-24 23:47 ` Greg KH
0 siblings, 1 reply; 22+ messages in thread
From: Greg KH @ 2003-04-24 23:47 UTC (permalink / raw)
To: linux-usb-devel, linux-kernel
ChangeSet 1.1165.2.8, 2003/04/23 17:35:11-07:00, greg@kroah.com
[PATCH] USB: cdc-acm: add support for new tty tiocmget and tiocmset functions.
drivers/usb/class/cdc-acm.c | 60 ++++++++++++++++++++++++--------------------
1 files changed, 33 insertions(+), 27 deletions(-)
diff -Nru a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
--- a/drivers/usb/class/cdc-acm.c Thu Apr 24 16:24:52 2003
+++ b/drivers/usb/class/cdc-acm.c Thu Apr 24 16:24:52 2003
@@ -432,43 +432,47 @@
dbg("send break failed");
}
-static int acm_tty_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd, unsigned long arg)
+static int acm_tty_tiocmget(struct tty_struct *tty, struct file *file)
{
struct acm *acm = tty->driver_data;
- unsigned int mask, newctrl;
- if (!ACM_READY(acm)) return -EINVAL;
+ if (!ACM_READY(acm))
+ return -EINVAL;
- switch (cmd) {
+ return (acm->ctrlout & ACM_CTRL_DTR ? TIOCM_DTR : 0) |
+ (acm->ctrlout & ACM_CTRL_RTS ? TIOCM_RTS : 0) |
+ (acm->ctrlin & ACM_CTRL_DSR ? TIOCM_DSR : 0) |
+ (acm->ctrlin & ACM_CTRL_RI ? TIOCM_RI : 0) |
+ (acm->ctrlin & ACM_CTRL_DCD ? TIOCM_CD : 0) |
+ TIOCM_CTS;
+}
- case TIOCMGET:
+static int acm_tty_tiocmset(struct tty_struct *tty, struct file *file,
+ unsigned int set, unsigned int clear)
+{
+ struct acm *acm = tty->driver_data;
+ unsigned int newctrl;
- return put_user((acm->ctrlout & ACM_CTRL_DTR ? TIOCM_DTR : 0) |
- (acm->ctrlout & ACM_CTRL_RTS ? TIOCM_RTS : 0) |
- (acm->ctrlin & ACM_CTRL_DSR ? TIOCM_DSR : 0) |
- (acm->ctrlin & ACM_CTRL_RI ? TIOCM_RI : 0) |
- (acm->ctrlin & ACM_CTRL_DCD ? TIOCM_CD : 0) |
- TIOCM_CTS, (unsigned long *) arg);
+ if (!ACM_READY(acm))
+ return -EINVAL;
- case TIOCMSET:
- case TIOCMBIS:
- case TIOCMBIC:
+ newctrl = acm->ctrlout;
+ set = (set & TIOCM_DTR ? ACM_CTRL_DTR : 0) | (set & TIOCM_RTS ? ACM_CTRL_RTS : 0);
+ clear = (clear & TIOCM_DTR ? ACM_CTRL_DTR : 0) | (clear & TIOCM_RTS ? ACM_CTRL_RTS : 0);
- if (get_user(mask, (unsigned long *) arg))
- return -EFAULT;
+ newctrl = (newctrl & ~clear) | set;
- newctrl = acm->ctrlout;
- mask = (mask & TIOCM_DTR ? ACM_CTRL_DTR : 0) | (mask & TIOCM_RTS ? ACM_CTRL_RTS : 0);
+ if (acm->ctrlout == newctrl)
+ return 0;
+ return acm_set_control(acm, acm->ctrlout = newctrl);
+}
- switch (cmd) {
- case TIOCMSET: newctrl = mask; break;
- case TIOCMBIS: newctrl |= mask; break;
- case TIOCMBIC: newctrl &= ~mask; break;
- }
+static int acm_tty_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd, unsigned long arg)
+{
+ struct acm *acm = tty->driver_data;
- if (acm->ctrlout == newctrl) return 0;
- return acm_set_control(acm, acm->ctrlout = newctrl);
- }
+ if (!ACM_READY(acm))
+ return -EINVAL;
return -ENOIOCTLCMD;
}
@@ -750,7 +754,9 @@
.unthrottle = acm_tty_unthrottle,
.chars_in_buffer = acm_tty_chars_in_buffer,
.break_ctl = acm_tty_break_ctl,
- .set_termios = acm_tty_set_termios
+ .set_termios = acm_tty_set_termios,
+ .tiocmget = acm_tty_tiocmget,
+ .tiocmset = acm_tty_tiocmset,
};
/*
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH] More USB fixes for 2.5.68
2003-04-24 23:47 ` Greg KH
@ 2003-04-24 23:47 ` Greg KH
2003-04-24 23:47 ` Greg KH
0 siblings, 1 reply; 22+ messages in thread
From: Greg KH @ 2003-04-24 23:47 UTC (permalink / raw)
To: linux-usb-devel, linux-kernel
ChangeSet 1.1165.2.10, 2003/04/23 17:36:29-07:00, greg@kroah.com
[PATCH] USB: belkin_sa: add support for new tty tiocmget and tiocmset functions.
drivers/usb/serial/belkin_sa.c | 110 +++++++++++++++++++++++------------------
1 files changed, 63 insertions(+), 47 deletions(-)
diff -Nru a/drivers/usb/serial/belkin_sa.c b/drivers/usb/serial/belkin_sa.c
--- a/drivers/usb/serial/belkin_sa.c Thu Apr 24 16:23:49 2003
+++ b/drivers/usb/serial/belkin_sa.c Thu Apr 24 16:23:49 2003
@@ -101,6 +101,8 @@
static void belkin_sa_set_termios (struct usb_serial_port *port, struct termios * old);
static int belkin_sa_ioctl (struct usb_serial_port *port, struct file * file, unsigned int cmd, unsigned long arg);
static void belkin_sa_break_ctl (struct usb_serial_port *port, int break_state );
+static int belkin_sa_tiocmget (struct usb_serial_port *port, struct file *file);
+static int belkin_sa_tiocmset (struct usb_serial_port *port, struct file *file, unsigned int set, unsigned int clear);
static struct usb_device_id id_table_combined [] = {
@@ -138,6 +140,8 @@
.ioctl = belkin_sa_ioctl,
.set_termios = belkin_sa_set_termios,
.break_ctl = belkin_sa_break_ctl,
+ .tiocmget = belkin_sa_tiocmget,
+ .tiocmset = belkin_sa_tiocmset,
.attach = belkin_sa_startup,
.shutdown = belkin_sa_shutdown,
};
@@ -502,65 +506,77 @@
}
-static int belkin_sa_ioctl (struct usb_serial_port *port, struct file * file, unsigned int cmd, unsigned long arg)
+static int belkin_sa_tiocmget (struct usb_serial_port *port, struct file *file)
+{
+ struct belkin_sa_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 belkin_sa_tiocmset (struct usb_serial_port *port, struct file *file,
+ unsigned int set, unsigned int clear)
{
struct usb_serial *serial = port->serial;
- __u16 urb_value; /* Will hold the new flags */
struct belkin_sa_private *priv = usb_get_serial_port_data(port);
- int ret = 0;
- int mask;
unsigned long control_state;
unsigned long flags;
+ int retval;
+ int rts = 0;
+ int dtr = 0;
+ dbg("%s", __FUNCTION__);
+
spin_lock_irqsave(&priv->lock, flags);
control_state = priv->control_state;
+
+ if (set & TIOCM_RTS) {
+ control_state |= TIOCM_RTS;
+ rts = 1;
+ }
+ if (set & TIOCM_DTR) {
+ control_state |= TIOCM_DTR;
+ dtr = 1;
+ }
+ if (clear & TIOCM_RTS) {
+ control_state &= ~TIOCM_RTS;
+ rts = 0;
+ }
+ if (clear & TIOCM_DTR) {
+ control_state &= ~TIOCM_DTR;
+ dtr = 0;
+ }
+
+ priv->control_state = control_state;
spin_unlock_irqrestore(&priv->lock, flags);
- /* Based on code from acm.c and others */
- switch (cmd) {
- case TIOCMGET:
- return put_user(control_state, (unsigned long *) arg);
- break;
+ retval = BSA_USB_CMD(BELKIN_SA_SET_RTS_REQUEST, rts);
+ if (retval < 0) {
+ err("Set RTS error %d", retval);
+ goto exit;
+ }
- 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 */
- urb_value = ((cmd == TIOCMSET) && (mask & TIOCM_RTS)) || (cmd == TIOCMBIS) ? 1 : 0;
- if (urb_value)
- control_state |= TIOCM_RTS;
- else
- control_state &= ~TIOCM_RTS;
-
- if ((ret = BSA_USB_CMD(BELKIN_SA_SET_RTS_REQUEST, urb_value)) < 0) {
- err("Set RTS error %d", ret);
- goto cmerror;
- }
- }
+ retval = BSA_USB_CMD(BELKIN_SA_SET_DTR_REQUEST, dtr);
+ if (retval < 0) {
+ err("Set DTR error %d", retval);
+ goto exit;
+ }
+exit:
+ return retval;
+}
- if ((cmd == TIOCMSET) || (mask & TIOCM_DTR)) {
- /* DTR needs set */
- urb_value = ((cmd == TIOCMSET) && (mask & TIOCM_DTR)) || (cmd == TIOCMBIS) ? 1 : 0;
- if (urb_value)
- control_state |= TIOCM_DTR;
- else
- control_state &= ~TIOCM_DTR;
- if ((ret = BSA_USB_CMD(BELKIN_SA_SET_DTR_REQUEST, urb_value)) < 0) {
- err("Set DTR error %d", ret);
- goto cmerror;
- }
- }
-cmerror:
- spin_lock_irqsave(&priv->lock, flags);
- priv->control_state = control_state;
- spin_unlock_irqrestore(&priv->lock, flags);
- return ret;
- break;
-
+
+static int belkin_sa_ioctl (struct usb_serial_port *port, struct file * file, unsigned int cmd, unsigned long arg)
+{
+ switch (cmd) {
case TIOCMIWAIT:
/* wait for any of the 4 modem inputs (DCD,RI,DSR,CTS)*/
/* TODO */
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH] More USB fixes for 2.5.68
2003-04-24 23:47 ` Greg KH
@ 2003-04-24 23:47 ` Greg KH
2003-04-24 23:47 ` Greg KH
0 siblings, 1 reply; 22+ messages in thread
From: Greg KH @ 2003-04-24 23:47 UTC (permalink / raw)
To: linux-usb-devel, linux-kernel
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 */
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH] More USB fixes for 2.5.68
2003-04-24 23:47 ` Greg KH
@ 2003-04-24 23:47 ` Greg KH
2003-04-24 23:47 ` Greg KH
0 siblings, 1 reply; 22+ messages in thread
From: Greg KH @ 2003-04-24 23:47 UTC (permalink / raw)
To: linux-usb-devel, linux-kernel
ChangeSet 1.1165.2.18, 2003/04/23 17:49:06-07:00, greg@kroah.com
[PATCH] USB: whiteheat: add support for new tty tiocmget and tiocmset functions.
drivers/usb/serial/whiteheat.c | 92 ++++++++++++++++-------------------------
1 files changed, 38 insertions(+), 54 deletions(-)
diff -Nru a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c
--- a/drivers/usb/serial/whiteheat.c Thu Apr 24 16:20:13 2003
+++ b/drivers/usb/serial/whiteheat.c Thu Apr 24 16:20:13 2003
@@ -146,6 +146,8 @@
static int whiteheat_write_room (struct usb_serial_port *port);
static int whiteheat_ioctl (struct usb_serial_port *port, struct file * file, unsigned int cmd, unsigned long arg);
static void whiteheat_set_termios (struct usb_serial_port *port, struct termios * old);
+static int whiteheat_tiocmget (struct usb_serial_port *port, struct file *file);
+static int whiteheat_tiocmset (struct usb_serial_port *port, struct file *file, unsigned int set, unsigned int clear);
static void whiteheat_break_ctl (struct usb_serial_port *port, int break_state);
static int whiteheat_chars_in_buffer (struct usb_serial_port *port);
static void whiteheat_throttle (struct usb_serial_port *port);
@@ -184,6 +186,8 @@
.ioctl = whiteheat_ioctl,
.set_termios = whiteheat_set_termios,
.break_ctl = whiteheat_break_ctl,
+ .tiocmget = whiteheat_tiocmget,
+ .tiocmset = whiteheat_tiocmset,
.chars_in_buffer = whiteheat_chars_in_buffer,
.throttle = whiteheat_throttle,
.unthrottle = whiteheat_unthrottle,
@@ -767,73 +771,53 @@
}
-static int whiteheat_ioctl (struct usb_serial_port *port, struct file * file, unsigned int cmd, unsigned long arg)
+static int whiteheat_tiocmget (struct usb_serial_port *port, struct file *file)
{
struct whiteheat_private *info = usb_get_serial_port_data(port);
unsigned int modem_signals = 0;
- struct serial_struct serstruct;
-
- dbg("%s - port %d, cmd 0x%.4x", __FUNCTION__, port->number, cmd);
- switch (cmd) {
- case TIOCMGET:
- firm_get_dtr_rts(port);
- if (info->mcr & UART_MCR_DTR)
- modem_signals |= TIOCM_DTR;
- if (info->mcr & UART_MCR_RTS)
- modem_signals |= TIOCM_RTS;
-
- if (copy_to_user((unsigned int *)arg, &modem_signals, sizeof(unsigned int)))
- return -EFAULT;
-
- break;
-
- case TIOCMSET:
- if (copy_from_user(&modem_signals, (unsigned int *)arg, sizeof(unsigned int)))
- return -EFAULT;
-
- if (modem_signals & TIOCM_DTR)
- info->mcr |= UART_MCR_DTR;
- else
- info->mcr &= ~UART_MCR_DTR;
- if (modem_signals & TIOCM_RTS)
- info->mcr |= UART_MCR_RTS;
- else
- info->mcr &= ~UART_MCR_RTS;
+ dbg("%s - port %d", __FUNCTION__, port->number);
- firm_set_dtr(port, info->mcr & UART_MCR_DTR);
- firm_set_rts(port, info->mcr & UART_MCR_RTS);
+ firm_get_dtr_rts(port);
+ if (info->mcr & UART_MCR_DTR)
+ modem_signals |= TIOCM_DTR;
+ if (info->mcr & UART_MCR_RTS)
+ modem_signals |= TIOCM_RTS;
- break;
+ return modem_signals;
+}
- case TIOCMBIS:
- if (copy_from_user(&modem_signals, (unsigned int *)arg, sizeof(unsigned int)))
- return -EFAULT;
- if (modem_signals & TIOCM_DTR)
- info->mcr |= UART_MCR_DTR;
- if (modem_signals & TIOCM_RTS)
- info->mcr |= UART_MCR_RTS;
+static int whiteheat_tiocmset (struct usb_serial_port *port, struct file *file,
+ unsigned int set, unsigned int clear)
+{
+ struct whiteheat_private *info = usb_get_serial_port_data(port);
- firm_set_dtr(port, info->mcr & UART_MCR_DTR);
- firm_set_rts(port, info->mcr & UART_MCR_RTS);
+ dbg("%s - port %d", __FUNCTION__, port->number);
- break;
+ if (set & TIOCM_RTS)
+ info->mcr |= UART_MCR_RTS;
+ if (set & TIOCM_DTR)
+ info->mcr |= UART_MCR_DTR;
+
+ if (clear & TIOCM_RTS)
+ info->mcr &= ~UART_MCR_RTS;
+ if (clear & TIOCM_DTR)
+ info->mcr &= ~UART_MCR_DTR;
- case TIOCMBIC:
- if (copy_from_user(&modem_signals, (unsigned int *)arg, sizeof(unsigned int)))
- return -EFAULT;
+ firm_set_dtr(port, info->mcr & UART_MCR_DTR);
+ firm_set_rts(port, info->mcr & UART_MCR_RTS);
+ return 0;
+}
- if (modem_signals & TIOCM_DTR)
- info->mcr &= ~UART_MCR_DTR;
- if (modem_signals & TIOCM_RTS)
- info->mcr &= ~UART_MCR_RTS;
- firm_set_dtr(port, info->mcr & UART_MCR_DTR);
- firm_set_rts(port, info->mcr & UART_MCR_RTS);
+static int whiteheat_ioctl (struct usb_serial_port *port, struct file * file, unsigned int cmd, unsigned long arg)
+{
+ struct serial_struct serstruct;
- break;
+ dbg("%s - port %d, cmd 0x%.4x", __FUNCTION__, port->number, cmd);
+ switch (cmd) {
case TIOCGSERIAL:
memset(&serstruct, 0, sizeof(serstruct));
serstruct.type = PORT_16654;
@@ -864,10 +848,10 @@
break;
default:
- return -ENOIOCTLCMD;
+ break;
}
- return 0;
+ return -ENOIOCTLCMD;
}
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH] More USB fixes for 2.5.68
2003-04-24 23:47 ` Greg KH
@ 2003-04-24 23:47 ` Greg KH
2003-04-24 23:47 ` Greg KH
0 siblings, 1 reply; 22+ messages in thread
From: Greg KH @ 2003-04-24 23:47 UTC (permalink / raw)
To: linux-usb-devel, linux-kernel
ChangeSet 1.1165.2.11, 2003/04/23 17:37:29-07:00, greg@kroah.com
[PATCH] USB: digi_acceleport: add support for new tty tiocmget and tiocmset functions.
drivers/usb/serial/digi_acceleport.c | 62 +++++++++++++++++++++--------------
1 files changed, 38 insertions(+), 24 deletions(-)
diff -Nru a/drivers/usb/serial/digi_acceleport.c b/drivers/usb/serial/digi_acceleport.c
--- a/drivers/usb/serial/digi_acceleport.c Thu Apr 24 16:23:25 2003
+++ b/drivers/usb/serial/digi_acceleport.c Thu Apr 24 16:23:25 2003
@@ -460,6 +460,9 @@
static void digi_break_ctl( struct usb_serial_port *port, int break_state );
static int digi_ioctl( struct usb_serial_port *port, struct file *file,
unsigned int cmd, unsigned long arg );
+static int digi_tiocmget( struct usb_serial_port *port, struct file *file );
+static int digi_tiocmset( struct usb_serial_port *port, struct file *file,
+ unsigned int set, unsigned int clear );
static int digi_write( struct usb_serial_port *port, int from_user,
const unsigned char *buf, int count );
static void digi_write_bulk_callback( struct urb *urb, struct pt_regs *regs );
@@ -526,6 +529,8 @@
.ioctl = digi_ioctl,
.set_termios = digi_set_termios,
.break_ctl = digi_break_ctl,
+ .tiocmget = digi_tiocmget,
+ .tiocmset = digi_tiocmset,
.attach = digi_startup,
.shutdown = digi_shutdown,
};
@@ -551,6 +556,8 @@
.ioctl = digi_ioctl,
.set_termios = digi_set_termios,
.break_ctl = digi_break_ctl,
+ .tiocmget = digi_tiocmget,
+ .tiocmset = digi_tiocmset,
.attach = digi_startup,
.shutdown = digi_shutdown,
};
@@ -1211,39 +1218,46 @@
}
-static int digi_ioctl( struct usb_serial_port *port, struct file *file,
- unsigned int cmd, unsigned long arg )
+static int digi_tiocmget( struct usb_serial_port *port, struct file *file )
{
+ struct digi_port *priv = usb_get_serial_port_data(port);
+ unsigned int val;
+ unsigned long flags;
+
+ dbg("%s: TOP: port=%d", __FUNCTION__, priv->dp_port_num);
+
+ spin_lock_irqsave( &priv->dp_port_lock, flags );
+ val = priv->dp_modem_signals;
+ spin_unlock_irqrestore( &priv->dp_port_lock, flags );
+ return val;
+}
+
+static int digi_tiocmset( struct usb_serial_port *port, struct file *file,
+ unsigned int set, unsigned int clear )
+{
struct digi_port *priv = usb_get_serial_port_data(port);
unsigned int val;
- unsigned long flags = 0;
+ unsigned long flags;
+ dbg("%s: TOP: port=%d", __FUNCTION__, priv->dp_port_num);
+
+ spin_lock_irqsave( &priv->dp_port_lock, flags );
+ val = (priv->dp_modem_signals & ~clear) | set;
+ spin_unlock_irqrestore( &priv->dp_port_lock, flags );
+ return digi_set_modem_signals( port, val, 1 );
+}
+
+
+static int digi_ioctl( struct usb_serial_port *port, struct file *file,
+ unsigned int cmd, unsigned long arg )
+{
+
+ struct digi_port *priv = usb_get_serial_port_data(port);
dbg( "digi_ioctl: TOP: port=%d, cmd=0x%x", priv->dp_port_num, cmd );
switch (cmd) {
-
- case TIOCMGET:
- spin_lock_irqsave( &priv->dp_port_lock, flags );
- val = priv->dp_modem_signals;
- spin_unlock_irqrestore( &priv->dp_port_lock, flags );
- if( copy_to_user((unsigned int *)arg, &val, sizeof(int)) )
- return( -EFAULT );
- return( 0 );
-
- case TIOCMSET:
- case TIOCMBIS:
- case TIOCMBIC:
- if( copy_from_user(&val, (unsigned int *)arg, sizeof(int)) )
- return( -EFAULT );
- spin_lock_irqsave( &priv->dp_port_lock, flags );
- if( cmd == TIOCMBIS )
- val = priv->dp_modem_signals | val;
- else if( cmd == TIOCMBIC )
- val = priv->dp_modem_signals & ~val;
- spin_unlock_irqrestore( &priv->dp_port_lock, flags );
- return( digi_set_modem_signals( port, val, 1 ) );
case TIOCMIWAIT:
/* wait for any of the 4 modem inputs (DCD,RI,DSR,CTS)*/
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH] More USB fixes for 2.5.68
2003-04-24 23:47 ` Greg KH
@ 2003-04-24 23:47 ` Greg KH
2003-04-24 23:47 ` Greg KH
0 siblings, 1 reply; 22+ messages in thread
From: Greg KH @ 2003-04-24 23:47 UTC (permalink / raw)
To: linux-usb-devel, linux-kernel
ChangeSet 1.1165.2.15, 2003/04/23 17:48:10-07:00, greg@kroah.com
[PATCH] USB: kobil_sct: add support for new tty tiocmget and tiocmset functions.
drivers/usb/serial/kobil_sct.c | 200 +++++++++++++++++++++++------------------
1 files changed, 116 insertions(+), 84 deletions(-)
diff -Nru a/drivers/usb/serial/kobil_sct.c b/drivers/usb/serial/kobil_sct.c
--- a/drivers/usb/serial/kobil_sct.c Thu Apr 24 16:21:37 2003
+++ b/drivers/usb/serial/kobil_sct.c Thu Apr 24 16:21:37 2003
@@ -81,6 +81,9 @@
static int kobil_write_room(struct usb_serial_port *port);
static int kobil_ioctl(struct usb_serial_port *port, struct file *file,
unsigned int cmd, unsigned long arg);
+static int kobil_tiocmget(struct usb_serial_port *port, struct file *file);
+static int kobil_tiocmset(struct usb_serial_port *port, struct file *file,
+ unsigned int set, unsigned int clear);
static void kobil_read_int_callback( struct urb *urb, struct pt_regs *regs );
static void kobil_write_callback( struct urb *purb, struct pt_regs *regs );
@@ -106,6 +109,8 @@
.attach = kobil_startup,
.shutdown = kobil_shutdown,
.ioctl = kobil_ioctl,
+ .tiocmget = kobil_tiocmget,
+ .tiocmset = kobil_tiocmset,
.open = kobil_open,
.close = kobil_close,
.write = kobil_write,
@@ -490,11 +495,120 @@
}
+static int kobil_tiocmget(struct usb_serial_port *port, struct file *file)
+{
+ struct kobil_private * priv;
+ int result;
+ unsigned char *transfer_buffer;
+ int transfer_buffer_length = 8;
+
+ priv = usb_get_serial_port_data(port);
+ if (priv->device_type == KOBIL_USBTWIN_PRODUCT_ID) {
+ // This device doesn't support ioctl calls
+ return -EINVAL;
+ }
+
+ // allocate memory for transfer buffer
+ transfer_buffer = (unsigned char *) kmalloc(transfer_buffer_length, GFP_KERNEL);
+ if (!transfer_buffer) {
+ return -ENOMEM;
+ }
+ memset(transfer_buffer, 0, transfer_buffer_length);
+
+ result = usb_control_msg( port->serial->dev,
+ usb_rcvctrlpipe(port->serial->dev, 0 ),
+ SUSBCRequest_GetStatusLineState,
+ USB_TYPE_VENDOR | USB_RECIP_ENDPOINT | USB_DIR_IN,
+ 0,
+ 0,
+ transfer_buffer,
+ transfer_buffer_length,
+ KOBIL_TIMEOUT);
+
+ dbg("%s - port %d Send get_status_line_state URB returns: %i. Statusline: %02x",
+ __FUNCTION__, port->number, result, transfer_buffer[0]);
+
+ if ((transfer_buffer[0] & SUSBCR_GSL_DSR) != 0) {
+ priv->line_state |= TIOCM_DSR;
+ } else {
+ priv->line_state &= ~TIOCM_DSR;
+ }
+
+ kfree(transfer_buffer);
+ return priv->line_state;
+}
+
+static int kobil_tiocmset(struct usb_serial_port *port, struct file *file,
+ unsigned int set, unsigned int clear)
+{
+ struct kobil_private * priv;
+ int result;
+ int dtr = 0;
+ int rts = 0;
+ unsigned char *transfer_buffer;
+ int transfer_buffer_length = 8;
+
+ priv = usb_get_serial_port_data(port);
+ if (priv->device_type == KOBIL_USBTWIN_PRODUCT_ID) {
+ // This device doesn't support ioctl calls
+ return -EINVAL;
+ }
+
+ // allocate memory for transfer buffer
+ transfer_buffer = (unsigned char *) kmalloc(transfer_buffer_length, GFP_KERNEL);
+ if (! transfer_buffer) {
+ return -ENOMEM;
+ }
+ memset(transfer_buffer, 0, transfer_buffer_length);
+
+ if (set & TIOCM_RTS)
+ rts = 1;
+ if (set & TIOCM_DTR)
+ dtr = 1;
+ if (clear & TIOCM_RTS)
+ rts = 0;
+ if (clear & TIOCM_DTR)
+ dtr = 0;
+
+ if (priv->device_type == KOBIL_ADAPTER_B_PRODUCT_ID) {
+ if (dtr != 0)
+ dbg("%s - port %d Setting DTR", __FUNCTION__, port->number);
+ else
+ dbg("%s - port %d Clearing DTR", __FUNCTION__, port->number);
+ result = usb_control_msg( port->serial->dev,
+ usb_rcvctrlpipe(port->serial->dev, 0 ),
+ SUSBCRequest_SetStatusLinesOrQueues,
+ USB_TYPE_VENDOR | USB_RECIP_ENDPOINT | USB_DIR_OUT,
+ ((dtr != 0) ? SUSBCR_SSL_SETDTR : SUSBCR_SSL_CLRDTR),
+ 0,
+ transfer_buffer,
+ 0,
+ KOBIL_TIMEOUT);
+ } else {
+ if (rts != 0)
+ dbg("%s - port %d Setting RTS", __FUNCTION__, port->number);
+ else
+ dbg("%s - port %d Clearing RTS", __FUNCTION__, port->number);
+ result = usb_control_msg( port->serial->dev,
+ usb_rcvctrlpipe(port->serial->dev, 0 ),
+ SUSBCRequest_SetStatusLinesOrQueues,
+ USB_TYPE_VENDOR | USB_RECIP_ENDPOINT | USB_DIR_OUT,
+ ((rts != 0) ? SUSBCR_SSL_SETRTS : SUSBCR_SSL_CLRRTS),
+ 0,
+ transfer_buffer,
+ 0,
+ KOBIL_TIMEOUT);
+ }
+ dbg("%s - port %d Send set_status_line URB returns: %i", __FUNCTION__, port->number, result);
+ kfree(transfer_buffer);
+ return (result < 0) ? result : 0;
+}
+
+
static int kobil_ioctl(struct usb_serial_port *port, struct file *file,
unsigned int cmd, unsigned long arg)
{
struct kobil_private * priv;
- int mask;
int result;
unsigned short urb_val = 0;
unsigned char *transfer_buffer;
@@ -605,90 +719,8 @@
kfree(transfer_buffer);
return ((result < 0) ? -EFAULT : 0);
- case TIOCMGET: // 0x5415
- // allocate memory for transfer buffer
- transfer_buffer = (unsigned char *) kmalloc(transfer_buffer_length, GFP_KERNEL);
- if (! transfer_buffer) {
- return -ENOBUFS;
- } else {
- memset(transfer_buffer, 0, transfer_buffer_length);
- }
-
- result = usb_control_msg( port->serial->dev,
- usb_rcvctrlpipe(port->serial->dev, 0 ),
- SUSBCRequest_GetStatusLineState,
- USB_TYPE_VENDOR | USB_RECIP_ENDPOINT | USB_DIR_IN,
- 0,
- 0,
- transfer_buffer,
- transfer_buffer_length,
- KOBIL_TIMEOUT
- );
-
- dbg("%s - port %d Send get_status_line_state (TIOCMGET) URB returns: %i. Statusline: %02x",
- __FUNCTION__, port->number, result, transfer_buffer[0]);
-
- if ((transfer_buffer[0] & SUSBCR_GSL_DSR) != 0) {
- priv->line_state |= TIOCM_DSR;
- } else {
- priv->line_state &= ~TIOCM_DSR;
- }
-
- kfree(transfer_buffer);
- return put_user(priv->line_state, (unsigned long *) arg);
-
- case TIOCMSET: // 0x5418
- if (get_user(mask, (unsigned long *) arg)){
- return -EFAULT;
- }
- // allocate memory for transfer buffer
- transfer_buffer = (unsigned char *) kmalloc(transfer_buffer_length, GFP_KERNEL);
- if (! transfer_buffer) {
- return -ENOBUFS;
- } else {
- memset(transfer_buffer, 0, transfer_buffer_length);
- }
-
- if (priv->device_type == KOBIL_ADAPTER_B_PRODUCT_ID) {
- if ((mask & TIOCM_DTR) != 0){
- dbg("%s - port %d Setting DTR", __FUNCTION__, port->number);
- } else {
- dbg("%s - port %d Clearing DTR", __FUNCTION__, port->number);
- }
- result = usb_control_msg( port->serial->dev,
- usb_rcvctrlpipe(port->serial->dev, 0 ),
- SUSBCRequest_SetStatusLinesOrQueues,
- USB_TYPE_VENDOR | USB_RECIP_ENDPOINT | USB_DIR_OUT,
- ( ((mask & TIOCM_DTR) != 0) ? SUSBCR_SSL_SETDTR : SUSBCR_SSL_CLRDTR),
- 0,
- transfer_buffer,
- 0,
- KOBIL_TIMEOUT
- );
-
- } else {
- if ((mask & TIOCM_RTS) != 0){
- dbg("%s - port %d Setting RTS", __FUNCTION__, port->number);
- } else {
- dbg("%s - port %d Clearing RTS", __FUNCTION__, port->number);
- }
- result = usb_control_msg( port->serial->dev,
- usb_rcvctrlpipe(port->serial->dev, 0 ),
- SUSBCRequest_SetStatusLinesOrQueues,
- USB_TYPE_VENDOR | USB_RECIP_ENDPOINT | USB_DIR_OUT,
- (((mask & TIOCM_RTS) != 0) ? SUSBCR_SSL_SETRTS : SUSBCR_SSL_CLRRTS),
- 0,
- transfer_buffer,
- 0,
- KOBIL_TIMEOUT
- );
- }
- dbg("%s - port %d Send set_status_line (TIOCMSET) URB returns: %i", __FUNCTION__, port->number, result);
-
- kfree(transfer_buffer);
- return ((result < 0) ? -EFAULT : 0);
}
- return 0;
+ return -ENOIOCTLCMD;
}
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH] More USB fixes for 2.5.68
2003-04-24 23:47 ` Greg KH
@ 2003-04-24 23:47 ` Greg KH
2003-04-24 23:47 ` Greg KH
0 siblings, 1 reply; 22+ messages in thread
From: Greg KH @ 2003-04-24 23:47 UTC (permalink / raw)
To: linux-usb-devel, linux-kernel
ChangeSet 1.1165.2.17, 2003/04/23 17:48:48-07:00, greg@kroah.com
[PATCH] USB: pl2303: add support for new tty tiocmget and tiocmset functions.
drivers/usb/serial/pl2303.c | 63 +++++++++++++-------------------------------
1 files changed, 19 insertions(+), 44 deletions(-)
diff -Nru a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
--- a/drivers/usb/serial/pl2303.c Thu Apr 24 16:20:41 2003
+++ b/drivers/usb/serial/pl2303.c Thu Apr 24 16:20:41 2003
@@ -124,6 +124,9 @@
static int pl2303_write (struct usb_serial_port *port, int from_user,
const unsigned char *buf, int count);
static void pl2303_break_ctl(struct usb_serial_port *port,int break_state);
+static int pl2303_tiocmget (struct usb_serial_port *port, struct file *file);
+static int pl2303_tiocmset (struct usb_serial_port *port, struct file *file,
+ unsigned int set, unsigned int clear);
static int pl2303_startup (struct usb_serial *serial);
static void pl2303_shutdown (struct usb_serial *serial);
@@ -143,6 +146,8 @@
.ioctl = pl2303_ioctl,
.break_ctl = pl2303_break_ctl,
.set_termios = pl2303_set_termios,
+ .tiocmget = pl2303_tiocmget,
+ .tiocmset = pl2303_tiocmset,
.read_bulk_callback = pl2303_read_bulk_callback,
.read_int_callback = pl2303_read_int_callback,
.write_bulk_callback = pl2303_write_bulk_callback,
@@ -490,51 +495,35 @@
}
-static int set_modem_info (struct usb_serial_port *port, unsigned int cmd, unsigned int *value)
+static int pl2303_tiocmset (struct usb_serial_port *port, struct file *file,
+ unsigned int set, unsigned int clear)
{
struct pl2303_private *priv = usb_get_serial_port_data(port);
- unsigned int arg;
u8 control;
- if (copy_from_user(&arg, value, sizeof(int)))
- return -EFAULT;
-
spin_lock (&priv->lock);
- switch (cmd) {
- case TIOCMBIS:
- if (arg & TIOCM_RTS)
- priv->line_control |= CONTROL_RTS;
- if (arg & TIOCM_DTR)
- priv->line_control |= CONTROL_DTR;
- break;
-
- case TIOCMBIC:
- if (arg & TIOCM_RTS)
- priv->line_control &= ~CONTROL_RTS;
- if (arg & TIOCM_DTR)
- priv->line_control &= ~CONTROL_DTR;
- break;
-
- case TIOCMSET:
- /* turn off RTS and DTR and then only turn
- on what was asked to */
- priv->line_control &= ~(CONTROL_RTS | CONTROL_DTR);
- priv->line_control |= ((arg & TIOCM_RTS) ? CONTROL_RTS : 0);
- priv->line_control |= ((arg & TIOCM_DTR) ? CONTROL_DTR : 0);
- break;
- }
+ if (set & TIOCM_RTS)
+ priv->line_control |= CONTROL_RTS;
+ if (set & TIOCM_DTR)
+ priv->line_control |= CONTROL_DTR;
+ if (clear & TIOCM_RTS)
+ priv->line_control &= ~CONTROL_RTS;
+ if (clear & TIOCM_DTR)
+ priv->line_control &= ~CONTROL_DTR;
control = priv->line_control;
spin_unlock (&priv->lock);
return set_control_lines (port->serial->dev, control);
}
-static int get_modem_info (struct usb_serial_port *port, unsigned int *value)
+static int pl2303_tiocmget (struct usb_serial_port *port, struct file *file)
{
struct pl2303_private *priv = usb_get_serial_port_data(port);
unsigned int mcr;
unsigned int result;
+ dbg("%s (%d)", __FUNCTION__, port->number);
+
spin_lock (&priv->lock);
mcr = priv->line_control;
spin_unlock (&priv->lock);
@@ -544,9 +533,7 @@
dbg("%s - result = %x", __FUNCTION__, result);
- if (copy_to_user(value, &result, sizeof(int)))
- return -EFAULT;
- return 0;
+ return result;
}
static int pl2303_ioctl (struct usb_serial_port *port, struct file *file, unsigned int cmd, unsigned long arg)
@@ -554,17 +541,6 @@
dbg("%s (%d) cmd = 0x%04x", __FUNCTION__, port->number, cmd);
switch (cmd) {
-
- case TIOCMGET:
- dbg("%s (%d) TIOCMGET", __FUNCTION__, port->number);
- return get_modem_info (port, (unsigned int *)arg);
-
- case TIOCMBIS:
- case TIOCMBIC:
- case TIOCMSET:
- dbg("%s (%d) TIOCMSET/TIOCMBIC/TIOCMSET", __FUNCTION__, port->number);
- return set_modem_info(port, cmd, (unsigned int *) arg);
-
default:
dbg("%s not supported = 0x%04x", __FUNCTION__, cmd);
break;
@@ -572,7 +548,6 @@
return -ENOIOCTLCMD;
}
-
static void pl2303_break_ctl (struct usb_serial_port *port, int break_state)
{
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH] More USB fixes for 2.5.68
2003-04-24 23:47 ` Greg KH
@ 2003-04-24 23:47 ` Greg KH
2003-04-24 23:47 ` Greg KH
0 siblings, 1 reply; 22+ messages in thread
From: Greg KH @ 2003-04-24 23:47 UTC (permalink / raw)
To: linux-usb-devel, linux-kernel
ChangeSet 1.1165.2.13, 2003/04/23 17:47:05-07:00, greg@kroah.com
[PATCH] USB: keyspan_pda: add support for new tty tiocmget and tiocmset functions.
drivers/usb/serial/io_edgeport.c | 80 ++++++++++++---------------------
drivers/usb/serial/io_tables.h | 8 +++
drivers/usb/serial/io_ti.c | 82 ++++++++++++----------------------
drivers/usb/serial/keyspan.c | 68 +++++++++++++---------------
drivers/usb/serial/keyspan.h | 11 ++++
drivers/usb/serial/keyspan_pda.c | 94 ++++++++++++++++++---------------------
6 files changed, 156 insertions(+), 187 deletions(-)
diff -Nru a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c
--- a/drivers/usb/serial/io_edgeport.c Thu Apr 24 16:22:31 2003
+++ b/drivers/usb/serial/io_edgeport.c Thu Apr 24 16:22:31 2003
@@ -455,6 +455,8 @@
static void edge_set_termios (struct usb_serial_port *port, struct termios *old_termios);
static int edge_ioctl (struct usb_serial_port *port, struct file *file, unsigned int cmd, unsigned long arg);
static void edge_break (struct usb_serial_port *port, int break_state);
+static int edge_tiocmget (struct usb_serial_port *port, struct file *file);
+static int edge_tiocmset (struct usb_serial_port *port, struct file *file, unsigned int set, unsigned int clear);
static int edge_startup (struct usb_serial *serial);
static void edge_shutdown (struct usb_serial *serial);
@@ -1762,42 +1764,27 @@
return -ENOIOCTLCMD;
}
-static int set_modem_info(struct edgeport_port *edge_port, unsigned int cmd, unsigned int *value)
+static int edge_tiocmset (struct usb_serial_port *port, struct file *file, unsigned int set, unsigned int clear)
{
- unsigned int mcr = edge_port->shadowMCR;
- unsigned int arg;
-
- if (copy_from_user(&arg, value, sizeof(int)))
- return -EFAULT;
-
- switch (cmd) {
- case TIOCMBIS:
- if (arg & TIOCM_RTS)
- mcr |= MCR_RTS;
- if (arg & TIOCM_DTR)
- mcr |= MCR_RTS;
- if (arg & TIOCM_LOOP)
- mcr |= MCR_LOOPBACK;
- break;
+ struct edgeport_port *edge_port = usb_get_serial_port_data(port);
+ unsigned int mcr;
- case TIOCMBIC:
- if (arg & TIOCM_RTS)
- mcr &= ~MCR_RTS;
- if (arg & TIOCM_DTR)
- mcr &= ~MCR_RTS;
- if (arg & TIOCM_LOOP)
- mcr &= ~MCR_LOOPBACK;
- break;
+ dbg("%s - port %d", __FUNCTION__, port->number);
- case TIOCMSET:
- /* turn off the RTS and DTR and LOOPBACK
- * and then only turn on what was asked to */
- mcr &= ~(MCR_RTS | MCR_DTR | MCR_LOOPBACK);
- mcr |= ((arg & TIOCM_RTS) ? MCR_RTS : 0);
- mcr |= ((arg & TIOCM_DTR) ? MCR_DTR : 0);
- mcr |= ((arg & TIOCM_LOOP) ? MCR_LOOPBACK : 0);
- break;
- }
+ mcr = edge_port->shadowMCR;
+ if (set & TIOCM_RTS)
+ mcr |= MCR_RTS;
+ if (set & TIOCM_DTR)
+ mcr |= MCR_DTR;
+ if (set & TIOCM_LOOP)
+ mcr |= MCR_LOOPBACK;
+
+ if (clear & TIOCM_RTS)
+ mcr &= ~MCR_RTS;
+ if (clear & TIOCM_DTR)
+ mcr &= ~MCR_DTR;
+ if (clear & TIOCM_LOOP)
+ mcr &= ~MCR_LOOPBACK;
edge_port->shadowMCR = mcr;
@@ -1806,12 +1793,17 @@
return 0;
}
-static int get_modem_info(struct edgeport_port *edge_port, unsigned int *value)
+static int edge_tiocmget(struct usb_serial_port *port, struct file *file)
{
+ struct edgeport_port *edge_port = usb_get_serial_port_data(port);
unsigned int result = 0;
- unsigned int msr = edge_port->shadowMSR;
- unsigned int mcr = edge_port->shadowMCR;
+ unsigned int msr;
+ unsigned int mcr;
+
+ dbg("%s - port %d", __FUNCTION__, port->number);
+ msr = edge_port->shadowMSR;
+ mcr = edge_port->shadowMCR;
result = ((mcr & MCR_DTR) ? TIOCM_DTR: 0) /* 0x002 */
| ((mcr & MCR_RTS) ? TIOCM_RTS: 0) /* 0x004 */
| ((msr & MSR_CTS) ? TIOCM_CTS: 0) /* 0x020 */
@@ -1822,13 +1814,9 @@
dbg("%s -- %x", __FUNCTION__, result);
- if (copy_to_user(value, &result, sizeof(int)))
- return -EFAULT;
- return 0;
+ return result;
}
-
-
static int get_serial_info(struct edgeport_port *edge_port, struct serial_struct * retinfo)
{
struct serial_struct tmp;
@@ -1884,16 +1872,6 @@
dbg("%s (%d) TIOCSERGETLSR", __FUNCTION__, port->number);
return get_lsr_info(edge_port, (unsigned int *) arg);
return 0;
-
- case TIOCMBIS:
- case TIOCMBIC:
- case TIOCMSET:
- dbg("%s (%d) TIOCMSET/TIOCMBIC/TIOCMSET", __FUNCTION__, port->number);
- return set_modem_info(edge_port, cmd, (unsigned int *) arg);
-
- case TIOCMGET:
- dbg("%s (%d) TIOCMGET", __FUNCTION__, port->number);
- return get_modem_info(edge_port, (unsigned int *) arg);
case TIOCGSERIAL:
dbg("%s (%d) TIOCGSERIAL", __FUNCTION__, port->number);
diff -Nru a/drivers/usb/serial/io_tables.h b/drivers/usb/serial/io_tables.h
--- a/drivers/usb/serial/io_tables.h Thu Apr 24 16:22:31 2003
+++ b/drivers/usb/serial/io_tables.h Thu Apr 24 16:22:31 2003
@@ -114,6 +114,8 @@
.shutdown = edge_shutdown,
.ioctl = edge_ioctl,
.set_termios = edge_set_termios,
+ .tiocmget = edge_tiocmget,
+ .tiocmset = edge_tiocmset,
.write = edge_write,
.write_room = edge_write_room,
.chars_in_buffer = edge_chars_in_buffer,
@@ -137,6 +139,8 @@
.shutdown = edge_shutdown,
.ioctl = edge_ioctl,
.set_termios = edge_set_termios,
+ .tiocmget = edge_tiocmget,
+ .tiocmset = edge_tiocmset,
.write = edge_write,
.write_room = edge_write_room,
.chars_in_buffer = edge_chars_in_buffer,
@@ -160,6 +164,8 @@
.shutdown = edge_shutdown,
.ioctl = edge_ioctl,
.set_termios = edge_set_termios,
+ .tiocmget = edge_tiocmget,
+ .tiocmset = edge_tiocmset,
.write = edge_write,
.write_room = edge_write_room,
.chars_in_buffer = edge_chars_in_buffer,
@@ -183,6 +189,8 @@
.shutdown = edge_shutdown,
.ioctl = edge_ioctl,
.set_termios = edge_set_termios,
+ .tiocmget = edge_tiocmget,
+ .tiocmset = edge_tiocmset,
.write = edge_write,
.write_room = edge_write_room,
.chars_in_buffer = edge_chars_in_buffer,
diff -Nru a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c
--- a/drivers/usb/serial/io_ti.c Thu Apr 24 16:22:31 2003
+++ b/drivers/usb/serial/io_ti.c Thu Apr 24 16:22:31 2003
@@ -2403,42 +2403,27 @@
return;
}
-static int set_modem_info (struct edgeport_port *edge_port, unsigned int cmd, unsigned int *value)
+static int edge_tiocmset (struct usb_serial_port *port, struct file *file, unsigned int set, unsigned int clear)
{
- unsigned int mcr = edge_port->shadow_mcr;
- unsigned int arg;
+ struct edgeport_port *edge_port = usb_get_serial_port_data(port);
+ unsigned int mcr;
- if (copy_from_user(&arg, value, sizeof(int)))
- return -EFAULT;
-
- switch (cmd) {
- case TIOCMBIS:
- if (arg & TIOCM_RTS)
- mcr |= MCR_RTS;
- if (arg & TIOCM_DTR)
- mcr |= MCR_RTS;
- if (arg & TIOCM_LOOP)
- mcr |= MCR_LOOPBACK;
- break;
+ dbg("%s - port %d", __FUNCTION__, port->number);
- case TIOCMBIC:
- if (arg & TIOCM_RTS)
- mcr &= ~MCR_RTS;
- if (arg & TIOCM_DTR)
- mcr &= ~MCR_RTS;
- if (arg & TIOCM_LOOP)
- mcr &= ~MCR_LOOPBACK;
- break;
-
- case TIOCMSET:
- /* turn off the RTS and DTR and LOOPBACK
- * and then only turn on what was asked to */
- mcr &= ~(MCR_RTS | MCR_DTR | MCR_LOOPBACK);
- mcr |= ((arg & TIOCM_RTS) ? MCR_RTS : 0);
- mcr |= ((arg & TIOCM_DTR) ? MCR_DTR : 0);
- mcr |= ((arg & TIOCM_LOOP) ? MCR_LOOPBACK : 0);
- break;
- }
+ mcr = edge_port->shadow_mcr;
+ if (set & TIOCM_RTS)
+ mcr |= MCR_RTS;
+ if (set & TIOCM_DTR)
+ mcr |= MCR_DTR;
+ if (set & TIOCM_LOOP)
+ mcr |= MCR_LOOPBACK;
+
+ if (clear & TIOCM_RTS)
+ mcr &= ~MCR_RTS;
+ if (clear & TIOCM_DTR)
+ mcr &= ~MCR_DTR;
+ if (clear & TIOCM_LOOP)
+ mcr &= ~MCR_LOOPBACK;
edge_port->shadow_mcr = mcr;
@@ -2447,12 +2432,17 @@
return 0;
}
-static int get_modem_info (struct edgeport_port *edge_port, unsigned int *value)
+static int edge_tiocmget(struct usb_serial_port *port, struct file *file)
{
+ struct edgeport_port *edge_port = usb_get_serial_port_data(port);
unsigned int result = 0;
- unsigned int msr = edge_port->shadow_msr;
- unsigned int mcr = edge_port->shadow_mcr;
+ unsigned int msr;
+ unsigned int mcr;
+ dbg("%s - port %d", __FUNCTION__, port->number);
+
+ msr = edge_port->shadow_msr;
+ mcr = edge_port->shadow_mcr;
result = ((mcr & MCR_DTR) ? TIOCM_DTR: 0) /* 0x002 */
| ((mcr & MCR_RTS) ? TIOCM_RTS: 0) /* 0x004 */
| ((msr & MSR_CTS) ? TIOCM_CTS: 0) /* 0x020 */
@@ -2463,9 +2453,7 @@
dbg("%s -- %x", __FUNCTION__, result);
- if (copy_to_user(value, &result, sizeof(int)))
- return -EFAULT;
- return 0;
+ return result;
}
static int get_serial_info (struct edgeport_port *edge_port, struct serial_struct * retinfo)
@@ -2515,18 +2503,6 @@
// return get_lsr_info(edge_port, (unsigned int *) arg);
break;
- case TIOCMBIS:
- case TIOCMBIC:
- case TIOCMSET:
- dbg("%s - (%d) TIOCMSET/TIOCMBIC/TIOCMSET", __FUNCTION__, port->number);
- return set_modem_info(edge_port, cmd, (unsigned int *) arg);
- break;
-
- case TIOCMGET:
- dbg("%s - (%d) TIOCMGET", __FUNCTION__, port->number);
- return get_modem_info(edge_port, (unsigned int *) arg);
- break;
-
case TIOCGSERIAL:
dbg("%s - (%d) TIOCGSERIAL", __FUNCTION__, port->number);
return get_serial_info(edge_port, (struct serial_struct *) arg);
@@ -2665,6 +2641,8 @@
.shutdown = edge_shutdown,
.ioctl = edge_ioctl,
.set_termios = edge_set_termios,
+ .tiocmget = edge_tiocmget,
+ .tiocmset = edge_tiocmset,
.write = edge_write,
.write_room = edge_write_room,
.chars_in_buffer = edge_chars_in_buffer,
@@ -2688,6 +2666,8 @@
.shutdown = edge_shutdown,
.ioctl = edge_ioctl,
.set_termios = edge_set_termios,
+ .tiocmget = edge_tiocmget,
+ .tiocmset = edge_tiocmset,
.write = edge_write,
.write_room = edge_write_room,
.chars_in_buffer = edge_chars_in_buffer,
diff -Nru a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c
--- a/drivers/usb/serial/keyspan.c Thu Apr 24 16:22:31 2003
+++ b/drivers/usb/serial/keyspan.c Thu Apr 24 16:22:31 2003
@@ -282,48 +282,46 @@
keyspan_send_setup(port, 0);
}
-static int keyspan_ioctl(struct usb_serial_port *port, struct file *file,
- unsigned int cmd, unsigned long arg)
+static int keyspan_tiocmget(struct usb_serial_port *port, struct file *file)
{
- unsigned int value, set;
+ unsigned int value;
struct keyspan_port_private *p_priv;
p_priv = usb_get_serial_port_data(port);
- switch (cmd) {
- case TIOCMGET:
- value = ((p_priv->rts_state) ? TIOCM_RTS : 0) |
- ((p_priv->dtr_state) ? TIOCM_DTR : 0) |
- ((p_priv->cts_state) ? TIOCM_CTS : 0) |
- ((p_priv->dsr_state) ? TIOCM_DSR : 0) |
- ((p_priv->dcd_state) ? TIOCM_CAR : 0) |
- ((p_priv->ri_state) ? TIOCM_RNG : 0);
-
- if (put_user(value, (unsigned int *) arg))
- return -EFAULT;
- return 0;
+ value = ((p_priv->rts_state) ? TIOCM_RTS : 0) |
+ ((p_priv->dtr_state) ? TIOCM_DTR : 0) |
+ ((p_priv->cts_state) ? TIOCM_CTS : 0) |
+ ((p_priv->dsr_state) ? TIOCM_DSR : 0) |
+ ((p_priv->dcd_state) ? TIOCM_CAR : 0) |
+ ((p_priv->ri_state) ? TIOCM_RNG : 0);
+
+ return value;
+}
+
+static int keyspan_tiocmset(struct usb_serial_port *port, struct file *file,
+ unsigned int set, unsigned int clear)
+{
+ struct keyspan_port_private *p_priv;
+
+ p_priv = usb_get_serial_port_data(port);
- case TIOCMSET:
- if (get_user(value, (unsigned int *) arg))
- return -EFAULT;
- p_priv->rts_state = ((value & TIOCM_RTS) ? 1 : 0);
- p_priv->dtr_state = ((value & TIOCM_DTR) ? 1 : 0);
- keyspan_send_setup(port, 0);
- return 0;
-
- case TIOCMBIS:
- case TIOCMBIC:
- if (get_user(value, (unsigned int *) arg))
- return -EFAULT;
- set = (cmd == TIOCMBIS);
- if (value & TIOCM_RTS)
- p_priv->rts_state = set;
- if (value & TIOCM_DTR)
- p_priv->dtr_state = set;
- keyspan_send_setup(port, 0);
- return 0;
- }
+ if (set & TIOCM_RTS)
+ p_priv->rts_state = 1;
+ if (set & TIOCM_DTR)
+ p_priv->dtr_state = 1;
+
+ if (clear & TIOCM_RTS)
+ p_priv->rts_state = 0;
+ if (clear & TIOCM_DTR)
+ p_priv->dtr_state = 0;
+ keyspan_send_setup(port, 0);
+ return 0;
+}
+static int keyspan_ioctl(struct usb_serial_port *port, struct file *file,
+ unsigned int cmd, unsigned long arg)
+{
return -ENOIOCTLCMD;
}
diff -Nru a/drivers/usb/serial/keyspan.h b/drivers/usb/serial/keyspan.h
--- a/drivers/usb/serial/keyspan.h Thu Apr 24 16:22:31 2003
+++ b/drivers/usb/serial/keyspan.h Thu Apr 24 16:22:31 2003
@@ -63,6 +63,11 @@
struct termios *old);
static void keyspan_break_ctl (struct usb_serial_port *port,
int break_state);
+static int keyspan_tiocmget (struct usb_serial_port *port,
+ struct file *file);
+static int keyspan_tiocmset (struct usb_serial_port *port,
+ struct file *file, unsigned int set,
+ unsigned int clear);
static int keyspan_fake_startup (struct usb_serial *serial);
static int keyspan_usa19_calc_baud (u32 baud_rate, u32 baudclk,
@@ -551,6 +556,8 @@
.ioctl = keyspan_ioctl,
.set_termios = keyspan_set_termios,
.break_ctl = keyspan_break_ctl,
+ .tiocmget = keyspan_tiocmget,
+ .tiocmset = keyspan_tiocmset,
.attach = keyspan_startup,
.shutdown = keyspan_shutdown,
};
@@ -574,6 +581,8 @@
.ioctl = keyspan_ioctl,
.set_termios = keyspan_set_termios,
.break_ctl = keyspan_break_ctl,
+ .tiocmget = keyspan_tiocmget,
+ .tiocmset = keyspan_tiocmset,
.attach = keyspan_startup,
.shutdown = keyspan_shutdown,
};
@@ -597,6 +606,8 @@
.ioctl = keyspan_ioctl,
.set_termios = keyspan_set_termios,
.break_ctl = keyspan_break_ctl,
+ .tiocmget = keyspan_tiocmget,
+ .tiocmset = keyspan_tiocmset,
.attach = keyspan_startup,
.shutdown = keyspan_shutdown,
};
diff -Nru a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c
--- a/drivers/usb/serial/keyspan_pda.c Thu Apr 24 16:22:31 2003
+++ b/drivers/usb/serial/keyspan_pda.c Thu Apr 24 16:22:31 2003
@@ -457,62 +457,54 @@
return rc;
}
+static int keyspan_pda_tiocmget(struct usb_serial_port *port, struct file *file)
+{
+ struct usb_serial *serial = port->serial;
+ int rc;
+ unsigned char status;
+ int value;
-static int keyspan_pda_ioctl(struct usb_serial_port *port, struct file *file,
- unsigned int cmd, unsigned long arg)
+ rc = keyspan_pda_get_modem_info(serial, &status);
+ if (rc < 0)
+ return rc;
+ value =
+ ((status & (1<<7)) ? TIOCM_DTR : 0) |
+ ((status & (1<<6)) ? TIOCM_CAR : 0) |
+ ((status & (1<<5)) ? TIOCM_RNG : 0) |
+ ((status & (1<<4)) ? TIOCM_DSR : 0) |
+ ((status & (1<<3)) ? TIOCM_CTS : 0) |
+ ((status & (1<<2)) ? TIOCM_RTS : 0);
+ return value;
+}
+
+static int keyspan_pda_tiocmset(struct usb_serial_port *port, struct file *file,
+ unsigned int set, unsigned int clear)
{
struct usb_serial *serial = port->serial;
int rc;
- unsigned int value;
- unsigned char status, mask;
+ unsigned char status;
+ rc = keyspan_pda_get_modem_info(serial, &status);
+ if (rc < 0)
+ return rc;
+
+ if (set & TIOCM_RTS)
+ status |= (1<<2);
+ if (set & TIOCM_DTR)
+ status |= (1<<7);
+
+ if (clear & TIOCM_RTS)
+ status &= ~(1<<2);
+ if (clear & TIOCM_DTR)
+ status &= ~(1<<7);
+ rc = keyspan_pda_set_modem_info(serial, status);
+ return rc;
+}
+
+static int keyspan_pda_ioctl(struct usb_serial_port *port, struct file *file,
+ unsigned int cmd, unsigned long arg)
+{
switch (cmd) {
- case TIOCMGET: /* get modem pins state */
- rc = keyspan_pda_get_modem_info(serial, &status);
- if (rc < 0)
- return rc;
- value =
- ((status & (1<<7)) ? TIOCM_DTR : 0) |
- ((status & (1<<6)) ? TIOCM_CAR : 0) |
- ((status & (1<<5)) ? TIOCM_RNG : 0) |
- ((status & (1<<4)) ? TIOCM_DSR : 0) |
- ((status & (1<<3)) ? TIOCM_CTS : 0) |
- ((status & (1<<2)) ? TIOCM_RTS : 0);
- if (copy_to_user((unsigned int *)arg, &value, sizeof(int)))
- return -EFAULT;
- return 0;
- case TIOCMSET: /* set a state as returned by MGET */
- if (copy_from_user(&value, (unsigned int *)arg, sizeof(int)))
- return -EFAULT;
- status =
- ((value & TIOCM_DTR) ? (1<<7) : 0) |
- ((value & TIOCM_CAR) ? (1<<6) : 0) |
- ((value & TIOCM_RNG) ? (1<<5) : 0) |
- ((value & TIOCM_DSR) ? (1<<4) : 0) |
- ((value & TIOCM_CTS) ? (1<<3) : 0) |
- ((value & TIOCM_RTS) ? (1<<2) : 0);
- rc = keyspan_pda_set_modem_info(serial, status);
- if (rc < 0)
- return rc;
- return 0;
- case TIOCMBIS: /* set bits in bitmask <arg> */
- case TIOCMBIC: /* clear bits from bitmask <arg> */
- if (copy_from_user(&value, (unsigned int *)arg, sizeof(int)))
- return -EFAULT;
- rc = keyspan_pda_get_modem_info(serial, &status);
- if (rc < 0)
- return rc;
- mask =
- ((value & TIOCM_RTS) ? (1<<2) : 0) |
- ((value & TIOCM_DTR) ? (1<<7) : 0);
- if (cmd == TIOCMBIS)
- status |= mask;
- else
- status &= ~mask;
- rc = keyspan_pda_set_modem_info(serial, status);
- if (rc < 0)
- return rc;
- return 0;
case TIOCMIWAIT:
/* wait for any of the 4 modem inputs (DCD,RI,DSR,CTS)*/
/* TODO */
@@ -874,6 +866,8 @@
.ioctl = keyspan_pda_ioctl,
.set_termios = keyspan_pda_set_termios,
.break_ctl = keyspan_pda_break_ctl,
+ .tiocmget = keyspan_pda_tiocmget,
+ .tiocmset = keyspan_pda_tiocmset,
.attach = keyspan_pda_startup,
.shutdown = keyspan_pda_shutdown,
};
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH] More USB fixes for 2.5.68
2003-04-24 23:47 ` Greg KH
@ 2003-04-24 23:47 ` Greg KH
2003-04-24 23:47 ` Greg KH
0 siblings, 1 reply; 22+ messages in thread
From: Greg KH @ 2003-04-24 23:47 UTC (permalink / raw)
To: linux-usb-devel, linux-kernel
ChangeSet 1.1165.2.12, 2003/04/23 17:38:41-07:00, greg@kroah.com
[PATCH] USB: ftdi_sio: add support for new tty tiocmget and tiocmset functions.
drivers/usb/serial/ftdi_sio.c | 193 ++++++++++++++++++------------------------
1 files changed, 87 insertions(+), 106 deletions(-)
diff -Nru a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
--- a/drivers/usb/serial/ftdi_sio.c Thu Apr 24 16:23:00 2003
+++ b/drivers/usb/serial/ftdi_sio.c Thu Apr 24 16:23:00 2003
@@ -175,6 +175,8 @@
static void ftdi_sio_write_bulk_callback (struct urb *urb, struct pt_regs *regs);
static void ftdi_sio_read_bulk_callback (struct urb *urb, struct pt_regs *regs);
static void ftdi_sio_set_termios (struct usb_serial_port *port, struct termios * old);
+static int ftdi_sio_tiocmget (struct usb_serial_port *port, struct file *file);
+static int ftdi_sio_tiocmset (struct usb_serial_port *port, struct file *file, unsigned int set, unsigned int clear);
static int ftdi_sio_ioctl (struct usb_serial_port *port, struct file * file, unsigned int cmd, unsigned long arg);
static void ftdi_sio_break_ctl (struct usb_serial_port *port, int break_state );
@@ -198,6 +200,8 @@
.ioctl = ftdi_sio_ioctl,
.set_termios = ftdi_sio_set_termios,
.break_ctl = ftdi_sio_break_ctl,
+ .tiocmget = ftdi_sio_tiocmget,
+ .tiocmset = ftdi_sio_tiocmset,
.attach = ftdi_sio_startup,
.shutdown = ftdi_sio_shutdown,
};
@@ -219,6 +223,8 @@
.ioctl = ftdi_sio_ioctl,
.set_termios = ftdi_sio_set_termios,
.break_ctl = ftdi_sio_break_ctl,
+ .tiocmget = ftdi_sio_tiocmget,
+ .tiocmset = ftdi_sio_tiocmset,
.attach = ftdi_8U232AM_startup,
.shutdown = ftdi_sio_shutdown,
};
@@ -823,125 +829,100 @@
return;
} /* ftdi_sio_set_termios */
-static int ftdi_sio_ioctl (struct usb_serial_port *port, struct file * file, unsigned int cmd, unsigned long arg)
+static int ftdi_sio_tiocmget (struct usb_serial_port *port, struct file *file)
{
struct usb_serial *serial = port->serial;
struct ftdi_private *priv = usb_get_serial_port_data(port);
- __u16 urb_value=0; /* Will hold the new flags */
- char buf[2];
- int ret, mask;
+ char *buf = NULL;
+ int ret = -EINVAL;
+ int size;
- dbg("%s cmd 0x%04x", __FUNCTION__, cmd);
+ dbg("%s", __FUNCTION__);
- /* Based on code from acm.c and others */
- switch (cmd) {
+ buf = kmalloc(2, GFP_KERNEL);
+ if (!buf)
+ goto exit;
- case TIOCMGET:
- dbg("%s TIOCMGET", __FUNCTION__);
- if (priv->ftdi_type == sio){
- /* Request the status from the device */
- if ((ret = usb_control_msg(serial->dev,
- usb_rcvctrlpipe(serial->dev, 0),
- FTDI_SIO_GET_MODEM_STATUS_REQUEST,
- FTDI_SIO_GET_MODEM_STATUS_REQUEST_TYPE,
- 0, 0,
- buf, 1, WDR_TIMEOUT)) < 0 ) {
- err("%s Could not get modem status of device - err: %d", __FUNCTION__,
- ret);
- return(ret);
- }
- } else {
- /* the 8U232AM returns a two byte value (the sio is a 1 byte value) - in the same
- format as the data returned from the in point */
- if ((ret = usb_control_msg(serial->dev,
- usb_rcvctrlpipe(serial->dev, 0),
- FTDI_SIO_GET_MODEM_STATUS_REQUEST,
- FTDI_SIO_GET_MODEM_STATUS_REQUEST_TYPE,
- 0, 0,
- buf, 2, WDR_TIMEOUT)) < 0 ) {
- err("%s Could not get modem status of device - err: %d", __FUNCTION__,
- ret);
- return(ret);
- }
- }
+ if (priv->ftdi_type == sio) {
+ size = 1;
+ } else {
+ /* the 8U232AM returns a two byte value (the sio is a 1 byte value) - in the same
+ format as the data returned from the in point */
+ size = 2;
+ }
+ ret = usb_control_msg(serial->dev,
+ usb_rcvctrlpipe(serial->dev, 0),
+ FTDI_SIO_GET_MODEM_STATUS_REQUEST,
+ FTDI_SIO_GET_MODEM_STATUS_REQUEST_TYPE,
+ 0, 0, buf, size, WDR_TIMEOUT);
+ if (ret < 0) {
+ err("%s Could not get modem status of device - err: %d",
+ __FUNCTION__, ret);
+ goto exit;
+ }
+
+ ret = (buf[0] & FTDI_SIO_DSR_MASK ? TIOCM_DSR : 0) |
+ (buf[0] & FTDI_SIO_CTS_MASK ? TIOCM_CTS : 0) |
+ (buf[0] & FTDI_SIO_RI_MASK ? TIOCM_RI : 0) |
+ (buf[0] & FTDI_SIO_RLSD_MASK ? TIOCM_CD : 0);
+
+exit:
+ kfree(buf);
+ return ret;
+}
- return put_user((buf[0] & FTDI_SIO_DSR_MASK ? TIOCM_DSR : 0) |
- (buf[0] & FTDI_SIO_CTS_MASK ? TIOCM_CTS : 0) |
- (buf[0] & FTDI_SIO_RI_MASK ? TIOCM_RI : 0) |
- (buf[0] & FTDI_SIO_RLSD_MASK ? TIOCM_CD : 0),
- (unsigned long *) arg);
- break;
-
- case TIOCMSET: /* Turns on and off the lines as specified by the mask */
- dbg("%s TIOCMSET", __FUNCTION__);
- if (get_user(mask, (unsigned long *) arg))
- return -EFAULT;
- urb_value = ((mask & TIOCM_DTR) ? HIGH : LOW);
- if (set_dtr(serial->dev, usb_sndctrlpipe(serial->dev, 0),urb_value) < 0){
- err("Error from DTR set urb (TIOCMSET)");
- }
- urb_value = ((mask & TIOCM_RTS) ? HIGH : LOW);
- if (set_rts(serial->dev, usb_sndctrlpipe(serial->dev, 0),urb_value) < 0){
- err("Error from RTS set urb (TIOCMSET)");
- }
- break;
-
- case TIOCMBIS: /* turns on (Sets) the lines as specified by the mask */
- dbg("%s TIOCMBIS", __FUNCTION__);
- if (get_user(mask, (unsigned long *) arg))
- return -EFAULT;
- if (mask & TIOCM_DTR){
- if ((ret = set_dtr(serial->dev,
- usb_sndctrlpipe(serial->dev, 0),
- HIGH)) < 0) {
- err("Urb to set DTR failed");
- return(ret);
- }
- }
- if (mask & TIOCM_RTS) {
- if ((ret = set_rts(serial->dev,
- usb_sndctrlpipe(serial->dev, 0),
- HIGH)) < 0){
- err("Urb to set RTS failed");
- return(ret);
- }
- }
- break;
+static int ftdi_sio_tiocmset (struct usb_serial_port *port, struct file *file,
+ unsigned int set, unsigned int clear)
+{
+ struct usb_serial *serial = port->serial;
+ int ret = 0;
+
+ dbg("%s", __FUNCTION__);
- case TIOCMBIC: /* turns off (Clears) the lines as specified by the mask */
- dbg("%s TIOCMBIC", __FUNCTION__);
- if (get_user(mask, (unsigned long *) arg))
- return -EFAULT;
- if (mask & TIOCM_DTR){
- if ((ret = set_dtr(serial->dev,
- usb_sndctrlpipe(serial->dev, 0),
- LOW)) < 0){
- err("Urb to unset DTR failed");
- return(ret);
- }
- }
- if (mask & TIOCM_RTS) {
- if ((ret = set_rts(serial->dev,
- usb_sndctrlpipe(serial->dev, 0),
- LOW)) < 0){
- err("Urb to unset RTS failed");
- return(ret);
- }
+ if (set & TIOCM_RTS)
+ if ((ret = set_rts(serial->dev,
+ usb_sndctrlpipe(serial->dev, 0),
+ HIGH)) < 0) {
+ err("Urb to set RTS failed");
+ goto exit;
+ }
+
+ if (set & TIOCM_DTR)
+ if ((ret = set_dtr(serial->dev,
+ usb_sndctrlpipe(serial->dev, 0),
+ HIGH)) < 0) {
+ err("Urb to set DTR failed");
+ goto exit;
+ }
+
+ if (clear & TIOCM_RTS)
+ if ((ret = set_rts(serial->dev,
+ usb_sndctrlpipe(serial->dev, 0),
+ LOW)) < 0) {
+ err("Urb to unset RTS failed");
+ goto exit;
+ }
+
+ if (clear & TIOCM_DTR)
+ if ((ret = set_dtr(serial->dev,
+ usb_sndctrlpipe(serial->dev, 0),
+ LOW)) < 0) {
+ err("Urb to unset DTR failed");
+ goto exit;
}
- break;
- /*
- * I had originally implemented TCSET{A,S}{,F,W} and
- * TCGET{A,S} here separately, however when testing I
- * found that the higher layers actually do the termios
- * conversions themselves and pass the call onto
- * ftdi_sio_set_termios.
- *
- */
+exit:
+ return ret;
+}
+static int ftdi_sio_ioctl (struct usb_serial_port *port, struct file * file, unsigned int cmd, unsigned long arg)
+{
+ dbg("%s cmd 0x%04x", __FUNCTION__, cmd);
+
+ switch (cmd) {
default:
/* This is not an error - turns out the higher layers will do
- * some ioctls itself (see comment above)
+ * some ioctls itself
*/
dbg("%s arg not supported - it was 0x%04x", __FUNCTION__,cmd);
return(-ENOIOCTLCMD);
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH] More USB fixes for 2.5.68
2003-04-24 23:47 ` Greg KH
@ 2003-04-24 23:47 ` Greg KH
2003-04-24 23:47 ` Greg KH
0 siblings, 1 reply; 22+ messages in thread
From: Greg KH @ 2003-04-24 23:47 UTC (permalink / raw)
To: linux-usb-devel, linux-kernel
ChangeSet 1.1165.2.14, 2003/04/23 17:47:50-07:00, greg@kroah.com
[PATCH] USB: kl5kusb105: add support for new tty tiocmget and tiocmset functions.
drivers/usb/serial/kl5kusb105.c | 112 +++++++++++++++++++++-------------------
1 files changed, 59 insertions(+), 53 deletions(-)
diff -Nru a/drivers/usb/serial/kl5kusb105.c b/drivers/usb/serial/kl5kusb105.c
--- a/drivers/usb/serial/kl5kusb105.c Thu Apr 24 16:22:03 2003
+++ b/drivers/usb/serial/kl5kusb105.c Thu Apr 24 16:22:04 2003
@@ -105,6 +105,11 @@
static void klsi_105_break_ctl (struct usb_serial_port *port,
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.
@@ -143,6 +148,8 @@
.ioctl = klsi_105_ioctl,
.set_termios = klsi_105_set_termios,
/*.break_ctl = klsi_105_break_ctl,*/
+ .tiocmget = klsi_105_tiocmget,
+ .tiocmset = klsi_105_tiocmset,
.attach = klsi_105_startup,
.shutdown = klsi_105_shutdown,
.throttle = klsi_105_throttle,
@@ -879,68 +886,67 @@
} /* mct_u232_break_ctl */
#endif
-static int klsi_105_ioctl (struct usb_serial_port *port, struct file * file,
- unsigned int cmd, unsigned long arg)
+static int klsi_105_tiocmget (struct usb_serial_port *port, struct file *file)
{
struct usb_serial *serial = port->serial;
struct klsi_105_private *priv = usb_get_serial_port_data(port);
- int mask;
unsigned long flags;
+ int rc;
+ unsigned long line_state;
+ dbg("%s - request, just guessing", __FUNCTION__);
+
+ rc = klsi_105_get_line_state(serial, &line_state);
+ if (rc < 0) {
+ err("Reading line control failed (error = %d)", rc);
+ /* better return value? EAGAIN? */
+ return rc;
+ }
+
+ spin_lock_irqsave (&priv->lock, flags);
+ priv->line_state = line_state;
+ spin_unlock_irqrestore (&priv->lock, flags);
+ dbg("%s - read line state 0x%lx", __FUNCTION__, line_state);
+ return (int)line_state;
+}
+
+static int klsi_105_tiocmset (struct usb_serial_port *port, struct file *file,
+ unsigned int set, unsigned int clear)
+{
+ int retval = -EINVAL;
+
+ dbg("%s", __FUNCTION__);
+
+/* if this ever gets implemented, it should be done something like this:
+ struct usb_serial *serial = port->serial;
+ struct klsi_105_private *priv = usb_get_serial_port_data(port);
+ unsigned long flags;
+ int control;
+
+ 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 TIOCMGET: {
- int rc;
- unsigned long line_state;
- dbg("%s - TIOCMGET request, just guessing", __FUNCTION__);
-
- rc = klsi_105_get_line_state(serial, &line_state);
- if (rc < 0) {
- err("Reading line control failed (error = %d)", rc);
- /* better return value? EAGAIN? */
- return -ENOIOCTLCMD;
- }
- spin_lock_irqsave (&priv->lock, flags);
- priv->line_state = line_state;
- spin_unlock_irqrestore (&priv->lock, flags);
- dbg("%s - read line state 0x%lx", __FUNCTION__, line_state);
- return put_user(line_state, (unsigned long *) arg);
- };
-
- 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) )
- 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)) {
- /* DTR needs set */
- if( ((cmd == TIOCMSET) && (mask & TIOCM_DTR)) ||
- (cmd == TIOCMBIS) )
- dbg("%s - set DTR not handled", __FUNCTION__);
- /* 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;
-
case TIOCMIWAIT:
/* wait for any of the 4 modem inputs (DCD,RI,DSR,CTS)*/
/* TODO */
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH] More USB fixes for 2.5.68
2003-04-24 23:47 ` Greg KH
@ 2003-04-24 23:47 ` Greg KH
2003-04-24 23:47 ` Greg KH
0 siblings, 1 reply; 22+ messages in thread
From: Greg KH @ 2003-04-24 23:47 UTC (permalink / raw)
To: linux-usb-devel, linux-kernel
ChangeSet 1.1165.2.19, 2003/04/24 14:54:09-07:00, greg@kroah.com
[PATCH] USB: add error reporting functionality to the pl2303 driver.
drivers/usb/serial/pl2303.c | 79 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 65 insertions(+), 14 deletions(-)
diff -Nru a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
--- a/drivers/usb/serial/pl2303.c Thu Apr 24 16:19:46 2003
+++ b/drivers/usb/serial/pl2303.c Thu Apr 24 16:19:46 2003
@@ -1,7 +1,8 @@
/*
* Prolific PL2303 USB to serial adaptor driver
*
- * Copyright (C) 2001-2002 Greg Kroah-Hartman (greg@kroah.com)
+ * Copyright (C) 2001-2003 Greg Kroah-Hartman (greg@kroah.com)
+ * Copyright (C) 2003 IBM Corp.
*
* Original driver for 2.2.x by anonymous
*
@@ -111,6 +112,16 @@
#define VENDOR_READ_REQUEST_TYPE 0xc0
#define VENDOR_READ_REQUEST 0x01
+#define UART_STATE 0x08
+#define UART_DCD 0x01
+#define UART_DSR 0x02
+#define UART_BREAK_ERROR 0x04
+#define UART_RING 0x08
+#define UART_FRAME_ERROR 0x10
+#define UART_PARITY_ERROR 0x20
+#define UART_OVERRUN_ERROR 0x40
+#define UART_CTS 0x80
+
/* function prototypes for a PL2303 serial converter */
static int pl2303_open (struct usb_serial_port *port, struct file *filp);
static void pl2303_close (struct usb_serial_port *port, struct file *filp);
@@ -158,6 +169,7 @@
struct pl2303_private {
spinlock_t lock;
u8 line_control;
+ u8 line_status;
u8 termios_initialized;
};
@@ -227,6 +239,7 @@
{
struct usb_serial *serial = port->serial;
struct pl2303_private *priv = usb_get_serial_port_data(port);
+ unsigned long flags;
unsigned int cflag;
unsigned char *buf;
int baud;
@@ -239,13 +252,13 @@
return;
}
- spin_lock(&priv->lock);
+ spin_lock_irqsave(&priv->lock, flags);
if (!priv->termios_initialized) {
*(port->tty->termios) = tty_std_termios;
port->tty->termios->c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL;
priv->termios_initialized = 1;
}
- spin_unlock(&priv->lock);
+ spin_unlock_irqrestore(&priv->lock, flags);
cflag = port->tty->termios->c_cflag;
/* check that they really want us to change something */
@@ -355,13 +368,13 @@
if (cflag && CBAUD) {
u8 control;
- spin_lock (&priv->lock);
+ spin_lock_irqsave(&priv->lock, flags);
if ((cflag && CBAUD) == B0)
priv->line_control &= ~(CONTROL_DTR | CONTROL_RTS);
else
priv->line_control |= (CONTROL_DTR | CONTROL_RTS);
control = priv->line_control;
- spin_unlock (&priv->lock);
+ spin_unlock_irqrestore(&priv->lock, flags);
set_control_lines (serial->dev, control);
}
@@ -450,6 +463,7 @@
{
struct usb_serial *serial;
struct pl2303_private *priv;
+ unsigned long flags;
unsigned int c_cflag;
int result;
@@ -486,9 +500,9 @@
if (c_cflag & HUPCL) {
/* drop DTR and RTS */
priv = usb_get_serial_port_data(port);
- spin_lock (&priv->lock);
+ spin_lock_irqsave(&priv->lock, flags);
priv->line_control = 0;
- spin_unlock (&priv->lock);
+ spin_unlock_irqrestore (&priv->lock, flags);
set_control_lines (port->serial->dev, 0);
}
}
@@ -499,9 +513,10 @@
unsigned int set, unsigned int clear)
{
struct pl2303_private *priv = usb_get_serial_port_data(port);
+ unsigned long flags;
u8 control;
- spin_lock (&priv->lock);
+ spin_lock_irqsave (&priv->lock, flags);
if (set & TIOCM_RTS)
priv->line_control |= CONTROL_RTS;
if (set & TIOCM_DTR)
@@ -511,7 +526,7 @@
if (clear & TIOCM_DTR)
priv->line_control &= ~CONTROL_DTR;
control = priv->line_control;
- spin_unlock (&priv->lock);
+ spin_unlock_irqrestore (&priv->lock, flags);
return set_control_lines (port->serial->dev, control);
}
@@ -519,14 +534,15 @@
static int pl2303_tiocmget (struct usb_serial_port *port, struct file *file)
{
struct pl2303_private *priv = usb_get_serial_port_data(port);
+ unsigned long flags;
unsigned int mcr;
unsigned int result;
dbg("%s (%d)", __FUNCTION__, port->number);
- spin_lock (&priv->lock);
+ spin_lock_irqsave (&priv->lock, flags);
mcr = priv->line_control;
- spin_unlock (&priv->lock);
+ spin_unlock_irqrestore (&priv->lock, flags);
result = ((mcr & CONTROL_DTR) ? TIOCM_DTR : 0)
| ((mcr & CONTROL_RTS) ? TIOCM_RTS : 0);
@@ -588,9 +604,13 @@
{
struct usb_serial_port *port = (struct usb_serial_port *) urb->context;
struct usb_serial *serial = get_usb_serial (port, __FUNCTION__);
- //unsigned char *data = urb->transfer_buffer;
+ struct pl2303_private *priv = usb_get_serial_port_data(port);
+ unsigned char *data = urb->transfer_buffer;
+ unsigned long flags;
int status;
+ dbg("%s (%d)", __FUNCTION__, port->number);
+
switch (urb->status) {
case 0:
/* success */
@@ -612,8 +632,14 @@
usb_serial_debug_data (__FILE__, __FUNCTION__, urb->actual_length, urb->transfer_buffer);
- //FIXME need to update state of terminal lines variable
+ if (urb->actual_length > UART_STATE)
+ goto exit;
+ /* Save off the uart status for others to look at */
+ spin_lock_irqsave(&priv->lock, flags);
+ priv->line_status = data[UART_STATE];
+ spin_unlock_irqrestore(&priv->lock, flags);
+
exit:
status = usb_submit_urb (urb, GFP_ATOMIC);
if (status)
@@ -626,10 +652,14 @@
{
struct usb_serial_port *port = (struct usb_serial_port *) urb->context;
struct usb_serial *serial = get_usb_serial (port, __FUNCTION__);
+ struct pl2303_private *priv = usb_get_serial_port_data(port);
struct tty_struct *tty;
unsigned char *data = urb->transfer_buffer;
+ unsigned long flags;
int i;
int result;
+ u8 status;
+ char tty_flag;
if (port_paranoia_check (port, __FUNCTION__))
return;
@@ -663,13 +693,34 @@
usb_serial_debug_data (__FILE__, __FUNCTION__, urb->actual_length, data);
+ /* get tty_flag from status */
+ tty_flag = TTY_NORMAL;
+
+ spin_lock_irqsave(&priv->lock, flags);
+ status = priv->line_status;
+ spin_unlock_irqrestore(&priv->lock, flags);
+
+ /* break takes precedence over parity, */
+ /* which takes precedence over framing errors */
+ if (status & UART_BREAK_ERROR )
+ tty_flag = TTY_BREAK;
+ else if (status & UART_PARITY_ERROR)
+ tty_flag = TTY_PARITY;
+ else if (status & UART_FRAME_ERROR)
+ tty_flag = TTY_FRAME;
+ dbg("%s - tty_flag = %d", __FUNCTION__, tty_flag);
+
tty = port->tty;
if (tty && urb->actual_length) {
+ /* overrun is special, not associated with a char */
+ if (status & UART_OVERRUN_ERROR)
+ tty_insert_flip_char(tty, 0, TTY_OVERRUN);
+
for (i = 0; i < urb->actual_length; ++i) {
if (tty->flip.count >= TTY_FLIPBUF_SIZE) {
tty_flip_buffer_push(tty);
}
- tty_insert_flip_char (tty, data[i], 0);
+ tty_insert_flip_char (tty, data[i], tty_flag);
}
tty_flip_buffer_push (tty);
}
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH] More USB fixes for 2.5.68
2003-04-24 23:47 ` Greg KH
@ 2003-04-24 23:47 ` Greg KH
0 siblings, 0 replies; 22+ messages in thread
From: Greg KH @ 2003-04-24 23:47 UTC (permalink / raw)
To: linux-usb-devel, linux-kernel
ChangeSet 1.1222, 2003/04/24 16:14:59-07:00, greg@kroah.com
[PATCH] tty: let tiocmset pass TIOCM_LOOP changes to the tty drivers.
drivers/char/tty_io.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff -Nru a/drivers/char/tty_io.c b/drivers/char/tty_io.c
--- a/drivers/char/tty_io.c Thu Apr 24 16:18:55 2003
+++ b/drivers/char/tty_io.c Thu Apr 24 16:18:55 2003
@@ -1700,8 +1700,8 @@
break;
}
- set &= TIOCM_DTR|TIOCM_RTS|TIOCM_OUT1|TIOCM_OUT2;
- clear &= TIOCM_DTR|TIOCM_RTS|TIOCM_OUT1|TIOCM_OUT2;
+ set &= TIOCM_DTR|TIOCM_RTS|TIOCM_OUT1|TIOCM_OUT2|TIOCM_LOOP;
+ clear &= TIOCM_DTR|TIOCM_RTS|TIOCM_OUT1|TIOCM_OUT2|TIOCM_LOOP;
retval = tty->driver->tiocmset(tty, file, set, clear);
}
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [BK PATCH] USB changes for 2.5.68
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-25 4:14 ` Greg KH
1 sibling, 0 replies; 22+ messages in thread
From: Greg KH @ 2003-04-25 4:14 UTC (permalink / raw)
To: linux-kernel
On Thu, Apr 24, 2003 at 04:46:14PM -0700, Greg KH wrote:
>
> Patches will be posted to linux-usb-devel as a follow-up thread for
> those who want to see them.
Bah, my patch-bomb script went a bit haywire and also posted these to
lkml. Sorry for the extra traffic.
greg k-h
^ permalink raw reply [flat|nested] 22+ messages in thread
end of thread, other threads:[~2003-04-25 4:01 UTC | newest]
Thread overview: 22+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
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
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).