Module Name: src
Committed By: pooka
Date: Sat Oct 3 19:06:36 UTC 2009
Modified Files:
src/sys/rump/librump/rumpdev: autoconf.c rump_dev_private.h
Log Message:
pass unit number in mainbus attach args
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/librump/rumpdev/autoconf.c
cvs rdiff -u -r1.5 -r1.6 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/autoconf.c
diff -u src/sys/rump/librump/rumpdev/autoconf.c:1.3 src/sys/rump/librump/rumpdev/autoconf.c:1.4
--- src/sys/rump/librump/rumpdev/autoconf.c:1.3 Thu Oct 1 15:21:38 2009
+++ src/sys/rump/librump/rumpdev/autoconf.c Sat Oct 3 19:06:35 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.3 2009/10/01 15:21:38 pooka Exp $ */
+/* $NetBSD: autoconf.c,v 1.4 2009/10/03 19:06:35 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.3 2009/10/01 15:21:38 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.4 2009/10/03 19:06:35 pooka Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -125,9 +125,11 @@
mainbus_search(struct device *parent, struct cfdata *cf,
const int *ldesc, void *aux)
{
+ struct mainbus_attach_args maa;
- if (config_match(parent, cf, NULL) > 0)
- config_attach(parent, cf, NULL, NULL);
+ maa.maa_unit = cf->cf_unit;
+ if (config_match(parent, cf, &maa) > 0)
+ config_attach(parent, cf, &maa, NULL);
return 0;
}
Index: src/sys/rump/librump/rumpdev/rump_dev_private.h
diff -u src/sys/rump/librump/rumpdev/rump_dev_private.h:1.5 src/sys/rump/librump/rumpdev/rump_dev_private.h:1.6
--- src/sys/rump/librump/rumpdev/rump_dev_private.h:1.5 Thu Oct 1 21:43:29 2009
+++ src/sys/rump/librump/rumpdev/rump_dev_private.h Sat Oct 3 19:06:36 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_dev_private.h,v 1.5 2009/10/01 21:43:29 pooka Exp $ */
+/* $NetBSD: rump_dev_private.h,v 1.6 2009/10/03 19:06:36 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -41,4 +41,8 @@
void rump_device_configuration(void);
+struct mainbus_attach_args {
+ int maa_unit;
+};
+
#endif /* _SYS_RUMP_DEV_PRIVATE_H_ */
