Changes in uspace/drv/usbhub/utils.c [09daa8b:0f21c0c] in mainline

File:

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

uspace/drv/usbhub/utils.c

@@ -33 +33 @@
  * @brief various utilities
  */
-#include <ddf/driver.h>
+#include <driver.h>
 #include <bool.h>
 #include <errno.h>
@@ -88 +88 @@
 
         if (sdescriptor[1] != USB_DESCTYPE_HUB) {
-                usb_log_warning("trying to deserialize wrong descriptor %x\n",sdescriptor[1]);
+                dprintf(1,"[usb_hub] wrong descriptor %x\n",sdescriptor[1]);
                 return NULL;
         }
@@ -103 +103 @@
                         ? 1 : 0);
         result->devices_removable = (uint8_t*) malloc(var_size);
-
+        //printf("[usb_hub] getting removable devices data \n");
         size_t i;
         for (i = 0; i < var_size; ++i) {
@@ -111 +111 @@
 }
 
+//control transactions
+/*
+int usb_drv_sync_control_read(
+    int phone, usb_target_t target,
+    usb_device_request_setup_packet_t * request,
+    void * rcvd_buffer, size_t rcvd_size, size_t * actual_size
+) {
+        usb_handle_t handle;
+        int opResult;
+        //setup
+        opResult = usb_drv_async_control_read_setup(phone, target,
+            request, sizeof (usb_device_request_setup_packet_t),
+            &handle);
+        if (opResult != EOK) {
+                return opResult;
+        }
+        opResult = usb_drv_async_wait_for(handle);
+        if (opResult != EOK) {
+                return opResult;
+        }
+        //read
+        opResult = usb_drv_async_control_read_data(phone, target,
+                        rcvd_buffer, rcvd_size, actual_size,
+                        &handle);
+        if (opResult != EOK) {
+                return opResult;
+        }
+        opResult = usb_drv_async_wait_for(handle);
+        if (opResult != EOK) {
+                return opResult;
+        }
+        //finalize
+        opResult = usb_drv_async_control_read_status(phone, target,
+                        &handle);
+        if (opResult != EOK) {
+                return opResult;
+        }
+        opResult = usb_drv_async_wait_for(handle);
+        if (opResult != EOK) {
+                return opResult;
+        }
+        return EOK;
+}
+
+int usb_drv_sync_control_write(
+    int phone, usb_target_t target,
+    usb_device_request_setup_packet_t * request,
+    void * sent_buffer, size_t sent_size
+) {
+        usb_handle_t handle;
+        int opResult;
+        //setup
+        opResult = usb_drv_async_control_write_setup(phone, target,
+            request, sizeof (usb_device_request_setup_packet_t),
+            &handle);
+        if (opResult != EOK) {
+                return opResult;
+        }
+        opResult = usb_drv_async_wait_for(handle);
+        if (opResult != EOK) {
+                return opResult;
+        }
+        //write
+        opResult = usb_drv_async_control_write_data(phone, target,
+                        sent_buffer, sent_size,
+                        &handle);
+        if (opResult != EOK) {
+                return opResult;
+        }
+        opResult = usb_drv_async_wait_for(handle);
+        if (opResult != EOK) {
+                return opResult;
+        }
+        //finalize
+        opResult = usb_drv_async_control_write_status(phone, target,
+            &handle);
+        if (opResult != EOK) {
+                return opResult;
+        }
+        opResult = usb_drv_async_wait_for(handle);
+        if (opResult != EOK) {
+                return opResult;
+        }
+        return EOK;
+}
+
+*/
+