We use the generic isa version now.

2 files changed, 0 insertions, 170 deletions

diff --git a/sys/i386/isa/atkbd_isa.c b/sys/i386/isa/atkbd_isa.c
deleted file mode 100644
index e4c0603..0000000
--- a/sys/i386/isa/atkbd_isa.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*-
- * Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
- * 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 THE AUTHORS ``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 AUTHORS 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: atkbd_isa.c,v 1.2 1999/01/19 11:30:55 yokota Exp $
- */
-
-#include "atkbd.h"
-#include "opt_kbd.h"
-
-#if NATKBD > 0
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/conf.h>
-#include <sys/tty.h>
-
-#include <dev/kbd/kbdreg.h>
-#include <dev/kbd/atkbdreg.h>
-
-#include <i386/isa/isa.h>
-#include <i386/isa/isa_device.h>
-
-static int		atkbdprobe(struct isa_device *dev);
-static int		atkbdattach(struct isa_device *dev);
-static ointhand2_t	atkbd_isa_intr;
-
-struct isa_driver atkbddriver = {
-	atkbdprobe,
-	atkbdattach,
-	ATKBD_DRIVER_NAME,
-	0,
-};
-
-static int
-atkbdprobe(struct isa_device *dev)
-{
-	return ((atkbd_probe_unit(dev->id_unit, dev->id_iobase,
-				  dev->id_irq, dev->id_flags)) ? 0 : -1);
-}
-
-static int
-atkbdattach(struct isa_device *dev)
-{
-	atkbd_softc_t *sc;
-
-	sc = atkbd_get_softc(dev->id_unit);
-	if (sc == NULL)
-		return 0;
-
-	dev->id_ointr = atkbd_isa_intr;
-	return ((atkbd_attach_unit(dev->id_unit, sc, dev->id_iobase,
-				   dev->id_irq, dev->id_flags)) ? 0 : 1);
-}
-
-static void
-atkbd_isa_intr(int unit)
-{
-	keyboard_t *kbd;
-
-	kbd = atkbd_get_softc(unit)->kbd;
-	(*kbdsw[kbd->kb_index]->intr)(kbd, NULL);
-}
-
-#endif /* NATKBD > 0 */
diff --git a/sys/i386/isa/atkbdc_isa.c b/sys/i386/isa/atkbdc_isa.c
deleted file mode 100644
index c547a40..0000000
--- a/sys/i386/isa/atkbdc_isa.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/*-
- * Copyright (c) 1999 Kazutaka YOKOTA (yokota@zodiac.mech.utsunomiya-u.ac.jp)
- * 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.
- * 3. The name of the author may not be used to endorse or promote 
- *    products derived from this software without specific prior written 
- *    permission.
- *
- * 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.
- *
- * $Id: $
- */
-
-#include "atkbdc.h"
-#include "opt_kbd.h"
-
-#if NATKBDC > 0
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-
-#include <dev/kbd/atkbdcreg.h>
-
-#include <i386/isa/isa.h>
-#include <i386/isa/isa_device.h>
-
-static int	atkbdc_probe(struct isa_device *dev);
-static int	atkbdc_attach(struct isa_device *dev);
-
-struct isa_driver atkbdcdriver = {
-	atkbdc_probe,
-	atkbdc_attach,
-	ATKBDC_DRIVER_NAME,
-	0,
-};
-
-static int
-atkbdc_probe(struct isa_device *dev)
-{
-	atkbdc_softc_t *sc;
-	int error;
-
-	sc = atkbdc_get_softc(dev->id_unit);
-	if (sc == NULL)
-		return 0;
-
-	error = atkbdc_probe_unit(sc, dev->id_unit, dev->id_iobase);
-	if (error)
-		return 0;
-	if (dev->id_iobase <= 0)
-		dev->id_iobase = sc->port;
-	return IO_KBDSIZE;
-}
-
-static int
-atkbdc_attach(struct isa_device *dev)
-{
-	atkbdc_softc_t *sc;
-	
-	sc = atkbdc_get_softc(dev->id_unit);
-	return ((sc == NULL) ? 0 : 1);
-}
-
-#endif /* NATKBDC > 0 */