Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys We have three sets of DTYPE_ constants in the kernel:
details: https://anonhg.NetBSD.org/src/rev/77078d1bb919
branches: trunk
changeset: 805445:77078d1bb919
user: christos <christos%NetBSD.org@localhost>
date: Fri Jan 02 19:42:05 2015 +0000
description:
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.
diffstat:
sys/arch/acorn32/mainbus/fd.c | 6 +++---
sys/arch/amiga/dev/fd.c | 6 +++---
sys/arch/arc/jazz/fd.c | 6 +++---
sys/arch/atari/dev/fd.c | 6 +++---
sys/arch/atari/dev/hdfd.c | 10 +++++-----
sys/arch/bebox/stand/boot/sd.c | 4 ++--
sys/arch/bebox/stand/boot/wd.c | 6 +++---
sys/arch/cobalt/stand/boot/wd.c | 6 +++---
sys/arch/dreamcast/dev/maple/mmemcard.c | 6 +++---
sys/arch/emips/ebus/ace_ebus.c | 6 +++---
sys/arch/emips/ebus/flash_ebus.c | 6 +++---
sys/arch/evbarm/stand/boot2440/dev_sdmmc.c | 2 +-
sys/arch/hp300/dev/rd.c | 6 +++---
sys/arch/luna68k/luna68k/disksubr.c | 6 +++---
sys/arch/luna68k/stand/boot/disklabel.c | 4 ++--
sys/arch/mac68k/obio/iwm_fd.c | 8 ++++----
sys/arch/mmeye/stand/boot/wd.c | 6 +++---
sys/arch/next68k/next68k/disksubr.c | 6 +++---
sys/arch/prep/stand/boot/sd.c | 4 ++--
sys/arch/sparc/dev/fd.c | 6 +++---
sys/arch/sparc64/dev/fdc.c | 6 +++---
sys/arch/sun3/dev/fd.c | 6 +++---
sys/arch/vax/vsa/hdc9224.c | 6 +++---
sys/arch/x68k/dev/bmd.c | 6 +++---
sys/arch/x68k/dev/fd.c | 6 +++---
sys/arch/xen/xen/xbd_xenbus.c | 6 +++---
sys/arch/zaurus/stand/zboot/diskprobe.c | 8 ++++----
sys/dev/ata/ata_wdc.c | 8 ++++----
sys/dev/ata/wd.c | 8 ++++----
sys/dev/ccd.c | 6 +++---
sys/dev/cgd.c | 6 +++---
sys/dev/gpib/rd.c | 6 +++---
sys/dev/ic/mvsata.c | 8 ++++----
sys/dev/isa/fd.c | 6 +++---
sys/dev/ld.c | 6 +++---
sys/dev/mca/ed_mca.c | 6 +++---
sys/dev/md.c | 6 +++---
sys/dev/mscp/mscp_disk.c | 10 +++++-----
sys/dev/qbus/rf.c | 6 +++---
sys/dev/qbus/rl.c | 6 +++---
sys/dev/raidframe/rf_netbsdkintf.c | 6 +++---
sys/dev/scsipi/cd.c | 8 ++++----
sys/dev/scsipi/sd.c | 8 ++++----
sys/dev/vnd.c | 6 +++---
sys/fs/adosfs/advfsops.c | 6 +++---
sys/rump/librump/rumpvfs/rumpblk.c | 6 +++---
sys/sys/disklabel.h | 9 +++++----
47 files changed, 149 insertions(+), 148 deletions(-)
diffs (truncated from 1271 to 300 lines):
diff -r a8c69ccaf474 -r 77078d1bb919 sys/arch/acorn32/mainbus/fd.c
--- a/sys/arch/acorn32/mainbus/fd.c Fri Jan 02 18:49:02 2015 +0000
+++ b/sys/arch/acorn32/mainbus/fd.c Fri Jan 02 19:42:05 2015 +0000
@@ -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 @@
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)
diff -r a8c69ccaf474 -r 77078d1bb919 sys/arch/amiga/dev/fd.c
--- a/sys/arch/amiga/dev/fd.c Fri Jan 02 18:49:02 2015 +0000
+++ b/sys/arch/amiga/dev/fd.c Fri Jan 02 19:42:05 2015 +0000
@@ -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 @@
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 */
diff -r a8c69ccaf474 -r 77078d1bb919 sys/arch/arc/jazz/fd.c
--- a/sys/arch/arc/jazz/fd.c Fri Jan 02 18:49:02 2015 +0000
+++ b/sys/arch/arc/jazz/fd.c Fri Jan 02 19:42:05 2015 +0000
@@ -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 @@
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)
diff -r a8c69ccaf474 -r 77078d1bb919 sys/arch/atari/dev/fd.c
--- a/sys/arch/atari/dev/fd.c Fri Jan 02 18:49:02 2015 +0000
+++ b/sys/arch/atari/dev/fd.c Fri Jan 02 19:42:05 2015 +0000
@@ -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 @@
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;
diff -r a8c69ccaf474 -r 77078d1bb919 sys/arch/atari/dev/hdfd.c
--- a/sys/arch/atari/dev/hdfd.c Fri Jan 02 18:49:02 2015 +0000
+++ b/sys/arch/atari/dev/hdfd.c Fri Jan 02 19:42:05 2015 +0000
@@ -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 @@
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 @@
* 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 @@
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;
diff -r a8c69ccaf474 -r 77078d1bb919 sys/arch/bebox/stand/boot/sd.c
--- a/sys/arch/bebox/stand/boot/sd.c Fri Jan 02 18:49:02 2015 +0000
+++ b/sys/arch/bebox/stand/boot/sd.c Fri Jan 02 19:42:05 2015 +0000
@@ -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 @@
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;
diff -r a8c69ccaf474 -r 77078d1bb919 sys/arch/bebox/stand/boot/wd.c
--- a/sys/arch/bebox/stand/boot/wd.c Fri Jan 02 18:49:02 2015 +0000
+++ b/sys/arch/bebox/stand/boot/wd.c Fri Jan 02 19:42:05 2015 +0000
@@ -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 @@
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);
diff -r a8c69ccaf474 -r 77078d1bb919 sys/arch/cobalt/stand/boot/wd.c
--- a/sys/arch/cobalt/stand/boot/wd.c Fri Jan 02 18:49:02 2015 +0000
+++ b/sys/arch/cobalt/stand/boot/wd.c Fri Jan 02 19:42:05 2015 +0000
@@ -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 @@
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);
diff -r a8c69ccaf474 -r 77078d1bb919 sys/arch/dreamcast/dev/maple/mmemcard.c
--- a/sys/arch/dreamcast/dev/maple/mmemcard.c Fri Jan 02 18:49:02 2015 +0000
+++ b/sys/arch/dreamcast/dev/maple/mmemcard.c Fri Jan 02 19:42:05 2015 +0000
@@ -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 @@
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);
diff -r a8c69ccaf474 -r 77078d1bb919 sys/arch/emips/ebus/ace_ebus.c
--- a/sys/arch/emips/ebus/ace_ebus.c Fri Jan 02 18:49:02 2015 +0000
+++ b/sys/arch/emips/ebus/ace_ebus.c Fri Jan 02 19:42:05 2015 +0000
@@ -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 @@
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);
diff -r a8c69ccaf474 -r 77078d1bb919 sys/arch/emips/ebus/flash_ebus.c
--- a/sys/arch/emips/ebus/flash_ebus.c Fri Jan 02 18:49:02 2015 +0000
+++ b/sys/arch/emips/ebus/flash_ebus.c Fri Jan 02 19:42:05 2015 +0000
@@ -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 @@
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);
diff -r a8c69ccaf474 -r 77078d1bb919 sys/arch/evbarm/stand/boot2440/dev_sdmmc.c
--- a/sys/arch/evbarm/stand/boot2440/dev_sdmmc.c Fri Jan 02 18:49:02 2015 +0000
+++ b/sys/arch/evbarm/stand/boot2440/dev_sdmmc.c Fri Jan 02 19:42:05 2015 +0000
@@ -280,7 +280,7 @@
lp->d_nsectors = wd->sc_params.atap_sectors;
lp->d_ncylinders = wd->sc_params.atap_cylinders;*/
Home |
Main Index |
Thread Index |
Old Index