Update of /cvsroot/linuxconsole/ruby/linux/drivers/input/joystick/iforce
In directory usw-pr-cvs1:/tmp/cvs-serv12155
Modified Files:
iforce-main.c iforce-packets.c iforce-usb.c
Log Message:
Synced with latest USB API changes.
Index: iforce-main.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/joystick/iforce/iforce-main.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- iforce-main.c 8 Feb 2002 23:02:34 -0000 1.13
+++ iforce-main.c 10 Feb 2002 23:41:31 -0000 1.14
@@ -227,14 +227,11 @@
{
struct iforce *iforce = dev->private;
-printk(KERN_DEBUG "In iforce_open\n");
-
switch (iforce->bus) {
#ifdef IFORCE_USB
case IFORCE_USB:
-printk(KERN_DEBUG "Submitting irq URB\n");
iforce->irq.dev = iforce->usbdev;
- if (usb_submit_urb(&iforce->irq))
+ if (usb_submit_urb(&iforce->irq, GFP_KERNEL))
return -EIO;
break;
#endif
@@ -274,15 +271,12 @@
{
struct iforce *iforce = dev->private;
- printk(KERN_DEBUG "iforce.c: in iforce_release\n");
-
/* Disable force feedback playback */
iforce_send_packet(iforce, FF_CMD_ENABLE, "\001");
switch (iforce->bus) {
#ifdef IFORCE_USB
case IFORCE_USB:
-printk(KERN_DEBUG "Unlinking irq URB\n");
usb_unlink_urb(&iforce->irq);
/* The device was unplugged before the file
@@ -412,6 +406,8 @@
for (i = 0; iforce->type->btn[i] >= 0; i++) {
signed short t = iforce->type->btn[i];
set_bit(t, iforce->dev.keybit);
+ if (t != BTN_DEAD)
+ set_bit(t, iforce->dev.ffbit);
}
for (i = 0; iforce->type->abs[i] >= 0; i++) {
Index: iforce-packets.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/joystick/iforce/iforce-packets.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- iforce-packets.c 8 Feb 2002 00:35:34 -0000 1.10
+++ iforce-packets.c 10 Feb 2002 23:41:31 -0000 1.11
@@ -243,7 +243,7 @@
set_current_state(TASK_INTERRUPTIBLE);
add_wait_queue(&iforce->wait, &wait);
- if (usb_submit_urb(&iforce->ctrl)) {
+ if (usb_submit_urb(&iforce->ctrl, GFP_KERNEL)) {
set_current_state(TASK_RUNNING);
remove_wait_queue(&iforce->wait, &wait);
return -1;
Index: iforce-usb.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/joystick/iforce/iforce-usb.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- iforce-usb.c 8 Feb 2002 00:35:34 -0000 1.12
+++ iforce-usb.c 10 Feb 2002 23:41:31 -0000 1.13
@@ -64,8 +64,8 @@
}
XMIT_INC(iforce->xmit.tail, n);
- if ( (n=usb_submit_urb(&iforce->out)) ) {
- printk(KERN_WARNING "iforce.c: iforce_usb_xmit: usb_submit_urb failed %d\n", n);
+ if ( (n=usb_submit_urb(&iforce->out, GFP_KERNEL)) ) {
+ printk(KERN_WARNING "iforce-usb.c: iforce_usb_xmit: usb_submit_urb failed %d\n", n);
}
/* The IFORCE_XMIT_RUNNING bit is not cleared here. That's intended.
|
