patch-2.4.20 linux-2.4.20/drivers/isdn/hisax/ix1_micro.c
Next file: linux-2.4.20/drivers/isdn/hisax/md5sums.asc
Previous file: linux-2.4.20/drivers/isdn/hisax/isurf.c
Back to the patch index
Back to the overall index
- Lines: 76
- Date:
Thu Nov 28 15:53:13 2002
- Orig file:
linux-2.4.19/drivers/isdn/hisax/ix1_micro.c
- Orig date:
Fri Dec 21 09:41:54 2001
diff -urN linux-2.4.19/drivers/isdn/hisax/ix1_micro.c linux-2.4.20/drivers/isdn/hisax/ix1_micro.c
@@ -19,6 +19,7 @@
#define __NO_VERSION__
#include <linux/init.h>
+#include <linux/isapnp.h>
#include "hisax.h"
#include "isac.h"
#include "hscx.h"
@@ -218,6 +219,21 @@
return(0);
}
+#ifdef __ISAPNP__
+static struct isapnp_device_id itk_ids[] __initdata = {
+ { ISAPNP_VENDOR('I', 'T', 'K'), ISAPNP_FUNCTION(0x25),
+ ISAPNP_VENDOR('I', 'T', 'K'), ISAPNP_FUNCTION(0x25),
+ (unsigned long) "ITK micro 2" },
+ { ISAPNP_VENDOR('I', 'T', 'K'), ISAPNP_FUNCTION(0x29),
+ ISAPNP_VENDOR('I', 'T', 'K'), ISAPNP_FUNCTION(0x29),
+ (unsigned long) "ITK micro 2." },
+ { 0, }
+};
+
+static struct isapnp_device_id *idev = &itk_ids[0];
+static struct pci_bus *pnp_c __devinitdata = NULL;
+#endif
+
int __init
setup_ix1micro(struct IsdnCard *card)
@@ -230,6 +246,45 @@
if (cs->typ != ISDN_CTYPE_IX1MICROR2)
return (0);
+#ifdef __ISAPNP__
+ if (!card->para[1] && isapnp_present()) {
+ struct pci_bus *pb;
+ struct pci_dev *pd;
+
+ while(idev->card_vendor) {
+ if ((pb = isapnp_find_card(idev->card_vendor,
+ idev->card_device, pnp_c))) {
+ pnp_c = pb;
+ pd = NULL;
+ if ((pd = isapnp_find_dev(pnp_c,
+ idev->vendor, idev->function, pd))) {
+ printk(KERN_INFO "HiSax: %s detected\n",
+ (char *)idev->driver_data);
+ pd->prepare(pd);
+ pd->deactivate(pd);
+ pd->activate(pd);
+ card->para[1] = pd->resource[0].start;
+ card->para[0] = pd->irq_resource[0].start;
+ if (!card->para[0] || !card->para[1]) {
+ printk(KERN_ERR "ITK PnP:some resources are missing %ld/%lx\n",
+ card->para[0], card->para[1]);
+ pd->deactivate(pd);
+ return(0);
+ }
+ break;
+ } else {
+ printk(KERN_ERR "ITK PnP: PnP error card found, no device\n");
+ }
+ }
+ idev++;
+ pnp_c=NULL;
+ }
+ if (!idev->card_vendor) {
+ printk(KERN_INFO "ITK PnP: no ISAPnP card found\n");
+ return(0);
+ }
+ }
+#endif
/* IO-Ports */
cs->hw.ix1.isac_ale = card->para[1] + ISAC_COMMAND_OFFSET;
cs->hw.ix1.hscx_ale = card->para[1] + HSCX_COMMAND_OFFSET;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)