]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 12 May 2006 19:14:19 +0000 (12:14 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 12 May 2006 19:14:19 +0000 (12:14 -0700)
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6:
  [PATCH] USB: fix omninet driver bug
  [PATCH] USB: add ark3116 usb to serial driver
  [PATCH] usbserial: Fixes leak in serial_open() error path.
  [PATCH] usbserial: Fixes use-after-free in serial_open().
  [PATCH] USB: Emagic USB firmware loading fixes
  [PATCH] USB: add an IBM USB keyboard to the HID_QUIRK_NOGET blacklist
  [PATCH] USB: Add Sieraa Wireless 580 evdo card to airprime.c
  [PATCH] USB: ftdi_sio: add device id for ACT Solutions HomePro ZWave interface
  [PATCH] USB: ftdi_sio: Add support for HCG HF Dual ISO RFID Reader
  [PATCH] USB: ub oops in block_uevent
  [PATCH] USB: usbcore: don't check the device's power source
  [PATCH] USB: fix OHCI PM regression
  [PATCH] USB: pegasus fixes (logstorm, suspend)
  [PATCH] USBATM: fix modinfo output
  [PATCH] USBATM: change the default speedtouch iso altsetting
  [PATCH] USB: fix bug in ohci-hcd.c ohci_restart()

19 files changed:
drivers/block/ub.c
drivers/usb/atm/speedtch.c
drivers/usb/atm/usbatm.c
drivers/usb/core/hcd.c
drivers/usb/core/hub.c
drivers/usb/host/ohci-hcd.c
drivers/usb/input/hid-core.c
drivers/usb/misc/emi26.c
drivers/usb/misc/emi62.c
drivers/usb/net/pegasus.c
drivers/usb/serial/Kconfig
drivers/usb/serial/Makefile
drivers/usb/serial/airprime.c
drivers/usb/serial/ark3116.c [new file with mode: 0644]
drivers/usb/serial/ftdi_sio.c
drivers/usb/serial/ftdi_sio.h
drivers/usb/serial/generic.c
drivers/usb/serial/omninet.c
drivers/usb/serial/usb-serial.c

index f73446f580dff85b4f074393cdff8cac422fe801..c688c25992e44b0a914624735c448e7e7abb1429 100644 (file)
@@ -536,6 +536,9 @@ static void ub_cleanup(struct ub_dev *sc)
                kfree(lun);
        }
 
+       usb_set_intfdata(sc->intf, NULL);
+       usb_put_intf(sc->intf);
+       usb_put_dev(sc->dev);
        kfree(sc);
 }
 
