Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Use "edc" instead of "dasd". As pointed out by Soren, dasd d...
details: https://anonhg.NetBSD.org/src/rev/5a60286a420e
branches: trunk
changeset: 508770:5a60286a420e
user: jdolecek <jdolecek%NetBSD.org@localhost>
date: Thu Apr 19 17:17:28 2001 +0000
description:
Use "edc" instead of "dasd". As pointed out by Soren, dasd doesn't
mean anything special in IBM-talk. And edc better matches prior art, too.
diffstat:
share/man/man4/Makefile | 6 +-
share/man/man4/dasd.4 | 68 ----
share/man/man4/edc.4 | 68 ++++
sys/arch/i386/conf/PS2 | 6 +-
sys/dev/DEVNAMES | 4 +-
sys/dev/mca/dasd_mca.c | 810 ------------------------------------------------
sys/dev/mca/dasdreg.h | 131 -------
sys/dev/mca/dasdvar.h | 43 --
sys/dev/mca/ed_mca.c | 26 +-
sys/dev/mca/edc_mca.c | 810 ++++++++++++++++++++++++++++++++++++++++++++++++
sys/dev/mca/edcreg.h | 131 +++++++
sys/dev/mca/edcvar.h | 43 ++
sys/dev/mca/edvar.h | 6 +-
sys/dev/mca/files.mca | 10 +-
14 files changed, 1081 insertions(+), 1081 deletions(-)
diffs (truncated from 2347 to 300 lines):
diff -r 3496920fd59a -r 5a60286a420e share/man/man4/Makefile
--- a/share/man/man4/Makefile Thu Apr 19 16:18:27 2001 +0000
+++ b/share/man/man4/Makefile Thu Apr 19 17:17:28 2001 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.193 2001/04/19 08:16:06 jdolecek Exp $
+# $NetBSD: Makefile,v 1.194 2001/04/19 17:17:29 jdolecek Exp $
# @(#)Makefile 8.1 (Berkeley) 6/18/93
MAN= adv.4 adw.4 ahb.4 ahc.4 an.4 aria.4 atalk.4 audio.4 auich.4 auvia.4 \
awi.4 bba.4 bha.4 bktr.4 bpf.4 cac.4 cardbus.4 ccd.4 \
- cd.4 ch.4 clcs.4 clct.4 clnp.4 cltp.4 cmpci.4 cms.4 cnw.4 dasd.4 ddb.4 \
- de.4 dpt.4 drum.4 eap.4 elmc.4 en.4 envsys.4 ep.4 esh.4 \
+ cd.4 ch.4 clcs.4 clct.4 clnp.4 cltp.4 cmpci.4 cms.4 cnw.4 ddb.4 \
+ de.4 dpt.4 drum.4 eap.4 edc.4 elmc.4 en.4 envsys.4 ep.4 esh.4 \
esis.4 esm.4 eso.4 exphy.4 fd.4 fpa.4 fms.4 fxp.4 gre.4 hme.4 icmp.4 \
icsphy.4 idp.4 ifmedia.4 inet.4 inphy.4 intersil7170.4 ioat.4 \
iop.4 iophy.4 iopsp.4 ip.4 ipip.4 ipkdb.4 iso.4 isp.4 \
diff -r 3496920fd59a -r 5a60286a420e share/man/man4/dasd.4
--- a/share/man/man4/dasd.4 Thu Apr 19 16:18:27 2001 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-.\" $NetBSD: dasd.4,v 1.1 2001/04/19 08:16:06 jdolecek Exp $
-.\"
-.\" Copyright (c) 1999 The NetBSD Foundation, Inc.
-.\" 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. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the NetBSD
-.\" Foundation, Inc. and its contributors.
-.\" 4. Neither the name of The NetBSD Foundation nor the names of its
-.\" contributors may be used to endorse or promote products derived
-.\" from this software without specific prior written permission.
-.\"
-.\" 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.
-.\"
-.Dd April 19, 2001
-.Dt DASD 4
-.Os
-.Sh NAME
-.Nm dasd
-.Nd
-.Tn IBM
-DASD Storage Interface
-ESDI disk driver
-.Sh SYNOPSIS
-.Cd "dasd* at mca? slot ?"
-.Cd "ed* at dasd?"
-.Sh DESCRIPTION
-The
-.Nm
-driver supports
-.Tn IBM
-.Tn MCA
-ESDI disk controllers and disks, most commonly
-found in
-.Tn IBM
-.Tn PS/2
-machines.
-Supported boards include:
-.Pp
-.Bl -tag -width xxxx -offset indent
-.It Tn IBM ESDI Fixed Disk Controller
-.It Tn IBM Integrated ESDI Fixed Disk & Controller
-.El
-.Sh SEE ALSO
-.Xr intro 4 ,
-.Xr mca 4
-.Sh AUTHOR
-The driver was written by
-.An Jaromir Dolecek Aq jdolecek%NetBSD.org@localhost .
diff -r 3496920fd59a -r 5a60286a420e share/man/man4/edc.4
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/man/man4/edc.4 Thu Apr 19 17:17:28 2001 +0000
@@ -0,0 +1,68 @@
+.\" $NetBSD: edc.4,v 1.1 2001/04/19 17:17:30 jdolecek Exp $
+.\"
+.\" Copyright (c) 1999 The NetBSD Foundation, Inc.
+.\" 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. All advertising materials mentioning features or use of this software
+.\" must display the following acknowledgement:
+.\" This product includes software developed by the NetBSD
+.\" Foundation, Inc. and its contributors.
+.\" 4. Neither the name of The NetBSD Foundation nor the names of its
+.\" contributors may be used to endorse or promote products derived
+.\" from this software without specific prior written permission.
+.\"
+.\" 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.
+.\"
+.Dd April 19, 2001
+.Dt DASD 4
+.Os
+.Sh NAME
+.Nm dasd
+.Nd
+.Tn IBM
+DASD Storage Interface
+ESDI disk driver
+.Sh SYNOPSIS
+.Cd "dasd* at mca? slot ?"
+.Cd "ed* at dasd?"
+.Sh DESCRIPTION
+The
+.Nm
+driver supports
+.Tn IBM
+.Tn MCA
+ESDI disk controllers and disks, most commonly
+found in
+.Tn IBM
+.Tn PS/2
+machines.
+Supported boards include:
+.Pp
+.Bl -tag -width xxxx -offset indent
+.It Tn IBM ESDI Fixed Disk Controller
+.It Tn IBM Integrated ESDI Fixed Disk & Controller
+.El
+.Sh SEE ALSO
+.Xr intro 4 ,
+.Xr mca 4
+.Sh AUTHOR
+The driver was written by
+.An Jaromir Dolecek Aq jdolecek%NetBSD.org@localhost .
diff -r 3496920fd59a -r 5a60286a420e sys/arch/i386/conf/PS2
--- a/sys/arch/i386/conf/PS2 Thu Apr 19 16:18:27 2001 +0000
+++ b/sys/arch/i386/conf/PS2 Thu Apr 19 17:17:28 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: PS2,v 1.15 2001/04/19 07:37:10 jdolecek Exp $
+# $NetBSD: PS2,v 1.16 2001/04/19 17:17:28 jdolecek Exp $
#
# Sample kernel config for PS/2 with MCA bus
#
@@ -117,8 +117,8 @@
ate* at mca? slot ? # Allied Telesis AT1720
# MCA ESDI controllers & disks - EXPERIMENTAL
-dasd* at mca? slot ? # IBM DASD-compliant ESDI controllers
-ed* at dasd?
+edc* at mca? slot ? # IBM ESDI Disk Controllers
+ed* at edc?
# MCA SCSI controllers
aha* at mca? slot ? # Adaptec AHA-1640
diff -r 3496920fd59a -r 5a60286a420e sys/dev/DEVNAMES
--- a/sys/dev/DEVNAMES Thu Apr 19 16:18:27 2001 +0000
+++ b/sys/dev/DEVNAMES Thu Apr 19 17:17:28 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: DEVNAMES,v 1.47 2001/04/19 07:47:50 jdolecek Exp $
+# $NetBSD: DEVNAMES,v 1.48 2001/04/19 17:17:28 jdolecek Exp $
#
# This file contains all used device names and defined attributes in
# alphabetical order. New devices added to the system somewhere should first
@@ -213,7 +213,6 @@
cy82c693 MI
cz MI
daic MI
-dasd MI (MCA)
dc pmax
dca hp300
dcm hp300
@@ -255,6 +254,7 @@
ed amiga
ed amigappc
ed MI (MCA)
+edc MI (MCA)
eeprom sparc
eeprom sparc64
eeprom sun3
diff -r 3496920fd59a -r 5a60286a420e sys/dev/mca/dasd_mca.c
--- a/sys/dev/mca/dasd_mca.c Thu Apr 19 16:18:27 2001 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,810 +0,0 @@
-/* $NetBSD: dasd_mca.c,v 1.1 2001/04/19 07:30:24 jdolecek Exp $ */
-
-/*
- * Copyright (c) 2001 The NetBSD Foundation, Inc.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jaromir Dolecek.
- *
- * 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. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. 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.
- */
-
-/*
- * Driver for MCA ESDI controllers and disks conforming to IBM DASD
- * spec.
- *
- * The driver was written with DASD Storage Interface Specification
- * for MCA rev. 2.2 in hands, thanks to Scott Telford <st%epcc.ed.ac.uk@localhost>.
- *
- * TODO:
- * - move the MCA DMA controller (dasd_setup_dma()) goo to device driver
- * independant location
- * - improve error recovery
- * add any soft resets when anything gets stuck?
- * - test with > 1 disk (this is supported by some controllers), eliminate
- * any remaining devno=0 assumptions if there are any still
- * - test with > 1 ESDI controller in machine; shared interrupts
- * necessary for this to work should be supported - dasd_intr() specifically
- * checks if the interrupt is for this controller
- */
-
-#include "rnd.h"
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/errno.h>
-#include <sys/device.h>
-#include <sys/malloc.h>
-#include <sys/endian.h>
-#include <sys/disklabel.h>
-#include <sys/disk.h>
-#include <sys/syslog.h>
-#include <sys/proc.h>
-#include <sys/vnode.h>
-#include <sys/kernel.h>
-#if NRND > 0
-#include <sys/rnd.h>
-#endif
-
-#include <machine/bus.h>
-#include <machine/intr.h>
-
-#include <dev/mca/mcareg.h>
-#include <dev/mca/mcavar.h>
-#include <dev/mca/mcadevs.h>
-
-#include <dev/mca/dasdreg.h>
-#include <dev/mca/edvar.h>
-#include <dev/mca/dasdvar.h>
-
-#define DASD_MAXDEVS 7
-struct dasd_mca_softc {
- struct device sc_dev;
-
- bus_space_tag_t sc_iot;
- bus_space_handle_t sc_ioh;
-
Home |
Main Index |
Thread Index |
Old Index