kaluga: waiting for all spawnds to be up before starting drivers/apps

[barrelfish] / usr / kaluga / x86.c

diff --git a/usr/kaluga/x86.c b/usr/kaluga/x86.c
index 48b7587..89321a8 100644 (file)
--- a/usr/kaluga/x86.c
+++ b/usr/kaluga/x86.c
@@ -173,13 +173,6 @@ errval_t arch_startup(char * add_device_db_file)
         USER_PANIC_ERR(err, "Watching PCI root bridges.");
     }
 
-    KALUGA_DEBUG("Kaluga: pci_devices\n");
-
-    err = watch_for_pci_devices();
-    if (err_is_fail(err)) {
-        USER_PANIC_ERR(err, "Watching PCI devices.");
-    }
-
     KALUGA_DEBUG("Kaluga: int_controller_devices\n");
 
     err = watch_for_int_controller();
@@ -194,6 +187,13 @@ errval_t arch_startup(char * add_device_db_file)
         USER_PANIC_ERR(err, "Unable to wait for spawnds failed.");
     }
 
+    KALUGA_DEBUG("Kaluga: pci_devices\n");
+
+    err = watch_for_pci_devices();
+    if (err_is_fail(err)) {
+        USER_PANIC_ERR(err, "Watching PCI devices.");
+    }
+
     KALUGA_DEBUG("Kaluga: Starting serial...\n");
     err = start_serial();
     if (err_is_fail(err) && err != KALUGA_ERR_MODULE_NOT_FOUND) {