patch-2.3.41 linux/drivers/usb/usb_scsi.c

Next file: linux/drivers/usb/usb_scsi.h
Previous file: linux/drivers/usb/usb.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.40/linux/drivers/usb/usb_scsi.c linux/drivers/usb/usb_scsi.c
@@ -1,1539 +0,0 @@
-/* Driver for USB Mass Storage compliant devices
- *
- * (c) 1999 Michael Gee (michael@linuxspecific.com)
- * (c) 1999, 2000 Matthew Dharm (mdharm-usb@one-eyed-alien.net)
- *
- * Further reference:
- *	This driver is based on the 'USB Mass Storage Class' document. This
- *	describes in detail the protocol used to communicate with such
- *      devices.  Clearly, the designers had SCSI commands in mind when they
- *      created this document.  The commands are all similar to commands
- *      in the SCSI-II specification.
- *
- *	It is important to note that in a number of cases this class exhibits
- *	class-specific exemptions from the USB specification. Notably the
- *	usage of NAK, STALL and ACK differs from the norm, in that they are
- *	used to communicate wait, failed and OK on commands.
- *	Also, for certain devices, the interrupt endpoint is used to convey
- *	status of a command.
- *
- *	Basically, this stuff is WEIRD!!
- *
- */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/signal.h>
-#include <linux/errno.h>
-#include <linux/random.h>
-#include <linux/poll.h>
-#include <linux/init.h>
-#include <linux/malloc.h>
-#include <linux/spinlock.h>
-#include <linux/smp_lock.h>
-
-#include <linux/blk.h>
-#include "../scsi/scsi.h"
-#include "../scsi/hosts.h"
-#include "../scsi/sd.h"
-
-#include "usb.h"
-#include "usb_scsi.h"
-
-/* direction table -- this indicates the direction of the data
- * transfer for each command code -- a 1 indicates input
- */
-unsigned char us_direction[256/8] = {
-	0x28, 0x81, 0x14, 0x14, 0x20, 0x01, 0x90, 0x77, 
-	0x0C, 0x20, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-};
-
-/*
- * Per device data
- */
-
-static int my_host_number;
-
-int usb_stor_debug = 1;
-
-struct us_data {
-	struct us_data	*next;		/* next device */
-	struct usb_device	*pusb_dev;
-	unsigned int		flags;		/* from filter initially */
-	__u8			ifnum;		/* interface number */
-	__u8			ep_in;		/* in endpoint */
-	__u8			ep_out;		/* out ....... */
-	__u8			ep_int;		/* interrupt . */
-	__u8			subclass;	/* as in overview */
-	__u8			protocol;	/* .............. */
-	__u8			attention_done; /* force attn on first cmd */
-	int (*pop)(Scsi_Cmnd *);		/* protocol specific do cmd */
-	int (*pop_reset)(struct us_data *);	/* ........... device reset */
-	GUID(guid);				/* unique dev id */
-	struct Scsi_Host	*host;		/* our dummy host data */
-	Scsi_Host_Template	*htmplt;	/* own host template */
-	int			host_number;	/* to find us */
-	int			host_no;	/* allocated by scsi */
-	int			fixedlength;	/* expand commands */
-	Scsi_Cmnd		*srb;		/* current srb */
-	int			action;		/* what to do */
-	wait_queue_head_t	waitq;		/* thread waits */
-	wait_queue_head_t	ip_waitq;	/* for CBI interrupts */
-	__u16			ip_data;	/* interrupt data */
-	int			ip_wanted;	/* needed */
-	int			pid;		/* control thread */
-	struct semaphore	*notify;	/* wait for thread to begin */
-	void			*irq_handle;	/* for USB int requests */
-	unsigned int		irqpipe;	/* pipe for release_irq */
-	int			mode_xlate;	/* trans MODE_6 to _10? */
-};
-
-/*
- * kernel thread actions
- */
-
-#define US_ACT_COMMAND		1
-#define US_ACT_ABORT		2
-#define US_ACT_DEVICE_RESET	3
-#define US_ACT_BUS_RESET	4
-#define US_ACT_HOST_RESET	5
-
-static struct us_data *us_list;
-
-static void * storage_probe(struct usb_device *dev, unsigned int ifnum);
-static void storage_disconnect(struct usb_device *dev, void *ptr);
-static struct usb_driver storage_driver = {
-	"usb-storage",
-	storage_probe,
-	storage_disconnect,
-	{ NULL, NULL }
-};
-
-/***********************************************************************
- * Data transfer routines
- ***********************************************************************/
-
-/* transfer one buffer (breaking into packets if necessary) */
-static int us_one_transfer(struct us_data *us, int pipe, char *buf, int length)
-{
-	int max_size = usb_maxpacket(us->pusb_dev, pipe, usb_pipeout(pipe)) * 16;
-	int this_xfer;
-	int result;
-	unsigned long partial;
-	int maxtry = 100;
-
-	/* while we have data to transfer */
-	while (length) {
-
-		/* calculate how long this will be -- maximum or a remainder */
-		this_xfer = length > max_size ? max_size : length;
-		length -= this_xfer;
-
-		do {
-			/* transfer the data */
-			US_DEBUGP("Bulk xfer %x(%d)\n", (unsigned int)buf, this_xfer);
-			result = usb_bulk_msg(us->pusb_dev, pipe, buf,
-					      this_xfer, &partial, HZ*5);
-			US_DEBUGP("bulk_msg returned %d xferred %lu/%d\n",
-				  result, partial, this_xfer);
-
-			/* if we stall, we need to clear it before we go on */
-			if (result == USB_ST_STALL) {
-				US_DEBUGP("clearing endpoint halt for pipe %x\n", pipe);
-				usb_clear_halt(us->pusb_dev,
-					       usb_pipeendpoint(pipe) | (pipe & USB_DIR_IN));
-			}
-
-			/* we want to retry if the device reported NAK */
-			if (result == USB_ST_TIMEOUT) {
-
-				/* if our try counter reaches 0, bail out */
-				if (!maxtry--)
-					break;
-
-				/* otherwise, we did transmit some data, and we update pointers */
-				this_xfer -= partial;
-				buf += partial;
-
-			} else if (!result && partial != this_xfer) {
-				/* result is an error, not a NAK, and short data - assume end */
-				result = USB_ST_DATAUNDERRUN;
-				break;
-
-			} else if (result == USB_ST_STALL && us->protocol == US_PR_CB) {
-				/* for CB devices, a stall isn't fatal? */
-
-				/* if our try counter reaches 0, bail out */
-				if (!maxtry--)
-					break;
-
-				this_xfer -= partial;
-				buf += partial;
-			} 
-
-			/* continue until this transfer is done */
-		} while ( this_xfer );
-
-		/* if we have some nonzero result, we return it here */
-		if (result)
-			return result;
-
-		/* otherwise, we advance the buf pointer
-		 * note that the code above doesn't advance the pointer if all
-		 * goes well
-		 */
-		buf += this_xfer;
-	}
-
-	/* if we get here, we're done and successful */
-	return 0;
-}
-
-/* transfer one SCSI command, using scatter-gather if requested */
-static int us_transfer(Scsi_Cmnd *srb, int dir_in)
-{
-	struct us_data *us = (struct us_data *)srb->host_scribble;
-	int i;
-	int result = -1;
-	unsigned int pipe = dir_in ? usb_rcvbulkpipe(us->pusb_dev, us->ep_in) :
-		usb_sndbulkpipe(us->pusb_dev, us->ep_out);
-
-	if (srb->use_sg) {
-		struct scatterlist *sg = (struct scatterlist *) srb->request_buffer;
-
-		for (i = 0; i < srb->use_sg; i++) {
-			result = us_one_transfer(us, pipe, sg[i].address, sg[i].length);
-			if (result)
-				break;
-		}
-	}
-	else
-		result = us_one_transfer(us, pipe,
-					 srb->request_buffer, srb->request_bufflen);
-
-	if (result)
-		US_DEBUGP("us_transfer returning error %d\n", result);
-	return result;
-}
-
-/* calculate the length of the data transfer (not the command) for any
- * given SCSI command
- */
-static unsigned int us_transfer_length(Scsi_Cmnd *srb)
-{
-	int i;
-	unsigned int total = 0;
-
-	/* always zero for some commands */
-	switch (srb->cmnd[0]) {
-	case SEEK_6:
-	case SEEK_10:
-	case REZERO_UNIT:
-	case ALLOW_MEDIUM_REMOVAL:
-	case START_STOP:
-	case TEST_UNIT_READY:
-		return 0;
-
-	default:
-		break;
-	}
-
-	if (srb->use_sg) {
-		struct scatterlist *sg = (struct scatterlist *) srb->request_buffer;
-
-		for (i = 0; i < srb->use_sg; i++) {
-			total += sg[i].length;
-		}
-		return total;
-	}
-	else
-		return srb->request_bufflen;
-}
-
-/***********************************************************************
- * Transport routines
- ***********************************************************************/
-
-static int CBI_irq(int state, void *buffer, int len, void *dev_id)
-{
-	struct us_data *us = (struct us_data *)dev_id;
-
-	US_DEBUGP("CBI_irq() called!!\n");
-
-	if (state != USB_ST_REMOVED) {
-		us->ip_data = le16_to_cpup((__u16 *)buffer);
-		US_DEBUGP("Interrupt Status %x\n", us->ip_data);
-	}
-  
-	if (us->ip_wanted) {
-		us->ip_wanted = 0;
-		wake_up(&us->ip_waitq);
-	}
-
-	/* this return code is truly meaningless */
-	return 0;
-}
-
-static int pop_CB_reset(struct us_data *us)
-{
-	unsigned char cmd[12];
-	int result;
-
-	US_DEBUGP("pop_CB_reset\n");
-
-	memset(cmd, -1, sizeof(cmd));
-	cmd[0] = SEND_DIAGNOSTIC;
-	cmd[1] = 4;
-	result = usb_control_msg(us->pusb_dev, usb_sndctrlpipe(us->pusb_dev,0),
-				 US_CBI_ADSC, USB_TYPE_CLASS | USB_RECIP_INTERFACE,
-				 0, us->ifnum, cmd, sizeof(cmd), HZ*5);
-
-	/* long wait for reset */
-
-	schedule_timeout(HZ*6);
-
-	US_DEBUGP("pop_CB_reset: clearing endpoint halt\n");
-	usb_clear_halt(us->pusb_dev, us->ep_in | USB_DIR_IN);
-	usb_clear_halt(us->pusb_dev, us->ep_out | USB_DIR_OUT);
-
-	US_DEBUGP("pop_CB_reset done\n");
-	return 0;
-}
-
-static int pop_CB_command(Scsi_Cmnd *srb)
-{
-	struct us_data *us = (struct us_data *)srb->host_scribble;
-	unsigned char cmd[16];
-	int result;
-	int retry = 5;
-	int done_start = 0;
-
-	/* we'll try this up to 5 times? */
-	while (retry--) {
-		if (us->flags & US_FL_FIXED_COMMAND) {
-			memset(cmd, 0, us->fixedlength);
-      
-			/* fix some commands */
-      
-			switch (srb->cmnd[0]) {
-			case WRITE_6:
-			case READ_6:
-				cmd[0] = srb->cmnd[0] | 0x20;
-				cmd[1] = srb->cmnd[1] & 0xE0;
-				cmd[2] = 0;
-				cmd[3] = srb->cmnd[1] & 0x1F;
-				cmd[4] = srb->cmnd[2];
-				cmd[5] = srb->cmnd[3];
-				cmd[8] = srb->cmnd[4];
-				break;
-
-			case MODE_SENSE:
-			case MODE_SELECT:
-				us->mode_xlate = (srb->cmnd[0] == MODE_SENSE);
-				cmd[0] = srb->cmnd[0] | 0x40;
-				cmd[1] = srb->cmnd[1];
-				cmd[2] = srb->cmnd[2];
-				cmd[8] = srb->cmnd[4];
-				break;
-
-			default:
-				us->mode_xlate = 0;
-				memcpy(cmd, srb->cmnd, srb->cmd_len);
-				break;
-			} /* switch */
-
-			result = usb_control_msg(us->pusb_dev, usb_sndctrlpipe(us->pusb_dev,0),
-						 US_CBI_ADSC, USB_TYPE_CLASS | USB_RECIP_INTERFACE,
-						 0, us->ifnum,
-						 cmd, us->fixedlength, HZ*5);
-			US_DEBUGP("First usb_control_msg returns %d\n", result);
-
-			/* For UFI, if this is the first time we've sent this TEST_UNIT_READY 
-			 * command, we can try again
-			 */
-			if (!done_start && (us->subclass == US_SC_UFI)
-			    && (cmd[0] == TEST_UNIT_READY) && (result < 0)) {
-
-				/* as per spec try a start command, wait and retry */
-				wait_ms(100);
-
-				done_start++;
-				memset(cmd, 0, sizeof(cmd));
-				cmd[0] = START_STOP;
-				cmd[4] = 1;		/* start */
-
-				result = usb_control_msg(us->pusb_dev, usb_sndctrlpipe(us->pusb_dev,0),
-							 US_CBI_ADSC, 
-							 USB_TYPE_CLASS | USB_RECIP_INTERFACE,
-							 0, us->ifnum,
-							 cmd, us->fixedlength, HZ*5);
-				US_DEBUGP("Next usb_control_msg returns %d\n", result);
-
-				/* allow another retry */
-				retry++;
-				continue;
-			}
-		} else { /* !US_FL_FIXED_COMMAND */
-			result = usb_control_msg(us->pusb_dev, usb_sndctrlpipe(us->pusb_dev,0),
-						 US_CBI_ADSC, USB_TYPE_CLASS | USB_RECIP_INTERFACE,
-						 0, us->ifnum,
-						 srb->cmnd, srb->cmd_len, HZ*5);
-		}
-    
-		/* return an answer if we've got one */
-		if (/*result != USB_ST_STALL &&*/ result != USB_ST_TIMEOUT)
-			return result;
-	}
-
-	/* all done -- return our status */
-	return result;
-}
-
-/*
- * Control/Bulk status handler
- */
-
-static int pop_CB_status(Scsi_Cmnd *srb)
-{
-	struct us_data *us = (struct us_data *)srb->host_scribble;
-	int result;
-	__u8 status[2];
-	int retry = 5;
-
-	US_DEBUGP("pop_CB_status, proto=%x\n", us->protocol);
-	switch (us->protocol) {
-	case US_PR_CB:
-		/* get from control */
-
-		while (retry--) {
-			result = usb_control_msg(us->pusb_dev, usb_rcvctrlpipe(us->pusb_dev,0),
-						 USB_REQ_GET_STATUS, USB_DIR_IN |
-						 USB_TYPE_STANDARD | USB_RECIP_DEVICE,
-						 0, us->ifnum, status, sizeof(status), HZ*5);
-			if (result != USB_ST_TIMEOUT)
-				break;
-		}
-		if (result) {
-			US_DEBUGP("Bad AP status request %d\n", result);
-			return DID_ABORT << 16;
-		}
-		US_DEBUGP("Got AP status %x %x\n", status[0], status[1]);
-		if (srb->cmnd[0] != REQUEST_SENSE && srb->cmnd[0] != INQUIRY &&
-		    ( (status[0] & ~3) || status[1]))
-			return (DID_OK << 16) | 2;
-		else
-			return DID_OK << 16;
-		break;
-
-	case US_PR_CBI:
-		/* get from interrupt pipe */
-
-		/* add interrupt transfer, marked for removal */
-		us->ip_wanted = 1;
-
-		/* go to sleep until we get this interrup */
-		sleep_on(&us->ip_waitq);
-
-		/* NO! We don't release this IRQ.  We just re-use the handler 
-		   usb_release_irq(us->pusb_dev, us->irq_handle, us->irqpipe);
-		   us->irq_handle = NULL;
-		*/
-
-		if (us->ip_wanted) {
-			US_DEBUGP("Did not get interrupt on CBI\n");
-			us->ip_wanted = 0;
-			return DID_ABORT << 16;
-		}
-
-		US_DEBUGP("Got interrupt data %x\n", us->ip_data);
-
-		/* sort out what it means */
-
-		if (us->subclass == US_SC_UFI) {
-			/* gives us asc and ascq, as per request sense */
-
-			if (srb->cmnd[0] == REQUEST_SENSE ||
-			    srb->cmnd[0] == INQUIRY)
-				return DID_OK << 16;
-			else
-				return (DID_OK << 16) + ((us->ip_data & 0xff) ? 2 : 0);
-		}
-		if (us->ip_data & 0xff) {
-			US_DEBUGP("Bad CBI interrupt data %x\n", us->ip_data);
-			return DID_ABORT << 16;
-		}
-		return (DID_OK << 16) + ((us->ip_data & 0x300) ? 2 : 0);
-	}
-	return DID_ERROR << 16;
-}
-
-/* Protocol command handlers */
-
-static int pop_CBI(Scsi_Cmnd *srb)
-{
-	int result;
-
-	US_DEBUGP("CBI gets a command:\n");
-	US_DEBUG(us_show_command(srb));
-
-	/* run the command */
-	if ((result = pop_CB_command(srb)) < 0) {
-		US_DEBUGP("Call to pop_CB_command returned %d\n", result);
-		if (result == USB_ST_STALL || result == USB_ST_TIMEOUT) {
-			return (DID_OK << 16) | 2;
-		}
-		return DID_ERROR << 16;
-	}
-
-	/* transfer the data */
-	if (us_transfer_length(srb)) {
-		result = us_transfer(srb, US_DIRECTION(srb->cmnd[0]));
-		if ((result < 0) && 
-		    (result != USB_ST_DATAUNDERRUN) && 
-		    (result != USB_ST_STALL)) {
-			US_DEBUGP("CBI attempted to transfer data, result is %x\n", result);
-			return DID_ERROR << 16;
-		}
-#if 0
-		else if (result == USB_ST_DATAUNDERRUN) {
-			return DID_OK << 16;
-		}
-	} else {
-		if (!result) {
-			return DID_OK << 16;
-		}
-#endif
-	}
-
-	/* get status */
-	return pop_CB_status(srb);
-}
-
-static int pop_Bulk_reset(struct us_data *us)
-{
-	int result;
-
-	result = usb_control_msg(us->pusb_dev, usb_sndctrlpipe(us->pusb_dev,0),
-				 US_BULK_RESET, USB_TYPE_CLASS | USB_RECIP_INTERFACE,
-				 US_BULK_RESET_HARD, us->ifnum,
-				 NULL, 0, HZ*5);
-	if (result)
-		US_DEBUGP("Bulk hard reset failed %d\n", result);
-	usb_clear_halt(us->pusb_dev, us->ep_in | USB_DIR_IN);
-	usb_clear_halt(us->pusb_dev, us->ep_out | USB_DIR_OUT);
-
-	/* long wait for reset */
-
-	schedule_timeout(HZ*6);
-
-	return result;
-}
-
-/*
- * The bulk only protocol handler.
- *	Uses the in and out endpoints to transfer commands and data (nasty)
- */
-static int pop_Bulk(Scsi_Cmnd *srb)
-{
-	struct us_data *us = (struct us_data *)srb->host_scribble;
-	struct bulk_cb_wrap bcb;
-	struct bulk_cs_wrap bcs;
-	int result;
-	unsigned long partial;
-	int stall;
-
-	/* set up the command wrapper */
-
-	bcb.Signature = US_BULK_CB_SIGN;
-	bcb.DataTransferLength = us_transfer_length(srb);;
-	bcb.Flags = US_DIRECTION(srb->cmnd[0]) << 7;
-	bcb.Tag = srb->serial_number;
-	bcb.Lun = 0;
-	memset(bcb.CDB, 0, sizeof(bcb.CDB));
-	memcpy(bcb.CDB, srb->cmnd, srb->cmd_len);
-	if (us->flags & US_FL_FIXED_COMMAND) {
-		bcb.Length = us->fixedlength;
-	} else {
-		bcb.Length = srb->cmd_len;
-	}
-
-	/* send it to out endpoint */
-
-	US_DEBUGP("Bulk command S %x T %x L %d F %d CL %d\n",
-		  bcb.Signature, bcb.Tag, bcb.DataTransferLength,
-		  bcb.Flags, bcb.Length);
-	result = usb_bulk_msg(us->pusb_dev,
-			      usb_sndbulkpipe(us->pusb_dev, us->ep_out), &bcb,
-			      US_BULK_CB_WRAP_LEN, &partial, HZ*5);
-	if (result) {
-		US_DEBUGP("Bulk command result %x\n", result);
-		return DID_ABORT << 16;
-	}
-
-	//return DID_BAD_TARGET << 16;
-	/* send/receive data */
-
-	if (bcb.DataTransferLength) {
-		result = us_transfer(srb, bcb.Flags);
-		if (result && result != USB_ST_DATAUNDERRUN && result != USB_ST_STALL) {
-			US_DEBUGP("Bulk transfer result %x\n", result);
-			return DID_ABORT << 16;
-		}
-	}
-
-	/* get status */
-
-	stall = 0;
-	do {
-		result = usb_bulk_msg(us->pusb_dev,
-				      usb_rcvbulkpipe(us->pusb_dev, us->ep_in), &bcs,
-				      US_BULK_CS_WRAP_LEN, &partial, HZ*5);
-		if (result == USB_ST_STALL || result == USB_ST_TIMEOUT)
-			stall++;
-		else
-			break;
-	} while ( stall < 3);
-	if (result && result != USB_ST_DATAUNDERRUN) {
-		US_DEBUGP("Bulk status result = %x\n", result);
-		return DID_ABORT << 16;
-	}
-
-	/* check bulk status */
-
-	US_DEBUGP("Bulk status S %x T %x R %d V %x\n",
-		  bcs.Signature, bcs.Tag, bcs.Residue, bcs.Status);
-	if (bcs.Signature != US_BULK_CS_SIGN || bcs.Tag != bcb.Tag ||
-	    bcs.Status > US_BULK_STAT_PHASE) {
-		US_DEBUGP("Bulk logical error\n");
-		return DID_ABORT << 16;
-	}
-
-	/* We need to fix some of this status handling. */
-	switch (bcs.Status) {
-	case US_BULK_STAT_OK:
-		return DID_OK << 16;
-
-	case US_BULK_STAT_FAIL:
-		/* check for underrun - dont report */
-		if (bcs.Residue)
-			return DID_OK << 16;
-		//pop_Bulk_reset(us);
-		break;
-
-	case US_BULK_STAT_PHASE:
-		return DID_ERROR << 16;
-	}
-
-	return (DID_OK << 16) | 2;	    /* check sense required */
-}
-
-/* Host functions */
-
-/* detect adapter (always true ) */
-static int us_detect(struct SHT *sht)
-{
-	/* FIXME - not nice at all, but how else ? */
-	struct us_data *us = (struct us_data *)sht->proc_dir;
-	char name[32];
-
-	/* set up our name */
-	sprintf(name, "usbscsi%d", us->host_number);
-	sht->name = sht->proc_name = kmalloc(strlen(name)+1, GFP_KERNEL);
-	if (!sht->proc_name)
-		return 0;
-	strcpy(sht->proc_name, name);
-
-	/* we start with no /proc directory entry */
-	sht->proc_dir = NULL;
-
-	/* register the host */
-	us->host = scsi_register(sht, sizeof(us));
-	if (us->host) {
-		us->host->hostdata[0] = (unsigned long)us;
-		us->host_no = us->host->host_no;
-		return 1;
-	}
-
-	/* odd... didn't register properly.  Abort and free pointers */
-	kfree(sht->proc_name);
-	sht->proc_name = NULL;
-	sht->name = NULL;
-	return 0;
-}
-
-/* release - must be here to stop scsi
- *	from trying to release IRQ etc.
- *	Kill off our data
- */
-static int us_release(struct Scsi_Host *psh)
-{
-	struct us_data *us = (struct us_data *)psh->hostdata[0];
-	struct us_data *prev = (struct us_data *)&us_list;
-
-	if (us->irq_handle) {
-		usb_release_irq(us->pusb_dev, us->irq_handle, us->irqpipe);
-		us->irq_handle = NULL;
-	}
-	if (us->pusb_dev)
-		usb_deregister(&storage_driver);
-
-	/* FIXME - leaves hanging host template copy */
-	/* (because scsi layer uses it after removal !!!) */
-	while (prev->next != us)
-		prev = prev->next;
-	prev->next = us->next;
-	return 0;
-}
-
-/* run command */
-static int us_command( Scsi_Cmnd *srb )
-{
-	US_DEBUGP("Bad use of us_command\n");
-
-	return DID_BAD_TARGET << 16;
-}
-
-/* run command */
-static int us_queuecommand( Scsi_Cmnd *srb , void (*done)(Scsi_Cmnd *))
-{
-	struct us_data *us = (struct us_data *)srb->host->hostdata[0];
-
-	US_DEBUGP("Command wakeup\n");
-	if (us->srb) {
-		/* busy */
-	}
-	srb->host_scribble = (unsigned char *)us;
-	us->srb = srb;
-	srb->scsi_done = done;
-	us->action = US_ACT_COMMAND;
-
-	/* wake up the process task */
-
-	wake_up_interruptible(&us->waitq);
-
-	return 0;
-}
-
-static int us_abort( Scsi_Cmnd *srb )
-{
-	return 0;
-}
-
-static int us_bus_reset( Scsi_Cmnd *srb )
-{
-	struct us_data *us = (struct us_data *)srb->host->hostdata[0];
-
-	US_DEBUGP("Bus reset requested\n");
-	us->pop_reset(us);
-	return SUCCESS;
-}
-
-static int us_host_reset( Scsi_Cmnd *srb )
-{
-	return 0;
-}
-
-/***********************************************************************
- * /proc/scsi/ functions
- ***********************************************************************/
-
-/* we use this macro to help us write into the buffer */
-#undef SPRINTF
-#define SPRINTF(args...) do { if (pos < (buffer + length)) pos += sprintf (pos, ## args); } while (0)
-
-int usb_stor_proc_info (char *buffer, char **start, off_t offset, 
-			int length, int hostno, int inout)
-{
-	struct us_data *us = us_list;
-	char *pos = buffer;
-	char *tmp_ptr;
-
-	/* find our data from hostno */
-	while (us) {
-		if (us->host_no == hostno)
-			break;
-		us = us->next;
-	}
-
-	/* if we couldn't find it, we return an error */
-	if (!us)
-		return -ESRCH;
-
-	/* if someone is sending us data, just throw it away */
-	if (inout)
-		return length;
-
-	/* print the controler name */
-	SPRINTF ("Host scsi%d: usb-scsi\n", hostno);
-
-	/* print product and vendor strings */
-	tmp_ptr = kmalloc(256, GFP_KERNEL);
-	if (!us->pusb_dev || !tmp_ptr) {
-		SPRINTF("Vendor: Unknown Vendor\n");
-		SPRINTF("Product: Unknown Product\n");
-	} else {
-		SPRINTF("Vendor: ");
-		if (usb_string(us->pusb_dev, us->pusb_dev->descriptor.iManufacturer, tmp_ptr, 256) > 0)
-			SPRINTF("%s\n", tmp_ptr);
-		else
-			SPRINTF("Unknown Vendor\n");
-    
-		SPRINTF("Product: ");
-		if (usb_string(us->pusb_dev, us->pusb_dev->descriptor.iProduct, tmp_ptr, 256) > 0)
-			SPRINTF("%s\n", tmp_ptr);
-		else
-			SPRINTF("Unknown Vendor\n");
-	}
-	kfree(tmp_ptr);
-
-	SPRINTF("Protocol: ");
-	switch (us->protocol) {
-	case US_PR_CB:
-		SPRINTF("Control/Bulk\n");
-		break;
-    
-	case US_PR_CBI:
-		SPRINTF("Control/Bulk/Interrupt\n");
-		break;
-    
-	case US_PR_BULK:
-		SPRINTF("Bulk only\n");
-		break;
-    
-	default:
-		SPRINTF("Unknown Protocol\n");
-		break;
-	}
-
-	/* show the GUID of the device */
-	SPRINTF("GUID: " GUID_FORMAT "\n", GUID_ARGS(us->guid));
-
-	/*
-	 * Calculate start of next buffer, and return value.
-	 */
-	*start = buffer + offset;
-
-	if ((pos - buffer) < offset)
-		return (0);
-	else if ((pos - buffer - offset) < length)
-		return (pos - buffer - offset);
-	else
-		return (length);
-}
-
-/*
- * this defines our 'host'
- */
-
-static Scsi_Host_Template my_host_template = {
-	NULL,			    /* next */
-	NULL,			    /* module */
-	NULL,			    /* proc_dir */
-	usb_stor_proc_info,
-	NULL,			    /* name - points to unique */
-	us_detect,
-	us_release,
-	NULL,			    /* info */
-	NULL,			    /* ioctl */
-	us_command,
-	us_queuecommand,
-	NULL,			    /* eh_strategy */
-	us_abort,
-	us_bus_reset,
-	us_bus_reset,
-	us_host_reset,
-	NULL,			    /* abort */
-	NULL,			    /* reset */
-	NULL,			    /* slave_attach */
-	NULL,			    /* bios_param */
-	1,			    /* can_queue */
-	-1,			    /* this_id */
-	SG_ALL,			    /* sg_tablesize */
-	1,			    /* cmd_per_lun */
-	0,			    /* present */
-	FALSE,			    /* unchecked_isa_dma */
-	FALSE,			    /* use_clustering */
-	TRUE,			    /* use_new_eh_code */
-	TRUE			    /* emulated */
-};
-
-static unsigned char sense_notready[] = {
-	0x70,			    /* current error */
-	0x00,
-	0x02,			    /* not ready */
-	0x00,
-	0x00,
-	10,			    /* additional length */
-	0x00,
-	0x00,
-	0x00,
-	0x00,
-	0x04,			    /* not ready */
-	0x03,			    /* manual intervention */
-	0x00,
-	0x00,
-	0x00,
-	0x00
-};
-
-static int usb_stor_control_thread(void * __us)
-{
-	struct us_data *us = (struct us_data *)__us;
-	int action;
-
-	lock_kernel();
-
-	/*
-	 * This thread doesn't need any user-level access,
-	 * so get rid of all our resources..
-	 */
-	daemonize();
-
-	sprintf(current->comm, "usbscsi%d", us->host_number);
-
-	unlock_kernel();
-
-	up(us->notify);
-
-	for(;;) {
-		siginfo_t info;
-		int unsigned long signr;
-
-		interruptible_sleep_on(&us->waitq);
-
-		action = us->action;
-		us->action = 0;
-
-		switch (action) {
-		case US_ACT_COMMAND:
-			if (us->srb->target || us->srb->lun) {
-				/* bad device */
-				US_DEBUGP( "Bad device number (%d/%d) or dev %x\n",
-					   us->srb->target, us->srb->lun, (unsigned int)us->pusb_dev);
-				us->srb->result = DID_BAD_TARGET << 16;
-			} else if (!us->pusb_dev) {
-
-				/* our device has gone - pretend not ready */
-
-				if (us->srb->cmnd[0] == REQUEST_SENSE) {
-					memcpy(us->srb->request_buffer, sense_notready, sizeof(sense_notready));
-					us->srb->result = DID_OK << 16;
-				} else {
-					us->srb->result = (DID_OK << 16) | 2;
-				}
-			} else {
-				US_DEBUG(us_show_command(us->srb));
-
-				if (us->srb->cmnd[0] == START_STOP &&
-				    us->pusb_dev->descriptor.idProduct == 0x0001 &&
-				    us->pusb_dev->descriptor.idVendor == 0x04e6)
-					us->srb->result = DID_OK << 16;
-				else {
-					unsigned int savelen = us->srb->request_bufflen;
-					unsigned int saveallocation = 0;
-
-					/* check for variable length - do properly if so */
-					switch (us->srb->cmnd[0]) {
-					case REQUEST_SENSE:
-						if (us->srb->request_bufflen > 18)
-							us->srb->request_bufflen = 18;
-						else
-							break;
-						saveallocation = us->srb->cmnd[4];
-						us->srb->cmnd[4] = 18;
-						break;
-
-					case INQUIRY:
-						if (us->srb->request_bufflen > 36)
-							us->srb->request_bufflen = 36;
-						else
-							break;
-						saveallocation = us->srb->cmnd[4];
-						us->srb->cmnd[4] = 36;
-						break;
-
-					case MODE_SENSE:
-						if (us->srb->request_bufflen > 4)
-							us->srb->request_bufflen = 4;
-						else
-							break;
-						saveallocation = us->srb->cmnd[4];
-						us->srb->cmnd[4] = 4;
-						break;
-
-					case LOG_SENSE:
-					case MODE_SENSE_10:
-						if (us->srb->request_bufflen > 8)
-							us->srb->request_bufflen = 8;
-						else
-							break;
-						saveallocation = (us->srb->cmnd[7] << 8) | us->srb->cmnd[8];
-						us->srb->cmnd[7] = 0;
-						us->srb->cmnd[8] = 8;
-						break;
-
-					default:
-						break;
-					} /* end switch on cmnd[0] */
-
-#if 0
-					/* translate READ_6 to READ_10 */
-					if (us->srb->cmnd[0] == 0x08) {
-
-						/* get the control */
-						us->srb->cmnd[9] = us->srb->cmnd[5];
-
-						/* get the length */
-						us->srb->cmnd[8] = us->srb->cmnd[6];
-						us->srb->cmnd[7] = 0;
-
-						/* set the reserved area to 0 */
-						us->srb->cmnd[6] = 0;	    
-
-						/* get LBA */
-						us->srb->cmnd[5] = us->srb->cmnd[3];
-						us->srb->cmnd[4] = us->srb->cmnd[2];
-						us->srb->cmnd[3] = 0;
-						us->srb->cmnd[2] = 0;
-
-						/* LUN and other info in cmnd[1] can stay */
-	    
-						/* fix command code */
-						us->srb->cmnd[0] = 0x28;
-
-						US_DEBUGP("Changing READ_6 to READ_10\n");
-						US_DEBUG(us_show_command(us->srb));
-					}
-
-					/* translate WRITE_6 to WRITE_10 */
-					if (us->srb->cmnd[0] == 0x0A) {
-
-						/* get the control */
-						us->srb->cmnd[9] = us->srb->cmnd[5];
-
-						/* get the length */
-						us->srb->cmnd[8] = us->srb->cmnd[4];
-						us->srb->cmnd[7] = 0;
-
-						/* set the reserved area to 0 */
-						us->srb->cmnd[6] = 0;	    
-
-						/* get LBA */
-						us->srb->cmnd[5] = us->srb->cmnd[3];
-						us->srb->cmnd[4] = us->srb->cmnd[2];
-						us->srb->cmnd[3] = 0;
-						us->srb->cmnd[2] = 0;
-
-						/* LUN and other info in cmnd[1] can stay */
-	    
-						/* fix command code */
-						us->srb->cmnd[0] = 0x2A;
-
-						US_DEBUGP("Changing WRITE_6 to WRITE_10\n");
-						US_DEBUG(us_show_command(us->srb));
-					}
-#endif
-
-					/* let's do the command */
-					us->srb->result = us->pop(us->srb);
-
-					if (savelen != us->srb->request_bufflen &&
-					    us->srb->result == (DID_OK << 16)) {
-						unsigned char *p = (unsigned char *)us->srb->request_buffer;
-						unsigned int length = 0;
-
-						/* set correct length and retry */
-						switch (us->srb->cmnd[0]) {
-						case REQUEST_SENSE:
-							/* simply return 18 bytes */
-							p[7] = 10;
-							length = us->srb->request_bufflen;
-							break;
-
-						case INQUIRY:
-							length = p[4] + 5 > savelen ? savelen : p[4] + 5;
-							us->srb->cmnd[4] = length;
-							break;
-
-						case MODE_SENSE:
-							US_DEBUGP("MODE_SENSE Mode data length is %d\n", p[0]);
-							length = p[0] + 1 > savelen ? savelen : p[0] + 1;
-							us->srb->cmnd[4] = length;
-							break;
-
-						case LOG_SENSE:
-							length = ((p[2] << 8) + p[3]) + 4 > savelen ? savelen : ((p[2] << 8) + p[3]) + 4;
-							us->srb->cmnd[7] = length >> 8;
-							us->srb->cmnd[8] = length;
-							break;
-
-						case MODE_SENSE_10:
-							US_DEBUGP("MODE_SENSE_10 Mode data length is %d\n",
-								  (p[0] << 8) + p[1]);
-							length = ((p[0] << 8) + p[1]) + 6 > savelen ? savelen : ((p[0] << 8) + p[1]) + 6;
-							us->srb->cmnd[7] = length >> 8;
-							us->srb->cmnd[8] = length;
-							break;
-						} /* end switch on cmnd[0] */
-
-						US_DEBUGP("Old/New length = %d/%d\n",
-							  savelen, length);
-
-						if (us->srb->request_bufflen != length) {
-							US_DEBUGP("redoing cmd with len=%d\n", length);
-							us->srb->request_bufflen = length;
-							us->srb->result = us->pop(us->srb);
-						}
-						/* reset back to original values */
-
-						us->srb->request_bufflen = savelen;
-						switch (us->srb->cmnd[0]) {
-						case INQUIRY:
-							if ((((unsigned char*)us->srb->request_buffer)[2] & 0x7) == 0) { 
-								US_DEBUGP("Fixing INQUIRY data, setting SCSI rev to 2\n");
-								((unsigned char*)us->srb->request_buffer)[2] |= 2;
-							}
-							/* FALL THROUGH */
-						case REQUEST_SENSE:
-						case MODE_SENSE:
-							if (us->srb->use_sg == 0 && length > 0) {
-								int i;
-								printk(KERN_DEBUG "Data is");
-								for (i = 0; i < 32 && i < length; ++i)
-									printk(" %.2x", ((unsigned char *)us->srb->request_buffer)[i]);
-								if (i < length)
-									printk(" ...");
-								printk("\n");
-							}
-							us->srb->cmnd[4] = saveallocation;
-							if (us->mode_xlate) {
-								/* convert MODE_SENSE_10 return data
-								 * format to MODE_SENSE_6 format */
-								unsigned char *dta = (unsigned char *)us->srb->request_buffer;
-								dta[0] = dta[1];	/* data len */
-								dta[1] = dta[2];	/* med type */
-								dta[2] = dta[3];	/* dev-spec prm */
-								dta[3] = dta[7];	/* block desc len */
-								printk (KERN_DEBUG USB_SCSI "new MODE_SENSE_6 data = %.2X %.2X %.2X %.2X\n",
-									dta[0], dta[1], dta[2], dta[3]);
-							}
-							break;
-
-						case LOG_SENSE:
-						case MODE_SENSE_10:
-							us->srb->cmnd[7] = saveallocation >> 8;
-							us->srb->cmnd[8] = saveallocation;
-							break;
-						} /* end switch on cmnd[0] */
-					}
-					/* force attention on first command */
-					if (!us->attention_done) {
-						US_DEBUGP("forcing unit attention\n");
-						if (us->srb->cmnd[0] == REQUEST_SENSE) {
-							if (us->srb->result == (DID_OK << 16)) {
-								unsigned char *p = (unsigned char *)us->srb->request_buffer;
-
-								us->attention_done = 1;
-								if ((p[2] & 0x0f) != UNIT_ATTENTION) {
-									p[2] = UNIT_ATTENTION;
-									p[12] = 0x29;	/* power on, reset or bus-reset */
-									p[13] = 0;
-								}
-							}
-						} else if (us->srb->cmnd[0] != INQUIRY &&
-							   us->srb->result == (DID_OK << 16)) {
-							us->srb->result |= 2;	/* force check condition */
-						}
-					}
-				}
-			}
-			US_DEBUGP("scsi cmd done, result=%x\n", us->srb->result);
-			us->srb->scsi_done(us->srb);
-			us->srb = NULL;
-			break;
-
-		case US_ACT_ABORT:
-			break;
-
-		case US_ACT_DEVICE_RESET:
-			break;
-
-		case US_ACT_BUS_RESET:
-			break;
-
-		case US_ACT_HOST_RESET:
-			break;
-
-		} /* end switch on action */
-
-		if (signal_pending(current)) {
-			/* sending SIGUSR1 makes us print out some info */
-			spin_lock_irq(&current->sigmask_lock);
-			signr = dequeue_signal(&current->blocked, &info);
-			spin_unlock_irq(&current->sigmask_lock);
-
-			if (signr == SIGUSR2) {
-				usb_stor_debug = !usb_stor_debug;
-				printk(USB_SCSI "debug toggle = %d\n", usb_stor_debug);
-			} else {
-				break;	    /* exit the loop on any other signal */
-			}
-		}
-	}
-
-	//  MOD_DEC_USE_COUNT;
-
-	printk("usb_stor_control_thread exiting\n");
-
-	return 0;
-}	
-
-/* Probe to see if a new device is actually a SCSI device */
-static void * storage_probe(struct usb_device *dev, unsigned int ifnum)
-{
-	struct usb_interface_descriptor *interface;
-	int i;
-	char mf[32];		     /* manufacturer */
-	char prod[32];		     /* product */
-	char serial[32];	     /* serial number */
-	struct us_data *ss = NULL;
-	unsigned int flags = 0;
-	GUID(guid);		     /* Global Unique Identifier */
-	struct us_data *prev;
-	Scsi_Host_Template *htmplt;
-	int protocol = 0;
-	int subclass = 0;
-	struct usb_interface_descriptor *altsetting = 
-		&(dev->actconfig->interface[ifnum].altsetting[0]); 
-
-	/* clear the GUID and fetch the strings */
-	GUID_CLEAR(guid);
-	usb_string(dev, dev->descriptor.iManufacturer, mf, sizeof(mf));
-	usb_string(dev, dev->descriptor.iProduct, prod, sizeof(prod));
-	usb_string(dev, dev->descriptor.iSerialNumber, serial, sizeof(serial));
-
-	/* let's examine the device now */
-
-	/* We make an exception for the shuttle E-USB */
-	if (dev->descriptor.idVendor == 0x04e6 &&
-	    dev->descriptor.idProduct == 0x0001) {
-		protocol = US_PR_CB;
-		subclass = US_SC_8070;	    /* an assumption */
-	} else if (dev->descriptor.bDeviceClass != 0 ||
-		   altsetting->bInterfaceClass != USB_CLASS_MASS_STORAGE ||
-		   altsetting->bInterfaceSubClass < US_SC_MIN ||
-		   altsetting->bInterfaceSubClass > US_SC_MAX) {
-		/* if it's not a mass storage, we go no further */
-		return NULL;
-	}
-
-	/* At this point, we know we've got a live one */
-	US_DEBUGP("USB Mass Storage device detected\n");
-
-	/* Create a GUID for this device */
-	if (dev->descriptor.iSerialNumber && serial[0]) {
-		/* If we have a serial number, and it's a non-NULL string */
-		make_guid(guid, dev->descriptor.idVendor, 
-			  dev->descriptor.idProduct,
-			  serial);
-	} else {
-		/* We don't have a serial number, so we use 0 */
-		make_guid(guid, dev->descriptor.idVendor, 
-			  dev->descriptor.idProduct, "0");
-	}
-
-	/* Now check if we have seen this GUID before, and restore
-	 * the flags if we find it
-	 */
-	for (ss = us_list; ss != NULL; ss = ss->next) {
-		if (!ss->pusb_dev && GUID_EQUAL(guid, ss->guid))    {
-			US_DEBUGP("Found existing GUID " GUID_FORMAT "\n",
-				  GUID_ARGS(guid));
-			flags = ss->flags;
-			break;
-		}
-	}
-
-	/* If ss == NULL, then this is a new device.  Allocate memory for it */
-	if (!ss) {
-		if ((ss = (struct us_data *)kmalloc(sizeof(*ss), 
-						    GFP_KERNEL)) == NULL) {
-			printk(KERN_WARNING USB_SCSI "Out of memory\n");
-			return NULL;
-		}
-		memset(ss, 0, sizeof(struct us_data));
-	}
-
-	/* Initialize the us_data structure with some useful info */
-	interface = altsetting;
-	ss->flags = flags;
-	ss->ifnum = ifnum;
-	ss->pusb_dev = dev;
-	ss->attention_done = 0;
-
-	/* If the device has subclass and protocol, then use that.  Otherwise, 
-	 * take data from the specific interface.
-	 */
-	if (subclass) {
-		ss->subclass = subclass;
-		ss->protocol = protocol;
-	} else {
-		ss->subclass = interface->bInterfaceSubClass;
-		ss->protocol = interface->bInterfaceProtocol;
-	}
-
-	/* set the handler pointers based on the protocol */
-	US_DEBUGP("Protocol: ");
-	switch (ss->protocol) {
-	case US_PR_CB:
-		US_DEBUGPX("Control/Bulk\n");
-		ss->pop = pop_CBI;
-		ss->pop_reset = pop_CB_reset;
-		break;
-
-	case US_PR_CBI:
-		US_DEBUGPX("Control/Bulk/Interrupt\n");
-		ss->pop = pop_CBI;
-		ss->pop_reset = pop_CB_reset;
-		break;
-
-	case US_PR_BULK:
-		US_DEBUGPX("Bulk\n");
-		ss->pop = pop_Bulk;
-		ss->pop_reset = pop_Bulk_reset;
-		break;
-
-	default:
-		US_DEBUGPX("Unknown\n");    
-		kfree(ss);
-		return NULL;
-		break;
-	}
-
-	/*
-	 * We are expecting a minimum of 2 endpoints - in and out (bulk).
-	 * An optional interrupt is OK (necessary for CBI protocol).
-	 * We will ignore any others.
-	 */
-	for (i = 0; i < interface->bNumEndpoints; i++) {
-		/* is it an BULK endpoint? */
-		if ((interface->endpoint[i].bmAttributes &  USB_ENDPOINT_XFERTYPE_MASK)
-		    == USB_ENDPOINT_XFER_BULK) {
-			if (interface->endpoint[i].bEndpointAddress & USB_DIR_IN)
-				ss->ep_in = interface->endpoint[i].bEndpointAddress &
-					USB_ENDPOINT_NUMBER_MASK;
-			else
-				ss->ep_out = interface->endpoint[i].bEndpointAddress &
-					USB_ENDPOINT_NUMBER_MASK;
-		}
-
-		/* is it an interrupt endpoint? */
-		if ((interface->endpoint[i].bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) 
-		    == USB_ENDPOINT_XFER_INT) {
-			ss->ep_int = interface->endpoint[i].bEndpointAddress &
-				USB_ENDPOINT_NUMBER_MASK;
-		}
-	}
-	US_DEBUGP("Endpoints In %d Out %d Int %d\n",
-		  ss->ep_in, ss->ep_out, ss->ep_int);
-
-	/* Do some basic sanity checks, and bail if we find a problem */
-	if (usb_set_interface(dev, interface->bInterfaceNumber, 0) ||
-	    !ss->ep_in || !ss->ep_out || 
-	    (ss->protocol == US_PR_CBI && ss->ep_int == 0)) {
-		US_DEBUGP("Problems with device\n");
-		if (ss->host) {
-			scsi_unregister_module(MODULE_SCSI_HA, ss->htmplt);
-			kfree(ss->htmplt->name);
-			kfree(ss->htmplt);
-		}
-
-		kfree(ss);
-		return NULL;
-	}
-
-	/* If this is a new device (i.e. we haven't seen it before), we need to
-	 * generate a scsi host definition, and register with scsi above us 
-	 */
-	if (!ss->host) {
-		/* copy the GUID we created before */
-		US_DEBUGP("New GUID " GUID_FORMAT "\n", GUID_ARGS(guid));
-		memcpy(ss->guid, guid, sizeof(guid));
-
-		/* set class specific stuff */
-		US_DEBUGP("SubClass: ");
-		switch (ss->subclass) {
-		case US_SC_RBC:
-			US_DEBUGPX("Reduced Block Commands\n");
-			break;
-
-		case US_SC_8020:
-			US_DEBUGPX("8020\n");
-			break;
-
-		case US_SC_QIC:
-			US_DEBUGPX("QIC157\n");
-			break;
-
-		case US_SC_8070:
-			US_DEBUGPX("8070\n");
-			ss->flags |= US_FL_FIXED_COMMAND;
-			ss->fixedlength = 12;
-			break;
-
-		case US_SC_SCSI:
-			US_DEBUGPX("Transparent SCSI\n");
-			break;
-
-		case US_SC_UFI:
-			US_DEBUGPX("UFI\n");
-			ss->flags |= US_FL_FIXED_COMMAND;
-			ss->fixedlength = 12;
-			break;
-
-		default:
-			US_DEBUGPX("Unknown\n");
-			break;
-		}
-
-		/* Allocate memory for the SCSI Host Template */
-		if ((htmplt = (Scsi_Host_Template *)
-		     kmalloc(sizeof(*ss->htmplt), GFP_KERNEL)) == NULL ) {
-
-			printk(KERN_WARNING USB_SCSI "Out of memory\n");
-
-			kfree(ss);
-			return NULL;
-		}
-
-		/* Initialize the host template based on the default one */
-		memcpy(htmplt, &my_host_template, sizeof(my_host_template));
-
-		/* Grab the next host number */
-		ss->host_number = my_host_number++;
-
-		/* MDD: FIXME: this is bad.  We abuse this pointer so we
-		 * can pass the ss pointer to the host controler thread
-		 * in us_detect
-		 */
-		(struct us_data *)htmplt->proc_dir = ss; 
-
-		/* shuttle E-USB */	
-		if (dev->descriptor.idVendor == 0x04e6 &&
-		    dev->descriptor.idProduct == 0x0001) {
-			__u8 qstat[2];
-			int result;
-	    
-			result = usb_control_msg(ss->pusb_dev, usb_rcvctrlpipe(dev,0),
-						 1, 0xC0,
-						 0, ss->ifnum,
-						 qstat, 2, HZ*5);
-			US_DEBUGP("C0 status %x %x\n", qstat[0], qstat[1]);
-			init_waitqueue_head(&ss->ip_waitq);
-			ss->irqpipe = usb_rcvintpipe(ss->pusb_dev, ss->ep_int);
-			result = usb_request_irq(ss->pusb_dev, ss->irqpipe, CBI_irq,
-						 255, (void *)ss, &ss->irq_handle);
-			if (result)
-				return NULL;
-
-			interruptible_sleep_on_timeout(&ss->ip_waitq, HZ*6);
-		} else if (ss->protocol == US_PR_CBI)
-		{
-			int result; 
-
-			init_waitqueue_head(&ss->ip_waitq);
-
-			/* set up the IRQ pipe and handler */
-			/* FIXME: This needs to get the period from the device */
-			ss->irqpipe = usb_rcvintpipe(ss->pusb_dev, ss->ep_int);
-			result = usb_request_irq(ss->pusb_dev, ss->irqpipe, CBI_irq,
-						 255, (void *)ss, &ss->irq_handle);
-			if (result) {
-				US_DEBUGP("usb_request_irq failed (0x%x), No interrupt for CBI\n",
-					  result);
-			}
-		}
-    
-
-		/* start up our thread */
-		{
-			DECLARE_MUTEX_LOCKED(sem);
-
-			init_waitqueue_head(&ss->waitq);
-
-			ss->notify = &sem;
-			ss->pid = kernel_thread(usb_stor_control_thread, ss,
-						CLONE_FS | CLONE_FILES | CLONE_SIGHAND);
-			if (ss->pid < 0) {
-				printk(KERN_WARNING USB_SCSI "Unable to start control thread\n");
-				kfree(htmplt);
-
-				kfree(ss);
-				return NULL;
-			}
-
-			/* wait for it to start */
-			down(&sem);
-		}
-
-		/* now register - our detect function will be called */
-
-		scsi_register_module(MODULE_SCSI_HA, htmplt);
-
-		/* put us in the list */
-
-		prev = (struct us_data *)&us_list;
-		while (prev->next)
-			prev = prev->next;
-		prev->next = ss;
-	}
-
-	printk(KERN_WARNING "WARNING: USB SCSI data integrity not assured\n");
-	printk(KERN_INFO "USB SCSI device found at address %d\n", dev->devnum);
-
-	return ss;
-}
-
-/* Handle a disconnect event from the USB core */
-static void storage_disconnect(struct usb_device *dev, void *ptr)
-{
-	struct us_data *ss = ptr;
-
-	if (!ss)
-		return;
-
-	ss->pusb_dev = NULL;
-	//  MOD_DEC_USE_COUNT;
-}
-
-
-/***********************************************************************
- * Initialization and registration
- ***********************************************************************/
-
-int usb_stor_init(void)
-{
-	//  MOD_INC_USE_COUNT;
-
-	if (usb_register(&storage_driver) < 0)
-		return -1;
-
-	printk(KERN_INFO "USB SCSI support registered.\n");
-	return 0;
-}
-
-#ifdef MODULE
-int init_module(void)
-{
-	/* MDD: Perhaps we should register the host here */
-	return usb_stor_init();
-}
-
-void cleanup_module(void)
-{
-	usb_deregister(&storage_driver);
-}
-#endif

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)