Module Name: src
Committed By: maxv
Date: Sun Jan 27 08:53:31 UTC 2019
Modified Files:
src/distrib/sets/lists/comp: mi
src/etc: MAKEDEV.tmpl
src/etc/etc.algor: MAKEDEV.conf
src/etc/etc.alpha: MAKEDEV.conf
src/etc/etc.amd64: MAKEDEV.conf
src/etc/etc.bebox: MAKEDEV.conf
src/etc/etc.evbmips: MAKEDEV.conf
src/etc/etc.i386: MAKEDEV.conf
src/etc/etc.ia64: MAKEDEV.conf
src/etc/etc.ofppc: MAKEDEV.conf
src/etc/etc.sbmips: MAKEDEV.conf
src/share/man/man9: ioctl.9
src/sys/arch/algor/conf: majors.algor
src/sys/arch/alpha/conf: GENERIC majors.alpha
src/sys/arch/amd64/conf: ALL majors.amd64
src/sys/arch/bebox/conf: majors.bebox
src/sys/arch/evbmips/conf: majors.evbmips
src/sys/arch/i386/conf: ALL GENERIC GENERIC_TINY INSTALL_FLOPPY
INSTALL_TINY majors.i386
src/sys/arch/ia64/conf: majors.ia64
src/sys/arch/ibmnws/conf: majors.ibmnws
src/sys/arch/mvmeppc/conf: majors.mvmeppc
src/sys/arch/powerpc/conf: majors.powerpc
src/sys/arch/prep/conf: majors.prep
src/sys/arch/riscv/conf: majors.riscv
src/sys/dev: DEVNAMES
src/sys/dev/isa: Makefile files.isa
src/sys/rump/librump/rumpkern: devsw.c
Removed Files:
src/sys/dev/isa: satlink.c satlinkio.h satlinkreg.h
Log Message:
Remove the satlink driver. It was disabled everywhere, had no man page and
no use either. Spotted by thorpej in PR/21345, ok christos.
To generate a diff of this commit:
cvs rdiff -u -r1.2252 -r1.2253 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.196 -r1.197 src/etc/MAKEDEV.tmpl
cvs rdiff -u -r1.6 -r1.7 src/etc/etc.algor/MAKEDEV.conf
cvs rdiff -u -r1.12 -r1.13 src/etc/etc.alpha/MAKEDEV.conf
cvs rdiff -u -r1.26 -r1.27 src/etc/etc.amd64/MAKEDEV.conf
cvs rdiff -u -r1.9 -r1.10 src/etc/etc.bebox/MAKEDEV.conf
cvs rdiff -u -r1.9 -r1.10 src/etc/etc.evbmips/MAKEDEV.conf
cvs rdiff -u -r1.28 -r1.29 src/etc/etc.i386/MAKEDEV.conf
cvs rdiff -u -r1.2 -r1.3 src/etc/etc.ia64/MAKEDEV.conf
cvs rdiff -u -r1.10 -r1.11 src/etc/etc.ofppc/MAKEDEV.conf
cvs rdiff -u -r1.5 -r1.6 src/etc/etc.sbmips/MAKEDEV.conf
cvs rdiff -u -r1.33 -r1.34 src/share/man/man9/ioctl.9
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/algor/conf/majors.algor
cvs rdiff -u -r1.387 -r1.388 src/sys/arch/alpha/conf/GENERIC
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/alpha/conf/majors.alpha
cvs rdiff -u -r1.113 -r1.114 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/amd64/conf/majors.amd64
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/bebox/conf/majors.bebox
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/evbmips/conf/majors.evbmips
cvs rdiff -u -r1.461 -r1.462 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1199 -r1.1200 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.161 -r1.162 src/sys/arch/i386/conf/GENERIC_TINY
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/i386/conf/INSTALL_FLOPPY
cvs rdiff -u -r1.158 -r1.159 src/sys/arch/i386/conf/INSTALL_TINY
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/i386/conf/majors.i386
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/ia64/conf/majors.ia64
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/ibmnws/conf/majors.ibmnws
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/mvmeppc/conf/majors.mvmeppc
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/powerpc/conf/majors.powerpc
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/prep/conf/majors.prep
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/riscv/conf/majors.riscv
cvs rdiff -u -r1.319 -r1.320 src/sys/dev/DEVNAMES
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/isa/Makefile
cvs rdiff -u -r1.171 -r1.172 src/sys/dev/isa/files.isa
cvs rdiff -u -r1.46 -r0 src/sys/dev/isa/satlink.c
cvs rdiff -u -r1.4 -r0 src/sys/dev/isa/satlinkio.h
cvs rdiff -u -r1.3 -r0 src/sys/dev/isa/satlinkreg.h
cvs rdiff -u -r1.9 -r1.10 src/sys/rump/librump/rumpkern/devsw.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/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2252 src/distrib/sets/lists/comp/mi:1.2253
--- src/distrib/sets/lists/comp/mi:1.2252 Thu Jan 24 21:51:15 2019
+++ src/distrib/sets/lists/comp/mi Sun Jan 27 08:53:28 2019
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.2252 2019/01/24 21:51:15 mrg Exp $
+# $NetBSD: mi,v 1.2253 2019/01/27 08:53:28 maxv Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
./etc/mtree/set.comp comp-sys-root
@@ -583,7 +583,7 @@
./usr/include/dev/isa/pcppireg.h comp-obsolete obsolete
./usr/include/dev/isa/pcppivar.h comp-obsolete obsolete
./usr/include/dev/isa/pssreg.h comp-obsolete obsolete
-./usr/include/dev/isa/satlinkio.h comp-c-include
+./usr/include/dev/isa/satlinkio.h comp-obsolete obsolete
./usr/include/dev/isa/satlinkreg.h comp-obsolete obsolete
./usr/include/dev/isa/sbdspvar.h comp-obsolete obsolete
./usr/include/dev/isa/sbreg.h comp-obsolete obsolete
Index: src/etc/MAKEDEV.tmpl
diff -u src/etc/MAKEDEV.tmpl:1.196 src/etc/MAKEDEV.tmpl:1.197
--- src/etc/MAKEDEV.tmpl:1.196 Wed Nov 7 07:43:07 2018
+++ src/etc/MAKEDEV.tmpl Sun Jan 27 08:53:28 2019
@@ -1,5 +1,5 @@
#!/bin/sh -
-# $NetBSD: MAKEDEV.tmpl,v 1.196 2018/11/07 07:43:07 maxv Exp $
+# $NetBSD: MAKEDEV.tmpl,v 1.197 2019/01/27 08:53:28 maxv Exp $
#
# Copyright (c) 2003,2007,2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -268,7 +268,6 @@
# radio* radio devices
# random Random number generator
# rtc* RealTimeClock
-# satlink* PlanetConnect satellite receiver driver
# scsibus* SCSI busses
# se* SCSI Ethernet
# ses* SES/SAF-TE SCSI Devices
@@ -1601,11 +1600,6 @@ apm)
mkdev apmctl c %apmdev_chr% 8 644
;;
-satlink[0-9]*)
- unit=${i#satlink}
- mkdev satlink$unit c %satlink_chr% $unit 444
- ;;
-
random)
mkdev random c %rnd_chr% 0 444
mkdev urandom c %rnd_chr% 1 644
Index: src/etc/etc.algor/MAKEDEV.conf
diff -u src/etc/etc.algor/MAKEDEV.conf:1.6 src/etc/etc.algor/MAKEDEV.conf:1.7
--- src/etc/etc.algor/MAKEDEV.conf:1.6 Sun Sep 23 09:20:57 2018
+++ src/etc/etc.algor/MAKEDEV.conf Sun Jan 27 08:53:28 2019
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.6 2018/09/23 09:20:57 maxv Exp $
+# $NetBSD: MAKEDEV.conf,v 1.7 2019/01/27 08:53:28 maxv Exp $
all_md)
makedev wscons sd0 sd1 sd2 sd3 sd4
@@ -7,7 +7,7 @@ all_md)
makedev ld0 ld1 ld2 ld3
makedev ttyC0 ttyC1
makedev lpa0 lpt0 audio speaker wd0 wd1 fd0 fd1
- makedev satlink0 speaker mlx0
+ makedev speaker mlx0
makedev scsibus0 scsibus1 scsibus2 scsibus3
makedev ses0 ses1 ses2 ses3
makedev usbs
Index: src/etc/etc.alpha/MAKEDEV.conf
diff -u src/etc/etc.alpha/MAKEDEV.conf:1.12 src/etc/etc.alpha/MAKEDEV.conf:1.13
--- src/etc/etc.alpha/MAKEDEV.conf:1.12 Sun Sep 23 09:20:57 2018
+++ src/etc/etc.alpha/MAKEDEV.conf Sun Jan 27 08:53:28 2019
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.12 2018/09/23 09:20:57 maxv Exp $
+# $NetBSD: MAKEDEV.conf,v 1.13 2019/01/27 08:53:28 maxv Exp $
all_md)
makedev wscons stic0 sd0 sd1 sd2 sd3 sd4
@@ -7,7 +7,7 @@ all_md)
makedev ld0 ld1 ld2 ld3
makedev ttyB0 ttyB1 ttyC0 ttyC1
makedev lpa0 lpt0 audio wd0 wd1 fd0 fd1
- makedev satlink0 speaker mlx0
+ makedev speaker mlx0
makedev scsibus0 scsibus1 scsibus2 scsibus3
makedev ses0 ses1 ses2 ses3
makedev sysmon
Index: src/etc/etc.amd64/MAKEDEV.conf
diff -u src/etc/etc.amd64/MAKEDEV.conf:1.26 src/etc/etc.amd64/MAKEDEV.conf:1.27
--- src/etc/etc.amd64/MAKEDEV.conf:1.26 Sun Dec 23 12:18:30 2018
+++ src/etc/etc.amd64/MAKEDEV.conf Sun Jan 27 08:53:28 2019
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.26 2018/12/23 12:18:30 maxv Exp $
+# $NetBSD: MAKEDEV.conf,v 1.27 2019/01/27 08:53:28 maxv Exp $
# As of 2003-04-17, the "init" case must not create more than 890 entries.
all_md)
@@ -26,7 +26,6 @@ all_md)
makedev lpt0 lpt1 lpt2
makedev ss0 uk0 uk1
makedev speaker joy0 joy1
- makedev satlink0
makedev audio
makedev radio
makedev music rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7
Index: src/etc/etc.bebox/MAKEDEV.conf
diff -u src/etc/etc.bebox/MAKEDEV.conf:1.9 src/etc/etc.bebox/MAKEDEV.conf:1.10
--- src/etc/etc.bebox/MAKEDEV.conf:1.9 Sun Sep 23 09:20:58 2018
+++ src/etc/etc.bebox/MAKEDEV.conf Sun Jan 27 08:53:28 2019
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.9 2018/09/23 09:20:58 maxv Exp $
+# $NetBSD: MAKEDEV.conf,v 1.10 2019/01/27 08:53:28 maxv Exp $
all_md)
makedev wt0 fd0 fd1 wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3 sd4
@@ -6,7 +6,7 @@ all_md)
makedev st0 st1 ch0 cd0 cd1 lpa0 lpa1 lpa2
makedev lpt0 lpt1 lpt2 ttyv0 tun0 tun1
makedev ss0 ch0 uk0 uk1 ttyCY0
- makedev speaker audio joy0 joy1 satlink0
+ makedev speaker audio joy0 joy1
makedev ttyv0 wscons
makedev scsibus0 scsibus1 scsibus2 scsibus3
makedev ses0 ses1 ses2 ses3
Index: src/etc/etc.evbmips/MAKEDEV.conf
diff -u src/etc/etc.evbmips/MAKEDEV.conf:1.9 src/etc/etc.evbmips/MAKEDEV.conf:1.10
--- src/etc/etc.evbmips/MAKEDEV.conf:1.9 Sun Sep 23 09:20:58 2018
+++ src/etc/etc.evbmips/MAKEDEV.conf Sun Jan 27 08:53:29 2019
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.9 2018/09/23 09:20:58 maxv Exp $
+# $NetBSD: MAKEDEV.conf,v 1.10 2019/01/27 08:53:29 maxv Exp $
# When creating a /dev file system on MFS, init makes a FS that leaves
# only 890 (or so) inodes free. Therefore the "init" case (used by
@@ -25,7 +25,7 @@ all_md)
makedev ld0 ld1 ld2 ld3
makedev tty00 tty01
makedev lpa0 lpt0 audio wd0 wd1 wd2 wd3 fd0 fd1
- makedev satlink0 speaker mlx0
+ makedev speaker mlx0
makedev scsibus0 scsibus1 scsibus2 scsibus3
makedev ses0 ses1 ses2 ses3
makedev usbs
Index: src/etc/etc.i386/MAKEDEV.conf
diff -u src/etc/etc.i386/MAKEDEV.conf:1.28 src/etc/etc.i386/MAKEDEV.conf:1.29
--- src/etc/etc.i386/MAKEDEV.conf:1.28 Tue Nov 27 14:55:56 2018
+++ src/etc/etc.i386/MAKEDEV.conf Sun Jan 27 08:53:29 2019
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.28 2018/11/27 14:55:56 msaitoh Exp $
+# $NetBSD: MAKEDEV.conf,v 1.29 2019/01/27 08:53:29 maxv Exp $
# As of 2005-03-15, the "init" case must not create more than 1024 entries.
all_md)
@@ -27,7 +27,7 @@ all_md)
makedev lpt0 lpt1 lpt2
makedev ss0 uk0 uk1
makedev speaker joy0 joy1
- makedev apm satlink0
+ makedev apm
makedev cmos
makedev audio
makedev radio
Index: src/etc/etc.ia64/MAKEDEV.conf
diff -u src/etc/etc.ia64/MAKEDEV.conf:1.2 src/etc/etc.ia64/MAKEDEV.conf:1.3
--- src/etc/etc.ia64/MAKEDEV.conf:1.2 Sun Sep 23 09:20:59 2018
+++ src/etc/etc.ia64/MAKEDEV.conf Sun Jan 27 08:53:29 2019
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.2 2018/09/23 09:20:59 maxv Exp $
+# $NetBSD: MAKEDEV.conf,v 1.3 2019/01/27 08:53:29 maxv Exp $
# As of 2005-03-15, the "init" case must not create more than 1024 entries.
all_md)
@@ -23,7 +23,7 @@ all_md)
makedev lpt0 lpt1 lpt2
makedev ss0 uk0 uk1
makedev speaker joy0 joy1
- makedev apm satlink0
+ makedev apm
makedev cmos
makedev audio
makedev radio
Index: src/etc/etc.ofppc/MAKEDEV.conf
diff -u src/etc/etc.ofppc/MAKEDEV.conf:1.10 src/etc/etc.ofppc/MAKEDEV.conf:1.11
--- src/etc/etc.ofppc/MAKEDEV.conf:1.10 Sun Sep 23 09:20:59 2018
+++ src/etc/etc.ofppc/MAKEDEV.conf Sun Jan 27 08:53:29 2019
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.10 2018/09/23 09:20:59 maxv Exp $
+# $NetBSD: MAKEDEV.conf,v 1.11 2019/01/27 08:53:29 maxv Exp $
all_md)
makedev wscons sd0 sd1 sd2 st0 st1 cd0 cd1 wd0 wd1 fd0 fd1
@@ -13,7 +13,7 @@ all_md)
makedev pci0 pci1 pci2 pci3 pci4 pci5 pci6 pci7
makedev altq sysmon bktr radio kttcp
makedev lpt0 lpt1 lpt2 tun0 tun1
- makedev speaker joy0 joy1 satlink0
+ makedev speaker joy0 joy1
makedev xlcom0
makedev cfs
;;
Index: src/etc/etc.sbmips/MAKEDEV.conf
diff -u src/etc/etc.sbmips/MAKEDEV.conf:1.5 src/etc/etc.sbmips/MAKEDEV.conf:1.6
--- src/etc/etc.sbmips/MAKEDEV.conf:1.5 Sun Sep 23 09:21:00 2018
+++ src/etc/etc.sbmips/MAKEDEV.conf Sun Jan 27 08:53:29 2019
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.5 2018/09/23 09:21:00 maxv Exp $
+# $NetBSD: MAKEDEV.conf,v 1.6 2019/01/27 08:53:29 maxv Exp $
# When creating a /dev file system on MFS, init makes a FS that leaves
# only 890 (or so) inodes free. Therefore the "init" case (used by
@@ -23,7 +23,7 @@ all_md)
makedev ss0 ss1 uk0 uk1
makedev ld0 ld1 ld2 ld3
makedev tty00 tty01
- makedev satlink0 mlx0
+ makedev mlx0
makedev scsibus0 scsibus1 scsibus2 scsibus3
makedev usbs
makedev ttyCZ0 ttyCY0
Index: src/share/man/man9/ioctl.9
diff -u src/share/man/man9/ioctl.9:1.33 src/share/man/man9/ioctl.9:1.34
--- src/share/man/man9/ioctl.9:1.33 Sun Sep 23 09:21:00 2018
+++ src/share/man/man9/ioctl.9 Sun Jan 27 08:53:29 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: ioctl.9,v 1.33 2018/09/23 09:21:00 maxv Exp $
+.\" $NetBSD: ioctl.9,v 1.34 2019/01/27 08:53:29 maxv Exp $
.\"
.\" Copyright (c) 1999 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd September 23, 2018
+.Dd January 27, 2019
.Dt IOCTL 9
.Os
.Sh NAME
@@ -184,8 +184,6 @@ the routing subsystem
.Xr rnd 4
.It 's'
the socket layer
-.It 's'
-satlink devices
.It 'S'
SCSI disks (arc, hp300, pmax)
.It 'S'
Index: src/sys/arch/algor/conf/majors.algor
diff -u src/sys/arch/algor/conf/majors.algor:1.24 src/sys/arch/algor/conf/majors.algor:1.25
--- src/sys/arch/algor/conf/majors.algor:1.24 Sun Sep 23 09:21:01 2018
+++ src/sys/arch/algor/conf/majors.algor Sun Jan 27 08:53:29 2019
@@ -1,4 +1,4 @@
-# $NetBSD: majors.algor,v 1.24 2018/09/23 09:21:01 maxv Exp $
+# $NetBSD: majors.algor,v 1.25 2019/01/27 08:53:29 maxv Exp $
#
# Device majors for algor
#
@@ -34,7 +34,6 @@ device-major fd char 34 block 0 fdc
device-major ipl char 35 ipfilter
device-major wd char 36 block 4 wd
device-major se char 37 se
-device-major satlink char 38 satlink
device-major rnd char 39 rnd
device-major scsibus char 42 scsibus
Index: src/sys/arch/alpha/conf/GENERIC
diff -u src/sys/arch/alpha/conf/GENERIC:1.387 src/sys/arch/alpha/conf/GENERIC:1.388
--- src/sys/arch/alpha/conf/GENERIC:1.387 Sun Jan 27 02:08:37 2019
+++ src/sys/arch/alpha/conf/GENERIC Sun Jan 27 08:53:29 2019
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.387 2019/01/27 02:08:37 pgoyette Exp $
+# $NetBSD: GENERIC,v 1.388 2019/01/27 08:53:29 maxv 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.387 $"
+ident "GENERIC-$Revision: 1.388 $"
maxusers 32
@@ -457,7 +457,6 @@ uha* at isa? port 0x334 irq ? drq ? # Ul
pcic0 at isa? port 0x3e0 iomem 0xd0000 iosiz 0x10000
pcic1 at isa? port 0x3e2 iomem 0xcc000 iosiz 0x10000
pcmcia* at pcic? controller ? socket ?
-#satlink0 at isa? port 0x300 drq 1 # PlanetConnect Satellite receiver.
# EISA devices
ahb* at eisa? slot ? # Adaptec 174[024] SCSI (unt.)
Index: src/sys/arch/alpha/conf/majors.alpha
diff -u src/sys/arch/alpha/conf/majors.alpha:1.31 src/sys/arch/alpha/conf/majors.alpha:1.32
--- src/sys/arch/alpha/conf/majors.alpha:1.31 Sun Sep 23 09:21:01 2018
+++ src/sys/arch/alpha/conf/majors.alpha Sun Jan 27 08:53:29 2019
@@ -1,4 +1,4 @@
-# $NetBSD: majors.alpha,v 1.31 2018/09/23 09:21:01 maxv Exp $
+# $NetBSD: majors.alpha,v 1.32 2019/01/27 08:53:29 maxv Exp $
#
# Device majors for alpha
#
@@ -35,7 +35,6 @@ device-major fd char 34 block 0 fdc
device-major ipl char 35 ipfilter
device-major wd char 36 block 4 wd
device-major se char 37 se
-device-major satlink char 38 satlink
device-major rnd char 39 rnd
#device-major obsolete char 40 obsolete
device-major scsibus char 42 scsibus
Index: src/sys/arch/amd64/conf/ALL
diff -u src/sys/arch/amd64/conf/ALL:1.113 src/sys/arch/amd64/conf/ALL:1.114
--- src/sys/arch/amd64/conf/ALL:1.113 Sat Dec 29 11:30:11 2018
+++ src/sys/arch/amd64/conf/ALL Sun Jan 27 08:53:29 2019
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.113 2018/12/29 11:30:11 maxv Exp $
+# $NetBSD: ALL,v 1.114 2019/01/27 08:53:29 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.113 $"
+#ident "ALL-$Revision: 1.114 $"
maxusers 64 # estimated number of users
@@ -1548,10 +1548,6 @@ joy* at eso? # ESS Solo-1 on-board jo
# ISA joysticks. Probe is a little strange; add only if you have one.
joy0 at isa? port 0x201
-
-# Planetconnect Satellite receiver driver.
-satlink0 at isa? port 0x300 drq 1
-
# Middle Digital, Inc. PCI-Weasel serial console board control
# devices (watchdog timer, etc.)
weasel* at pci?
Index: src/sys/arch/amd64/conf/majors.amd64
diff -u src/sys/arch/amd64/conf/majors.amd64:1.29 src/sys/arch/amd64/conf/majors.amd64:1.30
--- src/sys/arch/amd64/conf/majors.amd64:1.29 Wed Dec 19 13:57:45 2018
+++ src/sys/arch/amd64/conf/majors.amd64 Sun Jan 27 08:53:29 2019
@@ -1,4 +1,4 @@
-# $NetBSD: majors.amd64,v 1.29 2018/12/19 13:57:45 maxv Exp $
+# $NetBSD: majors.amd64,v 1.30 2019/01/27 08:53:29 maxv Exp $
#
# Device majors for amd64
#
@@ -35,7 +35,6 @@ device-major tun char 40 tun
device-major vnd char 41 block 14 vnd
device-major audio char 42 audio
device-major ipl char 44 ipfilter
-device-major satlink char 45 satlink
device-major rnd char 46 rnd
device-major wsdisplay char 47 wsdisplay
device-major wskbd char 48 wskbd
Index: src/sys/arch/bebox/conf/majors.bebox
diff -u src/sys/arch/bebox/conf/majors.bebox:1.28 src/sys/arch/bebox/conf/majors.bebox:1.29
--- src/sys/arch/bebox/conf/majors.bebox:1.28 Wed Dec 19 13:57:46 2018
+++ src/sys/arch/bebox/conf/majors.bebox Sun Jan 27 08:53:29 2019
@@ -1,4 +1,4 @@
-# $NetBSD: majors.bebox,v 1.28 2018/12/19 13:57:46 maxv Exp $
+# $NetBSD: majors.bebox,v 1.29 2019/01/27 08:53:29 maxv Exp $
#
# Device majors for bebox
#
@@ -40,7 +40,6 @@ device-major tun char 40 tun
device-major vnd char 41 block 14 vnd
device-major audio char 42 audio
device-major ipl char 44 ipfilter
-device-major satlink char 45 satlink
device-major rnd char 46 rnd
device-major wsdisplay char 47 wsdisplay
device-major wskbd char 48 wskbd
Index: src/sys/arch/evbmips/conf/majors.evbmips
diff -u src/sys/arch/evbmips/conf/majors.evbmips:1.31 src/sys/arch/evbmips/conf/majors.evbmips:1.32
--- src/sys/arch/evbmips/conf/majors.evbmips:1.31 Sun Sep 23 09:21:02 2018
+++ src/sys/arch/evbmips/conf/majors.evbmips Sun Jan 27 08:53:29 2019
@@ -1,4 +1,4 @@
-# $NetBSD: majors.evbmips,v 1.31 2018/09/23 09:21:02 maxv Exp $
+# $NetBSD: majors.evbmips,v 1.32 2019/01/27 08:53:29 maxv Exp $
#
# Device majors for evbmips
#
@@ -36,7 +36,6 @@ device-major fd char 34 block 0 fdc
device-major ipl char 35 ipfilter
device-major wd char 36 block 4 wd
device-major se char 37 se
-device-major satlink char 38 satlink
device-major rnd char 39 rnd
device-major scsibus char 42 scsibus
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.461 src/sys/arch/i386/conf/ALL:1.462
--- src/sys/arch/i386/conf/ALL:1.461 Sat Dec 29 11:30:11 2018
+++ src/sys/arch/i386/conf/ALL Sun Jan 27 08:53:30 2019
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.461 2018/12/29 11:30:11 maxv Exp $
+# $NetBSD: ALL,v 1.462 2019/01/27 08:53:30 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.461 $"
+#ident "ALL-$Revision: 1.462 $"
maxusers 64 # estimated number of users
@@ -1689,9 +1689,6 @@ geodegcb* at pci? dev ? function ? # Ge
geodewdog* at geodegcb? # AMD Geode SC1100 watchdog timer
geodecntr* at geodegcb? # AMD Geode SC1100 high res. counter
-# Planetconnect Satellite receiver driver.
-satlink0 at isa? port 0x300 drq 1
-
# Middle Digital, Inc. PCI-Weasel serial console board control
# devices (watchdog timer, etc.)
weasel* at pci?
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1199 src/sys/arch/i386/conf/GENERIC:1.1200
--- src/sys/arch/i386/conf/GENERIC:1.1199 Tue Dec 25 11:56:14 2018
+++ src/sys/arch/i386/conf/GENERIC Sun Jan 27 08:53:30 2019
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1199 2018/12/25 11:56:14 mlelstv Exp $
+# $NetBSD: GENERIC,v 1.1200 2019/01/27 08:53:30 maxv 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.1199 $"
+#ident "GENERIC-$Revision: 1.1200 $"
maxusers 64 # estimated number of users
@@ -1408,9 +1408,6 @@ geodegcb* at pci? dev ? function ? # Ge
geodewdog* at geodegcb? # AMD Geode SC1100 watchdog timer
geodecntr* at geodegcb? # AMD Geode SC1100 high res. counter
-# Planetconnect Satellite receiver driver.
-#satlink0 at isa? port 0x300 drq 1
-
# Middle Digital, Inc. PCI-Weasel serial console board control
# devices (watchdog timer, etc.)
weasel* at pci?
Index: src/sys/arch/i386/conf/GENERIC_TINY
diff -u src/sys/arch/i386/conf/GENERIC_TINY:1.161 src/sys/arch/i386/conf/GENERIC_TINY:1.162
--- src/sys/arch/i386/conf/GENERIC_TINY:1.161 Tue Oct 23 19:58:52 2018
+++ src/sys/arch/i386/conf/GENERIC_TINY Sun Jan 27 08:53:30 2019
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_TINY,v 1.161 2018/10/23 19:58:52 jdolecek Exp $
+# $NetBSD: GENERIC_TINY,v 1.162 2019/01/27 08:53:30 maxv Exp $
#
# GENERIC_TINY -- suitable default for 4M machines
# No EISA, PCI, or SCSI.
@@ -495,13 +495,6 @@ we1 at isa? port 0x300 iomem 0xcc000 irq
# ISA joysticks. Probe is a little strange; add only if you have one.
#joy0 at isa? port 0x201
-
-# Miscellaneous Devices
-
-# Planetconnect Satellite receiver driver.
-#satlink0 at isa? port 0x300 drq 1
-
-
# Pull in optional local configuration
cinclude "arch/i386/conf/GENERIC.local"
Index: src/sys/arch/i386/conf/INSTALL_FLOPPY
diff -u src/sys/arch/i386/conf/INSTALL_FLOPPY:1.47 src/sys/arch/i386/conf/INSTALL_FLOPPY:1.48
--- src/sys/arch/i386/conf/INSTALL_FLOPPY:1.47 Wed Dec 12 06:29:37 2018
+++ src/sys/arch/i386/conf/INSTALL_FLOPPY Sun Jan 27 08:53:30 2019
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_FLOPPY,v 1.47 2018/12/12 06:29:37 maxv Exp $
+# $NetBSD: INSTALL_FLOPPY,v 1.48 2019/01/27 08:53:30 maxv Exp $
#
# INSTALL - Installation kernel.
#
@@ -717,9 +717,6 @@ url* at uhub? port ? # Realtek RTL8150L
# Miscellaneous Devices
-# Planetconnect Satellite receiver driver.
-#satlink0 at isa? port 0x300 drq 1
-
# Virtio devices
virtio* at pci? dev ? function ? # Virtio PCI device
viomb* at virtio? # Virtio memory balloon device
Index: src/sys/arch/i386/conf/INSTALL_TINY
diff -u src/sys/arch/i386/conf/INSTALL_TINY:1.158 src/sys/arch/i386/conf/INSTALL_TINY:1.159
--- src/sys/arch/i386/conf/INSTALL_TINY:1.158 Thu Sep 6 05:36:50 2018
+++ src/sys/arch/i386/conf/INSTALL_TINY Sun Jan 27 08:53:30 2019
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_TINY,v 1.158 2018/09/06 05:36:50 maxv Exp $
+# $NetBSD: INSTALL_TINY,v 1.159 2019/01/27 08:53:30 maxv Exp $
#
# This kernel should be derived from INSTALL (which is derived
# from GENERIC) with some features commented out.
@@ -463,17 +463,9 @@ we1 at isa? port 0x300 iomem 0xcc000 irq
# ISA joysticks. Probe is a little strange; add only if you have one.
#joy0 at isa? port 0x201
-
-# Miscellaneous Devices
-
-# Planetconnect Satellite receiver driver.
-#satlink0 at isa? port 0x300 drq 1
-
-
# Pull in optional local configuration
cinclude "arch/i386/conf/INSTALL.local"
-
# Pseudo-Devices
# disk/mass storage pseudo-devices
Index: src/sys/arch/i386/conf/majors.i386
diff -u src/sys/arch/i386/conf/majors.i386:1.48 src/sys/arch/i386/conf/majors.i386:1.49
--- src/sys/arch/i386/conf/majors.i386:1.48 Wed Dec 19 13:57:47 2018
+++ src/sys/arch/i386/conf/majors.i386 Sun Jan 27 08:53:30 2019
@@ -1,4 +1,4 @@
-# $NetBSD: majors.i386,v 1.48 2018/12/19 13:57:47 maxv Exp $
+# $NetBSD: majors.i386,v 1.49 2019/01/27 08:53:30 maxv Exp $
#
# Device majors for i386
#
@@ -41,7 +41,6 @@ device-major tun char 40 tun
device-major vnd char 41 block 14 vnd vector=8:8
device-major audio char 42 audio
device-major ipl char 44 ipfilter
-device-major satlink char 45 satlink
device-major rnd char 46 rnd
device-major wsdisplay char 47 wsdisplay
device-major wskbd char 48 wskbd
Index: src/sys/arch/ia64/conf/majors.ia64
diff -u src/sys/arch/ia64/conf/majors.ia64:1.14 src/sys/arch/ia64/conf/majors.ia64:1.15
--- src/sys/arch/ia64/conf/majors.ia64:1.14 Wed Dec 19 13:57:47 2018
+++ src/sys/arch/ia64/conf/majors.ia64 Sun Jan 27 08:53:30 2019
@@ -1,4 +1,4 @@
-# $NetBSD: majors.ia64,v 1.14 2018/12/19 13:57:47 maxv Exp $
+# $NetBSD: majors.ia64,v 1.15 2019/01/27 08:53:30 maxv Exp $
#
# Device majors for ia64
#
@@ -41,7 +41,6 @@ device-major tun char 40 tun
device-major vnd char 41 block 14 vnd
device-major audio char 42 audio
device-major ipl char 44 ipfilter
-device-major satlink char 45 satlink
device-major rnd char 46 rnd
device-major wsdisplay char 47 wsdisplay
device-major wskbd char 48 wskbd
Index: src/sys/arch/ibmnws/conf/majors.ibmnws
diff -u src/sys/arch/ibmnws/conf/majors.ibmnws:1.16 src/sys/arch/ibmnws/conf/majors.ibmnws:1.17
--- src/sys/arch/ibmnws/conf/majors.ibmnws:1.16 Wed Dec 19 13:57:47 2018
+++ src/sys/arch/ibmnws/conf/majors.ibmnws Sun Jan 27 08:53:30 2019
@@ -1,4 +1,4 @@
-# $NetBSD: majors.ibmnws,v 1.16 2018/12/19 13:57:47 maxv Exp $
+# $NetBSD: majors.ibmnws,v 1.17 2019/01/27 08:53:30 maxv Exp $
#
# Device majors for ibmnws
#
@@ -31,7 +31,6 @@ device-major tun char 40 tun
device-major vnd char 41 block 14 vnd
device-major audio char 42 audio
device-major ipl char 44 ipfilter
-device-major satlink char 45 satlink
device-major rnd char 46 rnd
device-major wsdisplay char 47 wsdisplay
device-major wskbd char 48 wskbd
Index: src/sys/arch/mvmeppc/conf/majors.mvmeppc
diff -u src/sys/arch/mvmeppc/conf/majors.mvmeppc:1.22 src/sys/arch/mvmeppc/conf/majors.mvmeppc:1.23
--- src/sys/arch/mvmeppc/conf/majors.mvmeppc:1.22 Wed Dec 19 13:57:49 2018
+++ src/sys/arch/mvmeppc/conf/majors.mvmeppc Sun Jan 27 08:53:30 2019
@@ -1,4 +1,4 @@
-# $NetBSD: majors.mvmeppc,v 1.22 2018/12/19 13:57:49 maxv Exp $
+# $NetBSD: majors.mvmeppc,v 1.23 2019/01/27 08:53:30 maxv Exp $
#
# Device majors for mvmeppc
#
@@ -31,7 +31,6 @@ device-major tun char 40 tun
device-major vnd char 41 block 14 vnd
device-major ipl char 44 ipfilter
-device-major satlink char 45 satlink
device-major rnd char 46 rnd
device-major scsibus char 50 scsibus
Index: src/sys/arch/powerpc/conf/majors.powerpc
diff -u src/sys/arch/powerpc/conf/majors.powerpc:1.11 src/sys/arch/powerpc/conf/majors.powerpc:1.12
--- src/sys/arch/powerpc/conf/majors.powerpc:1.11 Sun Sep 23 09:21:02 2018
+++ src/sys/arch/powerpc/conf/majors.powerpc Sun Jan 27 08:53:30 2019
@@ -1,4 +1,4 @@
-# $NetBSD: majors.powerpc,v 1.11 2018/09/23 09:21:02 maxv Exp $
+# $NetBSD: majors.powerpc,v 1.12 2019/01/27 08:53:30 maxv Exp $
#
# Device majors for shared PowerPC
#
@@ -80,7 +80,6 @@ device-major altq char 77 altq
device-major joy char 78 joy
device-major gtmpsc char 80 gtmpsc
-device-major satlink char 81 satlink
device-major nsmb char 98 nsmb
device-major xlcom char 99 xlcom
Index: src/sys/arch/prep/conf/majors.prep
diff -u src/sys/arch/prep/conf/majors.prep:1.24 src/sys/arch/prep/conf/majors.prep:1.25
--- src/sys/arch/prep/conf/majors.prep:1.24 Sun Sep 23 09:21:03 2018
+++ src/sys/arch/prep/conf/majors.prep Sun Jan 27 08:53:30 2019
@@ -1,4 +1,4 @@
-# $NetBSD: majors.prep,v 1.24 2018/09/23 09:21:03 maxv Exp $
+# $NetBSD: majors.prep,v 1.25 2019/01/27 08:53:30 maxv Exp $
#
# Device majors for prep
#
@@ -40,7 +40,6 @@ device-major vnd char 41 block 14 vnd
device-major audio char 42 audio
device-major ipl char 44 ipfilter
-device-major satlink char 45 satlink
device-major rnd char 46 rnd
device-major wsdisplay char 47 wsdisplay
device-major wskbd char 48 wskbd
Index: src/sys/arch/riscv/conf/majors.riscv
diff -u src/sys/arch/riscv/conf/majors.riscv:1.3 src/sys/arch/riscv/conf/majors.riscv:1.4
--- src/sys/arch/riscv/conf/majors.riscv:1.3 Sun Sep 23 09:21:03 2018
+++ src/sys/arch/riscv/conf/majors.riscv Sun Jan 27 08:53:30 2019
@@ -1,4 +1,4 @@
-# $NetBSD: majors.riscv,v 1.3 2018/09/23 09:21:03 maxv Exp $
+# $NetBSD: majors.riscv,v 1.4 2019/01/27 08:53:30 maxv Exp $
#
# Device majors for evbmips
#
@@ -10,7 +10,6 @@ device-major audio char 24 audio
device-major com char 26 com
device-major lpt char 31 lpt
device-major ipl char 35 ipfilter
-device-major satlink char 38 satlink
device-major esh char 44 esh
device-major midi char 49 midi
Index: src/sys/dev/DEVNAMES
diff -u src/sys/dev/DEVNAMES:1.319 src/sys/dev/DEVNAMES:1.320
--- src/sys/dev/DEVNAMES:1.319 Wed Dec 12 07:04:05 2018
+++ src/sys/dev/DEVNAMES Sun Jan 27 08:53:30 2019
@@ -1,4 +1,4 @@
-# $NetBSD: DEVNAMES,v 1.319 2018/12/12 07:04:05 maxv Exp $
+# $NetBSD: DEVNAMES,v 1.320 2019/01/27 08:53:30 maxv Exp $
#
# This file contains all used device names and defined attributes in
# alphabetical order. New devices added to the system somewhere should first
@@ -1180,7 +1180,6 @@ sacpcic hpcarm
saip hpcarm
saost hpcarm
satalink MI
-satlink MI
satmgr sandpoint
sb MI
sbc mac68k
Index: src/sys/dev/isa/Makefile
diff -u src/sys/dev/isa/Makefile:1.10 src/sys/dev/isa/Makefile:1.11
--- src/sys/dev/isa/Makefile:1.10 Fri Dec 9 06:04:06 2016
+++ src/sys/dev/isa/Makefile Sun Jan 27 08:53:30 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2016/12/09 06:04:06 christos Exp $
+# $NetBSD: Makefile,v 1.11 2019/01/27 08:53:30 maxv Exp $
INCSDIR= /usr/include/dev/isa
# Only install includes which are used by userland
-INCS= isvio.h satlinkio.h spkrio.h wtreg.h
+INCS= isvio.h spkrio.h wtreg.h
.include <bsd.kinc.mk>
Index: src/sys/dev/isa/files.isa
diff -u src/sys/dev/isa/files.isa:1.171 src/sys/dev/isa/files.isa:1.172
--- src/sys/dev/isa/files.isa:1.171 Sat Sep 22 16:22:23 2018
+++ src/sys/dev/isa/files.isa Sun Jan 27 08:53:30 2019
@@ -1,4 +1,4 @@
-# $NetBSD: files.isa,v 1.171 2018/09/22 16:22:23 maxv Exp $
+# $NetBSD: files.isa,v 1.172 2019/01/27 08:53:30 maxv Exp $
#
# Config file and device description for machine-independent ISA code.
# Included by ports that need it. Requires that the SCSI files be
@@ -370,13 +370,6 @@ device cms: midibus
attach cms at isa
file dev/isa/cms.c cms
-#
-# PlanetConnect satellite receiver driver.
-#
-device satlink: isadma
-attach satlink at isa
-file dev/isa/satlink.c satlink needs-flag
-
# ISA PC keyboard controller
defflag opt_pckbc.h PCKBCNOTEST
attach pckbc at isa with pckbc_isa
Index: src/sys/rump/librump/rumpkern/devsw.c
diff -u src/sys/rump/librump/rumpkern/devsw.c:1.9 src/sys/rump/librump/rumpkern/devsw.c:1.10
--- src/sys/rump/librump/rumpkern/devsw.c:1.9 Wed Dec 19 13:57:52 2018
+++ src/sys/rump/librump/rumpkern/devsw.c Sun Jan 27 08:53:30 2019
@@ -74,7 +74,6 @@ struct devsw_conv devsw_conv0[] = {
{ "vnd", 14, 41, DEVNODE_VECTOR, 0, { 2, 8 }},
{ "audio", -1, 42, DEVNODE_DONTBOTHER, 0, { 0, 0 }},
{ "ipl", -1, 44, DEVNODE_DONTBOTHER, 0, { 0, 0 }},
- { "satlink", -1, 45, DEVNODE_DONTBOTHER, 0, { 0, 0 }},
{ "rnd", -1, 46, DEVNODE_DONTBOTHER, 0, { 0, 0 }},
{ "wsdisplay", -1, 47, DEVNODE_DONTBOTHER, 0, { 0, 0 }},
{ "wskbd", -1, 48, DEVNODE_DONTBOTHER, 0, { 0, 0 }},
