mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-11 09:50:12 +00:00
Create nexus in configure_first() instead of in configure(). This
makes sure that sysinit tasks that run after configure_first(), but before configure() have a nexus to hang devices off.
This commit is contained in:
parent
7b7c2c20d4
commit
470cd51ee6
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=146794
@ -74,14 +74,14 @@ device_t isa_bus_device = 0;
|
||||
static void
|
||||
configure_first(void *dummy)
|
||||
{
|
||||
|
||||
device_add_child(root_bus, platform.iobus, 0);
|
||||
}
|
||||
|
||||
static void
|
||||
configure(void *dummy)
|
||||
{
|
||||
|
||||
device_add_child(root_bus, platform.iobus, 0);
|
||||
|
||||
root_bus_configure();
|
||||
|
||||
/*
|
||||
|
@ -90,6 +90,9 @@ static void
|
||||
configure_first(dummy)
|
||||
void *dummy;
|
||||
{
|
||||
|
||||
/* nexus0 is the top of the amd64 device tree */
|
||||
device_add_child(root_bus, "nexus", 0);
|
||||
}
|
||||
|
||||
static void
|
||||
@ -104,9 +107,6 @@ configure(dummy)
|
||||
*/
|
||||
enable_intr();
|
||||
|
||||
/* nexus0 is the top of the i386 device tree */
|
||||
device_add_child(root_bus, "nexus", 0);
|
||||
|
||||
/* initialize new bus architecture */
|
||||
root_bus_configure();
|
||||
|
||||
|
@ -79,13 +79,14 @@ device_t nexus_dev;
|
||||
static void
|
||||
configure_first(void *dummy)
|
||||
{
|
||||
|
||||
device_add_child(root_bus, "nexus", 0);
|
||||
}
|
||||
|
||||
static void
|
||||
configure(void *dummy)
|
||||
{
|
||||
device_add_child(root_bus, "nexus", 0);
|
||||
|
||||
|
||||
root_bus_configure();
|
||||
}
|
||||
|
||||
|
@ -91,6 +91,9 @@ static void
|
||||
configure_first(dummy)
|
||||
void *dummy;
|
||||
{
|
||||
|
||||
/* nexus0 is the top of the i386 device tree */
|
||||
device_add_child(root_bus, "nexus", 0);
|
||||
}
|
||||
|
||||
static void
|
||||
@ -105,9 +108,6 @@ configure(dummy)
|
||||
*/
|
||||
enable_intr();
|
||||
|
||||
/* nexus0 is the top of the i386 device tree */
|
||||
device_add_child(root_bus, "nexus", 0);
|
||||
|
||||
/* initialize new bus architecture */
|
||||
root_bus_configure();
|
||||
|
||||
|
@ -74,14 +74,14 @@ device_t isa_bus_device = 0;
|
||||
static void
|
||||
configure_first(void *dummy)
|
||||
{
|
||||
|
||||
device_add_child(root_bus, "nexus", 0);
|
||||
}
|
||||
|
||||
static void
|
||||
configure(void *dummy)
|
||||
{
|
||||
|
||||
device_add_child(root_bus, "nexus", 0);
|
||||
|
||||
root_bus_configure();
|
||||
|
||||
/*
|
||||
|
@ -51,12 +51,13 @@ SYSINIT(configure3, SI_SUB_CONFIGURE, SI_ORDER_ANY, configure_final, NULL);
|
||||
static void
|
||||
configure_first(void *dummy)
|
||||
{
|
||||
|
||||
nexusdev = device_add_child(root_bus, "nexus", 0);
|
||||
}
|
||||
|
||||
static void
|
||||
configure(void *dummy)
|
||||
{
|
||||
nexusdev = device_add_child(root_bus, "nexus", 0);
|
||||
|
||||
root_bus_configure();
|
||||
}
|
||||
|
@ -57,13 +57,14 @@ SYSINIT(configure3, SI_SUB_CONFIGURE, SI_ORDER_ANY, configure_final, NULL);
|
||||
static void
|
||||
configure_first(void *dummy)
|
||||
{
|
||||
|
||||
nexusdev = device_add_child(root_bus, "nexus", 0);
|
||||
}
|
||||
|
||||
static void
|
||||
configure(void *dummy)
|
||||
{
|
||||
|
||||
nexusdev = device_add_child(root_bus, "nexus", 0);
|
||||
root_bus_configure();
|
||||
#ifdef DEV_ISA
|
||||
if (isa_bus_device != NULL)
|
||||
|
Loading…
Reference in New Issue
Block a user