Module Name: src Committed By: pooka Date: Sat Jan 9 16:29:32 UTC 2010
Modified Files: src/sys/rump/librump/rumpdev: Makefile.rumpdev src/sys/rump/librump/rumpkern: emul.c Added Files: src/sys/rump/librump/rumpdev/opt: wsdisplay.h Log Message: Include kern_pmf.c in rumpdev. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/rump/librump/rumpdev/Makefile.rumpdev cvs rdiff -u -r0 -r1.1 src/sys/rump/librump/rumpdev/opt/wsdisplay.h cvs rdiff -u -r1.115 -r1.116 src/sys/rump/librump/rumpkern/emul.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/rump/librump/rumpdev/Makefile.rumpdev diff -u src/sys/rump/librump/rumpdev/Makefile.rumpdev:1.2 src/sys/rump/librump/rumpdev/Makefile.rumpdev:1.3 --- src/sys/rump/librump/rumpdev/Makefile.rumpdev:1.2 Sun Sep 6 20:42:26 2009 +++ src/sys/rump/librump/rumpdev/Makefile.rumpdev Sat Jan 9 16:29:32 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.rumpdev,v 1.2 2009/09/06 20:42:26 pooka Exp $ +# $NetBSD: Makefile.rumpdev,v 1.3 2010/01/09 16:29:32 pooka Exp $ # .include "${RUMPTOP}/Makefile.rump" @@ -11,13 +11,13 @@ SRCS= rump_dev.c autoconf.c # sys/kern -SRCS+= subr_autoconf.c +SRCS+= kern_pmf.c subr_autoconf.c # automatically in sync src/lib SHLIB_MAJOR= 0 SHLIB_MINOR= 0 -CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern +CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern -I${RUMPTOP}/librump/rumpdev/opt CPPFLAGS+= -Wno-pointer-sign .include <bsd.lib.mk> Index: src/sys/rump/librump/rumpkern/emul.c diff -u src/sys/rump/librump/rumpkern/emul.c:1.115 src/sys/rump/librump/rumpkern/emul.c:1.116 --- src/sys/rump/librump/rumpkern/emul.c:1.115 Fri Jan 8 20:04:06 2010 +++ src/sys/rump/librump/rumpkern/emul.c Sat Jan 9 16:29:32 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: emul.c,v 1.115 2010/01/08 20:04:06 dyoung Exp $ */ +/* $NetBSD: emul.c,v 1.116 2010/01/09 16:29:32 pooka Exp $ */ /* * Copyright (c) 2007 Antti Kantee. All Rights Reserved. @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.115 2010/01/08 20:04:06 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.116 2010/01/09 16:29:32 pooka Exp $"); #include <sys/param.h> #include <sys/null.h> @@ -451,23 +451,6 @@ rumpuser_exit(0); } -bool -pmf_device_register1(struct device *dev, - bool (*suspend)(device_t, pmf_qual_t), - bool (*resume)(device_t, pmf_qual_t), - bool (*shutdown)(device_t, int)) -{ - - return true; -} - -void -pmf_device_deregister(struct device *dev) -{ - - /* nada */ -} - int syscall_establish(const struct emul *em, const struct syscall_package *sp) { Added files: Index: src/sys/rump/librump/rumpdev/opt/wsdisplay.h diff -u /dev/null src/sys/rump/librump/rumpdev/opt/wsdisplay.h:1.1 --- /dev/null Sat Jan 9 16:29:32 2010 +++ src/sys/rump/librump/rumpdev/opt/wsdisplay.h Sat Jan 9 16:29:32 2010 @@ -0,0 +1 @@ +/* $NetBSD: wsdisplay.h,v 1.1 2010/01/09 16:29:32 pooka Exp $ */