[src/trunk]: src/sys/rump/librump Include kern_pmf.c in rumpdev.

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e14b19a453d9
branches:  trunk
changeset: 750654:e14b19a453d9
user:      pooka <pooka%NetBSD.org@localhost>
date:      Sat Jan 09 16:29:32 2010 +0000

description:
Include kern_pmf.c in rumpdev.

diffstat:

 sys/rump/librump/rumpdev/Makefile.rumpdev |   6 +++---
 sys/rump/librump/rumpdev/opt/wsdisplay.h  |   1 +
 sys/rump/librump/rumpkern/emul.c          |  21 ++-------------------
 3 files changed, 6 insertions(+), 22 deletions(-)

diffs (72 lines):

diff -r b0d86859bb51 -r e14b19a453d9 sys/rump/librump/rumpdev/Makefile.rumpdev
--- a/sys/rump/librump/rumpdev/Makefile.rumpdev Sat Jan 09 16:19:17 2010 +0000
+++ b/sys/rump/librump/rumpdev/Makefile.rumpdev Sat Jan 09 16:29:32 2010 +0000
@@ -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>
diff -r b0d86859bb51 -r e14b19a453d9 sys/rump/librump/rumpdev/opt/wsdisplay.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/librump/rumpdev/opt/wsdisplay.h  Sat Jan 09 16:29:32 2010 +0000
@@ -0,0 +1,1 @@
+/*     $NetBSD: wsdisplay.h,v 1.1 2010/01/09 16:29:32 pooka Exp $      */
diff -r b0d86859bb51 -r e14b19a453d9 sys/rump/librump/rumpkern/emul.c
--- a/sys/rump/librump/rumpkern/emul.c  Sat Jan 09 16:19:17 2010 +0000
+++ b/sys/rump/librump/rumpkern/emul.c  Sat Jan 09 16:29:32 2010 +0000
@@ -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)
 {