Changeset ff3a34b in mainline

Timestamp:

2007-06-01T14:15:42Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

ea7890e7

Parents:

60133d0

Message:

initial merge of branches/fs
(not finished, huge cleanup is needed)

Files:

• kernel/doc/AUTHORS (modified) (1 diff)
• kernel/generic/include/errno.h (modified) (1 diff)
• kernel/generic/include/lib/rd.h (modified) (1 diff)
• kernel/generic/src/lib/rd.c (modified) (4 diffs)
• kernel/generic/src/main/kinit.c (modified) (2 diffs)
• uspace/libc/generic/io/file.c (added)
• uspace/libc/include/io/file.h (added)
• uspace/libc/include/ipc/services.h (modified) (1 diff)
• uspace/rd/rd.c (modified) (5 diffs)
• uspace/rd/rd.h (added)

kernel/doc/AUTHORS

@@ -5 +5 @@
 Josef Cejka <cejka@helenos.eu>
 Sergey Bondari <bondari@helenos.eu>
+Michal Konopa <mkonopa@seznam.cz>
 

kernel/generic/include/errno.h

@@ -38 +38 @@
 /* 1-255 are kernel error codes, 256-512 are user error codes */
 
+#define EOK                     0       /* No error */
 #define ENOENT          -1      /* No such entry */
 #define ENOMEM          -2      /* Not enough memory */

kernel/generic/include/lib/rd.h

@@ -41 +41 @@
  * RAM disk version
  */
-#define RD_VERSION      0
+#define RD_VERSION      1
 
 /**

kernel/generic/src/lib/rd.c

@@ -43 +43 @@
 #include <sysinfo/sysinfo.h>
 #include <ddi/ddi.h>
+#include <print.h>
+#include <align.h>
 
 static parea_t rd_parea;                /**< Physical memory area for rd. */
 
+/**
+ * RAM disk initialization routine. At this point, the RAM disk memory is shared
+ * and information about the share is provided as sysinfo values to the userspace
+ * tasks.
+ */  
 int init_rd(rd_header * header, size_t size)
 {
@@ -75 +82 @@
                 return RE_UNSUPPORTED;
         
+        if (dsize % FRAME_SIZE)
+                return RE_UNSUPPORTED;
+
         if (hsize > size)
                 return RE_INVALID;
@@ -81 +91 @@
                 dsize = size - hsize;
         
-        rd_parea.pbase = KA2PA((void *) header + hsize);
+        rd_parea.pbase = ALIGN_DOWN((uintptr_t) KA2PA((void *) header + hsize), FRAME_SIZE);
         rd_parea.vbase = (uintptr_t) ((void *) header + hsize);
         rd_parea.frames = SIZE2FRAMES(dsize);
@@ -88 +98 @@
 
         sysinfo_set_item_val("rd", NULL, true);
+        sysinfo_set_item_val("rd.header_size", NULL, hsize);    
         sysinfo_set_item_val("rd.size", NULL, dsize);
         sysinfo_set_item_val("rd.address.physical", NULL, (unative_t)

kernel/generic/src/main/kinit.c

@@ -168 +168 @@
                 task_t *utask = task_run_program((void *) init.tasks[i].addr,
                     "uspace");
+                
                 if (utask) {
                         /*
@@ -182 +183 @@
                         
                         if (rd != RE_OK)
-                                printf("Init binary %zd not used.\n", i);
+                                printf("Init binary %zd not used, error code %d.\n", i, rd);
                 }
         }

uspace/libc/include/ipc/services.h

@@ -43 +43 @@
 #define SERVICE_CONSOLE         4
 #define SERVICE_RD              5
+#define SERVICE_FS              6
 
 /* Memory area to be received from NS */

uspace/rd/rd.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Martin Decky
+ * Copyright (c) 2007 Michal Konopa
+ * Copyright (c) 2007 Martin Jelen
+ * Copyright (c) 2007 Peter Majer
  * All rights reserved.
  *
@@ -46 +48 @@
 #include <errno.h>
 #include <async.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <align.h>
+#include <async.h>
+#include <ddi.h>
+#include <libarch/ddi.h>
+#include <stdio.h> 
+#include "rd.h"
 
+static void *rd_addr;
+static void *fs_addr;
 
 static void rd_connection(ipc_callid_t iid, ipc_call_t *icall)
@@ -55 +67 @@
 
         ipc_answer_fast(iid, 0, 0, 0);
+        ipcarg_t offset;
 
         while (1) {
                 callid = async_get_call(&call);
                 switch (IPC_GET_METHOD(call)) {
-                case IPC_M_PHONE_HUNGUP:
-                        ipc_answer_fast(callid, 0,0,0);
-                        return;
-                default:
-                        retval = EINVAL;
+                        case IPC_M_PHONE_HUNGUP:
+                                ipc_answer_fast(callid, 0,0,0);
+                                return;
+                        case IPC_M_AS_AREA_SEND:
+                                ipc_answer_fast(callid, 0, (uintptr_t)fs_addr, 0);
+                                continue;
+                        case RD_READ_BLOCK:                     
+                                offset = IPC_GET_ARG1(call);
+                                memcpy((void *)fs_addr, rd_addr+offset, BLOCK_SIZE);
+                                retval = EOK;
+                                break;
+                        default:
+                                retval = EINVAL;
                 }
                 ipc_answer_fast(callid, retval, 0, 0);
@@ -72 +93 @@
 static bool rd_init(void)
 {
+        int retval, flags;
+
         size_t rd_size = sysinfo_value("rd.size");
         void * rd_ph_addr = (void *) sysinfo_value("rd.address.physical");
@@ -78 +101 @@
                 return false;
         
-        void * rd_addr = as_get_mappable_page(rd_size);
+        rd_addr = as_get_mappable_page(rd_size);
         
-        physmem_map(rd_ph_addr, rd_addr, ALIGN_UP(rd_size, PAGE_SIZE) >> PAGE_WIDTH, AS_AREA_READ | AS_AREA_WRITE);
+        flags = AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE;
+        retval = physmem_map(rd_ph_addr, rd_addr, ALIGN_UP(rd_size, PAGE_SIZE) >> PAGE_WIDTH, flags);
+
+        if (retval < 0)
+                return false;
         
+        size_t fs_size = ALIGN_UP(BLOCK_SIZE * sizeof(char), PAGE_SIZE);
+        fs_addr = as_get_mappable_page(fs_size);
+
         return true;
 }
-
 
 int main(int argc, char **argv)