Module Name: src
Committed By: pooka
Date: Mon Mar 8 10:57:25 UTC 2010
Modified Files:
src/sys/rump/dev/wip/libukbd: UKBD.ioconf ukbd_at_usb.c
src/sys/rump/dev/wip/libums: UMS.ioconf ums_at_usb.c
Log Message:
Convert to pseudo-root.
These can be moved out of wip (once I get some time).
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/wip/libukbd/UKBD.ioconf \
src/sys/rump/dev/wip/libukbd/ukbd_at_usb.c
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/wip/libums/UMS.ioconf \
src/sys/rump/dev/wip/libums/ums_at_usb.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/dev/wip/libukbd/UKBD.ioconf
diff -u src/sys/rump/dev/wip/libukbd/UKBD.ioconf:1.3 src/sys/rump/dev/wip/libukbd/UKBD.ioconf:1.4
--- src/sys/rump/dev/wip/libukbd/UKBD.ioconf:1.3 Fri Feb 12 04:21:57 2010
+++ src/sys/rump/dev/wip/libukbd/UKBD.ioconf Mon Mar 8 10:57:25 2010
@@ -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 ?
Index: src/sys/rump/dev/wip/libukbd/ukbd_at_usb.c
diff -u src/sys/rump/dev/wip/libukbd/ukbd_at_usb.c:1.3 src/sys/rump/dev/wip/libukbd/ukbd_at_usb.c:1.4
--- src/sys/rump/dev/wip/libukbd/ukbd_at_usb.c:1.3 Wed Feb 10 02:26:23 2010
+++ src/sys/rump/dev/wip/libukbd/ukbd_at_usb.c Mon Mar 8 10:57:25 2010
@@ -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));
}
Index: src/sys/rump/dev/wip/libums/UMS.ioconf
diff -u src/sys/rump/dev/wip/libums/UMS.ioconf:1.3 src/sys/rump/dev/wip/libums/UMS.ioconf:1.4
--- src/sys/rump/dev/wip/libums/UMS.ioconf:1.3 Fri Feb 12 04:21:57 2010
+++ src/sys/rump/dev/wip/libums/UMS.ioconf Mon Mar 8 10:57:25 2010
@@ -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 ?
Index: src/sys/rump/dev/wip/libums/ums_at_usb.c
diff -u src/sys/rump/dev/wip/libums/ums_at_usb.c:1.3 src/sys/rump/dev/wip/libums/ums_at_usb.c:1.4
--- src/sys/rump/dev/wip/libums/ums_at_usb.c:1.3 Wed Feb 10 02:26:24 2010
+++ src/sys/rump/dev/wip/libums/ums_at_usb.c Mon Mar 8 10:57:25 2010
@@ -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));
}
