diff --git a/Documentation/Configure.help.divert.diff b/Documentation/Configure.help.divert.diff index 61aff57e..660135e8 100644 --- a/Documentation/Configure.help.divert.diff +++ b/Documentation/Configure.help.divert.diff @@ -17,6 +17,15 @@ + implemented. + CD should work in all countries if this service has been sub- + scribed. ++ ++HiSax driver for HFC-S+, HFC-SP and HFC-PCMCIA cards ++CONFIG_HISAX_HFC_SX ++ This option allows you to add support for for ISDN-cards supplied ++ with CCDs HFC-S+, HFC-SP and HFC-PCMCIA-cards with the SP chip. ++ Drivers for the very old HFC-S chip and the new busmaster HFC-PCI ++ are separate selectable drivers and not covered by this option. ++ Due to problems with cards only equipped with 8K of RAM this driver ++ only supports cards equipped with 32K RAM like CCD recommends. + ICN 2B and 4B support CONFIG_ISDN_DRV_ICN diff --git a/Documentation/isdn/README.HiSax b/Documentation/isdn/README.HiSax index ee95d85f..04167822 100644 --- a/Documentation/isdn/README.HiSax +++ b/Documentation/isdn/README.HiSax @@ -64,6 +64,7 @@ Scitel Quadro Gazel ISDN cards HFC-PCI based cards Winbond W6692 based cards +HFC-S+, HFC-SP/PCMCIA cards Note: PCF, PCF-Pro: up to now, only the ISDN part is supported PCC-8: not tested yet @@ -72,6 +73,7 @@ Note: PCF, PCF-Pro: up to now, only the ISDN part is supported Teles PCI is EXPERIMENTAL Teles S0Box is EXPERIMENTAL Eicon.Diehl Diva U interface not tested + HFC-S+, HFC-SP/PCMCIA are experimental If you know other passive cards with the Siemens chipset, please let me know. To use the PNP cards you need the isapnptools. @@ -184,6 +186,7 @@ Card types: 34 Gazel ISDN cards (PCI) none 35 HFC 2BDS0 PCI none 36 W6692 based PCI cards none + 37 HFC 2BDS0 S+, SP/PCMCIA irq,io (pcmcia must be set with cardmgr) At the moment IRQ sharing is only possible with PCI cards. Please make sure @@ -288,6 +291,7 @@ type 34 Gazel ISDN cards (PCI) no parameter 35 HFC 2BDS0 PCI no parameter 36 W6692 based PCI cards none + 37 HFC 2BDS0 S+,SP/PCMCIA pa=irq, pb=io Running the driver ------------------ diff --git a/drivers/isdn/Config.in b/drivers/isdn/Config.in index 08610e8c..db52d524 100644 --- a/drivers/isdn/Config.in +++ b/drivers/isdn/Config.in @@ -21,44 +21,45 @@ dep_tristate ' isdnloop support' CONFIG_ISDN_DRV_LOOP $CONFIG_ISDN dep_tristate ' PCBIT-D support' CONFIG_ISDN_DRV_PCBIT $CONFIG_ISDN dep_tristate ' HiSax SiemensChipSet driver support' CONFIG_ISDN_DRV_HISAX $CONFIG_ISDN if [ "$CONFIG_ISDN_DRV_HISAX" != "n" ]; then - bool ' HiSax Support for EURO/DSS1' CONFIG_HISAX_EURO - if [ "$CONFIG_HISAX_EURO" != "n" ]; then - bool ' Support for german chargeinfo' CONFIG_DE_AOC - bool ' Disable sending complete' CONFIG_HISAX_NO_SENDCOMPLETE - bool ' Disable sending low layer compatibility' CONFIG_HISAX_NO_LLC - fi - bool ' HiSax Support for german 1TR6' CONFIG_HISAX_1TR6 - bool ' HiSax Support for Teles 16.0/8.0' CONFIG_HISAX_16_0 - bool ' HiSax Support for Teles 16.3 or PNP or PCMCIA' CONFIG_HISAX_16_3 - bool ' HiSax Support for Teles PCI' CONFIG_HISAX_TELESPCI - bool ' HiSax Support for Teles S0Box' CONFIG_HISAX_S0BOX - bool ' HiSax Support for AVM A1 (Fritz)' CONFIG_HISAX_AVM_A1 - bool ' HiSax Support for AVM PnP/PCI (Fritz!PnP/PCI)' CONFIG_HISAX_FRITZPCI - bool ' HiSax Support for AVM A1 PCMCIA (Fritz)' CONFIG_HISAX_AVM_A1_PCMCIA - bool ' HiSax Support for Elsa cards' CONFIG_HISAX_ELSA - bool ' HiSax Support for ITK ix1-micro Revision 2' CONFIG_HISAX_IX1MICROR2 - bool ' HiSax Support for Eicon.Diehl Diva cards' CONFIG_HISAX_DIEHLDIVA - bool ' HiSax Support for ASUSCOM cards' CONFIG_HISAX_ASUSCOM - bool ' HiSax Support for TELEINT cards' CONFIG_HISAX_TELEINT - bool ' HiSax Support for HFC-S based cards' CONFIG_HISAX_HFCS - bool ' HiSax Support for Sedlbauer cards' CONFIG_HISAX_SEDLBAUER - bool ' HiSax Support for USR Sportster internal TA' CONFIG_HISAX_SPORTSTER - bool ' HiSax Support for MIC card' CONFIG_HISAX_MIC - bool ' HiSax Support for NETjet card' CONFIG_HISAX_NETJET - bool ' HiSax Support for Niccy PnP/PCI card' CONFIG_HISAX_NICCY - bool ' HiSax Support for Siemens I-Surf card' CONFIG_HISAX_ISURF - bool ' HiSax Support for HST Saphir card' CONFIG_HISAX_HSTSAPHIR - bool ' HiSax Support for Telekom A4T card' CONFIG_HISAX_BKM_A4T - bool ' HiSax Support for Scitel Quadro card' CONFIG_HISAX_SCT_QUADRO - bool ' HiSax Support for Gazel cards' CONFIG_HISAX_GAZEL - bool ' HiSax Support for HFC PCI-Bus cards' CONFIG_HISAX_HFC_PCI - bool ' HiSax Support for Winbond W6692 based cards' CONFIG_HISAX_W6692 - if [ "$CONFIG_EXPERIMENTAL" != "n" ]; then -# bool ' HiSax Support for TESTEMULATOR (EXPERIMENTAL)' CONFIG_HISAX_TESTEMU - if [ "$ARCH" = "sparc" -o "$ARCH" = "sparc64" ]; then - bool ' HiSax Support for Am7930' CONFIG_HISAX_AMD7930 - fi - fi + bool 'HiSax Support for EURO/DSS1' CONFIG_HISAX_EURO + if [ "$CONFIG_HISAX_EURO" != "n" ]; then + bool 'Support for german chargeinfo' CONFIG_DE_AOC + bool 'Disable sending complete' CONFIG_HISAX_NO_SENDCOMPLETE + bool 'Disable sending low layer compatibility' CONFIG_HISAX_NO_LLC + fi + bool 'HiSax Support for german 1TR6' CONFIG_HISAX_1TR6 + bool 'HiSax Support for Teles 16.0/8.0' CONFIG_HISAX_16_0 + bool 'HiSax Support for Teles 16.3 or PNP or PCMCIA' CONFIG_HISAX_16_3 + bool 'HiSax Support for Teles PCI' CONFIG_HISAX_TELESPCI + bool 'HiSax Support for Teles S0Box' CONFIG_HISAX_S0BOX + bool 'HiSax Support for AVM A1 (Fritz)' CONFIG_HISAX_AVM_A1 + bool 'HiSax Support for AVM PnP/PCI (Fritz!PnP/PCI)' CONFIG_HISAX_FRITZPCI + bool 'HiSax Support for AVM A1 PCMCIA (Fritz)' CONFIG_HISAX_AVM_A1_PCMCIA + bool 'HiSax Support for Elsa cards' CONFIG_HISAX_ELSA + bool 'HiSax Support for ITK ix1-micro Revision 2' CONFIG_HISAX_IX1MICROR2 + bool 'HiSax Support for Eicon.Diehl Diva cards' CONFIG_HISAX_DIEHLDIVA + bool 'HiSax Support for ASUSCOM cards' CONFIG_HISAX_ASUSCOM + bool 'HiSax Support for TELEINT cards' CONFIG_HISAX_TELEINT + bool 'HiSax Support for HFC-S based cards' CONFIG_HISAX_HFCS + bool 'HiSax Support for Sedlbauer cards' CONFIG_HISAX_SEDLBAUER + bool 'HiSax Support for USR Sportster internal TA' CONFIG_HISAX_SPORTSTER + bool 'HiSax Support for MIC card' CONFIG_HISAX_MIC + bool 'HiSax Support for NETjet card' CONFIG_HISAX_NETJET + bool 'HiSax Support for Niccy PnP/PCI card' CONFIG_HISAX_NICCY + bool 'HiSax Support for Siemens I-Surf card' CONFIG_HISAX_ISURF + bool 'HiSax Support for HST Saphir card' CONFIG_HISAX_HSTSAPHIR + bool 'HiSax Support for Telekom A4T card' CONFIG_HISAX_BKM_A4T + bool 'HiSax Support for Scitel Quadro card' CONFIG_HISAX_SCT_QUADRO + bool 'HiSax Support for Gazel cards' CONFIG_HISAX_GAZEL + bool 'HiSax Support for HFC PCI-Bus cards' CONFIG_HISAX_HFC_PCI + bool 'HiSax Support for Winbond W6692 based cards' CONFIG_HISAX_W6692 + if [ "$CONFIG_EXPERIMENTAL" != "n" ]; then + bool 'HiSax Support for HFC-S+, HFC-SP, HFC-PCMCIA cards' CONFIG_HISAX_HFC_SX +# bool 'HiSax Support for TESTEMULATOR (EXPERIMENTAL)' CONFIG_HISAX_TESTEMU + if [ "$ARCH" = "sparc" -o "$ARCH" = "sparc64" ]; then + bool 'HiSax Support for Am7930' CONFIG_HISAX_AMD7930 + fi + fi fi if [ "$CONFIG_EXPERIMENTAL" != "n" ]; then dep_tristate ' Spellcaster support (EXPERIMENTAL)' CONFIG_ISDN_DRV_SC $CONFIG_ISDN diff --git a/drivers/isdn/hisax/Makefile b/drivers/isdn/hisax/Makefile index e37d9c40..7bc340de 100644 --- a/drivers/isdn/hisax/Makefile +++ b/drivers/isdn/hisax/Makefile @@ -137,6 +137,10 @@ ifeq ($(CONFIG_HISAX_HFC_PCI),y) HFC_2BDS0 += hfc_pci.o endif +ifeq ($(CONFIG_HISAX_HFC_SX),y) + HFC_2BDS0 += hfc_sx.o +endif + ifeq ($(CONFIG_HISAX_NICCY),y) O_OBJS += niccy.o ISAC_OBJ := isac.o