Changeset f1fae414 in mainline for uspace/srv/hid/input/include/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/srv/hid/input/include/input.h (moved) (moved from uspace/srv/hid/kbd/include/kbd.h ) (3 diffs)

uspace/srv/hid/input/include/input.h

@@ -1 +1 @@
 /*
  * Copyright (c) 2006 Josef Cejka
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +28 @@
  */
 
-/** @addtogroup kbdgen generic
- * @brief HelenOS generic uspace keyboard handler.
- * @ingroup kbd
+/** @addtogroup inputgen generic
+ * @brief HelenOS input server.
+ * @ingroup input
  * @{
  */
@@ -35 +36 @@
  */
 
-#ifndef KBD_KBD_H_
-#define KBD_KBD_H_
+#ifndef INPUT_H_
+#define INPUT_H_
 
 #include <bool.h>
 
+#define NAME       "input"
+#define NAMESPACE  "hid"
+
 extern bool irc_service;
 extern int irc_phone;
-
-extern void kbd_push_scancode(int);
-extern void kbd_push_ev(int, unsigned int);
 
 #endif