[Linuxconsole-commit]CVS: ruby/linux/drivers/input iforce-packets.c,1.4,1.5 iforce-usb.c,1.3,1.4 iforce.h,1.3,1.4 vortex.c,1.1,1.2

[James S. <jsi...@us...>]

Update of /cvsroot/linuxconsole/ruby/linux/drivers/input
In directory usw-pr-cvs1:/tmp/cvs-serv32442

Modified Files:
	iforce-packets.c iforce-usb.c iforce.h vortex.c 
Log Message:
Syncing to new USB api for 2.5.2. Will sync rest of tree up tomorrow.

Index: iforce-packets.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/iforce-packets.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- iforce-packets.c	2001/10/28 19:10:24	1.4
+++ iforce-packets.c	2002/01/18 18:45:31	1.5
@@ -235,7 +235,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);

Index: iforce-usb.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/iforce-usb.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- iforce-usb.c	2001/11/10 09:46:19	1.3
+++ iforce-usb.c	2002/01/18 18:45:32	1.4
@@ -114,9 +114,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);

Index: iforce.h
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/iforce.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- iforce.h	2001/10/23 21:20:54	1.3
+++ iforce.h	2002/01/18 18:45:32	1.4
@@ -140,7 +140,7 @@
 #ifdef IFORCE_USB
 	struct usb_device *usbdev;	/* USB transfer */
 	struct urb irq, out, ctrl;
-	devrequest dr;
+	struct usb_ctrlrequest dr;
 #endif
 	spinlock_t xmit_lock;
 	/* Buffer used for asynchronous sending of bytes to the device */

Index: vortex.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/vortex.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2