diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-03-02 12:13:32 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-03-02 12:13:32 -0800 |
| commit | 0650ee5d81f5b64bd1dfc8ffd28fefc6f6ea4c20 (patch) | |
| tree | c8b23fe8a7be8da9665011bd34c4eb37a4aaabb6 | |
| parent | 51eba2cbeef2921df39ca6f143b9da44966e82c5 (diff) | |
| download | patches-0650ee5d81f5b64bd1dfc8ffd28fefc6f6ea4c20.tar.gz | |
updated driver patch
| -rw-r--r-- | driver.patch | 42 |
1 files changed, 32 insertions, 10 deletions
diff --git a/driver.patch b/driver.patch index 26b645feb5b296..39164ed36119b2 100644 --- a/driver.patch +++ b/driver.patch @@ -1,8 +1,8 @@ --- drivers/usb/serial/Kconfig | 9 drivers/usb/serial/Makefile | 1 - drivers/usb/serial/f81232.c | 402 ++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 412 insertions(+) + drivers/usb/serial/f81232.c | 424 ++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 434 insertions(+) --- a/drivers/usb/serial/Kconfig +++ b/drivers/usb/serial/Kconfig @@ -34,7 +34,7 @@ obj-$(CONFIG_USB_SERIAL_GARMIN) += garmin_gps.o --- /dev/null +++ b/drivers/usb/serial/f81232.c -@@ -0,0 +1,402 @@ +@@ -0,0 +1,424 @@ +/* + * Fintek F81232 USB to serial adaptor driver + * @@ -47,7 +47,6 @@ + * + */ + -+ +#include <linux/kernel.h> +#include <linux/errno.h> +#include <linux/init.h> @@ -63,7 +62,6 @@ +#include <linux/usb.h> +#include <linux/usb/serial.h> + -+ +static bool debug; + +static const struct usb_device_id id_table[] = { @@ -193,12 +191,26 @@ + +static int set_control_lines(struct usb_device *dev, u8 value) +{ ++ /* FIXME - Stubbed out for now */ + return 0; +} + ++static void f81232_break_ctl(struct tty_struct *tty, int break_state) ++{ ++ /* FIXME - Stubbed out for now */ ++ ++ /* ++ * break_state = -1 to turn on break, and 0 to turn off break ++ * see drivers/char/tty_io.c to see it used. ++ * last_set_data_urb_value NEVER has the break bit set in it. ++ */ ++} ++ +static void f81232_set_termios(struct tty_struct *tty, + struct usb_serial_port *port, struct ktermios *old_termios) +{ ++ /* FIXME - Stubbed out for now */ ++ + /* Don't change anything if nothing has changed */ + if (!tty_termios_hw_change(tty->termios, old_termios)) + return; @@ -206,6 +218,18 @@ + /* Do the real work here... */ +} + ++static int f81232_tiocmget(struct tty_struct *tty) ++{ ++ /* FIXME - Stubbed out for now */ ++ return 0; ++} ++ ++static int f81232_tiocmset(struct tty_struct *tty, ++ unsigned int set, unsigned int clear) ++{ ++ /* FIXME - Stubbed out for now */ ++ return 0; ++} + +static int f81232_open(struct tty_struct *tty, struct usb_serial_port *port) +{ @@ -366,8 +390,6 @@ + } +} + -+ -+ +static struct usb_driver f81232_driver = { + .name = "f81232", + .probe = usb_serial_probe, @@ -394,10 +416,10 @@ + .dtr_rts = f81232_dtr_rts, + .carrier_raised = f81232_carrier_raised, + .ioctl = f81232_ioctl, -+// .break_ctl = f81232_break_ctl, ++ .break_ctl = f81232_break_ctl, + .set_termios = f81232_set_termios, -+// .tiocmget = f81232_tiocmget, -+// .tiocmset = f81232_tiocmset, ++ .tiocmget = f81232_tiocmget, ++ .tiocmset = f81232_tiocmset, + .process_read_urb = f81232_process_read_urb, + .read_int_callback = f81232_read_int_callback, + .attach = f81232_startup, |