Changeset 2036 for Whitix/trunk

Timestamp:

04/02/09 21:37:49 (3 years ago)

Author:

mwhitworth

Message:

Update startup code.

Files:

• Whitix/trunk/user/system/startup.c (modified) (2 diffs)

Whitix/trunk/user/system/startup.c

@@ -48 +48 @@
         pid=ModuleLoad("Core/pci");
 
-        SysWaitForProcessFinish(pid, NULL);
-
-//      ModuleLoad("Video/nvidia");
-
-        ModuleLoad("Network/ne2k_pci");
-        
+        if (pid < 0)
+        {
+                printf("startup: could not load pci: %s\n", strerror(-pid));
+                SysExit(0);
+        }
+
+        SysWaitForProcessFinish(pid, NULL);
+
+        pid = ModuleLoad("Core/usb");
+        
+        SysWaitForProcessFinish(pid, NULL);
+        
+        pid = ModuleLoad("Core/uhci_usb");
+
+        SysWaitForProcessFinish(pid, NULL);
+        
+        pid = ModuleLoad("Core/ehci_usb");
+        
+        SysWaitForProcessFinish(pid, NULL);
+
+        ModuleLoad("Core/usb_hub");
+        
+        ModuleLoad("Core/usb_storage");
+
+        ModuleLoad("Video/nvidia");
+
+//      ModuleLoad("Network/ne2k_pci");
+        
+//      ModuleLoad("Network/pcnet32");
+
         int ret;
         
         /* Move to FS thread? */
         ModuleLoad("Filesystems/fatfs");
-        pid=ModuleLoad("Filesystems/icfs");
+        pid = ModuleLoad("Filesystems/icfs");
+        
+        if (pid < 0)
+        {
+                printf("startup: could not load icfs\n");
+                SysExit(0);
+        }
         
         SysWaitForProcessFinish(pid, NULL);
@@ -191 +221 @@
         SysChangeDir("/");
 
-//      SysCreateProcess("/System/Startup/regserver", NULL, NULL);
+        SysCreateProcess("/System/Startup/regserver", NULL, NULL);
 
         ShellRun();
+
+//      SysCreateProcess("/Applications/xy", NULL, NULL);
 
 //      SysShutdown(0);