Changes in uspace/lib/usb/src/hcdhubd.c [8f62b0f:0ee648a] in mainline

File:

• uspace/lib/usb/src/hcdhubd.c (modified) (6 diffs)

uspace/lib/usb/src/hcdhubd.c

@@ -34 +34 @@
  */
 #include <usb/hcdhubd.h>
-#include <usb/devreq.h>
 #include <usbhc_iface.h>
 #include <driver.h>
@@ -56 +55 @@
         .interfaces[USBHC_DEV_IFACE] = &usb_interface
 };
-
-static void set_hub_address(usb_hc_device_t *hc, usb_address_t address);
 
 /** Callback when new device is detected and must be handled by this driver.
@@ -101 +98 @@
                 return EOK;
         } else {
-                usb_hc_device_t *hc = list_get_instance(hc_list.next, usb_hc_device_t, link);
-                set_hub_address(hc, 5);
-
+                printf("%s: hub added, hurrah!\n", hc_driver->name);
                 /*
                  * We are some (probably deeply nested) hub.
@@ -109 +104 @@
                  * connected devices.
                  */
-
                 return ENOTSUP;
         }
-}
-
-/** 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(usb_hc_device_t *hc, usb_address_t address)
-{
-        printf("%s: setting hub address to %d\n", hc->generic->name, 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;
-
-        rc = usb_hc_async_control_write_setup(hc, target,
-            &setup_packet, sizeof(setup_packet), &handle);
-        if (rc != EOK) {
-                return;
-        }
-
-        rc = usb_hc_async_wait_for(handle);
-        if (rc != EOK) {
-                return;
-        }
-
-        rc = usb_hc_async_control_write_status(hc, target, &handle);
-        if (rc != EOK) {
-                return;
-        }
-
-        rc = usb_hc_async_wait_for(handle);
-        if (rc != EOK) {
-                return;
-        }
-
-        printf("%s: hub address changed\n", hc->generic->name);
 }
 
@@ -266 +212 @@
 
         /*
+         * For testing/debugging purposes only.
+         * Try to send some data to default USB address.
+         */
+        usb_target_t target = {0, 0};
+        usb_handle_t handle = 0;
+        char *data = (char *) "Hello, World!";
+
+
+        (void)usb_hc_async_interrupt_out(dev, target, data, str_length(data), &handle);
+        (void)usb_hc_async_wait_for(handle);
+
+        /*
          * Announce presence of child device.
          */
@@ -314 +272 @@
 }
 
+/** Issue interrupt OUT transfer to HC driven by current task.
+ *
+ * @param hc Host controller to handle the transfer.
+ * @param target Target device address.
+ * @param buffer Data buffer.
+ * @param size Buffer size.
+ * @param handle Transfer handle.
+ * @return Error code.
+ */
+int usb_hc_async_interrupt_out(usb_hc_device_t *hc, usb_target_t target,
+    void *buffer, size_t size,
+    usb_handle_t *handle)
+{
+        if ((hc->transfer_ops == NULL)
+            || (hc->transfer_ops->transfer_out == NULL)) {
+                return ENOTSUP;
+        }
+
+        /*
+         * For debugging purposes only.
+         * We need to find appropriate device in list of managed device
+         * and pass it to the transfer callback function.
+         */
+        usb_hcd_attached_device_info_t dev = {
+                .address = target.address,
+                .endpoint_count = 0,
+                .endpoints = NULL,
+        };
+        usb_hc_endpoint_info_t endpoint = {
+                .endpoint = target.endpoint,
+                .transfer_type = USB_TRANSFER_INTERRUPT,
+                .direction = USB_DIRECTION_OUT,
+                .data_toggle = 0
+        };
+
+        hc->transfer_ops->transfer_out(hc, &dev, &endpoint, buffer, size, NULL, NULL);
+
+        *handle = (usb_handle_t)NULL;
+
+        return EOK;
+}
+
+
+/** Issue interrupt IN transfer to HC driven by current task.
+ *
+ * @warning The @p buffer and @p actual_size parameters shall not be
+ * touched until this transfer is waited for by usb_hc_async_wait_for().
+ *
+ * @param hc Host controller to handle the transfer.
+ * @param target Target device address.
+ * @param buffer Data buffer.
+ * @param size Buffer size.
+ * @param actual_size Size of actually transferred data.
+ * @param handle Transfer handle.
+ * @return Error code.
+ */
+int usb_hc_async_interrupt_in(usb_hc_device_t *hc, usb_target_t target,
+    void *buffer, size_t size, size_t *actual_size,
+    usb_handle_t *handle)
+{
+        /*
+         * TODO: verify that given endpoint is of interrupt type and
+         * call hc->transfer_ops->transfer_in()
+         */
+        return ENOTSUP;
+}
+
+/** Wait for transfer to complete.
+ *
+ * @param handle Transfer handle.
+ * @return Error code.
+ */
+int usb_hc_async_wait_for(usb_handle_t handle)
+{
+        return ENOTSUP;
+}
+
 /**
  * @}