@@ -2221,7 +2224,12 @@ static int ub_probe(struct usb_interface *intf,
        // sc->ifnum = intf->cur_altsetting->desc.bInterfaceNumber;
        usb_set_intfdata(intf, sc);
        usb_get_dev(sc->dev);
-       // usb_get_intf(sc->intf);      /* Do we need this? */
+       /*
+        * Since we give the interface struct to the block level through
+        * disk->driverfs_dev, we have to pin it. Otherwise, block_uevent
+        * oopses on close after a disconnect (kernels 2.6.16 and up).
+        */
+       usb_get_intf(sc->intf);
 
        snprintf(sc->name, 12, DRV_NAME "(%d.%d)",
            sc->dev->bus->busnum, sc->dev->devnum);
@@ -2286,7 +2294,7 @@ static int ub_probe(struct usb_interface *intf,
 
 err_dev_desc:
        usb_set_intfdata(intf, NULL);
-       // usb_put_intf(sc->intf);
+       usb_put_intf(sc->intf);
        usb_put_dev(sc->dev);
        kfree(sc);
 err_core:
@@ -2461,12 +2469,6 @@ static void ub_disconnect(struct usb_interface *intf)
         * and no URBs left in transit.
         */
 
-       usb_set_intfdata(intf, NULL);
-       // usb_put_intf(sc->intf);
-       sc->intf = NULL;
-       usb_put_dev(sc->dev);
-       sc->dev = NULL;
-
        ub_put(sc);
 }
 
index 7860c8a5800d5a184adc8abea047dbef16c37b89..956b7a1e8af98c0a37056f280c371b6dd785a5dd 100644 (file)
@@ -69,7 +69,7 @@ static const char speedtch_driver_name[] = "speedtch";
 #define RESUBMIT_DELAY         1000    /* milliseconds */
 
 #define DEFAULT_BULK_ALTSETTING        1
-#define DEFAULT_ISOC_ALTSETTING        2
+#define DEFAULT_ISOC_ALTSETTING        3
 #define DEFAULT_DL_512_FIRST   0
 #define DEFAULT_ENABLE_ISOC    0
 #define DEFAULT_SW_BUFFERING   0
index c1211fc037d997b8a30cee323ded090d72d9da63..546249843b8e5fe3613ada68e512484d5382d73b 100644 (file)
@@ -99,11 +99,11 @@ static const char usbatm_driver_name[] = "usbatm";
 
 #define UDSL_MAX_RCV_URBS              16
 #define UDSL_MAX_SND_URBS              16
-#define UDSL_MAX_BUF_SIZE              64 * 1024       /* bytes */
+#define UDSL_MAX_BUF_SIZE              65536
 #define UDSL_DEFAULT_RCV_URBS          4
 #define UDSL_DEFAULT_SND_URBS          4
-#define UDSL_DEFAULT_RCV_BUF_SIZE      64 * ATM_CELL_SIZE      /* bytes */
-#define UDSL_DEFAULT_SND_BUF_SIZE      64 * ATM_CELL_SIZE      /* bytes */
+#define UDSL_DEFAULT_RCV_BUF_SIZE      3392    /* 64 * ATM_CELL_SIZE */
+#define UDSL_DEFAULT_SND_BUF_SIZE      3392    /* 64 * ATM_CELL_SIZE */
 
 #define ATM_CELL_HEADER                        (ATM_CELL_SIZE - ATM_CELL_PAYLOAD)
 
@@ -135,7 +135,7 @@ MODULE_PARM_DESC(rcv_buf_bytes,
 module_param(snd_buf_bytes, uint, S_IRUGO);
 MODULE_PARM_DESC(snd_buf_bytes,
                 "Size of the buffers used for transmission, in bytes (range: 1-"
-                __MODULE_STRING(UDSL_MAX_SND_BUF_SIZE) ", default: "
+                __MODULE_STRING(UDSL_MAX_BUF_SIZE) ", default: "
                 __MODULE_STRING(UDSL_DEFAULT_SND_BUF_SIZE) ")");
 
 
index fbd938d4ea589cc9d558d1f41cae0fad0dccd18b..e2e00ba4e1e6dd5b20aff7dda22316cd02a39e97 100644 (file)
@@ -1805,6 +1805,12 @@ int usb_add_hcd(struct usb_hcd *hcd,
                        USB_SPEED_FULL;
        hcd->self.root_hub = rhdev;
 
+       /* wakeup flag init defaults to "everything works" for root hubs,
+        * but drivers can override it in reset() if needed, along with
+        * recording the overall controller's system wakeup capability.
+        */
+       device_init_wakeup(&rhdev->dev, 1);
+
        /* "reset" is misnamed; its role is now one-time init. the controller
         * should already have been reset (and boot firmware kicked off etc).
         */
@@ -1813,13 +1819,6 @@ int usb_add_hcd(struct usb_hcd *hcd,
                goto err_hcd_driver_setup;
        }
 
-       /* wakeup flag init is in transition; for now we can't rely on PCI to
-        * initialize these bits properly, so we let reset() override it.
-        * This init should _precede_ the reset() once PCI behaves.
-        */
-       device_init_wakeup(&rhdev->dev,
-                       device_can_wakeup(hcd->self.controller));
-
        /* NOTE: root hub and controller capabilities may not be the same */
        if (device_can_wakeup(hcd->self.controller)
                        && device_can_wakeup(&hcd->self.root_hub->dev))
index 0c87f73f29332d9bbf71e688b97acaa5ac4a668f..90b8d43c6b339eb233045dc8d550176ea67192f6 100644 (file)
@@ -1168,19 +1168,9 @@ static inline const char *plural(int n)
 static int choose_configuration(struct usb_device *udev)
 {
        int i;
-       u16 devstatus;
-       int bus_powered;
        int num_configs;
        struct usb_host_config *c, *best;
 
-       /* If this fails, assume the device is bus-powered */
-       devstatus = 0;
-       usb_get_status(udev, USB_RECIP_DEVICE, 0, &devstatus);
-       le16_to_cpus(&devstatus);
-       bus_powered = ((devstatus & (1 << USB_DEVICE_SELF_POWERED)) == 0);
-       dev_dbg(&udev->dev, "device is %s-powered\n",
-                       bus_powered ? "bus" : "self");
-
        best = NULL;
        c = udev->config;
        num_configs = udev->descriptor.bNumConfigurations;
@@ -1197,6 +1187,19 @@ static int choose_configuration(struct usb_device *udev)
                 * similar errors in their descriptors.  If the next test
                 * were allowed to execute, such configurations would always
                 * be rejected and the devices would not work as expected.
+                * In the meantime, we run the risk of selecting a config
+                * that requires external power at a time when that power
+                * isn't available.  It seems to be the lesser of two evils.
+                *
+                * Bugzilla #6448 reports a device that appears to crash
+                * when it receives a GET_DEVICE_STATUS request!  We don't
+                * have any other way to tell whether a device is self-powered,
+                * but since we don't use that information anywhere but here,
+                * the call has been removed.
+                *
+                * Maybe the GET_DEVICE_STATUS call and the test below can
+                * be reinstated when device firmwares become more reliable.
+                * Don't hold your breath.
                 */
 #if 0
                /* Rule out self-powered configs for a bus-powered device */
index 544f7589912f714337cae4832a6478fd5fc50160..73f5a379d9b332a37e73b100862ad3c817e0df9e 100644 (file)
@@ -863,7 +863,7 @@ static int ohci_restart (struct ohci_hcd *ohci)
                i = ohci->num_ports;
                while (i--)
                        ohci_writel (ohci, RH_PS_PSS,
-                               &ohci->regs->roothub.portstatus [temp]);
+                               &ohci->regs->roothub.portstatus [i]);
                ohci_dbg (ohci, "restart complete\n");
        }
        return 0;
index f419bd82ab7f5bd00fc78979c4e56369d4de77f1..435273e7c85cb5912ec9cc22ded58dec3b6e76aa 100644 (file)
@@ -1557,6 +1557,9 @@ void hid_init_reports(struct hid_device *hid)
 #define USB_VENDOR_ID_HP               0x03f0
 #define USB_DEVICE_ID_HP_USBHUB_KB     0x020c
 
+#define USB_VENDOR_ID_IBM              0x04b3
+#define USB_DEVICE_ID_IBM_USBHUB_KB    0x3005
+
 #define USB_VENDOR_ID_CREATIVELABS     0x062a
 #define USB_DEVICE_ID_CREATIVELABS_SILVERCREST 0x0201
 
@@ -1681,6 +1684,7 @@ static const struct hid_blacklist {
        { USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_USBHUB_KB, HID_QUIRK_NOGET},
        { USB_VENDOR_ID_CREATIVELABS, USB_DEVICE_ID_CREATIVELABS_SILVERCREST, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_HP, USB_DEVICE_ID_HP_USBHUB_KB, HID_QUIRK_NOGET },
+       { USB_VENDOR_ID_IBM, USB_DEVICE_ID_IBM_USBHUB_KB, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_TANGTOP, USB_DEVICE_ID_TANGTOP_USBPS2, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },
        { USB_VENDOR_ID_SILVERCREST, USB_DEVICE_ID_SILVERCREST_KB, HID_QUIRK_NOGET },
index 3824df33094e237d10a26058ebb91945f7ba2bad..1fd9cb85f4ca3aa9014e542d0a517d508dcad1e6 100644 (file)
@@ -15,6 +15,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/usb.h>
+#include <linux/delay.h>
 
 #define MAX_INTEL_HEX_RECORD_LENGTH 16
 typedef struct _INTEL_HEX_RECORD
@@ -114,6 +115,7 @@ static int emi26_load_firmware (struct usb_device *dev)
 
        /* De-assert reset (let the CPU run) */
        err = emi26_set_reset(dev,0);
+       msleep(250);    /* let device settle */
 
        /* 2. We upload the FPGA firmware into the EMI
         * Note: collect up to 1023 (yes!) bytes and send them with
@@ -150,6 +152,7 @@ static int emi26_load_firmware (struct usb_device *dev)
                        goto wraperr;
                }
        }
+       msleep(250);    /* let device settle */
 
        /* De-assert reset (let the CPU run) */
        err = emi26_set_reset(dev,0);
@@ -192,6 +195,7 @@ static int emi26_load_firmware (struct usb_device *dev)
                err("%s - error loading firmware: error = %d", __FUNCTION__, err);
                goto wraperr;
        }
+       msleep(250);    /* let device settle */
 
        /* return 1 to fail the driver inialization
         * and give real driver change to load */
index 52fea2e08db87358f0d1073dfba5e2bc555b323b..fe351371f274e11e6b576dcce1a671cd2b8ef0f8 100644 (file)
@@ -15,6 +15,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/usb.h>
+#include <linux/delay.h>
 
 #define MAX_INTEL_HEX_RECORD_LENGTH 16
 typedef struct _INTEL_HEX_RECORD
@@ -123,6 +124,7 @@ static int emi62_load_firmware (struct usb_device *dev)
 
        /* De-assert reset (let the CPU run) */
        err = emi62_set_reset(dev,0);
+       msleep(250);    /* let device settle */
 
        /* 2. We upload the FPGA firmware into the EMI
         * Note: collect up to 1023 (yes!) bytes and send them with
@@ -166,6 +168,7 @@ static int emi62_load_firmware (struct usb_device *dev)
                err("%s - error loading firmware: error = %d", __FUNCTION__, err);
                goto wraperr;
        }
+       msleep(250);    /* let device settle */
 
        /* 4. We put the part of the firmware that lies in the external RAM into the EZ-USB */
 
@@ -228,6 +231,7 @@ static int emi62_load_firmware (struct usb_device *dev)
                err("%s - error loading firmware: error = %d", __FUNCTION__, err);
                goto wraperr;
        }
+       msleep(250);    /* let device settle */
 
        kfree(buf);
 
index 2deb4c01539e8466ef97766e408ff0b6689e71b5..7683926a1b6f19c5fae68caa07a6727691acfc17 100644 (file)
@@ -318,6 +318,8 @@ static int read_mii_word(pegasus_t * pegasus, __u8 phy, __u8 indx, __u16 * regd)
        set_register(pegasus, PhyCtrl, (indx | PHY_READ));
        for (i = 0; i < REG_TIMEOUT; i++) {
                ret = get_registers(pegasus, PhyCtrl, 1, data);
+               if (ret == -ESHUTDOWN)
+                       goto fail;
                if (data[0] & PHY_DONE)
                        break;
        }
@@ -326,6 +328,7 @@ static int read_mii_word(pegasus_t * pegasus, __u8 phy, __u8 indx, __u16 * regd)
                *regd = le16_to_cpu(regdi);
                return ret;
        }
