Skip to content

L
linux
Commit 0a1ec89f authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files
Options

USB 

 - changed printer.c to use dynamic urbs, as that is now necessary.
parent b4062a55
Show whitespace changes
Inline Side-by-side
Showing with 55 additions and 35 deletions
drivers/usb/printer.c
View file @ 0a1ec89f
...@@ -91,7 +91,7 @@ struct usblp { ...@@ -91,7 +91,7 @@ struct usblp {
struct usb_device *dev; /* USB device */ struct usb_device *dev; /* USB device */
devfs_handle_t devfs; /* devfs device */ devfs_handle_t devfs; /* devfs device */
struct semaphore sem; /* locks this struct, especially "dev" */ struct semaphore sem; /* locks this struct, especially "dev" */
struct urb readurb, writeurb; /* The urbs */ struct urb *readurb, *writeurb; /* The urbs */
wait_queue_head_t wait; /* Zzzzz ... */ wait_queue_head_t wait; /* Zzzzz ... */
int readcount; /* Counter for reads */ int readcount; /* Counter for reads */
int ifnum; /* Interface number */ int ifnum; /* Interface number */
...@@ -253,15 +253,15 @@ static int usblp_open(struct inode *inode, struct file *file) ...@@ -253,15 +253,15 @@ static int usblp_open(struct inode *inode, struct file *file)
usblp->used = 1; usblp->used = 1;
file->private_data = usblp; file->private_data = usblp;
usblp->writeurb.transfer_buffer_length = 0; usblp->writeurb->transfer_buffer_length = 0;
usblp->writeurb.status = 0; usblp->writeurb->status = 0;
usblp->wcomplete = 1; /* we begin writeable */ usblp->wcomplete = 1; /* we begin writeable */
usblp->rcomplete = 0; usblp->rcomplete = 0;
if (usblp->bidir) { if (usblp->bidir) {
usblp->readcount = 0; usblp->readcount = 0;
usblp->readurb.dev = usblp->dev; usblp->readurb->dev = usblp->dev;
if (usb_submit_urb(&usblp->readurb, GFP_KERNEL) < 0) { if (usb_submit_urb(usblp->readurb, GFP_KERNEL) < 0) {
retval = -EIO; retval = -EIO;
usblp->used = 0; usblp->used = 0;
file->private_data = NULL; file->private_data = NULL;
...@@ -278,8 +278,10 @@ static void usblp_cleanup (struct usblp *usblp) ...@@ -278,8 +278,10 @@ static void usblp_cleanup (struct usblp *usblp)
usblp_table [usblp->minor] = NULL; usblp_table [usblp->minor] = NULL;
info ("usblp%d: removed", usblp->minor); info ("usblp%d: removed", usblp->minor);
kfree (usblp->writeurb.transfer_buffer); kfree (usblp->writeurb->transfer_buffer);
kfree (usblp->device_id_string); kfree (usblp->device_id_string);
usb_free_urb(usblp->writeurb);
usb_free_urb(usblp->readurb);
kfree (usblp); kfree (usblp);
} }
...@@ -292,8 +294,8 @@ static int usblp_release(struct inode *inode, struct file *file) ...@@ -292,8 +294,8 @@ static int usblp_release(struct inode *inode, struct file *file)
usblp->used = 0; usblp->used = 0;
if (usblp->dev) { if (usblp->dev) {
if (usblp->bidir) if (usblp->bidir)
usb_unlink_urb(&usblp->readurb); usb_unlink_urb(usblp->readurb);
usb_unlink_urb(&usblp->writeurb); usb_unlink_urb(usblp->writeurb);
up(&usblp->sem); up(&usblp->sem);
} else /* finish cleanup from disconnect */ } else /* finish cleanup from disconnect */
usblp_cleanup (usblp); usblp_cleanup (usblp);
...@@ -306,8 +308,8 @@ static unsigned int usblp_poll(struct file *file, struct poll_table_struct *wait ...@@ -306,8 +308,8 @@ static unsigned int usblp_poll(struct file *file, struct poll_table_struct *wait
{ {
struct usblp *usblp = file->private_data; struct usblp *usblp = file->private_data;
poll_wait(file, &usblp->wait, wait); poll_wait(file, &usblp->wait, wait);
return ((!usblp->bidir || usblp->readurb.status == -EINPROGRESS) ? 0 : POLLIN | POLLRDNORM) return ((!usblp->bidir || usblp->readurb->status == -EINPROGRESS) ? 0 : POLLIN | POLLRDNORM)
| (usblp->writeurb.status == -EINPROGRESS ? 0 : POLLOUT | POLLWRNORM); | (usblp->writeurb->status == -EINPROGRESS ? 0 : POLLOUT | POLLWRNORM);
} }
static int usblp_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) static int usblp_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
...@@ -423,12 +425,12 @@ static ssize_t usblp_write(struct file *file, const char *buffer, size_t count, ...@@ -423,12 +425,12 @@ static ssize_t usblp_write(struct file *file, const char *buffer, size_t count,
return -ENODEV; return -ENODEV;
} }
if (usblp->writeurb.status != 0) { if (usblp->writeurb->status != 0) {
if (usblp->quirks & USBLP_QUIRK_BIDIR) { if (usblp->quirks & USBLP_QUIRK_BIDIR) {
if (!usblp->wcomplete) if (!usblp->wcomplete)
err("usblp%d: error %d writing to printer", err("usblp%d: error %d writing to printer",
usblp->minor, usblp->writeurb.status); usblp->minor, usblp->writeurb->status);
err = usblp->writeurb.status; err = usblp->writeurb->status;
} else } else
err = usblp_check_status(usblp, err); err = usblp_check_status(usblp, err);
up (&usblp->sem); up (&usblp->sem);
...@@ -440,23 +442,23 @@ static ssize_t usblp_write(struct file *file, const char *buffer, size_t count, ...@@ -440,23 +442,23 @@ static ssize_t usblp_write(struct file *file, const char *buffer, size_t count,
continue; continue;
} }
writecount += usblp->writeurb.transfer_buffer_length; writecount += usblp->writeurb->transfer_buffer_length;
usblp->writeurb.transfer_buffer_length = 0; usblp->writeurb->transfer_buffer_length = 0;
if (writecount == count) { if (writecount == count) {
up (&usblp->sem); up (&usblp->sem);
break; break;
} }
usblp->writeurb.transfer_buffer_length = (count - writecount) < USBLP_BUF_SIZE ? usblp->writeurb->transfer_buffer_length = (count - writecount) < USBLP_BUF_SIZE ?
(count - writecount) : USBLP_BUF_SIZE; (count - writecount) : USBLP_BUF_SIZE;
if (copy_from_user(usblp->writeurb.transfer_buffer, buffer + writecount, if (copy_from_user(usblp->writeurb->transfer_buffer, buffer + writecount,
usblp->writeurb.transfer_buffer_length)) return -EFAULT; usblp->writeurb->transfer_buffer_length)) return -EFAULT;
usblp->writeurb.dev = usblp->dev; usblp->writeurb->dev = usblp->dev;
usblp->wcomplete = 0; usblp->wcomplete = 0;
if (usb_submit_urb(&usblp->writeurb, GFP_KERNEL)) { if (usb_submit_urb(usblp->writeurb, GFP_KERNEL)) {
count = -EIO; count = -EIO;
up (&usblp->sem); up (&usblp->sem);
break; break;
...@@ -516,29 +518,29 @@ static ssize_t usblp_read(struct file *file, char *buffer, size_t count, loff_t ...@@ -516,29 +518,29 @@ static ssize_t usblp_read(struct file *file, char *buffer, size_t count, loff_t
goto done; goto done;
} }
if (usblp->readurb.status) { if (usblp->readurb->status) {
err("usblp%d: error %d reading from printer", err("usblp%d: error %d reading from printer",
usblp->minor, usblp->readurb.status); usblp->minor, usblp->readurb->status);
usblp->readurb.dev = usblp->dev; usblp->readurb->dev = usblp->dev;
usblp->readcount = 0; usblp->readcount = 0;
usb_submit_urb(&usblp->readurb, GFP_KERNEL); usb_submit_urb(usblp->readurb, GFP_KERNEL);
count = -EIO; count = -EIO;
goto done; goto done;
} }
count = count < usblp->readurb.actual_length - usblp->readcount ? count = count < usblp->readurb->actual_length - usblp->readcount ?
count : usblp->readurb.actual_length - usblp->readcount; count : usblp->readurb->actual_length - usblp->readcount;
if (copy_to_user(buffer, usblp->readurb.transfer_buffer + usblp->readcount, count)) { if (copy_to_user(buffer, usblp->readurb->transfer_buffer + usblp->readcount, count)) {
count = -EFAULT; count = -EFAULT;
goto done; goto done;
} }
if ((usblp->readcount += count) == usblp->readurb.actual_length) { if ((usblp->readcount += count) == usblp->readurb->actual_length) {
usblp->readcount = 0; usblp->readcount = 0;
usblp->readurb.dev = usblp->dev; usblp->readurb->dev = usblp->dev;
usblp->rcomplete = 0; usblp->rcomplete = 0;
if (usb_submit_urb(&usblp->readurb, GFP_KERNEL)) { if (usb_submit_urb(usblp->readurb, GFP_KERNEL)) {
count = -EIO; count = -EIO;
goto done; goto done;
} }
...@@ -668,24 +670,42 @@ static void *usblp_probe(struct usb_device *dev, unsigned int ifnum, ...@@ -668,24 +670,42 @@ static void *usblp_probe(struct usb_device *dev, unsigned int ifnum,
init_waitqueue_head(&usblp->wait); init_waitqueue_head(&usblp->wait);
usblp->writeurb = usb_alloc_urb(0, GFP_KERNEL);
if (!usblp->writeurb) {
err("out of memory");
kfree(usblp);
return NULL;
}
usblp->readurb = usb_alloc_urb(0, GFP_KERNEL);
if (!usblp->readurb) {
err("out of memory");
usb_free_urb(usblp->writeurb);
kfree(usblp);
return NULL;
}
if (!(buf = kmalloc(USBLP_BUF_SIZE * (bidir ? 2 : 1), GFP_KERNEL))) { if (!(buf = kmalloc(USBLP_BUF_SIZE * (bidir ? 2 : 1), GFP_KERNEL))) {
err("out of memory"); err("out of memory");
usb_free_urb(usblp->writeurb);
usb_free_urb(usblp->readurb);
kfree(usblp); kfree(usblp);
return NULL; return NULL;
} }
if (!(usblp->device_id_string = kmalloc(DEVICE_ID_SIZE, GFP_KERNEL))) { if (!(usblp->device_id_string = kmalloc(DEVICE_ID_SIZE, GFP_KERNEL))) {
err("out of memory"); err("out of memory");
usb_free_urb(usblp->writeurb);
usb_free_urb(usblp->readurb);
kfree(usblp); kfree(usblp);
kfree(buf); kfree(buf);
return NULL; return NULL;
} }
FILL_BULK_URB(&usblp->writeurb, dev, usb_sndbulkpipe(dev, epwrite->bEndpointAddress), FILL_BULK_URB(usblp->writeurb, dev, usb_sndbulkpipe(dev, epwrite->bEndpointAddress),
buf, 0, usblp_bulk_write, usblp); buf, 0, usblp_bulk_write, usblp);
if (bidir) if (bidir)
FILL_BULK_URB(&usblp->readurb, dev, usb_rcvbulkpipe(dev, epread->bEndpointAddress), FILL_BULK_URB(usblp->readurb, dev, usb_rcvbulkpipe(dev, epread->bEndpointAddress),
buf + USBLP_BUF_SIZE, USBLP_BUF_SIZE, usblp_bulk_read, usblp); buf + USBLP_BUF_SIZE, USBLP_BUF_SIZE, usblp_bulk_read, usblp);
/* Get the device_id string if possible. FIXME: Could make this kmalloc(length). */ /* Get the device_id string if possible. FIXME: Could make this kmalloc(length). */
...@@ -737,9 +757,9 @@ static void usblp_disconnect(struct usb_device *dev, void *ptr) ...@@ -737,9 +757,9 @@ static void usblp_disconnect(struct usb_device *dev, void *ptr)
lock_kernel(); lock_kernel();
usblp->dev = NULL; usblp->dev = NULL;
usb_unlink_urb(&usblp->writeurb); usb_unlink_urb(usblp->writeurb);
if (usblp->bidir) if (usblp->bidir)
usb_unlink_urb(&usblp->readurb); usb_unlink_urb(usblp->readurb);
if (!usblp->used) if (!usblp->used)
usblp_cleanup (usblp); usblp_cleanup (usblp);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7