Changeset 26e7d6d in mainline for uspace/srv/hid/input/include/kbd_ctl.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:

• uspace/srv/hid/input/include/kbd_ctl.h (modified) (3 diffs)

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

@@ -28 +28 @@
 
 /** @addtogroup inputgen generic
- * @brief       Keyboard controller driver interface.
- * @ingroup  input
+ * @brief Keyboard controller driver interface.
+ * @ingroup input
  * @{
  */
@@ -43 +43 @@
 
 typedef struct kbd_ctl_ops {
-        void (*parse_scancode)(int);
+        void (*parse)(sysarg_t);
         int (*init)(struct kbd_dev *);
-        void (*set_ind)(struct kbd_dev *, unsigned);
+        void (*set_ind)(struct kbd_dev *, unsigned int);
 } kbd_ctl_ops_t;
 
@@ -59 +59 @@
 /**
  * @}
- */ 
-
+ */