Changeset d900699 in mainline for uspace/lib/c/include/ipc/kbdev.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/kbdev.h (moved) (moved from uspace/lib/c/include/ipc/kbd.h ) (4 diffs)

uspace/lib/c/include/ipc/kbdev.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
  * @{
  */
@@ -35 +33 @@
  */
 
-#ifndef LIBC_IPC_KBD_H_
-#define LIBC_IPC_KBD_H_
+#ifndef LIBC_IPC_KBDEV_H_
+#define LIBC_IPC_KBDEV_H_
 
 #include <ipc/common.h>
@@ -42 +40 @@
 
 typedef enum {
-        KBD_YIELD = DEV_FIRST_CUSTOM_METHOD,
-        KBD_RECLAIM
-} kbd_request_t;
+        KBDEV_YIELD = DEV_FIRST_CUSTOM_METHOD,
+        KBDEV_RECLAIM,
+        KBDEV_SET_IND
+} kbdev_request_t;
 
 typedef enum {
-        KBD_EVENT = IPC_FIRST_USER_METHOD
-} kbd_notif_t;
+        KBDEV_EVENT = IPC_FIRST_USER_METHOD
+} kbdev_notif_t;
 
 #endif