patch-2.4.20 linux-2.4.20/drivers/isdn/hisax/config.c
Next file: linux-2.4.20/drivers/isdn/hisax/diva.c
Previous file: linux-2.4.20/drivers/isdn/hisax/avm_pci.c
Back to the patch index
Back to the overall index
- Lines: 116
- Date:
Thu Nov 28 15:53:13 2002
- Orig file:
linux-2.4.19/drivers/isdn/hisax/config.c
- Orig date:
Fri Aug 2 17:39:44 2002
diff -urN linux-2.4.19/drivers/isdn/hisax/config.c linux-2.4.20/drivers/isdn/hisax/config.c
@@ -75,6 +75,8 @@
* 37 HFC 2BDS0 S+/SP p0=irq p1=iobase
* 38 Travers Technologies NETspider-U PCI card
* 39 HFC 2BDS0-SP PCMCIA p0=irq p1=iobase
+ * 40 hotplug interface
+ * 41 Formula-n enter:now ISDN PCI a/b none
*
* protocol can be either ISDN_PTYPE_EURO or ISDN_PTYPE_1TR6 or ISDN_PTYPE_NI1
*
@@ -93,6 +95,7 @@
"Siemens I-Surf", "Acer P10", "HST Saphir", "Telekom A4T",
"Scitel Quadro", "Gazel", "HFC 2BDS0 PCI", "Winbond 6692",
"HFC 2BDS0 SX", "NETspider-U", "HFC-2BDS0-SP PCMCIA",
+ "Hotplug", "Formula-n enter:now PCI a/b",
};
void HiSax_closecard(int cardnr);
@@ -601,6 +604,10 @@
extern int setup_netjet_u(struct IsdnCard *card);
#endif
+#if CARD_FN_ENTERNOW_PCI
+extern int setup_enternow_pci(struct IsdnCard *card);
+#endif
+
/*
* Find card with given driverId
*/
@@ -1136,6 +1143,11 @@
ret = setup_netjet_u(card);
break;
#endif
+#if CARD_FN_ENTERNOW_PCI
+ case ISDN_CTYPE_ENTERNOW:
+ ret = setup_enternow_pci(card);
+ break;
+#endif
case ISDN_CTYPE_DYNAMIC:
ret = 2;
break;
@@ -1249,9 +1261,12 @@
foundcards++;
i++;
} else {
- printk(KERN_WARNING
- "HiSax: Card %s not installed !\n",
- CardType[cards[i].typ]);
+ /* make sure we don't oops the module */
+ if (cards[i].typ > 0 && cards[i].typ <= ISDN_CTYPE_COUNT) {
+ printk(KERN_WARNING
+ "HiSax: Card %s not installed !\n",
+ CardType[cards[i].typ]);
+ }
HiSax_shiftcards(i);
nrcards--;
}
@@ -1511,7 +1526,8 @@
nrcards, (nrcards > 1) ? "s" : "");
/* Install only, if at least one card found */
- HiSax_inithardware(NULL);
+ if (!HiSax_inithardware(NULL))
+ return -ENODEV;
return 0;
out_tei:
@@ -1579,7 +1595,8 @@
printk(KERN_DEBUG "HiSax: Total %d card%s defined\n",
nrcards, (nrcards > 1) ? "s" : "");
- HiSax_inithardware(busy_flag);
+ if (!HiSax_inithardware(busy_flag))
+ return -ENODEV;
printk(KERN_NOTICE "HiSax: module installed\n");
#endif
return 0;
@@ -1621,7 +1638,8 @@
printk(KERN_DEBUG "HiSax: Total %d card%s defined\n",
nrcards, (nrcards > 1) ? "s" : "");
- HiSax_inithardware(busy_flag);
+ if (!HiSax_inithardware(busy_flag))
+ return -ENODEV;
printk(KERN_NOTICE "HiSax: module installed\n");
#endif
return 0;
@@ -1663,7 +1681,8 @@
printk(KERN_DEBUG "HiSax: Total %d card%s defined\n",
nrcards, (nrcards > 1) ? "s" : "");
- HiSax_inithardware(busy_flag);
+ if (!HiSax_inithardware(busy_flag))
+ return -ENODEV;
printk(KERN_NOTICE "HiSax: module installed\n");
#endif
return 0;
@@ -1705,7 +1724,8 @@
printk(KERN_DEBUG "HiSax: Total %d card%s defined\n",
nrcards, (nrcards > 1) ? "s" : "");
- HiSax_inithardware(busy_flag);
+ if (!HiSax_inithardware(busy_flag))
+ return -ENODEV;
printk(KERN_NOTICE "HiSax: module installed\n");
#endif
return 0;
@@ -2092,6 +2112,9 @@
{PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_DIVA20, PCI_ANY_ID, PCI_ANY_ID},
{PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_DIVA20_U, PCI_ANY_ID, PCI_ANY_ID},
{PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_DIVA201, PCI_ANY_ID, PCI_ANY_ID},
+//#########################################################################################
+ {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_DIVA202, PCI_ANY_ID, PCI_ANY_ID},
+//#########################################################################################
#endif
#ifdef CONFIG_HISAX_ELSA
{PCI_VENDOR_ID_ELSA, PCI_DEVICE_ID_ELSA_MICROLINK, PCI_ANY_ID, PCI_ANY_ID},
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)