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);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Wed Apr 30 2003 - 22:00:19 EST