* Fix: mdc800 used sleep_on and slept with io_lock held.
* Converted sleep_on to waitqueues with schedule_timeout and made io_lock
* a semaphore from a spinlock.
- * by Oliver Neukum <520047054719-0001@t-online.de>
+ * by Oliver Neukum <oliver@neukum.name>
* (02/12/2001)
*
* Identify version on module load.
*
* version 0.7.5
* Fixed potential SMP races with Spinlocks.
- * Thanks to Oliver Neukum <oliver.neukum@lrz.uni-muenchen.de> who
+ * Thanks to Oliver Neukum <oliver@neukum.name> who
* noticed the race conditions.
* (30/10/2000)
*
/* Specification of the Endpoints */
static struct usb_endpoint_descriptor mdc800_ed [4] =
{
- { 0,0, 0x01, 0x02, 8, 0,0,0 },
- { 0,0, 0x82, 0x03, 8, 0,0,0 },
- { 0,0, 0x03, 0x02, 64, 0,0,0 },
- { 0,0, 0x84, 0x02, 64, 0,0,0 }
+ {
+ .bLength = 0,
+ .bDescriptorType = 0,
+ .bEndpointAddress = 0x01,
+ .bmAttributes = 0x02,
+ .wMaxPacketSize = __constant_cpu_to_le16(8),
+ .bInterval = 0,
+ .bRefresh = 0,
+ .bSynchAddress = 0,
+ },
+ {
+ .bLength = 0,
+ .bDescriptorType = 0,
+ .bEndpointAddress = 0x82,
+ .bmAttributes = 0x03,
+ .wMaxPacketSize = __constant_cpu_to_le16(8),
+ .bInterval = 0,
+ .bRefresh = 0,
+ .bSynchAddress = 0,
+ },
+ {
+ .bLength = 0,
+ .bDescriptorType = 0,
+ .bEndpointAddress = 0x03,
+ .bmAttributes = 0x02,
+ .wMaxPacketSize = __constant_cpu_to_le16(64),
+ .bInterval = 0,
+ .bRefresh = 0,
+ .bSynchAddress = 0,
+ },
+ {
+ .bLength = 0,
+ .bDescriptorType = 0,
+ .bEndpointAddress = 0x84,
+ .bmAttributes = 0x02,
+ .wMaxPacketSize = __constant_cpu_to_le16(64),
+ .bInterval = 0,
+ .bRefresh = 0,
+ .bSynchAddress = 0,
+ },
};
-
/* The Variable used by the driver */
-static struct mdc800_data* mdc800=0;
+static struct mdc800_data* mdc800;
/***************************************************************************
static int mdc800_usb_waitForIRQ (int mode, int msec)
{
DECLARE_WAITQUEUE(wait, current);
+ long timeout;
mdc800->camera_request_ready=1+mode;
add_wait_queue(&mdc800->irq_wait, &wait);
- set_current_state(TASK_INTERRUPTIBLE);
- if (!mdc800->irq_woken)
+ timeout = msec*HZ/1000;
+ while (!mdc800->irq_woken && timeout)
{
- schedule_timeout (msec*HZ/1000);
+ set_current_state(TASK_UNINTERRUPTIBLE);
+ timeout = schedule_timeout (timeout);
}
remove_wait_queue(&mdc800->irq_wait, &wait);
- set_current_state(TASK_RUNNING);
mdc800->irq_woken = 0;
if (mdc800->camera_request_ready>0)
dbg ("(mdc800_usb_probe) called.");
- if (mdc800->dev != 0)
+ if (mdc800->dev != NULL)
{
warn ("only one Mustek MDC800 is supported.");
return -ENODEV;
mdc800->state=NOT_CONNECTED;
- usb_unlink_urb (mdc800->irq_urb);
- usb_unlink_urb (mdc800->write_urb);
- usb_unlink_urb (mdc800->download_urb);
+ usb_kill_urb(mdc800->irq_urb);
+ usb_kill_urb(mdc800->write_urb);
+ usb_kill_urb(mdc800->download_urb);
- mdc800->dev=0;
+ mdc800->dev = NULL;
usb_set_intfdata(intf, NULL);
}
info ("Mustek MDC800 disconnected from USB.");
down (&mdc800->io_lock);
if (mdc800->open && (mdc800->state != NOT_CONNECTED))
{
- usb_unlink_urb (mdc800->irq_urb);
- usb_unlink_urb (mdc800->write_urb);
- usb_unlink_urb (mdc800->download_urb);
+ usb_kill_urb(mdc800->irq_urb);
+ usb_kill_urb(mdc800->write_urb);
+ usb_kill_urb(mdc800->download_urb);
mdc800->open=0;
}
else
/*
* The Device read callback Function
*/
-static ssize_t mdc800_device_read (struct file *file, char *buf, size_t len, loff_t *pos)
+static ssize_t mdc800_device_read (struct file *file, char __user *buf, size_t len, loff_t *pos)
{
size_t left=len, sts=len; /* single transfer size */
- char* ptr=buf;
+ char __user *ptr = buf;
+ long timeout;
DECLARE_WAITQUEUE(wait, current);
down (&mdc800->io_lock);
return len-left;
}
add_wait_queue(&mdc800->download_wait, &wait);
- set_current_state(TASK_INTERRUPTIBLE);
- if (!mdc800->downloaded)
+ timeout = TO_DOWNLOAD_GET_READY*HZ/1000;
+ while (!mdc800->downloaded && timeout)
{
- schedule_timeout (TO_DOWNLOAD_GET_READY*HZ/1000);
+ set_current_state(TASK_UNINTERRUPTIBLE);
+ timeout = schedule_timeout (timeout);
}
- set_current_state(TASK_RUNNING);
remove_wait_queue(&mdc800->download_wait, &wait);
mdc800->downloaded = 0;
if (mdc800->download_urb->status != 0)
* After this the driver initiates the request for the answer or
* just waits until the camera becomes ready.
*/
-static ssize_t mdc800_device_write (struct file *file, const char *buf, size_t len, loff_t *pos)
+static ssize_t mdc800_device_write (struct file *file, const char __user *buf, size_t len, loff_t *pos)
{
size_t i=0;
DECLARE_WAITQUEUE(wait, current);
if (mdc800->in_count == 8)
{
int answersize;
+ long timeout;
if (mdc800_usb_waitForIRQ (0,TO_GET_READY))
{
return -EIO;
}
add_wait_queue(&mdc800->write_wait, &wait);
- set_current_state(TASK_INTERRUPTIBLE);
- if (!mdc800->written)
+ timeout = TO_WRITE_GET_READY*HZ/1000;
+ while (!mdc800->written && timeout)
{
- schedule_timeout (TO_WRITE_GET_READY*HZ/1000);
+ set_current_state(TASK_UNINTERRUPTIBLE);
+ timeout = schedule_timeout (timeout);
}
- set_current_state(TASK_RUNNING);
remove_wait_queue(&mdc800->write_wait, &wait);
mdc800->written = 0;
if (mdc800->state == WORKING)
{
- usb_unlink_urb (mdc800->write_urb);
+ usb_kill_urb(mdc800->write_urb);
up (&mdc800->io_lock);
return -EIO;
}
Init and Cleanup this driver (Main Functions)
*************************************************************************/
-#define try(A) if ((A) == 0) goto cleanup_on_fail;
-#define try_free_mem(A) if (A != 0) { kfree (A); A=0; }
-#define try_free_urb(A) if (A != 0) { usb_free_urb (A); A=0; }
+#define try(A) if (!(A)) goto cleanup_on_fail;
static int __init usb_mdc800_init (void)
{
try (mdc800=kmalloc (sizeof (struct mdc800_data), GFP_KERNEL));
memset(mdc800, 0, sizeof(struct mdc800_data));
- mdc800->dev=0;
+ mdc800->dev = NULL;
mdc800->open=0;
mdc800->state=NOT_CONNECTED;
init_MUTEX (&mdc800->io_lock);
cleanup_on_fail:
- if (mdc800 != 0)
+ if (mdc800 != NULL)
{
err ("can't alloc memory!");
- try_free_mem (mdc800->download_urb_buffer);
- try_free_mem (mdc800->write_urb_buffer);
- try_free_mem (mdc800->irq_urb_buffer);
+ kfree(mdc800->download_urb_buffer);
+ kfree(mdc800->write_urb_buffer);
+ kfree(mdc800->irq_urb_buffer);
- try_free_urb (mdc800->write_urb);
- try_free_urb (mdc800->download_urb);
- try_free_urb (mdc800->irq_urb);
+ usb_free_urb(mdc800->write_urb);
+ usb_free_urb(mdc800->download_urb);
+ usb_free_urb(mdc800->irq_urb);
kfree (mdc800);
}
- mdc800=0;
+ mdc800 = NULL;
return retval;
}
kfree (mdc800->download_urb_buffer);
kfree (mdc800);
- mdc800=0;
+ mdc800 = NULL;
}
module_init (usb_mdc800_init);
git://git.onelab.eu / linux-2.6.git / blobdiff