diff options
| author |   matthew <matthew@openbsd.org> | 2011-06-05 18:40:33 +0000 |
|---|---|---|
| committer | matthew <matthew@openbsd.org> | 2011-06-05 18:40:33 +0000 |
| commit | b707634bad0f39b98f24fab5089e02e2a7bb681e (patch) | |
| tree | 69a880acdcdcf59a22bd1910347288444ded28a5 /sys/dev/isa/mcd.c | |
| parent | Disable MSIs in pci_intr_disestablish() when appropriate. (diff) | |
| download | wireguard-openbsd-b707634bad0f39b98f24fab5089e02e2a7bb681e.tar.xz wireguard-openbsd-b707634bad0f39b98f24fab5089e02e2a7bb681e.zip | |
Drop kernel support for the useless DIOCWLABEL ioctl and prune a lot
of silly flag twiddling code in various disk drivers.
ok deraadt@, miod@
N.B., users will need a -current disklabel(8) to be able to write new
disklabels to disk now.
Diffstat (limited to 'sys/dev/isa/mcd.c')
| -rw-r--r-- | sys/dev/isa/mcd.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/sys/dev/isa/mcd.c b/sys/dev/isa/mcd.c index d250f670ae7..13a93d9400d 100644 --- a/sys/dev/isa/mcd.c +++ b/sys/dev/isa/mcd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mcd.c,v 1.58 2011/06/03 21:14:11 matthew Exp $ */ +/* $OpenBSD: mcd.c,v 1.59 2011/06/05 18:40:33 matthew Exp $ */ /* $NetBSD: mcd.c,v 1.60 1998/01/14 12:14:41 drochner Exp $ */ /* @@ -123,8 +123,6 @@ struct mcd_softc { int flags; #define MCDF_LOCKED 0x01 #define MCDF_WANTED 0x02 -#define MCDF_WLABEL 0x04 /* label is writable */ -#define MCDF_LABELLING 0x08 /* writing label */ #define MCDF_LOADED 0x10 /* parameters loaded */ #define MCDF_EJECTING 0x20 /* please eject at close */ short status; @@ -649,20 +647,15 @@ mcdioctl(dev, cmd, addr, flag, p) if ((error = mcdlock(sc)) != 0) return error; - sc->flags |= MCDF_LABELLING; error = setdisklabel(sc->sc_dk.dk_label, (struct disklabel *)addr, /*sc->sc_dk.dk_openmask : */0); if (error == 0) { } - sc->flags &= ~MCDF_LABELLING; mcdunlock(sc); return error; - case DIOCWLABEL: - return EBADF; - case CDIOCPLAYTRACKS: return mcd_playtracks(sc, (struct ioc_play_track *)addr); case CDIOCPLAYMSF: |