Changeset c39e9fb in mainline for uspace/drv/bus/usb/usbhid

Timestamp:

2013-01-25T22:21:13Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

945d66c

Parents:

f6b2a76b

Message:

usb, drivers: Use usb_device_* wrappers.

Location:

uspace/drv/bus/usb/usbhid

Files:

• kbd/kbddev.c (modified) (3 diffs)
• main.c (modified) (4 diffs)
• mouse/mousedev.c (modified) (2 diffs)

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

@@ -270 +270 @@
                 0));
 
-        rc = usbhid_req_set_report(&hid_dev->usb_dev->ctrl_pipe,
+        rc = usbhid_req_set_report(
+            usb_device_get_default_pipe(hid_dev->usb_dev),
             hid_dev->usb_dev->interface_no, USB_HID_REPORT_TYPE_OUTPUT,
             kbd_dev->output_buffer, kbd_dev->output_size);
@@ -581 +582 @@
         usb_kbd_set_led(hid_dev, kbd_dev);
 
-        usbhid_req_set_idle(&hid_dev->usb_dev->ctrl_pipe,
+        usbhid_req_set_idle(usb_device_get_default_pipe(hid_dev->usb_dev),
             hid_dev->usb_dev->interface_no, IDLE_RATE);
 
@@ -786 +787 @@
         }
 
-        rc = usbhid_req_set_protocol(&hid_dev->usb_dev->ctrl_pipe,
+        rc = usbhid_req_set_protocol(
+            usb_device_get_default_pipe(hid_dev->usb_dev),
             hid_dev->usb_dev->interface_no, USB_HID_PROTOCOL_BOOT);
 

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

@@ -105 +105 @@
         if (rc != EOK) {
                 usb_log_error("Failed to start polling fibril for `%s'.\n",
-                    ddf_dev_get_name(dev->ddf_dev));
+                    usb_device_get_name(dev));
                 usb_hid_deinit(hid_dev);
                 return rc;
@@ -111 +111 @@
         hid_dev->running = true;
 
-        usb_log_info("HID device `%s' ready to use.\n",
-            ddf_dev_get_name(dev->ddf_dev));
+        usb_log_info("HID device `%s' ready.\n", usb_device_get_name(dev));
 
         return EOK;
@@ -139 +138 @@
 {
         assert(dev);
-        assert(dev->driver_data);
-        usb_hid_dev_t *hid_dev = dev->driver_data;
+        usb_hid_dev_t *hid_dev = usb_device_data_get(dev);
+        assert(hid_dev);
         unsigned tries = 100;
         /* Wait for fail. */
@@ -152 +151 @@
 
         usb_hid_deinit(hid_dev);
-        usb_log_debug2("%s destruction complete.\n", ddf_dev_get_name(dev->ddf_dev));
+        usb_log_debug2("%s destruction complete.\n", usb_device_get_name(dev));
         return EOK;
 }

uspace/drv/bus/usb/usbhid/mouse/mousedev.c

@@ -315 +315 @@
 
         // TODO: how to know if the device supports the request???
-        usbhid_req_set_idle(&hid_dev->usb_dev->ctrl_pipe,
+        usbhid_req_set_idle(usb_device_get_default_pipe(hid_dev->usb_dev),
             hid_dev->usb_dev->interface_no, IDLE_RATE);
         return EOK;
@@ -425 +425 @@
         }
 
-        rc = usbhid_req_set_protocol(&hid_dev->usb_dev->ctrl_pipe,
+        rc = usbhid_req_set_protocol(
+            usb_device_get_default_pipe(hid_dev->usb_dev),
             hid_dev->usb_dev->interface_no, USB_HID_PROTOCOL_BOOT);