Changeset 662da50 in mainline for uspace/drv/usbhid/kbd/kbddev.h

Timestamp:

2011-06-16T10:21:33Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

d022500

Parents:

854eddd6 (diff), bbfa425 (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 last-minute USB changes

File:

• uspace/drv/usbhid/kbd/kbddev.h (modified) (1 diff)

uspace/drv/usbhid/kbd/kbddev.h

@@ -125 +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/*, 
+                              uint8_t *buffer, size_t buffer_size*/);
 
 int usb_kbd_is_initialized(const usb_kbd_t *kbd_dev);