Changeset da68871a in mainline for uspace/drv/bus/usb/usbhid/kbd/kbddev.h

Timestamp:

2012-08-08T08:46:22Z (13 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

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

Children:

30c0826

Parents:

bc216a0 (diff), 1d01cca (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:

Merged changes from mainline.

File:

• uspace/drv/bus/usb/usbhid/kbd/kbddev.h (modified) (4 diffs)

uspace/drv/bus/usb/usbhid/kbd/kbddev.h

@@ -50 +50 @@
 struct usb_hid_dev;
 
-/*----------------------------------------------------------------------------*/
+
 /**
  * USB/HID keyboard device type.
@@ -82 +82 @@
         unsigned lock_keys;
 
-        /** IPC session to the console device (for sending key events). */
-        async_sess_t *console_sess;
-
-        /** @todo What is this actually? */
-        ddf_dev_ops_t ops;
+        /** IPC session to client (for sending key events). */
+        async_sess_t *client_sess;
 
         /** Information for auto-repeat of keys. */
@@ -116 +113 @@
 } usb_kbd_t;
 
-/*----------------------------------------------------------------------------*/
+
 
 extern const usb_endpoint_description_t usb_hid_kbd_poll_endpoint_description;
@@ -123 +120 @@
 const char *HID_KBD_CLASS_NAME;
 
-/*----------------------------------------------------------------------------*/
+
 
 int usb_kbd_init(struct usb_hid_dev *hid_dev, void **data);