summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authormaxv <maxv@NetBSD.org>2019-01-27 08:53:28 +0000
committermaxv <maxv@NetBSD.org>2019-01-27 08:53:28 +0000
commitfabd8218b1983a32f62080997fe36596797682c1 (patch)
treedfa5dce58e1d6a32b66ae95da991b1994ae88ff4 /sys/dev
parentfd04630f3ee19140773d93c2a801ddbf6b5f88ad (diff)
Remove the satlink driver. It was disabled everywhere, had no man page and
no use either. Spotted by thorpej in PR/21345, ok christos.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/DEVNAMES3
-rw-r--r--sys/dev/isa/Makefile4
-rw-r--r--sys/dev/isa/files.isa9
-rw-r--r--sys/dev/isa/satlink.c541
-rw-r--r--sys/dev/isa/satlinkio.h51
-rw-r--r--sys/dev/isa/satlinkreg.h53
6 files changed, 4 insertions, 657 deletions
diff --git a/sys/dev/DEVNAMES b/sys/dev/DEVNAMES
index b208d628b0e..69ca1ba7659 100644
--- a/sys/dev/DEVNAMES
+++ b/sys/dev/DEVNAMES
@@ -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
diff --git a/sys/dev/isa/Makefile b/sys/dev/isa/Makefile
index 899b7fbc35b..e334d7cfcbf 100644
--- a/sys/dev/isa/Makefile
+++ b/sys/dev/isa/Makefile
@@ -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>
diff --git a/sys/dev/isa/files.isa b/sys/dev/isa/files.isa
index bbe496264d6..06e5e79b483 100644
--- a/sys/dev/isa/files.isa
+++ b/sys/dev/isa/files.isa
@@ -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
diff --git a/sys/dev/isa/satlink.c b/sys/dev/isa/satlink.c
deleted file mode 100644
index 1b27c3797c6..00000000000
--- a/sys/dev/isa/satlink.c
+++ /dev/null
@@ -1,541 +0,0 @@
-/* $NetBSD: satlink.c,v 1.46 2017/10/25 08:12:38 maya Exp $ */
-
-/*-
- * Copyright (c) 1997 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Canada Connect Corp.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Device driver for SatLink interface.
- *
- * This thing is really simple. We essentially DMA into a ring buffer
- * which the user then reads from, and provide an ioctl interface to
- * reset the card, etc.
- */
-
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: satlink.c,v 1.46 2017/10/25 08:12:38 maya Exp $");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/callout.h>
-#include <sys/errno.h>
-#include <sys/ioctl.h>
-#include <sys/device.h>
-#include <sys/conf.h>
-#include <sys/proc.h>
-#include <sys/uio.h>
-#include <sys/select.h>
-#include <sys/poll.h>
-#include <sys/kernel.h>
-#include <sys/file.h>
-#include <sys/tty.h>
-
-#include <sys/cpu.h>
-#include <sys/bus.h>
-#include <sys/intr.h>
-
-#include <dev/isa/isareg.h>
-#include <dev/isa/isavar.h>
-#include <dev/isa/isadmavar.h>
-
-#include <dev/isa/satlinkreg.h>
-#include <dev/isa/satlinkio.h>
-
-struct satlink_softc {
- bus_space_tag_t sc_iot; /* space tag */
- bus_space_handle_t sc_ioh; /* space handle */
- isa_chipset_tag_t sc_ic; /* ISA chipset info */
- int sc_drq; /* the DRQ we're using */
- bus_size_t sc_bufsize; /* DMA buffer size */
- void * sc_buf; /* ring buffer for incoming data */
- int sc_uptr; /* user index into ring buffer */
- int sc_sptr; /* satlink index into ring buffer */
- int sc_flags; /* misc. flags. */
- int sc_lastresid; /* residual */
- struct selinfo sc_selq; /* our select/poll queue */
- struct satlink_id sc_id; /* ID cached at attach time */
- callout_t sc_ch; /* callout pseudo-interrupt */
-};
-
-/* sc_flags */
-#define SATF_ISOPEN 0x01 /* device is open */
-#define SATF_DATA 0x02 /* waiting for data */
-
-/*
- * Our pseudo-interrupt. Since up to 328 bytes can arrive in 1/100 of
- * a second, this gives us 3280 bytes per timeout.
- */
-#define SATLINK_TIMEOUT (hz/10)
-
-int satlinkprobe(device_t, cfdata_t, void *);
-void satlinkattach(device_t, device_t, void *);
-void satlinktimeout(void *);
-
-CFATTACH_DECL_NEW(satlink, sizeof(struct satlink_softc),
- satlinkprobe, satlinkattach, NULL, NULL);
-
-extern struct cfdriver satlink_cd;
-
-dev_type_open(satlinkopen);
-dev_type_close(satlinkclose);
-dev_type_read(satlinkread);
-dev_type_ioctl(satlinkioctl);
-dev_type_poll(satlinkpoll);
-dev_type_kqfilter(satlinkkqfilter);
-
-const struct cdevsw satlink_cdevsw = {
- .d_open = satlinkopen,
- .d_close = satlinkclose,
- .d_read = satlinkread,
- .d_write = nowrite,
- .d_ioctl = satlinkioctl,
- .d_stop = nostop,
- .d_tty = notty,
- .d_poll = satlinkpoll,
- .d_mmap = nommap,
- .d_kqfilter = satlinkkqfilter,
- .d_discard = nodiscard,
- .d_flag = D_OTHER
-};
-
-int
-satlinkprobe(device_t parent, cfdata_t match, void *aux)
-{
- struct isa_attach_args *ia = aux;
- bus_space_tag_t iot = ia->ia_iot;
- bus_space_handle_t ioh;
- int rv = 0;
-
- if (ia->ia_nio < 1)
- return (0);
- if (ia->ia_ndrq < 1)
- return (0);
-
- if (ISA_DIRECT_CONFIG(ia))
- return (0);
-
- /* Don't allow wildcarding of iobase or drq. */
- if (ia->ia_io[0].ir_addr == ISA_UNKNOWN_PORT)
- return (0);
- if (ia->ia_drq[0].ir_drq == ISA_UNKNOWN_DRQ)
- return (0);
-
- if (bus_space_map(iot, ia->ia_io[0].ir_addr, SATLINK_IOSIZE, 0, &ioh))
- return (0);
-
- /*
- * XXX Should check manufacturer ID here, or something.
- */
-
- rv = 1;
-
- ia->ia_nio = 1;
- ia->ia_io[0].ir_size = SATLINK_IOSIZE;
-
- ia->ia_ndrq = 1;
-
- ia->ia_nirq = 0;
- ia->ia_niomem = 0;
-
- bus_space_unmap(iot, ioh, SATLINK_IOSIZE);
- return (rv);
-}
-
-void
-satlinkattach(device_t parent, device_t self, void *aux)
-{
- struct satlink_softc *sc = device_private(self);
- struct isa_attach_args *ia = aux;
- bus_space_tag_t iot = ia->ia_iot;
- bus_space_handle_t ioh;
- bus_addr_t ringaddr;
-
- printf("\n");
-
- /* Map the card. */
- if (bus_space_map(iot, ia->ia_io[0].ir_addr, SATLINK_IOSIZE, 0, &ioh)) {
- aprint_error_dev(self, "can't map i/o space\n");
- return;
- }
-
- sc->sc_iot = iot;
- sc->sc_ioh = ioh;
- sc->sc_ic = ia->ia_ic;
- sc->sc_drq = ia->ia_drq[0].ir_drq;
-
- /* Reset the card. */
- bus_space_write_1(iot, ioh, SATLINK_COMMAND, SATLINK_CMD_RESET);
-
- /* Read ID from the card. */
- sc->sc_id.sid_mfrid =
- bus_space_read_1(iot, ioh, SATLINK_MFRID_L) |
- (bus_space_read_1(iot, ioh, SATLINK_MFRID_H) << 8);
- sc->sc_id.sid_grpid = bus_space_read_1(iot, ioh, SATLINK_GRPID);
- sc->sc_id.sid_userid =
- bus_space_read_1(iot, ioh, SATLINK_USERID_L) |
- (bus_space_read_1(iot, ioh, SATLINK_USERID_H) << 8);
- sc->sc_id.sid_serial =
- bus_space_read_1(iot, ioh, SATLINK_SER_L) |
- (bus_space_read_1(iot, ioh, SATLINK_SER_M0) << 8) |
- (bus_space_read_1(iot, ioh, SATLINK_SER_M1) << 16) |
- (bus_space_read_1(iot, ioh, SATLINK_SER_H) << 24);
-
- printf("%s: mfrid 0x%x, grpid 0x%x, userid 0x%x, serial %d\n",
- device_xname(self), sc->sc_id.sid_mfrid,
- sc->sc_id.sid_grpid, sc->sc_id.sid_userid,
- sc->sc_id.sid_serial);
-
- callout_init(&sc->sc_ch, 0);
- selinit(&sc->sc_selq);
-
- sc->sc_bufsize = isa_dmamaxsize(sc->sc_ic, sc->sc_drq);
-
- /* Allocate and map the ring buffer. */
- if (isa_dmamem_alloc(sc->sc_ic, sc->sc_drq, sc->sc_bufsize,
- &ringaddr, BUS_DMA_NOWAIT)) {
- aprint_error_dev(self, "can't allocate ring buffer\n");
- return;
- }
- if (isa_dmamem_map(sc->sc_ic, sc->sc_drq, ringaddr, sc->sc_bufsize,
- &sc->sc_buf, BUS_DMA_NOWAIT|BUS_DMA_COHERENT)) {
- aprint_error_dev(self, "can't map ring buffer\n");
- isa_dmamem_free(sc->sc_ic, sc->sc_drq, ringaddr,
- sc->sc_bufsize);
- return;
- }
-
- if (isa_drq_alloc(sc->sc_ic, sc->sc_drq) != 0) {
- aprint_error_dev(self, "can't reserve drq %d\n",
- sc->sc_drq);
- isa_dmamem_unmap(sc->sc_ic, sc->sc_drq, sc->sc_buf,
- sc->sc_bufsize);
- isa_dmamem_free(sc->sc_ic, sc->sc_drq, ringaddr,
- sc->sc_bufsize);
- return;
- }
-
- /* Create the DMA map. */
- if (isa_dmamap_create(sc->sc_ic, sc->sc_drq, sc->sc_bufsize,
- BUS_DMA_NOWAIT|BUS_DMA_ALLOCNOW)) {
- aprint_error_dev(self, "can't create DMA map\n");
- isa_dmamem_unmap(sc->sc_ic, sc->sc_drq, sc->sc_buf,
- sc->sc_bufsize);
- isa_dmamem_free(sc->sc_ic, sc->sc_drq, ringaddr,
- sc->sc_bufsize);
- return;
- }
-}
-
-int
-satlinkopen(dev_t dev, int flags, int fmt,
- struct lwp *l)
-{
- struct satlink_softc *sc;
- int error;
-
- sc = device_lookup_private(&satlink_cd, minor(dev));
-
- if (sc == NULL)
- return (ENXIO);
-
- if (sc->sc_flags & SATF_ISOPEN)
- return (EBUSY);
-
- bus_space_write_1(sc->sc_iot, sc->sc_ioh, SATLINK_COMMAND,
- SATLINK_CMD_RESET);
-
- /* Reset the ring buffer, and start the DMA loop. */
- sc->sc_uptr = 0;
- sc->sc_sptr = 0;
- sc->sc_lastresid = sc->sc_bufsize;
- memset(sc->sc_buf, 0, sc->sc_bufsize);
- error = isa_dmastart(sc->sc_ic, sc->sc_drq, sc->sc_buf,
- sc->sc_bufsize, NULL, DMAMODE_READ|DMAMODE_LOOP, BUS_DMA_WAITOK);
- if (error)
- return (error);
-
- sc->sc_flags |= SATF_ISOPEN;
-
- callout_reset(&sc->sc_ch, SATLINK_TIMEOUT, satlinktimeout, sc);
-
- return (0);
-}
-
-int
-satlinkclose(dev_t dev, int flags, int fmt,
- struct lwp *l)
-{
- struct satlink_softc *sc;
- int s;
-
- sc = device_lookup_private(&satlink_cd, minor(dev));
-
- s = splsoftclock();
- sc->sc_flags &= ~SATF_ISOPEN;
- splx(s);
-
- isa_dmaabort(sc->sc_ic, sc->sc_drq);
- callout_stop(&sc->sc_ch);
-
- return (0);
-}
-
-int
-satlinkread(dev_t dev, struct uio *uio, int flags)
-{
- struct satlink_softc *sc;
- int error, s, count, sptr;
- int wrapcnt, oresid;
-
- sc = device_lookup_private(&satlink_cd, minor(dev));
-
- s = splsoftclock();
-
- /* Wait for data to be available. */
- while (sc->sc_sptr == sc->sc_uptr) {
- if (flags & O_NONBLOCK) {
- splx(s);
- return (EWOULDBLOCK);
- }
- sc->sc_flags |= SATF_DATA;
- if ((error = tsleep(sc, TTIPRI | PCATCH, "satio", 0)) != 0) {
- splx(s);
- return (error);
- }
- }
-
- sptr = sc->sc_sptr;
- splx(s);
-
- /* Compute number of readable bytes. */
- if (sptr > sc->sc_uptr)
- count = sptr - sc->sc_uptr;
- else
- count = sc->sc_bufsize - sc->sc_uptr + sptr;
-
- if (count > uio->uio_resid)
- count = uio->uio_resid;
-
- /* Send data out to user. */
- if (sptr > sc->sc_uptr) {
- /*
- * Easy case - no wrap-around.
- */
- error = uiomove((char *)sc->sc_buf + sc->sc_uptr, count, uio);
- if (error == 0) {
- sc->sc_uptr += count;
- if (sc->sc_uptr == sc->sc_bufsize)
- sc->sc_uptr = 0;
- }
- return (error);
- }
-
- /*
- * We wrap around. Copy to the end of the ring...
- */
- wrapcnt = sc->sc_bufsize - sc->sc_uptr;
- oresid = uio->uio_resid;
- if (wrapcnt > uio->uio_resid)
- wrapcnt = uio->uio_resid;
- error = uiomove((char *)sc->sc_buf + sc->sc_uptr, wrapcnt, uio);
- sc->sc_uptr = 0;
- if (error != 0 || wrapcnt == oresid)
- return (error);
-
- /* ...and the rest. */
- count -= wrapcnt;
- error = uiomove(sc->sc_buf, count, uio);
- sc->sc_uptr += count;
- if (sc->sc_uptr == sc->sc_bufsize)
- sc->sc_uptr = 0;
-
- return (error);
-}
-
-int
-satlinkioctl(dev_t dev, u_long cmd, void *data, int flags,
- struct lwp *l)
-{
- struct satlink_softc *sc;
-
- sc = device_lookup_private(&satlink_cd, minor(dev));
-
- switch (cmd) {
- case SATIORESET:
- bus_space_write_1(sc->sc_iot, sc->sc_ioh, SATLINK_COMMAND,
- SATLINK_CMD_RESET);
- sc->sc_uptr = isa_dmacount(sc->sc_ic, sc->sc_drq);
- sc->sc_sptr = sc->sc_uptr;
- break;
-
- case SATIOGID:
- memcpy(data, &sc->sc_id, sizeof(sc->sc_id));
- break;
-
- default:
- return (ENOTTY);
- }
-
- return (0);
-}
-
-int
-satlinkpoll(dev_t dev, int events, struct lwp *l)
-{
- struct satlink_softc *sc;
- int s, revents;
-
- sc = device_lookup_private(&satlink_cd, minor(dev));
-
- revents = events & (POLLOUT | POLLWRNORM);
-
- /* Attempt to save some work. */
- if ((events & (POLLIN | POLLRDNORM)) == 0)
- return (revents);
-
- /* We're timeout-driven, so must block the clock. */
- s = splsoftclock();
- if (sc->sc_uptr != sc->sc_sptr)
- revents |= events & (POLLIN | POLLRDNORM);
- else
- selrecord(l, &sc->sc_selq);
- splx(s);
-
- return (revents);
-}
-
-static void
-filt_satlinkrdetach(struct knote *kn)
-{
- struct satlink_softc *sc = kn->kn_hook;
- int s;
-
- s = splsoftclock();
- SLIST_REMOVE(&sc->sc_selq.sel_klist, kn, knote, kn_selnext);
- splx(s);
-}
-
-static int
-filt_satlinkread(struct knote *kn, long hint)
-{
- struct satlink_softc *sc = kn->kn_hook;
-
- if (sc->sc_uptr == sc->sc_sptr)
- return (0);
-
- if (sc->sc_sptr > sc->sc_uptr)
- kn->kn_data = sc->sc_sptr - sc->sc_uptr;
- else
- kn->kn_data = (sc->sc_bufsize - sc->sc_uptr) +
- sc->sc_sptr;
- return (1);
-}
-
-static const struct filterops satlinkread_filtops = {
- .f_isfd = 1,
- .f_attach = NULL,
- .f_detach = filt_satlinkrdetach,
- .f_event = filt_satlinkread,
-};
-
-static const struct filterops satlink_seltrue_filtops = {
- .f_isfd = 1,
- .f_attach = NULL,
- .f_detach = filt_satlinkrdetach,
- .f_event = filt_seltrue,
-};
-
-int
-satlinkkqfilter(dev_t dev, struct knote *kn)
-{
- struct satlink_softc *sc;
- struct klist *klist;
- int s;
-
- sc = device_lookup_private(&satlink_cd, minor(dev));
-
- switch (kn->kn_filter) {
- case EVFILT_READ:
- klist = &sc->sc_selq.sel_klist;
- kn->kn_fop = &satlinkread_filtops;
- break;
-
- case EVFILT_WRITE:
- klist = &sc->sc_selq.sel_klist;
- kn->kn_fop = &satlink_seltrue_filtops;
- break;
-
- default:
- return (EINVAL);
- }
-
- kn->kn_hook = sc;
-
- s = splsoftclock();
- SLIST_INSERT_HEAD(klist, kn, kn_selnext);
- splx(s);
-
- return (0);
-}
-
-void
-satlinktimeout(void *arg)
-{
- struct satlink_softc *sc = arg;
- bus_size_t resid;
- int newidx;
-
- if ((sc->sc_flags & SATF_ISOPEN) == 0)
- return;
-
- /*
- * Get the current residual count from the DMA controller
- * and compute the satlink's index into the ring buffer.
- */
- resid = isa_dmacount(sc->sc_ic, sc->sc_drq);
- newidx = sc->sc_bufsize - resid;
- if (newidx == sc->sc_bufsize)
- newidx = 0;
-
- if (newidx == sc->sc_sptr)
- goto out;
-
- sc->sc_sptr = newidx;
-
- /* Wake up anyone blocked in read... */
- if (sc->sc_flags & SATF_DATA) {
- sc->sc_flags &= ~SATF_DATA;
- wakeup(sc);
- }
-
- /* Wake up anyone blocked in poll... */
- selnotify(&sc->sc_selq, 0, 0);
-
- out:
- callout_reset(&sc->sc_ch, SATLINK_TIMEOUT, satlinktimeout, sc);
-}
diff --git a/sys/dev/isa/satlinkio.h b/sys/dev/isa/satlinkio.h
deleted file mode 100644
index de2ec32da04..00000000000
--- a/sys/dev/isa/satlinkio.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* $NetBSD: satlinkio.h,v 1.4 2015/09/06 06:01:00 dholland Exp $ */
-/*-
- * Copyright (c) 1997 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Canada Connect Corp.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _DEV_ISA_SATLINKIO_H_
-#define _DEV_ISA_SATLINKIO_H_
-
-/*
- * ioctl definitions for SatLink interface.
- */
-
-#include <sys/ioccom.h>
-
-struct satlink_id {
- u_int16_t sid_mfrid; /* manufacturer ID */
- u_int8_t sid_grpid; /* group ID */
- u_int16_t sid_userid; /* user ID */
- u_int32_t sid_serial; /* serial number */
-};
-
-#define SATIORESET _IO('s', 0) /* reset interface */
-#define SATIOGID _IOR('s', 1, struct satlink_id) /* read ID */
-#define SATIOSBUFSIZE _IOW('s', 2, int) /* set buffer size */
-
-#endif /* _DEV_ISA_SATLINKIO_H_ */
diff --git a/sys/dev/isa/satlinkreg.h b/sys/dev/isa/satlinkreg.h
deleted file mode 100644
index 1205608a8ab..00000000000
--- a/sys/dev/isa/satlinkreg.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* $NetBSD: satlinkreg.h,v 1.3 2008/04/28 20:23:52 martin Exp $ */
-/*-
- * Copyright (c) 1997 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Canada Connect Corp.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _DEV_ISA_SATLINKREG_H_
-#define _DEV_ISA_SATLINKREG_H_
-
-/*
- * Register definitions for the SatLink interface.
- */
-
-#define SATLINK_IOSIZE 0x20
-
-#define SATLINK_COMMAND 0x00 /* command register */
-#define SATLINK_MFRID_L 0x1c /* Manufacturer ID (low) */
-#define SATLINK_MFRID_H 0x1b /* (high) */
-#define SATLINK_GRPID 0x1d /* Group ID */
-#define SATLINK_USERID_L 0x1f /* User ID (low) */
-#define SATLINK_USERID_H 0x1e /* (high) */
-#define SATLINK_SER_L 0x10 /* Serial number (low) */
-#define SATLINK_SER_M0 0x11 /* . */
-#define SATLINK_SER_M1 0x12 /* . */
-#define SATLINK_SER_H 0x13 /* (high) */
-
-#define SATLINK_CMD_RESET 0x0c /* reset card */
-
-#endif /* _DEV_ISA_SATLINKREG_H_ */