+fail:
        if (netif_msg_drv(pegasus))
                dev_warn(&pegasus->intf->dev, "fail %s\n", __FUNCTION__);
 
@@ -354,12 +357,15 @@ static int write_mii_word(pegasus_t * pegasus, __u8 phy, __u8 indx, __u16 regd)
        set_register(pegasus, PhyCtrl, (indx | PHY_WRITE));
        for (i = 0; i < REG_TIMEOUT; i++) {
                ret = get_registers(pegasus, PhyCtrl, 1, data);
+               if (ret == -ESHUTDOWN)
+                       goto fail;
                if (data[0] & PHY_DONE)
                        break;
        }
        if (i < REG_TIMEOUT)
                return ret;
 
+fail:
        if (netif_msg_drv(pegasus))
                dev_warn(&pegasus->intf->dev, "fail %s\n", __FUNCTION__);
        return -ETIMEDOUT;
@@ -387,6 +393,8 @@ static int read_eprom_word(pegasus_t * pegasus, __u8 index, __u16 * retdata)
                ret = get_registers(pegasus, EpromCtrl, 1, &tmp);
                if (tmp & EPROM_DONE)
                        break;
+               if (ret == -ESHUTDOWN)
+                       goto fail;
        }
        if (i < REG_TIMEOUT) {
                ret = get_registers(pegasus, EpromData, 2, &retdatai);
@@ -394,6 +402,7 @@ static int read_eprom_word(pegasus_t * pegasus, __u8 index, __u16 * retdata)
                return ret;
        }
 
