MODULE_DESCRIPTION("ENE USB Mass Storage driver for Linux");
MODULE_LICENSE("GPL");
+static unsigned int delay_use = 1;
+
static struct usb_device_id eucr_usb_ids [] = {
{ USB_DEVICE(0x058f, 0x6366) },
{ USB_DEVICE(0x0cf2, 0x6230) },
mutex_lock(&(us->dev_mutex));
/* if the device has disconnected, we are free to exit */
-/* if (test_bit(US_FLIDX_DISCONNECTING, &us->flags))
- {
+ if (test_bit(US_FLIDX_DISCONNECTING, &us->dflags)) {
mutex_unlock(&us->dev_mutex);
break;
- }*/
+ }
/* lock access to the state */
scsi_lock(host);
{
printk("usb --- get_transport\n");
switch (us->protocol) {
- case US_PR_BULK:
+ case USB_PR_BULK:
us->transport_name = "Bulk";
us->transport = usb_stor_Bulk_transport;
us->transport_reset = usb_stor_Bulk_reset;
printk("us->pusb_dev->descriptor.idVendor = %x\n", us->pusb_dev->descriptor.idVendor);
printk("us->pusb_dev->descriptor.idProduct = %x\n", us->pusb_dev->descriptor.idProduct);
switch (us->subclass) {
- case US_SC_SCSI:
+ case USB_SC_SCSI:
us->protocol_name = "Transparent SCSI";
if( (us->pusb_dev->descriptor.idVendor == 0x0CF2) && (us->pusb_dev->descriptor.idProduct == 0x6250) )
us->proto_handler = ENE_stor_invoke_transport;
}
}
- if (!ep_in || !ep_out || (us->protocol == US_PR_CBI && !ep_int))
+ if (!ep_in || !ep_out || (us->protocol == USB_PR_CBI && !ep_int))
{
printk("Endpoint sanity check failed! Rejecting dev.\n");
return -EIO;
printk("usb --- usb_stor_scan_thread\n");
printk("EUCR : device found at %d\n", us->pusb_dev->devnum);
-// Have we to add this code ?
-// set_freezable();
-// /* Wait for the timeout to expire or for a disconnect */
-// if (delay_use > 0)
-// {
-// wait_event_freezable_timeout(us->delay_wait,
-// test_bit(US_FLIDX_DONT_SCAN, &us->dflags),
-// delay_use * HZ);
-// }
+ set_freezable();
+ /* Wait for the timeout to expire or for a disconnect */
+ if (delay_use > 0) {
+ wait_event_freezable_timeout(us->delay_wait,
+ test_bit(US_FLIDX_DONT_SCAN, &us->dflags),
+ delay_use * HZ);
+ }
/* If the device is still connected, perform the scanning */
if (!test_bit(US_FLIDX_DONT_SCAN, &us->dflags))
{
/* For bulk-only devices, determine the max LUN value */
- if (us->protocol == US_PR_BULK && !(us->fflags & US_FL_SINGLE_LUN))
+ if (us->protocol == USB_PR_BULK && !(us->fflags & US_FL_SINGLE_LUN))
{
mutex_lock(&us->dev_mutex);
us->max_lun = usb_stor_Bulk_max_lun(us);