Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move the keylock.h header from sys/sys to sys/dev where it really belongs.

Browse Source 
Add keylock options to the ALL kernel configuration.
This commit is contained in:
mbalmer 2009-08-15 09:43:58 +00:00
parent d5042376f6
commit 385b2e3631
6 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/arch/i386/conf/ALL
View File

@ -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 @@ include "arch/i386/conf/std.i386"
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 WSDISPLAY_SCROLLSUPPORT
#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

4
sys/dev/gpio/gpiolock.c
View File

@ -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 <marc@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

5
sys/dev/keylock.c
View File

@ -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 <marc@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>

2
sys/sys/keylock.h → sys/dev/keylock.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: keylock.h,v 1.1 2009/08/14 21:17:22 mbalmer Exp $ */
/* $NetBSD: keylock.h,v 1.1 2009/08/15 09:43:58 mbalmer Exp $ */
/*
* Copyright (c) 2009 Marc Balmer <marc@msys.ch>

7
sys/secmodel/keylock/secmodel_keylock.c
View File

@ -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 <marc@msys.ch>
* Copyright (c) 2006 Elad Efrat <elad@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>

4
sys/sys/Makefile
View File

@ -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 @@ INCS= acct.h agpio.h aio.h ansi.h ataio.h atomic.h audioio.h \
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 \