summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiels Provos <provos@cvs.openbsd.org>1997-12-10 00:01:41 +0000
committerNiels Provos <provos@cvs.openbsd.org>1997-12-10 00:01:41 +0000
commitd00c2a6d581af2261edfb3878499baef78323389 (patch)
tree2c4a75b29e38073ad910a33fb2e41346a2952208
parent6690a9d92a486677f79c4fb8010a0a8462d6a332 (diff)
insert forgotten copyright + handle eject ioctl.
-rw-r--r--sys/compat/linux/linux_cdrom.c5
-rw-r--r--sys/compat/linux/linux_cdrom.h31
2 files changed, 34 insertions, 2 deletions
diff --git a/sys/compat/linux/linux_cdrom.c b/sys/compat/linux/linux_cdrom.c
index 3586fc7d6a2..c54fa8b17bd 100644
--- a/sys/compat/linux/linux_cdrom.c
+++ b/sys/compat/linux/linux_cdrom.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: linux_cdrom.c,v 1.1 1997/12/07 22:59:14 provos Exp $ */
+/* $OpenBSD: linux_cdrom.c,v 1.2 1997/12/10 00:01:39 provos Exp $ */
/*
* Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
* All rights reserved.
@@ -209,6 +209,9 @@ linux_ioctl_cdrom(p, uap, retval)
case LINUX_CDROMSTART:
SCARG(&ia, com) = CDIOCSTART;
break;
+ case LINUX_CDROMEJECT:
+ SCARG(&ia, com) = CDIOCEJECT;
+ break;
default:
printf("linux_ioctl_cdrom: invalid ioctl %08lx\n", com);
return EINVAL;
diff --git a/sys/compat/linux/linux_cdrom.h b/sys/compat/linux/linux_cdrom.h
index bbc058b61f3..6d94c6132e7 100644
--- a/sys/compat/linux/linux_cdrom.h
+++ b/sys/compat/linux/linux_cdrom.h
@@ -1,4 +1,33 @@
-/* $OpenBSD: linux_cdrom.h,v 1.1 1997/12/07 22:59:14 provos Exp $ */
+/* $OpenBSD: linux_cdrom.h,v 1.2 1997/12/10 00:01:40 provos Exp $ */
+/*
+ * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by Niels Provos.
+ * 4. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
struct linux_cdrom_blk
{