Merge with 2.4.0-test7.

5 files changed, 60 insertions, 18 deletions

diff --git a/Documentation/isdn/README b/Documentation/isdn/README
index 0d3b0b023..6df4d2bb9 100644
--- a/Documentation/isdn/README
+++ b/Documentation/isdn/README
@@ -242,7 +242,7 @@ README for the ISDN-subsystem
                                       0 = transparent
                                       1 = transparent with audio features (e.g. DSP)
                                       2 = Fax G3 Class 2 commands (S14 has to be set to 11)
-                                      2 = Fax G3 Class 1 commands (S14 has to be set to 11)
+                                      3 = Fax G3 Class 1 commands (S14 has to be set to 11)
              16   250       Send-Packet-size/16
              17   8         Window-size (not yet implemented)
              18   4         Bit coded register, Service-Octet-1 to accept,
diff --git a/Documentation/isdn/README.HiSax b/Documentation/isdn/README.HiSax
index fb64b1ecd..2dddf96ec 100644
--- a/Documentation/isdn/README.HiSax
+++ b/Documentation/isdn/README.HiSax
@@ -53,7 +53,7 @@ Sedlbauer Speed Star/Speed Star2 (PCMCIA)
 Sedlbauer ISDN-Controller PC/104
 USR Sportster internal TA (compatible Stollmann tina-pp V3)
 ith Kommunikationstechnik GmbH MIC 16 ISA card
-Traverse Technologie NETjet PCI S0 card
+Traverse Technologie NETjet PCI S0 card and NETspider U card
 Dr. Neuhaus Niccy PnP/PCI
 Siemens I-Surf 1.0
 Siemens I-Surf 2.0 (with IPAC, try type 12 asuscom) 
@@ -134,7 +134,12 @@ mem=,0xd0000. See example 6 below.
 
 The parameter for the D-Channel protocol may be omitted if you selected the
 correct one during kernel config. Valid values are "1" for German 1TR6,
-"2" for EDSS1 (Euro ISDN) and "3" for leased lines (no D-Channel).
+"2" for EDSS1 (Euro ISDN), "3" for leased lines (no D-Channel) and "4"
+for US NI1.
+With US NI1 you have to include your SPID into the MSN setting in the form
+<MSN>:<SPID> for example (your phonenumber is 1234 your SPID 5678):
+AT&E1234:5678                       on ttyI interfaces
+isdnctrl eaz ippp0 1234:5678        on network devices
 
 The Creatix/Teles PnP cards use io1= and io2= instead of io= for specifying
 the I/O addresses of the ISAC and HSCX chips, respectively.
@@ -186,8 +191,8 @@ 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)
-
+   37	HFC 2BDS0 S+, SP/PCMCIA  irq,io (pcmcia must be set with cardmgr)
+   38	NETspider U PCI card     none
 
 At the moment IRQ sharing is only possible with PCI cards. Please make sure
 that your IRQ is free and enabled for ISA use.
@@ -291,7 +296,9 @@ 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
+   37	HFC 2BDS0 S+,SP/PCMCIA  ONLY WORKS AS A MODULE !
+   38	NETspider U PCI card    none
+
 
 Running the driver
 ------------------
diff --git a/Documentation/isdn/README.eicon b/Documentation/isdn/README.eicon
index 87b40c6dd..a77542a67 100644
--- a/Documentation/isdn/README.eicon
+++ b/Documentation/isdn/README.eicon
@@ -1,4 +1,4 @@
-$Id: README.eicon,v 1.7 2000/03/06 16:38:43 armin Exp $
+$Id: README.eicon,v 1.9 2000/06/08 08:50:25 armin Exp $
 
 (c) 1999,2000 Armin Schindler (mac@melware.de)
 (c) 1999,2000 Cytronics & Melware (info@melware.de)
@@ -40,6 +40,7 @@ DIVA Server family
 ------------------
 - DIVA Server BRI/PCI 2M
 - DIVA Server PRI/PCI 2M (9M 23M 30M)
+- DIVA Server 4BRI/PCI
 	supported functions of onboard DSPs:
 	- analog modem
 	- fax group 2/3 (Fax Class 2 commands)
@@ -80,7 +81,7 @@ Example for loading and starting a BRI card with E-DSS1 Protocol.
 
 Example for a BRI card with E-DSS1 Protocol with PtP configuration.
 
-	eiconctrl [-d DriverId] load etsi -n -t0 -s1
+	eiconctrl [-d DriverId] load etsi -n -t1 -s1
 
 
 Example for loading and starting a PRI card with E-DSS1 Protocol.
@@ -99,6 +100,18 @@ Just use "eiconctrl isdnlog on" and the driver will generate
 the necessary D-Channel traces for isdnlog.
 
 
