update to i4b version 0.95.04

3 files changed, 116 insertions, 66 deletions

diff --git a/sys/conf/files b/sys/conf/files
index 81a45de..d5737a2 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -393,42 +393,52 @@ gnu/ext2fs/ext2_lookup.c	optional ext2fs
 gnu/ext2fs/ext2_subr.c		optional ext2fs
 gnu/ext2fs/ext2_vfsops.c	optional ext2fs
 gnu/ext2fs/ext2_vnops.c		optional ext2fs
-# device drivers
-i4b/driver/i4b_trace.c	 count i4btrc
-i4b/driver/i4b_rbch.c	 count i4brbch
-i4b/driver/i4b_tel.c	 count i4btel
-i4b/driver/i4b_ipr.c	 count i4bipr
-i4b/driver/i4b_ctl.c     count i4bctl
-i4b/driver/i4b_isppp.c   count i4bisppp
-net/if_spppsubr.c        count sppp
-# needed by i4bipr
-net/slcompress.c         optional i4bipr
-# tina-dd control driver
-i4b/tina-dd/i4b_tina_dd.c count tina
-# support
-i4b/layer2/i4b_mbuf.c	 optional i4btrc
-# Q.921 handler
-i4b/layer2/i4b_l2.c	 count i4bq921
-i4b/layer2/i4b_l2fsm.c	 optional i4bq921
-i4b/layer2/i4b_uframe.c	 optional i4bq921
-i4b/layer2/i4b_tei.c	 optional i4bq921
-i4b/layer2/i4b_sframe.c	 optional i4bq921
-i4b/layer2/i4b_iframe.c	 optional i4bq921
-i4b/layer2/i4b_l2timer.c optional i4bq921
-i4b/layer2/i4b_util.c	 optional i4bq921
-i4b/layer2/i4b_lme.c	 optional i4bq921
-# Q.931 handler
-i4b/layer3/i4b_q931.c	 count i4bq931
-i4b/layer3/i4b_l3fsm.c	 optional i4bq931
-i4b/layer3/i4b_l3timer.c optional i4bq931
-i4b/layer3/i4b_l2if.c	 optional i4bq931
-i4b/layer3/i4b_l4if.c	 optional i4bq931
-i4b/layer3/i4b_q932fac.c optional i4bq931
-# isdn device driver, interface to i4bd
-i4b/layer4/i4b_i4bdrv.c	 optional i4b
-i4b/layer4/i4b_l4.c	 count i4b
-i4b/layer4/i4b_l4mgmt.c	 optional i4b
-i4b/layer4/i4b_l4timer.c optional i4b
+#
+# isdn4bsd device drivers
+#
+i4b/driver/i4b_trace.c		count i4btrc
+i4b/driver/i4b_rbch.c		count i4brbch
+i4b/driver/i4b_tel.c		count i4btel
+i4b/driver/i4b_ipr.c		count i4bipr
+net/slcompress.c		optional i4bipr
+i4b/driver/i4b_ctl.c		count i4bctl
+i4b/driver/i4b_ing.c		count i4bing
+i4b/driver/i4b_isppp.c		count i4bisppp
+i4b/driver/i4b_ispppsubr.c	optional i4bisppp
+net/slcompress.c		optional i4bisppp
+#
+# isdn4bsd support
+#
+i4b/layer2/i4b_mbuf.c		optional i4btrc
+#
+# isdn4bsd Q.921 handler
+#
+i4b/layer2/i4b_l2.c		count i4bq921
+i4b/layer2/i4b_l2fsm.c		optional i4bq921
+i4b/layer2/i4b_uframe.c		optional i4bq921
+i4b/layer2/i4b_tei.c		optional i4bq921
+i4b/layer2/i4b_sframe.c		optional i4bq921
+i4b/layer2/i4b_iframe.c		optional i4bq921
+i4b/layer2/i4b_l2timer.c	optional i4bq921
+i4b/layer2/i4b_util.c		optional i4bq921
+i4b/layer2/i4b_lme.c		optional i4bq921
+#
+# isdn4bsd Q.931 handler
+#
+i4b/layer3/i4b_q931.c		count i4bq931
+i4b/layer3/i4b_l3fsm.c		optional i4bq931
+i4b/layer3/i4b_l3timer.c	optional i4bq931
+i4b/layer3/i4b_l2if.c		optional i4bq931
+i4b/layer3/i4b_l4if.c		optional i4bq931
+i4b/layer3/i4b_q932fac.c	optional i4bq931
+#
+# isdn4bsd control device driver, interface to isdnd
+#
+i4b/layer4/i4b_i4bdrv.c		count i4b
+i4b/layer4/i4b_l4.c		optional i4b
+i4b/layer4/i4b_l4mgmt.c		optional i4b
+i4b/layer4/i4b_l4timer.c	optional i4b
+#
 isa/isa_if.m		optional isa
 isa/isa_common.c	count isa
 isa/isahint.c		optional isa
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 97af22e..5624684 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -276,33 +276,74 @@ i386/pci/pci_bus.c		optional	pci
 i386/svr4/svr4_locore.s		optional	compat_svr4		\
 	dependency	"svr4_assym.h"
 i386/svr4/svr4_machdep.c	optional	compat_svr4
