Changeset 46c20c8 in mainline for boot/arch/mips32/include/types.h

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (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.

File:

• boot/arch/mips32/include/types.h (moved) (moved from boot/arch/arm32/loader/types.h ) (1 diff)

boot/arch/mips32/include/types.h

@@ -27 +27 @@
  */
 
+#ifndef BOOT_mips32_TYPES_H_
+#define BOOT_mips32_TYPES_H_
 
-/** @addtogroup arm32boot
- * @{
- */
-/** @file 
- *  @brief Definitions of basic types like #uintptr_t.
- */ 
+#define TASKMAP_MAX_RECORDS        32
+#define CPUMAP_MAX_RECORDS         32
+#define BOOTINFO_TASK_NAME_BUFLEN  32
 
+typedef uint32_t size_t;
+typedef uint32_t uintptr_t;
 
-#ifndef BOOT_arm32_TYPES_H
-#define BOOT_arm32_TYPES_H
+typedef struct {
+        /** Address where the task was placed. */
+        void *addr;
+        /** Size of the task's binary. */
+        size_t size;
+        /** Task name. */
+        char name[BOOTINFO_TASK_NAME_BUFLEN];
+} task_t;
 
-
-#include <gentypes.h>
-
-typedef signed char int8_t;
-
-typedef unsigned char uint8_t;
-typedef unsigned short uint16_t;
-typedef unsigned int uint32_t;
-typedef unsigned long long uint64_t;
-
-typedef uint32_t uintptr_t;
-typedef uint32_t unative_t;
-
+typedef struct {
+        uint32_t cpumap;
+        size_t cnt;
+        task_t tasks[TASKMAP_MAX_RECORDS];
+} bootinfo_t;
 
 #endif
-
-
-/** @}
- */