Module Name: src
Committed By: jdolecek
Date: Mon Sep 24 21:19:50 UTC 2018
Modified Files:
src/sys/dev/isa [jdolecek-ncqfixes]: files.isa
src/sys/dev/isapnp [jdolecek-ncqfixes]: files.isapnp
src/sys/dev/pci [jdolecek-ncqfixes]: files.pci
src/sys/dev/pcmcia [jdolecek-ncqfixes]: files.pcmcia
Log Message:
partial HEAD sync - ISDN device removal
To generate a diff of this commit:
cvs rdiff -u -r1.169 -r1.169.6.1 src/sys/dev/isa/files.isa
cvs rdiff -u -r1.38 -r1.38.166.1 src/sys/dev/isapnp/files.isapnp
cvs rdiff -u -r1.400 -r1.400.2.1 src/sys/dev/pci/files.pci
cvs rdiff -u -r1.58 -r1.58.42.1 src/sys/dev/pcmcia/files.pcmcia
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/isa/files.isa
diff -u src/sys/dev/isa/files.isa:1.169 src/sys/dev/isa/files.isa:1.169.6.1
--- src/sys/dev/isa/files.isa:1.169 Tue Jan 2 00:25:35 2018
+++ src/sys/dev/isa/files.isa Mon Sep 24 21:19:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.isa,v 1.169 2018/01/02 00:25:35 christos Exp $
+# $NetBSD: files.isa,v 1.169.6.1 2018/09/24 21:19:50 jdolecek Exp $
#
# Config file and device description for machine-independent ISA code.
# Included by ports that need it. Requires that the SCSI files be
@@ -484,22 +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
-#attach daic at isa with daic_isa
-#file dev/isa/daic_isa.c daic_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.38.166.1
--- src/sys/dev/isapnp/files.isapnp:1.38 Sun Dec 11 12:22:16 2005
+++ src/sys/dev/isapnp/files.isapnp Mon Sep 24 21:19:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.isapnp,v 1.38 2005/12/11 12:22:16 christos Exp $
+# $NetBSD: files.isapnp,v 1.38.166.1 2018/09/24 21:19:50 jdolecek 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.400 src/sys/dev/pci/files.pci:1.400.2.1
--- src/sys/dev/pci/files.pci:1.400 Sat Aug 25 07:48:57 2018
+++ src/sys/dev/pci/files.pci Mon Sep 24 21:19:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.pci,v 1.400 2018/08/25 07:48:57 maxv Exp $
+# $NetBSD: files.pci,v 1.400.2.1 2018/09/24 21:19:50 jdolecek Exp $
#
# Config file and device description for machine-independent PCI code.
# Included by ports that need it. Requires that the SCSI files be
@@ -167,11 +167,6 @@ device de: ether, ifnet, arp
attach de at pci
file dev/pci/if_de.c de
-# Efficient Networks, Inc. ATM interface
-# device declaration in sys/conf/files
-attach en at pci with en_pci
-file dev/pci/if_en_pci.c en_pci
-
# 3Com 3c590 and 3c595 Ethernet controllers
# device declaration in sys/conf/files
attach ep at pci with ep_pci
@@ -812,24 +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
-
-# AVM T1/B1
-attach iavc at pci with iavc_pci
-file dev/pci/iavc_pci.c iavc_pci
-
-device ifpci: isdndev, passive_isdn, nisac
-attach ifpci at pci
-file dev/pci/ifpci.c ifpci
-
-device ifritz: isdndev, passive_isdn, nisacsx
-attach ifritz at pci
-file dev/pci/ifpci2.c ifritz
-
# Winbond W6692
device iwic: isdndev, passive_isdn
attach iwic at pci with iwic_pci
Index: src/sys/dev/pcmcia/files.pcmcia
diff -u src/sys/dev/pcmcia/files.pcmcia:1.58 src/sys/dev/pcmcia/files.pcmcia:1.58.42.1
--- src/sys/dev/pcmcia/files.pcmcia:1.58 Sat Aug 25 08:20:03 2012
+++ src/sys/dev/pcmcia/files.pcmcia Mon Sep 24 21:19:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.pcmcia,v 1.58 2012/08/25 08:20:03 kiyohara Exp $
+# $NetBSD: files.pcmcia,v 1.58.42.1 2018/09/24 21:19:50 jdolecek 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