-i4b/layer1/i4b_asuscom_ipac.c	optional	isic
-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_avm_fritz_pnp.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_pcc16.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		count		isic
-i4b/layer1/i4b_isic_isa.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_siemens_isurf.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_usr_sti.c	optional	isic
+#
+# isdn4bsd, needed for isic | iwic | ifpi | ihfc | ifpnp
+#
+i4b/layer1/i4b_l1dmux.c         	optional        isic
+i4b/layer1/i4b_l1lib.c          	optional        isic
+i4b/layer1/i4b_l1dmux.c         	optional        iwic
+i4b/layer1/i4b_l1lib.c          	optional        iwic
+i4b/layer1/i4b_l1dmux.c         	optional        ifpi
+i4b/layer1/i4b_l1lib.c          	optional        ifpi
+i4b/layer1/i4b_l1dmux.c         	optional        ihfc
+i4b/layer1/i4b_l1lib.c          	optional        ihfc
+i4b/layer1/i4b_l1dmux.c         	optional        ifpnp
+i4b/layer1/i4b_l1lib.c          	optional        ifpnp
+#
+# isdn4bsd, isic
+#
+i4b/layer1/isic/i4b_asuscom_ipac.c	optional	isic
+i4b/layer1/isic/i4b_avm_a1.c		optional	isic
+i4b/layer1/isic/i4b_bchan.c		optional	isic
+i4b/layer1/isic/i4b_ctx_s0P.c		optional	isic
+i4b/layer1/isic/i4b_drn_ngo.c		optional	isic
+i4b/layer1/isic/i4b_dynalink.c		optional	isic
+i4b/layer1/isic/i4b_elsa_qs1i.c		optional	isic
+i4b/layer1/isic/i4b_elsa_qs1p.c		optional	isic
+i4b/layer1/isic/i4b_elsa_pcc16.c	optional	isic
+i4b/layer1/isic/i4b_hscx.c		optional	isic
+i4b/layer1/isic/i4b_isac.c		optional	isic
+i4b/layer1/isic/i4b_isic.c		count		isic
+i4b/layer1/isic/i4b_isic_isa.c		optional	isic
+i4b/layer1/isic/i4b_isic_pnp.c		optional	isic
+i4b/layer1/isic/i4b_itk_ix1.c		optional	isic
+i4b/layer1/isic/i4b_l1.c		optional	isic
+i4b/layer1/isic/i4b_l1fsm.c		optional	isic
+i4b/layer1/isic/i4b_siemens_isurf.c	optional	isic
+i4b/layer1/isic/i4b_sws.c		optional	isic
+i4b/layer1/isic/i4b_tel_s016.c		optional	isic
+i4b/layer1/isic/i4b_tel_s0163.c		optional	isic
+i4b/layer1/isic/i4b_tel_s08.c		optional	isic
+i4b/layer1/isic/i4b_usr_sti.c		optional	isic
+#
+# isdn4bsd, iwic
+#
+i4b/layer1/iwic/i4b_iwic_pci.c		count		iwic
+i4b/layer1/iwic/i4b_iwic_dchan.c	optional	iwic
+i4b/layer1/iwic/i4b_iwic_bchan.c	optional	iwic
+i4b/layer1/iwic/i4b_iwic_fsm.c		optional	iwic
+i4b/layer1/iwic/i4b_iwic_l1if.c		optional	iwic
+#
+# isdn4bsd, ifpi
+#
+i4b/layer1/ifpi/i4b_ifpi_pci.c		count		ifpi
+i4b/layer1/ifpi/i4b_ifpi_isac.c		optional	ifpi
+i4b/layer1/ifpi/i4b_ifpi_l1.c		optional	ifpi
+i4b/layer1/ifpi/i4b_ifpi_l1fsm.c	optional	ifpi
+#
+# isdn4bsd, ifpnp
+#
+i4b/layer1/ifpnp/i4b_ifpnp_avm.c	count		ifpnp
+i4b/layer1/ifpnp/i4b_ifpnp_isac.c	optional	ifpnp
+i4b/layer1/ifpnp/i4b_ifpnp_l1.c		optional	ifpnp
+i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c	optional	ifpnp
+#
+# isdn4bsd, ihfc
+#
+i4b/layer1/ihfc/i4b_ihfc_l1if.c		count		ihfc
+i4b/layer1/ihfc/i4b_ihfc_pnp.c		optional	ihfc
+i4b/layer1/ihfc/i4b_ihfc_drv.c		optional	ihfc
+#
 isa/atkbd_isa.c			optional	atkbd
 isa/atkbdc_isa.c		optional	atkbdc
 isa/fd.c			optional	fdc
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index d5d0f65..743c522 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -149,7 +149,7 @@ TEL_S0_16		opt_i4b.h
 TEL_S0_16_3		opt_i4b.h
 AVM_A1			opt_i4b.h
 USR_STI			opt_i4b.h
-#ITKIX1			opt_i4b.h
+ITKIX1			opt_i4b.h
 ELSA_PCC16		opt_i4b.h
 # -------------------------------
 # isdn4bsd: passive ISA PnP cards
@@ -158,10 +158,9 @@ CRTX_S0_P		opt_i4b.h
 DRN_NGO                 opt_i4b.h
 TEL_S0_16_3_P		opt_i4b.h
 SEDLBAUER		opt_i4b.h
-#DYNALINK		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