[src/trunk]: src/sys/rump/dev/wip Convert to pseudo-root.

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

details:   https://anonhg.NetBSD.org/src/rev/ab9f4929e932
branches:  trunk
changeset: 752851:ab9f4929e932
user:      pooka <pooka%NetBSD.org@localhost>
date:      Mon Mar 08 10:57:25 2010 +0000

description:
Convert to pseudo-root.

These can be moved out of wip (once I get some time).

diffstat:

 sys/rump/dev/wip/libukbd/UKBD.ioconf   |   4 +++-
 sys/rump/dev/wip/libukbd/ukbd_at_usb.c |  18 +++---------------
 sys/rump/dev/wip/libums/UMS.ioconf     |   4 +++-
 sys/rump/dev/wip/libums/ums_at_usb.c   |  18 +++---------------
 4 files changed, 12 insertions(+), 32 deletions(-)

diffs (128 lines):

diff -r f949628c7ea3 -r ab9f4929e932 sys/rump/dev/wip/libukbd/UKBD.ioconf
--- a/sys/rump/dev/wip/libukbd/UKBD.ioconf      Mon Mar 08 10:56:12 2010 +0000
+++ b/sys/rump/dev/wip/libukbd/UKBD.ioconf      Mon Mar 08 10:57:25 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: UKBD.ioconf,v 1.3 2010/02/12 04:21:57 pooka Exp $
+#      $NetBSD: UKBD.ioconf,v 1.4 2010/03/08 10:57:25 pooka Exp $
 #
 
 ioconf ukbd
@@ -7,6 +7,8 @@
 include "dev/usb/files.usb"
 include "rump/dev/files.rump"
 
+pseudo-root uhub*
+
 # USB HID device
 uhidev* at uhub? port ? configuration ? interface ?
 
diff -r f949628c7ea3 -r ab9f4929e932 sys/rump/dev/wip/libukbd/ukbd_at_usb.c
--- a/sys/rump/dev/wip/libukbd/ukbd_at_usb.c    Mon Mar 08 10:56:12 2010 +0000
+++ b/sys/rump/dev/wip/libukbd/ukbd_at_usb.c    Mon Mar 08 10:57:25 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ukbd_at_usb.c,v 1.3 2010/02/10 02:26:23 pooka Exp $    */
+/*     $NetBSD: ukbd_at_usb.c,v 1.4 2010/03/08 10:57:25 pooka Exp $    */
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -9,6 +9,7 @@
 
 #include <sys/stat.h>
 
+#include "rump_private.h"
 #include "rump_dev_private.h"
 #include "rump_vfs_private.h"
 
@@ -19,27 +20,14 @@
                panic("\"%s\" failed", #call);                          \
 } while (/*CONSTCOND*/0)
 
-void
-rump_device_configuration(void)
+RUMP_COMPONENT(RUMP_COMPONENT_DEV)
 {
 
        FLAWLESSCALL(config_cfdata_attach(cfdata_ukbd, 0));
 
-       FLAWLESSCALL(config_cfdriver_attach(&mainbus_cd));
-       FLAWLESSCALL(config_cfattach_attach("mainbus", &mainbus_ca));
-
-       FLAWLESSCALL(config_cfdriver_attach(&ugenhc_cd));
-       FLAWLESSCALL(config_cfattach_attach("ugenhc", &ugenhc_ca));
-
-       FLAWLESSCALL(config_cfdriver_attach(&usb_cd));
-       FLAWLESSCALL(config_cfattach_attach("usb", &usb_ca));
-
        FLAWLESSCALL(config_cfdriver_attach(&uhidev_cd));
        FLAWLESSCALL(config_cfattach_attach("uhidev", &uhidev_ca));
 
        FLAWLESSCALL(config_cfdriver_attach(&ukbd_cd));
        FLAWLESSCALL(config_cfattach_attach("ukbd", &ukbd_ca));
-
-       FLAWLESSCALL(config_cfdriver_attach(&uhub_cd));
-       FLAWLESSCALL(config_cfattach_attach("uhub", &uroothub_ca));
 }
diff -r f949628c7ea3 -r ab9f4929e932 sys/rump/dev/wip/libums/UMS.ioconf
--- a/sys/rump/dev/wip/libums/UMS.ioconf        Mon Mar 08 10:56:12 2010 +0000
+++ b/sys/rump/dev/wip/libums/UMS.ioconf        Mon Mar 08 10:57:25 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: UMS.ioconf,v 1.3 2010/02/12 04:21:57 pooka Exp $
+#      $NetBSD: UMS.ioconf,v 1.4 2010/03/08 10:57:25 pooka Exp $
 #
 
 ioconf ums
@@ -7,6 +7,8 @@
 include "dev/usb/files.usb"
 include "rump/dev/files.rump"
 
+pseudo-root uhub*
+
 # USB HID device
 uhidev* at uhub? port ? configuration ? interface ?
 
diff -r f949628c7ea3 -r ab9f4929e932 sys/rump/dev/wip/libums/ums_at_usb.c
--- a/sys/rump/dev/wip/libums/ums_at_usb.c      Mon Mar 08 10:56:12 2010 +0000
+++ b/sys/rump/dev/wip/libums/ums_at_usb.c      Mon Mar 08 10:57:25 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ums_at_usb.c,v 1.3 2010/02/10 02:26:24 pooka Exp $     */
+/*     $NetBSD: ums_at_usb.c,v 1.4 2010/03/08 10:57:25 pooka Exp $     */
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -7,6 +7,7 @@
 
 #include "ioconf.c"
 
+#include "rump_private.h"
 #include "rump_dev_private.h"
 #include "rump_vfs_private.h"
 
@@ -17,27 +18,14 @@
                panic("\"%s\" failed", #call);                          \
 } while (/*CONSTCOND*/0)
 
-void
-rump_device_configuration(void)
+RUMP_COMPONENT(RUMP_COMPONENT_DEV)
 {
 
        FLAWLESSCALL(config_cfdata_attach(cfdata_ums, 0));
 
-       FLAWLESSCALL(config_cfdriver_attach(&mainbus_cd));
-       FLAWLESSCALL(config_cfattach_attach("mainbus", &mainbus_ca));
-
-       FLAWLESSCALL(config_cfdriver_attach(&ugenhc_cd));
-       FLAWLESSCALL(config_cfattach_attach("ugenhc", &ugenhc_ca));
-
-       FLAWLESSCALL(config_cfdriver_attach(&usb_cd));
-       FLAWLESSCALL(config_cfattach_attach("usb", &usb_ca));
-
        FLAWLESSCALL(config_cfdriver_attach(&uhidev_cd));
        FLAWLESSCALL(config_cfattach_attach("uhidev", &uhidev_ca));
 
        FLAWLESSCALL(config_cfdriver_attach(&ums_cd));
        FLAWLESSCALL(config_cfattach_attach("ums", &ums_ca));
-
-       FLAWLESSCALL(config_cfdriver_attach(&uhub_cd));
-       FLAWLESSCALL(config_cfattach_attach("uhub", &uroothub_ca));
 }