Changeset 7c34822e in mainline for kernel

Timestamp:

2006-11-30T15:38:45Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

7bf7ef7

Parents:

8c19cf28

Message:

update rd

Location:

kernel/generic

Files:

• include/lib/rd.h (modified) (1 diff)
• src/lib/rd.c (modified) (2 diffs)
• src/main/kinit.c (modified) (1 diff)

kernel/generic/include/lib/rd.h

@@ -76 +76 @@
 } rd_header;
 
-extern int init_rd(rd_header * addr);
+extern int init_rd(rd_header * addr, size_t size);
 
 #endif

kernel/generic/src/lib/rd.c

@@ -40 +40 @@
 #include <lib/rd.h>
 #include <arch/byteorder.h>
+#include <mm/frame.h>
+#include <sysinfo/sysinfo.h>
 
-int init_rd(rd_header * header)
+int init_rd(rd_header * header, size_t size)
 {
         /* Identify RAM disk */
@@ -51 +53 @@
                 return RE_UNSUPPORTED;
         
-        uint64_t hsize;
+        uint32_t hsize;
+        uint64_t dsize;
         switch (header->data_type) {
         case RD_DATA_LSB:
-                hsize = uint64_t_le2host(header->header_size);
+                hsize = uint32_t_le2host(header->header_size);
+                dsize = uint64_t_le2host(header->data_size);
                 break;
-//      case RD_DATA_MSB:
-//              hsize = uint64_t_be2host(header->header_size);
-//              break;
+        case RD_DATA_MSB:
+                hsize = uint32_t_be2host(header->header_size);
+                dsize = uint64_t_le2host(header->data_size);
+                break;
         default:
                 return RE_UNSUPPORTED;
         }
-                
+        
+        if ((hsize % FRAME_SIZE) || (dsize % FRAME_SIZE))
+                return RE_UNSUPPORTED;
+        
+        if (hsize > size)
+                return RE_INVALID;
+        
+        if ((uint64_t) hsize + dsize > size)
+                dsize = size - hsize;
+        
+        sysinfo_set_item_val("rd", NULL, true);
+        sysinfo_set_item_val("rd.size", NULL, dsize);
+        sysinfo_set_item_val("rd.address.physical", NULL, (unative_t) KA2PA((void *) header + hsize));
 
         return RE_OK;

kernel/generic/src/main/kinit.c

@@ -181 +181 @@
                                 ipc_phone_0 = &utask->answerbox;
                 } else {
-                        int rd = init_rd((void *) init.tasks[i].addr);
+                        int rd = init_rd((rd_header *) init.tasks[i].addr, init.tasks[i].size);
                         
                         if (rd != RE_OK)