[src/trunk]: src/sys/rump/librump/rumpkern Include newly-created subr_device....

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

details:   https://anonhg.NetBSD.org/src/rev/c07f103ab0f9
branches:  trunk
changeset: 751314:c07f103ab0f9
user:      pooka <pooka%NetBSD.org@localhost>
date:      Sun Jan 31 15:12:42 2010 +0000

description:
Include newly-created subr_device.c and remove few special case
device accessor copypastes.  This makes it possible to link static
binaries which use -lrumpdev.

diffstat:

 sys/rump/librump/rumpkern/Makefile.rumpkern |   8 ++++----
 sys/rump/librump/rumpkern/emul.c            |  17 ++---------------
 2 files changed, 6 insertions(+), 19 deletions(-)

diffs (67 lines):

diff -r bc8a03eaf00b -r c07f103ab0f9 sys/rump/librump/rumpkern/Makefile.rumpkern
--- a/sys/rump/librump/rumpkern/Makefile.rumpkern       Sun Jan 31 15:10:11 2010 +0000
+++ b/sys/rump/librump/rumpkern/Makefile.rumpkern       Sun Jan 31 15:12:42 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.rumpkern,v 1.72 2010/01/31 02:08:36 pooka Exp $
+#      $NetBSD: Makefile.rumpkern,v 1.73 2010/01/31 15:12:42 pooka Exp $
 #
 
 .include "${RUMPTOP}/Makefile.rump"
@@ -44,9 +44,9 @@
        sys_descrip.c sys_generic.c sys_pipe.c sys_select.c syscalls.c
 
 # sys/kern subr (misc)
-SRCS+= subr_devsw.c subr_callback.c subr_copy.c subr_evcnt.c           \
-       subr_extent.c subr_hash.c subr_humanize.c subr_iostat.c         \
-       subr_kobj.c subr_log.c subr_once.c subr_prf.c                   \
+SRCS+= subr_devsw.c subr_callback.c subr_copy.c subr_device.c          \
+       subr_evcnt.c subr_extent.c subr_hash.c subr_humanize.c          \
+       subr_iostat.c subr_kobj.c subr_log.c subr_once.c subr_prf.c     \
        subr_specificdata.c subr_time.c subr_workqueue.c subr_xcall.c
 
 # sys/uvm
diff -r bc8a03eaf00b -r c07f103ab0f9 sys/rump/librump/rumpkern/emul.c
--- a/sys/rump/librump/rumpkern/emul.c  Sun Jan 31 15:10:11 2010 +0000
+++ b/sys/rump/librump/rumpkern/emul.c  Sun Jan 31 15:12:42 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: emul.c,v 1.120 2010/01/31 02:08:36 pooka Exp $ */
+/*     $NetBSD: emul.c,v 1.121 2010/01/31 15:12:42 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.120 2010/01/31 02:08:36 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.121 2010/01/31 15:12:42 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/null.h>
@@ -125,13 +125,6 @@
        FSCALE,
 };
 
-devclass_t
-device_class(device_t dev)
-{
-
-       return dev->dv_class;
-}
-
 void
 getnanouptime(struct timespec *ts)
 {
@@ -318,12 +311,6 @@
        return t;
 }
 
-const char *
-device_xname(device_t dv)
-{
-       return "bogus0";
-}
-
 void
 assert_sleepable(void)
 {