change NETjet U to NETspider U(Trademark issue)
HiSax is now version 3.5
This commit is contained in:
Karsten Keil
parent
c8b8c616a5
commit
843b1753b8
|
|
@ -86,9 +86,7 @@ if [ "$CONFIG_ISDN_DRV_HISAX" != "n" ]; then
|
|||
bool ' USR Sportster internal TA' CONFIG_HISAX_SPORTSTER
|
||||
bool ' MIC card' CONFIG_HISAX_MIC
|
||||
bool ' NETjet card' CONFIG_HISAX_NETJET
|
||||
if [ "$CONFIG_HISAX_NETJET" != "n" ]; then
|
||||
bool ' Support NETjet U interface' CONFIG_HISAX_NETJET_U
|
||||
fi
|
||||
bool ' NETspider U card' CONFIG_HISAX_NETJET_U
|
||||
bool ' Niccy PnP/PCI card' CONFIG_HISAX_NICCY
|
||||
bool ' Siemens I-Surf card' CONFIG_HISAX_ISURF
|
||||
bool ' HST Saphir card' CONFIG_HISAX_HSTSAPHIR
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@ HFC_OBJ :=
|
|||
HFC_2BDS0 :=
|
||||
JADE_OBJ :=
|
||||
W6692_OBJ :=
|
||||
NETJ_OBJ :=
|
||||
ICC_OBJ :=
|
||||
|
||||
ifeq ($(CONFIG_HISAX_16_0),y)
|
||||
|
|
@ -125,12 +126,14 @@ ifeq ($(CONFIG_HISAX_MIC),y)
|
|||
endif
|
||||
|
||||
ifeq ($(CONFIG_HISAX_NETJET),y)
|
||||
O_OBJS += nj_s.o netjet.o
|
||||
O_OBJS += nj_s.o
|
||||
NETJ_OBJ := netjet.o
|
||||
ISAC_OBJ := isac.o
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_HISAX_NETJET_U),y)
|
||||
O_OBJS += nj_u.o
|
||||
NETJ_OBJ := netjet.o
|
||||
ICC_OBJ := icc.o
|
||||
endif
|
||||
|
||||
|
|
@ -195,7 +198,7 @@ ifeq ($(ISAC_OBJ), isac.o)
|
|||
endif
|
||||
|
||||
O_OBJS += $(ISAC_OBJ) $(HSCX_OBJ) $(ISAR_OBJ) $(JADE_OBJ)
|
||||
O_OBJS += $(HFC_OBJ) $(HFC_2BDS0) $(W6692_OBJ) $(ICC_OBJ)
|
||||
O_OBJS += $(HFC_OBJ) $(HFC_2BDS0) $(W6692_OBJ) $(NETJ_OBJ) $(ICC_OBJ)
|
||||
OX_OBJS += config.o
|
||||
|
||||
O_TARGET :=
|
||||
|
|
@ -214,10 +217,9 @@ include $(TOPDIR)/Rules.make
|
|||
|
||||
MD5FILES += isac.c isdnl1.c isdnl2.c isdnl3.c \
|
||||
tei.c callc.c cert.c l3dss1.c l3_1tr6.c \
|
||||
elsa.c diva.c
|
||||
elsa.c diva.c sedlbauer.c
|
||||
|
||||
CERT = $(shell md5sum -c md5sums.asc >> /dev/null;echo $$?)
|
||||
|
||||
cert.o: $(MD5FILES) md5sums.asc
|
||||
$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -D CERTIFICATION=$(CERT) -c -o cert.o cert.c
|
||||
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@
|
|||
* 35 HFC 2BDS0 PCI none
|
||||
* 36 Winbond 6692 PCI none
|
||||
* 37 HFC 2BDS0 S+/SP p0=irq p1=iobase
|
||||
* 38 Travers Technologies NETjet-U PCI card
|
||||
* 38 Travers Technologies NETspider-U PCI card
|
||||
*
|
||||
* protocol can be either ISDN_PTYPE_EURO or ISDN_PTYPE_1TR6 or ISDN_PTYPE_NI1
|
||||
*
|
||||
|
|
@ -84,7 +84,7 @@ const char *CardType[] =
|
|||
"AMD 7930", "NICCY", "S0Box", "AVM A1 (PCMCIA)", "AVM Fritz PnP/PCI",
|
||||
"Sedlbauer Speed Fax +", "Siemens I-Surf", "Acer P10", "HST Saphir",
|
||||
"Telekom A4T", "Scitel Quadro", "Gazel", "HFC 2BDS0 PCI", "Winbond 6692",
|
||||
"HFC 2BDS0 SX", "NETjet-U",
|
||||
"HFC 2BDS0 SX", "NETspider-U",
|
||||
};
|
||||
|
||||
void HiSax_closecard(int cardnr);
|
||||
|
|
@ -449,9 +449,9 @@ HiSaxVersion(void))
|
|||
|
||||
printk(KERN_INFO "HiSax: Linux Driver for passive ISDN cards\n");
|
||||
#ifdef MODULE
|
||||
printk(KERN_INFO "HiSax: Version 3.4 (module)\n");
|
||||
printk(KERN_INFO "HiSax: Version 3.5 (module)\n");
|
||||
#else
|
||||
printk(KERN_INFO "HiSax: Version 3.4 (kernel)\n");
|
||||
printk(KERN_INFO "HiSax: Version 3.5 (kernel)\n");
|
||||
#endif
|
||||
strcpy(tmp, l1_revision);
|
||||
printk(KERN_INFO "HiSax: Layer1 Revision %s\n", HiSax_getrev(tmp));
|
||||
|
|
|
|||
|
|
@ -2,30 +2,32 @@
|
|||
|
||||
# This are valid md5sums for certificated HiSax driver.
|
||||
# The certification is valid only if the md5sums of all files match.
|
||||
# The certification is valid only for ELSA QuickStep cards and
|
||||
# Eicon Technology Diva 2.01 PCI cards in the moment.
|
||||
# The certification is valid only for ELSA Microlink PCI,
|
||||
# Eicon Technology Diva 2.01 PCI and Sedlbauer SpeedFax +
|
||||
# cards in the moment.
|
||||
# Read ../../../Documentation/isdn/HiSax.cert for more informations.
|
||||
#
|
||||
2e1f5b05d71808b3e7086628200f849d isac.c
|
||||
6184db1fd62c931e52687dd3b9dff2d7 isdnl1.c
|
||||
c68c5f1ef7784794977cae44ca9dedda isdnl2.c
|
||||
d7c1a314961faa32958e471eb4d36271 isdnl3.c
|
||||
e7b238aa3dc7f0fdf1937b0af6e4d004 tei.c
|
||||
029df93c8346733d88088d0d66d60068 callc.c
|
||||
bf9605b36429898f7be6630034e83230 cert.c
|
||||
fb9b840be420995fb5408a994892da11 l3dss1.c
|
||||
9702aa18e245fe097db31a0e0a066b5c l3_1tr6.c
|
||||
b77664080ae1dfe063922cecf26287c9 elsa.c
|
||||
7e2d29b7bd37f9c2e063c9a24fab283a diva.c
|
||||
6054f869e005b722428635c079ca3931 isac.c
|
||||
d3cb83a85bb766bdf60b658b8d88e884 isdnl1.c
|
||||
7b92aed462df57c67bee108e75dcb3da isdnl2.c
|
||||
5ddb773ba6b3b9503553348c9be78b80 isdnl3.c
|
||||
6ec1fc92d3a11d6c7850341201c28784 tei.c
|
||||
8074393a4324f36c79cf266b4e022577 callc.c
|
||||
a1834e9b2ec068440cff2e899eff4710 cert.c
|
||||
d0593aafc67f7a25ed23cdb3f6bb3c96 l3dss1.c
|
||||
16ce2872757e87d1f8c770e091af2608 l3_1tr6.c
|
||||
df5467d16a10998e930837b468796aa6 elsa.c
|
||||
852a107bee885c03ea3e43086bc8c6cf diva.c
|
||||
de266f6f40f0e432affbb2f544258283 sedlbauer.c
|
||||
# end of md5sums
|
||||
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: 2.6.3i
|
||||
Charset: noconv
|
||||
|
||||
iQCVAwUBOVX6FDpxHvX/mS9tAQFFMgP/XGGkKn58d1jFNv6WGVZavIhwDslDwYWX
|
||||
+wT4qdSHnkEXh5WAMPHLLj6gK93KL4fOs01CU2LHFaTUsWYivhUtVa/wuoYyw90F
|
||||
fEaevgn/K+7tbK8lIpTgbc027KsXJT5ePP0l4OFmvwSKDDkkPp0P+UfNPtR35eXG
|
||||
KSIKA5TZXWM=
|
||||
=2dcy
|
||||
iQCVAwUBOVdN9jpxHvX/mS9tAQFsewQAgASx47gOFDj8/hDfEiCNhBXtCI6NmIQC
|
||||
jkZFBf1HE2Qe2WA5Dj/cmuthwllWk7pNXOdAwdSzKYVZBn3yDwTKaduDNr89zF5b
|
||||
knqPX08F6ziZBJ5fqladk3P9JMqJCbTo3a5eimW5brxcJhuhBlHyzlXnFdpzlCeR
|
||||
36FeOF2B+R4=
|
||||
=Areb
|
||||
-----END PGP SIGNATURE-----
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ netjet_u_interrupt(int intno, void *dev_id, struct pt_regs *regs)
|
|||
long flags;
|
||||
|
||||
if (!cs) {
|
||||
printk(KERN_WARNING "NETjet-U: Spurious interrupt!\n");
|
||||
printk(KERN_WARNING "NETspider-U: Spurious interrupt!\n");
|
||||
return;
|
||||
}
|
||||
if (!((sval = bytein(cs->hw.njet.base + NETJET_IRQSTAT1)) &
|
||||
|
|
@ -156,7 +156,7 @@ setup_netjet_u(struct IsdnCard *card))
|
|||
#error "not running on big endian machines now"
|
||||
#endif
|
||||
strcpy(tmp, NETjet_U_revision);
|
||||
printk(KERN_INFO "HiSax: Traverse Tech. NETjet-U driver Rev. %s\n", HiSax_getrev(tmp));
|
||||
printk(KERN_INFO "HiSax: Traverse Tech. NETspider-U driver Rev. %s\n", HiSax_getrev(tmp));
|
||||
if (cs->typ != ISDN_CTYPE_NETJET_U)
|
||||
return(0);
|
||||
test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags);
|
||||
|
|
@ -168,7 +168,7 @@ setup_netjet_u(struct IsdnCard *card))
|
|||
#ifdef COMPAT_HAS_NEW_PCI
|
||||
|
||||
if (!pci_present()) {
|
||||
printk(KERN_ERR "Netjet: no PCI bus present\n");
|
||||
printk(KERN_ERR "NETspider-U: no PCI bus present\n");
|
||||
return(0);
|
||||
}
|
||||
if ((dev_netjet = pci_find_device(PCI_VENDOR_ID_TIGERJET,
|
||||
|
|
@ -177,16 +177,16 @@ setup_netjet_u(struct IsdnCard *card))
|
|||
return(0);
|
||||
cs->irq = dev_netjet->irq;
|
||||
if (!cs->irq) {
|
||||
printk(KERN_WARNING "NETjet-U: No IRQ for PCI card found\n");
|
||||
printk(KERN_WARNING "NETspider-U: No IRQ for PCI card found\n");
|
||||
return(0);
|
||||
}
|
||||
cs->hw.njet.base = pci_resource_start_io(dev_netjet, 0);
|
||||
if (!cs->hw.njet.base) {
|
||||
printk(KERN_WARNING "NETjet-U: No IO-Adr for PCI card found\n");
|
||||
printk(KERN_WARNING "NETspider-U: No IO-Adr for PCI card found\n");
|
||||
return(0);
|
||||
}
|
||||
} else {
|
||||
printk(KERN_WARNING "NETjet-U: No PCI card found\n");
|
||||
printk(KERN_WARNING "NETspider-U: No PCI card found\n");
|
||||
return(0);
|
||||
}
|
||||
#else
|
||||
|
|
@ -209,16 +209,16 @@ setup_netjet_u(struct IsdnCard *card))
|
|||
break;
|
||||
}
|
||||
if (!found) {
|
||||
printk(KERN_WARNING "NETjet-U: No PCI card found\n");
|
||||
printk(KERN_WARNING "NETspider-U: No PCI card found\n");
|
||||
return(0);
|
||||
}
|
||||
pci_index++;
|
||||
if (!pci_irq) {
|
||||
printk(KERN_WARNING "NETjet-U: No IRQ for PCI card found\n");
|
||||
printk(KERN_WARNING "NETspider-U: No IRQ for PCI card found\n");
|
||||
return(0);
|
||||
}
|
||||
if (!pci_ioaddr) {
|
||||
printk(KERN_WARNING "NETjet-U: No IO-Adr for PCI card found\n");
|
||||
printk(KERN_WARNING "NETspider-U: No IO-Adr for PCI card found\n");
|
||||
return(0);
|
||||
}
|
||||
cs->hw.njet.base = pci_ioaddr & PCI_BASE_ADDRESS_IO_MASK;
|
||||
|
|
@ -271,8 +271,8 @@ setup_netjet_u(struct IsdnCard *card))
|
|||
}
|
||||
#else
|
||||
|
||||
printk(KERN_WARNING "NETjet-U: NO_PCI_BIOS\n");
|
||||
printk(KERN_WARNING "NETjet-U: unable to config NETJET-U PCI\n");
|
||||
printk(KERN_WARNING "NETspider-U: NO_PCI_BIOS\n");
|
||||
printk(KERN_WARNING "NETspider-U: unable to config NETspider-U PCI\n");
|
||||
return (0);
|
||||
|
||||
#endif /* CONFIG_PCI */
|
||||
|
|
@ -280,7 +280,7 @@ setup_netjet_u(struct IsdnCard *card))
|
|||
bytecnt = 256;
|
||||
|
||||
printk(KERN_INFO
|
||||
"NETjet-U: PCI card configured at 0x%x IRQ %d\n",
|
||||
"NETspider-U: PCI card configured at 0x%x IRQ %d\n",
|
||||
cs->hw.njet.base, cs->irq);
|
||||
if (check_region(cs->hw.njet.base, bytecnt)) {
|
||||
printk(KERN_WARNING
|
||||
|
|
@ -303,6 +303,6 @@ setup_netjet_u(struct IsdnCard *card))
|
|||
cs->cardmsg = &NETjet_U_card_msg;
|
||||
cs->irq_func = &netjet_u_interrupt;
|
||||
cs->irq_flags |= SA_SHIRQ;
|
||||
ICCVersion(cs, "NETjet-U:");
|
||||
ICCVersion(cs, "NETspider-U:");
|
||||
return (1);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue