Changeset 6387c18 in mainline

Timestamp:

2008-05-30T14:54:33Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

8c7294c6

Parents:

afb1e35

Message:

fix kernel ramdisk support

Location:

kernel/generic

Files:

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

kernel/generic/include/lib/rd.h

@@ -67 +67 @@
 
 /** RAM disk header */
-typedef struct {
+struct rd_header {
         uint8_t magic[RD_MAGIC_SIZE];
         uint8_t version;
@@ -73 +73 @@
         uint32_t header_size;
         uint64_t data_size;
-} rd_header;
+} __attribute__ ((packed));
 
-extern int init_rd(rd_header * addr, size_t size);
+typedef struct rd_header rd_header_t;
+
+extern int init_rd(rd_header_t *addr, size_t size);
 
 #endif

kernel/generic/src/lib/rd.c

@@ -43 +43 @@
 #include <sysinfo/sysinfo.h>
 #include <ddi/ddi.h>
-#include <print.h>
 #include <align.h>
 
@@ -53 +52 @@
  * tasks.
  */  
-int init_rd(rd_header * header, size_t size)
+int init_rd(rd_header_t *header, size_t size)
 {
         /* Identify RAM disk */
@@ -81 +80 @@
         if ((hsize % FRAME_SIZE) || (dsize % FRAME_SIZE))
                 return RE_UNSUPPORTED;
-        
-        if (dsize % FRAME_SIZE)
-                return RE_UNSUPPORTED;
-
+                
         if (hsize > size)
                 return RE_INVALID;

kernel/generic/src/main/kinit.c

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