Changes in uspace/drv/usbhub/utils.c [9ca0013:4317827] in mainline

File:

• uspace/drv/usbhub/utils.c (modified) (4 diffs)

uspace/drv/usbhub/utils.c

@@ -109 +109 @@
 //*********************************************
 
+static void set_hub_address(device_t *dev, usb_address_t address);
+
 usb_hcd_hub_info_t * usb_create_hub_info(device_t * device) {
         usb_hcd_hub_info_t* result = (usb_hcd_hub_info_t*) malloc(sizeof (usb_hcd_hub_info_t));
@@ -122 +124 @@
 int usb_add_hub_device(device_t *dev) {
         printf(NAME ": add_hub_device(handle=%d)\n", (int) dev->handle);
+        set_hub_address(dev, 5);
 
         check_hub_changes();
@@ -139 +142 @@
 }
 
+/** Sample usage of usb_hc_async functions.
+ * This function sets hub address using standard SET_ADDRESS request.
+ *
+ * @warning This function shall be removed once you are familiar with
+ * the usb_hc_ API.
+ *
+ * @param hc Host controller the hub belongs to.
+ * @param address New hub address.
+ */
+static void set_hub_address(device_t *dev, usb_address_t address) {
+        printf(NAME ": setting hub address to %d\n", address);
+        usb_target_t target = {0, 0};
+        usb_handle_t handle;
+        int rc;
+
+        usb_device_request_setup_packet_t setup_packet = {
+                .request_type = 0,
+                .request = USB_DEVREQ_SET_ADDRESS,
+                .index = 0,
+                .length = 0,
+        };
+        setup_packet.value = address;
+
+        int hc = usb_drv_hc_connect(dev, 0);
+
+        rc = usb_drv_async_control_write_setup(hc, target,
+                        &setup_packet, sizeof (setup_packet), &handle);
+        if (rc != EOK) {
+                return;
+        }
+
+        rc = usb_drv_async_wait_for(handle);
+        if (rc != EOK) {
+                return;
+        }
+
+        rc = usb_drv_async_control_write_status(hc, target, &handle);
+        if (rc != EOK) {
+                return;
+        }
+
+        rc = usb_drv_async_wait_for(handle);
+        if (rc != EOK) {
+                return;
+        }
+
+        printf(NAME ": hub address changed\n");
+}
 
 /** Check changes on all known hubs.
@@ -186 +237 @@
                  */
 
-                /*
-                 * WARNING: sample code, will not work out of the box.
-                 * And does not contain code for checking for errors.
-                 */
-#if 0
-                /*
-                 * Before opening the port, we must acquire the default
-                 * address.
-                 */
-                usb_drv_reserve_default_address(hc);
-
-                usb_address_t new_device_address = usb_drv_request_address(hc);
-
-                // TODO: open the port
-
-                // TODO: send request for setting address to new_device_address
-
-                /*
-                 * Once new address is set, we can release the default
-                 * address.
-                 */
-                usb_drv_release_default_address(hc);
-
-                /*
-                 * Obtain descriptors and create match ids for devman.
-                 */
-
-                // TODO: get device descriptors
-
-                // TODO: create match ids
-
-                // TODO: add child device
-
-                // child_device_register sets the device handle
-                // TODO: store it here
-                devman_handle_t new_device_handle = 0;
-
-                /*
-                 * Inform the HC that the new device has devman handle
-                 * assigned.
-                 */
-                usb_drv_bind_address(hc, new_device_address, new_device_handle);
-
-                /*
-                 * That's all.
-                 */
-#endif
-
 
                 /*