Changeset 25a76ab8 in mainline for boot/arch/arm32/include/types.h

Timestamp:

2010-05-08T07:53:23Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

051bc69a

Parents:

6c39a907 (diff), 1317380 (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/arm32/include/types.h (moved) (moved from boot/arch/ppc32/loader/main.h ) (2 diffs)

boot/arch/arm32/include/types.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2005 Martin Decky
+ * Copyright (c) 2006 Martin Decky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-#ifndef BOOT_ppc32_MAIN_H_
-#define BOOT_ppc32_MAIN_H_
+/** @addtogroup arm32boot
+ * @{
+ */
+/** @file
+ * @brief Definitions of basic types like #uintptr_t.
+ */
 
-#include <ofw.h>
-#include <ofw_tree.h>
-#include <balloc.h>
-#include <types.h>
+#ifndef BOOT_arm32_TYPES_H
+#define BOOT_arm32_TYPES_H
 
-#define TASKMAP_MAX_RECORDS  32
-
-/** Size of buffer for storing task name in task_t. */
+#define TASKMAP_MAX_RECORDS        32
 #define BOOTINFO_TASK_NAME_BUFLEN  32
 
+typedef uint32_t size_t;
+typedef uint32_t uintptr_t;
+
+typedef uint32_t pfn_t;
+
 typedef struct {
+        /** Address where the task was placed. */
         void *addr;
-        uint32_t size;
+        /** Size of the task's binary. */
+        size_t size;
+        /** Task name. */
         char name[BOOTINFO_TASK_NAME_BUFLEN];
 } task_t;
 
 typedef struct {
-        uint32_t count;
+        size_t cnt;
         task_t tasks[TASKMAP_MAX_RECORDS];
-} taskmap_t;
-
-typedef struct {
-        memmap_t memmap;
-        taskmap_t taskmap;
-        ballocs_t ballocs;
-        ofw_tree_node_t *ofw_root;
 } bootinfo_t;
 
-extern void start(void);
-extern void bootstrap(void);
+#endif
 
-#endif
+/** @}
+ */