Changeset 228b135 in mainline

Timestamp:

2006-11-28T10:55:43Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

d4b5542

Parents:

22f851e

Message:

start RAM disk support

Files:

• kernel/Makefile (modified) (1 diff)
• kernel/generic/include/mm/rd.h (added)
• kernel/generic/src/main/kinit.c (modified) (3 diffs)
• kernel/generic/src/main/main.c (modified) (1 diff)
• kernel/generic/src/mm/rd.c (added)
• uspace/Makefile (modified) (1 diff)
• uspace/libc/include/ipc/services.h (modified) (1 diff)
• uspace/rd/Makefile (added)
• uspace/rd/rd.c (added)

kernel/Makefile

@@ -178 +178 @@
         generic/src/mm/backend_phys.c \
         generic/src/mm/slab.c \
+        generic/src/mm/rd.c \
         generic/src/lib/func.c \
         generic/src/lib/memstr.c \

kernel/generic/src/main/kinit.c

@@ -62 +62 @@
 #include <console/kconsole.h>
 #include <security/cap.h>
+#include <mm/rd.h>
 
 #ifdef CONFIG_SMP
@@ -159 +160 @@
 #else  /* CONFIG_TEST */
 
-        task_t *utask;
         count_t i;
         for (i = 0; i < init.cnt; i++) {
                 /*
-                 * Run user tasks.
+                 * Run user tasks, load RAM disk images.
                  */
                 
-                if (init.tasks[i].addr % FRAME_SIZE)
-                        panic("init[%d].addr is not frame aligned", i);
-
-                utask = task_run_program((void *) init.tasks[i].addr, "USPACE");
+                if (init.tasks[i].addr % FRAME_SIZE) {
+                        printf("init[%d].addr is not frame aligned", i);
+                        continue;
+                }
+
+                task_t *utask = task_run_program((void *) init.tasks[i].addr, "USPACE");
                 if (utask) {
                         /*
@@ -178 +180 @@
                         if (!ipc_phone_0) 
                                 ipc_phone_0 = &utask->answerbox;
-                } else
-                        printf("Init task %zd not started.\n", i);
+                } else {
+                        bool rd = init_rd((void *) init.tasks[i].addr);
+                        
+                        if (!rd)
+                                printf("Init binary %zd not used.\n", i);
+                }
         }
 

kernel/generic/src/main/main.c

@@ -235 +235 @@
                         printf("init[%zd].addr=%.*p, init[%zd].size=%zd\n", i, sizeof(uintptr_t) * 2, init.tasks[i].addr, i, init.tasks[i].size);
         } else
-                printf("No init tasks found\n");
+                printf("No init binaries found\n");
         
         ipc_init();

uspace/Makefile

@@ -43 +43 @@
         tetris \
         ipcc \
-        klog
+        klog \
+        rd
 
 ifeq ($(ARCH), amd64)

uspace/libc/include/ipc/services.h

@@ -42 +42 @@
 #define SERVICE_VIDEO           3
 #define SERVICE_CONSOLE         4
+#define SERVICE_RD              5
 
 /* Memory area to be received from NS */