Changeset b50b5af2 in mainline for boot/arch/ppc32/loader/main.h

Timestamp:

2009-08-22T10:48:00Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

04803bf

Parents:

1ea99cc (diff), a71c158 (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/ppc32/loader/main.h (modified) (3 diffs)

boot/arch/ppc32/loader/main.h

@@ -30 +30 @@
 #define BOOT_ppc32_MAIN_H_
 
-#include "ofw.h"
+#include <ofw.h>
+#include <ofw_tree.h>
+#include <balloc.h>
+#include <types.h>
 
-#define TASKMAP_MAX_RECORDS 32
+#define TASKMAP_MAX_RECORDS  32
 
 /** Size of buffer for storing task name in task_t. */
-#define BOOTINFO_TASK_NAME_BUFLEN 32
+#define BOOTINFO_TASK_NAME_BUFLEN  32
 
-/** Struct holding information about single loaded task. */
 typedef struct {
-        /** Address where the task was placed. */
         void *addr;
-        /** Size of the task's binary. */
-        unsigned int size;
-        /** Task name. */
+        uint32_t size;
         char name[BOOTINFO_TASK_NAME_BUFLEN];
 } task_t;
 
 typedef struct {
-        unsigned int count;
+        uint32_t count;
         task_t tasks[TASKMAP_MAX_RECORDS];
 } taskmap_t;
@@ -55 +54 @@
         memmap_t memmap;
         taskmap_t taskmap;
-        screen_t screen;
-        macio_t macio;
+        ballocs_t ballocs;
+        ofw_tree_node_t *ofw_root;
 } bootinfo_t;
 
@@ -62 +61 @@
 extern void bootstrap(void);
 
-extern memmap_t memmap;
-
 #endif