Changeset 6843a9c in mainline for kernel/generic/include/lib/rd.h

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

Trivial conflicts.

File:

• kernel/generic/include/lib/rd.h (modified) (1 diff)

kernel/generic/include/lib/rd.h

@@ -38 +38 @@
 #include <typedefs.h>
 
-/**
- * RAM disk version
- */
-#define RD_VERSION      1
-
-/**
- * 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 */
-struct rd_header {
-        uint8_t magic[RD_MAGIC_SIZE];
-        uint8_t version;
-        uint8_t data_type;
-        uint32_t header_size;
-        uint64_t data_size;
-} __attribute__ ((packed));
-
-typedef struct rd_header rd_header_t;
-
-extern int init_rd(rd_header_t *addr, size_t size);
+extern void init_rd(void *, size_t);
 
 #endif