Changeset f1fae414 in mainline for uspace/lib/c/include/ipc/input.h

Timestamp:

2011-06-22T01:34:53Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

8d7e82c1, cac458f

Parents:

72ec8cc (diff), bf172825 (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:

• uspace/lib/c/include/ipc/input.h (moved) (moved from uspace/lib/c/include/ipc/mouse.h ) (3 diffs)

uspace/lib/c/include/ipc/input.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Jiri Svoboda
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup mouse
- * @brief
+/** @addtogroup libcipc
  * @{
  */
@@ -34 +33 @@
  */
 
-#ifndef LIBC_IPC_MOUSE_H_
-#define LIBC_IPC_MOUSE_H_
+#ifndef LIBC_IPC_INPUT_H_
+#define LIBC_IPC_INPUT_H_
 
 #include <ipc/common.h>
 
 typedef enum {
-        MEVENT_BUTTON = IPC_FIRST_USER_METHOD,
-        MEVENT_MOVE
-} mouse_notif_t;
+        INPUT_YIELD = IPC_FIRST_USER_METHOD,
+        INPUT_RECLAIM
+} input_request_t;
+
+typedef enum {
+        INPUT_EVENT_KEY = IPC_FIRST_USER_METHOD,
+        INPUT_EVENT_MOVE,
+        INPUT_EVENT_BUTTON
+} input_notif_t;
 
 #endif