Module Name: src
Committed By: maxv
Date: Sat Sep 22 16:22:24 UTC 2018
Modified Files:
src/distrib/sets/lists/man: mi
src/share/man/man4: Makefile
src/sys/arch/amd64/conf: ALL
src/sys/arch/amiga/conf: files.amiga
src/sys/arch/amigappc/conf: files.amigappc
src/sys/arch/i386/conf: ALL
src/sys/conf: files
src/sys/dev: DEVNAMES
src/sys/dev/isa: files.isa
src/sys/dev/isapnp: files.isapnp
src/sys/dev/pci: files.pci
src/sys/dev/pcmcia: files.pcmcia
Removed Files:
src/share/man/man4: isic.4
src/sys/arch/amiga/conf: ISDN
src/sys/arch/amiga/dev: aster.c isic_supio.c
src/sys/arch/i386/conf: GENERIC_ISDN
src/sys/dev/ic: hscx.c hscx.h ipac.h isac.c isac.h isacsx.c isacsx.h
isic.c isic_bchan.c isic_l1.c isic_l1.h isic_l1fsm.c
src/sys/dev/isa: isic_isa.c isic_isa_avm_a1.c isic_isa_itk_ix1.c
isic_isa_tel_s016.c isic_isa_tel_s0163.c isic_isa_tel_s08.c
isic_isa_usr_sti.c
src/sys/dev/isapnp: isic_isapnp.c isic_isapnp_ctx_s0P.c
isic_isapnp_drn_ngo.c isic_isapnp_dynalink.c
isic_isapnp_elsa_qs1i.c isic_isapnp_itkix.c
isic_isapnp_siemens_isurf.c isic_isapnp_sws.c isic_isapnp_tel_s0P.c
src/sys/dev/pci: isic_pci.c isic_pci.h isic_pci_elsa_qs1p.c
src/sys/dev/pcmcia: isic_pcmcia.c isic_pcmcia.h isic_pcmcia_avm_fritz.c
isic_pcmcia_elsa_isdnmc.c isic_pcmcia_elsa_mcall.c
isic_pcmcia_sbspeedstar2.c
Log Message:
Remove isic(4). It is part of ISDN, which we are now retiring.
To generate a diff of this commit:
cvs rdiff -u -r1.1622 -r1.1623 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.670 -r1.671 src/share/man/man4/Makefile
cvs rdiff -u -r1.18 -r0 src/share/man/man4/isic.4
cvs rdiff -u -r1.105 -r1.106 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.5 -r0 src/sys/arch/amiga/conf/ISDN
cvs rdiff -u -r1.179 -r1.180 src/sys/arch/amiga/conf/files.amiga
cvs rdiff -u -r1.23 -r0 src/sys/arch/amiga/dev/aster.c
cvs rdiff -u -r1.19 -r0 src/sys/arch/amiga/dev/isic_supio.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/amigappc/conf/files.amigappc
cvs rdiff -u -r1.455 -r1.456 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.20 -r0 src/sys/arch/i386/conf/GENERIC_ISDN
cvs rdiff -u -r1.1211 -r1.1212 src/sys/conf/files
cvs rdiff -u -r1.316 -r1.317 src/sys/dev/DEVNAMES
cvs rdiff -u -r1.16 -r0 src/sys/dev/ic/hscx.c
cvs rdiff -u -r1.4 -r0 src/sys/dev/ic/hscx.h src/sys/dev/ic/ipac.h \
src/sys/dev/ic/isac.h
cvs rdiff -u -r1.24 -r0 src/sys/dev/ic/isac.c
cvs rdiff -u -r1.7 -r0 src/sys/dev/ic/isacsx.c
cvs rdiff -u -r1.5 -r0 src/sys/dev/ic/isacsx.h
cvs rdiff -u -r1.25 -r0 src/sys/dev/ic/isic.c
cvs rdiff -u -r1.15 -r0 src/sys/dev/ic/isic_bchan.c
cvs rdiff -u -r1.19 -r0 src/sys/dev/ic/isic_l1.c
cvs rdiff -u -r1.21 -r0 src/sys/dev/ic/isic_l1.h
cvs rdiff -u -r1.14 -r0 src/sys/dev/ic/isic_l1fsm.c
cvs rdiff -u -r1.170 -r1.171 src/sys/dev/isa/files.isa
cvs rdiff -u -r1.38 -r0 src/sys/dev/isa/isic_isa.c
cvs rdiff -u -r1.10 -r0 src/sys/dev/isa/isic_isa_avm_a1.c
cvs rdiff -u -r1.18 -r0 src/sys/dev/isa/isic_isa_itk_ix1.c
cvs rdiff -u -r1.9 -r0 src/sys/dev/isa/isic_isa_tel_s016.c \
src/sys/dev/isa/isic_isa_tel_s08.c
cvs rdiff -u -r1.13 -r0 src/sys/dev/isa/isic_isa_tel_s0163.c
cvs rdiff -u -r1.8 -r0 src/sys/dev/isa/isic_isa_usr_sti.c
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/isapnp/files.isapnp
cvs rdiff -u -r1.33 -r0 src/sys/dev/isapnp/isic_isapnp.c
cvs rdiff -u -r1.11 -r0 src/sys/dev/isapnp/isic_isapnp_ctx_s0P.c \
src/sys/dev/isapnp/isic_isapnp_siemens_isurf.c \
src/sys/dev/isapnp/isic_isapnp_tel_s0P.c
cvs rdiff -u -r1.10 -r0 src/sys/dev/isapnp/isic_isapnp_drn_ngo.c
cvs rdiff -u -r1.14 -r0 src/sys/dev/isapnp/isic_isapnp_dynalink.c \
src/sys/dev/isapnp/isic_isapnp_sws.c
cvs rdiff -u -r1.16 -r0 src/sys/dev/isapnp/isic_isapnp_elsa_qs1i.c
cvs rdiff -u -r1.8 -r0 src/sys/dev/isapnp/isic_isapnp_itkix.c
cvs rdiff -u -r1.406 -r1.407 src/sys/dev/pci/files.pci
cvs rdiff -u -r1.41 -r0 src/sys/dev/pci/isic_pci.c
cvs rdiff -u -r1.11 -r0 src/sys/dev/pci/isic_pci.h
cvs rdiff -u -r1.20 -r0 src/sys/dev/pci/isic_pci_elsa_qs1p.c
cvs rdiff -u -r1.58 -r1.59 src/sys/dev/pcmcia/files.pcmcia
cvs rdiff -u -r1.43 -r0 src/sys/dev/pcmcia/isic_pcmcia.c
cvs rdiff -u -r1.6 -r0 src/sys/dev/pcmcia/isic_pcmcia.h
cvs rdiff -u -r1.12 -r0 src/sys/dev/pcmcia/isic_pcmcia_avm_fritz.c
cvs rdiff -u -r1.14 -r0 src/sys/dev/pcmcia/isic_pcmcia_elsa_isdnmc.c
cvs rdiff -u -r1.15 -r0 src/sys/dev/pcmcia/isic_pcmcia_elsa_mcall.c
cvs rdiff -u -r1.13 -r0 src/sys/dev/pcmcia/isic_pcmcia_sbspeedstar2.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1622 src/distrib/sets/lists/man/mi:1.1623
--- src/distrib/sets/lists/man/mi:1.1622 Sat Sep 22 12:41:00 2018
+++ src/distrib/sets/lists/man/mi Sat Sep 22 16:22:22 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1622 2018/09/22 12:41:00 maxv Exp $
+# $NetBSD: mi,v 1.1623 2018/09/22 16:22:22 maxv Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1350,7 +1350,7 @@
./usr/share/man/cat4/isdnctl.0 man-sys-catman .cat
./usr/share/man/cat4/isdntel.0 man-sys-catman .cat
./usr/share/man/cat4/isdntrc.0 man-sys-catman .cat
-./usr/share/man/cat4/isic.0 man-sys-catman .cat
+./usr/share/man/cat4/isic.0 man-obsolete obsolete
./usr/share/man/cat4/ismt.0 man-sys-catman .cat
./usr/share/man/cat4/iso.0 man-obsolete obsolete
./usr/share/man/cat4/isp.0 man-sys-catman .cat
@@ -4468,7 +4468,7 @@
./usr/share/man/html4/isdnctl.html man-sys-htmlman html
./usr/share/man/html4/isdntel.html man-sys-htmlman html
./usr/share/man/html4/isdntrc.html man-sys-htmlman html
-./usr/share/man/html4/isic.html man-sys-htmlman html
+./usr/share/man/html4/isic.html man-obsolete obsolete
./usr/share/man/html4/ismt.html man-sys-htmlman html
./usr/share/man/html4/iso.html man-obsolete obsolete
./usr/share/man/html4/isp.html man-sys-htmlman html
@@ -7424,7 +7424,7 @@
./usr/share/man/man4/isdnctl.4 man-sys-man .man
./usr/share/man/man4/isdntel.4 man-sys-man .man
./usr/share/man/man4/isdntrc.4 man-sys-man .man
-./usr/share/man/man4/isic.4 man-sys-man .man
+./usr/share/man/man4/isic.4 man-obsolete obsolete
./usr/share/man/man4/ismt.4 man-sys-man .man
./usr/share/man/man4/iso.4 man-obsolete obsolete
./usr/share/man/man4/isp.4 man-sys-man .man
Index: src/share/man/man4/Makefile
diff -u src/share/man/man4/Makefile:1.670 src/share/man/man4/Makefile:1.671
--- src/share/man/man4/Makefile:1.670 Sat Sep 22 12:41:00 2018
+++ src/share/man/man4/Makefile Sat Sep 22 16:22:22 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.670 2018/09/22 12:41:00 maxv Exp $
+# $NetBSD: Makefile,v 1.671 2018/09/22 16:22:22 maxv Exp $
# @(#)Makefile 8.1 (Berkeley) 6/18/93
MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \
@@ -146,7 +146,7 @@ MAN+= faith.4 gif.4 inet6.4 icmp6.4 ip6.
# ISDN devices
MAN+= isdntrc.4 isdntel.4 isdnbchan.4 ippp.4 irip.4 isdnctl.4 isdn.4 \
- isic.4 isdncapi.4
+ isdncapi.4
# onewire bus and devices
MAN+= gpioow.4 onewire.4 owtemp.4
Index: src/sys/arch/amd64/conf/ALL
diff -u src/sys/arch/amd64/conf/ALL:1.105 src/sys/arch/amd64/conf/ALL:1.106
--- src/sys/arch/amd64/conf/ALL:1.105 Sat Sep 22 12:41:00 2018
+++ src/sys/arch/amd64/conf/ALL Sat Sep 22 16:22:22 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.105 2018/09/22 12:41:00 maxv Exp $
+# $NetBSD: ALL,v 1.106 2018/09/22 16:22:22 maxv Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.105 $"
+#ident "ALL-$Revision: 1.106 $"
maxusers 64 # estimated number of users
@@ -1715,69 +1715,6 @@ options PAX_MPROTECT_DEBUG=1 # PaX mpro
options PAX_ASLR=1 # PaX Address Space Layout Randomization
options PAX_ASLR_DEBUG=1 # PaX ASLR debug
-#
-# NetBSD: GENERIC_ISDN,v 1.16 2010/01/03 03:53:34 dholland Exp
-#
-
-#---------------------------------------------------------------------
-# Various ISDN board drivers:
-#---------------------------------------------------------------------
-# Legacy ISA cards (no P&P support):
-#
-# Teles S0/8 or Niccy 1008
-options ISICISA_TEL_S0_8
-#isic0 at isa? iomem 0xd0000 irq 2
-# Teles S0/16 or Creatix ISDN-S0 or Niccy 1016
-options ISICISA_TEL_S0_16
-#isic0 at isa? port 0xd80 iomem 0xd0000 irq 9
-# Teles S0/16.3
-options ISICISA_TEL_S0_16_3
-#isic0 at isa? port 0xd80 irq 12
-# AVM A1 or AVM Fritz!Card
-options ISICISA_AVM_A1
-isic0 at isa? port 0x340 irq 10
-# USRobotics Sportster ISDN TA intern
-options ISICISA_USR_STI
-#isic0 at isa? port 0x268 irq 10
-# ITK ix1 micro
-options ISICISA_ITKIX1
-#isic0 at isa? port 0x398 irq 10
-#
-# XXX not ready yet:
-# Active EICON/Diehl Cards: S, SX, SXn, SCOM or QUADRO
-#daic0 at isa? iomem 0xd8000 irq 10
-#
-#
-#---------------------------------------------------------------------
-# Supported PCI cards:
-#
-isic* at pci?
-
-#
-#---------------------------------------------------------------------
-# Supported PCMCIA cards:
-#
-options ISICPCMCIA_AVM_A1 # Fritz!Card PCMCIA Version
-options ISICPCMCIA_ELSA_ISDNMC # ELSA MicroLink ISDN/MC
-options ISICPCMCIA_ELSA_MCALL # ELSA MicroLink MC/all
-options ISICPCMCIA_SBSPEEDSTAR2 # Sedlbauer speed star II
-isic* at pcmcia? function ?
-#
-
-#---------------------------------------------------------------------
-# ISDN user land devices, drivers and pseudo-devices.
-#---------------------------------------------------------------------
-#
-pseudo-device isdn # communication with userland daemon
-pseudo-device isdntrc 2 # userland driver to do ISDN tracing
-pseudo-device isdnctl # userland driver to control the whole thing
-pseudo-device isdnbchan 4 # userland driver for access to raw B channel
-pseudo-device isdntel 2 # userland driver for telephony
-options IRIP_VJ # compile support for VJ compression
-pseudo-device irip 2 # network driver for IP over raw HDLC ISDN
-pseudo-device ippp 2 # synchronous PPP over ISDN
-#---------------------------------------------------------------------
-
options ATHHAL_DEBUG
options A9PCIC_DEBUG
options AAC_DEBUG
Index: src/sys/arch/amiga/conf/files.amiga
diff -u src/sys/arch/amiga/conf/files.amiga:1.179 src/sys/arch/amiga/conf/files.amiga:1.180
--- src/sys/arch/amiga/conf/files.amiga:1.179 Tue Mar 6 06:04:21 2018
+++ src/sys/arch/amiga/conf/files.amiga Sat Sep 22 16:22:22 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.amiga,v 1.179 2018/03/06 06:04:21 spz Exp $
+# $NetBSD: files.amiga,v 1.180 2018/09/22 16:22:22 maxv Exp $
# maxpartitions must be first item in files.${ARCH}.newconf
maxpartitions 16 # NOTE THAT AMIGA IS SPECIAL!
@@ -314,14 +314,6 @@ file arch/amiga/dev/ioblix_zbus.c iobl_z
attach com at supio with com_supio
file arch/amiga/dev/com_supio.c com_supio
-# ISDN Blaster, ISDN Master
-device aster: supio
-attach aster at zbus
-file arch/amiga/dev/aster.c aster
-
-attach isic at supio with isic_supio
-file arch/amiga/dev/isic_supio.c isic_supio
-
# handle gvp's odd autoconf info..
device gvpbus {}
attach gvpbus at zbus
Index: src/sys/arch/amigappc/conf/files.amigappc
diff -u src/sys/arch/amigappc/conf/files.amigappc:1.29 src/sys/arch/amigappc/conf/files.amigappc:1.30
--- src/sys/arch/amigappc/conf/files.amigappc:1.29 Thu Oct 6 03:17:44 2016
+++ src/sys/arch/amigappc/conf/files.amigappc Sat Sep 22 16:22:23 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.amigappc,v 1.29 2016/10/06 03:17:44 christos Exp $
+# $NetBSD: files.amigappc,v 1.30 2018/09/22 16:22:23 maxv Exp $
# maxpartitions must be first item in files.${ARCH}.newconf
maxpartitions 16 # NOTE THAT AMIGA IS SPECIAL!
@@ -284,11 +284,6 @@ file arch/amiga/dev/ioblix_zbus.c iobl_z
attach com at supio with com_supio
file arch/amiga/dev/com_supio.c com_supio
-# ISDN Blaster, ISDN Master
-device aster: supio
-attach aster at zbus
-file arch/amiga/dev/aster.c aster
-
# handle gvp's odd autoconf info..
device gvpbus {}
attach gvpbus at zbus
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.455 src/sys/arch/i386/conf/ALL:1.456
--- src/sys/arch/i386/conf/ALL:1.455 Sat Sep 22 12:41:00 2018
+++ src/sys/arch/i386/conf/ALL Sat Sep 22 16:22:23 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.455 2018/09/22 12:41:00 maxv Exp $
+# $NetBSD: ALL,v 1.456 2018/09/22 16:22:23 maxv Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.455 $"
+#ident "ALL-$Revision: 1.456 $"
maxusers 64 # estimated number of users
@@ -1848,82 +1848,6 @@ options PAX_MPROTECT=0 # PaX mprotect(
options PAX_ASLR=0 # PaX Address Space Layout Randomization
#options PAX_SEGVGUARD=0 # PaX Segmentation fault guard
-#
-# NetBSD: GENERIC_ISDN,v 1.16 2010/01/03 03:53:34 dholland Exp
-#
-
-#---------------------------------------------------------------------
-# Various ISDN board drivers:
-#---------------------------------------------------------------------
-# Legacy ISA cards (no P&P support):
-#
-# Teles S0/8 or Niccy 1008
-options ISICISA_TEL_S0_8
-#isic0 at isa? iomem 0xd0000 irq 2
-# Teles S0/16 or Creatix ISDN-S0 or Niccy 1016
-options ISICISA_TEL_S0_16
-#isic0 at isa? port 0xd80 iomem 0xd0000 irq 9
-# Teles S0/16.3
-options ISICISA_TEL_S0_16_3
-#isic0 at isa? port 0xd80 irq 12
-# AVM A1 or AVM Fritz!Card
-options ISICISA_AVM_A1
-isic0 at isa? port 0x340 irq 10
-# USRobotics Sportster ISDN TA intern
-options ISICISA_USR_STI
-#isic0 at isa? port 0x268 irq 10
-# ITK ix1 micro
-options ISICISA_ITKIX1
-#isic0 at isa? port 0x398 irq 10
-#
-# XXX not ready yet:
-# Active EICON/Diehl Cards: S, SX, SXn, SCOM or QUADRO
-#daic0 at isa? iomem 0xd8000 irq 10
-#
-#---------------------------------------------------------------------
-# Supported ISA Plug & Play cards:
-#
-options ISICPNP_TEL_S0_16_3_P # Teles S0/16PnP (but not 16.3c !)
-options ISICPNP_CRTX_S0_P # Creatix ISDN-S0 P&P
-options ISICPNP_DRN_NGO # Dr. Neuhaus Niccy GO@
-options ISICPNP_ELSA_QS1ISA # ELSA QuickStep 1000 (ISA Version)
-options ISICPNP_ELSA_PCC16 # later variant of ELSA QuickStep
-options ISICPNP_SEDLBAUER # Sedlbauer WinSpeed
-options ISICPNP_DYNALINK # Dynalink IS64PH
-options ISICPNP_SIEMENS_ISURF2 # Siemens I-Surf
-options ISICPNP_ITKIX # ITK IX PnP cards
-isic* at isapnp?
-#
-#---------------------------------------------------------------------
-# Supported PCI cards:
-#
-isic* at pci?
-
-#
-#---------------------------------------------------------------------
-# Supported PCMCIA cards:
-#
-options ISICPCMCIA_AVM_A1 # Fritz!Card PCMCIA Version
-options ISICPCMCIA_ELSA_ISDNMC # ELSA MicroLink ISDN/MC
-options ISICPCMCIA_ELSA_MCALL # ELSA MicroLink MC/all
-options ISICPCMCIA_SBSPEEDSTAR2 # Sedlbauer speed star II
-isic* at pcmcia? function ?
-#
-
-#---------------------------------------------------------------------
-# ISDN user land devices, drivers and pseudo-devices.
-#---------------------------------------------------------------------
-#
-pseudo-device isdn # communication with userland daemon
-pseudo-device isdntrc 2 # userland driver to do ISDN tracing
-pseudo-device isdnctl # userland driver to control the whole thing
-pseudo-device isdnbchan 4 # userland driver for access to raw B channel
-pseudo-device isdntel 2 # userland driver for telephony
-options IRIP_VJ # compile support for VJ compression
-pseudo-device irip 2 # network driver for IP over raw HDLC ISDN
-pseudo-device ippp 2 # synchronous PPP over ISDN
-#---------------------------------------------------------------------
-
options ATHHAL_DEBUG
options A9PCIC_DEBUG
options AAC_DEBUG
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1211 src/sys/conf/files:1.1212
--- src/sys/conf/files:1.1211 Sat Sep 22 12:26:27 2018
+++ src/sys/conf/files Sat Sep 22 16:22:23 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1211 2018/09/22 12:26:27 maxv Exp $
+# $NetBSD: files,v 1.1212 2018/09/22 16:22:23 maxv Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20171118
@@ -1364,24 +1364,6 @@ define passive_isdn # files needed by pa
# specific)
define isdncapi # ISDN CAPI (http://www.capi.org/)
-# The isac found on the Fritz V2.0 Card.
-define nisacsx
-file dev/ic/isacsx.c nisacsx needs-flag
-
-# The 'standard' isac
-define nisac
-file dev/ic/isac.c nisac needs-flag
-
-# ISDN cards based on the Siemens ISAC/HSCX chipset (or lookalikes)
-#
-device isic: isdndev, passive_isdn, nisac
-
-file dev/ic/isic.c isic
-file dev/ic/isic_l1.c isic
-file dev/ic/isic_l1fsm.c isic
-file dev/ic/hscx.c isic
-file dev/ic/isic_bchan.c isic
-
# Broadcom AirForce / Apple Airport Extreme
device bwi: arp, ifnet, firmload, wlan
file dev/ic/bwi.c bwi
Index: src/sys/dev/DEVNAMES
diff -u src/sys/dev/DEVNAMES:1.316 src/sys/dev/DEVNAMES:1.317
--- src/sys/dev/DEVNAMES:1.316 Sat Sep 22 12:41:00 2018
+++ src/sys/dev/DEVNAMES Sat Sep 22 16:22:23 2018
@@ -1,4 +1,4 @@
-# $NetBSD: DEVNAMES,v 1.316 2018/09/22 12:41:00 maxv Exp $
+# $NetBSD: DEVNAMES,v 1.317 2018/09/22 16:22:23 maxv Exp $
#
# This file contains all used device names and defined attributes in
# alphabetical order. New devices added to the system somewhere should first
@@ -105,8 +105,6 @@ asc vax
asiop amiga Attribute
asiop amigappc Attribute
ast MI
-aster amiga
-aster amigappc
ata MI Attribute
ata_dma MI Attribute
ata_hl MI Attribute
@@ -686,7 +684,6 @@ isdnbchan MI
isdnctl MI
isdntel MI
isdntrc MI
-isic MI
ismt amd64
ismt i386
isp MI
Index: src/sys/dev/isa/files.isa
diff -u src/sys/dev/isa/files.isa:1.170 src/sys/dev/isa/files.isa:1.171
--- src/sys/dev/isa/files.isa:1.170 Wed Sep 19 13:58:27 2018
+++ src/sys/dev/isa/files.isa Sat Sep 22 16:22:23 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.isa,v 1.170 2018/09/19 13:58:27 maxv Exp $
+# $NetBSD: files.isa,v 1.171 2018/09/22 16:22:23 maxv Exp $
#
# Config file and device description for machine-independent ISA code.
# Included by ports that need it. Requires that the SCSI files be
@@ -484,20 +484,6 @@ device aps: sysmon_envsys
attach aps at isa with aps
file dev/isa/aps.c aps
-# ISDN devices
-attach isic at isa with isic_isa
-file dev/isa/isic_isa.c isic_isa
-
-defflag opt_isicisa.h ISICISA_TEL_S0_8 ISICISA_TEL_S0_16 ISICISA_TEL_S0_16_3
- ISICISA_AVM_A1 ISICISA_USR_STI ISICISA_ITKIX1
-
-file dev/isa/isic_isa_tel_s08.c isic_isa
-file dev/isa/isic_isa_tel_s016.c isic_isa
-file dev/isa/isic_isa_tel_s0163.c isic_isa
-file dev/isa/isic_isa_avm_a1.c isic_isa
-file dev/isa/isic_isa_usr_sti.c isic_isa
-file dev/isa/isic_isa_itk_ix1.c isic_isa
-
# Game adapter (joystick)
attach joy at isa with joy_isa
file dev/isa/joy_isa.c joy_isa
Index: src/sys/dev/isapnp/files.isapnp
diff -u src/sys/dev/isapnp/files.isapnp:1.38 src/sys/dev/isapnp/files.isapnp:1.39
--- src/sys/dev/isapnp/files.isapnp:1.38 Sun Dec 11 12:22:16 2005
+++ src/sys/dev/isapnp/files.isapnp Sat Sep 22 16:22:23 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.isapnp,v 1.38 2005/12/11 12:22:16 christos Exp $
+# $NetBSD: files.isapnp,v 1.39 2018/09/22 16:22:23 maxv Exp $
#
# Config file and device description for machine-independent ISAPnP code.
# Included by ports that need it.
@@ -91,24 +91,6 @@ file dev/isapnp/aha_isapnp.c aha_isapn
attach aic at isapnp with aic_isapnp
file dev/isapnp/aic_isapnp.c aic_isapnp
-# ISDN devices
-attach isic at isapnp with isic_isapnp
-file dev/isapnp/isic_isapnp.c isic_isapnp
-
-defflag opt_isicpnp.h ISICPNP_TEL_S0_16_3_P ISICPNP_CRTX_S0_P ISICPNP_DRN_NGO
- ISICPNP_ELSA_QS1ISA ISICPNP_ELSA_PCC16
- ISICPNP_SEDLBAUER ISICPNP_DYNALINK
- ISICPNP_SIEMENS_ISURF2 ISICPNP_ITKIX
-
-file dev/isapnp/isic_isapnp_tel_s0P.c isic_isapnp
-file dev/isapnp/isic_isapnp_ctx_s0P.c isic_isapnp
-file dev/isapnp/isic_isapnp_drn_ngo.c isic_isapnp
-file dev/isapnp/isic_isapnp_elsa_qs1i.c isic_isapnp
-file dev/isapnp/isic_isapnp_sws.c isic_isapnp
-file dev/isapnp/isic_isapnp_dynalink.c isic_isapnp
-file dev/isapnp/isic_isapnp_siemens_isurf.c isic_isapnp
-file dev/isapnp/isic_isapnp_itkix.c isic_isapnp
-
# Game adapter (joystick)
attach joy at isapnp with joy_isapnp
file dev/isapnp/joy_isapnp.c joy_isapnp
Index: src/sys/dev/pci/files.pci
diff -u src/sys/dev/pci/files.pci:1.406 src/sys/dev/pci/files.pci:1.407
--- src/sys/dev/pci/files.pci:1.406 Sat Sep 22 12:56:16 2018
+++ src/sys/dev/pci/files.pci Sat Sep 22 16:22:23 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.pci,v 1.406 2018/09/22 12:56:16 maxv Exp $
+# $NetBSD: files.pci,v 1.407 2018/09/22 16:22:23 maxv Exp $
#
# Config file and device description for machine-independent PCI code.
# Included by ports that need it. Requires that the SCSI files be
@@ -807,12 +807,6 @@ file dev/pci/if_malo_pci.c malo
attach wi at pci with wi_pci
file dev/pci/if_wi_pci.c wi_pci
-# ISDN devices
-attach isic at pci with isic_pci
-file dev/pci/isic_pci.c isic_pci
-
-file dev/pci/isic_pci_elsa_qs1p.c isic_pci
-
# IrDA devices
# Toshiba Fast Infrared Type O IrDA driver
device oboe: irbus, irdasir
Index: src/sys/dev/pcmcia/files.pcmcia
diff -u src/sys/dev/pcmcia/files.pcmcia:1.58 src/sys/dev/pcmcia/files.pcmcia:1.59
--- src/sys/dev/pcmcia/files.pcmcia:1.58 Sat Aug 25 08:20:03 2012
+++ src/sys/dev/pcmcia/files.pcmcia Sat Sep 22 16:22:23 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.pcmcia,v 1.58 2012/08/25 08:20:03 kiyohara Exp $
+# $NetBSD: files.pcmcia,v 1.59 2018/09/22 16:22:23 maxv Exp $
#
# Config.new file and device description for machine-independent PCMCIA code.
# Included by ports that need it.
@@ -115,18 +115,6 @@ file dev/pcmcia/if_cs_pcmcia.c cs_pcmci
attach an at pcmcia with an_pcmcia
file dev/pcmcia/if_an_pcmcia.c an_pcmcia
-# ISDN devices
-attach isic at pcmcia with isic_pcmcia
-file dev/pcmcia/isic_pcmcia.c isic_pcmcia
-
-defflag opt_isicpcmcia.h ISICPCMCIA_AVM_A1 ISICPCMCIA_ELSA_ISDNMC
- ISICPCMCIA_ELSA_MCALL ISICPCMCIA_SBSPEEDSTAR2
-
-file dev/pcmcia/isic_pcmcia_avm_fritz.c isic_pcmcia
-file dev/pcmcia/isic_pcmcia_elsa_isdnmc.c isic_pcmcia
-file dev/pcmcia/isic_pcmcia_elsa_mcall.c isic_pcmcia
-file dev/pcmcia/isic_pcmcia_sbspeedstar2.c isic_pcmcia
-
# 3Com Bluetooth controller 3CRW6096
device bt3c: btbus, bluetooth, firmload
attach bt3c at pcmcia
