diff options
author | bz <bz@FreeBSD.org> | 2008-05-26 10:40:09 +0000 |
---|---|---|
committer | bz <bz@FreeBSD.org> | 2008-05-26 10:40:09 +0000 |
commit | 6bba9b42448c966b4d7425ab0ca6f86f26564fb5 (patch) | |
tree | ce6d26c22aa5ab44c23fab794efd22c6b5bc9c39 /sys/conf | |
parent | cf7fbdd9301f7a93d32de3e79370507fa46278c6 (diff) | |
download | FreeBSD-src-6bba9b42448c966b4d7425ab0ca6f86f26564fb5.zip FreeBSD-src-6bba9b42448c966b4d7425ab0ca6f86f26564fb5.tar.gz |
Remove ISDN4BSD (I4B) from HEAD as it is not MPSAFE and
parts relied on the now removed NET_NEEDS_GIANT.
Most of I4B has been disconnected from the build
since July 2007 in HEAD/RELENG_7.
This is what was removed:
- configuration in /etc/isdn
- examples
- man pages
- kernel configuration
- sys/i4b (drivers, layers, include files)
- user space tools
- i4b support from ppp
- further documentation
Discussed with: rwatson, re
Diffstat (limited to 'sys/conf')
-rw-r--r-- | sys/conf/files | 60 | ||||
-rw-r--r-- | sys/conf/files.i386 | 77 | ||||
-rw-r--r-- | sys/conf/files.pc98 | 77 | ||||
-rw-r--r-- | sys/conf/options | 8 | ||||
-rw-r--r-- | sys/conf/options.amd64 | 13 | ||||
-rw-r--r-- | sys/conf/options.i386 | 36 | ||||
-rw-r--r-- | sys/conf/options.pc98 | 13 |
7 files changed, 2 insertions, 282 deletions
diff --git a/sys/conf/files b/sys/conf/files index 4b9afc7..4e1dbc5 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1511,62 +1511,6 @@ gnu/fs/reiserfs/reiserfs_stree.c optional reiserfs gnu/fs/reiserfs/reiserfs_vfsops.c optional reiserfs gnu/fs/reiserfs/reiserfs_vnops.c optional reiserfs # -# isdn4bsd device drivers -# -i4b/driver/i4b_trace.c optional i4btrc -i4b/driver/i4b_rbch.c optional i4brbch -i4b/driver/i4b_tel.c optional i4btel -#XXXBZ#i4b/driver/i4b_ipr.c optional i4bipr -net/slcompress.c optional i4bipr | i4bisppp -i4b/driver/i4b_ctl.c optional i4bctl -#XXXBZ#i4b/driver/i4b_ing.c optional i4bing -#XXXBZ#i4b/driver/i4b_isppp.c optional i4bisppp -# -# isdn4bsd CAPI driver -# -i4b/capi/capi_l4if.c optional i4bcapi -i4b/capi/capi_llif.c optional i4bcapi -i4b/capi/capi_msgs.c optional i4bcapi -# -# isdn4bsd AVM B1/T1 CAPI driver -# -i4b/capi/iavc/iavc_pci.c optional iavc i4bcapi pci -i4b/capi/iavc/iavc_isa.c optional iavc i4bcapi isa -i4b/capi/iavc/iavc_lli.c optional iavc i4bcapi -i4b/capi/iavc/iavc_card.c optional iavc i4bcapi -# -# isdn4bsd support -# -i4b/layer2/i4b_mbuf.c optional i4btrc -# -# isdn4bsd Q.921 handler -# -i4b/layer2/i4b_l2.c optional 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 optional 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 optional 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 standard isa/isa_common.c optional isa isa/isahint.c optional isa @@ -1814,8 +1758,8 @@ net/if_media.c standard net/if_mib.c standard net/if_ppp.c optional ppp net/if_sl.c optional sl -net/if_spppfr.c optional i4bisppp | sppp | netgraph_sppp -net/if_spppsubr.c optional i4bisppp | sppp | netgraph_sppp +net/if_spppfr.c optional sppp | netgraph_sppp +net/if_spppsubr.c optional sppp | netgraph_sppp net/if_stf.c optional stf net/if_tun.c optional tun net/if_tap.c optional tap diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index afc7a91..292d273 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -366,83 +366,6 @@ i386/svr4/svr4_locore.s optional compat_svr4 \ warning "COMPAT_SVR4 is broken and should be avoided" i386/svr4/svr4_machdep.c optional compat_svr4 # -# isdn4bsd, needed for isic | iwic | ifpi | ifpi2 | ihfc | ifpnp | itjc -# -i4b/layer1/i4b_hdlc.c optional ihfc | itjc -i4b/layer1/i4b_l1dmux.c optional ifpi | ifpi2 | ifpnp | \ - ihfc | isic | itjc | iwic -i4b/layer1/i4b_l1lib.c optional ifpi | ifpi2 | ifpnp | \ - ihfc | isic | itjc | iwic -# -# 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 pci -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 optional 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 -i4b/layer1/isic/i4b_diva.c optional isic -# -# isdn4bsd, iwic -# -i4b/layer1/iwic/i4b_iwic_pci.c optional iwic pci -i4b/layer1/iwic/i4b_iwic_dchan.c optional iwic pci -i4b/layer1/iwic/i4b_iwic_bchan.c optional iwic pci -i4b/layer1/iwic/i4b_iwic_fsm.c optional iwic pci -i4b/layer1/iwic/i4b_iwic_l1if.c optional iwic pci -# -# isdn4bsd, ifpi -# -i4b/layer1/ifpi/i4b_ifpi_pci.c optional ifpi pci -i4b/layer1/ifpi/i4b_ifpi_isac.c optional ifpi pci -i4b/layer1/ifpi/i4b_ifpi_l1.c optional ifpi pci -i4b/layer1/ifpi/i4b_ifpi_l1fsm.c optional ifpi pci -# -# isdn4bsd, ifpi2 -# -i4b/layer1/ifpi2/i4b_ifpi2_pci.c optional ifpi2 pci -i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c optional ifpi2 pci -i4b/layer1/ifpi2/i4b_ifpi2_l1.c optional ifpi2 pci -i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c optional ifpi2 pci -# -# isdn4bsd, ifpnp -# -i4b/layer1/ifpnp/i4b_ifpnp_avm.c optional 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 optional ihfc -i4b/layer1/ihfc/i4b_ihfc_pnp.c optional ihfc -i4b/layer1/ihfc/i4b_ihfc_drv.c optional ihfc -# -# isdn4bsd, itjc -# -i4b/layer1/itjc/i4b_itjc_pci.c optional itjc -i4b/layer1/itjc/i4b_itjc_isac.c optional itjc -i4b/layer1/itjc/i4b_itjc_l1.c optional itjc -i4b/layer1/itjc/i4b_itjc_l1fsm.c optional itjc -# isa/atrtc.c standard isa/syscons_isa.c optional sc isa/vga_isa.c optional vga diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98 index 97d85f6..68638c8 100644 --- a/sys/conf/files.pc98 +++ b/sys/conf/files.pc98 @@ -237,83 +237,6 @@ i386/svr4/svr4_locore.s optional compat_svr4 \ warning "COMPAT_SVR4 is broken and should be avoided" i386/svr4/svr4_machdep.c optional compat_svr4 # -# isdn4bsd, needed for isic | iwic | ifpi | ifpi2 | ihfc | ifpnp | itjc -# -i4b/layer1/i4b_hdlc.c optional ihfc | itjc -i4b/layer1/i4b_l1dmux.c optional ifpi | ifpi2 | ifpnp | \ - ihfc | isic | itjc | iwic -i4b/layer1/i4b_l1lib.c optional ifpi | ifpi2 | ifpnp | \ - ihfc | isic | itjc | iwic -# -# 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 pci -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 optional 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 -i4b/layer1/isic/i4b_diva.c optional isic -# -# isdn4bsd, iwic -# -i4b/layer1/iwic/i4b_iwic_pci.c optional iwic pci -i4b/layer1/iwic/i4b_iwic_dchan.c optional iwic pci -i4b/layer1/iwic/i4b_iwic_bchan.c optional iwic pci -i4b/layer1/iwic/i4b_iwic_fsm.c optional iwic pci -i4b/layer1/iwic/i4b_iwic_l1if.c optional iwic pci -# -# isdn4bsd, ifpi -# -i4b/layer1/ifpi/i4b_ifpi_pci.c optional ifpi pci -i4b/layer1/ifpi/i4b_ifpi_isac.c optional ifpi pci -i4b/layer1/ifpi/i4b_ifpi_l1.c optional ifpi pci -i4b/layer1/ifpi/i4b_ifpi_l1fsm.c optional ifpi pci -# -# isdn4bsd, ifpi2 -# -i4b/layer1/ifpi2/i4b_ifpi2_pci.c optional ifpi2 pci -i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c optional ifpi2 pci -i4b/layer1/ifpi2/i4b_ifpi2_l1.c optional ifpi2 pci -i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c optional ifpi2 pci -# -# isdn4bsd, ifpnp -# -i4b/layer1/ifpnp/i4b_ifpnp_avm.c optional 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 optional ihfc -i4b/layer1/ihfc/i4b_ihfc_pnp.c optional ihfc -i4b/layer1/ihfc/i4b_ihfc_drv.c optional ihfc -# -# isdn4bsd, itjc -# -i4b/layer1/itjc/i4b_itjc_pci.c optional itjc -i4b/layer1/itjc/i4b_itjc_isac.c optional itjc -i4b/layer1/itjc/i4b_itjc_l1.c optional itjc -i4b/layer1/itjc/i4b_itjc_l1fsm.c optional itjc -# kern/imgact_aout.c optional compat_aout kern/imgact_gzip.c optional gzip libkern/divdi3.c standard diff --git a/sys/conf/options b/sys/conf/options index 8be2ed7..7e5c9c5 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -743,14 +743,6 @@ DCONS_POLL_HZ opt_dcons.h DCONS_FORCE_CONSOLE opt_dcons.h DCONS_FORCE_GDB opt_dcons.h -# Static unit counts -NI4BTRC opt_i4b.h -NI4BRBCH opt_i4b.h -NI4BTEL opt_i4b.h -#XXXBZ#NI4BIPR opt_i4b.h -#XXXBZ#NI4BING opt_i4b.h -#XXXBZ#NI4BISPPP opt_i4b.h - # VFS options LOOKUP_SHARED opt_vfs.h diff --git a/sys/conf/options.amd64 b/sys/conf/options.amd64 index 00faf95..9a5e7dd 100644 --- a/sys/conf/options.amd64 +++ b/sys/conf/options.amd64 @@ -40,19 +40,6 @@ VGA_WIDTH90 opt_vga.h ATKBD_DFLT_KEYMAP opt_atkbd.h # ------------------------------- -# isdn4bsd: passive PCI cards -# ------------------------------- -ELSA_QS1PCI opt_i4b.h -# ------------------------------- -# isdn4bsd: misc options -# ------------------------------- -# temporary workaround for SMP machines -I4B_SMP_WORKAROUND opt_i4b.h -# enable VJ compression code for ipr i/f -#XXXBZ#IPR_VJ opt_i4b.h -#XXXBZ#IPR_LOG opt_i4b.h - -# ------------------------------- # EOF # ------------------------------- HAMMER opt_cpu.h diff --git a/sys/conf/options.i386 b/sys/conf/options.i386 index 8cdaa5e..5d8e0b7 100644 --- a/sys/conf/options.i386 +++ b/sys/conf/options.i386 @@ -102,42 +102,6 @@ SPIGOT_UNSECURE opt_spigot.h # Enables NETGRAPH support for Cronyx adapters NETGRAPH_CRONYX opt_ng_cronyx.h -# ------------------------------- -# isdn4bsd: passive ISA cards -# ------------------------------- -TEL_S0_8 opt_i4b.h -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 -ELSA_PCC16 opt_i4b.h -# ------------------------------- -# isdn4bsd: passive ISA PnP cards -# ------------------------------- -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 -ASUSCOM_IPAC opt_i4b.h -ELSA_QS1ISA opt_i4b.h -SIEMENS_ISURF2 opt_i4b.h -EICON_DIVA opt_i4b.h -COMPAQ_M610 opt_i4b.h -# ------------------------------- -# isdn4bsd: passive PCI cards -# ------------------------------- -ELSA_QS1PCI opt_i4b.h -# ------------------------------- -# isdn4bsd: misc options -# ------------------------------- -# temporary workaround for SMP machines -I4B_SMP_WORKAROUND opt_i4b.h -# enable VJ compression code for ipr i/f -#XXXBZ#IPR_VJ opt_i4b.h -#XXXBZ#IPR_LOG opt_i4b.h - # Device options DEV_APIC opt_apic.h DEV_NPX opt_npx.h diff --git a/sys/conf/options.pc98 b/sys/conf/options.pc98 index d910ff2..d0c8bbb 100644 --- a/sys/conf/options.pc98 +++ b/sys/conf/options.pc98 @@ -77,19 +77,6 @@ SPIGOT_UNSECURE opt_spigot.h # Enables NETGRAPH support for Cronyx adapters NETGRAPH_CRONYX opt_ng_cronyx.h -# ------------------------------- -# isdn4bsd: passive PCI cards -# ------------------------------- -ELSA_QS1PCI opt_i4b.h -# ------------------------------- -# isdn4bsd: misc options -# ------------------------------- -# temporary workaround for SMP machines -I4B_SMP_WORKAROUND opt_i4b.h -# enable VJ compression code for ipr i/f -#XXXBZ#IPR_VJ opt_i4b.h -#XXXBZ#IPR_LOG opt_i4b.h - # ct driver options CT_BUS_WEIGHT opt_ct.h CT_USE_RELOCATE_OFFSET opt_ct.h |