Changeset 058b021 in mainline

Timestamp:

2006-11-30T13:43:00Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

c55dd58

Parents:

0cf1dcf

Message:

rd work

Location:

kernel/generic

Files:

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

kernel/generic/include/byteorder.h

@@ -42 +42 @@
                 ((n & 0xff0000) << 24) |
                 ((n & 0xff000000LL) << 8) |
-                ((n & 0xff00000000LL) >>8) |
+                ((n & 0xff00000000LL) >> 8) |
                 ((n & 0xff0000000000LL) >> 24) |
                 ((n & 0xff000000000000LL) >> 40) |

kernel/generic/include/lib/rd.h

@@ -36 +36 @@
 #define KERN_RD_H_
 
+#include <arch/types.h>
 #include <typedefs.h>
 
-extern bool init_rd(void * addr);
+/**
+ * RAM disk version
+ */
+#define RD_VERSION      0
+
+/**
+ * RAM disk magic number
+ */
+#define RD_MAGIC_SIZE   4
+#define RD_MAG0                 'H'
+#define RD_MAG1                 'O'
+#define RD_MAG2                 'R'
+#define RD_MAG3                 'D'
+
+/**
+ * RAM disk data encoding types
+ */
+#define RD_DATA_NONE    0
+#define RD_DATA_LSB             1               /* Least significant byte first (little endian) */
+#define RD_DATA_MSB             2               /* Most signigicant byte first (big endian) */
+
+/**
+ * RAM disk error return codes
+ */
+#define RE_OK                   0       /* No error */
+#define RE_INVALID              1       /* Invalid RAM disk image */
+#define RE_UNSUPPORTED          2       /* Non-supported image (e.g. wrong version) */
+
+/** RAM disk header */
+typedef struct {
+        uint8_t magic[RD_MAGIC_SIZE];
+        uint8_t version;
+        uint8_t data_type;
+        uint32_t header_size;
+        uint64_t data_size;
+} rd_header;
+
+extern int init_rd(rd_header * addr);
 
 #endif

kernel/generic/src/lib/rd.c

@@ -39 +39 @@
 
 #include <lib/rd.h>
+#include <arch/byteorder.h>
 
-bool init_rd(void * addr)
+int init_rd(rd_header * header)
 {
-        return false;
+        /* Identify RAM disk */
+        if ((header->magic[0] != RD_MAG0) || (header->magic[1] != RD_MAG1) || (header->magic[2] != RD_MAG2) || (header->magic[3] != RD_MAG3))
+                return RE_INVALID;
+        
+        /* Identify version */  
+        if (header->version != RD_VERSION)
+                return RE_UNSUPPORTED;
+        
+        uint64_t hsize;
+        switch (header->data_type) {
+        case RD_DATA_LSB:
+                hsize = uint64_t_le2host(header->header_size);
+                break;
+//      case RD_DATA_MSB:
+//              hsize = uint64_t_be2host(header->header_size);
+//              break;
+        default:
+                return RE_UNSUPPORTED;
+        }
+                
+
+        return RE_OK;
 }
 

kernel/generic/src/main/kinit.c

@@ -181 +181 @@
                                 ipc_phone_0 = &utask->answerbox;
                 } else {
-                        bool rd = init_rd((void *) init.tasks[i].addr);
+                        int rd = init_rd((void *) init.tasks[i].addr);
                         
-                        if (!rd)
+                        if (rd != RE_OK)
                                 printf("Init binary %zd not used.\n", i);
                 }