Changeset 550 for Whitix/branches/hybrid

Timestamp:

05/24/08 09:59:22 (6 months ago)

Author:

mwhitworth

Message:

Add to file.

Files:

• Whitix/branches/hybrid/user/system/startup.c (modified) (3 diffs)

Whitix/branches/hybrid/user/system/startup.c

@@ -1 +1 @@
 #include <stdio.h>
+
+/* TODO: Make more configurable. Create a thread for each directory. */
 
 #define PATH_MAX        2048
@@ -6 +8 @@
 {
         char* args[]={name, NULL};
-        int fds[]={0, 1, 2};
 
-        return SysCreateProcess("moduleadd", fds, args);
+        return SysCreateProcess("moduleadd", NULL, args);
 }
 
+/* TODO: Finish. */
 int ModuleLoadDirectory(char* dirName)
 {
@@ -27 +29 @@
 }
 
+int networkFinished=0;
+
+void NetworkInit(void* args)
+{
+        int pid;
+
+        pid=ModuleLoad("Core/net");
+
+        SysWaitForProcessFinish(pid, NULL);
+
+        ModuleLoad("Core/local");
+        ModuleLoad("Core/inet");
+
+        pid=ModuleLoad("Core/pci");
+
+        SysWaitForProcessFinish(pid, NULL);
+
+        ModuleLoad("Network/ne2k_pci");
+
+        networkFinished=1;
+}
+
+int storageFinished=0;
+
+void StorageInit(void* args)
+{
+        ModuleLoad("Storage/ramdisk");
+        ModuleLoad("Storage/floppy");
+
+        storageFinished=1;
+}
+
+int inputFinished=0;
+
+void InputInit()
+{
+        int pid;
+
+        pid=ModuleLoad("Input/Ps2");
+
+        SysWaitForProcessFinish(pid, NULL);
+
+        ModuleLoad("Input/keyboard");
+        ModuleLoad("Input/Ps2Mouse");
+
+        inputFinished=1;
+}
+
 int main(int argc, char* argv[])
 {
+        int pid;
+
         /* Load modules */
         SysChangeDir("/System/Modules/");
-//      ModuleLoad("Core/pci");
-        ModuleLoad("Input/Ps2");
-        ModuleLoad("Input/keyboard");
-//      ModuleLoad("Network/ne2k-pci");
+
+        SysCreateThread(NetworkInit, 0, NULL);
+        SysCreateThread(InputInit, 0 , NULL);
+        SysCreateThread(StorageInit, 0, NULL);
+
+        while (!inputFinished || !networkFinished || !storageFinished)
+                SysYield();
 
         SysChangeDir("/");
 
-        int fds[]={0, 1, 2};
-        char* args[]={""};
+        char* args[]={NULL};
 
-        SysCreateProcess("/Applications/Burn", fds, args);
+        pid=SysCreateProcess("/Applications/Burn", NULL, args);
+
+        SysWaitForProcessFinish(pid, NULL);
+
         return 0;
 }