summaryrefslogtreecommitdiff
path: root/sys/arch/atari/dev/hdfd.c
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2015-01-02 19:42:05 +0000
committerchristos <christos@NetBSD.org>2015-01-02 19:42:05 +0000
commit6e87faa0ac011c6106b2662ebfae490341bfc61f (patch)
treed6fd1eb8a6b9d67d05d21a7a017187e60540d7a9 /sys/arch/atari/dev/hdfd.c
parente4a6a8bb42c897fbe7524f4566e0b898a739442b (diff)
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 (limited to 'sys/arch/atari/dev/hdfd.c')
-rw-r--r--sys/arch/atari/dev/hdfd.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/arch/atari/dev/hdfd.c b/sys/arch/atari/dev/hdfd.c
index 01bdf99d490..f8a3311ab66 100644
--- a/sys/arch/atari/dev/hdfd.c
+++ b/sys/arch/atari/dev/hdfd.c
@@ -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_t 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_t 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, struct disklabel *lp, int part)
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;