Changeset 86ffa27f in mainline for kernel/arch/mips64/include/arch.h

Timestamp:

2011-08-07T11:21:44Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

cc574511

Parents:

15f3c3f (diff), e8067c0 (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:

• kernel/arch/mips64/include/arch.h (moved) (moved from kernel/genarch/include/ofw/fhc.h ) (2 diffs)

kernel/arch/mips64/include/arch.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Jakub Jermar
+ * Copyright (c) 2005 Martin Decky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-#ifndef KERN_FHC_H_
-#define KERN_FHC_H_
+/** @addtogroup mips64
+ * @{
+ */
+/** @file
+ */
 
-#include <genarch/ofw/ofw_tree.h>
-#include <typedefs.h>
-#include <ddi/irq.h>
+#ifndef KERN_mips64_ARCH_H_
+#define KERN_mips64_ARCH_H_
+
 #include <typedefs.h>
 
-typedef struct {
-        uint64_t addr;
-        uint32_t size;
-} __attribute__ ((packed)) ofw_fhc_reg_t;
+#define TASKMAP_MAX_RECORDS        32
+#define CPUMAP_MAX_RECORDS         32
+#define BOOTINFO_TASK_NAME_BUFLEN  32
+
+extern size_t cpu_count;
 
 typedef struct {
-        uint64_t child_base;
-        uint64_t parent_base;
-        uint32_t size;
-} __attribute__ ((packed)) ofw_fhc_range_t;
+        void *addr;
+        size_t size;
+        char name[BOOTINFO_TASK_NAME_BUFLEN];
+} utask_t;
 
 typedef struct {
-        uint64_t addr;
-        uint32_t size;
-} __attribute__ ((packed)) ofw_central_reg_t;
+        uint32_t cpumap;
+        size_t cnt;
+        utask_t tasks[TASKMAP_MAX_RECORDS];
+} bootinfo_t;
 
-typedef struct {
-        uint64_t child_base;
-        uint64_t parent_base;
-        uint32_t size;
-} __attribute__ ((packed)) ofw_central_range_t;
-
-extern bool ofw_fhc_apply_ranges(ofw_tree_node_t *, ofw_fhc_reg_t *,
-    uintptr_t *);
-extern bool ofw_central_apply_ranges(ofw_tree_node_t *, ofw_central_reg_t *,
-    uintptr_t *);
-
-extern bool ofw_fhc_map_interrupt(ofw_tree_node_t *, ofw_fhc_reg_t *,
-    uint32_t, int *, cir_t *, void **);
+extern void arch_pre_main(void *entry, bootinfo_t *bootinfo);
 
 #endif
+
+/** @}
+ */