Changeset e4f8c77 in mainline for kernel/arch/mips64/include/arch.h

Timestamp:

2011-07-13T22:39:18Z (14 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

e6910c8

Parents:

5974661 (diff), 8ecef91 (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 libposix.

File:

• kernel/arch/mips64/include/arch.h (moved) (moved from uspace/srv/hid/kbd/include/layout.h ) (3 diffs)

kernel/arch/mips64/include/arch.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Jiri Svoboda
+ * Copyright (c) 2005 Martin Decky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup kbdgen generic
- * @brief HelenOS generic uspace keyboard handler.
- * @ingroup kbd
+/** @addtogroup mips64
  * @{
  */
@@ -35 +33 @@
  */
 
-#ifndef KBD_LAYOUT_H_
-#define KBD_LAYOUT_H_
+#ifndef KERN_mips64_ARCH_H_
+#define KERN_mips64_ARCH_H_
 
-#include <sys/types.h>
-#include <io/console.h>
+#include <typedefs.h>
+
+#define TASKMAP_MAX_RECORDS        32
+#define CPUMAP_MAX_RECORDS         32
+#define BOOTINFO_TASK_NAME_BUFLEN  32
+
+extern size_t cpu_count;
 
 typedef struct {
-        void (*reset)(void);
-        wchar_t (*parse_ev)(kbd_event_t *);
-} layout_op_t;
+        void *addr;
+        size_t size;
+        char name[BOOTINFO_TASK_NAME_BUFLEN];
+} utask_t;
 
-extern layout_op_t us_qwerty_op;
-extern layout_op_t us_dvorak_op;
-extern layout_op_t cz_op;
+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
 
-/**
- * @}
+/** @}
  */