updating isdn4bsd to beta version 0.83

4 files changed, 64 insertions, 32 deletions

diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 031b583..d934efd 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.620 1999/07/26 05:47:17 cracauer Exp $
+#	$Id: LINT,v 1.621 1999/08/04 17:29:33 green Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -1842,7 +1842,7 @@ options AVM_A1
 options USR_STI
 #device isic0 at isa? port 0x268 irq 5 flags 7
 #
-# ITK ix1 Micro
+# ITK ix1 Micro ( < V.3, non-PnP version )
 options ITKIX1
 #device isic0 at isa? port 0x398 irq 10 flags 18
 #
@@ -1877,6 +1877,18 @@ options DYNALINK
 options ELSA_QS1ISA
 #device	isic0 at isa? port ? irq ?
 #
+# ITK ix1 Micro ( V.3, PnP version )
+options "ITKIX1"
+#device isic0 at isa? port ? irq ?
+#
+# AVM Fritz!Card PnP
+options "AVM_PNP"  
+#device isic0 at isa? port ? irq ?
+#
+# Siemens I-Surf 2.0 
+options "SIEMENS_ISURF2"  
+#device isic0 at isa? port ? irq ?
+#
 # PCI-Cards:
 # ----------
 #
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 031b583..d934efd 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.620 1999/07/26 05:47:17 cracauer Exp $
+#	$Id: LINT,v 1.621 1999/08/04 17:29:33 green Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -1842,7 +1842,7 @@ options AVM_A1
 options USR_STI
 #device isic0 at isa? port 0x268 irq 5 flags 7
 #
-# ITK ix1 Micro
+# ITK ix1 Micro ( < V.3, non-PnP version )
 options ITKIX1
 #device isic0 at isa? port 0x398 irq 10 flags 18
 #
@@ -1877,6 +1877,18 @@ options DYNALINK
 options ELSA_QS1ISA
 #device	isic0 at isa? port ? irq ?
 #
+# ITK ix1 Micro ( V.3, PnP version )
+options "ITKIX1"
+#device isic0 at isa? port ? irq ?
+#
+# AVM Fritz!Card PnP
+options "AVM_PNP"  
+#device isic0 at isa? port ? irq ?
+#
+# Siemens I-Surf 2.0 
+options "SIEMENS_ISURF2"  
+#device isic0 at isa? port ? irq ?
+#
 # PCI-Cards:
 # ----------
 #
diff --git a/sys/i386/conf/files.i386 b/sys/i386/conf/files.i386
index 2e9b459..e6c065c 100644
--- a/sys/i386/conf/files.i386
+++ b/sys/i386/conf/files.i386
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-#	$Id: files.i386,v 1.254 1999/07/26 07:43:20 phk Exp $
+#	$Id: files.i386,v 1.255 1999/07/29 01:49:17 msmith Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -335,31 +335,34 @@ i386/linux/linux_stats.c	optional	compat_linux
 i386/linux/linux_sysent.c	optional	compat_linux
 i386/linux/linux_sysvec.c	optional	compat_linux
 i386/linux/linux_util.c		optional	compat_linux
