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

Timestamp:

2011-09-04T11:30:58Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

03bc76a

Parents:

d2c67e7 (diff), deac215e (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/drv/bus/usb/usbhid/kbd/kbddev.h (moved) (moved from uspace/drv/usbhid/kbd/kbddev.h ) (3 diffs)

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

@@ -65 +65 @@
  */
 typedef struct usb_kbd_t {
+        /** Link to HID device structure */
+        struct usb_hid_dev *hid_dev;
+
         /** Previously pressed keys (not translated to key codes). */
         int32_t *keys_old;
@@ -122 +125 @@
 int usb_kbd_init(struct usb_hid_dev *hid_dev, void **data);
 
-bool usb_kbd_polling_callback(struct usb_hid_dev *hid_dev, void *data, 
-                              uint8_t *buffer, size_t buffer_size);
+bool usb_kbd_polling_callback(struct usb_hid_dev *hid_dev, void *data);
 
 int usb_kbd_is_initialized(const usb_kbd_t *kbd_dev);
@@ -129 +131 @@
 int usb_kbd_is_ready_to_destroy(const usb_kbd_t *kbd_dev);
 
-void usb_kbd_free(usb_kbd_t **kbd_dev);
+void usb_kbd_destroy(usb_kbd_t *kbd_dev);
 
 void usb_kbd_push_ev(struct usb_hid_dev *hid_dev, usb_kbd_t *kbd_dev,