diff -urN ../old/linux-2.6.1/drivers/usb/Makefile ./drivers/usb/Makefile
--- ../old/linux-2.6.1/drivers/usb/Makefile	2004-01-09 02:00:03.000000000 -0500
+++ ./drivers/usb/Makefile	2004-01-19 17:14:35.000000000 -0500
@@ -59,3 +59,4 @@
 obj-$(CONFIG_USB_TEST)		+= misc/
 obj-$(CONFIG_USB_TIGL)		+= misc/
 obj-$(CONFIG_USB_USS720)	+= misc/
+obj-$(CONFIG_USB_ADUTUX)	+= misc/
diff -urN ../old/linux-2.6.1/drivers/usb/misc/adutux.c ./drivers/usb/misc/adutux.c
--- ../old/linux-2.6.1/drivers/usb/misc/adutux.c	1969-12-31 19:00:00.000000000 -0500
+++ ./drivers/usb/misc/adutux.c	2003-12-23 08:32:53.000000000 -0500
@@ -0,0 +1,990 @@
+/*
+ * adutux - driver for ADU devices from Ontrak Control Systems
+ * This is an experimental driver. Use at your own risk.
+ * This driver is not supported by Ontrak Control Systems.
+ *
+ * Copyright (c) 2003 John Homppi (SCO, leave this notice here)
+ *
+ * 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.
+ *
+ * derived from the Lego USB Tower driver 0.56:
+ * Copyright (c) 2003 David Glance <davidgsf <at> sourceforge.net> 
+ *               2001 Juergen Stuber <stuber <at> loria.fr>
+ * that was derived from USB Skeleton driver - 0.5
+ * Copyright (c) 2001 Greg Kroah-Hartman (greg <at> kroah.com)
+ *
+ * History:
+ *
+ * 2003-12-23 - 0.0.5 jhomppi
+ *   - unlink urb after each read and write
+ * 2003-12-02 - 0.0.4 jhomppi
+ *   - replace urb_submitted with urb status==-EINPROGRESS to stay
+ *     in synch with real urb state
+ *   - allow multiple open handles to the same device (now that
+ *     urb_submitted problem has been removed)
+ * 2003-11-28 - 0.0.3 jhomppi
+ *   - applied more changes suggested by Oliver Neukum
+ *       - pre-start read if a buffer is available
+ *       - correct the location of spin_unlock at end of a read
+ *   - added hack to return serial number to caller if read buffer
+ *     starts with an 's' (allows serial# retrieval without ioctl)
+ *   - check that udev was not nuked by an early disconnect 
+ *     (ie. check for a null dev->udev in adu_abort_transfers)
+ *   - increase scope of lock_irqsave in adu_read so that 
+ *     urb_submitted is protected versus the interrupt_in_callback
+ *   - use down_interruptible where appropriate to prevent locking
+ *     driver module into memory forever
+ * 2003-11-27 - 0.0.2 jhomppi
+ *   - applied changes suggested by Oliver Neukum to add
+ *     spin locks and double buffering to adu_interrupt_in_callback
+ * 2003-11-25 - 0.0.1 jhomppi
+ *   - copied from the Lego Tower USB driver for Kernel 2.6.0
+ *   - modified to support ADU devices (basically changed only 
+ *     the names and constants)
+ */
+
+#include <linux/config.h>
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/module.h>
+#include <linux/smp_lock.h>
+#include <linux/completion.h>
+#include <asm/uaccess.h>
+#include <linux/usb.h>
+
+
+#ifdef CONFIG_USB_DEBUG
+static int debug = 4;
+#else
+static int debug = 1;
+#endif
+
+/* Use our own dbg macro */
+#undef dbg
+#define dbg(lvl, format, arg...) do { if (debug >= lvl) printk(KERN_DEBUG __FILE__ " : " format " \n", ## arg); } while (0)
+
+
+/* Version Information */
+#define DRIVER_VERSION "v0.0.5"
+#define DRIVER_AUTHOR "John Homppi"
+#define DRIVER_DESC "driver - ADUxxx (see www.ontrak.net)"
+
+/* Module paramaters */
+MODULE_PARM(debug, "i");
+MODULE_PARM_DESC(debug, "Debug enabled or not");
+
+
+/* Define these values to match your device */
+#define ADU_VENDOR_ID 0x0a07
+#define ADU_PRODUCT_ID 0x0064
+
+/* table of devices that work with this driver */
+static struct usb_device_id device_table [] = {
+{ USB_DEVICE(ADU_VENDOR_ID, ADU_PRODUCT_ID) },		/* ADU100 */
+{ USB_DEVICE(ADU_VENDOR_ID, ADU_PRODUCT_ID+100) },	/* ADU200 */
+{ USB_DEVICE(ADU_VENDOR_ID, ADU_PRODUCT_ID+108) },	/* ADU208 */
+{ }/* Terminating entry */
+};
+
+MODULE_DEVICE_TABLE (usb, device_table);
+
+/* FIXME: Get a minor range for your devices from the usb maintainer */
+#define ADU_MINOR_BASE 0xB3 /* HEY! this belongs to the Lego guys!! */
+
+/* we can have up to this number of device plugged in at once */
+#define MAX_DEVICES 16
+
+#define COMMAND_TIMEOUT    (2*HZ)  /* 60 second timeout for a command */
+
+/* Structure to hold all of our device specific stuff */
+struct adu_device {
+	struct semaphore	sem; /* locks this structure */
+	struct usb_device*	udev; /* save off the usb device pointer */
+	struct usb_interface*	interface;
+	unsigned char		minor; /* the starting minor number for this device */
+	char			serial_number[8];
+
+	int			open_count; /* number of times this port has been opened */
+
+	char*			read_buffer_primary;
+	int			read_buffer_length;
+	char*			read_buffer_secondary;
+	int			secondary_head;
+	int			secondary_tail;
+	spinlock_t		buflock;
+
+	wait_queue_head_t	read_wait;
+	wait_queue_head_t	write_wait;
+
+	char*			interrupt_in_buffer;
+	struct usb_endpoint_descriptor* interrupt_in_endpoint;
+	struct urb*		interrupt_in_urb;
+	int			read_urb_finished;
+
+	char*			interrupt_out_buffer;
+	struct usb_endpoint_descriptor* interrupt_out_endpoint;
+	struct urb*		interrupt_out_urb;
+};
+
+/* prevent races between open() and disconnect */
+static DECLARE_MUTEX (disconnect_sem);
+
+/* local function prototypes */
+static ssize_t adu_read (struct file *file, char *buffer, size_t count, loff_t *ppos);
+static ssize_t adu_write (struct file *file, const char *buffer, size_t count, loff_t *ppos);
+static int adu_ioctl (struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg);
+static inline void adu_delete (struct adu_device *dev);
+static int adu_open(struct inode *inode, struct file *file);
+static int adu_release(struct inode *inode, struct file *file);
+static int adu_release_internal (struct adu_device *dev);
+static void adu_abort_transfers (struct adu_device *dev);
+static void adu_interrupt_in_callback (struct urb *urb, struct pt_regs *regs);
+static void adu_interrupt_out_callback (struct urb *urb, struct pt_regs *regs);
+
+static int  adu_probe (struct usb_interface *interface, const struct usb_device_id *id);
+static void adu_disconnect (struct usb_interface *interface);
+
+/* file operations needed when we register this driver */
+static struct file_operations adu_fops = {
+	.owner = THIS_MODULE,
+	.read  = adu_read,
+	.write = adu_write,
+	.ioctl = adu_ioctl,
+	.open = adu_open,
+	.release = adu_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 adu_class = {
+	.name = "usb/adutux%d",
+	.fops = &adu_fops,
+	.mode = S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH,
+	.minor_base = ADU_MINOR_BASE,
+};
+
+/* usb specific object needed to register this driver with the usb subsystem */
+static struct usb_driver adu_driver = {
+	.owner = THIS_MODULE,
+	.name = "adutux",
+	.probe = adu_probe,
+	.disconnect = adu_disconnect,
+	.id_table = device_table,
+};
+
+/**
+ * adu_debug_data
+ */
+static inline void adu_debug_data (int level, const char *function, int size, const unsigned char *data)
+{
+	int i;
+
+	if (debug < level)
+	return; 
+
+	printk (KERN_DEBUG __FILE__": %s - length = %d, data = ", function, size);
+	for (i = 0; i < size; ++i) {
+		printk ("%.2x ", data[i]);
+	}
+	printk ("\n");
+} /* end adu_debug_data */
+
+/**
+ * adu_delete
+ */
+static inline void adu_delete (struct adu_device *dev)
+{
+	dbg(2, "%s enter", __FUNCTION__);
+
+	adu_abort_transfers (dev);
+
+	/* free data structures */
+	if (dev->interrupt_in_urb != NULL) {
+		usb_free_urb (dev->interrupt_in_urb);
+	}
+	if (dev->interrupt_out_urb != NULL) {
+		usb_free_urb (dev->interrupt_out_urb);
+	}
+	
+	kfree (dev->read_buffer_primary);
+	kfree (dev->read_buffer_secondary);
+	kfree (dev->interrupt_in_buffer);
+	kfree (dev->interrupt_out_buffer);
+	kfree (dev);
+
+	dbg(2, "%s : leave", __FUNCTION__);
+} /* end adu_delete */
+
+
+/**
+ * adu_open
+ */
+static int adu_open (struct inode *inode, struct file *file)
+{
+	struct adu_device *dev = NULL;
+	struct usb_interface *interface;
+	int subminor;
+	int retval = 0;
+
+	dbg(2,"%s : enter", __FUNCTION__);
+
+	subminor = iminor(inode);
+
+	down (&disconnect_sem); /* not interruptible */
+
+	interface = usb_find_interface (&adu_driver, subminor);
+
+	if (!interface) {
+		err ("%s - error, can't find device for minor %d",
+			__FUNCTION__, subminor);
+		retval = -ENODEV;
+		goto exit_no_device;
+	}
+
+	dev = usb_get_intfdata(interface);
+
+	if (!dev) {
+		retval = -ENODEV;
+		goto exit_no_device;
+	}
+	
+	/* lock this device */
+	if ((retval = down_interruptible (&dev->sem))) {
+		int iCount;
+		iCount = atomic_read(&dev->sem.count);
+		dbg(2,"%s : sem down failed, count %d", __FUNCTION__, iCount);
+		goto exit_no_device;
+	}
+
+	/* increment our usage count for the device */
+	++dev->open_count;
+	dbg(2,"%s : open count %d", __FUNCTION__, dev->open_count);
+
+	/* save device in the file's private structure */
+	file->private_data = dev;
+
+	/* initialize in direction */
+	dev->read_buffer_length = 0;
+
+	up (&dev->sem);
+
+exit_no_device:
+
+	up (&disconnect_sem);
+
+	dbg(2,"%s : leave, return value %d ", __FUNCTION__, retval);
+
+	return retval;
+} /* end adu_open */
+
+/**
+ * adu_release
+ */
+static int adu_release (struct inode *inode, struct file *file)
+{
+	struct adu_device *dev = NULL;
+	int retval = 0;
+
+	dbg(2," %s : enter", __FUNCTION__);
+	
+	if (file == NULL) {
+ 		dbg(1," %s : file is NULL", __FUNCTION__);
+		retval = -ENODEV;
+		goto exit;
+	}
+
+	dev = (struct adu_device *)file->private_data;
+
+	if (dev == NULL) {
+ 		dbg(1," %s : object is NULL", __FUNCTION__);
+		retval = -ENODEV;
+		goto exit;
+	}
+
+
+	/* lock our device */
+	down (&dev->sem); /* not interruptible */
+
+	if (dev->open_count <= 0) {
+		dbg(1," %s : device not opened", __FUNCTION__);
+		retval = -ENODEV;
+		goto exit;
+	}
+
+	/* do the work */
+	retval = adu_release_internal (dev);
+
+exit:
+	up (&dev->sem);
+	dbg(2," %s : leave, return value %d", __FUNCTION__, retval);
+	return retval;
+} /* end adu_release */
+
+
+/**
+ * adu_release_internal
+ */
+static int adu_release_internal (struct adu_device *dev)
+{
+	int retval = 0;
+
+	dbg(2," %s : enter", __FUNCTION__);
+
+	if (dev->udev == NULL) {
+		/* the device was unplugged before the file was released */
+		adu_delete (dev);
+		goto exit;
+	}
+
+	/* decrement our usage count for the device */
+	--dev->open_count;
+	dbg(2," %s : open count %d", __FUNCTION__, dev->open_count);
+	if (dev->open_count <= 0) {
+		adu_abort_transfers (dev);
+		dev->open_count = 0;
+	}
+
+exit:
+	dbg(2," %s : leave", __FUNCTION__);
+	return retval;
+} /* end adu_release_internal */
+
+
+/**
+ * adu_abort_transfers
+ *      aborts transfers and frees associated data structures
+ */
+static void adu_abort_transfers (struct adu_device *dev)
+{
+	dbg(2," %s : enter", __FUNCTION__);
+
+	if (dev == NULL) {
+		dbg(1," %s : dev is null", __FUNCTION__);
+		goto exit;
+	}
+	
+	if (dev->udev == NULL) {
+		dbg(1," %s : udev is null", __FUNCTION__);
+		goto exit;
+	}
+	
+	dbg(2," %s : udev state %d", __FUNCTION__, dev->udev->state);
+	if (dev->udev->state == USB_STATE_NOTATTACHED) {
+		dbg(1," %s : udev is not attached", __FUNCTION__);
+		goto exit;
+	}
+
+	/* shutdown transfer */
+	if (dev->interrupt_in_urb != NULL) {
+		usb_unlink_urb (dev->interrupt_in_urb);
+	}
+	if (dev->interrupt_out_urb != NULL) {
+		usb_unlink_urb (dev->interrupt_out_urb);
+	}
+
+exit:
+	dbg(2," %s : leave", __FUNCTION__);
+} /* end adu_abort_transfers */
+
+
+/**
+ * adu_read
+ */
+static ssize_t adu_read (struct file *file, char *buffer, size_t count, loff_t *ppos)
+{
+	struct adu_device *dev;
+	size_t bytes_read = 0;
+	size_t bytes_to_read = count;
+	int i;
+	int retval = 0;
+	int timeout = 0;
+	int should_submit = 0;
+	unsigned long flags;
+	DECLARE_WAITQUEUE(wait, current);
+
+	dbg(2," %s : enter, count = %d", __FUNCTION__, count);
+
+	dev = (struct adu_device *)file->private_data;
+
+	/* lock this object */
+	if (down_interruptible(&dev->sem))
+		return -ERESTARTSYS;
+
+	/* verify that the device wasn't unplugged */
+	if (dev->udev == NULL || dev->minor == 0) {
+		retval = -ENODEV;
+		err("No device or device unplugged %d", retval);
+		goto exit;
+	}
+	
+	/* a hack to return serial number to caller (without using ioctl) */
+	if (buffer[0] == 's' || buffer[0] == 'S'){
+		memcpy(buffer, dev->serial_number, sizeof(dev->serial_number));
+		retval = sizeof(dev->serial_number);
+		goto exit;
+	}
+	
+	/* verify that some data was requested */
+	if (count == 0) {
+		dbg(1," %s : read request of 0 bytes", __FUNCTION__);
+		goto exit;
+	}
+
+	timeout = COMMAND_TIMEOUT;
+
+	while (bytes_to_read) {
+		int data_in_secondary = dev->secondary_tail - dev->secondary_head;
+		dbg(2," %s : while, data_in_secondary=%d, status=%d", __FUNCTION__, data_in_secondary,
+			dev->interrupt_in_urb->status);
+		if (data_in_secondary) { /* drain secondary buffer */
+			int amount = bytes_to_read < data_in_secondary ? bytes_to_read : data_in_secondary; 
+			i = copy_to_user (buffer, dev->read_buffer_secondary+dev->secondary_head, amount);
+			dev->secondary_head += (amount - i);
+			bytes_read += (amount - i);
+			bytes_to_read -= (amount - i);
+			if (i) {
+				retval = bytes_read ? bytes_read : -EFAULT;
+				goto exit;
+			}
+		} else { /* we check the primary buffer */
+			spin_lock_irqsave (&dev->buflock, flags);
+			if (dev->read_buffer_length) { /* we secure access to the primary */
+				char *tmp;
+				dbg(2," %s : swap, read_buffer_length = %d", __FUNCTION__, dev->read_buffer_length);
+				tmp = dev->read_buffer_secondary;
+				dev->read_buffer_secondary = dev->read_buffer_primary;
+				dev->read_buffer_primary = tmp;
+				dev->secondary_head = 0;
+				dev->secondary_tail = dev->read_buffer_length;
+				dev->read_buffer_length = 0;
+				spin_unlock_irqrestore (&dev->buflock, flags);
+				should_submit = 1; /* we have a free buffer so use it */
+			} else { /* even the primary was empty - we may need to do IO */
+				if (dev->interrupt_in_urb->status == -EINPROGRESS) { /*somebody is doing IO*/
+					spin_unlock_irqrestore (&dev->buflock, flags);
+					dbg(2," %s : submitted already", __FUNCTION__); 
+				} else { /* we must initiate input */
+					dbg(2," %s : initiate input", __FUNCTION__); 
+					dev->read_urb_finished = 0;
+					
+					usb_fill_int_urb (dev->interrupt_in_urb,dev->udev,
+						usb_rcvintpipe(dev->udev, dev->interrupt_in_endpoint->bEndpointAddress),
+						dev->interrupt_in_buffer,
+						dev->interrupt_in_endpoint->wMaxPacketSize,
+						adu_interrupt_in_callback,
+						dev,
+						dev->interrupt_in_endpoint->bInterval);
+					retval = usb_submit_urb(dev->interrupt_in_urb, GFP_KERNEL);
+					if (!retval) {
+						spin_unlock_irqrestore (&dev->buflock, flags);
+						dbg(2," %s : submitted OK", __FUNCTION__); 
+					} else {
+						if (retval == -ENOMEM) {
+							retval = bytes_read ? bytes_read : -ENOMEM;
+						}
+						spin_unlock_irqrestore (&dev->buflock, flags);
+						dbg(2," %s : submit failed", __FUNCTION__); 
+						goto exit;
+					}
+				}
+
+				/* we wait for I/O to complete */
+				set_current_state(TASK_INTERRUPTIBLE);
+				add_wait_queue(&dev->read_wait, &wait);
+				if (!dev->read_urb_finished) {
+					timeout = schedule_timeout(COMMAND_TIMEOUT);
+				}
+				else
+					set_current_state(TASK_RUNNING);
+				remove_wait_queue(&dev->read_wait, &wait);
+				
+				if (timeout <= 0) {
+					dbg(2," %s : timeout", __FUNCTION__); 
+					retval = bytes_read ? bytes_read : -ETIMEDOUT;
+					goto exit;
+				}
+
+				if (signal_pending(current)) {
+					dbg(2," %s : signal pending", __FUNCTION__); 
+					retval = bytes_read ? bytes_read : -EINTR;
+					goto exit;
+				}
+			}
+		}
+	}
+
+	retval = bytes_read;
+	/* if the primary buffer is empty then use it */
+	if (should_submit && !dev->interrupt_in_urb->status==-EINPROGRESS) {
+		usb_fill_int_urb (dev->interrupt_in_urb,dev->udev,
+				usb_rcvintpipe(dev->udev, dev->interrupt_in_endpoint->bEndpointAddress),
+				dev->interrupt_in_buffer,
+				dev->interrupt_in_endpoint->wMaxPacketSize,
+				adu_interrupt_in_callback,
+				dev,
+				dev->interrupt_in_endpoint->bInterval);
+		dev->interrupt_in_urb->transfer_flags |= URB_ASYNC_UNLINK; 
+		dev->read_urb_finished = 0;
+		usb_submit_urb(dev->interrupt_in_urb, GFP_KERNEL);
+			/* we ignore failure */
+	}
+
+ exit:
+	/* unlock the device */
+	up (&dev->sem);
+
+	dbg(2," %s : leave, return value %d", __FUNCTION__, retval);
+	return retval;
+} /* end adu_read */
+
+
+/**
+ * adu_write
+ */
+static ssize_t adu_write (struct file *file, const char *buffer, size_t count, loff_t *ppos)
+{
+	struct adu_device *dev;
+	size_t bytes_written = 0;
+	size_t bytes_to_write;
+	size_t buffer_size;
+	int retval = 0;
+	int timeout = 0;
+
+	dbg(2," %s : enter, count = %d", __FUNCTION__, count);
+
+	dev = (struct adu_device *)file->private_data;
+
+	/* lock this object */
+	down_interruptible (&dev->sem);
+
+	/* verify that the device wasn't unplugged */
+	if (dev->udev == NULL || dev->minor == 0) {
+		retval = -ENODEV;
+		err("No device or device unplugged %d", retval);
+		goto exit;
+	}
+
+	/* verify that we actually have some data to write */
+	if (count == 0) {
+		dbg(1," %s : write request of 0 bytes", __FUNCTION__);
+		goto exit;
+	}
+
+
+	while (count > 0) {
+		if (dev->interrupt_out_urb->status == -EINPROGRESS) {
+			timeout = COMMAND_TIMEOUT;
+
+			while (timeout > 0) {
+				if (signal_pending(current)) {
+				dbg(1," %s : interrupted", __FUNCTION__);
+				retval = -EINTR;
+				goto exit;
+			}
+			up (&dev->sem);
+			timeout = interruptible_sleep_on_timeout (&dev->write_wait, timeout);
+			down_interruptible (&dev->sem);
+			if (timeout > 0) {
+				break;
+			}
+			dbg(1," %s : interrupted timeout: %d", __FUNCTION__, timeout);
+		}
+
+
+		dbg(1," %s : final timeout: %d", __FUNCTION__, timeout);
+
+		if (timeout == 0) {
+			dbg(1, "%s - command timed out.", __FUNCTION__);
+			retval = -ETIMEDOUT;
+			goto exit;
+		}
+
+		dbg(4," %s : in progress, count = %d", __FUNCTION__, count);
+
+		} else {
+			dbg(4," %s : sending, count = %d", __FUNCTION__, count);
+
+			/* write the data into interrupt_out_buffer from userspace */
+			buffer_size = dev->interrupt_out_endpoint->wMaxPacketSize;
+			bytes_to_write = count > buffer_size ? buffer_size : count;
+			dbg(4," %s : buffer_size = %d, count = %d, bytes_to_write = %d", __FUNCTION__, buffer_size, count, bytes_to_write);
+
+			if (copy_from_user (dev->interrupt_out_buffer, buffer, bytes_to_write) != 0) {
+				retval = -EFAULT;
+				goto exit;
+			}
+
+			/* send off the urb */
+			usb_fill_int_urb(
+				dev->interrupt_out_urb,
+				dev->udev, 
+				usb_sndintpipe(dev->udev, dev->interrupt_out_endpoint->bEndpointAddress),
+				dev->interrupt_out_buffer,
+				bytes_to_write,
+				adu_interrupt_out_callback,
+				dev,
+				dev->interrupt_in_endpoint->bInterval);
+			dev->interrupt_in_urb->transfer_flags |= URB_ASYNC_UNLINK; 
+			dev->interrupt_out_urb->actual_length = bytes_to_write;
+			retval = usb_submit_urb (dev->interrupt_out_urb, GFP_KERNEL);
+
+			if (retval < 0) {
+				err("Couldn't submit interrupt_out_urb %d", retval);
+				goto exit;
+			}
+
+			buffer += bytes_to_write;
+			count -= bytes_to_write;
+
+			bytes_written += bytes_to_write;
+		}
+	}
+
+	retval = bytes_written;
+
+exit:
+	/* unlock the device */
+	up (&dev->sem);
+
+	dbg(2," %s : leave, return value %d", __FUNCTION__, retval);
+
+	return retval;
+} /* end adu_write */
+
+
+/**
+ * Number of reasons why this isn't supported - GKH doesn't like them
+ * since they are non-portable and also most of this is derived from
+ * proprietary information
+ */
+
+static int adu_ioctl (struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
+{
+	int retval =  -ENOTTY;  /* default: we don't understand ioctl */
+
+	return retval;
+} /* end adu_ioctl */
+
+
+/**
+ * adu_interrupt_in_callback
+ */
+static void adu_interrupt_in_callback (struct urb *urb, struct pt_regs *regs)
+{
+	struct adu_device *dev = (struct adu_device *)urb->context;
+
+	dbg(4," %s : enter, status %d", __FUNCTION__, urb->status);
+	adu_debug_data(5,__FUNCTION__, urb->actual_length, urb->transfer_buffer);
+	
+	spin_lock (&dev->buflock);
+	
+	if (urb->status != 0) {
+		if ((urb->status != -ENOENT) && (urb->status != -ECONNRESET)) {
+			dbg(1," %s : nonzero status received: %d", __FUNCTION__, urb->status);
+		}
+		goto exit;
+	}
+	
+	if (urb->actual_length > 0) {
+		if (dev->read_buffer_length < (4 * dev->interrupt_in_endpoint->wMaxPacketSize) - (urb->actual_length)) {
+
+			memcpy (dev->read_buffer_primary+dev->read_buffer_length, dev->interrupt_in_buffer, urb->actual_length);
+
+			dev->read_buffer_length += urb->actual_length;
+			dbg(1," %s reading  %d ", __FUNCTION__, urb->actual_length);
+
+		} else {
+			dbg(1," %s : read_buffer overflow", __FUNCTION__);
+		}
+	}
+	
+exit:
+	dev->read_urb_finished = 1;
+	spin_unlock (&dev->buflock);
+	wake_up_interruptible (&dev->read_wait); /* always wake up so we recover from errors */
+	adu_debug_data(5,__FUNCTION__, urb->actual_length, urb->transfer_buffer);
+	dbg(4," %s : leave, status %d", __FUNCTION__, urb->status);
+} /* end adu_interrupt_in_callback */
+
+
+/**
+ * adu_interrupt_out_callback
+ */
+static void adu_interrupt_out_callback (struct urb *urb, struct pt_regs *regs)
+{
+	struct adu_device *dev = (struct adu_device *)urb->context;
+
+	dbg(4," %s : enter, status %d", __FUNCTION__, urb->status);
+	adu_debug_data(5,__FUNCTION__, urb->actual_length, urb->transfer_buffer);
+
+	if (urb->status != 0) {
+		if ((urb->status != -ENOENT) && 
+		    (urb->status != -ECONNRESET)) {
+			dbg(1, " %s :nonzero status received: %d", __FUNCTION__, urb->status);
+		}
+		goto exit;
+	}                        
+
+	wake_up_interruptible(&dev->write_wait);
+exit:
+
+	adu_debug_data(5,__FUNCTION__, urb->actual_length, urb->transfer_buffer);
+	dbg(4," %s : leave, status %d", __FUNCTION__, urb->status);
+} /* end adu_interrupt_out_callback */
+
+
+/**
+ * adu_probe
+ *
+ * Called by the usb core when a new device is connected that it thinks
+ * this driver might be interested in.
+ */
+static int adu_probe (struct usb_interface *interface, const struct usb_device_id *id)
+{
+	struct usb_device *udev = interface_to_usbdev(interface);
+	struct adu_device *dev = NULL;
+	struct usb_host_interface *iface_desc;
+	struct usb_endpoint_descriptor *endpoint;
+	int i;
+	int retval = -ENOMEM;
+
+	dbg(2," %s : enter", __FUNCTION__);
+
+	if (udev == NULL) {
+		info ("udev is NULL.");
+		retval = -ENODEV;
+		goto exit;
+	}
+
+	/* See if the device offered us matches what we can accept */
+	if ((udev->descriptor.idVendor == ADU_VENDOR_ID) &&
+	    (udev->descriptor.idProduct == ADU_PRODUCT_ID ||
+	     udev->descriptor.idProduct == ADU_PRODUCT_ID+100 )) {
+	 	; /* do nothing */
+	} else {
+		return -ENODEV;
+	}
+
+
+	/* allocate memory for our device state and intialize it */
+
+	dev = kmalloc (sizeof(struct adu_device), GFP_KERNEL);
+
+	if (dev == NULL) {
+		err ("Out of memory");
+		goto exit;
+	}
+
+	init_MUTEX (&dev->sem);
+	spin_lock_init (&dev->buflock);
+
+	dev->udev = udev;
+	dev->open_count = 0;
+
+	dev->read_buffer_primary = NULL;
+	dev->read_buffer_secondary = NULL;
+	dev->read_buffer_length = 0;
+	dev->secondary_head = 0;
+	dev->secondary_tail = 0;
+
+	init_waitqueue_head (&dev->read_wait);
+	init_waitqueue_head (&dev->write_wait);
+
+	dev->interrupt_in_buffer = NULL;
+	dev->interrupt_in_endpoint = NULL;
+	dev->interrupt_in_urb = NULL;
+	dev->read_urb_finished = 0;
+
+	dev->interrupt_out_buffer = NULL;
+	dev->interrupt_out_endpoint = NULL;
+	dev->interrupt_out_urb = NULL;
+
+
+	iface_desc = &interface->altsetting[0];
+
+	/* set up the endpoint information */
+	for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) {
+		endpoint = &iface_desc->endpoint[i].desc;
+
+		if (((endpoint->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_IN) &&
+		((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_INT)) {
+			dev->interrupt_in_endpoint = endpoint;
+		}
+
+		if (((endpoint->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_OUT) &&
+		((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_INT)) {
+			dev->interrupt_out_endpoint = endpoint;
+		}
+	}
+	if(dev->interrupt_in_endpoint == NULL) {
+		err("interrupt in endpoint not found");
+		goto error;
+	}
+	if (dev->interrupt_out_endpoint == NULL) {
+		err("interrupt out endpoint not found");
+		goto error;
+	}
+
+	dev->read_buffer_primary = kmalloc ((4*dev->interrupt_in_endpoint->wMaxPacketSize), GFP_KERNEL);
+	if (!dev->read_buffer_primary) {
+		err("Couldn't allocate read_buffer_primary");
+		goto error;
+	}
+	dev->read_buffer_secondary = kmalloc ((4*dev->interrupt_in_endpoint->wMaxPacketSize), GFP_KERNEL);
+	if (!dev->read_buffer_secondary) {
+		err("Couldn't allocate read_buffer_secondary");
+		goto error;
+	}
+	dev->interrupt_in_buffer = kmalloc (dev->interrupt_in_endpoint->wMaxPacketSize, GFP_KERNEL);
+	if (!dev->interrupt_in_buffer) {
+		err("Couldn't allocate interrupt_in_buffer");
+		goto error;
+	}
+	dev->interrupt_in_urb = usb_alloc_urb(0, GFP_KERNEL);
+	if (!dev->interrupt_in_urb) {
+		err("Couldn't allocate interrupt_in_urb");
+		goto error;
+	}
+	dev->interrupt_out_buffer = kmalloc (dev->interrupt_out_endpoint->wMaxPacketSize, GFP_KERNEL);
+	if (!dev->interrupt_out_buffer) {
+		err("Couldn't allocate interrupt_out_buffer");
+		goto error;
+	}
+	dev->interrupt_out_urb = usb_alloc_urb(0, GFP_KERNEL);
+	if (!dev->interrupt_out_urb) {
+		err("Couldn't allocate interrupt_out_urb");
+		goto error;
+	}
+	memset(dev->serial_number, 0 , sizeof(dev->serial_number));
+	if (!usb_string(udev, udev->descriptor.iSerialNumber, dev->serial_number, sizeof(dev->serial_number))){
+		err("Could not retrieve serial number");
+		goto error;
+	}
+	dbg(2," %s : serial_number=%s", __FUNCTION__, dev->serial_number);
+
+	/* initialize the devfs node for this device and register it */
+
+	/* we can register the device now, as it is ready */
+	usb_set_intfdata (interface, dev);
+
+	retval = usb_register_dev (interface, &adu_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;
+	}
+
+	dev->minor = interface->minor;
+
+	/* let the user know what node this device is now attached to */
+	info ("ADU%d %s now attached to /dev/usb/adutux%d", udev->descriptor.idProduct, 
+		dev->serial_number, (dev->minor - ADU_MINOR_BASE));
+exit:
+	dbg(2," %s : leave, return value 0x%.8lx (dev)", __FUNCTION__, (long) dev);
+
+	return retval;
+
+error:
+	adu_delete(dev);
+	return retval;
+} /* end adu_probe */
+
+/**
+ * adu_disconnect
+ *
+ * Called by the usb core when the device is removed from the system.
+ */
+static void adu_disconnect (struct usb_interface *interface)
+{
+	struct adu_device *dev;
+	int minor;
+
+	dbg(2," %s : enter", __FUNCTION__);
+
+	down (&disconnect_sem); /* not interruptible */
+
+	dev = usb_get_intfdata (interface);
+	usb_set_intfdata (interface, NULL);
+
+	down (&dev->sem); /* not interruptible */
+
+	minor = dev->minor;
+
+	/* give back our minor */
+	usb_deregister_dev (interface, &adu_class);
+	dev->minor = 0; /* no minor active */ // jjh 2003-Nov-29
+
+	/* if the device is not opened, then we clean up right now */
+	dbg(2," %s : open count %d", __FUNCTION__, dev->open_count);
+	if (!dev->open_count) {
+		up (&dev->sem);
+		adu_delete (dev);
+	} else {
+		dev->udev = NULL;
+		up (&dev->sem);
+	}
+
+	up (&disconnect_sem);
+
+	info("ADU device adutux%d now disconnected", (minor - ADU_MINOR_BASE));
+
+	dbg(2," %s : leave", __FUNCTION__);
+} /* end adu_disconnect */
+
+/**
+ * adu_init
+ */
+static int __init adu_init(void)
+{
+	int result;
+	int retval = 0;
+
+	dbg(2," %s : enter", __FUNCTION__);
+
+	/* register this driver with the USB subsystem */
+	result = usb_register(&adu_driver);
+	if (result < 0) {
+		err("usb_register failed for the "__FILE__" driver. Error number %d", result);
+		retval = -1;
+		goto exit;
+	}
+
+	info("adutux " DRIVER_DESC " " DRIVER_VERSION);
+	info("adutux is an experimental driver. Use at your own risk");
+
+exit:
+	dbg(2," %s : leave, return value %d", __FUNCTION__, retval);
+
+	return retval;
+} /* end adu_init */
+
+
+/**
+ * adu_exit
+ */
+static void __exit adu_exit(void)
+{
+	dbg(2," %s : enter", __FUNCTION__);
+
+	/* deregister this driver with the USB subsystem */
+	usb_deregister (&adu_driver);
+
+	dbg(2," %s : leave", __FUNCTION__);
+} /* end adu_exit */
+
+module_init (adu_init);
+module_exit (adu_exit);
+
+MODULE_AUTHOR(DRIVER_AUTHOR);
+MODULE_DESCRIPTION(DRIVER_DESC);
+MODULE_LICENSE("GPL");
+
diff -urN ../old/linux-2.6.1/drivers/usb/misc/Kconfig ./drivers/usb/misc/Kconfig
--- ../old/linux-2.6.1/drivers/usb/misc/Kconfig	2004-01-09 02:00:04.000000000 -0500
+++ ./drivers/usb/misc/Kconfig	2004-01-19 17:14:35.000000000 -0500
@@ -69,6 +69,13 @@
 	  inserted in and removed from the running kernel whenever you want).
 	  The module will be called legousbtower. If you want to compile it as
 	  a module, say M here and read <file:Documentation/modules.txt>.
+	  
+config USB_ADUTUX
+	tristate "ADU devices from Ontrak Control Systems (EXPERIMENTAL)"
+	depends on USB && EXPERIMENTAL
+	help
+	  Say Y if you want to use an ADU device from Ontrak Control Systems.
+	  To compile as a module, choose M. The module will be called adutux.
 
 config USB_BRLVGER
 	tristate "Tieman Voyager USB Braille display support (EXPERIMENTAL)"
diff -urN ../old/linux-2.6.1/drivers/usb/misc/Makefile ./drivers/usb/misc/Makefile
--- ../old/linux-2.6.1/drivers/usb/misc/Makefile	2004-01-09 01:59:43.000000000 -0500
+++ ./drivers/usb/misc/Makefile	2004-01-19 17:14:35.000000000 -0500
@@ -13,3 +13,4 @@
 obj-$(CONFIG_USB_TIGL)		+= tiglusb.o
 obj-$(CONFIG_USB_USS720)	+= uss720.o
 obj-$(CONFIG_USB_LEGOTOWER)	+= legousbtower.o
+obj-$(CONFIG_USB_ADUTUX)	+= adutux.o