+FILECHECK:
+A part of the eicon driver source code files are provided
+by Eicon Technology. In order to get the best support from Eicon,
+these files are tested with a checksum, just to know if the files
+were modified. This does *not* mean, you are not allowed to modify the
+driver. If you want to improve the driver or you fix a bug, please do
+so and let me (or Eicon) know, about the necessary changes. So
+every user knows, if the driver he uses is modified or checked with
+Eicon files. When the driver has been loaded, in the syslog you will
+find something like "verified" or "modified" right after the version.
+
+
 Thanks to 
 	Deutsche Mailbox Saar-Lor-Lux GmbH
 	for sponsoring and testing fax
@@ -113,3 +126,4 @@ Have fun !
 Armin Schindler
 mac@melware.de
 http://www.melware.de
+
diff --git a/Documentation/isdn/README.fax b/Documentation/isdn/README.fax
index eeff9ce9f..5314958a8 100644
--- a/Documentation/isdn/README.fax
+++ b/Documentation/isdn/README.fax
@@ -24,6 +24,9 @@ Supported ISDN-Cards
 Eicon DIVA Server BRI/PCI
 	- full support with both B-channels.
 
+Eicon DIVA Server 4BRI/PCI
+	- full support with all B-channels.
+
 Eicon DIVA Server PRI/PCI
 	- full support on amount of B-channels
 		depending on DSPs on board.
diff --git a/Documentation/isdn/README.hysdn b/Documentation/isdn/README.hysdn
index 9cfac4626..90a5e8b71 100644
--- a/Documentation/isdn/README.hysdn
+++ b/Documentation/isdn/README.hysdn
@@ -1,9 +1,13 @@
-$Id: README.hysdn,v 1.1 2000/02/10 19:46:15 werner Exp $
+$Id: README.hysdn,v 1.3 2000/08/06 09:22:51 armin Exp $
 The hysdn driver has been written by
 by Werner Cornelius (werner@isdn4linux.de or werner@titro.de) 
 for Hypercope GmbH Aachen Germany. Hypercope agreed to publish this driver
 under the GNU Public License.
 
+The CAPI 2.0-support was added by Ulrich Albrecht (ualbrecht@hypercope.de)
+for Hypercope GmbH Aachen, Germany.
+
+
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
@@ -41,15 +45,19 @@ Table of contents
    enable ISDN support in the kernel config and support for HYSDN cards in
    the active cards submenu. The driver may only be compiled and used if 
    support for loadable modules and the process filesystem have been enabled.
-   No other ISDN options need to be enabled for these cards.
 
-   Up to now these cards do not use or require the standard isdn interface
-   module (isdn.o), but registers itself as an ethernet card. All necessary
+   These cards provide two different interfaces to the kernel. Without the
+   optional CAPI 2.0 support, they register as ethernet card. IP-routing
+   to a ISDN-destination is performed on the card itself. All necessary
    handlers for various protocols like ppp and others as well as config info
    and firmware may be fetched from Hypercopes WWW-Site www.hypercope.de.
-   The driver has been included in the i4l tree as a CAPI compliant module
-   is under development and will be connected to the standard i4l modules
-   additionally.
+
+   With CAPI 2.0 support enabled, the card can also be used as a CAPI 2.0 
+   compliant devices with either CAPI 2.0 applications 
+   (check isdn4k-utils) or -using the capidrv module- as a regular
+   isdn4linux device. This is done via the same mechanism as with the 
+   active AVM cards and in fact uses the same module.
+   
 
 2. Loading/Unloading the driver
 
@@ -58,7 +66,14 @@ Table of contents
    If a loaded driver shall be unloaded all open files in the /proc/net/hysdn
    subdir need to be closed and all ethernet interfaces allocated by this 
    driver must be shut down. Otherwise the module counter will avoid a module
-   unload. 
+   unload.
+   
+   If you are using the CAPI 2.0-interface, make sure to load/modprobe the
+   kernelcapi-module first.
+
+   If you plan to use the capidrv-link to isdn4linux, make sure to load
+   capidrv.o after all modules using this driver (i.e. after hysdn and
+   any avm-specific modules).
 
 3. Entries in the /proc filesystem
 
@@ -160,8 +175,11 @@ Table of contents
 6. Where to get additional info and help
 
    If you have any problems concerning the driver or configuration contact 
-   the Hypercope support team (www.hypercope.de) and or the author 
-   Werner Cornelius (werner@isdn4linux or cornelius@titro.de)
+   the Hypercope support team (support@hypercope.de) and or the authors
+   Werner Cornelius (werner@isdn4linux or cornelius@titro.de) or
+   Ulrich Albrecht (ualbrecht@hypercope.de).
+
+