From: James S. <jsi...@us...> - 2001-11-13 22:48:05
|
Update of /cvsroot/linuxconsole/ruby/linux/drivers/input In directory usw-pr-cvs1:/tmp/cvs-serv25951 Modified Files: ns558.c Log Message: Bug fixes. I hope I am grabbing the right info from PCI space. Index: ns558.c =================================================================== RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/ns558.c,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- ns558.c 2001/09/25 10:12:07 1.39 +++ ns558.c 2001/11/13 22:48:01 1.40 @@ -171,7 +171,7 @@ #define NS558_DEVICE(a,b,c,d)\ card_vendor: ISAPNP_ANY_ID, card_device: ISAPNP_ANY_ID,\ - vendor: ISAPNP_VENDOR(a,b,c), device: ISAPNP_DEVICE(d) + vendor: ISAPNP_VENDOR(a,b,c), function: ISAPNP_DEVICE(d) static struct isapnp_device_id pnp_devids[] = { { NS558_DEVICE('@','P','@',0x0001) }, /* ALS 100 */ @@ -242,15 +242,15 @@ port->gameport.idbus = BUS_ISAPNP; port->gameport.idvendor = dev->vendor; port->gameport.idproduct = dev->device; - port->gameport.idversion = dev->version; + port->gameport.idversion = 0x100; - sprintf(port->phys, "isapnp%d.%d/gameport0", dev->number, dev->devfn); - sprintf(port->name, "%s" dev->name[0] ? dev->name : "NS558 PnP Gameport"); + sprintf(port->phys, "isapnp%d.%d/gameport0", PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn)); + sprintf(port->name, "%s", dev->name[0] ? dev->name : "NS558 PnP Gameport"); gameport_register_port(&port->gameport); printk(KERN_INFO "gameport: NS558 PnP at isapnp%d.%d io %#x", - dev->number, dev->devfn, port->gameport.io); + PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn), port->gameport.io); if (iolen > 1) printk(" size %d", iolen); printk(" speed %d kHz\n", port->gameport.speed); |