diff options
| author |   niklas <niklas@openbsd.org> | 1996-03-08 16:42:45 +0000 |
|---|---|---|
| committer | niklas <niklas@openbsd.org> | 1996-03-08 16:42:45 +0000 |
| commit | 71bd8889c4052a543e2298298a29cb4c9df0c70c (patch) | |
| tree | d8bc90785dda8ba85c0baf1bacc535e1696ccb7e /sys/dev/isa/mcd.c | |
| parent | rm '-f' config.cache (diff) | |
| download | wireguard-openbsd-71bd8889c4052a543e2298298a29cb4c9df0c70c.tar.xz wireguard-openbsd-71bd8889c4052a543e2298298a29cb4c9df0c70c.zip | |
From NetBSD: merge of 960217
Diffstat (limited to 'sys/dev/isa/mcd.c')
| -rw-r--r-- | sys/dev/isa/mcd.c | 9 |
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; |