Module Name: src
Committed By: thorpej
Date: Sun Jan 19 06:55:24 UTC 2020
Modified Files:
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/comp: mi
src/sys/arch/alpha/conf: GENERIC RAWHIDE
src/sys/arch/amd64/conf: ALL GENERIC XEN3_DOM0
src/sys/arch/arc/conf: GENERIC
src/sys/arch/cats/conf: GENERIC INSTALL
src/sys/arch/cobalt/conf: GENERIC INSTALL
src/sys/arch/evbarm/conf: IXDP425 ZAO425
src/sys/arch/evbmips/conf: MALTA
src/sys/arch/evbppc/conf: PMPPC
src/sys/arch/hppa/conf: GENERIC
src/sys/arch/i386/conf: ALL GENERIC GENERIC_TINY INSTALL_FLOPPY
XEN3PAE_DOM0
src/sys/arch/sgimips/conf: GENERIC32_IP3x
src/sys/arch/sparc64/conf: GENERIC
src/sys/conf: files
src/sys/dev/ic: Makefile
src/sys/dev/pci: files.pci
src/sys/net: Makefile files.net
src/usr.sbin: Makefile
Removed Files:
src/sys/dev/ic: rrunner.c rrunnerreg.h rrunnervar.h
src/sys/dev/pci: if_esh_pci.c
src/sys/net: if_hippi.h if_hippisubr.c
src/usr.sbin/eshconfig: Makefile eshconfig.8 eshconfig.c
Log Message:
Remove HIPPI support and the esh(4) driver that uses it. There have not
been any users of HIPPI for some time, and it is unlikely to be resurrected.
To generate a diff of this commit:
cvs rdiff -u -r1.1224 -r1.1225 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.2300 -r1.2301 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.397 -r1.398 src/sys/arch/alpha/conf/GENERIC
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/alpha/conf/RAWHIDE
cvs rdiff -u -r1.137 -r1.138 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.555 -r1.556 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.170 -r1.171 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.194 -r1.195 src/sys/arch/arc/conf/GENERIC
cvs rdiff -u -r1.174 -r1.175 src/sys/arch/cats/conf/GENERIC
cvs rdiff -u -r1.110 -r1.111 src/sys/arch/cats/conf/INSTALL
cvs rdiff -u -r1.163 -r1.164 src/sys/arch/cobalt/conf/GENERIC
cvs rdiff -u -r1.71 -r1.72 src/sys/arch/cobalt/conf/INSTALL
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/evbarm/conf/IXDP425
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/evbarm/conf/ZAO425
cvs rdiff -u -r1.97 -r1.98 src/sys/arch/evbmips/conf/MALTA
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/evbppc/conf/PMPPC
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/hppa/conf/GENERIC
cvs rdiff -u -r1.481 -r1.482 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1219 -r1.1220 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.164 -r1.165 src/sys/arch/i386/conf/GENERIC_TINY
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/i386/conf/INSTALL_FLOPPY
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/i386/conf/XEN3PAE_DOM0
cvs rdiff -u -r1.127 -r1.128 src/sys/arch/sgimips/conf/GENERIC32_IP3x
cvs rdiff -u -r1.219 -r1.220 src/sys/arch/sparc64/conf/GENERIC
cvs rdiff -u -r1.1249 -r1.1250 src/sys/conf/files
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/ic/Makefile
cvs rdiff -u -r1.89 -r0 src/sys/dev/ic/rrunner.c
cvs rdiff -u -r1.10 -r0 src/sys/dev/ic/rrunnerreg.h
cvs rdiff -u -r1.14 -r0 src/sys/dev/ic/rrunnervar.h
cvs rdiff -u -r1.421 -r1.422 src/sys/dev/pci/files.pci
cvs rdiff -u -r1.33 -r0 src/sys/dev/pci/if_esh_pci.c
cvs rdiff -u -r1.38 -r1.39 src/sys/net/Makefile
cvs rdiff -u -r1.21 -r1.22 src/sys/net/files.net
cvs rdiff -u -r1.13 -r0 src/sys/net/if_hippi.h
cvs rdiff -u -r1.48 -r0 src/sys/net/if_hippisubr.c
cvs rdiff -u -r1.282 -r1.283 src/usr.sbin/Makefile
cvs rdiff -u -r1.2 -r0 src/usr.sbin/eshconfig/Makefile
cvs rdiff -u -r1.8 -r0 src/usr.sbin/eshconfig/eshconfig.8
cvs rdiff -u -r1.10 -r0 src/usr.sbin/eshconfig/eshconfig.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/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1224 src/distrib/sets/lists/base/mi:1.1225
--- src/distrib/sets/lists/base/mi:1.1224 Mon Dec 23 06:45:36 2019
+++ src/distrib/sets/lists/base/mi Sun Jan 19 06:55:22 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1224 2019/12/23 06:45:36 maxv Exp $
+# $NetBSD: mi,v 1.1225 2020/01/19 06:55:22 thorpej Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -1732,7 +1732,7 @@
./usr/sbin/editmap base-obsolete obsolete
./usr/sbin/edquota base-sysutil-bin
./usr/sbin/envstat base-sysutil-bin
-./usr/sbin/eshconfig base-sysutil-bin
+./usr/sbin/eshconfig base-obsolete obsolete
./usr/sbin/etcupdate base-sysutil-bin
./usr/sbin/extattrctl base-sysutil-bin
./usr/sbin/execsnoop base-debug-bin dtrace
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2300 src/distrib/sets/lists/comp/mi:1.2301
--- src/distrib/sets/lists/comp/mi:1.2300 Mon Jan 13 08:25:02 2020
+++ src/distrib/sets/lists/comp/mi Sun Jan 19 06:55:22 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.2300 2020/01/13 08:25:02 kamil Exp $
+# $NetBSD: mi,v 1.2301 2020/01/19 06:55:22 thorpej Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
./etc/mtree/set.comp comp-sys-root
@@ -519,8 +519,8 @@
./usr/include/dev/ic/pdqreg.h comp-obsolete obsolete
./usr/include/dev/ic/pdqvar.h comp-obsolete obsolete
./usr/include/dev/ic/qemufwcfgio.h comp-c-include
-./usr/include/dev/ic/rrunnerreg.h comp-c-include
-./usr/include/dev/ic/rrunnervar.h comp-c-include
+./usr/include/dev/ic/rrunnerreg.h comp-obsolete obsolete
+./usr/include/dev/ic/rrunnervar.h comp-obsolete obsolete
./usr/include/dev/ic/smc83c170reg.h comp-obsolete obsolete
./usr/include/dev/ic/smc83c170var.h comp-obsolete obsolete
./usr/include/dev/ic/smc90cx6reg.h comp-obsolete obsolete
Index: src/sys/arch/alpha/conf/GENERIC
diff -u src/sys/arch/alpha/conf/GENERIC:1.397 src/sys/arch/alpha/conf/GENERIC:1.398
--- src/sys/arch/alpha/conf/GENERIC:1.397 Sun Jan 19 01:25:04 2020
+++ src/sys/arch/alpha/conf/GENERIC Sun Jan 19 06:55:22 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.397 2020/01/19 01:25:04 thorpej Exp $
+# $NetBSD: GENERIC,v 1.398 2020/01/19 06:55:22 thorpej Exp $
#
# This machine description file is used to generate the default NetBSD
# kernel.
@@ -19,7 +19,7 @@ include "arch/alpha/conf/std.alpha"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "GENERIC-$Revision: 1.397 $"
+ident "GENERIC-$Revision: 1.398 $"
maxusers 32
@@ -308,7 +308,6 @@ dpt* at pci? dev ? function ? # DPT Sma
eap* at pci? dev ? function ? # Ensoniq AudioPCI
ep* at pci? dev ? function ? # 3COM 3c59x/3c90x Ethernet
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
-esh* at pci? dev ? function ? # Essential HIPPI card
eso* at pci? dev ? function ? # ESS Solo-1 PCI AudioDrive
ex* at pci? dev ? function ? # 3COM 3c90x[BC] Ethernet
fpa* at pci? dev ? function ? # DEC DEFPA FDDI
Index: src/sys/arch/alpha/conf/RAWHIDE
diff -u src/sys/arch/alpha/conf/RAWHIDE:1.43 src/sys/arch/alpha/conf/RAWHIDE:1.44
--- src/sys/arch/alpha/conf/RAWHIDE:1.43 Thu Sep 6 05:36:49 2018
+++ src/sys/arch/alpha/conf/RAWHIDE Sun Jan 19 06:55:22 2020
@@ -1,4 +1,4 @@
-# $NetBSD: RAWHIDE,v 1.43 2018/09/06 05:36:49 maxv Exp $
+# $NetBSD: RAWHIDE,v 1.44 2020/01/19 06:55:22 thorpej Exp $
#
# Alpha 4100 stripped for action server kernel.
#
@@ -60,7 +60,6 @@ ahc* at pci? dev ? function ? # Adaptec
bha* at pci? dev ? function ? # BusLogic 9xx SCSI (untested)
cy* at pci? dev ? function ? # Cyclades Cyclom-Y (untested)
ep* at pci? dev ? function ? # 3COM 3c59x/3c90x Ethernet
-esh* at pci? dev ? function ? # Essential HIPPI card
fpa* at pci? dev ? function ? # DEC DEFPA FDDI
fxp* at pci? dev ? function ? # Intel EEPRO 10+/100B
isp* at pci? dev ? function ? # Qlogic ISP 10x0 SCSI
Index: src/sys/arch/amd64/conf/ALL
diff -u src/sys/arch/amd64/conf/ALL:1.137 src/sys/arch/amd64/conf/ALL:1.138
--- src/sys/arch/amd64/conf/ALL:1.137 Sun Jan 19 01:25:04 2020
+++ src/sys/arch/amd64/conf/ALL Sun Jan 19 06:55:22 2020
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.137 2020/01/19 01:25:04 thorpej Exp $
+# $NetBSD: ALL,v 1.138 2020/01/19 06:55:22 thorpej 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.137 $"
+#ident "ALL-$Revision: 1.138 $"
maxusers 64 # estimated number of users
@@ -974,7 +974,6 @@ dge* at pci? dev ? function ? # Intel 82
ena* at pci? dev ? function ? # Amazon Elastic Network Adapter
ep* at pci? dev ? function ? # 3Com 3c59x
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
-esh* at pci? dev ? function ? # Essential HIPPI card
et* at pci? dev ? function ? # Agere/LSI ET1310/ET1301 Gigabit
ex* at pci? dev ? function ? # 3Com 3c90x[BC]
fpa* at pci? dev ? function ? # DEC DEFPA FDDI
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.555 src/sys/arch/amd64/conf/GENERIC:1.556
--- src/sys/arch/amd64/conf/GENERIC:1.555 Sun Jan 19 01:25:04 2020
+++ src/sys/arch/amd64/conf/GENERIC Sun Jan 19 06:55:22 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.555 2020/01/19 01:25:04 thorpej Exp $
+# $NetBSD: GENERIC,v 1.556 2020/01/19 06:55:22 thorpej Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.555 $"
+#ident "GENERIC-$Revision: 1.556 $"
maxusers 64 # estimated number of users
@@ -792,7 +792,6 @@ dge* at pci? dev ? function ? # Intel 82
ena* at pci? dev ? function ? # Amazon.com Elastic Network Adapter
ep* at pci? dev ? function ? # 3Com 3c59x
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
-esh* at pci? dev ? function ? # Essential HIPPI card
et* at pci? dev ? function ? # Agere/LSI ET1310/ET1301 Gigabit
ex* at pci? dev ? function ? # 3Com 90x[BC]
fpa* at pci? dev ? function ? # DEC DEFPA FDDI
Index: src/sys/arch/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.170 src/sys/arch/amd64/conf/XEN3_DOM0:1.171
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.170 Wed Jan 1 10:36:43 2020
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Sun Jan 19 06:55:22 2020
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.170 2020/01/01 10:36:43 ryo Exp $
+# $NetBSD: XEN3_DOM0,v 1.171 2020/01/19 06:55:22 thorpej Exp $
include "arch/amd64/conf/std.xen"
@@ -11,7 +11,7 @@ options INCLUDE_CONFIG_FILE # embed con
#options UVMHIST_PRINT
#options SYSCALL_DEBUG
-#ident "XEN3_DOM0-$Revision: 1.170 $"
+#ident "XEN3_DOM0-$Revision: 1.171 $"
maxusers 32 # estimated number of users
@@ -340,7 +340,6 @@ bnx* at pci? dev ? function ? # Broadcom
dge* at pci? dev ? function ? # Intel 82597 10GbE LR
ep* at pci? dev ? function ? # 3Com 3c59x
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
-esh* at pci? dev ? function ? # Essential HIPPI card
et* at pci? dev ? function ? # Agere/LSI ET1310/ET1301 Gigabit
ex* at pci? dev ? function ? # 3Com 90x[BC]
fpa* at pci? dev ? function ? # DEC DEFPA FDDI
Index: src/sys/arch/arc/conf/GENERIC
diff -u src/sys/arch/arc/conf/GENERIC:1.194 src/sys/arch/arc/conf/GENERIC:1.195
--- src/sys/arch/arc/conf/GENERIC:1.194 Sun Jan 19 01:25:04 2020
+++ src/sys/arch/arc/conf/GENERIC Sun Jan 19 06:55:22 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.194 2020/01/19 01:25:04 thorpej Exp $
+# $NetBSD: GENERIC,v 1.195 2020/01/19 06:55:22 thorpej Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/arc/conf/std.arc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.194 $"
+#ident "GENERIC-$Revision: 1.195 $"
maxusers 32 # estimated number of users
@@ -319,7 +319,6 @@ viaide* at pci? dev ? function ? # VIA/
bge* at pci? dev ? function ? # Broadcom 570x gigabit Ethernet
ep* at pci? dev ? function ? # 3Com 3c59x
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
-#esh* at pci? dev ? function ? # Essential HIPPI card
ex* at pci? dev ? function ? # 3Com 90x[BC]
#fpa* at pci? dev ? function ? # DEC DEFPA FDDI
fxp* at pci? dev ? function ? # Intel EtherExpress PRO
Index: src/sys/arch/cats/conf/GENERIC
diff -u src/sys/arch/cats/conf/GENERIC:1.174 src/sys/arch/cats/conf/GENERIC:1.175
--- src/sys/arch/cats/conf/GENERIC:1.174 Sun Jan 19 01:25:04 2020
+++ src/sys/arch/cats/conf/GENERIC Sun Jan 19 06:55:23 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.174 2020/01/19 01:25:04 thorpej Exp $
+# $NetBSD: GENERIC,v 1.175 2020/01/19 06:55:23 thorpej Exp $
#
# GENERIC machine description file
#
@@ -288,7 +288,6 @@ uk* at atapibus? drive ? flags 0x0000 #
ep* at pci? dev ? function ? # 3C590 ethernet cards
ex* at pci? dev ? function ? # 3Com 90x[B]
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
-#esh* at pci? dev ? function ? # Essential HIPPI card
#fpa* at pci? dev ? function ? # DEC DEFPA FDDI
fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
#le* at pci? dev ? function ? # PCnet-PCI Ethernet
Index: src/sys/arch/cats/conf/INSTALL
diff -u src/sys/arch/cats/conf/INSTALL:1.110 src/sys/arch/cats/conf/INSTALL:1.111
--- src/sys/arch/cats/conf/INSTALL:1.110 Sun Jan 19 01:25:04 2020
+++ src/sys/arch/cats/conf/INSTALL Sun Jan 19 06:55:23 2020
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.110 2020/01/19 01:25:04 thorpej Exp $
+# $NetBSD: INSTALL,v 1.111 2020/01/19 06:55:23 thorpej Exp $
#
# CATSINST -- CHALTECH CATS Install kernel
#
@@ -234,7 +234,6 @@ sd* at atapibus? drive ? flags 0x0000 #
ep* at pci? dev ? function ? # 3C590 ethernet cards
ex* at pci? dev ? function ? # 3Com 90x[B]
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
-#esh* at pci? dev ? function ? # Essential HIPPI card
#fpa* at pci? dev ? function ? # DEC DEFPA FDDI
fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
#le* at pci? dev ? function ? # PCnet-PCI Ethernet
Index: src/sys/arch/cobalt/conf/GENERIC
diff -u src/sys/arch/cobalt/conf/GENERIC:1.163 src/sys/arch/cobalt/conf/GENERIC:1.164
--- src/sys/arch/cobalt/conf/GENERIC:1.163 Sun Jan 19 01:25:04 2020
+++ src/sys/arch/cobalt/conf/GENERIC Sun Jan 19 06:55:23 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.163 2020/01/19 01:25:04 thorpej Exp $
+# $NetBSD: GENERIC,v 1.164 2020/01/19 06:55:23 thorpej Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/cobalt/conf/std.cobalt"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.163 $"
+#ident "GENERIC-$Revision: 1.164 $"
maxusers 32
@@ -238,7 +238,6 @@ wd* at atabus? drive ? flags 0x0000
#ep* at pci? dev ? function ? # 3Com 3c59x
#ex* at pci? dev ? function ? # 3Com 90x[BC]
#epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
-#esh* at pci? dev ? function ? # Essential HIPPI card
#fpa* at pci? dev ? function ? # DEC DEFPA FDDI
#fxp* at pci? dev ? function ? # Intel EtherExpress PRO10+/100B
#le* at pci? dev ? function ? # PCnet-PCI Ethernet
Index: src/sys/arch/cobalt/conf/INSTALL
diff -u src/sys/arch/cobalt/conf/INSTALL:1.71 src/sys/arch/cobalt/conf/INSTALL:1.72
--- src/sys/arch/cobalt/conf/INSTALL:1.71 Sun Jan 19 01:25:04 2020
+++ src/sys/arch/cobalt/conf/INSTALL Sun Jan 19 06:55:23 2020
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.71 2020/01/19 01:25:04 thorpej Exp $
+# $NetBSD: INSTALL,v 1.72 2020/01/19 06:55:23 thorpej Exp $
#
# INSTALL -- installation and rescue kernel.
#
@@ -10,7 +10,7 @@ include "arch/cobalt/conf/std.cobalt"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "INSTALL-$Revision: 1.71 $"
+#ident "INSTALL-$Revision: 1.72 $"
makeoptions COPTS="-Os -mmemcpy"
makeoptions CPUFLAGS="-march=vr5000 -mabi=32"
@@ -228,7 +228,6 @@ wd* at atabus? drive ? flags 0x0000
#ep* at pci? dev ? function ? # 3Com 3c59x
#ex* at pci? dev ? function ? # 3Com 90x[BC]
#epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
-#esh* at pci? dev ? function ? # Essential HIPPI card
#fpa* at pci? dev ? function ? # DEC DEFPA FDDI
#fxp* at pci? dev ? function ? # Intel EtherExpress PRO10+/100B
#le* at pci? dev ? function ? # PCnet-PCI Ethernet
Index: src/sys/arch/evbarm/conf/IXDP425
diff -u src/sys/arch/evbarm/conf/IXDP425:1.56 src/sys/arch/evbarm/conf/IXDP425:1.57
--- src/sys/arch/evbarm/conf/IXDP425:1.56 Wed Dec 12 06:29:36 2018
+++ src/sys/arch/evbarm/conf/IXDP425 Sun Jan 19 06:55:23 2020
@@ -1,4 +1,4 @@
-# $NetBSD: IXDP425,v 1.56 2018/12/12 06:29:36 maxv Exp $
+# $NetBSD: IXDP425,v 1.57 2020/01/19 06:55:23 thorpej Exp $
#
# IXDP425 -- Intel IXDP425/IXCDP1100 Development Platform
#
@@ -168,7 +168,6 @@ an* at pci? dev ? function ? # Aironet P
bge* at pci? dev ? function ? # Broadcom 570x gigabit Ethernet
ep* at pci? dev ? function ? # 3Com 3c59x
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
-esh* at pci? dev ? function ? # Essential HIPPI card
ex* at pci? dev ? function ? # 3Com 90x[BC]
fpa* at pci? dev ? function ? # DEC DEFPA FDDI
fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
Index: src/sys/arch/evbarm/conf/ZAO425
diff -u src/sys/arch/evbarm/conf/ZAO425:1.64 src/sys/arch/evbarm/conf/ZAO425:1.65
--- src/sys/arch/evbarm/conf/ZAO425:1.64 Wed Dec 12 06:29:36 2018
+++ src/sys/arch/evbarm/conf/ZAO425 Sun Jan 19 06:55:23 2020
@@ -1,4 +1,4 @@
-# $NetBSD: ZAO425,v 1.64 2018/12/12 06:29:36 maxv Exp $
+# $NetBSD: ZAO425,v 1.65 2020/01/19 06:55:23 thorpej Exp $
#
# ZAO425 -- Intel IXP425
#
@@ -155,7 +155,6 @@ an* at pci? dev ? function ? # Aironet P
bge* at pci? dev ? function ? # Broadcom 570x gigabit Ethernet
ep* at pci? dev ? function ? # 3Com 3c59x
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
-esh* at pci? dev ? function ? # Essential HIPPI card
ex* at pci? dev ? function ? # 3Com 90x[BC]
fpa* at pci? dev ? function ? # DEC DEFPA FDDI
fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
Index: src/sys/arch/evbmips/conf/MALTA
diff -u src/sys/arch/evbmips/conf/MALTA:1.97 src/sys/arch/evbmips/conf/MALTA:1.98
--- src/sys/arch/evbmips/conf/MALTA:1.97 Sun Jan 19 01:25:05 2020
+++ src/sys/arch/evbmips/conf/MALTA Sun Jan 19 06:55:23 2020
@@ -1,10 +1,10 @@
-# $NetBSD: MALTA,v 1.97 2020/01/19 01:25:05 thorpej Exp $
+# $NetBSD: MALTA,v 1.98 2020/01/19 06:55:23 thorpej Exp $
include "arch/evbmips/conf/std.malta"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "MALTA-$Revision: 1.97 $"
+#ident "MALTA-$Revision: 1.98 $"
maxusers 32
@@ -217,7 +217,6 @@ ath* at pci? dev ? function ? # Atheros
#ep* at pci? dev ? function ? # 3Com 3c59x
#ex* at pci? dev ? function ? # 3Com 90x[B]
#epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
-#esh* at pci? dev ? function ? # Essential HIPPI card
#fpa* at pci? dev ? function ? # DEC DEFPA FDDI
#fxp* at pci? dev ? function ? # Intel EtherExpress PRO10+/100B
#le* at pci? dev ? function ? # PCnet-PCI Ethernet
Index: src/sys/arch/evbppc/conf/PMPPC
diff -u src/sys/arch/evbppc/conf/PMPPC:1.50 src/sys/arch/evbppc/conf/PMPPC:1.51
--- src/sys/arch/evbppc/conf/PMPPC:1.50 Fri Apr 26 21:40:29 2019
+++ src/sys/arch/evbppc/conf/PMPPC Sun Jan 19 06:55:23 2020
@@ -1,4 +1,4 @@
-# $NetBSD: PMPPC,v 1.50 2019/04/26 21:40:29 sevan Exp $
+# $NetBSD: PMPPC,v 1.51 2020/01/19 06:55:23 thorpej Exp $
#
# PMPPC
#
@@ -229,7 +229,6 @@ icpsp* at icp? unit ? # SCSI pass-thro
an* at pci? dev ? function ? # Aironet PC4500/PC4800 (802.11)
ep* at pci? dev ? function ? # 3Com 3c59x
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
-esh* at pci? dev ? function ? # Essential HIPPI card
ex* at pci? dev ? function ? # 3Com 90x[BC]
fpa* at pci? dev ? function ? # DEC DEFPA FDDI
fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
Index: src/sys/arch/hppa/conf/GENERIC
diff -u src/sys/arch/hppa/conf/GENERIC:1.28 src/sys/arch/hppa/conf/GENERIC:1.29
--- src/sys/arch/hppa/conf/GENERIC:1.28 Sun Jan 19 01:25:05 2020
+++ src/sys/arch/hppa/conf/GENERIC Sun Jan 19 06:55:23 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.28 2020/01/19 01:25:05 thorpej Exp $
+# $NetBSD: GENERIC,v 1.29 2020/01/19 06:55:23 thorpej Exp $
#
# GENERIC machine description file
#
@@ -23,7 +23,7 @@ include "arch/hppa/conf/std.hppa"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
-#ident "GENERIC-$Revision: 1.28 $"
+#ident "GENERIC-$Revision: 1.29 $"
maxusers 32 # estimated number of users
@@ -464,7 +464,6 @@ bce* at pci? dev ? function ? # Broadco
bge* at pci? dev ? function ? # Broadcom 570x gigabit Ethernet
ep* at pci? dev ? function ? # 3Com 3c59x
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
-esh* at pci? dev ? function ? # Essential HIPPI card
ex* at pci? dev ? function ? # 3Com 90x[BC]
# fpa is broken, does funky things with bus_dma
#fpa* at pci? dev ? function ? # DEC DEFPA FDDI
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.481 src/sys/arch/i386/conf/ALL:1.482
--- src/sys/arch/i386/conf/ALL:1.481 Sun Jan 19 01:25:05 2020
+++ src/sys/arch/i386/conf/ALL Sun Jan 19 06:55:23 2020
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.481 2020/01/19 01:25:05 thorpej Exp $
+# $NetBSD: ALL,v 1.482 2020/01/19 06:55:23 thorpej 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.481 $"
+#ident "ALL-$Revision: 1.482 $"
maxusers 64 # estimated number of users
@@ -1056,7 +1056,6 @@ cas* at pci? dev ? function ? # Sun Cass
dge* at pci? dev ? function ? # Intel 82597 10GbE LR
ep* at pci? dev ? function ? # 3Com 3c59x
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
-esh* at pci? dev ? function ? # Essential HIPPI card
et* at pci? dev ? function ? # Agere/LSI ET1310/ET1301 Gigabit
ex* at pci? dev ? function ? # 3Com 3c90x[BC]
fpa* at pci? dev ? function ? # DEC DEFPA FDDI
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1219 src/sys/arch/i386/conf/GENERIC:1.1220
--- src/sys/arch/i386/conf/GENERIC:1.1219 Sun Jan 19 01:25:05 2020
+++ src/sys/arch/i386/conf/GENERIC Sun Jan 19 06:55:23 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1219 2020/01/19 01:25:05 thorpej Exp $
+# $NetBSD: GENERIC,v 1.1220 2020/01/19 06:55:23 thorpej Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1219 $"
+#ident "GENERIC-$Revision: 1.1220 $"
maxusers 64 # estimated number of users
@@ -971,7 +971,6 @@ bwfm* at pci? dev ? function ? # Broadco
dge* at pci? dev ? function ? # Intel 82597 10GbE LR
ep* at pci? dev ? function ? # 3Com 3c59x
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
-esh* at pci? dev ? function ? # Essential HIPPI card
et* at pci? dev ? function ? # Agere/LSI ET1310/ET1301 Gigabit
ex* at pci? dev ? function ? # 3Com 3c90x[BC]
fpa* at pci? dev ? function ? # DEC DEFPA FDDI
Index: src/sys/arch/i386/conf/GENERIC_TINY
diff -u src/sys/arch/i386/conf/GENERIC_TINY:1.164 src/sys/arch/i386/conf/GENERIC_TINY:1.165
--- src/sys/arch/i386/conf/GENERIC_TINY:1.164 Sun Jan 19 01:25:05 2020
+++ src/sys/arch/i386/conf/GENERIC_TINY Sun Jan 19 06:55:23 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_TINY,v 1.164 2020/01/19 01:25:05 thorpej Exp $
+# $NetBSD: GENERIC_TINY,v 1.165 2020/01/19 06:55:23 thorpej Exp $
#
# GENERIC_TINY -- suitable default for 4M machines
# No EISA, PCI, or SCSI.
@@ -365,7 +365,6 @@ fd* at fdc? drive ? # the drives thems
# PCI network interfaces
#ep* at pci? dev ? function ? # 3Com 3c59x/3c90x Ethernet
#epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
-#esh* at pci? dev ? function ? # Essential HIPPI card
#fpa* at pci? dev ? function ? # DEC DEFPA FDDI
#fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
#le* at pci? dev ? function ? # PCnet-PCI Ethernet
Index: src/sys/arch/i386/conf/INSTALL_FLOPPY
diff -u src/sys/arch/i386/conf/INSTALL_FLOPPY:1.50 src/sys/arch/i386/conf/INSTALL_FLOPPY:1.51
--- src/sys/arch/i386/conf/INSTALL_FLOPPY:1.50 Sun Jan 19 01:25:05 2020
+++ src/sys/arch/i386/conf/INSTALL_FLOPPY Sun Jan 19 06:55:23 2020
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_FLOPPY,v 1.50 2020/01/19 01:25:05 thorpej Exp $
+# $NetBSD: INSTALL_FLOPPY,v 1.51 2020/01/19 06:55:23 thorpej Exp $
#
# INSTALL - Installation kernel.
#
@@ -482,7 +482,6 @@ bge* at pci? dev ? function ? # Broadcom
ep* at pci? dev ? function ? # 3Com 3c59x
ex* at pci? dev ? function ? # 3Com 3c90x[BC]
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
-#esh* at pci? dev ? function ? # Essential HIPPI card
fpa* at pci? dev ? function ? # DEC DEFPA FDDI
fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
gsip* at pci? dev ? function ? # NS83820 Gigabit Ethernet
Index: src/sys/arch/i386/conf/XEN3PAE_DOM0
diff -u src/sys/arch/i386/conf/XEN3PAE_DOM0:1.16 src/sys/arch/i386/conf/XEN3PAE_DOM0:1.17
--- src/sys/arch/i386/conf/XEN3PAE_DOM0:1.16 Sun Jan 19 01:25:05 2020
+++ src/sys/arch/i386/conf/XEN3PAE_DOM0 Sun Jan 19 06:55:23 2020
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3PAE_DOM0,v 1.16 2020/01/19 01:25:05 thorpej Exp $
+# $NetBSD: XEN3PAE_DOM0,v 1.17 2020/01/19 06:55:23 thorpej Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -321,7 +321,6 @@ bnx* at pci? dev ? function ? # Broadcom
dge* at pci? dev ? function ? # Intel 82597 10GbE LR
ep* at pci? dev ? function ? # 3Com 3c59x
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
-esh* at pci? dev ? function ? # Essential HIPPI card
et* at pci? dev ? function ? # Agere/LSI ET1310/ET1301 Gigabit
ex* at pci? dev ? function ? # 3Com 3c90x[BC]
fpa* at pci? dev ? function ? # DEC DEFPA FDDI
Index: src/sys/arch/sgimips/conf/GENERIC32_IP3x
diff -u src/sys/arch/sgimips/conf/GENERIC32_IP3x:1.127 src/sys/arch/sgimips/conf/GENERIC32_IP3x:1.128
--- src/sys/arch/sgimips/conf/GENERIC32_IP3x:1.127 Sun Jan 19 01:25:07 2020
+++ src/sys/arch/sgimips/conf/GENERIC32_IP3x Sun Jan 19 06:55:23 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC32_IP3x,v 1.127 2020/01/19 01:25:07 thorpej Exp $
+# $NetBSD: GENERIC32_IP3x,v 1.128 2020/01/19 06:55:23 thorpej Exp $
#
# GENERIC32_IP3x machine description file
#
@@ -28,7 +28,7 @@ makeoptions TEXTADDR="0x80069000" # entr
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC32_IP3x-$Revision: 1.127 $"
+#ident "GENERIC32_IP3x-$Revision: 1.128 $"
maxusers 32
@@ -180,7 +180,6 @@ ubsec* at pci? dev ? function ? # Broadc
#bge* at pci? dev ? function ? # Broadcom 570x gigabit Ethernet
ep* at pci? dev ? function ? # 3Com 3c59x
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
-esh* at pci? dev ? function ? # Essential HIPPI card
ex* at pci? dev ? function ? # 3Com 90x[BC]
fpa* at pci? dev ? function ? # DEC DEFPA FDDI
fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
Index: src/sys/arch/sparc64/conf/GENERIC
diff -u src/sys/arch/sparc64/conf/GENERIC:1.219 src/sys/arch/sparc64/conf/GENERIC:1.220
--- src/sys/arch/sparc64/conf/GENERIC:1.219 Sun Jan 19 01:25:07 2020
+++ src/sys/arch/sparc64/conf/GENERIC Sun Jan 19 06:55:24 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.219 2020/01/19 01:25:07 thorpej Exp $
+# $NetBSD: GENERIC,v 1.220 2020/01/19 06:55:24 thorpej Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/sparc64/conf/std.sparc64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.219 $"
+#ident "GENERIC-$Revision: 1.220 $"
maxusers 64
@@ -490,7 +490,6 @@ cas* at pci? dev ? function ? # Sun Cass
# XXX causes ICE
#ep* at pci? dev ? function ? # 3Com 3c59x
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
-esh* at pci? dev ? function ? # Essential HIPPI card UT
ex* at pci? dev ? function ? # 3Com 90x[B]
fpa* at pci? dev ? function ? # DEC DEFPA FDDI UT
fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1249 src/sys/conf/files:1.1250
--- src/sys/conf/files:1.1249 Wed Jan 8 12:04:56 2020
+++ src/sys/conf/files Sun Jan 19 06:55:24 2020
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1249 2020/01/08 12:04:56 ad Exp $
+# $NetBSD: files,v 1.1250 2020/01/19 06:55:24 thorpej Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20171118
@@ -924,11 +924,6 @@ file dev/ic/clmpcc.c clmpcc needs-fl
device ug: sysmon_envsys
file dev/ic/ug.c ug needs-flag
-# Essential Communications Corp. HIPPI Interface
-#
-device esh: hippi, ifnet
-file dev/ic/rrunner.c esh needs-flag
-
# SMC 90c26, SMC 90C56 (and 90C66 if in compat mode) chip driver
#
device bah: ifnet, arcnet, arp
Index: src/sys/dev/ic/Makefile
diff -u src/sys/dev/ic/Makefile:1.26 src/sys/dev/ic/Makefile:1.27
--- src/sys/dev/ic/Makefile:1.26 Sat Nov 25 16:31:03 2017
+++ src/sys/dev/ic/Makefile Sun Jan 19 06:55:21 2020
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2017/11/25 16:31:03 jmcneill Exp $
+# $NetBSD: Makefile,v 1.27 2020/01/19 06:55:21 thorpej Exp $
INCSDIR= /usr/include/dev/ic
# Only install includes which are used by userland
INCS= athioctl.h bt8xx.h hd44780var.h icpreg.h icp_ioctl.h isp_ioctl.h \
- mlxreg.h mlxio.h nvmeio.h nvmereg.h qemufwcfgio.h rrunnerreg.h \
- rrunnervar.h wdcreg.h wi_ieee.h
+ mlxreg.h mlxio.h nvmeio.h nvmereg.h qemufwcfgio.h wdcreg.h wi_ieee.h
.include <bsd.kinc.mk>
Index: src/sys/dev/pci/files.pci
diff -u src/sys/dev/pci/files.pci:1.421 src/sys/dev/pci/files.pci:1.422
--- src/sys/dev/pci/files.pci:1.421 Fri Jan 17 05:22:42 2020
+++ src/sys/dev/pci/files.pci Sun Jan 19 06:55:21 2020
@@ -1,4 +1,4 @@
-# $NetBSD: files.pci,v 1.421 2020/01/17 05:22:42 ryo Exp $
+# $NetBSD: files.pci,v 1.422 2020/01/19 06:55:21 thorpej Exp $
#
# Config file and device description for machine-independent PCI code.
# Included by ports that need it. Requires that the SCSI files be
@@ -432,11 +432,6 @@ file dev/pci/if_tl.c tl
attach ntwoc at pci with ntwoc_pci
file dev/pci/if_ntwoc_pci.c ntwoc_pci
-# Essential Communications HIPPI interface
-# device declaration in sys/conf/files
-attach esh at pci with esh_pci
-file dev/pci/if_esh_pci.c esh_pci
-
# generic PCI VGA
defflag opt_vga.h VGA_POST: X86EMU
attach vga at pci with vga_pci
Index: src/sys/net/Makefile
diff -u src/sys/net/Makefile:1.38 src/sys/net/Makefile:1.39
--- src/sys/net/Makefile:1.38 Thu Sep 6 06:42:00 2018
+++ src/sys/net/Makefile Sun Jan 19 06:55:21 2020
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.38 2018/09/06 06:42:00 maxv Exp $
+# $NetBSD: Makefile,v 1.39 2020/01/19 06:55:21 thorpej Exp $
INCSDIR= /usr/include/net
INCS= bpf.h bpfjit.h bpfdesc.h dlt.h ethertypes.h if.h if_arc.h if_arp.h \
if_bridgevar.h if_dl.h if_ether.h if_fddi.h if_gif.h \
- if_gre.h if_hippi.h if_ieee1394.h if_ipsec.h if_llc.h if_media.h if_mpls.h \
+ if_gre.h if_ieee1394.h if_ipsec.h if_llc.h if_media.h if_mpls.h \
if_pflog.h if_ppp.h if_pppoe.h if_l2tp.h if_sppp.h if_srt.h if_stf.h \
if_tap.h if_token.h if_tun.h if_types.h if_vlanvar.h net_stats.h \
netisr.h pfil.h pfkeyv2.h pfvar.h ppp-comp.h ppp_defs.h radix.h \
Index: src/sys/net/files.net
diff -u src/sys/net/files.net:1.21 src/sys/net/files.net:1.22
--- src/sys/net/files.net:1.21 Sun Jan 19 01:25:03 2020
+++ src/sys/net/files.net Sun Jan 19 06:55:21 2020
@@ -1,4 +1,4 @@
-# $NetBSD: files.net,v 1.21 2020/01/19 01:25:03 thorpej Exp $
+# $NetBSD: files.net,v 1.22 2020/01/19 06:55:21 thorpej Exp $
# XXX CLEANUP
define net
@@ -18,7 +18,6 @@ file net/if_faith.c faith & (inet | in
file net/if_fddisubr.c fddi needs-flag
file net/if_gif.c gif needs-flag
file net/if_gre.c gre needs-flag
-file net/if_hippisubr.c hippi needs-flag
file net/if_ieee1394subr.c ieee1394
file net/if_ipsec.c ipsec & ipsecif
file net/if_llatbl.c inet | inet6
Index: src/usr.sbin/Makefile
diff -u src/usr.sbin/Makefile:1.282 src/usr.sbin/Makefile:1.283
--- src/usr.sbin/Makefile:1.282 Mon Oct 28 13:04:18 2019
+++ src/usr.sbin/Makefile Sun Jan 19 06:55:24 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.282 2019/10/28 13:04:18 maxv Exp $
+# $NetBSD: Makefile,v 1.283 2020/01/19 06:55:24 thorpej Exp $
# from: @(#)Makefile 5.20 (Berkeley) 6/12/93
.include <bsd.own.mk>
@@ -7,7 +7,7 @@ SUBDIR= ac accton acpitools altq apm apm
bad144 bootp bta2dpd btattach btconfig btdevctl bthcid btpand catman \
chroot cnwctl cpuctl crash \
dev_mkdb diskpart dumpfs dumplfs \
- edquota eeprom envstat eshconfig etcupdate extattrctl \
+ edquota eeprom envstat etcupdate extattrctl \
flashctl fssconfig fstyp fusermount fwctl \
gpioctl grfconfig gspa \
hdaudioctl \
