Changeset d8b275d in mainline for uspace/drv/usbhid/kbd/kbddev.c

Timestamp:

2011-04-14T08:24:29Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

5e07e2b5

Parents:

3f2af64 (diff), 34e8bab (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 development/ changes

File:

• uspace/drv/usbhid/kbd/kbddev.c (modified) (3 diffs)

uspace/drv/usbhid/kbd/kbddev.c

@@ -238 +238 @@
  * @param icall Call data.
  */
-void default_connection_handler(ddf_fun_t *fun,
+static void default_connection_handler(ddf_fun_t *fun,
     ipc_callid_t icallid, ipc_call_t *icall)
 {
@@ -856 +856 @@
 /*----------------------------------------------------------------------------*/
 
-bool usb_kbd_polling_callback(usb_device_t *dev, uint8_t *buffer,
-     size_t buffer_size, void *arg)
-{
-        if (dev == NULL || buffer == NULL || arg == NULL) {
+bool usb_kbd_polling_callback(usb_hid_dev_t *hid_dev, uint8_t *buffer,
+     size_t buffer_size)
+{
+        if (hid_dev == NULL || buffer == NULL) {
                 // do not continue polling (???)
                 return false;
         }
-        
-        usb_hid_dev_t *hid_dev = (usb_hid_dev_t *)arg;
         
         // TODO: add return value from this function
@@ -916 +914 @@
 /*----------------------------------------------------------------------------*/
 
-void usb_kbd_deinit(struct usb_hid_dev_t *hid_dev)
+void usb_kbd_deinit(usb_hid_dev_t *hid_dev)
 {
         if (hid_dev == NULL) {