patch-2.4.20 linux-2.4.20/drivers/char/joystick/iforce.c
Next file: linux-2.4.20/drivers/char/joystick/pcigame.c
Previous file: linux-2.4.20/drivers/char/joystick/analog.c
Back to the patch index
Back to the overall index
- Lines: 31
- Date:
Thu Nov 28 15:53:12 2002
- Orig file:
linux-2.4.19/drivers/char/joystick/iforce.c
- Orig date:
Wed Sep 12 15:34:06 2001
diff -urN linux-2.4.19/drivers/char/joystick/iforce.c linux-2.4.20/drivers/char/joystick/iforce.c
@@ -134,7 +134,7 @@
#ifdef IFORCE_USB
struct usb_device *usbdev; /* USB transfer */
struct urb irq, out, ctrl;
- devrequest dr;
+ struct usb_ctrlrequest dr;
#endif
/* Force Feedback */
wait_queue_head_t wait;
@@ -283,7 +283,7 @@
#ifdef IFORCE_USB
case IFORCE_USB:
- iforce->dr.request = packet[0];
+ iforce->dr.bRequest = packet[0];
iforce->ctrl.dev = iforce->usbdev;
set_current_state(TASK_INTERRUPTIBLE);
@@ -1027,9 +1027,9 @@
iforce->bus = IFORCE_USB;
iforce->usbdev = dev;
- iforce->dr.requesttype = USB_TYPE_VENDOR | USB_DIR_IN | USB_RECIP_INTERFACE;
- iforce->dr.index = 0;
- iforce->dr.length = 16;
+ iforce->dr.bRequestType = USB_TYPE_VENDOR | USB_DIR_IN | USB_RECIP_INTERFACE;
+ iforce->dr.wIndex = 0;
+ iforce->dr.wLength = 16;
FILL_INT_URB(&iforce->irq, dev, usb_rcvintpipe(dev, epirq->bEndpointAddress),
iforce->data, 16, iforce_usb_irq, iforce, epirq->bInterval);
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)