Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys Remove acorn26's upc(4) devices.
details: https://anonhg.NetBSD.org/src/rev/423b5f20dc88
branches: trunk
changeset: 966677:423b5f20dc88
user: msaitoh <msaitoh%NetBSD.org@localhost>
date: Mon Nov 11 04:04:29 2019 +0000
description:
Remove acorn26's upc(4) devices.
diffstat:
sys/conf/files | 13 +-
sys/dev/ic/com_upc.c | 70 ---------
sys/dev/ic/lpt_upc.c | 70 ---------
sys/dev/ic/upc.c | 388 ---------------------------------------------------
sys/dev/ic/wdc_upc.c | 108 --------------
5 files changed, 1 insertions(+), 648 deletions(-)
diffs (truncated from 679 to 300 lines):
diff -r b3874dc96c88 -r 423b5f20dc88 sys/conf/files
--- a/sys/conf/files Mon Nov 11 02:40:48 2019 +0000
+++ b/sys/conf/files Mon Nov 11 04:04:29 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1242 2019/11/09 23:27:50 jmcneill Exp $
+# $NetBSD: files,v 1.1243 2019/11/11 04:04:29 msaitoh Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20171118
@@ -1029,17 +1029,6 @@
device njata: ata, ata_piobm, wdc_common
file dev/ic/ninjaata32.c njata
-# CHIPS and Technologies 82C7[12][01] Universal Peripheral Controller
-#
-device upc { [offset = -1] }
-attach wdc at upc with wdc_upc
-attach com at upc with com_upc
-attach lpt at upc with lpt_upc
-file dev/ic/upc.c upc
-file dev/ic/wdc_upc.c wdc_upc
-file dev/ic/com_upc.c com_upc
-file dev/ic/lpt_upc.c lpt_upc
-
# AHCI-compatible SATA controllers
define ahcisata_core
file dev/ic/ahcisata_core.c ahcisata_core
diff -r b3874dc96c88 -r 423b5f20dc88 sys/dev/ic/com_upc.c
--- a/sys/dev/ic/com_upc.c Mon Nov 11 02:40:48 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-/* $NetBSD: com_upc.c,v 1.12 2018/12/08 17:46:13 thorpej Exp $ */
-/*-
- * Copyright (c) 2000 Ben Harris
- * 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 ``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 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.
- */
-/* This file is part of NetBSD/arm26 -- a port of NetBSD to ARM2/3 machines. */
-
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_upc.c,v 1.12 2018/12/08 17:46:13 thorpej Exp $");
-
-#include <sys/param.h>
-#include <sys/device.h>
-#include <sys/termios.h> /* XXX for tcflag_t in comvar.h */
-
-#include <sys/bus.h>
-#include <sys/intr.h>
-
-#include <dev/ic/comreg.h>
-#include <dev/ic/comvar.h>
-#include <dev/ic/upcvar.h>
-
-static int com_upc_match(device_t, cfdata_t , void *);
-static void com_upc_attach(device_t, device_t, void *);
-
-CFATTACH_DECL_NEW(com_upc, sizeof(struct com_softc),
- com_upc_match, com_upc_attach, NULL, NULL);
-
-static int
-com_upc_match(device_t parent, cfdata_t cf, void *aux)
-{
- struct upc_attach_args *ua = aux;
-
- return !strcmp(ua->ua_devtype, "com");
-}
-
-static void
-com_upc_attach(device_t parent, device_t self, void *aux)
-{
- struct com_softc *sc = device_private(self);
- struct upc_attach_args *ua = aux;
-
- sc->sc_dev = self;
- sc->sc_frequency = COM_FREQ;
-
- com_init_regs(&sc->sc_regs, ua->ua_iot, ua->ua_ioh, ua->ua_offset);
- com_attach_subr(sc);
- upc_intr_establish(ua->ua_irqhandle, IPL_SERIAL, comintr, sc);
-}
diff -r b3874dc96c88 -r 423b5f20dc88 sys/dev/ic/lpt_upc.c
--- a/sys/dev/ic/lpt_upc.c Mon Nov 11 02:40:48 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-/* $NetBSD: lpt_upc.c,v 1.10 2009/01/25 14:34:14 bjh21 Exp $ */
-/*-
- * Copyright (c) 2000 Ben Harris
- * 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 ``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 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.
- */
-/* This file is part of NetBSD/arm26 -- a port of NetBSD to ARM2/3 machines. */
-
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lpt_upc.c,v 1.10 2009/01/25 14:34:14 bjh21 Exp $");
-
-#include <sys/param.h>
-#include <sys/device.h>
-#include <sys/systm.h>
-
-#include <sys/bus.h>
-#include <sys/intr.h>
-
-#include <dev/ic/lptvar.h>
-#include <dev/ic/upcvar.h>
-
-static int lpt_upc_match(device_t, cfdata_t , void *);
-static void lpt_upc_attach(device_t, device_t, void *);
-
-CFATTACH_DECL_NEW(lpt_upc, sizeof(struct lpt_softc),
- lpt_upc_match, lpt_upc_attach, NULL, NULL);
-
-static int
-lpt_upc_match(device_t parent, cfdata_t cf, void *aux)
-{
- struct upc_attach_args *ua = aux;
-
- return !strcmp(ua->ua_devtype, "lpt");
-}
-
-static void
-lpt_upc_attach(device_t parent, device_t self, void *aux)
-{
- struct lpt_softc *sc = device_private(self);
- struct upc_attach_args *ua = aux;
-
- sc->sc_dev = self;
- sc->sc_iot = ua->ua_iot;
- sc->sc_ioh = ua->ua_ioh;
-
- lpt_attach_subr(sc);
- upc_intr_establish(ua->ua_irqhandle, IPL_TTY, lptintr, sc);
- aprint_normal("\n");
-}
diff -r b3874dc96c88 -r 423b5f20dc88 sys/dev/ic/upc.c
--- a/sys/dev/ic/upc.c Mon Nov 11 02:40:48 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,388 +0,0 @@
-/* $NetBSD: upc.c,v 1.15 2012/10/27 17:18:23 chs Exp $ */
-/*-
- * Copyright (c) 2000, 2003 Ben Harris
- * 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 ``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 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.
- */
-/*
- * upc - driver for C&T Universal Peripheral Controllers
- *
- * Supports:
- * 82C710 Universal Peripheral Controller
- * 82C711 Universal Peripheral Controller II
- * 82C721 Universal Peripheral Controller III (untested)
- *
- * The 82C710 is substantially different from its successors.
- * Functions that just handle the 82C710 are named upc1_*, which those
- * that handle the 82C711 and 82C721 are named upc2_*.
- */
-
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: upc.c,v 1.15 2012/10/27 17:18:23 chs Exp $");
-
-#include <sys/param.h>
-#include <sys/device.h>
-#include <sys/systm.h>
-
-#include <sys/bus.h>
-
-#include <dev/ata/atavar.h> /* XXX needed by wdcvar.h */
-#include <dev/ic/comreg.h>
-#include <dev/ic/lptreg.h>
-#include <dev/ic/lptvar.h>
-#include <dev/ic/wdcreg.h>
-#include <dev/ic/wdcvar.h>
-#include <dev/ic/upcreg.h>
-#include <dev/ic/upcvar.h>
-
-#include "locators.h"
-
-/* Conventional port to use for 82C710 configuration */
-#define UPC1_PORT_CRI 0x390
-#define UPC1_PORT_CAP (UPC1_PORT_CRI + 1)
-
-static int upc1_probe(struct upc_softc *);
-static void upc1_attach(struct upc_softc *);
-static void upc2_attach(struct upc_softc *);
-static void upc_found(struct upc_softc *, char const *, int, int,
- struct upc_irqhandle *);
-static void upc_found2(struct upc_softc *, char const *, int, int, int, int,
- struct upc_irqhandle *);
-static int upc_print(void *, char const *);
-static int upc2_com3_addr(int);
-static int upc2_com4_addr(int);
-
-void
-upc_attach(struct upc_softc *sc)
-{
-
- if (upc1_probe(sc))
- upc1_attach(sc);
- else
- upc2_attach(sc);
-}
-
-static int
-upc1_probe(struct upc_softc *sc)
-{
-
- return upc1_read_config(sc, UPC1_CFGADDR_CONFBASE) ==
- UPC1_PORT_CRI >> UPC1_CONFBASE_SHIFT;
-}
-
-static void
-upc1_attach(struct upc_softc *sc)
-{
- u_int8_t cr[16];
- int i;
-
- aprint_normal(": 82C710\n");
- /* Dump configuration */
- for (i = 0; i < 16; i++)
- cr[i] = upc1_read_config(sc, i);
-
- aprint_verbose_dev(sc->sc_dev, "config state");
- for (i = 0; i < 16; i++)
- aprint_verbose(" %02x", cr[i]);
- aprint_verbose("\n");
-
- /* FDC */
- if (cr[UPC1_CFGADDR_CRC] & UPC1_CRC_FDCEN)
- upc_found(sc, "fdc", UPC_PORT_FDCBASE, 2, &sc->sc_fintr);
- /* IDE */
- if (cr[UPC1_CFGADDR_CRC] & UPC1_CRC_IDEEN)
- upc_found2(sc, "wdc", UPC_PORT_IDECMDBASE, 8,
- UPC_PORT_IDECTLBASE, 2, &sc->sc_wintr);
- /* Parallel */
- if (cr[UPC1_CFGADDR_CR0] & UPC1_CR0_PEN)
- upc_found(sc, "lpt",
- cr[UPC1_CFGADDR_PARBASE] << UPC1_PARBASE_SHIFT,
- LPT_NPORTS, &sc->sc_pintr);
Home |
Main Index |
Thread Index |
Old Index