Page MenuHomeFreeBSD

D60662.diff
No OneTemporary

D60662.diff

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -51,6 +51,12 @@
# xargs -n1 | sort | uniq -d;
# done
+# 2026xxxx: Retire pbio(4)
+OLD_FILES+=usr/include/dev/pbio/pbioio.h
+OLD_DIRS+=usr/include/dev/pbio
+OLD_FILES+=usr/share/man/man4/i386/pbio.4.gz
+OLD_FILES+=usr/share/man/man4/pbio.4.gz
+
# 2026xxxx: Retire tdfx(4)
OLD_FILES+=usr/share/man/man4/tdfx.4.gz
OLD_FILES+=usr/share/man/man4/tdfx_linux.4.gz
diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist
--- a/etc/mtree/BSD.include.dist
+++ b/etc/mtree/BSD.include.dist
@@ -245,8 +245,6 @@
..
ofw
..
- pbio
- ..
pci
..
powermac_nvram
diff --git a/include/Makefile b/include/Makefile
--- a/include/Makefile
+++ b/include/Makefile
@@ -53,7 +53,7 @@
LSUBDIRS= dev/acpica dev/agp dev/ciss dev/filemon dev/firewire \
dev/hwpmc dev/hyperv \
dev/ic dev/iicbus dev/io dev/mfi dev/mmc dev/ntsync \
- dev/ofw dev/pbio dev/pci ${_dev_powermac_nvram} dev/ppbus dev/pwm \
+ dev/ofw dev/pci ${_dev_powermac_nvram} dev/ppbus dev/pwm \
dev/smbus dev/speaker dev/tcp_log dev/veriexec dev/vkbd dev/wg \
fs/devfs fs/fdescfs fs/msdosfs fs/nfs fs/nullfs \
fs/procfs fs/smbfs fs/udf fs/unionfs \
diff --git a/share/man/man4/man4.i386/Makefile b/share/man/man4/man4.i386/Makefile
--- a/share/man/man4/man4.i386/Makefile
+++ b/share/man/man4/man4.i386/Makefile
@@ -4,7 +4,6 @@
longrun.4 \
npx.4 \
pae.4 \
- pbio.4 \
pnp.4 \
pnpbios.4 \
sbni.4 \
diff --git a/share/man/man4/man4.i386/pbio.4 b/share/man/man4/man4.i386/pbio.4
deleted file mode 100644
--- a/share/man/man4/man4.i386/pbio.4
+++ /dev/null
@@ -1,185 +0,0 @@
-.\" Copyright (c) 2000-2002
-.\" Diomidis D. Spinellis, Athens, Greece
-.\" All rights reserved.
-.\"
-.\" 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 as
-.\" the first lines of this file unmodified.
-.\" 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 Diomidis D. Spinellis ``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 Diomidis D. Spinellis 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.
-.\"
-.Dd January 14, 2005
-.Dt PBIO 4 i386
-.Os
-.Sh NAME
-.Nm pbio
-.Nd 8255 parallel peripheral interface basic
-.Tn I/O
-driver
-.Sh SYNOPSIS
-.Cd "device pbio"
-.Pp
-In
-.Pa /boot/device.hints :
-.Cd hint.pbio.0.at="isa"
-.Cd hint.pbio.0.port="0x360"
-.Pp
-.In dev/pbio/pbioio.h
-.Sh DESCRIPTION
-The
-.Nm
-driver supports direct access to the Intel 8255A programmable
-peripheral interface (PPI) chip running in mode 0 (simple
-.Tn I/O ) .
-Such an interface provides 24 digital
-.Tn I/O
-lines.
-The driver is designed for performing
-.Tn I/O
-under program control using
-peripherals such as the
-.Tn Advantech
-.Tn PCL-724
-card, which emulates the Intel 8255A PPI in mode 0.
-Other 8255A-based peripherals such as the
-.Tn BMC
-Messsysteme
-.Tn PIO24II
-card have also been reported to work.
-.Pp
-The PPI provides two 8-bit ports (port A and port B) and
-two 4-bit ports (port C upper, port C lower).
-Each port can be individually programmed for input and
-(latched) output,
-and appears at a different offset of the device's base
-.Tn I/O
-address.
-.Pp
-A separate register allows the configuration of ports for input
-or output.
-The device is so simple, that reliably probing for it when
-input data arrives at its terminals is impossible;
-therefore the kernel configuration has to specify the
-device's base address.
-The device driver provides four character devices that
-correspond to the peripheral's
-.Tn I/O
-ports.
-Opening a device for read or write automatically configures
-the corresponding hardware port for input or output.
-At boot time all ports are set configured for input to avoid damaging
-external circuitry.
-.Pp
-A set of
-.Xr ioctl 2
-requests allow polled input and paced output to be
-efficiently performed at the driver level without expensive
-user/kernel context switching.
-The driver can perform
-.Tn I/O
-in three different ways:
-.Bl -tag -width ".No Differential"
-.It Basic
-The read or write operation returns immediately after reading
-or writing the data to the port at bus speed.
-.It Paced
-Data is transferred from or to the port at intervals specified
-by a separate
-.Xr ioctl 2
-call.
-.It Differential
-(Input only.)
-Only port values that differ from the previous port value are returned.
-.El
-.Pp
-The pacing interval is specified in
-.Em Hz
-unit increments.
-Setting a pace of
-.Ar n
-seconds
-will result in no more than one value being read or written every
-.Ar n
-seconds.
-Single byte read/write operations will take at least
-.Ar n
-seconds to complete.
-.Pp
-The following
-.Xr ioctl 2
-calls are supported:
-.Bl -tag -width ".Dv PBIO_SETIPACE"
-.It Dv PBIO_SETDIFF
-accepts a pointer to an integer as the third argument,
-and sets the driver for differential input if the integer is non-zero.
-The input pace speed determines the periodic interval the driver will use to
-examine the port for a changed value.
-.It Dv PBIO_GETDIFF
-accepts a pointer to an integer as the third argument,
-and sets the integer to the last set value for differential input.
-.It Dv PBIO_SETIPACE
-accepts a pointer to an integer as the third argument,
-and sets the driver's input pacing speed to the value of that integer.
-.It Dv PBIO_GETIPACE
-accepts a pointer to an integer as the third argument,
-and sets the integer to the last set value for the input pace.
-.It Dv PBIO_SETOPACE
-accepts a pointer to an integer as the third argument,
-and sets the driver's output pacing speed to the value of that integer.
-.It Dv PBIO_GETOPACE
-accepts a pointer to an integer as the third argument,
-and sets the integer to the last set value for the output pace.
-.El
-.Sh FILES
-.Bl -tag -width ".Pa /dev/pbio0ch" -compact
-.It Pa /dev/pbio0a
-Port A (8 bit
-.Tn I/O ) .
-.It Pa /dev/pbio0b
-Port B (8 bit
-.Tn I/O ) .
-.It Pa /dev/pbio0ch
-Port C upper (4 bit
-.Tn I/O ) .
-.It Pa /dev/pbio0cl
-Port C lower (4 bit
-.Tn I/O ) .
-.El
-.Sh SEE ALSO
-.Rs
-.%A "Diomidis Spinellis"
-.%T "The information furnace: Consolidated home control"
-.%D "2003"
-.%J "Personal and Ubiquitous Computing"
-.%N 1
-.%V 7
-.%P "53-69"
-.Re
-.Sh HISTORY
-The
-.Nm
-device was first used under
-.Fx 4.1 .
-.Sh AUTHORS
-.An Diomidis D. Spinellis Aq Mt dds@aueb.gr
-.Sh BUGS
-One of the
-.Tn PCL-724
-card's inputs can optionally be wired to generate an interrupt.
-This feature is not supported.
diff --git a/sys/conf/files b/sys/conf/files
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -2682,7 +2682,6 @@
dev/ow/own_if.m optional ow
dev/ow/ow_temp.c optional ow_temp
dev/ow/owc_gpiobus.c optional owc gpio
-dev/pbio/pbio.c optional pbio isa
dev/pccbb/pccbb.c optional cbb
dev/pccbb/pccbb_pci.c optional cbb pci
dev/pcf/pcf.c optional pcf
diff --git a/sys/dev/pbio/pbio.c b/sys/dev/pbio/pbio.c
deleted file mode 100644
--- a/sys/dev/pbio/pbio.c
+++ /dev/null
@@ -1,434 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
- * Copyright (c) 2000-2004
- * Diomidis D. Spinellis, Athens, Greece
- * All rights reserved.
- *
- * 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 as
- * the first lines of this file unmodified.
- * 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 Diomidis D. Spinellis ``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 Diomidis D. Spinellis 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.
- *
- * $Id: pbio.c,v 1.12 2003/10/11 13:05:08 dds Exp dds $
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h> /* SYSINIT stuff */
-#include <sys/bus.h>
-#include <sys/resource.h>
-#include <sys/syslog.h>
-#include <sys/sysctl.h>
-#include <sys/conf.h> /* cdevsw stuff */
-#include <sys/malloc.h> /* malloc region definitions */
-#include <sys/module.h>
-#include <machine/bus.h>
-#include <machine/resource.h>
-#include <sys/rman.h>
-#include <dev/pbio/pbioio.h> /* pbio IOCTL definitions */
-#include <sys/uio.h>
-#include <sys/fcntl.h>
-#include <sys/sx.h>
-#include <isa/isavar.h>
-
-/* Function prototypes (these should all be static) */
-static d_open_t pbioopen;
-static d_read_t pbioread;
-static d_write_t pbiowrite;
-static d_ioctl_t pbioioctl;
-static d_poll_t pbiopoll;
-static int pbioprobe(device_t);
-static int pbioattach(device_t);
-
-/* Device registers */
-#define PBIO_PORTA 0
-#define PBIO_PORTB 1
-#define PBIO_PORTC 2
-#define PBIO_CFG 3
-#define PBIO_IOSIZE 4
-
-/* Per-port buffer size */
-#define PBIO_BUFSIZ 64
-
-/* Number of /dev entries */
-#define PBIO_NPORTS 4
-
-/* I/O port range */
-#define IO_PBIOSIZE 4
-
-static char *port_names[] = {"a", "b", "ch", "cl"};
-
-#define PBIO_PNAME(n) (port_names[(n)])
-
-#define PORT(dev) (dev2unit(dev))
-
-#define pbio_addr(dev) ((dev)->si_drv1)
-
-static struct cdevsw pbio_cdevsw = {
- .d_version = D_VERSION,
- .d_open = pbioopen,
- .d_read = pbioread,
- .d_write = pbiowrite,
- .d_ioctl = pbioioctl,
- .d_poll = pbiopoll,
- .d_name = "pbio"
-};
-
-/*
- * Data specific to each I/O port
- */
-struct portdata {
- struct cdev *port;
- int diff; /* When true read only differences */
- int ipace; /* Input pace */
- int opace; /* Output pace */
- char oldval; /* Last value read */
- char buff[PBIO_BUFSIZ]; /* Per-port data buffer */
-};
-
-/*
- * One of these per allocated device
- */
-struct pbio_softc {
- struct portdata pd[PBIO_NPORTS];/* Per port data */
- int iomode; /* Virtualized I/O mode port value */
- /* The real port is write-only */
- struct resource *res;
- struct sx lock;
-};
-
-typedef struct pbio_softc *sc_p;
-
-static device_method_t pbio_methods[] = {
- /* Device interface */
- DEVMETHOD(device_probe, pbioprobe),
- DEVMETHOD(device_attach, pbioattach),
- DEVMETHOD_END
-};
-
-static char driver_name[] = "pbio";
-
-static driver_t pbio_driver = {
- driver_name,
- pbio_methods,
- sizeof(struct pbio_softc),
-};
-
-DRIVER_MODULE(pbio, isa, pbio_driver, 0, 0);
-
-static __inline uint8_t
-pbinb(struct pbio_softc *scp, int off)
-{
-
- return (bus_read_1(scp->res, off));
-}
-
-static __inline void
-pboutb(struct pbio_softc *scp, int off, uint8_t val)
-{
-
- bus_write_1(scp->res, off, val);
-}
-
-static int
-pbioprobe(device_t dev)
-{
- int rid;
- struct pbio_softc *scp = device_get_softc(dev);
-#ifdef GENERIC_PBIO_PROBE
- unsigned char val;
-#endif
-
- if (isa_get_logicalid(dev)) /* skip PnP probes */
- return (ENXIO);
- rid = 0;
- scp->res = bus_alloc_resource_anywhere(dev, SYS_RES_IOPORT, &rid,
- IO_PBIOSIZE, RF_ACTIVE);
- if (scp->res == NULL)
- return (ENXIO);
-
-#ifdef GENERIC_PBIO_PROBE
- /*
- * try see if the device is there.
- * This probe works only if the device has no I/O attached to it
- * XXX Better allow flags to abort testing
- */
- /* Set all ports to output */
- pboutb(scp, PBIO_CFG, 0x80);
- printf("pbio val(CFG: 0x%03x)=0x%02x (should be 0x80)\n",
- rman_get_start(scp->res), pbinb(scp, PBIO_CFG));
- pboutb(scp, PBIO_PORTA, 0xa5);
- val = pbinb(scp, PBIO_PORTA);
- printf("pbio val=0x%02x (should be 0xa5)\n", val);
- if (val != 0xa5) {
- bus_release_resource(dev, SYS_RES_IOPORT, rid, sc->res);
- return (ENXIO);
- }
- pboutb(scp, PBIO_PORTA, 0x5a);
- val = pbinb(scp, PBIO_PORTA);
- printf("pbio val=0x%02x (should be 0x5a)\n", val);
- if (val != 0x5a) {
- bus_release_resource(dev, SYS_RES_IOPORT, rid, sc->res);
- return (ENXIO);
- }
-#endif
- device_set_desc(dev, "Intel 8255 PPI (basic mode)");
- /* Set all ports to input */
- /* pboutb(scp, PBIO_CFG, 0x9b); */
- bus_release_resource(dev, SYS_RES_IOPORT, rid, scp->res);
- return (BUS_PROBE_DEFAULT);
-}
-
-/*
- * Called if the probe succeeded.
- * We can be destructive here as we know we have the device.
- * we can also trust the unit number.
- */
-static int
-pbioattach (device_t dev)
-{
- struct make_dev_args args;
- int unit;
- int i;
- int rid;
- struct pbio_softc *sc;
-
- sc = device_get_softc(dev);
- unit = device_get_unit(dev);
- rid = 0;
- sc->res = bus_alloc_resource_anywhere(dev, SYS_RES_IOPORT, &rid,
- IO_PBIOSIZE, RF_ACTIVE);
- if (sc->res == NULL)
- return (ENXIO);
-
- /*
- * Store whatever seems wise.
- */
- sc->iomode = 0x9b; /* All ports to input */
-
- sx_init(&sc->lock, "pbio");
- for (i = 0; i < PBIO_NPORTS; i++) {
- make_dev_args_init(&args);
- args.mda_devsw = &pbio_cdevsw;
- args.mda_uid = 0;
- args.mda_gid = 0;
- args.mda_mode = 0600;
- args.mda_unit = i;
- args.mda_si_drv1 = sc;
- (void)make_dev_s(&args, &sc->pd[i].port, "pbio%d%s", unit,
- PBIO_PNAME(i));
- }
- return (0);
-}
-
-static int
-pbioioctl (struct cdev *dev, u_long cmd, caddr_t data, int flag,
- struct thread *td)
-{
- struct pbio_softc *scp;
- int error, port;
-
- error = 0;
- port = PORT(dev);
- scp = pbio_addr(dev);
- sx_xlock(&scp->lock);
- switch (cmd) {
- case PBIO_SETDIFF:
- scp->pd[port].diff = *(int *)data;
- break;
- case PBIO_SETIPACE:
- scp->pd[port].ipace = *(int *)data;
- break;
- case PBIO_SETOPACE:
- scp->pd[port].opace = *(int *)data;
- break;
- case PBIO_GETDIFF:
- *(int *)data = scp->pd[port].diff;
- break;
- case PBIO_GETIPACE:
- *(int *)data = scp->pd[port].ipace;
- break;
- case PBIO_GETOPACE:
- *(int *)data = scp->pd[port].opace;
- break;
- default:
- error = ENXIO;
- }
- sx_xunlock(&scp->lock);
- return (error);
-}
-
-static int
-pbioopen(struct cdev *dev, int oflags, int devtype, struct thread *td)
-{
- struct pbio_softc *scp;
- int error, ocfg, port;
- int portbit; /* Port configuration bit */
-
- port = PORT(dev);
- scp = pbio_addr(dev);
-
- switch (port) {
- case 0: portbit = 0x10; break; /* Port A */
- case 1: portbit = 0x02; break; /* Port B */
- case 2: portbit = 0x08; break; /* Port CH */
- case 3: portbit = 0x01; break; /* Port CL */
- default: return (ENODEV);
- }
- ocfg = scp->iomode;
-
- error = 0;
- sx_xlock(&scp->lock);
- if (oflags & FWRITE)
- /* Writing == output; zero the bit */
- pboutb(scp, PBIO_CFG, scp->iomode = (ocfg & (~portbit)));
- else if (oflags & FREAD)
- /* Reading == input; set the bit */
- pboutb(scp, PBIO_CFG, scp->iomode = (ocfg | portbit));
- else
- error = EACCES;
- sx_xunlock(&scp->lock);
-
- return (error);
-}
-
-/*
- * Return the value of a given port on a given I/O base address
- * Handles the split C port nibbles and blocking
- */
-static int
-portval(int port, struct pbio_softc *scp, char *val)
-{
- int err;
-
- for (;;) {
- switch (port) {
- case 0:
- *val = pbinb(scp, PBIO_PORTA);
- break;
- case 1:
- *val = pbinb(scp, PBIO_PORTB);
- break;
- case 2:
- *val = (pbinb(scp, PBIO_PORTC) >> 4) & 0xf;
- break;
- case 3:
- *val = pbinb(scp, PBIO_PORTC) & 0xf;
- break;
- default:
- *val = 0;
- break;
- }
- if (scp->pd[port].diff) {
- if (*val != scp->pd[port].oldval) {
- scp->pd[port].oldval = *val;
- return (0);
- }
- err = pause_sig("pbiopl", max(1, scp->pd[port].ipace));
- if (err == EINTR)
- return (EINTR);
- } else
- return (0);
- }
-}
-
-static int
-pbioread(struct cdev *dev, struct uio *uio, int ioflag)
-{
- struct pbio_softc *scp;
- int err, i, port, toread;
- char val;
-
- port = PORT(dev);
- scp = pbio_addr(dev);
-
- err = 0;
- sx_xlock(&scp->lock);
- while (uio->uio_resid > 0) {
- toread = min(uio->uio_resid, PBIO_BUFSIZ);
- if ((err = uiomove(scp->pd[port].buff, toread, uio)) != 0)
- break;
- for (i = 0; i < toread; i++) {
- if ((err = portval(port, scp, &val)) != 0)
- break;
- scp->pd[port].buff[i] = val;
- if (!scp->pd[port].diff && scp->pd[port].ipace)
- pause_sig("pbioip", scp->pd[port].ipace);
- }
- }
- sx_xunlock(&scp->lock);
- return (err);
-}
-
-static int
-pbiowrite(struct cdev *dev, struct uio *uio, int ioflag)
-{
- struct pbio_softc *scp;
- int i, port, ret, towrite;
- char val, oval;
-
- port = PORT(dev);
- scp = pbio_addr(dev);
-
- ret = 0;
- sx_xlock(&scp->lock);
- while (uio->uio_resid > 0) {
- towrite = min(uio->uio_resid, PBIO_BUFSIZ);
- if ((ret = uiomove(scp->pd[port].buff, towrite, uio)) != 0)
- break;
- for (i = 0; i < towrite; i++) {
- val = scp->pd[port].buff[i];
- switch (port) {
- case 0:
- pboutb(scp, PBIO_PORTA, val);
- break;
- case 1:
- pboutb(scp, PBIO_PORTB, val);
- break;
- case 2:
- oval = pbinb(scp, PBIO_PORTC);
- oval &= 0xf;
- val <<= 4;
- pboutb(scp, PBIO_PORTC, val | oval);
- break;
- case 3:
- oval = pbinb(scp, PBIO_PORTC);
- oval &= 0xf0;
- val &= 0xf;
- pboutb(scp, PBIO_PORTC, oval | val);
- break;
- }
- if (scp->pd[port].opace)
- pause_sig("pbioop", scp->pd[port].opace);
- }
- }
- sx_xunlock(&scp->lock);
- return (ret);
-}
-
-static int
-pbiopoll(struct cdev *dev, int which, struct thread *td)
-{
- /*
- * Do processing
- */
- return (0); /* this is the wrong value I'm sure */
-}
diff --git a/sys/dev/pbio/pbioio.h b/sys/dev/pbio/pbioio.h
deleted file mode 100644
--- a/sys/dev/pbio/pbioio.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause
- *
- * Copyright (c) 2000-2004
- * Diomidis D. Spinellis, Athens, Greece
- * All rights reserved.
- *
- * 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 as
- * the first lines of this file unmodified.
- * 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 Diomidis D. Spinellis ``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 Diomidis D. Spinellis 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.
- *
- */
-
-/*
- * Definitions needed to access the pbio device (ioctls etc)
- */
-#ifndef SYS_PBIO_H
-#define SYS_PBIO_H
-
-#ifndef KERNEL
-#include <sys/types.h>
-#endif
-#include <sys/ioccom.h>
-
-/*
- * ioctls
- */
-#define PBIO_SETDIFF _IOW('p', 0x01, int)
-#define PBIO_SETIPACE _IOW('p', 0x02, int)
-#define PBIO_SETOPACE _IOW('p', 0x03, int)
-#define PBIO_GETDIFF _IOR('p', 0x81, int)
-#define PBIO_GETIPACE _IOR('p', 0x82, int)
-#define PBIO_GETOPACE _IOR('p', 0x83, int)
-
-#endif
diff --git a/sys/x86/conf/NOTES b/sys/x86/conf/NOTES
--- a/sys/x86/conf/NOTES
+++ b/sys/x86/conf/NOTES
@@ -523,15 +523,11 @@
# Miscellaneous hardware:
#
# ipmi: Intelligent Platform Management Interface
-# pbio: Parallel (8255 PPI) basic I/O (mode 0) port (e.g. Advantech PCL-724)
# smbios: DMI/SMBIOS entry point (requires EFIRT option)
# vpd: Vital Product Data kernel interface
# tpm: Trusted Platform Module
device ipmi
-device pbio
-envvar hint.pbio.0.at="isa"
-envvar hint.pbio.0.port="0x360"
device smbios
device vpd
device tpm
diff --git a/tools/kerneldoc/subsys/Doxyfile-dev_pbio b/tools/kerneldoc/subsys/Doxyfile-dev_pbio
deleted file mode 100644
--- a/tools/kerneldoc/subsys/Doxyfile-dev_pbio
+++ /dev/null
@@ -1,19 +0,0 @@
-# Doxyfile 1.5.2
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-PROJECT_NAME = "FreeBSD kernel PBIO device code"
-OUTPUT_DIRECTORY = $(DOXYGEN_DEST_PATH)/dev_pbio/
-EXTRACT_ALL = YES # for undocumented src, no warnings enabled
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-INPUT = $(DOXYGEN_SRC_PATH)/dev/pbio/ \
- $(NOTREVIEWED)
-
-GENERATE_TAGFILE = dev_pbio/dev_pbio.tag
-
-@INCLUDE_PATH = $(DOXYGEN_INCLUDE_PATH)
-@INCLUDE = common-Doxyfile
-

File Metadata

Mime Type
text/plain
Expires
Sun, Oct 18, 3:13 PM (19 h, 50 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
40921146
Default Alt Text
D60662.diff (22 KB)

Event Timeline