Module Name: src
Committed By: pooka
Date: Thu Oct 1 21:43:29 UTC 2009
Modified Files:
src/sys/rump/librump/rumpdev: rump_dev.c rump_dev_private.h
Log Message:
add a new init-related calls
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/librump/rumpdev/rump_dev.c
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/librump/rumpdev/rump_dev_private.h
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/rump_dev.c
diff -u src/sys/rump/librump/rumpdev/rump_dev.c:1.5 src/sys/rump/librump/rumpdev/rump_dev.c:1.6
--- src/sys/rump/librump/rumpdev/rump_dev.c:1.5 Mon Sep 21 12:14:47 2009
+++ src/sys/rump/librump/rumpdev/rump_dev.c Thu Oct 1 21:43:29 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_dev.c,v 1.5 2009/09/21 12:14:47 pooka Exp $ */
+/* $NetBSD: rump_dev.c,v 1.6 2009/10/01 21:43:29 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump_dev.c,v 1.5 2009/09/21 12:14:47 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump_dev.c,v 1.6 2009/10/01 21:43:29 pooka Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -39,10 +39,14 @@
__weak_alias(rump_dev_raidframe_init,nocomponent);
__weak_alias(rump_dev_netsmb_init,nocomponent);
__weak_alias(rump_dev_rnd_init,nocomponent);
+__weak_alias(rump_dev_rumpusbhc_init,nocomponent);
+
+__weak_alias(rump_device_configuration,nocomponent);
void
rump_dev_init(void)
{
+ extern int cold;
config_init_mi();
@@ -50,9 +54,13 @@
rump_dev_raidframe_init();
rump_dev_netsmb_init();
rump_dev_rnd_init();
+ rump_dev_rumpusbhc_init();
rump_pdev_finalize();
+ rump_device_configuration();
+
+ cold = 0;
if (config_rootfound("mainbus", NULL) == NULL)
panic("no mainbus");
Index: src/sys/rump/librump/rumpdev/rump_dev_private.h
diff -u src/sys/rump/librump/rumpdev/rump_dev_private.h:1.4 src/sys/rump/librump/rumpdev/rump_dev_private.h:1.5
--- src/sys/rump/librump/rumpdev/rump_dev_private.h:1.4 Tue Sep 8 20:15:51 2009
+++ src/sys/rump/librump/rumpdev/rump_dev_private.h Thu Oct 1 21:43:29 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_dev_private.h,v 1.4 2009/09/08 20:15:51 pooka Exp $ */
+/* $NetBSD: rump_dev_private.h,v 1.5 2009/10/01 21:43:29 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -37,5 +37,8 @@
void rump_dev_raidframe_init(void);
void rump_dev_netsmb_init(void);
void rump_dev_rnd_init(void);
+void rump_dev_rumpusbhc_init(void);
+
+void rump_device_configuration(void);
#endif /* _SYS_RUMP_DEV_PRIVATE_H_ */
