From: johann d. <jd...@us...> - 2002-01-28 22:45:03
|
Update of /cvsroot/linuxconsole/ruby/linux/drivers/input/joystick/iforce In directory usw-pr-cvs1:/tmp/cvs-serv16989 Modified Files: iforce-ff.c iforce-main.c iforce-packets.c iforce-serio.c iforce-usb.c iforce.h Log Message: Removed references to usb_make_path. Synced with dj patch. Index: iforce-ff.c =================================================================== RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/joystick/iforce/iforce-ff.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 Index: iforce-main.c =================================================================== RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/joystick/iforce/iforce-main.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- iforce-main.c 2002/01/22 20:33:38 1.6 +++ iforce-main.c 2002/01/28 22:45:00 1.7 @@ -28,7 +28,6 @@ */ #include "iforce.h" -#include "usbpath.h" MODULE_AUTHOR("Vojtech Pavlik <vo...@uc...>, Johann Deneux <de...@if...>"); MODULE_DESCRIPTION("USB/RS232 I-Force joysticks and wheels driver"); @@ -256,7 +255,7 @@ /* Free ressources assigned to effect */ if (iforce_erase_effect(dev, i)) { - printk(KERN_WARNING "iforce_flush: (%s) erase effect %d failed\n", dev->phys, i); + printk(KERN_WARNING "iforce_flush: erase effect %d failed\n", i); } } @@ -287,7 +286,6 @@ int iforce_init_device(struct iforce *iforce) { unsigned char c[] = "CEOV"; - char path[64]; int i; init_waitqueue_head(&iforce->wait); @@ -297,28 +295,13 @@ iforce->dev.ff_effects_max = 10; - switch (iforce->bus) { -#ifdef IFORCE_232 - case IFORCE_232: - strcpy(path, iforce->serio->phys); - break; -#endif -#ifdef IFORCE_USB - case IFORCE_USB: - usb_make_path(iforce->usbdev, path, 64); - break; -#endif - } - - sprintf(iforce->phys, "%s/input0", path); - /* * Input device fields. */ iforce->dev.idbus = BUS_USB; iforce->dev.private = iforce; - iforce->dev.name = iforce->phys; + iforce->dev.name = "Unknown I-Force device"; iforce->dev.open = iforce_open; iforce->dev.close = iforce_close; iforce->dev.flush = iforce_flush; @@ -398,8 +381,7 @@ iforce->type = iforce_device + i; - sprintf(iforce->name, iforce->type->name, - iforce->dev.idproduct, iforce->dev.idvendor); + iforce->name = iforce->type->name; /* * Set input device bitfields and ranges. Index: iforce-packets.c =================================================================== RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/joystick/iforce/iforce-packets.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- iforce-packets.c 2002/01/22 20:33:53 1.6 +++ iforce-packets.c 2002/01/28 22:45:00 1.7 @@ -235,7 +235,7 @@ #ifdef IFORCE_USB case IFORCE_USB: - iforce->dr.bRequest = packet[0]; + iforce->cr.bRequest = packet[0]; iforce->ctrl.dev = iforce->usbdev; set_current_state(TASK_INTERRUPTIBLE); Index: iforce-serio.c =================================================================== RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/joystick/iforce/iforce-serio.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 Index: iforce-usb.c =================================================================== RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/joystick/iforce/iforce-usb.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- iforce-usb.c 2002/01/22 20:34:21 1.5 +++ iforce-usb.c 2002/01/28 22:45:00 1.6 @@ -114,9 +114,9 @@ iforce->bus = IFORCE_USB; iforce->usbdev = dev; - iforce->dr.bRequestType = USB_TYPE_VENDOR | USB_DIR_IN | USB_RECIP_INTERFACE; - iforce->dr.wIndex = 0; - iforce->dr.wLength = 16; + iforce->cr.bRequestType = USB_TYPE_VENDOR | USB_DIR_IN | USB_RECIP_INTERFACE; + iforce->cr.wIndex = 0; + iforce->cr.wLength = 16; FILL_INT_URB(&iforce->irq, dev, usb_rcvintpipe(dev, epirq->bEndpointAddress), iforce->data, 16, iforce_usb_irq, iforce, epirq->bInterval); @@ -125,7 +125,7 @@ iforce + 1, 32, iforce_usb_out, iforce); FILL_CONTROL_URB(&iforce->ctrl, dev, usb_rcvctrlpipe(dev, 0), - (void*) &iforce->dr, iforce->edata, 16, iforce_usb_ctrl, iforce); + (void*) &iforce->cr, iforce->edata, 16, iforce_usb_ctrl, iforce); if (iforce_init_device(iforce)) { kfree(iforce); Index: iforce.h =================================================================== RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/joystick/iforce/iforce.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- iforce.h 2002/01/22 20:34:33 1.5 +++ iforce.h 2002/01/28 22:45:00 1.6 @@ -47,10 +47,10 @@ #define IFORCE_MAX_LENGTH 16 -#if defined(CONFIG_INPUT_IFORCE_232) || defined(CONFIG_INPUT_IFORCE_232_MODULE) +#if defined(CONFIG_JOYSTICK_IFORCE_232) || defined(CONFIG_JOYSTICK_IFORCE_232_MODULE) #define IFORCE_232 1 #endif -#if defined(CONFIG_INPUT_IFORCE_USB) || defined(CONFIG_INPUT_IFORCE_USB_MODULE) +#if defined(CONFIG_JOYSTICK_IFORCE_USB) || defined(CONFIG_JOYSTICK_IFORCE_USB_MODULE) #define IFORCE_USB 2 #endif @@ -123,7 +123,6 @@ struct input_dev dev; /* Input device interface */ struct iforce_device *type; char name[64]; - char phys[64]; int open; int bus; @@ -140,7 +139,7 @@ #ifdef IFORCE_USB struct usb_device *usbdev; /* USB transfer */ struct urb irq, out, ctrl; - struct usb_ctrlrequest dr; + struct usb_ctrlrequest cr; #endif spinlock_t xmit_lock; /* Buffer used for asynchronous sending of bytes to the device */ |