Changeset 26e7d6d in mainline for kernel/arch/mips64/include/arch.h

Timestamp:

2011-09-19T16:31:00Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a347a11

Parents:

3842a955 (diff), 086290d (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 uspace/lib/c/include/devman_obsolete.h ) (3 diffs)

kernel/arch/mips64/include/arch.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Jiri Svoboda
- * Copyright (c) 2010 Lenka Trochtova 
+ * Copyright (c) 2005 Martin Decky
  * All rights reserved.
  *
@@ -28 +27 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup mips64
  * @{
  */
@@ -34 +33 @@
  */
 
-#ifndef LIBC_DEVMAN_OBSOLETE_H_
-#define LIBC_DEVMAN_OBSOLETE_H_
+#ifndef KERN_mips64_ARCH_H_
+#define KERN_mips64_ARCH_H_
 
-#include <ipc/devman.h>
-#include <async.h>
-#include <bool.h>
+#include <typedefs.h>
 
-extern int devman_obsolete_get_phone(devman_interface_t, unsigned int);
-extern void devman_obsolete_hangup_phone(devman_interface_t);
+#define TASKMAP_MAX_RECORDS        32
+#define CPUMAP_MAX_RECORDS         32
+#define BOOTINFO_TASK_NAME_BUFLEN  32
 
-extern int devman_obsolete_device_connect(devman_handle_t, unsigned int);
-extern int devman_obsolete_parent_device_connect(devman_handle_t, unsigned int);
+extern size_t cpu_count;
+
+typedef struct {
+        void *addr;
+        size_t size;
+        char name[BOOTINFO_TASK_NAME_BUFLEN];
+} utask_t;
+
+typedef struct {
+        uint32_t cpumap;
+        size_t cnt;
+        utask_t tasks[TASKMAP_MAX_RECORDS];
+} bootinfo_t;
+
+extern void arch_pre_main(void *entry, bootinfo_t *bootinfo);
 
 #endif