-i4b/layer1/i4b_avm_a1.c		optional	isic
-i4b/layer1/i4b_avm_fritz_pci.c	optional	isic
-i4b/layer1/i4b_avm_fritz_pcmcia.c optional	isic
-i4b/layer1/i4b_bchan.c		optional	isic
-i4b/layer1/i4b_ctx_s0P.c	optional	isic
-i4b/layer1/i4b_drn_ngo.c	optional	isic
-i4b/layer1/i4b_dynalink.c	optional	isic
-i4b/layer1/i4b_elsa_qs1i.c	optional	isic
-i4b/layer1/i4b_elsa_qs1p.c	optional	isic
-i4b/layer1/i4b_hscx.c		optional	isic
-i4b/layer1/i4b_isac.c		optional	isic
-i4b/layer1/i4b_isic.c		optional	isic
-i4b/layer1/i4b_isic_isa.c	optional	isic
-i4b/layer1/i4b_isic_pci.c	optional	isic
-i4b/layer1/i4b_isic_pcmcia.c	optional	isic
-i4b/layer1/i4b_isic_pnp.c	optional	isic
-i4b/layer1/i4b_itk_ix1.c	optional	isic
-i4b/layer1/i4b_l1.c		optional	isic
-i4b/layer1/i4b_l1fsm.c		optional	isic
-i4b/layer1/i4b_sws.c		optional	isic
-i4b/layer1/i4b_tel_s016.c	optional	isic
-i4b/layer1/i4b_tel_s0163.c	optional	isic
-i4b/layer1/i4b_tel_s08.c	optional	isic
-i4b/layer1/i4b_tel_s0P.c	optional	isic
-i4b/layer1/i4b_usr_sti.c	optional	isic
+i4b/layer1/i4b_asuscom_ipac.c	optional	isic	device-driver
+i4b/layer1/i4b_avm_a1.c		optional	isic	device-driver
+i4b/layer1/i4b_avm_fritz_pci.c	optional	isic	device-driver
+i4b/layer1/i4b_avm_fritz_pcmcia.c optional	isic	device-driver
+i4b/layer1/i4b_avm_fritz_pnp.c	optional	isic	device-driver
+i4b/layer1/i4b_bchan.c		optional	isic	device-driver
+i4b/layer1/i4b_ctx_s0P.c	optional	isic	device-driver
+i4b/layer1/i4b_drn_ngo.c	optional	isic	device-driver
+i4b/layer1/i4b_dynalink.c	optional	isic	device-driver
+i4b/layer1/i4b_elsa_qs1i.c	optional	isic	device-driver
+i4b/layer1/i4b_elsa_qs1p.c	optional	isic	device-driver
+i4b/layer1/i4b_hscx.c		optional	isic	device-driver
+i4b/layer1/i4b_isac.c		optional	isic	device-driver
+i4b/layer1/i4b_isic.c		optional	isic	device-driver
+i4b/layer1/i4b_isic_isa.c	optional	isic	device-driver
+i4b/layer1/i4b_isic_pci.c	optional	isic	device-driver
+i4b/layer1/i4b_isic_pcmcia.c	optional	isic	device-driver
+i4b/layer1/i4b_isic_pnp.c	optional	isic	device-driver
+i4b/layer1/i4b_itk_ix1.c	optional	isic	device-driver
+i4b/layer1/i4b_l1.c		optional	isic	device-driver
+i4b/layer1/i4b_l1fsm.c		optional	isic	device-driver
+i4b/layer1/i4b_siemens_isurf.c	optional	isic	device-driver
+i4b/layer1/i4b_sws.c		optional	isic	device-driver
+i4b/layer1/i4b_tel_s016.c	optional	isic	device-driver
+i4b/layer1/i4b_tel_s0163.c	optional	isic	device-driver
+i4b/layer1/i4b_tel_s08.c	optional	isic	device-driver
+i4b/layer1/i4b_tel_s0P.c	optional	isic	device-driver
+i4b/layer1/i4b_usr_sti.c	optional	isic	device-driver
 isa/atkbd_isa.c			optional	atkbd
 isa/atkbdc_isa.c		optional	atkbdc
 isa/psm.c			optional	psm
diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386
index d7cc7b4..d3c9fb7 100644
--- a/sys/i386/conf/options.i386
+++ b/sys/i386/conf/options.i386
@@ -1,4 +1,4 @@
-#	$Id: options.i386,v 1.117 1999/06/15 13:14:43 des Exp $
+#	$Id: options.i386,v 1.118 1999/06/22 14:13:36 yokota Exp $
 
 DISABLE_PSE
 IDE_DELAY
@@ -139,6 +139,7 @@ GUS_IRQ			opt_sound.h
 
 # Video spigot
 SPIGOT_UNSECURE		opt_spigot.h
+
 # -------------------------------
 # isdn4bsd: passive ISA cards
 # -------------------------------
@@ -148,7 +149,7 @@ TEL_S0_16_3		opt_i4b.h
 AVM_A1			opt_i4b.h
 USR_STI			opt_i4b.h
 ITKIX1			opt_i4b.h
-ELSA_PCC16              opt_i4b.h
+ELSA_PCC16		opt_i4b.h
 # -------------------------------
 # isdn4bsd: passive ISA PnP cards
 # -------------------------------
@@ -157,7 +158,10 @@ DRN_NGO                 opt_i4b.h
 TEL_S0_16_3_P		opt_i4b.h
 SEDLBAUER		opt_i4b.h
 DYNALINK		opt_i4b.h
+ASUSCOM_IPAC		opt_i4b.h
 ELSA_QS1ISA		opt_i4b.h
+AVM_PNP			opt_i4b.h
+SIEMENS_ISURF2		opt_i4b.h
 # -------------------------------
 # isdn4bsd: passive PCI cards
 # -------------------------------
@@ -174,6 +178,7 @@ AVM_A1_PCMCIA		opt_i4b.h
 I4B_SMP_WORKAROUND      opt_i4b.h
 # enable VJ compression code for ipr i/f
 IPR_VJ			opt_i4b.h
+
 # -------------------------------
 # oltr: build options
 # -------------------------------