Module Name: src
Committed By: mbalmer
Date: Sat Aug 15 09:43:59 UTC 2009
Modified Files:
src/sys/arch/i386/conf: ALL
src/sys/dev: keylock.c
src/sys/dev/gpio: gpiolock.c
src/sys/secmodel/keylock: secmodel_keylock.c
src/sys/sys: Makefile
Added Files:
src/sys/dev: keylock.h
Removed Files:
src/sys/sys: keylock.h
Log Message:
Move the keylock.h header from sys/sys to sys/dev where it really belongs.
Add keylock options to the ALL kernel configuration.
To generate a diff of this commit:
cvs rdiff -u -r1.203 -r1.204 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/keylock.c
cvs rdiff -u -r0 -r1.1 src/sys/dev/keylock.h
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/gpio/gpiolock.c
cvs rdiff -u -r1.1 -r1.2 src/sys/secmodel/keylock/secmodel_keylock.c
cvs rdiff -u -r1.119 -r1.120 src/sys/sys/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/sys/keylock.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.203 src/sys/arch/i386/conf/ALL:1.204
--- src/sys/arch/i386/conf/ALL:1.203 Wed Jul 29 11:52:44 2009
+++ src/sys/arch/i386/conf/ALL Sat Aug 15 09:43:58 2009
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.203 2009/07/29 11:52:44 mbalmer Exp $
+# $NetBSD: ALL,v 1.204 2009/08/15 09:43:58 mbalmer Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.203 $"
+#ident "ALL-$Revision: 1.204 $"
maxusers 32 # estimated number of users
@@ -297,6 +297,10 @@
#options SPLASHSCREEN
#options SPLASHSCREEN_PROGRESS
+# Keylock support
+options KEYLOCK
+options secmodel_keylock
+
# Kernel root file system and dump configuration.
config netbsd root on ? type ?
#config netbsd root on sd0a type ffs
Index: src/sys/dev/keylock.c
diff -u src/sys/dev/keylock.c:1.1 src/sys/dev/keylock.c:1.2
--- src/sys/dev/keylock.c:1.1 Fri Aug 14 21:17:22 2009
+++ src/sys/dev/keylock.c Sat Aug 15 09:43:58 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: keylock.c,v 1.1 2009/08/14 21:17:22 mbalmer Exp $ */
+/* $NetBSD: keylock.c,v 1.2 2009/08/15 09:43:58 mbalmer Exp $ */
/*
* Copyright (c) 2009 Marc Balmer <m...@msys.ch>
@@ -31,9 +31,10 @@
#include <sys/param.h>
#include <sys/kernel.h>
-#include <sys/keylock.h>
#include <sys/sysctl.h>
+#include <dev/keylock.h>
+
#ifdef secmodel_keylock
#include <sys/kauth.h>
#include <secmodel/keylock/keylock.h>
Index: src/sys/dev/gpio/gpiolock.c
diff -u src/sys/dev/gpio/gpiolock.c:1.1 src/sys/dev/gpio/gpiolock.c:1.2
--- src/sys/dev/gpio/gpiolock.c:1.1 Fri Aug 14 21:17:22 2009
+++ src/sys/dev/gpio/gpiolock.c Sat Aug 15 09:43:59 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: gpiolock.c,v 1.1 2009/08/14 21:17:22 mbalmer Exp $ */
+/* $NetBSD: gpiolock.c,v 1.2 2009/08/15 09:43:59 mbalmer Exp $ */
/*
* Copyright (c) 2009 Marc Balmer <m...@msys.ch>
@@ -34,9 +34,9 @@
#include <sys/param.h>
#include <sys/device.h>
#include <sys/gpio.h>
-#include <sys/keylock.h>
#include <dev/gpio/gpiovar.h>
+#include <dev/keylock.h>
#define GPIOLOCK_MAXPINS 4
#define GPIOLOCK_MINPINS 2
Index: src/sys/secmodel/keylock/secmodel_keylock.c
diff -u src/sys/secmodel/keylock/secmodel_keylock.c:1.1 src/sys/secmodel/keylock/secmodel_keylock.c:1.2
--- src/sys/secmodel/keylock/secmodel_keylock.c:1.1 Fri Aug 14 21:17:22 2009
+++ src/sys/secmodel/keylock/secmodel_keylock.c Sat Aug 15 09:43:59 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: secmodel_keylock.c,v 1.1 2009/08/14 21:17:22 mbalmer Exp $ */
+/* $NetBSD: secmodel_keylock.c,v 1.2 2009/08/15 09:43:59 mbalmer Exp $ */
/*-
* Copyright (c) 2009 Marc Balmer <m...@msys.ch>
* Copyright (c) 2006 Elad Efrat <e...@netbsd.org>
@@ -54,18 +54,19 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: secmodel_keylock.c,v 1.1 2009/08/14 21:17:22 mbalmer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: secmodel_keylock.c,v 1.2 2009/08/15 09:43:59 mbalmer Exp $");
#include <sys/types.h>
#include <sys/param.h>
#include <sys/kauth.h>
#include <sys/conf.h>
-#include <sys/keylock.h>
#include <sys/mount.h>
#include <sys/sysctl.h>
#include <sys/vnode.h>
+#include <dev/keylock.h>
+
#include <miscfs/specfs/specdev.h>
#include <secmodel/keylock/keylock.h>
Index: src/sys/sys/Makefile
diff -u src/sys/sys/Makefile:1.119 src/sys/sys/Makefile:1.120
--- src/sys/sys/Makefile:1.119 Fri Aug 14 21:17:22 2009
+++ src/sys/sys/Makefile Sat Aug 15 09:43:59 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.119 2009/08/14 21:17:22 mbalmer Exp $
+# $NetBSD: Makefile,v 1.120 2009/08/15 09:43:59 mbalmer Exp $
.include <bsd.sys.mk>
@@ -17,7 +17,7 @@
float_ieee754.h fstypes.h gcq.h gmon.h gpio.h hash.h \
ieee754.h inttypes.h ioccom.h ioctl.h ioctl_compat.h iostat.h ipc.h \
joystick.h \
- kcore.h keylock.h kgdb.h kmem.h ksem.h ksyms.h ktrace.h \
+ kcore.h kgdb.h kmem.h ksem.h ksyms.h ktrace.h \
localedef.h lock.h lockf.h lwp.h lwpctl.h \
malloc.h mallocvar.h mbuf.h md4.h md5.h midiio.h \
mman.h module.h mount.h mqueue.h msg.h msgbuf.h mtio.h mutex.h \
Added files:
Index: src/sys/dev/keylock.h
diff -u /dev/null src/sys/dev/keylock.h:1.1
--- /dev/null Sat Aug 15 09:43:59 2009
+++ src/sys/dev/keylock.h Sat Aug 15 09:43:58 2009
@@ -0,0 +1,49 @@
+/* $NetBSD: keylock.h,v 1.1 2009/08/15 09:43:58 mbalmer Exp $ */
+
+/*
+ * Copyright (c) 2009 Marc Balmer <m...@msys.ch>
+ * 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.
+ *
+ * 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.
+ */
+
+#ifndef _SYS_KEYLOCK_H
+#define _SYS_KEYLOCK_H
+
+#define KEYLOCK_ABSENT 0
+#define KEYLOCK_TAMPER 1
+#define KEYLOCK_OPEN 2
+#define KEYLOCK_SEMIOPEN 3
+#define KEYLOCK_SEMICLOSE 4
+#define KEYLOCK_CLOSE 5
+
+#ifdef _KERNEL
+/* Functions for keylock drivers */
+extern int keylock_register(void *, int, int (*)(void *));
+extern void keylock_unregister(void *, int (*)(void *));
+
+/* Functions to query the keylock state */
+extern int keylock_state(void);
+extern int keylock_position(void);
+extern int keylock_num_positions(void);
+#endif
+
+#endif /* _SYS_KEYLOCK_H */