+fail:
        if (netif_msg_drv(pegasus))
                dev_warn(&pegasus->intf->dev, "fail %s\n", __FUNCTION__);
        return -ETIMEDOUT;
@@ -433,12 +442,15 @@ static int write_eprom_word(pegasus_t * pegasus, __u8 index, __u16 data)
 
        for (i = 0; i < REG_TIMEOUT; i++) {
                ret = get_registers(pegasus, EpromCtrl, 1, &tmp);
+               if (ret == -ESHUTDOWN)
+                       goto fail;
                if (tmp & EPROM_DONE)
                        break;
        }
        disable_eprom_write(pegasus);
        if (i < REG_TIMEOUT)
                return ret;
+fail:
        if (netif_msg_drv(pegasus))
                dev_warn(&pegasus->intf->dev, "fail %s\n", __FUNCTION__);
        return -ETIMEDOUT;
@@ -1378,9 +1390,8 @@ static int pegasus_suspend (struct usb_interface *intf, pm_message_t message)
        struct pegasus *pegasus = usb_get_intfdata(intf);
        
        netif_device_detach (pegasus->net);
+       cancel_delayed_work(&pegasus->carrier_check);
        if (netif_running(pegasus->net)) {
-               cancel_delayed_work(&pegasus->carrier_check);
-
                usb_kill_urb(pegasus->rx_urb);
                usb_kill_urb(pegasus->intr_urb);
        }
@@ -1400,10 +1411,9 @@ static int pegasus_resume (struct usb_interface *intf)
                pegasus->intr_urb->status = 0;
                pegasus->intr_urb->actual_length = 0;
                intr_callback(pegasus->intr_urb, NULL);
-
-               queue_delayed_work(pegasus_workqueue, &pegasus->carrier_check,
-                                       CARRIER_CHECK_DELAY);
        }
+       queue_delayed_work(pegasus_workqueue, &pegasus->carrier_check,
+                               CARRIER_CHECK_DELAY);
        return 0;
 }
 
index f96b73f54bf1cdb7d4840d7b3c1c0600c8e4d6a0..5c60be521561a5fdeed21d5bd4df5a37b5a9ee9b 100644 (file)
@@ -71,6 +71,16 @@ config USB_SERIAL_ANYDATA
          To compile this driver as a module, choose M here: the
          module will be called anydata.
 
+config USB_SERIAL_ARK3116
+       tristate "USB ARK Micro 3116 USB Serial Driver (EXPERIMENTAL)"
+       depends on USB_SERIAL && EXPERIMENTAL
+       help
+         Say Y here if you want to use a ARK Micro 3116 USB to Serial
+         device.
+
+         To compile this driver as a module, choose M here: the
+         module will be called ark3116
+
 config USB_SERIAL_BELKIN
        tristate "USB Belkin and Peracom Single Port Serial Driver"
        depends on USB_SERIAL
index 93c21245b1af713d52974d7eec80097073f52ee1..5a0960fc9d3e3facbfce9e90a0175e0fa25e4e46 100644 (file)
@@ -13,6 +13,7 @@ usbserial-objs        := usb-serial.o generic.o bus.o $(usbserial-obj-y)
 
 obj-$(CONFIG_USB_SERIAL_AIRPRIME)              += airprime.o
 obj-$(CONFIG_USB_SERIAL_ANYDATA)               += anydata.o
+obj-$(CONFIG_USB_SERIAL_ARK3116)               += ark3116.o
 obj-$(CONFIG_USB_SERIAL_BELKIN)                        += belkin_sa.o
 obj-$(CONFIG_USB_SERIAL_CP2101)                        += cp2101.o
 obj-$(CONFIG_USB_SERIAL_CYBERJACK)             += cyberjack.o
index dbf1f063098c58f7c6424bff49e4d8e56a34034b..694b205f9b736e90f42e995b9d90de1a2d5bc72a 100644 (file)
@@ -18,6 +18,7 @@
 static struct usb_device_id id_table [] = {
        { USB_DEVICE(0xf3d, 0x0112) },  /* AirPrime CDMA Wireless PC Card */
        { USB_DEVICE(0x1410, 0x1110) }, /* Novatel Wireless Merlin CDMA */
+       { USB_DEVICE(0x1199, 0x0112) }, /* Sierra Wireless Aircard 580 */
        { },
 };
 MODULE_DEVICE_TABLE(usb, id_table);
