aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Baldwin <jhb@FreeBSD.org>2016-08-19 23:39:08 +0000
committerJohn Baldwin <jhb@FreeBSD.org>2016-08-19 23:39:08 +0000
commit354b6f0fd9a89d1d3250d7b3bfaca37bd921ef15 (patch)
tree7883e9d3ba6c52f71a73c58e09bfb7a83f05b07e
parent09b9789b28dd8453a54cb424115f31a6d3672527 (diff)
downloadsrc-354b6f0fd9a89d1d3250d7b3bfaca37bd921ef15.tar.gz
src-354b6f0fd9a89d1d3250d7b3bfaca37bd921ef15.zip
Remove the spic(4) driver for the Sony Vaoi Jogdial.
This hardware is not present on any modern systems. The driver is quite hackish (raw inb/outb instead of bus_space, and raw inb/outb to random I/O ports to enable ACPI since it predated proper ACPI support). Relnotes: yes
Notes
Notes: svn path=/head/; revision=304508
-rw-r--r--ObsoleteFiles.inc2
-rw-r--r--share/man/man4/Makefile1
-rw-r--r--share/man/man4/spic.461
-rw-r--r--sys/conf/files.i3861
-rw-r--r--sys/i386/conf/NOTES4
-rw-r--r--sys/i386/isa/spic.c562
-rw-r--r--sys/i386/isa/spicreg.h56
7 files changed, 2 insertions, 685 deletions
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index e13a87c30fea..4f9390a547b9 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -38,6 +38,8 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20160819: Remove spic(4)
+OLD_FILES+=usr/share/man/man4/spic.4.gz
# 20160819: Remove wl(4) and wlconfig(8)
OLD_FILES+=usr/share/man/man4/i386/wl.4.gz
OLD_FILES+=usr/sbin/wlconfig
diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index e63f79500ecd..5cd4b7defcc2 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -496,7 +496,6 @@ MAN= aac.4 \
snd_via82c686.4 \
snd_vibes.4 \
snp.4 \
- spic.4 \
${_spkr.4} \
splash.4 \
sppp.4 \
diff --git a/share/man/man4/spic.4 b/share/man/man4/spic.4
deleted file mode 100644
index 5bbf53bb8bea..000000000000
--- a/share/man/man4/spic.4
+++ /dev/null
@@ -1,61 +0,0 @@
-.\"
-.\" Copyright (c) 2002 Will Andrews
-.\" 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.
-.\" 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 AUTHOR 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 AUTHOR 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.
-.\"
-.\" $FreeBSD$
-.\"
-.Dd May 20, 2002
-.Dt SPIC 4
-.Os
-.Sh NAME
-.Nm spic
-.Nd Sony Programmable I/O Controller device driver
-.Sh SYNOPSIS
-.Cd "device spic"
-.Sh DESCRIPTION
-The
-.Nm
-driver allows using
-.Xr moused 8
-to drive the Sony Vaio Jogdial device found on several Sony Vaio models.
-It works by mapping the forward, backwards, up, and down inputs to
-.Dq l ,
-.Dq r ,
-.Dq u ,
-and
-.Dq d ,
-respectively.
-From that a program reading the Jogdial can decide what to do.
-Some actions might include scrolling, mimicking mouse buttons, launching
-applications, or other useful things.
-.Sh SEE ALSO
-.Xr moused 8
-.Sh HISTORY
-The
-.Nm
-device driver first appeared in
-.Fx 4.6 .
-.Sh AUTHORS
-.An Nick Sayer Aq Mt nsayer@FreeBSD.org
-.An Will Andrews Aq Mt will@FreeBSD.org
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 516bf77f7446..0c0af884eec4 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -516,7 +516,6 @@ i386/isa/elink.c optional ep | ie
i386/isa/npx.c optional npx
i386/isa/pmtimer.c optional pmtimer
i386/isa/prof_machdep.c optional profiling-routine
-i386/isa/spic.c optional spic
i386/linux/imgact_linux.c optional compat_linux
i386/linux/linux_dummy.c optional compat_linux
i386/linux/linux_machdep.c optional compat_linux
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 632db68576df..2027760bd9be 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -834,7 +834,6 @@ device hyperv # HyperV drivers
# vpd: Vital Product Data kernel interface
# pmtimer: Adjust system timer at wakeup time
# pbio: Parallel (8255 PPI) basic I/O (mode 0) port (e.g. Advantech PCL-724)
-# spic: Sony Programmable I/O controller (VAIO notebooks)
# asmc: Apple System Management Controller
# si: Specialix International SI/XIO or SX intelligent serial card driver
# tpm: Trusted Platform Module
@@ -871,9 +870,6 @@ device pmtimer
device pbio
hint.pbio.0.at="isa"
hint.pbio.0.port="0x360"
-device spic
-hint.spic.0.at="isa"
-hint.spic.0.port="0x10a0"
device asmc
device tpm
device padlock_rng # VIA Padlock RNG
diff --git a/sys/i386/isa/spic.c b/sys/i386/isa/spic.c
deleted file mode 100644
index 2444333bfe33..000000000000
--- a/sys/i386/isa/spic.c
+++ /dev/null
@@ -1,562 +0,0 @@
-/*-
- * Copyright (c) 2000 Nick Sayer
- * 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.
- * 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 AUTHOR 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 AUTHOR 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.
- */
-
-/* spic -- the Sony Programmable I/O Controller
- *
- * This device exists on most recent Sony laptops. It is the means by which
- * you can watch the Jog Dial and some other functions.
- *
- * At the moment, this driver merely tries to turn the jog dial into a
- * device that moused can park on, with the intent of supplying a Z axis
- * and mouse button out of the jog dial. I suspect that this device will
- * end up having to support at least 2 different minor devices: One to be
- * the jog wheel device for moused to camp out on and the other to perform
- * all of the other miscellaneous functions of this device. But for now,
- * the jog wheel is all you get.
- *
- * At the moment, the data sent back by the device is rather primitive.
- * It sends a single character per event:
- * u = up, d = down -- that's the jog button
- * l = left, r = right -- that's the dial.
- * "left" and "right" are rather capricious. They actually represent
- * ccw and cw, respectively
- *
- * What documentation exists is thanks to Andrew Tridge, and his page at
- * http://samba.org/picturebook/ Special thanks also to Ian Dowse, who
- * also provided sample code upon which this driver was based.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/module.h>
-#include <sys/bus.h>
-#include <machine/bus.h>
-#include <sys/rman.h>
-#include <machine/resource.h>
-#include <isa/isavar.h>
-#include <sys/poll.h>
-#include <machine/pci_cfgreg.h>
-#include <sys/tty.h>
-#include <sys/conf.h>
-#include <sys/fcntl.h>
-#include <sys/malloc.h>
-#include <sys/sysctl.h>
-#include <sys/uio.h>
-
-#include <i386/isa/spicreg.h>
-
-static int spic_pollrate;
-
-SYSCTL_INT(_machdep, OID_AUTO, spic_pollrate, CTLFLAG_RW, &spic_pollrate, 0, "")
-;
-
-devclass_t spic_devclass;
-
-static d_open_t spicopen;
-static d_close_t spicclose;
-static d_read_t spicread;
-static d_ioctl_t spicioctl;
-static d_poll_t spicpoll;
-
-static struct cdevsw spic_cdevsw = {
- .d_version = D_VERSION,
- .d_open = spicopen,
- .d_close = spicclose,
- .d_read = spicread,
- .d_ioctl = spicioctl,
- .d_poll = spicpoll,
- .d_name = "spic",
-};
-
-#define SCBUFLEN 128
-
-struct spic_softc {
- u_int sc_port_addr;
- u_char sc_intr;
- struct resource *sc_port_res,*sc_intr_res;
- int sc_port_rid,sc_intr_rid;
- int sc_opened;
- int sc_sleeping;
- int sc_buttonlast;
- struct callout sc_timeout;
- struct mtx sc_lock;
- device_t sc_dev;
- struct cdev *sc_cdev;
- struct selinfo sc_rsel;
- u_char sc_buf[SCBUFLEN];
- int sc_count;
- int sc_model;
-};
-
-static void
-write_port1(struct spic_softc *sc, u_char val)
-{
- DELAY(10);
- outb(sc->sc_port_addr, val);
-}
-
-static void
-write_port2(struct spic_softc *sc, u_char val)
-{
- DELAY(10);
- outb(sc->sc_port_addr + 4, val);
-}
-
-static u_char
-read_port1(struct spic_softc *sc)
-{
- DELAY(10);
- return inb(sc->sc_port_addr);
-}
-
-static u_char
-read_port2(struct spic_softc *sc)
-{
- DELAY(10);
- return inb(sc->sc_port_addr + 4);
-}
-
-static u_char
-read_port_cst(struct spic_softc *sc)
-{
- DELAY(10);
- return inb(SPIC_CST_IOPORT);
-}
-
-static void
-busy_wait(struct spic_softc *sc)
-{
- int i=0;
-
- while(read_port2(sc) & 2) {
- DELAY(10);
- if (i++>10000) {
- printf("spic busy wait abort\n");
- return;
- }
- }
-}
-
-static void
-busy_wait_cst(struct spic_softc *sc, int mask)
-{
- int i=0;
-
- while(read_port_cst(sc) & mask) {
- DELAY(10);
- if (i++>10000) {
- printf("spic busy wait abort\n");
- return;
- }
- }
-}
-
-static u_char
-spic_call1(struct spic_softc *sc, u_char dev) {
- busy_wait(sc);
- write_port2(sc, dev);
- read_port2(sc);
- return read_port1(sc);
-}
-
-static u_char
-spic_call2(struct spic_softc *sc, u_char dev, u_char fn)
-{
- busy_wait(sc);
- write_port2(sc, dev);
- busy_wait(sc);
- write_port1(sc, fn);
- return read_port1(sc);
-}
-
-static void
-spic_ecrset(struct spic_softc *sc, u_int16_t addr, u_int16_t value)
-{
- busy_wait_cst(sc, 3);
- outb(SPIC_CST_IOPORT, 0x81);
- busy_wait_cst(sc, 2);
- outb(SPIC_DATA_IOPORT, addr);
- busy_wait_cst(sc, 2);
- outb(SPIC_DATA_IOPORT, value);
- busy_wait_cst(sc, 2);
-}
-
-static void
-spic_type2_srs(struct spic_softc *sc)
-{
- spic_ecrset(sc, SPIC_SHIB, (sc->sc_port_addr & 0xFF00) >> 8);
- spic_ecrset(sc, SPIC_SLOB, sc->sc_port_addr & 0x00FF);
- spic_ecrset(sc, SPIC_SIRQ, 0x00); /* using polling mode (IRQ=0)*/
- DELAY(10);
-}
-
-static int
-spic_probe(device_t dev)
-{
- struct spic_softc *sc;
- u_char t, spic_irq;
-
- sc = device_get_softc(dev);
-
- /*
- * We can only have 1 of these. Attempting to probe for a unit 1
- * will destroy the work we did for unit 0
- */
- if (device_get_unit(dev))
- return ENXIO;
-
- bzero(sc, sizeof(struct spic_softc));
-
- if (!(sc->sc_port_res = bus_alloc_resource_anywhere(dev, SYS_RES_IOPORT,
- &sc->sc_port_rid, 5, RF_ACTIVE))) {
- device_printf(dev,"Couldn't map I/O\n");
- return ENXIO;
- }
- sc->sc_port_addr = (u_short)rman_get_start(sc->sc_port_res);
-
-#ifdef notyet
- if (!(sc->sc_intr_res = bus_alloc_resource_any(dev, SYS_RES_IRQ,
- &sc->sc_intr_rid, RF_ACTIVE))) {
- device_printf(dev,"Couldn't map IRQ\n");
- bus_release_resource(dev, SYS_RES_IOPORT,
- sc->sc_port_rid, sc->sc_port_res);
- return ENXIO;
- }
- sc->sc_intr = (u_short)rman_get_start(sc->sc_intr_res);
-
- switch (sc->sc_intr) {
- case 0: spic_irq = 3; break;
- case 5: spic_irq = 0; break;
- case 0xa: spic_irq = 1; break;
- case 0xb: spic_irq = 2; break;
- default: device_printf(dev,"Invalid IRQ\n");
- bus_release_resource(dev, SYS_RES_IOPORT,
- sc->sc_port_rid, sc->sc_port_res);
- bus_release_resource(dev, SYS_RES_IRQ,
- sc->sc_intr_rid, sc->sc_intr_res);
- return ENXIO;
- }
-#else
- spic_irq = 3;
-#endif
-
-#if 0
- if (sc->sc_port_addr != 0x10A0) {
- bus_release_resource(dev, SYS_RES_IOPORT,
- sc->sc_port_rid, sc->sc_port_res);
- bus_release_resource(dev, SYS_RES_IRQ,
- sc->sc_intr_rid, sc->sc_intr_res);
- return ENXIO;
- }
-#endif
-
- /* PIIX4 chipset at least? */
- if (pci_cfgregread(PIIX4_BUS, PIIX4_SLOT, PIIX4_FUNC, 0, 4) ==
- PIIX4_DEVID) {
- sc->sc_model = SPIC_DEVICE_MODEL_TYPE1;
- } else {
- /* For newer VAIOs (R505, SRX7, ...) */
- sc->sc_model = SPIC_DEVICE_MODEL_TYPE2;
- }
-
- /*
- * This is an ugly hack. It is necessary until ACPI works correctly.
- *
- * The SPIC consists of 2 registers. They are mapped onto I/O by the
- * PIIX4's General Device 10 function. There is also an interrupt
- * control port at a somewhat magic location, but this first pass is
- * polled.
- *
- * So the first thing we need to do is map the G10 space in.
- *
- */
-
- /* Enable ACPI mode to get Fn key events */
- /* XXX This may slow down your VAIO if ACPI is not supported in the kernel.
- outb(0xb2, 0xf0);
- */
-
- device_printf(dev,"device model type = %d\n", sc->sc_model);
-
- if(sc->sc_model == SPIC_DEVICE_MODEL_TYPE1) {
- pci_cfgregwrite(PIIX4_BUS, PIIX4_SLOT, PIIX4_FUNC, G10A,
- sc->sc_port_addr, 2);
- t = pci_cfgregread(PIIX4_BUS, PIIX4_SLOT, PIIX4_FUNC, G10L, 1);
- t &= 0xf0;
- t |= 4;
- pci_cfgregwrite(PIIX4_BUS, PIIX4_SLOT, PIIX4_FUNC, G10L, t, 1);
- outw(SPIC_IRQ_PORT, (inw(SPIC_IRQ_PORT) & ~(0x3 << SPIC_IRQ_SHIFT)) | (spic_irq << SPIC_IRQ_SHIFT));
- t = pci_cfgregread(PIIX4_BUS, PIIX4_SLOT, PIIX4_FUNC, G10L, 1);
- t &= 0x1f;
- t |= 0xc0;
- pci_cfgregwrite(PIIX4_BUS, PIIX4_SLOT, PIIX4_FUNC, G10L, t, 1);
- } else {
- spic_type2_srs(sc);
- }
-
- /*
- * XXX: Should try and see if there's anything actually there.
- */
-
- device_set_desc(dev, "Sony Programmable I/O Controller");
-
- return 0;
-}
-
-static int
-spic_attach(device_t dev)
-{
- struct spic_softc *sc;
-
- sc = device_get_softc(dev);
-
- sc->sc_dev = dev;
- mtx_init(&sc->sc_lock, "spic", NULL, MTX_DEF);
- callout_init_mtx(&sc->sc_timeout, &sc->sc_lock, 0);
-
- spic_pollrate = (hz/50); /* Every 50th of a second */
-
- spic_call1(sc, 0x82);
- spic_call2(sc, 0x81, 0xff);
- spic_call1(sc, 0x92);
-
- /* There can be only one */
- sc->sc_cdev = make_dev(&spic_cdevsw, 0, 0, 0, 0600, "jogdial");
- sc->sc_cdev->si_drv1 = sc;
-
- return 0;
-}
-
-static void
-spictimeout(void *arg)
-{
- struct spic_softc *sc = arg;
- u_char b, event, param;
- int j;
-
- mtx_assert(&sc->sc_lock, MA_OWNED);
- if (!sc->sc_opened) {
- device_printf(sc->sc_dev, "timeout called while closed!\n");
- return;
- }
-
- event = read_port2(sc);
- param = read_port1(sc);
-
- if ((event != 4) && (!(event & 0x1)))
- switch(event) {
- case 0x10: /* jog wheel event (type1) */
- if (sc->sc_model == SPIC_DEVICE_MODEL_TYPE1) {
- b = !!(param & 0x40);
- if (b != sc->sc_buttonlast) {
- sc->sc_buttonlast = b;
- sc->sc_buf[sc->sc_count++] =
- b?'d':'u';
- }
- j = (param & 0xf) | ((param & 0x10)? ~0xf:0);
- if (j<0)
- while(j++!=0) {
- sc->sc_buf[sc->sc_count++] =
- 'l';
- }
- else if (j>0)
- while(j--!=0) {
- sc->sc_buf[sc->sc_count++] =
- 'r';
- }
- }
- break;
- case 0x08: /* jog wheel event (type2) */
- case 0x00:
- /* SPIC_DEVICE_MODEL_TYPE2 returns jog wheel event=0x00 */
- if (sc->sc_model == SPIC_DEVICE_MODEL_TYPE2) {
- b = !!(param & 0x40);
- if (b != sc->sc_buttonlast) {
- sc->sc_buttonlast = b;
- sc->sc_buf[sc->sc_count++] =
- b?'d':'u';
- }
- j = (param & 0xf) | ((param & 0x10)? ~0xf:0);
- if (j<0)
- while(j++!=0) {
- sc->sc_buf[sc->sc_count++] =
- 'l';
- }
- else if (j>0)
- while(j--!=0) {
- sc->sc_buf[sc->sc_count++] =
- 'r';
- }
- }
- break;
- case 0x60: /* Capture button */
- printf("Capture button event: %x\n",param);
- break;
- case 0x30: /* Lid switch */
- printf("Lid switch event: %x\n",param);
- break;
- case 0x0c: /* We must ignore these type of event for C1VP... */
- case 0x70: /* Closing/Opening the lid on C1VP */
- break;
- default:
- printf("Unknown event: event %02x param %02x\n", event, param);
- break;
- }
- else {
- /* No event. Wait some more */
- callout_reset(&sc->sc_timeout, spic_pollrate, spictimeout, sc);
- return;
- }
-
- if (sc->sc_count) {
- if (sc->sc_sleeping) {
- sc->sc_sleeping = 0;
- wakeup( sc);
- }
- selwakeuppri(&sc->sc_rsel, PZERO);
- }
- spic_call2(sc, 0x81, 0xff); /* Clear event */
-
- callout_reset(&sc->sc_timeout, spic_pollrate, spictimeout, sc);
-}
-
-static int
-spicopen(struct cdev *dev, int flag, int fmt, struct thread *td)
-{
- struct spic_softc *sc;
-
- sc = dev->si_drv1;
-
- mtx_lock(&sc->sc_lock);
- if (sc->sc_opened) {
- mtx_unlock(&sc->sc_lock);
- return (EBUSY);
- }
-
- sc->sc_opened++;
- sc->sc_count=0;
-
- /* Start the polling */
- callout_reset(&sc->sc_timeout, spic_pollrate, spictimeout, sc);
- mtx_unlock(&sc->sc_lock);
- return (0);
-}
-
-static int
-spicclose(struct cdev *dev, int flag, int fmt, struct thread *td)
-{
- struct spic_softc *sc;
-
- sc = dev->si_drv1;
- mtx_lock(&sc->sc_lock);
-
- /* Stop polling */
- callout_stop(&sc->sc_timeout);
- sc->sc_opened = 0;
- mtx_unlock(&sc->sc_lock);
- return 0;
-}
-
-static int
-spicread(struct cdev *dev, struct uio *uio, int flag)
-{
- struct spic_softc *sc;
- int l, error;
- u_char buf[SCBUFLEN];
-
- sc = dev->si_drv1;
-
- if (uio->uio_resid <= 0) /* What kind of a read is this?! */
- return (0);
-
- mtx_lock(&sc->sc_lock);
- while (!(sc->sc_count)) {
- sc->sc_sleeping=1;
- error = mtx_sleep(sc, &sc->sc_lock, PZERO | PCATCH, "jogrea", 0);
- sc->sc_sleeping=0;
- if (error) {
- mtx_unlock(&sc->sc_lock);
- return (error);
- }
- }
-
- l = min(uio->uio_resid, sc->sc_count);
- bcopy(sc->sc_buf, buf, l);
- sc->sc_count -= l;
- bcopy(sc->sc_buf + l, sc->sc_buf, l);
- mtx_unlock(&sc->sc_lock);
- return (uiomove(buf, l, uio));
-}
-
-static int
-spicioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
-{
- struct spic_softc *sc;
-
- sc = dev->si_drv1;
-
- return (EIO);
-}
-
-static int
-spicpoll(struct cdev *dev, int events, struct thread *td)
-{
- struct spic_softc *sc;
- int revents = 0;
-
- sc = dev->si_drv1;
- mtx_lock(&sc->sc_lock);
- if (events & (POLLIN | POLLRDNORM)) {
- if (sc->sc_count)
- revents |= events & (POLLIN | POLLRDNORM);
- else
- selrecord(td, &sc->sc_rsel); /* Who shall we wake? */
- }
- mtx_unlock(&sc->sc_lock);
-
- return (revents);
-}
-
-
-static device_method_t spic_methods[] = {
- DEVMETHOD(device_probe, spic_probe),
- DEVMETHOD(device_attach, spic_attach),
-
- { 0, 0 }
-};
-
-static driver_t spic_driver = {
- "spic",
- spic_methods,
- sizeof(struct spic_softc),
-};
-
-DRIVER_MODULE(spic, isa, spic_driver, spic_devclass, 0, 0);
-
diff --git a/sys/i386/isa/spicreg.h b/sys/i386/isa/spicreg.h
deleted file mode 100644
index cbbff1a7d081..000000000000
--- a/sys/i386/isa/spicreg.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * Copyright (c) 2000 Nick Sayer
- * 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.
- * 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 AUTHOR 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 AUTHOR 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.
- *
- * $FreeBSD$
- *
- */
-
-
-/*
- * Find the PCI device that holds the G10 register needed to map in the SPIC
- */
-#define PIIX4_BUS 0
-#define PIIX4_SLOT 7
-#define PIIX4_FUNC 3
-#define PIIX4_DEVID 0x71138086
-
-#define G10A (0x64)
-#define G10L (G10A + 2)
-
-#define SPIC_IRQ_PORT 0x8034
-#define SPIC_IRQ_SHIFT 22
-
-/* Define SPIC model type */
-#define SPIC_DEVICE_MODEL_TYPE1 1
-#define SPIC_DEVICE_MODEL_TYPE2 2
-
-/* type2 series specifics */
-#define SPIC_SIRQ 0x9b
-#define SPIC_SLOB 0x9c
-#define SPIC_SHIB 0x9d
-
-/* ioports used for brightness and type2 events */
-#define SPIC_DATA_IOPORT 0x62
-#define SPIC_CST_IOPORT 0x66