Changeset 25a76ab8 in mainline for boot/arch/sparc64/include/main.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/sparc64/include/main.h (moved) (moved from boot/arch/mips32/loader/types.h ) (2 diffs)

boot/arch/sparc64/include/main.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Martin Decky
+ * Copyright (c) 2005 Martin Decky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-#ifndef BOOT_mips32_TYPES_H_
-#define BOOT_mips32_TYPES_H_
+#ifndef BOOT_sparc64_MAIN_H_
+#define BOOT_sparc64_MAIN_H_
 
-#include <gentypes.h>
+#include <typedefs.h>
+#include <balloc.h>
+#include <genarch/ofw_tree.h>
 
-typedef signed char int8_t;
+typedef struct {
+        uintptr_t physmem_start;
+        taskmap_t taskmap;
+        memmap_t memmap;
+        ballocs_t ballocs;
+        ofw_tree_node_t *ofw_root;
+} bootinfo_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;
+extern void bootstrap(void);
 
 #endif