diff -urN linux-3.10.17.orig/drivers/usb/misc/Kconfig linux-3.10.17/drivers/usb/misc/Kconfig --- linux-3.10.17.orig/drivers/usb/misc/Kconfig 2013-10-18 19:44:19.000000000 +0200 +++ linux-3.10.17/drivers/usb/misc/Kconfig 2016-02-29 13:30:08.000000000 +0100 @@ -3,6 +3,15 @@ # comment "USB Miscellaneous drivers" +config USB_KXTDA + tristate "KX-TDA" + depends on USB + ---help--- + This code is also available as a module ( = code which can be + inserted in and removed from the running kernel whenever you want). + The module will be called audio. If you want to compile it as a + module, say M here and read . + config USB_EMI62 tristate "EMI 6|2m USB Audio interface support" ---help--- diff -urN linux-3.10.17.orig/drivers/usb/misc/Makefile linux-3.10.17/drivers/usb/misc/Makefile --- linux-3.10.17.orig/drivers/usb/misc/Makefile 2013-10-18 19:44:19.000000000 +0200 +++ linux-3.10.17/drivers/usb/misc/Makefile 2016-02-29 13:30:02.000000000 +0100 @@ -5,6 +5,7 @@ ccflags-$(CONFIG_USB_DEBUG) := -DDEBUG +obj-$(CONFIG_USB_KXTDA) += kxtda.o obj-$(CONFIG_USB_ADUTUX) += adutux.o obj-$(CONFIG_USB_APPLEDISPLAY) += appledisplay.o obj-$(CONFIG_USB_CYPRESS_CY7C63) += cypress_cy7c63.o diff -urN linux-3.10.17.orig/drivers/usb/misc/kxtda.c linux-3.10.17/drivers/usb/misc/kxtda.c --- linux-3.10.17.orig/drivers/usb/misc/kxtda.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.10.17/drivers/usb/misc/kxtda.c 2016-02-29 13:25:37.000000000 +0100 @@ -0,0 +1,477 @@ +/* + * USB Skeleton driver - 2.0 + * + * Copyright (C) 2001-2004 Greg Kroah-Hartman (greg@kroah.com) + * + * 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, version 2. + * + * This driver is based on the 2.6.3 version of drivers/usb/usb-skeleton.c + * but has been rewritten to be easy to read and use, as no locks are now + * needed anymore. + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + + +/* Define these values to match your devices */ +#define KXTDA30_VENDOR_ID 0x04da +#define KXTDA30_PRODUCT_ID 0x1680 + +/* table of devices that work with this driver */ +static const struct usb_device_id kxtda_table [] = { + { USB_DEVICE(KXTDA30_VENDOR_ID, KXTDA30_PRODUCT_ID) }, + { } /* Terminating entry */ +}; +MODULE_DEVICE_TABLE(usb, kxtda_table); + +static void kxtda_read_bulk_callback(struct urb *urb); + +/* Get a minor range for your devices from the usb maintainer */ +#define USB_SKEL_MINOR_BASE 192 + +/* Structure to hold all of our device specific stuff */ +struct usb_kxtda { + spinlock_t bulk_in_lock; + unsigned char * transfer_buffer; + size_t transfer_buffer_length; + unsigned char * bulk_in_ptr; + struct usb_device *udev; /* the usb device for this device */ + struct usb_interface *interface; /* the interface for this device */ +// struct semaphore limit_sem; /* limiting the number of writes in progress */ + struct usb_anchor submitted; /* in case we need to retract our submissions */ + struct urb *bulk_in_urb; /* the urb to read data with */ + unsigned char *bulk_in_buffer; /* the buffer to receive data */ + size_t bulk_in_size; /* the size of the receive buffer */ + size_t bulk_in_filled; /* number of bytes in the buffer */ + size_t bulk_in_copied; /* already copied to user space */ + __u8 bulk_in_endpointAddr; /* the address of the bulk in endpoint */ + __u8 bulk_out_endpointAddr; /* the address of the bulk out endpoint */ + int errors; /* the last request tanked */ + bool ongoing_read; /* a read is going on */ + spinlock_t err_lock; /* lock for errors */ + struct kref kref; + struct mutex io_mutex; /* synchronize I/O with disconnect */ + wait_queue_head_t write_wait; + wait_queue_head_t read_wait; + __u8 write_in_progress; + __u8 read_ready; + struct urb * read_urb; + wait_queue_head_t bulk_in_wait; /* to wait for an ongoing read */ +}; +#define to_kxtda_dev(d) container_of(d, struct usb_kxtda, kref) + +static struct usb_driver kxtda_driver; + +static void kxtda_delete(struct kref *kref) +{ + struct usb_kxtda *dev = to_kxtda_dev(kref); + + usb_free_urb(dev->bulk_in_urb); + usb_put_dev(dev->udev); + if (dev->read_urb) { + usb_unlink_urb(dev->read_urb); + usb_free_urb(dev->read_urb); + } + kfree (dev->bulk_in_buffer); + kfree (dev->transfer_buffer); + kfree (dev); +} + +static int kxtda_open(struct inode *inode, struct file *file) +{ + struct usb_kxtda *dev; + struct usb_interface *interface; + int subminor; + int result; + + subminor = iminor(inode); + + interface = usb_find_interface(&kxtda_driver, subminor); + if (!interface) { + printk (KERN_ERR "%s - error, can't find device for minor %d", + __func__, subminor); + return -ENODEV; + } + + dev = usb_get_intfdata(interface); + if (!dev) { + return -ENODEV; + } + +dev_err(&interface->dev, "open"); + + usb_fill_bulk_urb(dev->read_urb, dev->udev, + usb_rcvbulkpipe(dev->udev, dev->bulk_in_endpointAddr), + dev->transfer_buffer, dev->transfer_buffer_length, + kxtda_read_bulk_callback, dev); + result = usb_submit_urb(dev->read_urb, GFP_KERNEL); + if (result) + dev_err(&interface->dev, "%s - failed resubmiting read urb, error %d", __func__, result); + + /* increment our usage count for the device */ + kref_get(&dev->kref); + + /* save our object in the file's private structure */ + file->private_data = dev; + + return 0; +} + +static int kxtda_release(struct inode *inode, struct file *file) +{ + struct usb_kxtda *dev; + + dev = file->private_data; + if (dev == NULL) + return -ENODEV; + + /* decrement the count on our device */ + usb_autopm_put_interface(dev->interface); + kref_put(&dev->kref, kxtda_delete); + return 0; +} + +static ssize_t kxtda_read(struct file *file, char __user *buffer, + size_t count, loff_t *ppos) +{ + struct usb_kxtda *dev; + int retval = 0; + int bytes_read, i, r; + + dev = file->private_data; + + if (dev->bulk_in_ptr == dev->bulk_in_buffer) { + if (file->f_flags & O_NONBLOCK) { + return -EAGAIN; + } +// retval = wait_event_interruptible_timeout(dev->read_wait, dev->read_ready, 5 * HZ); + retval = wait_event_interruptible(dev->read_wait, dev->read_ready); + + if (retval < 0) { + dev_err(&dev->interface->dev, "timeout in wait_event_interruptible_timeout()"); + return retval; + } + } + spin_lock_irq (&dev->bulk_in_lock); + bytes_read = dev->bulk_in_ptr - dev->bulk_in_buffer; + if (bytes_read > count) bytes_read = count; +// if (bytes_read) dev_err(&dev->interface->dev, "reading %d bytes", bytes_read); + r = copy_to_user(buffer, dev->bulk_in_buffer, bytes_read); + if (dev->bulk_in_buffer + bytes_read == dev->bulk_in_ptr) { + dev->bulk_in_ptr = dev->bulk_in_buffer; + } else { + for (i = 0; i < dev->bulk_in_ptr - dev->bulk_in_buffer - bytes_read; i++) + dev->bulk_in_buffer[i] = dev->bulk_in_buffer[i + bytes_read]; + dev->bulk_in_ptr = dev->bulk_in_buffer + bytes_read; + dev_err(&dev->interface->dev, "Left %ld bytes", dev->bulk_in_ptr - dev->bulk_in_buffer); + } + dev->read_ready = 0; + spin_unlock_irq (&dev->bulk_in_lock); + return bytes_read; +} + +static void kxtda_read_bulk_callback(struct urb *urb) +{ + struct usb_kxtda *dev; + int result; + + dev = (struct usb_kxtda *)urb->context; +//dev_err(&dev->interface->dev, "read_bulk_callback %d %d", (int)urb->actual_length, (int)dev->transfer_buffer_length); + + if (urb->status) { + dev_err(&dev->interface->dev, "Nonzero read bulk callback status: %d", urb->status); +// return; + } + + if (urb->actual_length > 0) { + if (dev->bulk_in_ptr + urb->actual_length > dev->bulk_in_buffer + dev->bulk_in_size) { + dev_err(&dev->interface->dev, "%s: bulk_in_buffer full", __FUNCTION__); + goto resubmit; + } + spin_lock (&dev->bulk_in_lock); + memcpy (dev->bulk_in_ptr, + dev->transfer_buffer, + urb->actual_length); + dev->bulk_in_ptr += urb->actual_length; + dev_err(&dev->interface->dev, "%s: received %d bytes (%ld bytes in buffer)", __FUNCTION__, urb->actual_length, dev->bulk_in_ptr-dev->bulk_in_buffer); + dev->read_ready = 1; + spin_unlock (&dev->bulk_in_lock); + + wake_up_interruptible(&dev->read_wait); + } + +resubmit: + /* Continue trying to always read */ +//dev_err(&dev->interface->dev, "resubmitting urb"); + usb_fill_bulk_urb(urb, dev->udev, + usb_rcvbulkpipe(dev->udev, dev->bulk_in_endpointAddr), + dev->transfer_buffer, dev->transfer_buffer_length, + kxtda_read_bulk_callback, dev); + result = usb_submit_urb(urb, GFP_ATOMIC); + if (result) + dev_err(&dev->interface->dev, "%s - failed resubmitting read urb, error %d", __FUNCTION__, result); + +} + +static void kxtda_write_bulk_callback(struct urb *urb) +{ + struct usb_kxtda *dev; + int status = urb->status; + + dev = urb->context; + + /* sync/async unlink faults aren't errors */ + if (status && + !(status == -ENOENT || + status == -ECONNRESET || + status == -ESHUTDOWN)) { + dev_err(&dev->interface->dev, + "nonzero write bulk status received: %d", status); + } + + /* free up our allocated buffer */ + usb_free_coherent(urb->dev, urb->transfer_buffer_length, + urb->transfer_buffer, urb->transfer_dma); +// up(&dev->limit_sem); + dev->write_in_progress = 0; + wake_up_interruptible(&dev->write_wait); +} + +static ssize_t kxtda_write(struct file *file, const char *user_buffer, size_t count, loff_t *ppos) +{ + struct usb_kxtda *dev; + int retval = 0; + struct urb *urb = NULL; + char *buf = NULL; + + dev = file->private_data; + + /* verify that we actually have some data to write */ + if (count == 0) + goto exit; + +// r = down_interruptible(&dev->limit_sem); +// if (r < 0) +// return -EINTR; + + /* create a urb, and a buffer for it, and copy the data to the urb */ + urb = usb_alloc_urb(0, GFP_KERNEL); + if (!urb) { + retval = -ENOMEM; + goto err_no_urb; + } + + buf = usb_alloc_coherent(dev->udev, count, GFP_KERNEL, + &urb->transfer_dma); + if (!buf) { + retval = -ENOMEM; + goto err_no_buf; + } + + if (copy_from_user(buf, user_buffer, count)) { + retval = -EFAULT; + goto error; + } + + while (dev->write_in_progress) { + if (file->f_flags & O_NONBLOCK) { + retval = -EAGAIN; + goto error; + } + retval = wait_event_interruptible (dev->write_wait, !dev->write_in_progress); + if (retval) + goto error; + } + dev->write_in_progress = 1; + + /* initialize the urb properly */ + usb_fill_bulk_urb(urb, dev->udev, + usb_sndbulkpipe(dev->udev, + dev->bulk_out_endpointAddr), + buf, count, kxtda_write_bulk_callback, dev); + urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; + + usb_anchor_urb(urb, &dev->submitted); + + /* send the data out the bulk port */ + retval = usb_submit_urb(urb, GFP_KERNEL); + if (retval) { + dev_err(&dev->udev->dev, + "%s - failed submitting write urb, error %d\n", + __func__, retval); + goto error_unanchor; + } + + wait_event_interruptible (dev->write_wait, !dev->write_in_progress); + + /* release our reference to this urb, + the USB core will eventually free it entirely */ + usb_free_urb(urb); + +exit: + return count; + +error_unanchor: + usb_unanchor_urb(urb); +error: + usb_free_coherent(dev->udev, count, buf, urb->transfer_dma); +err_no_buf: + usb_free_urb(urb); +err_no_urb: +// up(&dev->limit_sem); + return retval; +} + +static struct file_operations kxtda_fops = { + .owner = THIS_MODULE, + .read = kxtda_read, + .write = kxtda_write, + .open = kxtda_open, + .release = kxtda_release, +}; + +/* + * usb class driver info in order to get a minor number from the usb core, + * and to have the device registered with devfs and the driver core + */ +static struct usb_class_driver kxtda_class = { + .name = "usb/kxtda%d", + .fops = &kxtda_fops, + .minor_base = USB_SKEL_MINOR_BASE, +}; + +static int kxtda_probe(struct usb_interface *interface, const struct usb_device_id *id) +{ + struct usb_kxtda *dev = NULL; + struct usb_host_interface *iface_desc; + struct usb_endpoint_descriptor *endpoint; + size_t buffer_size; + int i; + int retval = -ENOMEM; + + /* allocate memory for our device state and initialize it */ + dev = kmalloc(sizeof(*dev), GFP_KERNEL); + if (dev == NULL) { + dev_err(&interface->dev, "Out of memory\n"); + goto error; + } + memset(dev, 0x00, sizeof(*dev)); + kref_init(&dev->kref); +// sema_init(&dev->limit_sem, USB_LCD_CONCURRENT_WRITES); + init_usb_anchor(&dev->submitted); + + dev->udev = usb_get_dev(interface_to_usbdev(interface)); + dev->interface = interface; + + spin_lock_init (&dev->bulk_in_lock); + + init_waitqueue_head (&dev->read_wait); + init_waitqueue_head (&dev->write_wait); + + /* set up the endpoint information */ + /* use only the first bulk-in and bulk-out endpoints */ + iface_desc = interface->cur_altsetting; + for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) { + endpoint = &iface_desc->endpoint[i].desc; + + if (!dev->bulk_in_endpointAddr && + usb_endpoint_is_bulk_in(endpoint)) { + /* we found a bulk in endpoint */ + dev->read_urb = usb_alloc_urb (0, GFP_KERNEL); + if (!dev->read_urb) { + dev_err(&interface->dev, "No free urbs available\n"); + goto error; + } + + buffer_size = usb_endpoint_maxp(endpoint); + dev->bulk_in_size = buffer_size * 256; + dev->bulk_in_endpointAddr = endpoint->bEndpointAddress; + dev->bulk_in_ptr = dev->bulk_in_buffer = kmalloc(buffer_size * 256, GFP_KERNEL); + + dev->transfer_buffer_length = buffer_size; + dev_err(&interface->dev, "transfer_buffer_length = %d", (int)buffer_size); + dev->transfer_buffer = kmalloc(buffer_size, GFP_KERNEL); + if (!dev->bulk_in_buffer) { + dev_err(&interface->dev, + "Could not allocate bulk_in_buffer\n"); + goto error; + } + } + + if (!dev->bulk_out_endpointAddr && + usb_endpoint_is_bulk_out(endpoint)) { + /* we found a bulk out endpoint */ + dev->bulk_out_endpointAddr = endpoint->bEndpointAddress; + } + } + if (!(dev->bulk_in_endpointAddr && dev->bulk_out_endpointAddr)) { + dev_err(&interface->dev, + "Could not find both bulk-in and bulk-out endpoints\n"); + goto error; + } + + /* save our data pointer in this interface device */ + usb_set_intfdata(interface, dev); + + /* we can register the device now, as it is ready */ + retval = usb_register_dev(interface, &kxtda_class); + if (retval) { + /* something prevented us from registering this driver */ + dev_err(&interface->dev, + "Not able to get a minor for this device.\n"); + usb_set_intfdata(interface, NULL); + goto error; + } + + /* let the user know what node this device is now attached to */ + dev_info(&interface->dev, "KX-TDA now attached to USBSkel-%d", interface->minor); + + return 0; + +error: + if (dev) + kref_put(&dev->kref, kxtda_delete); + return retval; +} + +static void kxtda_disconnect(struct usb_interface *interface) +{ + struct usb_kxtda *dev; + int minor = interface->minor; + +// mutex_lock(&open_disc_mutex); + dev = usb_get_intfdata(interface); + usb_set_intfdata(interface, NULL); +// mutex_unlock(&open_disc_mutex); + + /* give back our minor */ + usb_deregister_dev(interface, &kxtda_class); + + /* decrement our usage count */ + kref_put(&dev->kref, kxtda_delete); + + dev_info(&interface->dev, "KX-TDA #%d now disconnected", minor); +} + +static struct usb_driver kxtda_driver = { + .name = "kxtda", + .probe = kxtda_probe, + .disconnect = kxtda_disconnect, + .id_table = kxtda_table, +}; + +module_usb_driver(kxtda_driver); + +MODULE_LICENSE("GPL"); +