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

Timestamp:

2011-06-17T16:48:53Z (14 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

f3a605be

Parents:

df8110d3 (diff), 98caf49 (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/srv/hid/kbd/include/kbd_ctl.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 kbdgen generic
- * @brief       HelenOS generic uspace keyboard handler.
- * @ingroup  kbd
+/** @addtogroup libcipc
  * @{
- */ 
+ */
 /** @file
  */
 
-#ifndef KBD_CTL_H_
-#define KBD_CTL_H_
+#ifndef LIBC_IPC_INPUT_H_
+#define LIBC_IPC_INPUT_H_
 
-extern void kbd_ctl_parse_scancode(int);
-extern int kbd_ctl_init(void);
-extern void kbd_ctl_set_ind(unsigned);
+#include <ipc/common.h>
+
+typedef enum {
+        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
@@ -46 +53 @@
 /**
  * @}
- */ 
-
+ */