diff --git a/drivers/usb/serial/ark3116.c b/drivers/usb/serial/ark3116.c
new file mode 100644 (file)
index 0000000..8dec796
--- /dev/null
@@ -0,0 +1,465 @@
+/*
+ * ark3116
+ * - implements a driver for the arkmicro ark3116 chipset (vendor=0x6547,
+ *   productid=0x0232) (used in a datacable called KQ-U8A)
+ *
+ * - based on code by krisfx -> thanks !!
+ *   (see http://www.linuxquestions.org/questions/showthread.php?p=2184457#post2184457)
+ *
+ *  - based on logs created by usbsnoopy
+ *
+ *  Author   : Simon Schulz [ark3116_driver<AT>auctionant.de]
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/tty.h>
+#include <linux/module.h>
+#include <linux/usb.h>
+#include "usb-serial.h"
+
+
+static int debug;
+
+static struct usb_device_id id_table [] = {
+       { USB_DEVICE(0x6547, 0x0232) },
+       { },
+};
+MODULE_DEVICE_TABLE(usb, id_table);
+
+struct ark3116_private {
+       spinlock_t lock;
+       u8 termios_initialized;
+};
+
+static inline void ARK3116_SND(struct usb_serial *serial, int seq,
+                              __u8 request, __u8 requesttype,
+                              __u16 value, __u16 index)
+{
+       int result;
+       result = usb_control_msg(serial->dev,
+                                usb_sndctrlpipe(serial->dev,0),
+                                request, requesttype, value, index,
+                                NULL,0x00, 1000);
+       dbg("%03d > ok",seq);
+}
+
+static inline void ARK3116_RCV(struct usb_serial *serial, int seq,
+                              __u8 request, __u8 requesttype,
+                              __u16 value, __u16 index, __u8 expected,
+                              char *buf)
+{
+       int result;
+       result = usb_control_msg(serial->dev,
+                             usb_rcvctrlpipe(serial->dev,0),
+                             request, requesttype, value, index,
+                             buf, 0x0000001, 1000);
+       if (result)
+               dbg("%03d < %d bytes [0x%02X]",seq, result, buf[0]);
+       else
+               dbg("%03d < 0 bytes", seq);
+}
+
+
+static inline void ARK3116_RCV_QUIET(struct usb_serial *serial,
+                                    __u8 request, __u8 requesttype,
+                                    __u16 value, __u16 index, char *buf)
+{
+       usb_control_msg(serial->dev,
+                       usb_rcvctrlpipe(serial->dev,0),
+                       request, requesttype, value, index,
+                       buf, 0x0000001, 1000);
+}
+
+
+static int ark3116_attach(struct usb_serial *serial)
+{
+       char *buf;
+       struct ark3116_private *priv;
+       int i;
+
+       for (i = 0; i < serial->num_ports; ++i) {
+               priv = kmalloc (sizeof (struct ark3116_private), GFP_KERNEL);
+               if (!priv)
+                       goto cleanup;
+               memset (priv, 0x00, sizeof (struct ark3116_private));
+               spin_lock_init(&priv->lock);
+
+               usb_set_serial_port_data(serial->port[i], priv);
+       }
+
+       buf = kmalloc(1, GFP_KERNEL);
+       if (!buf) {
+               dbg("error kmalloc -> out of mem ?");
+               goto cleanup;
+       }
+
+       /* 3 */
+       ARK3116_SND(serial, 3,0xFE,0x40,0x0008,0x0002);
+       ARK3116_SND(serial, 4,0xFE,0x40,0x0008,0x0001);
+       ARK3116_SND(serial, 5,0xFE,0x40,0x0000,0x0008);
+       ARK3116_SND(serial, 6,0xFE,0x40,0x0000,0x000B);
+
+       /* <-- seq7 */
+       ARK3116_RCV(serial, 7,0xFE,0xC0,0x0000,0x0003, 0x00, buf);
+       ARK3116_SND(serial, 8,0xFE,0x40,0x0080,0x0003);
+       ARK3116_SND(serial, 9,0xFE,0x40,0x001A,0x0000);
+       ARK3116_SND(serial,10,0xFE,0x40,0x0000,0x0001);
+       ARK3116_SND(serial,11,0xFE,0x40,0x0000,0x0003);
+
+       /* <-- seq12 */
+       ARK3116_RCV(serial,12,0xFE,0xC0,0x0000,0x0004, 0x00, buf);
+       ARK3116_SND(serial,13,0xFE,0x40,0x0000,0x0004);
+
+       /* 14 */
+       ARK3116_RCV(serial,14,0xFE,0xC0,0x0000,0x0004, 0x00, buf);
+       ARK3116_SND(serial,15,0xFE,0x40,0x0000,0x0004);
+
+       /* 16 */
+       ARK3116_RCV(serial,16,0xFE,0xC0,0x0000,0x0004, 0x00, buf);
+       /* --> seq17 */
+       ARK3116_SND(serial,17,0xFE,0x40,0x0001,0x0004);
+
+       /* <-- seq18 */
+       ARK3116_RCV(serial,18,0xFE,0xC0,0x0000,0x0004, 0x01, buf);
+
+       /* --> seq19 */
+       ARK3116_SND(serial,19,0xFE,0x40,0x0003,0x0004);
+
+
+       /* <-- seq20 */
+       /* seems like serial port status info (RTS, CTS,...) */
+       /* returns modem control line status ?! */
+       ARK3116_RCV(serial,20,0xFE,0xC0,0x0000,0x0006, 0xFF, buf);
+
+       /* set 9600 baud & do some init ?! */
+       ARK3116_SND(serial,147,0xFE,0x40,0x0083,0x0003);
+       ARK3116_SND(serial,148,0xFE,0x40,0x0038,0x0000);
+       ARK3116_SND(serial,149,0xFE,0x40,0x0001,0x0001);
+       ARK3116_SND(serial,150,0xFE,0x40,0x0003,0x0003);
+       ARK3116_RCV(serial,151,0xFE,0xC0,0x0000,0x0004,0x03, buf);
+       ARK3116_SND(serial,152,0xFE,0x40,0x0000,0x0003);
+       ARK3116_RCV(serial,153,0xFE,0xC0,0x0000,0x0003,0x00, buf);
+       ARK3116_SND(serial,154,0xFE,0x40,0x0003,0x0003);
+
+       kfree(buf);
+       return(0);
+
+cleanup:
+       for (--i; i>=0; --i)
+               usb_set_serial_port_data(serial->port[i], NULL);
+       return -ENOMEM;
+}
+
+static void ark3116_set_termios(struct usb_serial_port *port,
+                               struct termios *old_termios)
+{
+       struct usb_serial *serial = port->serial;
+       struct ark3116_private *priv = usb_get_serial_port_data(port);
+       unsigned int cflag = port->tty->termios->c_cflag;
+       unsigned long flags;
+       int baud;
+       int ark3116_baud;
+       char *buf;
+       char config;
+
+       config = 0;
+
+       dbg("%s - port %d", __FUNCTION__, port->number);
+
+       if ((!port->tty) || (!port->tty->termios)) {
+               dbg("%s - no tty structures", __FUNCTION__);
+               return;
+       }
+
+       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_irqrestore(&priv->lock, flags);
+
+       cflag = port->tty->termios->c_cflag;
+
+       /* check that they really want us to change something: */
+       if (old_termios) {
+               if ((cflag == old_termios->c_cflag) &&
+                   (RELEVANT_IFLAG(port->tty->termios->c_iflag) ==
+                    RELEVANT_IFLAG(old_termios->c_iflag))) {
+                       dbg("%s - nothing to change...", __FUNCTION__);
+                       return;
+               }
+       }
+
+       buf = kmalloc(1, GFP_KERNEL);
+       if (!buf) {
+               dbg("error kmalloc");
+               return;
+       }
+
+       /* set data bit count (8/7/6/5) */
+       if (cflag & CSIZE){
+               switch (cflag & CSIZE){
+               case CS5:
+                       config |= 0x00;
+                       dbg("setting CS5");
+                       break;
+               case CS6:
+                       config |= 0x01;
+                       dbg("setting CS6");
+                       break;
+               case CS7:
+                       config |= 0x02;
+                       dbg("setting CS7");
+                       break;
+               default:
+                       err ("CSIZE was set but not CS5-CS8, using CS8!");
+               case CS8:
+                       config |= 0x03;
+                       dbg("setting CS8");
+                       break;
+               }
+       }
+
+       /* set parity (NONE,EVEN,ODD) */
+       if (cflag & PARENB){
+               if (cflag & PARODD) {
+                       config |= 0x08;
+                       dbg("setting parity to ODD");
+               } else {
+                       config |= 0x18;
+                       dbg("setting parity to EVEN");
+               }
+       } else {
+               dbg("setting parity to NONE");
+       }
+
+       /* SET STOPBIT (1/2) */
+       if (cflag & CSTOPB) {
+               config |= 0x04;
+               dbg ("setting 2 stop bits");
+       } else {
+               dbg ("setting 1 stop bit");
+       }
+
+
+       /* set baudrate: */
+       baud = 0;
+       switch (cflag & CBAUD){
+               case B0:
+                       err("can't set 0baud, using 9600 instead");
+                       break;
+               case B75:       baud = 75;      break;
+               case B150:      baud = 150;     break;
+               case B300:      baud = 300;     break;
+               case B600:      baud = 600;     break;
+               case B1200:     baud = 1200;    break;
+               case B1800:     baud = 1800;    break;
+               case B2400:     baud = 2400;    break;
+               case B4800:     baud = 4800;    break;
+               case B9600:     baud = 9600;    break;
+               case B19200:    baud = 19200;   break;
+               case B38400:    baud = 38400;   break;
+               case B57600:    baud = 57600;   break;
+               case B115200:   baud = 115200;  break;
+               case B230400:   baud = 230400;  break;
+               case B460800:   baud = 460800;  break;
+               default:
+                       dbg("does not support the baudrate requested (fix it)");
+                       break;
+       }
+
+       /* set 9600 as default (if given baudrate is invalid for example) */
+       if (baud == 0)
+               baud = 9600;
+
+       /*
+        * found by try'n'error, be careful, maybe there are other options
+        * for multiplicator etc!
+        */
+       if (baud == 460800)
+               /* strange, for 460800 the formula is wrong
+                * (dont use round(), then 9600baud is wrong) */
+               ark3116_baud = 7;
+       else
+               ark3116_baud = 3000000 / baud;
+
+       /* ? */
+       ARK3116_RCV(serial,0,0xFE,0xC0,0x0000,0x0003, 0x03, buf);
+       /* offset = buf[0]; */
+       /* offset = 0x03; */
+       /* dbg("using 0x%04X as target for 0x0003:",0x0080+offset); */
+
+
+       /* set baudrate */
+       dbg("setting baudrate to %d (->reg=%d)",baud,ark3116_baud);
+       ARK3116_SND(serial,147,0xFE,0x40,0x0083,0x0003);
+       ARK3116_SND(serial,148,0xFE,0x40,(ark3116_baud & 0x00FF)   ,0x0000);
+       ARK3116_SND(serial,149,0xFE,0x40,(ark3116_baud & 0xFF00)>>8,0x0001);
+       ARK3116_SND(serial,150,0xFE,0x40,0x0003,0x0003);
+
+       /* ? */
+       ARK3116_RCV(serial,151,0xFE,0xC0,0x0000,0x0004,0x03, buf);
+       ARK3116_SND(serial,152,0xFE,0x40,0x0000,0x0003);
+
+       /* set data bit count, stop bit count & parity: */
+       dbg("updating bit count, stop bit or parity (cfg=0x%02X)", config);
+       ARK3116_RCV(serial,153,0xFE,0xC0,0x0000,0x0003,0x00, buf);
+       ARK3116_SND(serial,154,0xFE,0x40,config,0x0003);
+
+       if (cflag & CRTSCTS)
+               dbg("CRTSCTS not supported by chipset ?!");
+
+       /* TEST ARK3116_SND(154,0xFE,0x40,0xFFFF, 0x0006); */
+
+       kfree(buf);
+       return;
+}
+
+static int ark3116_open(struct usb_serial_port *port, struct file *filp)
+{
+       struct termios tmp_termios;
+       struct usb_serial *serial = port->serial;
+       char *buf;
+       int result = 0;
+
+       dbg("%s -  port %d", __FUNCTION__, port->number);
+
+       buf = kmalloc(1, GFP_KERNEL);
+       if (!buf) {
+               dbg("error kmalloc -> out of mem ?");
+               return -ENOMEM;
+       }
+
+       result = usb_serial_generic_open(port, filp);
+       if (result)
+               return result;
+
+       /* open */
+       ARK3116_RCV(serial,111,0xFE,0xC0,0x0000,0x0003, 0x02, buf);
+
+       ARK3116_SND(serial,112,0xFE,0x40,0x0082,0x0003);
+       ARK3116_SND(serial,113,0xFE,0x40,0x001A,0x0000);
+       ARK3116_SND(serial,114,0xFE,0x40,0x0000,0x0001);
+       ARK3116_SND(serial,115,0xFE,0x40,0x0002,0x0003);
+
+       ARK3116_RCV(serial,116,0xFE,0xC0,0x0000,0x0004, 0x03, buf);
+       ARK3116_SND(serial,117,0xFE,0x40,0x0002,0x0004);
+
+       ARK3116_RCV(serial,118,0xFE,0xC0,0x0000,0x0004, 0x02, buf);
+       ARK3116_SND(serial,119,0xFE,0x40,0x0000,0x0004);
+
+       ARK3116_RCV(serial,120,0xFE,0xC0,0x0000,0x0004, 0x00, buf);
+
+       ARK3116_SND(serial,121,0xFE,0x40,0x0001,0x0004);
+
+       ARK3116_RCV(serial,122,0xFE,0xC0,0x0000,0x0004, 0x01, buf);
+
+       ARK3116_SND(serial,123,0xFE,0x40,0x0003,0x0004);
+
+       /* returns different values (control lines ?!) */
+       ARK3116_RCV(serial,124,0xFE,0xC0,0x0000,0x0006, 0xFF, buf);
+
+       /* initialise termios: */
+       if (port->tty)
+               ark3116_set_termios(port, &tmp_termios);
+
+       kfree(buf);
+
+       return result;
+
+}
+
+static int ark3116_ioctl(struct usb_serial_port *port, struct file *file,
+                        unsigned int cmd, unsigned long arg)
+{
+       dbg("ioctl not supported yet...");
+       return -ENOIOCTLCMD;
+}
+
+static int ark3116_tiocmget(struct usb_serial_port *port, struct file *file)
+{
+       struct usb_serial *serial = port->serial;
+       char *buf;
+       char temp;
+
+       /* seems like serial port status info (RTS, CTS,...) is stored
+        * in reg(?) 0x0006
+        * pcb connection point 11 = GND -> sets bit4 of response
+        * pcb connection point  7 = GND -> sets bit6 of response
+        */
+
+       buf = kmalloc(1, GFP_KERNEL);
+       if (!buf) {
+               dbg("error kmalloc");
+               return -ENOMEM;
+       }
+
+       /* read register: */
+       ARK3116_RCV_QUIET(serial,0xFE,0xC0,0x0000,0x0006,buf);
+       temp = buf[0];
+       kfree(buf);
+
+       /* i do not really know if bit4=CTS and bit6=DSR... was just a
+        * quick guess !!
+        */
+       return  (temp & (1<<4) ? TIOCM_CTS : 0) |
+               (temp & (1<<6) ? TIOCM_DSR : 0);
+}
+
+static struct usb_driver ark3116_driver = {
+       .name =         "ark3116",
+       .probe =        usb_serial_probe,
+       .disconnect =   usb_serial_disconnect,
+       .id_table =     id_table,
+};
+
+static struct usb_serial_driver ark3116_device = {
+       .driver = {
+               .owner =        THIS_MODULE,
+               .name =         "ark3116",
+       },
+       .id_table =             id_table,
+       .num_interrupt_in =     1,
+       .num_bulk_in =          1,
+       .num_bulk_out =         1,
+       .num_ports =            1,
+       .attach =               ark3116_attach,
+       .set_termios =          ark3116_set_termios,
+       .ioctl =                ark3116_ioctl,
+       .tiocmget =             ark3116_tiocmget,
+       .open =                 ark3116_open,
+};
+
+static int __init ark3116_init(void)
+{
+       int retval;
+
+       retval = usb_serial_register(&ark3116_device);
+       if (retval)
+               return retval;
+       retval = usb_register(&ark3116_driver);
+       if (retval)
+               usb_serial_deregister(&ark3116_device);
+       return retval;
+}
+
+static void __exit ark3116_exit(void)
+{
+       usb_deregister(&ark3116_driver);
+       usb_serial_deregister(&ark3116_device);
+}
+
+module_init(ark3116_init);
+module_exit(ark3116_exit);
+MODULE_LICENSE("GPL");
+
+module_param(debug, bool, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(debug, "Debug enabled or not");
+
index 82151207d814674d38de9c5f94323e006b6b50aa..986d7622273d319e1ae4178aada87170fe246918 100644 (file)
@@ -307,6 +307,7 @@ static struct ftdi_sio_quirk ftdi_HE_TIRA1_quirk = {
 
 
 static struct usb_device_id id_table_combined [] = {
+       { USB_DEVICE(FTDI_VID, FTDI_ACTZWAVE_PID) },
        { USB_DEVICE(FTDI_VID, FTDI_IRTRANS_PID) },
        { USB_DEVICE(FTDI_VID, FTDI_IPLUS_PID) },
        { USB_DEVICE(FTDI_VID, FTDI_SIO_PID) },
@@ -498,6 +499,7 @@ static struct usb_device_id id_table_combined [] = {
        { USB_DEVICE(FTDI_VID, FTDI_ASK_RDR400_PID) },
        { USB_DEVICE(ICOM_ID1_VID, ICOM_ID1_PID) },
        { USB_DEVICE(PAPOUCH_VID, PAPOUCH_TMU_PID) },
+       { USB_DEVICE(FTDI_VID, FTDI_ACG_HFDUAL_PID) },
        { },                                    /* Optional parameter entry */
        { }                                     /* Terminating entry */
 };
index 2c55a5ea9c992adcb94db8f58cd82b6813d44e5b..d69a917e768f2e445851b7fea27442c3e023e48d 100644 (file)
 #define FTDI_NF_RIC_PID        0x0001  /* Product Id */
 
 
+/* ACT Solutions HomePro ZWave interface (http://www.act-solutions.com/HomePro.htm) */
+#define FTDI_ACTZWAVE_PID      0xF2D0
+
+
 /* www.irtrans.de device */
 #define FTDI_IRTRANS_PID 0xFC60 /* Product Id */
 
 #define PAPOUCH_VID                    0x5050  /* Vendor ID */
 #define PAPOUCH_TMU_PID                        0x0400  /* TMU USB Thermometer */
 
+/*
+ * ACG Identification Technologies GmbH products (http://www.acg.de/).
+ * Submitted by anton -at- goto10 -dot- org.
+ */
+#define FTDI_ACG_HFDUAL_PID            0xDD20  /* HF Dual ISO Reader (RFID) */
 
 /* Commands */
 #define FTDI_SIO_RESET                 0 /* Reset the port */
index 476cda107f4fa8bcf0ef2fe53a04d9f37f4a698d..c62cc2876519629a6bd39e8b6284b84a51d201ab 100644 (file)
@@ -138,6 +138,7 @@ int usb_serial_generic_open (struct usb_serial_port *port, struct file *filp)
 
        return result;
 }
+EXPORT_SYMBOL_GPL(usb_serial_generic_open);
 
 static void generic_cleanup (struct usb_serial_port *port)
 {
index 4d40704dea2cf157d30673bdbae47f27844dc201..238033a87092fc841c7c6ac225ff921ec381139a 100644 (file)
@@ -257,14 +257,14 @@ static int omninet_write (struct usb_serial_port *port, const unsigned char *buf
                return (0);
        }
 
-       spin_lock(&port->lock);
-       if (port->write_urb_busy) {
-               spin_unlock(&port->lock);
+       spin_lock(&wport->lock);
+       if (wport->write_urb_busy) {
+               spin_unlock(&wport->lock);
                dbg("%s - already writing", __FUNCTION__);
                return 0;
        }
-       port->write_urb_busy = 1;
-       spin_unlock(&port->lock);
+       wport->write_urb_busy = 1;
+       spin_unlock(&wport->lock);
 
        count = (count > OMNINET_BULKOUTSIZE) ? OMNINET_BULKOUTSIZE : count;
 
@@ -283,7 +283,7 @@ static int omninet_write (struct usb_serial_port *port, const unsigned char *buf
        wport->write_urb->dev = serial->dev;
        result = usb_submit_urb(wport->write_urb, GFP_ATOMIC);
        if (result) {
-               port->write_urb_busy = 0;
+               wport->write_urb_busy = 0;
                err("%s - failed submitting write urb, error %d", __FUNCTION__, result);
        } else
                result = count;
index 071f86a59c086222ecf89c8705080b064b4d8fdc..9c36f0ece20ff6b43631e860621198f694400d5f 100644 (file)
@@ -189,11 +189,15 @@ static int serial_open (struct tty_struct *tty, struct file * filp)
 
        portNumber = tty->index - serial->minor;
        port = serial->port[portNumber];
-       if (!port)
-               return -ENODEV;
+       if (!port) {
+               retval = -ENODEV;
+               goto bailout_kref_put;
+       }
 
-       if (mutex_lock_interruptible(&port->mutex))
-               return -ERESTARTSYS;
+       if (mutex_lock_interruptible(&port->mutex)) {
+               retval = -ERESTARTSYS;
+               goto bailout_kref_put;
+       }
         
        ++port->open_count;
 
@@ -209,7 +213,7 @@ static int serial_open (struct tty_struct *tty, struct file * filp)
                 * safe because we are called with BKL held */
                if (!try_module_get(serial->type->driver.owner)) {
                        retval = -ENODEV;
-                       goto bailout_kref_put;
+                       goto bailout_mutex_unlock;
                }
 
                /* only call the device specific open if this 
@@ -224,10 +228,11 @@ static int serial_open (struct tty_struct *tty, struct file * filp)
 
 bailout_module_put:
        module_put(serial->type->driver.owner);
-bailout_kref_put:
-       kref_put(&serial->kref, destroy_serial);
+bailout_mutex_unlock:
        port->open_count = 0;
        mutex_unlock(&port->mutex);
+bailout_kref_put:
+       kref_put(&serial->kref, destroy_serial);
        return retval;
 }