Changeset 26e7d6d in mainline for kernel/arch/mips64/include/cpu.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/cpu.h (moved) (moved from uspace/lib/c/include/ipc/mouse.h ) (3 diffs)

kernel/arch/mips64/include/cpu.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Jiri Svoboda
+ * Copyright (c) 2003-2004 Jakub Jermar
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup mouse
- * @brief
+/** @addtogroup mips64
  * @{
  */
@@ -34 +33 @@
  */
 
-#ifndef LIBC_IPC_MOUSE_H_
-#define LIBC_IPC_MOUSE_H_
+#ifndef KERN_mips64_CPU_H_
+#define KERN_mips64_CPU_H_
 
-#include <ipc/common.h>
+#include <typedefs.h>
+#include <arch/asm.h>
 
-typedef enum {
-        MEVENT_BUTTON = IPC_FIRST_USER_METHOD,
-        MEVENT_MOVE
-} mouse_notif_t;
+typedef struct {
+        uint32_t imp_num;
+        uint32_t rev_num;
+} cpu_arch_t;
 
 #endif
 
-/**
- * @}
+/** @}
  */