Changeset b4b534ac in mainline for uspace/drv/bus/usb/usbhid/blink1/blink1.c

Timestamp:

2016-07-22T08:24:47Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f76d2c2

Parents:

5b18137 (diff), 8351f9a4 (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 from lp:~jan.vesely/helenos/usb

File:

• uspace/drv/bus/usb/usbhid/blink1/blink1.c (modified) (3 diffs)

uspace/drv/bus/usb/usbhid/blink1/blink1.c

@@ -35 +35 @@
  */
 
+#include <errno.h>
 #include <str_error.h>
 #include <usb/debug.h>
@@ -78 +79 @@
         report.arg5 = 0;
         
-        return usbhid_req_set_report(&blink1_dev->hid_dev->usb_dev->ctrl_pipe,
-            blink1_dev->hid_dev->usb_dev->interface_no, USB_HID_REPORT_TYPE_FEATURE,
-            (uint8_t *) &report, sizeof(report));
+        return usbhid_req_set_report(
+            usb_device_get_default_pipe(blink1_dev->hid_dev->usb_dev),
+            usb_device_get_iface_number(blink1_dev->hid_dev->usb_dev),
+            USB_HID_REPORT_TYPE_FEATURE, (uint8_t *) &report, sizeof(report));
 }
 
@@ -100 +102 @@
         
         /* Create the exposed function. */
-        ddf_fun_t *fun = ddf_fun_create(hid_dev->usb_dev->ddf_dev, fun_exposed,
-            HID_BLINK1_FUN_NAME);
+        ddf_fun_t *fun = usb_device_ddf_fun_create(hid_dev->usb_dev,
+            fun_exposed, HID_BLINK1_FUN_NAME);
         if (fun == NULL) {
                 usb_log_error("Could not create DDF function node `%s'.\n",