diff -ur linux-2.6.14.2/drivers/usb/misc/Kconfig ../linux-2.6.14.2/drivers/usb/misc/Kconfig --- linux-2.6.14.2/drivers/usb/misc/Kconfig 2005-11-11 06:33:12.000000000 +0100 +++ ../linux-2.6.14.2/drivers/usb/misc/Kconfig 2006-06-05 19:19:00.000000000 +0200 @@ -4,6 +4,15 @@ comment "USB Miscellaneous drivers" depends on USB +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" depends on USB diff -ur linux-2.6.14.2/drivers/usb/misc/Makefile ../linux-2.6.14.2/drivers/usb/misc/Makefile --- linux-2.6.14.2/drivers/usb/misc/Makefile 2005-11-11 06:33:12.000000000 +0100 +++ ../linux-2.6.14.2/drivers/usb/misc/Makefile 2006-06-05 19:18:51.000000000 +0200 @@ -17,5 +17,6 @@ obj-$(CONFIG_USB_RIO500) += rio500.o obj-$(CONFIG_USB_TEST) += usbtest.o obj-$(CONFIG_USB_USS720) += uss720.o +obj-$(CONFIG_USB_KXTDA) += kxtda.o obj-$(CONFIG_USB_SISUSBVGA) += sisusbvga/ diff -ur linux-2.6.14.2/drivers/usb/misc/kxtda.c ../linux-2.6.14.2/drivers/usb/misc/kxtda.c --- linux-2.6.14.2/drivers/usb/misc/kxtda.c 2006-06-17 15:13:24.000000000 +0200 +++ ../linux-2.6.14.2/drivers/usb/misc/kxtda.c 2006-06-17 14:51:00.000000000 +0200 @@ -0,0 +1,473 @@ +/* + * 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 struct usb_device_id skel_table [] = { + { USB_DEVICE(KXTDA30_VENDOR_ID, KXTDA30_PRODUCT_ID) }, + { } /* Terminating entry */ +}; +MODULE_DEVICE_TABLE (usb, skel_table); + +static void skel_read_bulk_callback(struct urb *urb, struct pt_regs *regs); + +/* 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_skel { + struct usb_device * udev; /* the usb device for this device */ + struct usb_interface * interface; /* the interface for this device */ + spinlock_t bulk_in_lock; + unsigned char * transfer_buffer; + size_t transfer_buffer_length; + unsigned char * bulk_in_buffer; /* the buffer to receive data */ + size_t bulk_in_size; /* the size of the receive buffer */ + unsigned char * bulk_in_ptr; + __u8 bulk_in_endpointAddr; /* the address of the bulk in endpoint */ + __u8 bulk_out_endpointAddr; /* the address of the bulk out endpoint */ + struct kref kref; + __u8 write_in_progress; + __u8 read_ready; + wait_queue_head_t write_wait; + wait_queue_head_t read_wait; + struct urb * read_urb; +}; +#define to_skel_dev(d) container_of(d, struct usb_skel, kref) + +static struct usb_driver skel_driver; + +static void skel_delete(struct kref *kref) +{ + struct usb_skel *dev = to_skel_dev(kref); + + 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 skel_open(struct inode *inode, struct file *file) +{ + struct usb_skel *dev; + struct usb_interface *interface; + int subminor; + int retval = 0, result; + + subminor = iminor(inode); + + interface = usb_find_interface(&skel_driver, subminor); + if (!interface) { + err ("%s - error, can't find device for minor %d", + __FUNCTION__, subminor); + retval = -ENODEV; + goto exit; + } + + dev = usb_get_intfdata(interface); + if (!dev) { + retval = -ENODEV; + goto exit; + } + + usb_fill_bulk_urb(dev->read_urb, dev->udev, + usb_rcvbulkpipe(dev->udev, dev->bulk_in_endpointAddr), + dev->transfer_buffer, dev->transfer_buffer_length, + skel_read_bulk_callback, dev); + result = usb_submit_urb(dev->read_urb, GFP_KERNEL); + if (result) + err("%s - failed resubmiting read urb, error %d", __FUNCTION__, 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; + +exit: + return retval; +} + +static int skel_release(struct inode *inode, struct file *file) +{ + struct usb_skel *dev; + + dev = (struct usb_skel *)file->private_data; + if (dev == NULL) + return -ENODEV; + + /* decrement the count on our device */ + kref_put(&dev->kref, skel_delete); + return 0; +} + +static ssize_t skel_read(struct file *file, char *buffer, size_t count, loff_t *ppos) +{ + struct usb_skel *dev; + int retval = 0; + int bytes_read, i; + + dev = (struct usb_skel *)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) { + err("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) err("reading %d bytes", bytes_read); + 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; + err("Left %d 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 skel_read_bulk_callback(struct urb *urb, struct pt_regs *regs) +{ + struct usb_skel *dev; + int result; + + dev = (struct usb_skel *)urb->context; +err("read_bulk_callback %d %d", urb->actual_length, dev->transfer_buffer_length); + + if (urb->status) { + err("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) { + err("%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; + err("%s: received %d bytes (%d 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 */ +err("resubmitting urb"); + usb_fill_bulk_urb(urb, dev->udev, + usb_rcvbulkpipe(dev->udev, dev->bulk_in_endpointAddr), +// dev->bulk_in_buffer, dev->bulk_in_size, + dev->transfer_buffer, dev->transfer_buffer_length, + skel_read_bulk_callback, dev); + result = usb_submit_urb(urb, GFP_ATOMIC); + if (result) + err("%s - failed resubmitting read urb, error %d", __FUNCTION__, result); + +} + +static void skel_write_bulk_callback(struct urb *urb, struct pt_regs *regs) +{ + struct usb_skel *dev; + + dev = (struct usb_skel *)urb->context; + + /* sync/async unlink faults aren't errors */ + if (urb->status && + !(urb->status == -ENOENT || + urb->status == -ECONNRESET || + urb->status == -ESHUTDOWN)) { + dbg("%s - nonzero write bulk status received: %d", + __FUNCTION__, urb->status); + } + + /* free up our allocated buffer */ + usb_buffer_free(urb->dev, urb->transfer_buffer_length, + urb->transfer_buffer, urb->transfer_dma); + + dev->write_in_progress = 0; + wake_up_interruptible(&dev->write_wait); +} + +static ssize_t skel_write(struct file *file, const char *user_buffer, size_t count, loff_t *ppos) +{ + struct usb_skel *dev; + int retval = 0; + struct urb *urb = NULL; + char *buf = NULL; + + dev = (struct usb_skel *)file->private_data; + + /* verify that we actually have some data to write */ + if (count == 0) + goto exit; + + /* 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 error; + } + + buf = usb_buffer_alloc(dev->udev, count, GFP_KERNEL, &urb->transfer_dma); + if (!buf) { + retval = -ENOMEM; + goto error; + } + + 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, skel_write_bulk_callback, dev); + urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; + + /* send the data out the bulk port */ + retval = usb_submit_urb(urb, GFP_KERNEL); + if (retval) { + err("%s - failed submitting write urb, error %d", __FUNCTION__, retval); + goto error; + } + + 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: + usb_buffer_free(dev->udev, count, buf, urb->transfer_dma); + usb_free_urb(urb); + return retval; +} + +static struct file_operations skel_fops = { + .owner = THIS_MODULE, + .read = skel_read, + .write = skel_write, + .open = skel_open, + .release = skel_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 skel_class = { + .name = "usb/kxtda%d", + .fops = &skel_fops, + .mode = S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH, + .minor_base = USB_SKEL_MINOR_BASE, +}; + +static int skel_probe(struct usb_interface *interface, const struct usb_device_id *id) +{ + struct usb_skel *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) { + err("Out of memory"); + goto error; + } + memset(dev, 0x00, sizeof(*dev)); + kref_init(&dev->kref); + + 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 && + ((endpoint->bEndpointAddress & USB_ENDPOINT_DIR_MASK) + == USB_DIR_IN) && + ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) + == USB_ENDPOINT_XFER_BULK)) { + /* we found a bulk in endpoint */ + dev->read_urb = usb_alloc_urb (0, GFP_KERNEL); + if (!dev->read_urb) { + err("No free urbs available\n"); + goto error; + } + + buffer_size = le16_to_cpu(endpoint->wMaxPacketSize); + 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; + err("transfer_buffer_length = %d", buffer_size); + dev->transfer_buffer = kmalloc(buffer_size, GFP_KERNEL); + if (!dev->bulk_in_buffer) { + err("Could not allocate bulk_in_buffer"); + goto error; + } + } + + if (!dev->bulk_out_endpointAddr && + ((endpoint->bEndpointAddress & USB_ENDPOINT_DIR_MASK) + == USB_DIR_OUT) && + ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) + == USB_ENDPOINT_XFER_BULK)) { + /* we found a bulk out endpoint */ + dev->bulk_out_endpointAddr = endpoint->bEndpointAddress; + } + } + if (!(dev->bulk_in_endpointAddr && dev->bulk_out_endpointAddr)) { + err("Could not find both bulk-in and bulk-out endpoints"); + 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, &skel_class); + if (retval) { + /* something prevented us from registering this driver */ + err("Not able to get a minor for this device."); + usb_set_intfdata(interface, NULL); + goto error; + } + + /* let the user know what node this device is now attached to */ + info("USB Skeleton device now attached to USBSkel-%d", interface->minor); + + return 0; + +error: + if (dev) + kref_put(&dev->kref, skel_delete); + return retval; +} + +static void skel_disconnect(struct usb_interface *interface) +{ + struct usb_skel *dev; + int minor = interface->minor; + + /* prevent skel_open() from racing skel_disconnect() */ + lock_kernel(); + + dev = usb_get_intfdata(interface); + usb_set_intfdata(interface, NULL); + + /* give back our minor */ + usb_deregister_dev(interface, &skel_class); + + unlock_kernel(); + + /* decrement our usage count */ + kref_put(&dev->kref, skel_delete); + + info("USB Skeleton #%d now disconnected", minor); +} + +static struct usb_driver skel_driver = { + .owner = THIS_MODULE, + .name = "skeleton", + .probe = skel_probe, + .disconnect = skel_disconnect, + .id_table = skel_table, +}; + +static int __init usb_skel_init(void) +{ + int result; + + /* register this driver with the USB subsystem */ + result = usb_register(&skel_driver); + if (result) + err("usb_register failed. Error number %d", result); + + return result; +} + +static void __exit usb_skel_exit(void) +{ + /* deregister this driver with the USB subsystem */ + usb_deregister(&skel_driver); +} + +module_init (usb_skel_init); +module_exit (usb_skel_exit); + +MODULE_LICENSE("GPL");