Module Name: src
Committed By: christos
Date: Fri Jan 2 19:42:07 UTC 2015
Modified Files:
src/sys/arch/acorn32/mainbus: fd.c
src/sys/arch/amiga/dev: fd.c
src/sys/arch/arc/jazz: fd.c
src/sys/arch/atari/dev: fd.c hdfd.c
src/sys/arch/bebox/stand/boot: sd.c wd.c
src/sys/arch/cobalt/stand/boot: wd.c
src/sys/arch/dreamcast/dev/maple: mmemcard.c
src/sys/arch/emips/ebus: ace_ebus.c flash_ebus.c
src/sys/arch/evbarm/stand/boot2440: dev_sdmmc.c
src/sys/arch/hp300/dev: rd.c
src/sys/arch/luna68k/luna68k: disksubr.c
src/sys/arch/luna68k/stand/boot: disklabel.c
src/sys/arch/mac68k/obio: iwm_fd.c
src/sys/arch/mmeye/stand/boot: wd.c
src/sys/arch/next68k/next68k: disksubr.c
src/sys/arch/prep/stand/boot: sd.c
src/sys/arch/sparc/dev: fd.c
src/sys/arch/sparc64/dev: fdc.c
src/sys/arch/sun3/dev: fd.c
src/sys/arch/vax/vsa: hdc9224.c
src/sys/arch/x68k/dev: bmd.c fd.c
src/sys/arch/xen/xen: xbd_xenbus.c
src/sys/arch/zaurus/stand/zboot: diskprobe.c
src/sys/dev: ccd.c cgd.c ld.c md.c vnd.c
src/sys/dev/ata: ata_wdc.c wd.c
src/sys/dev/gpib: rd.c
src/sys/dev/ic: mvsata.c
src/sys/dev/isa: fd.c
src/sys/dev/mca: ed_mca.c
src/sys/dev/mscp: mscp_disk.c
src/sys/dev/qbus: rf.c rl.c
src/sys/dev/raidframe: rf_netbsdkintf.c
src/sys/dev/scsipi: cd.c sd.c
src/sys/fs/adosfs: advfsops.c
src/sys/rump/librump/rumpvfs: rumpblk.c
src/sys/sys: disklabel.h
Log Message:
We have three sets of DTYPE_ constants in the kernel:
altq Drop Type
disklabel Disk Type
file Descriptor Type
(not to mention constants that contain the string DTYPE).
Let's make them two, by changing the disklabel one to be DisK TYPE since the
other disklabel constants seem to do that. Not many userland programs use
these constants (and the ones that they do are mostly in ifdefs). They will
be fixed shortly.
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/acorn32/mainbus/fd.c
cvs rdiff -u -r1.94 -r1.95 src/sys/arch/amiga/dev/fd.c
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/arc/jazz/fd.c
cvs rdiff -u -r1.82 -r1.83 src/sys/arch/atari/dev/fd.c
cvs rdiff -u -r1.79 -r1.80 src/sys/arch/atari/dev/hdfd.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/bebox/stand/boot/sd.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/bebox/stand/boot/wd.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/cobalt/stand/boot/wd.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/dreamcast/dev/maple/mmemcard.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/emips/ebus/ace_ebus.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/emips/ebus/flash_ebus.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/stand/boot2440/dev_sdmmc.c
cvs rdiff -u -r1.99 -r1.100 src/sys/arch/hp300/dev/rd.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/luna68k/luna68k/disksubr.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/luna68k/stand/boot/disklabel.c
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/mac68k/obio/iwm_fd.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mmeye/stand/boot/wd.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/next68k/next68k/disksubr.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/prep/stand/boot/sd.c
cvs rdiff -u -r1.155 -r1.156 src/sys/arch/sparc/dev/fd.c
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/sparc64/dev/fdc.c
cvs rdiff -u -r1.78 -r1.79 src/sys/arch/sun3/dev/fd.c
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/vax/vsa/hdc9224.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/x68k/dev/bmd.c
cvs rdiff -u -r1.114 -r1.115 src/sys/arch/x68k/dev/fd.c
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/xen/xen/xbd_xenbus.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/zaurus/stand/zboot/diskprobe.c
cvs rdiff -u -r1.161 -r1.162 src/sys/dev/ccd.c
cvs rdiff -u -r1.95 -r1.96 src/sys/dev/cgd.c
cvs rdiff -u -r1.80 -r1.81 src/sys/dev/ld.c
cvs rdiff -u -r1.72 -r1.73 src/sys/dev/md.c
cvs rdiff -u -r1.238 -r1.239 src/sys/dev/vnd.c
cvs rdiff -u -r1.104 -r1.105 src/sys/dev/ata/ata_wdc.c
cvs rdiff -u -r1.417 -r1.418 src/sys/dev/ata/wd.c
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/gpib/rd.c
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/ic/mvsata.c
cvs rdiff -u -r1.106 -r1.107 src/sys/dev/isa/fd.c
cvs rdiff -u -r1.61 -r1.62 src/sys/dev/mca/ed_mca.c
cvs rdiff -u -r1.86 -r1.87 src/sys/dev/mscp/mscp_disk.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/qbus/rf.c
cvs rdiff -u -r1.48 -r1.49 src/sys/dev/qbus/rl.c
cvs rdiff -u -r1.320 -r1.321 src/sys/dev/raidframe/rf_netbsdkintf.c
cvs rdiff -u -r1.327 -r1.328 src/sys/dev/scsipi/cd.c
cvs rdiff -u -r1.313 -r1.314 src/sys/dev/scsipi/sd.c
cvs rdiff -u -r1.71 -r1.72 src/sys/fs/adosfs/advfsops.c
cvs rdiff -u -r1.58 -r1.59 src/sys/rump/librump/rumpvfs/rumpblk.c
cvs rdiff -u -r1.117 -r1.118 src/sys/sys/disklabel.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/acorn32/mainbus/fd.c
diff -u src/sys/arch/acorn32/mainbus/fd.c:1.56 src/sys/arch/acorn32/mainbus/fd.c:1.57
--- src/sys/arch/acorn32/mainbus/fd.c:1.56 Sat Oct 25 06:58:12 2014
+++ src/sys/arch/acorn32/mainbus/fd.c Fri Jan 2 14:42:05 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.56 2014/10/25 10:58:12 skrll Exp $ */
+/* $NetBSD: fd.c,v 1.57 2015/01/02 19:42:05 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -82,7 +82,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.56 2014/10/25 10:58:12 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.57 2015/01/02 19:42:05 christos Exp $");
#include "opt_ddb.h"
@@ -1285,7 +1285,7 @@ fdioctl(dev_t dev, u_long cmd, void *add
memset(&buffer, 0, sizeof(buffer));
buffer.d_secpercyl = fd->sc_type->seccyl;
- buffer.d_type = DTYPE_FLOPPY;
+ buffer.d_type = DKTYPE_FLOPPY;
buffer.d_secsize = FDC_BSIZE;
if (readdisklabel(dev, fdstrategy, &buffer, NULL) != NULL)
Index: src/sys/arch/amiga/dev/fd.c
diff -u src/sys/arch/amiga/dev/fd.c:1.94 src/sys/arch/amiga/dev/fd.c:1.95
--- src/sys/arch/amiga/dev/fd.c:1.94 Wed Dec 31 15:55:53 2014
+++ src/sys/arch/amiga/dev/fd.c Fri Jan 2 14:42:05 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.94 2014/12/31 20:55:53 christos Exp $ */
+/* $NetBSD: fd.c,v 1.95 2015/01/02 19:42:05 christos Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.94 2014/12/31 20:55:53 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.95 2015/01/02 19:42:05 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -743,7 +743,7 @@ fdgetdefaultlabel(struct fd_softc *sc, s
lp->d_ncylinders = sc->type->ncylinders;
lp->d_nsectors = sc->nsectors;
lp->d_secpercyl = lp->d_ntracks * lp->d_nsectors;
- lp->d_type = DTYPE_FLOPPY;
+ lp->d_type = DKTYPE_FLOPPY;
lp->d_secperunit = lp->d_secpercyl * lp->d_ncylinders;
lp->d_rpm = 300; /* good guess I suppose. */
lp->d_interleave = 1; /* should change when adding msdos */
Index: src/sys/arch/arc/jazz/fd.c
diff -u src/sys/arch/arc/jazz/fd.c:1.45 src/sys/arch/arc/jazz/fd.c:1.46
--- src/sys/arch/arc/jazz/fd.c:1.45 Fri Jul 25 04:10:31 2014
+++ src/sys/arch/arc/jazz/fd.c Fri Jan 2 14:42:05 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.45 2014/07/25 08:10:31 dholland Exp $ */
+/* $NetBSD: fd.c,v 1.46 2015/01/02 19:42:05 christos Exp $ */
/* $OpenBSD: fd.c,v 1.6 1998/10/03 21:18:57 millert Exp $ */
/* NetBSD: fd.c,v 1.78 1995/07/04 07:23:09 mycroft Exp */
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.45 2014/07/25 08:10:31 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.46 2015/01/02 19:42:05 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1085,7 +1085,7 @@ fdioctl(dev_t dev, u_long cmd, void *add
memset(&buffer, 0, sizeof(buffer));
buffer.d_secpercyl = fd->sc_type->seccyl;
- buffer.d_type = DTYPE_FLOPPY;
+ buffer.d_type = DKTYPE_FLOPPY;
buffer.d_secsize = FDC_BSIZE;
if (readdisklabel(dev, fdstrategy, &buffer, NULL) != NULL)
Index: src/sys/arch/atari/dev/fd.c
diff -u src/sys/arch/atari/dev/fd.c:1.82 src/sys/arch/atari/dev/fd.c:1.83
--- src/sys/arch/atari/dev/fd.c:1.82 Thu Jan 1 12:46:09 2015
+++ src/sys/arch/atari/dev/fd.c Fri Jan 2 14:42:05 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.82 2015/01/01 17:46:09 christos Exp $ */
+/* $NetBSD: fd.c,v 1.83 2015/01/02 19:42:05 christos Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.82 2015/01/01 17:46:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.83 2015/01/02 19:42:05 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1298,7 +1298,7 @@ fdgetdefaultlabel(struct fd_softc *sc, s
lp->d_ncylinders = sc->nblocks / lp->d_secpercyl;
lp->d_secperunit = sc->nblocks;
- lp->d_type = DTYPE_FLOPPY;
+ lp->d_type = DKTYPE_FLOPPY;
lp->d_rpm = 300; /* good guess I suppose. */
lp->d_interleave = 1; /* FIXME: is this OK? */
lp->d_bbsize = 0;
Index: src/sys/arch/atari/dev/hdfd.c
diff -u src/sys/arch/atari/dev/hdfd.c:1.79 src/sys/arch/atari/dev/hdfd.c:1.80
--- src/sys/arch/atari/dev/hdfd.c:1.79 Wed Dec 31 14:52:04 2014
+++ src/sys/arch/atari/dev/hdfd.c Fri Jan 2 14:42:05 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: hdfd.c,v 1.79 2014/12/31 19:52:04 christos Exp $ */
+/* $NetBSD: hdfd.c,v 1.80 2015/01/02 19:42:05 christos Exp $ */
/*-
* Copyright (c) 1996 Leo Weppelman
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdfd.c,v 1.79 2014/12/31 19:52:04 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdfd.c,v 1.80 2015/01/02 19:42:05 christos Exp $");
#include "opt_ddb.h"
@@ -1548,7 +1548,7 @@ fdgetdisklabel(struct fd_softc *fd, dev_
memset(&cpulab, 0, sizeof(cpulab));
lp->d_secpercyl = fd->sc_type->seccyl;
- lp->d_type = DTYPE_FLOPPY;
+ lp->d_type = DKTYPE_FLOPPY;
lp->d_secsize = FDC_BSIZE;
lp->d_secperunit = fd->sc_type->size;
@@ -1567,7 +1567,7 @@ fdgetdisklabel(struct fd_softc *fd, dev_
* sounds!
*/
lp->d_secpercyl = fd->sc_type->seccyl;
- lp->d_type = DTYPE_FLOPPY;
+ lp->d_type = DKTYPE_FLOPPY;
lp->d_secsize = FDC_BSIZE;
lp->d_secperunit = fd->sc_type->size;
}
@@ -1589,7 +1589,7 @@ fdgetdefaultlabel(struct fd_softc *fd, s
lp->d_ncylinders = fd->sc_type->size / lp->d_secpercyl;
lp->d_secperunit = fd->sc_type->size;
- lp->d_type = DTYPE_FLOPPY;
+ lp->d_type = DKTYPE_FLOPPY;
lp->d_rpm = 300; /* good guess I suppose. */
lp->d_interleave = 1; /* FIXME: is this OK? */
lp->d_bbsize = 0;
Index: src/sys/arch/bebox/stand/boot/sd.c
diff -u src/sys/arch/bebox/stand/boot/sd.c:1.4 src/sys/arch/bebox/stand/boot/sd.c:1.5
--- src/sys/arch/bebox/stand/boot/sd.c:1.4 Tue Jun 10 14:37:26 2014
+++ src/sys/arch/bebox/stand/boot/sd.c Fri Jan 2 14:42:05 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sd.c,v 1.4 2014/06/10 18:37:26 phx Exp $ */
+/* $NetBSD: sd.c,v 1.5 2015/01/02 19:42:05 christos Exp $ */
/*
* Copyright (c) 2010 KIYOHARA Takashi
* All rights reserved.
@@ -474,7 +474,7 @@ sdgetdefaultlabel(struct sd_softc *sd, s
lp->d_ncylinders = sd->sc_params.cyls;
lp->d_secpercyl = lp->d_ntracks * lp->d_nsectors;
- lp->d_type = DTYPE_SCSI;
+ lp->d_type = DKTYPE_SCSI;
strncpy(lp->d_packname, "fictitious", 16);
lp->d_secperunit = sd->sc_params.disksize;
Index: src/sys/arch/bebox/stand/boot/wd.c
diff -u src/sys/arch/bebox/stand/boot/wd.c:1.2 src/sys/arch/bebox/stand/boot/wd.c:1.3
--- src/sys/arch/bebox/stand/boot/wd.c:1.2 Sun Jul 17 16:54:38 2011
+++ src/sys/arch/bebox/stand/boot/wd.c Fri Jan 2 14:42:05 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: wd.c,v 1.2 2011/07/17 20:54:38 joerg Exp $ */
+/* $NetBSD: wd.c,v 1.3 2015/01/02 19:42:05 christos Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -133,9 +133,9 @@ wdgetdefaultlabel(struct wd_softc *wd, s
lp->d_secpercyl = lp->d_ntracks * lp->d_nsectors;
if (strcmp((const char *)wd->sc_params.atap_model, "ST506") == 0)
- lp->d_type = DTYPE_ST506;
+ lp->d_type = DKTYPE_ST506;
else
- lp->d_type = DTYPE_ESDI;
+ lp->d_type = DKTYPE_ESDI;
strncpy(lp->d_typename, (const char *)wd->sc_params.atap_model, 16);
strncpy(lp->d_packname, "fictitious", 16);
Index: src/sys/arch/cobalt/stand/boot/wd.c
diff -u src/sys/arch/cobalt/stand/boot/wd.c:1.16 src/sys/arch/cobalt/stand/boot/wd.c:1.17
--- src/sys/arch/cobalt/stand/boot/wd.c:1.16 Thu Apr 3 14:49:41 2014
+++ src/sys/arch/cobalt/stand/boot/wd.c Fri Jan 2 14:42:05 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: wd.c,v 1.16 2014/04/03 18:49:41 joerg Exp $ */
+/* $NetBSD: wd.c,v 1.17 2015/01/02 19:42:05 christos Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -121,9 +121,9 @@ wdgetdefaultlabel(struct wd_softc *wd, s
lp->d_secpercyl = lp->d_ntracks * lp->d_nsectors;
if (strcmp(wd->sc_params.atap_model, "ST506") == 0)
- lp->d_type = DTYPE_ST506;
+ lp->d_type = DKTYPE_ST506;
else
- lp->d_type = DTYPE_ESDI;
+ lp->d_type = DKTYPE_ESDI;
strncpy(lp->d_typename, wd->sc_params.atap_model, 16);
strncpy(lp->d_packname, "fictitious", 16);
Index: src/sys/arch/dreamcast/dev/maple/mmemcard.c
diff -u src/sys/arch/dreamcast/dev/maple/mmemcard.c:1.24 src/sys/arch/dreamcast/dev/maple/mmemcard.c:1.25
--- src/sys/arch/dreamcast/dev/maple/mmemcard.c:1.24 Fri Jul 25 04:10:32 2014
+++ src/sys/arch/dreamcast/dev/maple/mmemcard.c Fri Jan 2 14:42:05 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: mmemcard.c,v 1.24 2014/07/25 08:10:32 dholland Exp $ */
+/* $NetBSD: mmemcard.c,v 1.25 2015/01/02 19:42:05 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mmemcard.c,v 1.24 2014/07/25 08:10:32 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mmemcard.c,v 1.25 2015/01/02 19:42:05 christos Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -381,7 +381,7 @@ mmem_defaultlabel(struct mmem_softc *sc,
memset(d, 0, sizeof *d);
#if 0
- d->d_type = DTYPE_FLOPPY; /* XXX? */
+ d->d_type = DKTYPE_FLOPPY; /* XXX? */
#endif
strncpy(d->d_typename, sc->sc_devinfo->di_product_name,
sizeof d->d_typename);
Index: src/sys/arch/emips/ebus/ace_ebus.c
diff -u src/sys/arch/emips/ebus/ace_ebus.c:1.16 src/sys/arch/emips/ebus/ace_ebus.c:1.17
--- src/sys/arch/emips/ebus/ace_ebus.c:1.16 Wed Dec 31 14:52:04 2014
+++ src/sys/arch/emips/ebus/ace_ebus.c Fri Jan 2 14:42:05 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ace_ebus.c,v 1.16 2014/12/31 19:52:04 christos Exp $ */
+/* $NetBSD: ace_ebus.c,v 1.17 2015/01/02 19:42:05 christos Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ace_ebus.c,v 1.16 2014/12/31 19:52:04 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ace_ebus.c,v 1.17 2015/01/02 19:42:05 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -2076,7 +2076,7 @@ acegetdefaultlabel(struct ace_softc *ace
ace->sc_params.CurrentSectorsPerTrack);
lp->d_secpercyl = lp->d_ntracks * lp->d_nsectors;
- lp->d_type = DTYPE_ST506; /* ?!? */
+ lp->d_type = DKTYPE_ST506; /* ?!? */
strncpy(lp->d_typename, ace->sc_params.ModelNumber, 16);
strncpy(lp->d_packname, "fictitious", 16);
Index: src/sys/arch/emips/ebus/flash_ebus.c
diff -u src/sys/arch/emips/ebus/flash_ebus.c:1.14 src/sys/arch/emips/ebus/flash_ebus.c:1.15
--- src/sys/arch/emips/ebus/flash_ebus.c:1.14 Wed Dec 31 14:52:04 2014
+++ src/sys/arch/emips/ebus/flash_ebus.c Fri Jan 2 14:42:05 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: flash_ebus.c,v 1.14 2014/12/31 19:52:04 christos Exp $ */
+/* $NetBSD: flash_ebus.c,v 1.15 2015/01/02 19:42:05 christos Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: flash_ebus.c,v 1.14 2014/12/31 19:52:04 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: flash_ebus.c,v 1.15 2015/01/02 19:42:05 christos Exp $");
/* Driver for the Intel 28F320/640/128 (J3A150) StrataFlash memory device
* Extended to include the Intel JS28F256P30T95.
@@ -1992,7 +1992,7 @@ eflashgetdefaultlabel(struct eflash_soft
lp->d_ncylinders = 1;
lp->d_secpercyl = lp->d_ntracks * lp->d_nsectors;
- lp->d_type = DTYPE_ST506; /* ?!? */
+ lp->d_type = DKTYPE_ST506; /* ?!? */
strncpy(lp->d_typename, ST506, 16);
strncpy(lp->d_packname, "fictitious", 16);
Index: src/sys/arch/evbarm/stand/boot2440/dev_sdmmc.c
diff -u src/sys/arch/evbarm/stand/boot2440/dev_sdmmc.c:1.2 src/sys/arch/evbarm/stand/boot2440/dev_sdmmc.c:1.3
--- src/sys/arch/evbarm/stand/boot2440/dev_sdmmc.c:1.2 Mon Nov 4 16:54:59 2013
+++ src/sys/arch/evbarm/stand/boot2440/dev_sdmmc.c Fri Jan 2 14:42:05 2015
@@ -280,7 +280,7 @@ sdmmc_getdisklabel(struct sdmmc_softc *s
lp->d_nsectors = wd->sc_params.atap_sectors;
lp->d_ncylinders = wd->sc_params.atap_cylinders;*/
lp->d_secpercyl = lp->d_ntracks * lp->d_nsectors;
- lp->d_type = DTYPE_FLASH;
+ lp->d_type = DKTYPE_FLASH;
/*strncpy(lp->d_typename, (char *)wd->sc_params.atap_model, 16);*/
strncpy(lp->d_packname, "fictitious", 16);
/*if (wd->sc_capacity > UINT32_MAX)
Index: src/sys/arch/hp300/dev/rd.c
diff -u src/sys/arch/hp300/dev/rd.c:1.99 src/sys/arch/hp300/dev/rd.c:1.100
--- src/sys/arch/hp300/dev/rd.c:1.99 Wed Dec 31 14:52:05 2014
+++ src/sys/arch/hp300/dev/rd.c Fri Jan 2 14:42:05 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rd.c,v 1.99 2014/12/31 19:52:05 christos Exp $ */
+/* $NetBSD: rd.c,v 1.100 2015/01/02 19:42:05 christos Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.99 2014/12/31 19:52:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.100 2015/01/02 19:42:05 christos Exp $");
#include "opt_useleds.h"
@@ -1165,7 +1165,7 @@ rdgetdefaultlabel(struct rd_softc *sc, s
memset((void *)lp, 0, sizeof(struct disklabel));
- lp->d_type = DTYPE_HPIB;
+ lp->d_type = DKTYPE_HPIB;
lp->d_secsize = DEV_BSIZE;
lp->d_nsectors = rdidentinfo[type].ri_nbpt;
lp->d_ntracks = rdidentinfo[type].ri_ntpc;
Index: src/sys/arch/luna68k/luna68k/disksubr.c
diff -u src/sys/arch/luna68k/luna68k/disksubr.c:1.30 src/sys/arch/luna68k/luna68k/disksubr.c:1.31
--- src/sys/arch/luna68k/luna68k/disksubr.c:1.30 Tue Jan 15 12:23:39 2013
+++ src/sys/arch/luna68k/luna68k/disksubr.c Fri Jan 2 14:42:05 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.30 2013/01/15 17:23:39 tsutsui Exp $ */
+/* $NetBSD: disksubr.c,v 1.31 2015/01/02 19:42:05 christos Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -103,7 +103,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.30 2013/01/15 17:23:39 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.31 2015/01/02 19:42:05 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -368,7 +368,7 @@ disklabel_om_to_bsd(char *cp, struct dis
lp->d_magic2 = DISKMAGIC;
memcpy(lp->d_packname, sl->sl_text, sizeof(lp->d_packname));
- lp->d_type = DTYPE_SCSI;
+ lp->d_type = DKTYPE_SCSI;
lp->d_secsize = 512;
lp->d_nsectors = sl->sl_nsectors;
lp->d_ntracks = sl->sl_ntracks;
Index: src/sys/arch/luna68k/stand/boot/disklabel.c
diff -u src/sys/arch/luna68k/stand/boot/disklabel.c:1.5 src/sys/arch/luna68k/stand/boot/disklabel.c:1.6
--- src/sys/arch/luna68k/stand/boot/disklabel.c:1.5 Mon Mar 24 06:46:58 2014
+++ src/sys/arch/luna68k/stand/boot/disklabel.c Fri Jan 2 14:42:05 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.c,v 1.5 2014/03/24 10:46:58 martin Exp $ */
+/* $NetBSD: disklabel.c,v 1.6 2015/01/02 19:42:05 christos Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -204,7 +204,7 @@ disklabel(int argc, char *argv[])
bp->d_ntracks = 12;
bp->d_ncylinders = 1076;
- bp->d_type = DTYPE_SCSI;
+ bp->d_type = DKTYPE_SCSI;
bp->d_secpercyl = bp->d_nsectors * bp->d_ntracks;
bp->d_secperunit = bp->d_secpercyl * bp->d_ncylinders;
Index: src/sys/arch/mac68k/obio/iwm_fd.c
diff -u src/sys/arch/mac68k/obio/iwm_fd.c:1.53 src/sys/arch/mac68k/obio/iwm_fd.c:1.54
--- src/sys/arch/mac68k/obio/iwm_fd.c:1.53 Fri Jan 2 10:49:51 2015
+++ src/sys/arch/mac68k/obio/iwm_fd.c Fri Jan 2 14:42:05 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: iwm_fd.c,v 1.53 2015/01/02 15:49:51 christos Exp $ */
+/* $NetBSD: iwm_fd.c,v 1.54 2015/01/02 19:42:05 christos Exp $ */
/*
* Copyright (c) 1997, 1998 Hauke Fath. All rights reserved.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iwm_fd.c,v 1.53 2015/01/02 15:49:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iwm_fd.c,v 1.54 2015/01/02 19:42:05 christos Exp $");
#include "locators.h"
@@ -1573,7 +1573,7 @@ fdGetDiskLabel(fd_softc_t *fd, dev_t dev
* track (8..12) and variable rpm (300..550)? Apple came up
* with ZBR in 1983! Un*x drive management sucks.
*/
- lp->d_type = DTYPE_FLOPPY;
+ lp->d_type = DKTYPE_FLOPPY;
lp->d_rpm = 300;
lp->d_secsize = fd->currentType->sectorSize;
lp->d_ntracks = fd->currentType->heads;
@@ -1584,7 +1584,7 @@ fdGetDiskLabel(fd_softc_t *fd, dev_t dev
lp->d_interleave = fd->currentType->interleave;
lp->d_trkseek = fd->currentType->stepRate;
- strcpy(lp->d_typename, dktypenames[DTYPE_FLOPPY]);
+ strcpy(lp->d_typename, dktypenames[DKTYPE_FLOPPY]);
strncpy(lp->d_packname, "fictitious", sizeof(lp->d_packname));
lp->d_npartitions = fdType + 1;
Index: src/sys/arch/mmeye/stand/boot/wd.c
diff -u src/sys/arch/mmeye/stand/boot/wd.c:1.3 src/sys/arch/mmeye/stand/boot/wd.c:1.4
--- src/sys/arch/mmeye/stand/boot/wd.c:1.3 Sun Jul 17 16:54:44 2011
+++ src/sys/arch/mmeye/stand/boot/wd.c Fri Jan 2 14:42:06 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: wd.c,v 1.3 2011/07/17 20:54:44 joerg Exp $ */
+/* $NetBSD: wd.c,v 1.4 2015/01/02 19:42:06 christos Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -119,9 +119,9 @@ wdgetdefaultlabel(struct wd_softc *wd, s
lp->d_secpercyl = lp->d_ntracks * lp->d_nsectors;
if (strcmp(wd->sc_params.atap_model, "ST506") == 0)
- lp->d_type = DTYPE_ST506;
+ lp->d_type = DKTYPE_ST506;
else
- lp->d_type = DTYPE_ESDI;
+ lp->d_type = DKTYPE_ESDI;
strncpy(lp->d_typename, wd->sc_params.atap_model, 16);
strncpy(lp->d_packname, "fictitious", 16);
Index: src/sys/arch/next68k/next68k/disksubr.c
diff -u src/sys/arch/next68k/next68k/disksubr.c:1.27 src/sys/arch/next68k/next68k/disksubr.c:1.28
--- src/sys/arch/next68k/next68k/disksubr.c:1.27 Mon Mar 24 15:58:04 2014
+++ src/sys/arch/next68k/next68k/disksubr.c Fri Jan 2 14:42:06 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.27 2014/03/24 19:58:04 christos Exp $ */
+/* $NetBSD: disksubr.c,v 1.28 2015/01/02 19:42:06 christos Exp $ */
/*
* Copyright (c) 1982, 1986, 1988, 1993
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.27 2014/03/24 19:58:04 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.28 2015/01/02 19:42:06 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -89,7 +89,7 @@ parse_nextstep_label(struct next68k_disk
osdep->od_version = ondisk->cd_version;
lp->d_magic = lp->d_magic2 = DISKMAGIC;
- lp->d_type = DTYPE_SCSI;
+ lp->d_type = DKTYPE_SCSI;
lp->d_subtype = 0;
if (sizeof (lp->d_typename) > sizeof (ondisk->cd_name))
lp->d_typename[sizeof (ondisk->cd_name)] = '\0';
Index: src/sys/arch/prep/stand/boot/sd.c
diff -u src/sys/arch/prep/stand/boot/sd.c:1.2 src/sys/arch/prep/stand/boot/sd.c:1.3
--- src/sys/arch/prep/stand/boot/sd.c:1.2 Tue Jun 10 14:37:26 2014
+++ src/sys/arch/prep/stand/boot/sd.c Fri Jan 2 14:42:06 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sd.c,v 1.2 2014/06/10 18:37:26 phx Exp $ */
+/* $NetBSD: sd.c,v 1.3 2015/01/02 19:42:06 christos Exp $ */
/*
* Copyright (c) 2010 KIYOHARA Takashi
* All rights reserved.
@@ -474,7 +474,7 @@ sdgetdefaultlabel(struct sd_softc *sd, s
lp->d_ncylinders = sd->sc_params.cyls;
lp->d_secpercyl = lp->d_ntracks * lp->d_nsectors;
- lp->d_type = DTYPE_SCSI;
+ lp->d_type = DKTYPE_SCSI;
strncpy(lp->d_packname, "fictitious", 16);
lp->d_secperunit = sd->sc_params.disksize;
Index: src/sys/arch/sparc/dev/fd.c
diff -u src/sys/arch/sparc/dev/fd.c:1.155 src/sys/arch/sparc/dev/fd.c:1.156
--- src/sys/arch/sparc/dev/fd.c:1.155 Tue Aug 19 10:43:41 2014
+++ src/sys/arch/sparc/dev/fd.c Fri Jan 2 14:42:06 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.155 2014/08/19 14:43:41 tsutsui Exp $ */
+/* $NetBSD: fd.c,v 1.156 2015/01/02 19:42:06 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.155 2014/08/19 14:43:41 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.156 2015/01/02 19:42:06 christos Exp $");
#include "opt_ddb.h"
#include "opt_md.h"
@@ -2246,7 +2246,7 @@ fdgetdisklabel(dev_t dev)
memset(lp, 0, sizeof(struct disklabel));
memset(clp, 0, sizeof(struct cpu_disklabel));
- lp->d_type = DTYPE_FLOPPY;
+ lp->d_type = DKTYPE_FLOPPY;
lp->d_secsize = FD_BSIZE(fd);
lp->d_secpercyl = fd->sc_type->seccyl;
lp->d_nsectors = fd->sc_type->sectrac;
Index: src/sys/arch/sparc64/dev/fdc.c
diff -u src/sys/arch/sparc64/dev/fdc.c:1.42 src/sys/arch/sparc64/dev/fdc.c:1.43
--- src/sys/arch/sparc64/dev/fdc.c:1.42 Tue Aug 19 14:20:51 2014
+++ src/sys/arch/sparc64/dev/fdc.c Fri Jan 2 14:42:06 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: fdc.c,v 1.42 2014/08/19 18:20:51 jnemeth Exp $ */
+/* $NetBSD: fdc.c,v 1.43 2015/01/02 19:42:06 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdc.c,v 1.42 2014/08/19 18:20:51 jnemeth Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdc.c,v 1.43 2015/01/02 19:42:06 christos Exp $");
#include "opt_ddb.h"
#include "opt_md.h"
@@ -2432,7 +2432,7 @@ fdgetdisklabel(dev_t dev)
memset(lp, 0, sizeof(struct disklabel));
memset(clp, 0, sizeof(struct cpu_disklabel));
- lp->d_type = DTYPE_FLOPPY;
+ lp->d_type = DKTYPE_FLOPPY;
lp->d_secsize = FD_BSIZE(fd);
lp->d_secpercyl = fd->sc_type->seccyl;
lp->d_nsectors = fd->sc_type->sectrac;
Index: src/sys/arch/sun3/dev/fd.c
diff -u src/sys/arch/sun3/dev/fd.c:1.78 src/sys/arch/sun3/dev/fd.c:1.79
--- src/sys/arch/sun3/dev/fd.c:1.78 Wed Aug 20 13:48:57 2014
+++ src/sys/arch/sun3/dev/fd.c Fri Jan 2 14:42:06 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.78 2014/08/20 17:48:57 tsutsui Exp $ */
+/* $NetBSD: fd.c,v 1.79 2015/01/02 19:42:06 christos Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.78 2014/08/20 17:48:57 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.79 2015/01/02 19:42:06 christos Exp $");
#include "opt_ddb.h"
@@ -1877,7 +1877,7 @@ fdgetdisklabel(dev_t dev)
memset(lp, 0, sizeof(struct disklabel));
memset(clp, 0, sizeof(struct cpu_disklabel));
- lp->d_type = DTYPE_FLOPPY;
+ lp->d_type = DKTYPE_FLOPPY;
lp->d_secsize = FDC_BSIZE;
lp->d_secpercyl = fd->sc_type->seccyl;
lp->d_nsectors = fd->sc_type->sectrac;
Index: src/sys/arch/vax/vsa/hdc9224.c
diff -u src/sys/arch/vax/vsa/hdc9224.c:1.56 src/sys/arch/vax/vsa/hdc9224.c:1.57
--- src/sys/arch/vax/vsa/hdc9224.c:1.56 Wed Dec 31 15:37:10 2014
+++ src/sys/arch/vax/vsa/hdc9224.c Fri Jan 2 14:42:06 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: hdc9224.c,v 1.56 2014/12/31 20:37:10 christos Exp $ */
+/* $NetBSD: hdc9224.c,v 1.57 2015/01/02 19:42:06 christos Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -51,7 +51,7 @@
#undef RDDEBUG
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdc9224.c,v 1.56 2014/12/31 20:37:10 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdc9224.c,v 1.57 2015/01/02 19:42:06 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -830,7 +830,7 @@ rdmakelabel(struct disklabel *dl, struct
}
dl->d_typename[p++] = n + '0';
dl->d_typename[p] = 0;
- dl->d_type = DTYPE_MSCP; /* XXX - what to use here??? */
+ dl->d_type = DKTYPE_MSCP; /* XXX - what to use here??? */
dl->d_rpm = 3600;
dl->d_secsize = DEV_BSIZE;
Index: src/sys/arch/x68k/dev/bmd.c
diff -u src/sys/arch/x68k/dev/bmd.c:1.22 src/sys/arch/x68k/dev/bmd.c:1.23
--- src/sys/arch/x68k/dev/bmd.c:1.22 Wed Dec 31 14:52:05 2014
+++ src/sys/arch/x68k/dev/bmd.c Fri Jan 2 14:42:06 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: bmd.c,v 1.22 2014/12/31 19:52:05 christos Exp $ */
+/* $NetBSD: bmd.c,v 1.23 2015/01/02 19:42:06 christos Exp $ */
/*
* Copyright (c) 2002 Tetsuya Isaki. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bmd.c,v 1.22 2014/12/31 19:52:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bmd.c,v 1.23 2015/01/02 19:42:06 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -426,7 +426,7 @@ bmd_getdisklabel(struct bmd_softc *sc, d
lp->d_secpercyl = lp->d_nsectors * lp->d_ntracks;
lp->d_secperunit = lp->d_secpercyl * lp->d_ncylinders;
- lp->d_type = DTYPE_LD;
+ lp->d_type = DKTYPE_LD;
lp->d_rpm = 300; /* dummy */
lp->d_interleave = 1; /* dummy? */
Index: src/sys/arch/x68k/dev/fd.c
diff -u src/sys/arch/x68k/dev/fd.c:1.114 src/sys/arch/x68k/dev/fd.c:1.115
--- src/sys/arch/x68k/dev/fd.c:1.114 Fri Jan 2 10:53:25 2015
+++ src/sys/arch/x68k/dev/fd.c Fri Jan 2 14:42:06 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.114 2015/01/02 15:53:25 christos Exp $ */
+/* $NetBSD: fd.c,v 1.115 2015/01/02 19:42:06 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.114 2015/01/02 15:53:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.115 2015/01/02 19:42:06 christos Exp $");
#include "opt_ddb.h"
#include "opt_m68k_arch.h"
@@ -1877,7 +1877,7 @@ fdgetdisklabel(struct fd_softc *sc, dev_
lp->d_ncylinders = sc->sc_type->size / lp->d_secpercyl;
lp->d_secperunit = sc->sc_type->size;
- lp->d_type = DTYPE_FLOPPY;
+ lp->d_type = DKTYPE_FLOPPY;
lp->d_rpm = 300; /* XXX */
lp->d_interleave = 1; /* FIXME: is this OK? */
lp->d_bbsize = 0;
Index: src/sys/arch/xen/xen/xbd_xenbus.c
diff -u src/sys/arch/xen/xen/xbd_xenbus.c:1.68 src/sys/arch/xen/xen/xbd_xenbus.c:1.69
--- src/sys/arch/xen/xen/xbd_xenbus.c:1.68 Thu Jan 1 20:13:00 2015
+++ src/sys/arch/xen/xen/xbd_xenbus.c Fri Jan 2 14:42:06 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: xbd_xenbus.c,v 1.68 2015/01/02 01:13:00 christos Exp $ */
+/* $NetBSD: xbd_xenbus.c,v 1.69 2015/01/02 19:42:06 christos Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xbd_xenbus.c,v 1.68 2015/01/02 01:13:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xbd_xenbus.c,v 1.69 2015/01/02 19:42:06 christos Exp $");
#include "opt_xen.h"
@@ -220,7 +220,7 @@ extern struct cfdriver xbd_cd;
/* Pseudo-disk Interface */
static struct dk_intf dkintf_esdi = {
- DTYPE_ESDI,
+ DKTYPE_ESDI,
"Xen Virtual ESDI",
xbdopen,
xbdclose,
Index: src/sys/arch/zaurus/stand/zboot/diskprobe.c
diff -u src/sys/arch/zaurus/stand/zboot/diskprobe.c:1.3 src/sys/arch/zaurus/stand/zboot/diskprobe.c:1.4
--- src/sys/arch/zaurus/stand/zboot/diskprobe.c:1.3 Wed Jan 18 18:12:21 2012
+++ src/sys/arch/zaurus/stand/zboot/diskprobe.c Fri Jan 2 14:42:06 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: diskprobe.c,v 1.3 2012/01/18 23:12:21 nonaka Exp $ */
+/* $NetBSD: diskprobe.c,v 1.4 2015/01/02 19:42:06 christos Exp $ */
/* $OpenBSD: diskprobe.c,v 1.3 2006/10/13 00:00:55 krw Exp $ */
/*
@@ -112,9 +112,9 @@ hardprobe(char *buf, size_t bufsiz)
} else {
/* Best guess */
switch (dip->disklabel.d_type) {
- case DTYPE_SCSI:
- case DTYPE_ESDI:
- case DTYPE_ST506:
+ case DKTYPE_SCSI:
+ case DKTYPE_ESDI:
+ case DKTYPE_ST506:
dip->bios_info.flags |= BDI_GOODLABEL;
break;
Index: src/sys/dev/ccd.c
diff -u src/sys/dev/ccd.c:1.161 src/sys/dev/ccd.c:1.162
--- src/sys/dev/ccd.c:1.161 Wed Dec 31 14:52:05 2014
+++ src/sys/dev/ccd.c Fri Jan 2 14:42:06 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ccd.c,v 1.161 2014/12/31 19:52:05 christos Exp $ */
+/* $NetBSD: ccd.c,v 1.162 2015/01/02 19:42:06 christos Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999, 2007, 2009 The NetBSD Foundation, Inc.
@@ -88,7 +88,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.161 2014/12/31 19:52:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.162 2015/01/02 19:42:06 christos Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -1519,7 +1519,7 @@ ccdgetdefaultlabel(struct ccd_softc *cs,
lp->d_secpercyl = lp->d_ntracks * lp->d_nsectors;
strncpy(lp->d_typename, "ccd", sizeof(lp->d_typename));
- lp->d_type = DTYPE_CCD;
+ lp->d_type = DKTYPE_CCD;
strncpy(lp->d_packname, "fictitious", sizeof(lp->d_packname));
lp->d_rpm = 3600;
lp->d_interleave = 1;
Index: src/sys/dev/cgd.c
diff -u src/sys/dev/cgd.c:1.95 src/sys/dev/cgd.c:1.96
--- src/sys/dev/cgd.c:1.95 Thu Jan 1 20:13:00 2015
+++ src/sys/dev/cgd.c Fri Jan 2 14:42:06 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cgd.c,v 1.95 2015/01/02 01:13:00 christos Exp $ */
+/* $NetBSD: cgd.c,v 1.96 2015/01/02 19:42:06 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.95 2015/01/02 01:13:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.96 2015/01/02 19:42:06 christos Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -118,7 +118,7 @@ static void cgd_cipher(struct cgd_softc
/* Pseudo-disk Interface */
static struct dk_intf the_dkintf = {
- DTYPE_CGD,
+ DKTYPE_CGD,
"cgd",
cgdopen,
cgdclose,
Index: src/sys/dev/ld.c
diff -u src/sys/dev/ld.c:1.80 src/sys/dev/ld.c:1.81
--- src/sys/dev/ld.c:1.80 Wed Dec 31 14:52:05 2014
+++ src/sys/dev/ld.c Fri Jan 2 14:42:06 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ld.c,v 1.80 2014/12/31 19:52:05 christos Exp $ */
+/* $NetBSD: ld.c,v 1.81 2015/01/02 19:42:06 christos Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld.c,v 1.80 2014/12/31 19:52:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld.c,v 1.81 2015/01/02 19:42:06 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -759,7 +759,7 @@ ldgetdefaultlabel(struct ld_softc *sc, s
lp->d_nsectors = sc->sc_nsectors;
lp->d_ncylinders = sc->sc_ncylinders;
lp->d_secpercyl = lp->d_ntracks * lp->d_nsectors;
- lp->d_type = DTYPE_LD;
+ lp->d_type = DKTYPE_LD;
strlcpy(lp->d_typename, "unknown", sizeof(lp->d_typename));
strlcpy(lp->d_packname, "fictitious", sizeof(lp->d_packname));
if (sc->sc_secperunit > UINT32_MAX)
Index: src/sys/dev/md.c
diff -u src/sys/dev/md.c:1.72 src/sys/dev/md.c:1.73
--- src/sys/dev/md.c:1.72 Wed Dec 31 14:52:05 2014
+++ src/sys/dev/md.c Fri Jan 2 14:42:06 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.72 2014/12/31 19:52:05 christos Exp $ */
+/* $NetBSD: md.c,v 1.73 2015/01/02 19:42:06 christos Exp $ */
/*
* Copyright (c) 1995 Gordon W. Ross, Leo Weppelman.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: md.c,v 1.72 2014/12/31 19:52:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: md.c,v 1.73 2015/01/02 19:42:06 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_md.h"
@@ -546,7 +546,7 @@ md_set_disklabel(struct md_softc *sc)
lp->d_secpercyl = lp->d_ntracks*lp->d_nsectors;
strncpy(lp->d_typename, md_cd.cd_name, sizeof(lp->d_typename));
- lp->d_type = DTYPE_UNKNOWN;
+ lp->d_type = DKTYPE_MD;
strncpy(lp->d_packname, "fictitious", sizeof(lp->d_packname));
lp->d_rpm = 3600;
lp->d_interleave = 1;
Index: src/sys/dev/vnd.c
diff -u src/sys/dev/vnd.c:1.238 src/sys/dev/vnd.c:1.239
--- src/sys/dev/vnd.c:1.238 Wed Dec 31 14:52:05 2014
+++ src/sys/dev/vnd.c Fri Jan 2 14:42:06 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: vnd.c,v 1.238 2014/12/31 19:52:05 christos Exp $ */
+/* $NetBSD: vnd.c,v 1.239 2015/01/02 19:42:06 christos Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc.
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.238 2014/12/31 19:52:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.239 2015/01/02 19:42:06 christos Exp $");
#if defined(_KERNEL_OPT)
#include "opt_vnd.h"
@@ -1754,7 +1754,7 @@ vndgetdefaultlabel(struct vnd_softc *sc,
lp->d_secpercyl = lp->d_ntracks * lp->d_nsectors;
strncpy(lp->d_typename, "vnd", sizeof(lp->d_typename));
- lp->d_type = DTYPE_VND;
+ lp->d_type = DKTYPE_VND;
strncpy(lp->d_packname, "fictitious", sizeof(lp->d_packname));
lp->d_rpm = 3600;
lp->d_interleave = 1;
Index: src/sys/dev/ata/ata_wdc.c
diff -u src/sys/dev/ata/ata_wdc.c:1.104 src/sys/dev/ata/ata_wdc.c:1.105
--- src/sys/dev/ata/ata_wdc.c:1.104 Wed Sep 10 03:04:48 2014
+++ src/sys/dev/ata/ata_wdc.c Fri Jan 2 14:42:06 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ata_wdc.c,v 1.104 2014/09/10 07:04:48 matt Exp $ */
+/* $NetBSD: ata_wdc.c,v 1.105 2015/01/02 19:42:06 christos Exp $ */
/*
* Copyright (c) 1998, 2001, 2003 Manuel Bouyer.
@@ -54,7 +54,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata_wdc.c,v 1.104 2014/09/10 07:04:48 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata_wdc.c,v 1.105 2015/01/02 19:42:06 christos Exp $");
#include "opt_ata.h"
#include "opt_wdc.h"
@@ -268,7 +268,7 @@ geometry:
wdccommand(chp, xfer->c_drive, WDCC_IDP,
ata_bio->lp->d_ncylinders,
ata_bio->lp->d_ntracks - 1, 0, ata_bio->lp->d_nsectors,
- (ata_bio->lp->d_type == DTYPE_ST506) ?
+ (ata_bio->lp->d_type == DKTYPE_ST506) ?
ata_bio->lp->d_precompcyl / 4 : 0);
errstring = "geometry";
if (wdcwait(chp, WDCS_DRDY, WDCS_DRDY, ATA_DELAY, wait_flags))
@@ -531,7 +531,7 @@ again:
} else {
wdccommand(chp, xfer->c_drive, cmd, cyl,
head, sect, nblks,
- (ata_bio->lp->d_type == DTYPE_ST506) ?
+ (ata_bio->lp->d_type == DKTYPE_ST506) ?
ata_bio->lp->d_precompcyl / 4 : 0);
}
/* start timeout machinery */
Index: src/sys/dev/ata/wd.c
diff -u src/sys/dev/ata/wd.c:1.417 src/sys/dev/ata/wd.c:1.418
--- src/sys/dev/ata/wd.c:1.417 Wed Dec 31 14:52:05 2014
+++ src/sys/dev/ata/wd.c Fri Jan 2 14:42:06 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: wd.c,v 1.417 2014/12/31 19:52:05 christos Exp $ */
+/* $NetBSD: wd.c,v 1.418 2015/01/02 19:42:06 christos Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -54,7 +54,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.417 2014/12/31 19:52:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.418 2015/01/02 19:42:06 christos Exp $");
#include "opt_ata.h"
@@ -1067,9 +1067,9 @@ wdgetdefaultlabel(struct wd_softc *wd, s
lp->d_secpercyl = lp->d_ntracks * lp->d_nsectors;
if (strcmp(wd->sc_params.atap_model, "ST506") == 0)
- lp->d_type = DTYPE_ST506;
+ lp->d_type = DKTYPE_ST506;
else
- lp->d_type = DTYPE_ESDI;
+ lp->d_type = DKTYPE_ESDI;
strncpy(lp->d_typename, wd->sc_params.atap_model, 16);
strncpy(lp->d_packname, "fictitious", 16);
Index: src/sys/dev/gpib/rd.c
diff -u src/sys/dev/gpib/rd.c:1.38 src/sys/dev/gpib/rd.c:1.39
--- src/sys/dev/gpib/rd.c:1.38 Wed Dec 31 15:36:20 2014
+++ src/sys/dev/gpib/rd.c Fri Jan 2 14:42:06 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rd.c,v 1.38 2014/12/31 20:36:20 christos Exp $ */
+/* $NetBSD: rd.c,v 1.39 2015/01/02 19:42:06 christos Exp $ */
/*-
* Copyright (c) 1996-2003 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.38 2014/12/31 20:36:20 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.39 2015/01/02 19:42:06 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1022,7 +1022,7 @@ rdgetdefaultlabel(struct rd_softc *sc, s
memset((void *)lp, 0, sizeof(struct disklabel));
- lp->d_type = DTYPE_HPIB /* DTYPE_GPIB */;
+ lp->d_type = DKTYPE_HPIB /* DKTYPE_GPIB */;
lp->d_secsize = DEV_BSIZE;
lp->d_nsectors = rdidentinfo[type].ri_nbpt;
lp->d_ntracks = rdidentinfo[type].ri_ntpc;
Index: src/sys/dev/ic/mvsata.c
diff -u src/sys/dev/ic/mvsata.c:1.33 src/sys/dev/ic/mvsata.c:1.34
--- src/sys/dev/ic/mvsata.c:1.33 Mon Feb 17 08:41:20 2014
+++ src/sys/dev/ic/mvsata.c Fri Jan 2 14:42:07 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: mvsata.c,v 1.33 2014/02/17 13:41:20 kiyohara Exp $ */
+/* $NetBSD: mvsata.c,v 1.34 2015/01/02 19:42:07 christos Exp $ */
/*
* Copyright (c) 2008 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mvsata.c,v 1.33 2014/02/17 13:41:20 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mvsata.c,v 1.34 2015/01/02 19:42:07 christos Exp $");
#include "opt_mvsata.h"
@@ -1223,7 +1223,7 @@ do_pio:
else
wdccommand(chp, 0, cmd, cyl,
head, sect, nblks,
- (ata_bio->lp->d_type == DTYPE_ST506) ?
+ (ata_bio->lp->d_type == DKTYPE_ST506) ?
ata_bio->lp->d_precompcyl / 4 : 0);
/* start timeout machinery */
@@ -1519,7 +1519,7 @@ geometry:
goto multimode;
wdccommand(chp, 0, WDCC_IDP, ata_bio->lp->d_ncylinders,
ata_bio->lp->d_ntracks - 1, 0, ata_bio->lp->d_nsectors,
- (ata_bio->lp->d_type == DTYPE_ST506) ?
+ (ata_bio->lp->d_type == DKTYPE_ST506) ?
ata_bio->lp->d_precompcyl / 4 : 0);
errstring = "geometry";
if (wdcwait(chp, WDCS_DRDY, WDCS_DRDY, ATA_DELAY, flags))
Index: src/sys/dev/isa/fd.c
diff -u src/sys/dev/isa/fd.c:1.106 src/sys/dev/isa/fd.c:1.107
--- src/sys/dev/isa/fd.c:1.106 Wed Dec 31 14:52:05 2014
+++ src/sys/dev/isa/fd.c Fri Jan 2 14:42:07 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.106 2014/12/31 19:52:05 christos Exp $ */
+/* $NetBSD: fd.c,v 1.107 2015/01/02 19:42:07 christos Exp $ */
/*-
* Copyright (c) 1998, 2003, 2008 The NetBSD Foundation, Inc.
@@ -81,7 +81,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.106 2014/12/31 19:52:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.107 2015/01/02 19:42:07 christos Exp $");
#include "opt_ddb.h"
@@ -1415,7 +1415,7 @@ fdioctl(dev_t dev, u_long cmd, void *add
#endif
memset(lp, 0, sizeof(*lp));
- lp->d_type = DTYPE_FLOPPY;
+ lp->d_type = DKTYPE_FLOPPY;
lp->d_secsize = FDC_BSIZE;
lp->d_nsectors = fd->sc_type->sectrac;
lp->d_ntracks = fd->sc_type->heads;
Index: src/sys/dev/mca/ed_mca.c
diff -u src/sys/dev/mca/ed_mca.c:1.61 src/sys/dev/mca/ed_mca.c:1.62
--- src/sys/dev/mca/ed_mca.c:1.61 Wed Dec 31 14:52:05 2014
+++ src/sys/dev/mca/ed_mca.c Fri Jan 2 14:42:07 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ed_mca.c,v 1.61 2014/12/31 19:52:05 christos Exp $ */
+/* $NetBSD: ed_mca.c,v 1.62 2015/01/02 19:42:07 christos Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ed_mca.c,v 1.61 2014/12/31 19:52:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ed_mca.c,v 1.62 2015/01/02 19:42:07 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -410,7 +410,7 @@ edgetdefaultlabel(struct ed_softc *ed, s
lp->d_ncylinders = ed->cyl;
lp->d_secpercyl = lp->d_ntracks * lp->d_nsectors;
- lp->d_type = DTYPE_ESDI;
+ lp->d_type = DKTYPE_ESDI;
strncpy(lp->d_typename, "ESDI", 16);
strncpy(lp->d_packname, "fictitious", 16);
Index: src/sys/dev/mscp/mscp_disk.c
diff -u src/sys/dev/mscp/mscp_disk.c:1.86 src/sys/dev/mscp/mscp_disk.c:1.87
--- src/sys/dev/mscp/mscp_disk.c:1.86 Wed Dec 31 15:45:44 2014
+++ src/sys/dev/mscp/mscp_disk.c Fri Jan 2 14:42:07 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: mscp_disk.c,v 1.86 2014/12/31 20:45:44 christos Exp $ */
+/* $NetBSD: mscp_disk.c,v 1.87 2015/01/02 19:42:07 christos Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
@@ -82,7 +82,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mscp_disk.c,v 1.86 2014/12/31 20:45:44 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mscp_disk.c,v 1.87 2015/01/02 19:42:07 christos Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -472,7 +472,7 @@ raioctl(dev_t dev, u_long cmd, void *dat
tp->d_ncylinders = lp->d_ncylinders;
tp->d_secpercyl = lp->d_secpercyl;
tp->d_secperunit = lp->d_secperunit;
- tp->d_type = DTYPE_MSCP;
+ tp->d_type = DKTYPE_MSCP;
tp->d_rpm = 3600;
rrmakelabel(tp, ra->ra_mediaid);
#ifdef __HAVE_OLD_DISKLABEL
@@ -960,10 +960,10 @@ rronline(device_t usc, struct mscp *mp)
if (dl->d_secpercyl) {
dl->d_ncylinders = dl->d_secperunit/dl->d_secpercyl;
- dl->d_type = DTYPE_MSCP;
+ dl->d_type = DKTYPE_MSCP;
dl->d_rpm = 3600;
} else {
- dl->d_type = DTYPE_FLOPPY;
+ dl->d_type = DKTYPE_FLOPPY;
dl->d_rpm = 300;
}
rrmakelabel(dl, ra->ra_mediaid);
Index: src/sys/dev/qbus/rf.c
diff -u src/sys/dev/qbus/rf.c:1.30 src/sys/dev/qbus/rf.c:1.31
--- src/sys/dev/qbus/rf.c:1.30 Wed Dec 31 14:52:06 2014
+++ src/sys/dev/qbus/rf.c Fri Jan 2 14:42:07 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rf.c,v 1.30 2014/12/31 19:52:06 christos Exp $ */
+/* $NetBSD: rf.c,v 1.31 2015/01/02 19:42:07 christos Exp $ */
/*
* Copyright (c) 2002 Jochen Kunz.
* All rights reserved.
@@ -36,7 +36,7 @@ TODO:
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf.c,v 1.30 2014/12/31 19:52:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf.c,v 1.31 2015/01/02 19:42:07 christos Exp $");
/* autoconfig stuff */
#include <sys/param.h>
@@ -460,7 +460,7 @@ rf_attach(device_t parent, device_t self
disk_init(&rf_sc->sc_disk, device_xname(rf_sc->sc_dev), &rfdkdriver);
disk_attach(&rf_sc->sc_disk);
dl = rf_sc->sc_disk.dk_label;
- dl->d_type = DTYPE_FLOPPY; /* drive type */
+ dl->d_type = DKTYPE_FLOPPY; /* drive type */
dl->d_magic = DISKMAGIC; /* the magic number */
dl->d_magic2 = DISKMAGIC;
dl->d_typename[0] = 'R';
Index: src/sys/dev/qbus/rl.c
diff -u src/sys/dev/qbus/rl.c:1.48 src/sys/dev/qbus/rl.c:1.49
--- src/sys/dev/qbus/rl.c:1.48 Wed Dec 31 14:52:06 2014
+++ src/sys/dev/qbus/rl.c Fri Jan 2 14:42:07 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rl.c,v 1.48 2014/12/31 19:52:06 christos Exp $ */
+/* $NetBSD: rl.c,v 1.49 2015/01/02 19:42:07 christos Exp $ */
/*
* Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rl.c,v 1.48 2014/12/31 19:52:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rl.c,v 1.49 2015/01/02 19:42:07 christos Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -294,7 +294,7 @@ rlattach(device_t parent, device_t self,
dl->d_bbsize = BBSIZE;
dl->d_sbsize = SBLOCKSIZE;
dl->d_rpm = 2400;
- dl->d_type = DTYPE_DEC;
+ dl->d_type = DKTYPE_DEC;
printf(": %s, %s\n", dl->d_typename, rlstate(rc->rc_rlc, ra->hwid));
/*
Index: src/sys/dev/raidframe/rf_netbsdkintf.c
diff -u src/sys/dev/raidframe/rf_netbsdkintf.c:1.320 src/sys/dev/raidframe/rf_netbsdkintf.c:1.321
--- src/sys/dev/raidframe/rf_netbsdkintf.c:1.320 Wed Dec 31 14:52:06 2014
+++ src/sys/dev/raidframe/rf_netbsdkintf.c Fri Jan 2 14:42:07 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_netbsdkintf.c,v 1.320 2014/12/31 19:52:06 christos Exp $ */
+/* $NetBSD: rf_netbsdkintf.c,v 1.321 2015/01/02 19:42:07 christos Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008-2011 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
***********************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.320 2014/12/31 19:52:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.321 2015/01/02 19:42:07 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -2353,7 +2353,7 @@ raidgetdefaultlabel(RF_Raid_t *raidPtr,
lp->d_secpercyl = lp->d_ntracks * lp->d_nsectors;
strncpy(lp->d_typename, "raid", sizeof(lp->d_typename));
- lp->d_type = DTYPE_RAID;
+ lp->d_type = DKTYPE_RAID;
strncpy(lp->d_packname, "fictitious", sizeof(lp->d_packname));
lp->d_rpm = 3600;
lp->d_interleave = 1;
Index: src/sys/dev/scsipi/cd.c
diff -u src/sys/dev/scsipi/cd.c:1.327 src/sys/dev/scsipi/cd.c:1.328
--- src/sys/dev/scsipi/cd.c:1.327 Wed Dec 31 14:52:06 2014
+++ src/sys/dev/scsipi/cd.c Fri Jan 2 14:42:07 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cd.c,v 1.327 2014/12/31 19:52:06 christos Exp $ */
+/* $NetBSD: cd.c,v 1.328 2015/01/02 19:42:07 christos Exp $ */
/*-
* Copyright (c) 1998, 2001, 2003, 2004, 2005, 2008 The NetBSD Foundation,
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.327 2014/12/31 19:52:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.328 2015/01/02 19:42:07 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1698,10 +1698,10 @@ cdgetdefaultlabel(struct cd_softc *cd, s
switch (SCSIPI_BUSTYPE_TYPE(scsipi_periph_bustype(cd->sc_periph))) {
case SCSIPI_BUSTYPE_SCSI:
- lp->d_type = DTYPE_SCSI;
+ lp->d_type = DKTYPE_SCSI;
break;
case SCSIPI_BUSTYPE_ATAPI:
- lp->d_type = DTYPE_ATAPI;
+ lp->d_type = DKTYPE_ATAPI;
break;
}
/*
Index: src/sys/dev/scsipi/sd.c
diff -u src/sys/dev/scsipi/sd.c:1.313 src/sys/dev/scsipi/sd.c:1.314
--- src/sys/dev/scsipi/sd.c:1.313 Wed Dec 31 14:52:06 2014
+++ src/sys/dev/scsipi/sd.c Fri Jan 2 14:42:07 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sd.c,v 1.313 2014/12/31 19:52:06 christos Exp $ */
+/* $NetBSD: sd.c,v 1.314 2015/01/02 19:42:07 christos Exp $ */
/*-
* Copyright (c) 1998, 2003, 2004 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.313 2014/12/31 19:52:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.314 2015/01/02 19:42:07 christos Exp $");
#include "opt_scsi.h"
@@ -1266,10 +1266,10 @@ sdgetdefaultlabel(struct sd_softc *sd, s
switch (SCSIPI_BUSTYPE_TYPE(scsipi_periph_bustype(sd->sc_periph))) {
case SCSIPI_BUSTYPE_SCSI:
- lp->d_type = DTYPE_SCSI;
+ lp->d_type = DKTYPE_SCSI;
break;
case SCSIPI_BUSTYPE_ATAPI:
- lp->d_type = DTYPE_ATAPI;
+ lp->d_type = DKTYPE_ATAPI;
break;
}
/*
Index: src/sys/fs/adosfs/advfsops.c
diff -u src/sys/fs/adosfs/advfsops.c:1.71 src/sys/fs/adosfs/advfsops.c:1.72
--- src/sys/fs/adosfs/advfsops.c:1.71 Tue Aug 5 04:50:54 2014
+++ src/sys/fs/adosfs/advfsops.c Fri Jan 2 14:42:07 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: advfsops.c,v 1.71 2014/08/05 08:50:54 hannken Exp $ */
+/* $NetBSD: advfsops.c,v 1.72 2015/01/02 19:42:07 christos Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: advfsops.c,v 1.71 2014/08/05 08:50:54 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: advfsops.c,v 1.72 2015/01/02 19:42:07 christos Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -214,7 +214,7 @@ adosfs_mountfs(struct vnode *devvp, stru
if (error)
goto fail;
parp = &dl.d_partitions[DISKPART(devvp->v_rdev)];
- if (dl.d_type == DTYPE_FLOPPY) {
+ if (dl.d_type == DKTYPE_FLOPPY) {
amp->bsize = secsize;
secsperblk = 1;
resvblks = 2;
Index: src/sys/rump/librump/rumpvfs/rumpblk.c
diff -u src/sys/rump/librump/rumpvfs/rumpblk.c:1.58 src/sys/rump/librump/rumpvfs/rumpblk.c:1.59
--- src/sys/rump/librump/rumpvfs/rumpblk.c:1.58 Mon Nov 17 09:30:31 2014
+++ src/sys/rump/librump/rumpvfs/rumpblk.c Fri Jan 2 14:42:07 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpblk.c,v 1.58 2014/11/17 14:30:31 pooka Exp $ */
+/* $NetBSD: rumpblk.c,v 1.59 2015/01/02 19:42:07 christos Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rumpblk.c,v 1.58 2014/11/17 14:30:31 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpblk.c,v 1.59 2015/01/02 19:42:07 christos Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -159,7 +159,7 @@ makedefaultlabel(struct disklabel *lp, o
strncpy(lp->d_typename, "rumpd", sizeof(lp->d_typename));
strncpy(lp->d_packname, "fictitious", sizeof(lp->d_packname));
- lp->d_type = DTYPE_RUMPD;
+ lp->d_type = DKTYPE_RUMPD;
lp->d_rpm = 11;
lp->d_interleave = 1;
lp->d_flags = 0;
Index: src/sys/sys/disklabel.h
diff -u src/sys/sys/disklabel.h:1.117 src/sys/sys/disklabel.h:1.118
--- src/sys/sys/disklabel.h:1.117 Fri Sep 5 01:47:40 2014
+++ src/sys/sys/disklabel.h Fri Jan 2 14:42:07 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.117 2014/09/05 05:47:40 matt Exp $ */
+/* $NetBSD: disklabel.h,v 1.118 2015/01/02 19:42:07 christos Exp $ */
/*
* Copyright (c) 1987, 1988, 1993
@@ -308,11 +308,12 @@ x(JFS2, 16, "jfs") /* IBM JFS2 */ \
x(CGD, 17, "cgd") /* cryptographic pseudo-disk */ \
x(VINUM, 18, "vinum") /* vinum volume */ \
x(FLASH, 19, "flash") /* flash memory devices */ \
-x(DM, 20, "dm") /* device-mapper pseudo-disk devices */\
-x(RUMPD, 21, "rumpd") /* rump virtual disk */ \
+x(DM, 20, "dm") /* device-mapper pseudo-disk devices */\
+x(RUMPD, 21, "rumpd") /* rump virtual disk */ \
+x(MD, 22, "md") /* memory disk */ \
#ifndef _LOCORE
-#define DKTYPE_NUMS(tag, number, name) __CONCAT(DTYPE_,tag=number),
+#define DKTYPE_NUMS(tag, number, name) __CONCAT(DKTYPE_,tag=number),
#ifndef DKTYPE_ENUMNAME
#define DKTYPE_ENUMNAME
#endif
