Update of /cvsroot/linuxconsole/ruby/linux/drivers/input
In directory usw-pr-cvs1:/tmp/cvs-serv2215
Modified Files:
fm801-gp.c ns558.c tsdev.c
Removed Files:
a3d.c analog.c
Log Message:
Fixes.
Index: fm801-gp.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/fm801-gp.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fm801-gp.c 2001/12/13 16:30:17 1.1
+++ fm801-gp.c 2002/01/22 20:21:58 1.2
@@ -39,6 +39,8 @@
struct fm801_gp {
struct gameport gameport;
struct resource *res_port;
+ char phys[32];
+ char name[32];
};
#ifdef HAVE_COOKED
@@ -96,19 +98,26 @@
pci_enable_device(pci);
gp->gameport.io = pci_resource_start(pci, 0);
if ((gp->res_port = request_region(gp->gameport.io, 0x10, "FM801 GP")) == NULL) {
+ kfree(gp);
printk("unable to grab region 0x%x-0x%x\n", gp->gameport.io, gp->gameport.io + 0x0f);
return -1;
}
+ gp->gameport.phys = gp->phys;
+ gp->gameport.name = gp->name;
+ gp->gameport.idbus = BUS_PCI;
+ gp->gameport.idvendor = pci->vendor;
+ gp->gameport.idproduct = pci->device;
+
pci_set_drvdata(pci, gp);
- gameport_register_port(&gp->gameport);
-
+
outb(0x60, gp->gameport.io + 0x0d); /* enable joystick 1 and 2 */
- printk(KERN_INFO "gameport%d: %s at pci%02x:%02x.%x speed %d kHz\n",
- gp->gameport.number, pci->name, pci->bus->number,
- PCI_SLOT(pci->devfn), PCI_FUNC(pci->devfn), gp->gameport.speed);
-
+ gameport_register_port(&gp->gameport);
+
+ printk(KERN_INFO "gameport: %s at pci%s speed %d kHz\n",
+ pci->name, pci->slot_name, gp->gameport.speed);
+
return 0;
}
Index: ns558.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/ns558.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- ns558.c 2001/12/26 21:08:33 1.41
+++ ns558.c 2002/01/22 20:21:58 1.42
@@ -145,9 +145,6 @@
port->gameport.phys = port->phys;
port->gameport.name = port->name;
port->gameport.idbus = BUS_ISA;
- port->gameport.idvendor = 0x0000;
- port->gameport.idproduct = 0x0000;
- port->gameport.idversion = 0x0000;
sprintf(port->phys, "isa%04x/gameport0", io & (-1 << i));
sprintf(port->name, "NS558 ISA");
Index: tsdev.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/tsdev.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- tsdev.c 2002/01/20 03:54:46 1.11
+++ tsdev.c 2002/01/22 20:21:58 1.12
@@ -302,7 +302,7 @@
wake_up_interruptible(&tsdev->wait);
}
-static struct input_handle *tsdev_connect(struct input_handler *handler, struct input_dev *dev)
+static struct input_handle *tsdev_connect(struct input_handler *handler, struct input_dev *dev, struct input_device_id *id)
{
struct tsdev *tsdev;
int minor;
--- a3d.c DELETED ---
--- analog.c DELETED ---
|
