Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys Remove the last vestiges of COMPAT_NOLABEL. It's been 1...
details: https://anonhg.NetBSD.org/src/rev/20feae01c03f
branches: trunk
changeset: 569664:20feae01c03f
user: thorpej <thorpej%NetBSD.org@localhost>
date: Sat Aug 28 17:45:24 2004 +0000
description:
Remove the last vestiges of COMPAT_NOLABEL. It's been 10 years; label
your disks already.
diffstat:
sys/arch/hp300/conf/GENERIC | 5 +-
sys/arch/hp300/conf/INSTALL | 3 +-
sys/arch/hp300/conf/files.hp300 | 3 +-
sys/arch/hp300/dev/rd.c | 16 +-
sys/arch/hp300/dev/rd_compat.c | 329 ---------------------------------------
sys/arch/hp300/dev/rdvar.h | 9 +-
sys/arch/hp300/stand/common/rd.c | 64 +-------
sys/arch/hp300/stand/common/sd.c | 17 +-
sys/dev/gpib/rd.c | 245 +----------------------------
9 files changed, 20 insertions(+), 671 deletions(-)
diffs (truncated from 865 to 300 lines):
diff -r 45a5f7e93d7f -r 20feae01c03f sys/arch/hp300/conf/GENERIC
--- a/sys/arch/hp300/conf/GENERIC Sat Aug 28 17:37:00 2004 +0000
+++ b/sys/arch/hp300/conf/GENERIC Sat Aug 28 17:45:24 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.104 2004/07/18 05:56:15 tsutsui Exp $
+# $NetBSD: GENERIC,v 1.105 2004/08/28 17:45:24 thorpej Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.104 $"
+#ident "GENERIC-$Revision: 1.105 $"
maxusers 32 # estimated number of users
@@ -159,7 +159,6 @@
# Options for HP hardware
options USELEDS # make the lights twinkle
-options COMPAT_NOLABEL # defaults for unlabeled disks
#options PANICBUTTON # two fast <reset>s on HIL dump kernel
#options CONSCODE=9 # force console at this select code
#options MAPPEDCOPY # different copyin/copyout for large copies
diff -r 45a5f7e93d7f -r 20feae01c03f sys/arch/hp300/conf/INSTALL
--- a/sys/arch/hp300/conf/INSTALL Sat Aug 28 17:37:00 2004 +0000
+++ b/sys/arch/hp300/conf/INSTALL Sat Aug 28 17:45:24 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.16 2004/07/18 05:56:15 tsutsui Exp $
+# $NetBSD: INSTALL,v 1.17 2004/08/28 17:45:24 thorpej Exp $
#
# INSTALL machine description file
#
@@ -96,7 +96,6 @@
# Options for HP hardware
#options USELEDS # make the lights twinkle
-options COMPAT_NOLABEL # defaults for unlabeled disks
#options PANICBUTTON # two fast <reset>s on HIL dump kernel
#options CONSCODE=9 # force console at this select code
diff -r 45a5f7e93d7f -r 20feae01c03f sys/arch/hp300/conf/files.hp300
--- a/sys/arch/hp300/conf/files.hp300 Sat Aug 28 17:37:00 2004 +0000
+++ b/sys/arch/hp300/conf/files.hp300 Sat Aug 28 17:45:24 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.hp300,v 1.70 2004/07/07 08:41:34 mycroft Exp $
+# $NetBSD: files.hp300,v 1.71 2004/08/28 17:45:24 thorpej Exp $
#
# hp300-specific configuration info
@@ -161,7 +161,6 @@
device rd: disk
attach rd at hpibbus
file arch/hp300/dev/rd.c rd needs-flag
-file arch/hp300/dev/rd_compat.c rd # XXX
device ppi
attach ppi at hpibbus
diff -r 45a5f7e93d7f -r 20feae01c03f sys/arch/hp300/dev/rd.c
--- a/sys/arch/hp300/dev/rd.c Sat Aug 28 17:37:00 2004 +0000
+++ b/sys/arch/hp300/dev/rd.c Sat Aug 28 17:45:24 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rd.c,v 1.63 2004/08/28 17:37:02 thorpej Exp $ */
+/* $NetBSD: rd.c,v 1.64 2004/08/28 17:45:24 thorpej Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -117,7 +117,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.63 2004/08/28 17:37:02 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.64 2004/08/28 17:45:24 thorpej Exp $");
#include "opt_useleds.h"
#include "rnd.h"
@@ -230,7 +230,7 @@
* Misc. HW description, indexed by sc_type.
* Nothing really critical here, could do without it.
*/
-const struct rdidentinfo rdidentinfo[] = {
+static const struct rdidentinfo rdidentinfo[] = {
{ RD7946AID, 0, "7945A", NRD7945ABPT,
NRD7945ATRK, 968, 108416 },
@@ -586,17 +586,13 @@
return (0);
pi = lp->d_partitions;
- printf("%s: WARNING: %s, ", rs->sc_dev.dv_xname, msg);
-#ifdef COMPAT_NOLABEL
- printf("using old default partitioning\n");
- rdmakedisklabel(unit, lp);
-#else
- printf("defining `c' partition as entire disk\n");
+ printf("%s: WARNING: %s\n", rs->sc_dev.dv_xname, msg);
+
pi[2].p_size = rdidentinfo[rs->sc_type].ri_nblocks;
/* XXX reset other info since readdisklabel screws with it */
lp->d_npartitions = 3;
pi[0].p_size = 0;
-#endif
+
return(0);
}
diff -r 45a5f7e93d7f -r 20feae01c03f sys/arch/hp300/dev/rd_compat.c
--- a/sys/arch/hp300/dev/rd_compat.c Sat Aug 28 17:37:00 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,329 +0,0 @@
-/* $NetBSD: rd_compat.c,v 1.12 2004/08/28 17:37:02 thorpej Exp $ */
-
-/*
- * Copyright (c) 1982, 1990, 1993
- * The Regents of the University of California. All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * the Systems Programming Group of the University of Utah Computer
- * Science Department.
- *
- * 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. Neither the name of the University 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 REGENTS 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 REGENTS 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.
- *
- * from: Utah $Hdr: rd_compat.c 1.1 92/12/21$
- *
- * @(#)rd_compat.c 8.1 (Berkeley) 6/10/93
- */
-/*
- * Copyright (c) 1988 University of Utah.
- *
- * This code is derived from software contributed to Berkeley by
- * the Systems Programming Group of the University of Utah Computer
- * Science Department.
- *
- * 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 University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University 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 REGENTS 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 REGENTS 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.
- *
- * from: Utah $Hdr: rd_compat.c 1.1 92/12/21$
- *
- * @(#)rd_compat.c 8.1 (Berkeley) 6/10/93
- */
-
-/*
- * Compatibility for CS80 disks without disklabels.
- */
-
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rd_compat.c,v 1.12 2004/08/28 17:37:02 thorpej Exp $");
-
-#include <sys/param.h>
-#include <sys/disklabel.h>
-#include <sys/disk.h>
-#include <sys/device.h>
-#include <sys/buf.h> /* XXX */
-
-#include <hp300/dev/hpibvar.h>
-
-#include <hp300/dev/rdreg.h>
-#include <hp300/dev/rdvar.h>
-
-/*
- * CS/80 partitions. We reserve the first cylinder for a LIF
- * style boot directory (the 8k allowed in the BSD filesystem
- * is just way too small). This boot area is outside of all but
- * the C partition. This implies that you cannot use the C
- * partition on a bootable disk since the filesystem would overlay
- * the boot area. You must use the A partition.
- *
- * These maps support four basic layouts:
- *
- * A/B/G: This is the "traditional" setup for a bootable disk.
- * A is the root partition, B the swap, and G a user partition.
- * A/D/H: This is a setup for bootable systems requiring more swap
- * (e.g. those who use HPCL). It has A as the root, D as a
- * larger swap, and H as a smaller user partition.
- * A/D/E/F: Similar to A/D/H with E and F breaking H into two partitions.
- * E could be used for /usr and F for users.
- * C: This gives a single, non-bootable, large user filesystem.
- * Good for second drives on a machine (e.g. /usr/src).
- */
-struct size {
- daddr_t nblocks;
- int cyloff;
-} rd7945A_sizes[8] = {
- { RDSZ(15904), 1 }, /* A=cyl 1 thru 142 */
- { RDSZ(20160), 143 }, /* B=cyl 143 thru 322 */
- { RDSZ(108416), 0 }, /* C=cyl 0 thru 967 */
- { RDSZ(40320), 143 }, /* D=cyl 143 thru 502 */
- { RDSZ(0), 0 }, /* E=<undefined> */
- { RDSZ(0), 0 }, /* F=<undefined> */
- { RDSZ(72240), 323 }, /* G=cyl 323 thru 967 */
- { RDSZ(52080), 503 }, /* H=cyl 503 thru 967 */
-}, rd9134D_sizes[8] = {
- { RDSZ(15936), 1 }, /* A=cyl 1 thru 166 */
- { RDSZ(13056), 167 }, /* B=cyl 167 thru 302 */
- { RDSZ(29088), 0 }, /* C=cyl 0 thru 302 */
- { RDSZ(0), 0 }, /* D=<undefined> */
- { RDSZ(0), 0 }, /* E=<undefined> */
- { RDSZ(0), 0 }, /* F=<undefined> */
- { RDSZ(0), 0 }, /* G=<undefined> */
- { RDSZ(0), 0 }, /* H=<undefined> */
-}, rd9122S_sizes[8] = {
- { RDSZ(0), 0 }, /* A=<undefined> */
- { RDSZ(0), 0 }, /* B=<undefined> */
- { RDSZ(1232), 0 }, /* C=cyl 0 thru 76 */
- { RDSZ(0), 0 }, /* D=<undefined> */
- { RDSZ(0), 0 }, /* E=<undefined> */
- { RDSZ(0), 0 }, /* F=<undefined> */
- { RDSZ(0), 0 }, /* G=<undefined> */
- { RDSZ(0), 0 }, /* H=<undefined> */
-}, rd7912P_sizes[8] = {
- { RDSZ(15904), 0 }, /* A=cyl 1 thru 71 */
- { RDSZ(22400), 72 }, /* B=cyl 72 thru 171 */
- { RDSZ(128128), 0 }, /* C=cyl 0 thru 571 */
- { RDSZ(42560), 72 }, /* D=cyl 72 thru 261 */
- { RDSZ(0), 292 }, /* E=<undefined> */
- { RDSZ(0), 542 }, /* F=<undefined> */
- { RDSZ(89600), 172 }, /* G=cyl 221 thru 571 */
- { RDSZ(69440), 262 }, /* H=cyl 262 thru 571 */
-}, rd7914P_sizes[8] = {
- { RDSZ(15904), 1 }, /* A=cyl 1 thru 71 */
- { RDSZ(40320), 72 }, /* B=cyl 72 thru 251 */
- { RDSZ(258048), 0 }, /* C=cyl 0 thru 1151 */
- { RDSZ(64960), 72 }, /* D=cyl 72 thru 361 */
- { RDSZ(98560), 362 }, /* E=cyl 362 thru 801 */
- { RDSZ(78400), 802 }, /* F=cyl 802 thru 1151 */
- { RDSZ(201600), 252 }, /* G=cyl 221 thru 1151 */
- { RDSZ(176960), 362 }, /* H=cyl 362 thru 1151 */
-}, rd7933H_sizes[8] = {
- { RDSZ(16146), 1 }, /* A=cyl 1 thru 27 */
- { RDSZ(66976), 28 }, /* B=cyl 28 thru 139 */
- { RDSZ(789958), 0 }, /* C=cyl 0 thru 1320 */
- { RDSZ(16146), 140 }, /* D=cyl 140 thru 166 */
- { RDSZ(165646), 167 }, /* E=cyl 167 thru 443 */
- { RDSZ(165646), 444 }, /* F=cyl 444 thru 720 */
- { RDSZ(706238), 140 }, /* G=cyl 140 thru 1320 */
- { RDSZ(358800), 721 }, /* H=cyl 721 thru 1320 */
-}, rd9134L_sizes[8] = {
- { RDSZ(15920), 1 }, /* A=cyl 1 thru 199 */
- { RDSZ(20000), 200 }, /* B=cyl 200 thru 449 */
- { RDSZ(77840), 0 }, /* C=cyl 0 thru 972 */
- { RDSZ(32000), 200 }, /* D=cyl 200 thru 599 */
- { RDSZ(0), 0 }, /* E=<undefined> */
- { RDSZ(0), 0 }, /* F=<undefined> */
- { RDSZ(41840), 450 }, /* G=cyl 450 thru 972 */
- { RDSZ(29840), 600 }, /* H=cyl 600 thru 972 */
-}, rd7957A_sizes[8] = {
- { RDSZ(16016), 1 }, /* A=cyl 1 thru 104 */
- { RDSZ(24640), 105 }, /* B=cyl 105 thru 264 */
- { RDSZ(159544), 0 }, /* C=cyl 0 thru 1035 */
- { RDSZ(42350), 105 }, /* D=cyl 105 thru 379 */
- { RDSZ(54824), 380 }, /* E=cyl 380 thru 735 */
Home |
Main Index |
Thread Index |
Old Index