summaryrefslogtreecommitdiff
path: root/sys/dev/isa/mcd.c
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>1996-03-08 16:43:18 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>1996-03-08 16:43:18 +0000
commitf002504e4c0ab3d830bf64c740d87aa36bee2fc6 (patch)
tree5114ddfd409cf1da4256c18c3b42ea0b09330aa4 /sys/dev/isa/mcd.c
parent44871426571d01c2486b46d4317ff9caeac6ee4d (diff)
From NetBSD: merge of 960217
Diffstat (limited to 'sys/dev/isa/mcd.c')
-rw-r--r--sys/dev/isa/mcd.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/sys/dev/isa/mcd.c b/sys/dev/isa/mcd.c
index ebec3cfd4aa..6cfb6958f17 100644
--- a/sys/dev/isa/mcd.c
+++ b/sys/dev/isa/mcd.c
@@ -1,4 +1,5 @@
-/* $NetBSD: mcd.c,v 1.44 1996/01/07 22:03:37 thorpej Exp $ */
+/* $OpenBSD: mcd.c,v 1.6 1996/03/08 16:43:09 niklas Exp $ */
+/* $NetBSD: mcd.c,v 1.45 1996/01/30 18:28:05 thorpej Exp $ */
/*
* Copyright (c) 1993, 1994, 1995 Charles M. Hannum. All rights reserved.
@@ -617,12 +618,16 @@ mcdioctl(dev, cmd, addr, flag, p)
return EINVAL;
case CDIOCSTOP:
return mcd_stop(sc);
- case CDIOCEJECT:
+ case CDIOCEJECT: /* FALLTHROUGH */
+ case DIOCEJECT:
return mcd_eject(sc);
case CDIOCALLOW:
return mcd_setlock(sc, MCD_LK_UNLOCK);
case CDIOCPREVENT:
return mcd_setlock(sc, MCD_LK_LOCK);
+ case DIOCLOCK:
+ return mcd_setlock(sc,
+ (*(int *)addr) ? MCD_LK_LOCK : MCD_LK_UNLOCK);
case CDIOCSETDEBUG:
sc->debug = 1;
return 0;