Changes in uspace/drv/usbhub/usbhub.c [563fb40:15b0432] in mainline

File:

• uspace/drv/usbhub/usbhub.c (modified) (22 diffs)

uspace/drv/usbhub/usbhub.c

@@ -39 +39 @@
 
 #include <usb_iface.h>
-#include <usb/usbdrv.h>
+#include <usb/ddfiface.h>
 #include <usb/descriptor.h>
 #include <usb/recognise.h>
-#include <usb/devreq.h>
+#include <usb/request.h>
 #include <usb/classes/hub.h>
 
@@ -49 +49 @@
 #include "port_status.h"
 #include "usb/usb.h"
-
-static int iface_get_hc_handle(device_t *device, devman_handle_t *handle)
-{
-        return usb_hc_find(device->handle, handle);
-}
-
-static usb_iface_t hub_usb_iface = {
-        .get_hc_handle = iface_get_hc_handle
+#include "usb/pipes.h"
+#include "usb/classes/classes.h"
+
+static device_ops_t hub_device_ops = {
+        .interfaces[USB_DEV_IFACE] = &usb_iface_hub_impl
 };
 
-static device_ops_t hub_device_ops = {
-        .interfaces[USB_DEV_IFACE] = &hub_usb_iface
+/** Hub status-change endpoint description */
+static usb_endpoint_description_t status_change_endpoint_description = {
+        .transfer_type = USB_TRANSFER_INTERRUPT,
+        .direction = USB_DIRECTION_IN,
+        .interface_class = USB_CLASS_HUB,
+        .flags = 0
 };
+
 
 //*********************************************
@@ -69 +71 @@
 //*********************************************
 
-usb_hub_info_t * usb_create_hub_info(device_t * device, int hc) {
+/**
+ * Initialize connnections to host controller, device, and device
+ * control endpoint
+ * @param hub
+ * @param device
+ * @return
+ */
+static int usb_hub_init_communication(usb_hub_info_t * hub){
+        int opResult;
+        opResult = usb_device_connection_initialize_from_device(
+                        &hub->device_connection,
+                        hub->device);
+        if(opResult != EOK){
+                dprintf(USB_LOG_LEVEL_ERROR,
+                                "could not initialize connection to hc, errno %d",opResult);
+                return opResult;
+        }
+        opResult = usb_hc_connection_initialize_from_device(&hub->connection,
+                        hub->device);
+        if(opResult != EOK){
+                dprintf(USB_LOG_LEVEL_ERROR,
+                                "could not initialize connection to device, errno %d",opResult);
+                return opResult;
+        }
+        opResult = usb_endpoint_pipe_initialize_default_control(&hub->endpoints.control,
+            &hub->device_connection);
+        if(opResult != EOK){
+                dprintf(USB_LOG_LEVEL_ERROR,
+                                "could not initialize connection to device endpoint, errno %d",opResult);
+        }
+        return opResult;
+}
+
+/**
+ * When entering this function, hub->endpoints.control should be active.
+ * @param hub
+ * @return
+ */
+static int usb_hub_process_configuration_descriptors(
+        usb_hub_info_t * hub){
+        if(hub==NULL) {
+                return EINVAL;
+        }
+        int opResult;
+        
+        //device descriptor
+        usb_standard_device_descriptor_t std_descriptor;
+        opResult = usb_request_get_device_descriptor(&hub->endpoints.control,
+            &std_descriptor);
+        if(opResult!=EOK){
+                dprintf(USB_LOG_LEVEL_ERROR, "could not get device descriptor, %d",opResult);
+                return opResult;
+        }
+        dprintf(USB_LOG_LEVEL_INFO, "hub has %d configurations",
+                        std_descriptor.configuration_count);
+        if(std_descriptor.configuration_count<1){
+                dprintf(USB_LOG_LEVEL_ERROR, "THERE ARE NO CONFIGURATIONS AVAILABLE");
+                //shouldn`t I return?
+        }
+
+        //configuration descriptor
+        /// \TODO check other configurations
+        usb_standard_configuration_descriptor_t config_descriptor;
+        opResult = usb_request_get_bare_configuration_descriptor(
+            &hub->endpoints.control, 0,
+        &config_descriptor);
+        if(opResult!=EOK){
+                dprintf(USB_LOG_LEVEL_ERROR, "could not get configuration descriptor, %d",opResult);
+                return opResult;
+        }
+        //set configuration
+        opResult = usb_request_set_configuration(&hub->endpoints.control,
+                config_descriptor.configuration_number);
+
+        if (opResult != EOK) {
+                dprintf(USB_LOG_LEVEL_ERROR,
+                                "something went wrong when setting hub`s configuration, %d",
+                                opResult);
+                return opResult;
+        }
+        dprintf(USB_LOG_LEVEL_DEBUG, "\tused configuration %d",
+                        config_descriptor.configuration_number);
+
+        //full configuration descriptor
+        size_t transferred = 0;
+        uint8_t * descriptors = (uint8_t *)malloc(config_descriptor.total_length);
+        if (descriptors == NULL) {
+                dprintf(USB_LOG_LEVEL_ERROR, "insufficient memory");
+                return ENOMEM;
+        }
+        opResult = usb_request_get_full_configuration_descriptor(&hub->endpoints.control,
+            0, descriptors,
+            config_descriptor.total_length, &transferred);
+        if(opResult!=EOK){
+                free(descriptors);
+                dprintf(USB_LOG_LEVEL_ERROR,
+                                "could not get full configuration descriptor, %d",opResult);
+                return opResult;
+        }
+        if (transferred != config_descriptor.total_length) {
+                dprintf(USB_LOG_LEVEL_ERROR,
+                                "received incorrect full configuration descriptor");
+                return ELIMIT;
+        }
+
+        /**
+         * Initialize the interrupt in endpoint.
+         * \TODO this code should be checked...
+         */
+        usb_endpoint_mapping_t endpoint_mapping[1] = {
+                {
+                        .pipe = &hub->endpoints.status_change,
+                        .description = &status_change_endpoint_description,
+                        .interface_no =
+                            usb_device_get_assigned_interface(hub->device)
+                }
+        };
+        opResult = usb_endpoint_pipe_initialize_from_configuration(
+            endpoint_mapping, 1,
+            descriptors, config_descriptor.total_length,
+            &hub->device_connection);
+        if (opResult != EOK) {
+                dprintf(USB_LOG_LEVEL_ERROR,
+                                "Failed to initialize status change pipe: %s",
+                    str_error(opResult));
+                return opResult;
+        }
+        if (!endpoint_mapping[0].present) {
+                dprintf(USB_LOG_LEVEL_ERROR,"Not accepting device, " \
+                    "cannot understand what is happenning");
+                return EREFUSED;
+        }
+
+        free(descriptors);
+        return EOK;
+        
+
+        // Initialize the interrupt(=status change) endpoint.
+        /*usb_endpoint_pipe_initialize(
+                &result->endpoints->status_change,
+                &result->device_connection, );USB_TRANSFER_INTERRUPT
+        USB_DIRECTION_IN*/
+
+}
+
+
+/**
+ * Create hub representation from device information.
+ * @param device
+ * @return pointer to created structure or NULL in case of error
+ */
+usb_hub_info_t * usb_create_hub_info(device_t * device) {
         usb_hub_info_t* result = usb_new(usb_hub_info_t);
+        result->device = device;
+        int opResult;
+        opResult = usb_hub_init_communication(result);
+        if(opResult != EOK){
+                free(result);
+                return NULL;
+        }
+
         //result->device = device;
         result->port_count = -1;
-        /// \TODO is this correct? is the device stored?
         result->device = device;
 
-
-        dprintf(USB_LOG_LEVEL_DEBUG, "phone to hc = %d", hc);
-        if (hc < 0) {
-                return result;
-        }
-        //get some hub info
-        usb_address_t addr = usb_drv_get_my_address(hc, device);
-        dprintf(USB_LOG_LEVEL_DEBUG, "address of newly created hub = %d", addr);
-        /*if(addr<0){
-                //return result;
-
-        }*/
-
-        result->address = addr;
+        //result->usb_device = usb_new(usb_hcd_attached_device_info_t);
+        size_t received_size;
 
         // get hub descriptor
-
         dprintf(USB_LOG_LEVEL_DEBUG, "creating serialized descripton");
         void * serialized_descriptor = malloc(USB_HUB_MAX_DESCRIPTOR_SIZE);
         usb_hub_descriptor_t * descriptor;
-        size_t received_size;
-        int opResult;
         dprintf(USB_LOG_LEVEL_DEBUG, "starting control transaction");
-        
-        opResult = usb_drv_req_get_descriptor(hc, addr,
+        usb_endpoint_pipe_start_session(&result->endpoints.control);
+        opResult = usb_request_get_descriptor(&result->endpoints.control,
                         USB_REQUEST_TYPE_CLASS,
                         USB_DESCTYPE_HUB, 0, 0, serialized_descriptor,
                         USB_HUB_MAX_DESCRIPTOR_SIZE, &received_size);
+        usb_endpoint_pipe_end_session(&result->endpoints.control);
 
         if (opResult != EOK) {
@@ -117 +263 @@
                 return result;
         }
+
+        
         dprintf(USB_LOG_LEVEL_INFO, "setting port count to %d",descriptor->ports_count);
         result->port_count = descriptor->ports_count;
-        result->attached_devs = (usb_hub_attached_device_t*)
-            malloc((result->port_count+1) * sizeof(usb_hub_attached_device_t));
+        result->attached_devs = (usb_hc_attached_device_t*)
+            malloc((result->port_count+1) * sizeof(usb_hc_attached_device_t));
         int i;
         for(i=0;i<result->port_count+1;++i){
-                result->attached_devs[i].devman_handle=0;
+                result->attached_devs[i].handle=0;
                 result->attached_devs[i].address=0;
         }
@@ -138 +286 @@
 }
 
+/**
+ * Create hub representation and add it into hub list
+ * @param dev
+ * @return
+ */
 int usb_add_hub_device(device_t *dev) {
         dprintf(USB_LOG_LEVEL_INFO, "add_hub_device(handle=%d)", (int) dev->handle);
 
-        /*
-         * We are some (probably deeply nested) hub.
-         * Thus, assign our own operations and explore already
-         * connected devices.
-         */
         dev->ops = &hub_device_ops;
 
-        //create the hub structure
-        //get hc connection
-        int hc = usb_drv_hc_connect_auto(dev, 0);
-        if (hc < 0) {
-                return hc;
-        }
-
-        usb_hub_info_t * hub_info = usb_create_hub_info(dev, hc);
+        usb_hub_info_t * hub_info = usb_create_hub_info(dev);
+
+        int opResult;
+
+        //perform final configurations
+        usb_endpoint_pipe_start_session(&hub_info->endpoints.control);
+        // process descriptors
+        opResult = usb_hub_process_configuration_descriptors(hub_info);
+        if(opResult != EOK){
+                dprintf(USB_LOG_LEVEL_ERROR,"could not get condiguration descriptors, %d",
+                                opResult);
+                return opResult;
+        }
+        //power ports
+        usb_device_request_setup_packet_t request;
         int port;
-        int opResult;
-        usb_target_t target;
-        target.address = hub_info->address;
-        target.endpoint = 0;
-
-        //get configuration descriptor
-        // this is not fully correct - there are more configurations
-        // and all should be checked
-        usb_standard_device_descriptor_t std_descriptor;
-        opResult = usb_drv_req_get_device_descriptor(hc, target.address,
-            &std_descriptor);
-        if(opResult!=EOK){
-                dprintf(USB_LOG_LEVEL_ERROR, "could not get device descriptor, %d",opResult);
-                return opResult;
-        }
-        dprintf(USB_LOG_LEVEL_INFO, "hub has %d configurations",std_descriptor.configuration_count);
-        if(std_descriptor.configuration_count<1){
-                dprintf(USB_LOG_LEVEL_ERROR, "THERE ARE NO CONFIGURATIONS AVAILABLE");
-                //shouldn`t I return?
-        }
-        /// \TODO check other configurations
-        usb_standard_configuration_descriptor_t config_descriptor;
-        opResult = usb_drv_req_get_bare_configuration_descriptor(hc,
-        target.address, 0,
-        &config_descriptor);
-        if(opResult!=EOK){
-                dprintf(USB_LOG_LEVEL_ERROR, "could not get configuration descriptor, %d",opResult);
-                return opResult;
-        }
-        //set configuration
-        opResult = usb_drv_req_set_configuration(hc, target.address,
-    config_descriptor.configuration_number);
-
-        if (opResult != EOK) {
-                dprintf(USB_LOG_LEVEL_ERROR, "something went wrong when setting hub`s configuration, %d", opResult);
-        }
-
-        usb_device_request_setup_packet_t request;
         for (port = 1; port < hub_info->port_count+1; ++port) {
                 usb_hub_set_power_port_request(&request, port);
-                opResult = usb_drv_sync_control_write(hc, target, &request, NULL, 0);
+                opResult = usb_endpoint_pipe_control_write(&hub_info->endpoints.control,
+                                &request,sizeof(usb_device_request_setup_packet_t), NULL, 0);
                 dprintf(USB_LOG_LEVEL_INFO, "powering port %d",port);
                 if (opResult != EOK) {
@@ -204 +322 @@
         }
         //ports powered, hub seems to be enabled
-
-        async_hangup(hc);
+        usb_endpoint_pipe_end_session(&hub_info->endpoints.control);
 
         //add the hub to list
@@ -215 +332 @@
         //(void)hub_info;
         usb_hub_check_hub_changes();
-
         
-
         dprintf(USB_LOG_LEVEL_INFO, "hub dev added");
+        //address is lost...
         dprintf(USB_LOG_LEVEL_DEBUG, "\taddress %d, has %d ports ",
-                        hub_info->address,
+                        //hub_info->endpoints.control.,
                         hub_info->port_count);
-        dprintf(USB_LOG_LEVEL_DEBUG, "\tused configuration %d",config_descriptor.configuration_number);
 
         return EOK;
@@ -236 +351 @@
 
 /**
- * Convenience function for releasing default address and writing debug info
- * (these few lines are used too often to be written again and again).
- * @param hc
- * @return
- */
-inline static int usb_hub_release_default_address(int hc){
-        int opResult;
-        dprintf(USB_LOG_LEVEL_INFO, "releasing default address");
-        opResult = usb_drv_release_default_address(hc);
-        if (opResult != EOK) {
-                dprintf(USB_LOG_LEVEL_WARNING, "failed to release default address");
-        }
-        return opResult;
-}
-
-/**
  * Reset the port with new device and reserve the default address.
  * @param hc
@@ -257 +356 @@
  * @param target
  */
-static void usb_hub_init_add_device(int hc, uint16_t port, usb_target_t target) {
+static void usb_hub_init_add_device(usb_hub_info_t * hub, uint16_t port) {
         usb_device_request_setup_packet_t request;
         int opResult;
         dprintf(USB_LOG_LEVEL_INFO, "some connection changed");
+        assert(hub->endpoints.control.hc_phone);
         //get default address
-        opResult = usb_drv_reserve_default_address(hc);
+        //opResult = usb_drv_reserve_default_address(hc);
+        opResult = usb_hc_reserve_default_address(&hub->connection, USB_SPEED_LOW);
+
         if (opResult != EOK) {
                 dprintf(USB_LOG_LEVEL_WARNING, "cannot assign default address, it is probably used");
@@ -269 +371 @@
         //reset port
         usb_hub_set_reset_port_request(&request, port);
-        opResult = usb_drv_sync_control_write(
-                        hc, target,
-                        &request,
+        opResult = usb_endpoint_pipe_control_write(
+                        &hub->endpoints.control,
+                        &request,sizeof(usb_device_request_setup_packet_t),
                         NULL, 0
                         );
         if (opResult != EOK) {
                 dprintf(USB_LOG_LEVEL_ERROR, "something went wrong when reseting a port");
-                usb_hub_release_default_address(hc);
+                //usb_hub_release_default_address(hc);
+                usb_hc_release_default_address(&hub->connection);
         }
 }
@@ -287 +390 @@
  */
 static void usb_hub_finalize_add_device( usb_hub_info_t * hub,
-                int hc, uint16_t port, usb_target_t target) {
+                uint16_t port) {
 
         int opResult;
         dprintf(USB_LOG_LEVEL_INFO, "finalizing add device");
-        opResult = usb_hub_clear_port_feature(hc, target.address,
+        opResult = usb_hub_clear_port_feature(&hub->endpoints.control,
             port, USB_HUB_FEATURE_C_PORT_RESET);
+
         if (opResult != EOK) {
                 dprintf(USB_LOG_LEVEL_ERROR, "failed to clear port reset feature");
-                usb_hub_release_default_address(hc);
-                return;
-        }
-
-        /* Request address at from host controller. */
-        usb_address_t new_device_address = usb_drv_request_address(hc);
+                usb_hc_release_default_address(&hub->connection);
+                return;
+        }
+        //create connection to device
+        usb_endpoint_pipe_t new_device_pipe;
+        usb_device_connection_t new_device_connection;
+        usb_device_connection_initialize_on_default_address(
+                        &new_device_connection,
+                        &hub->connection
+                        );
+        usb_endpoint_pipe_initialize_default_control(
+                        &new_device_pipe,
+                        &new_device_connection);
+        /// \TODO get highspeed info
+
+
+
+
+
+        /* Request address from host controller. */
+        usb_address_t new_device_address = usb_hc_request_address(
+                        &hub->connection,
+                        USB_SPEED_LOW/// \TODO fullspeed??
+                        );
         if (new_device_address < 0) {
                 dprintf(USB_LOG_LEVEL_ERROR, "failed to get free USB address");
                 opResult = new_device_address;
-                usb_hub_release_default_address(hc);
+                usb_hc_release_default_address(&hub->connection);
                 return;
         }
         dprintf(USB_LOG_LEVEL_INFO, "setting new address %d",new_device_address);
-        opResult = usb_drv_req_set_address(hc, USB_ADDRESS_DEFAULT,
-            new_device_address);
+        //opResult = usb_drv_req_set_address(hc, USB_ADDRESS_DEFAULT,
+        //    new_device_address);
+        opResult = usb_request_set_address(&new_device_pipe,new_device_address);
 
         if (opResult != EOK) {
                 dprintf(USB_LOG_LEVEL_ERROR, "could not set address for new device");
-                usb_hub_release_default_address(hc);
-                return;
-        }
-
-
-        opResult = usb_hub_release_default_address(hc);
+                usb_hc_release_default_address(&hub->connection);
+                return;
+        }
+
+
+        //opResult = usb_hub_release_default_address(hc);
+        opResult = usb_hc_release_default_address(&hub->connection);
         if(opResult!=EOK){
                 return;
         }
 
-        devman_handle_t hc_handle;
-        opResult = usb_drv_find_hc(hub->device, &hc_handle);
-        if (opResult != EOK) {
-                usb_log_error("Failed to get handle of host controller: %s.\n",
-                    str_error(opResult));
-                return;
-        }
-
         devman_handle_t child_handle;
-        opResult = usb_device_register_child_in_devman(new_device_address,
-            hc_handle, hub->device, &child_handle);
+        //??
+    opResult = usb_device_register_child_in_devman(new_device_address,
+            hub->connection.hc_handle, hub->device, &child_handle);
+
         if (opResult != EOK) {
                 dprintf(USB_LOG_LEVEL_ERROR, "could not start driver for new device");
                 return;
         }
-        hub->attached_devs[port].devman_handle = child_handle;
+        hub->attached_devs[port].handle = child_handle;
         hub->attached_devs[port].address = new_device_address;
 
-        opResult = usb_drv_bind_address(hc, new_device_address, child_handle);
+        //opResult = usb_drv_bind_address(hc, new_device_address, child_handle);
+        opResult = usb_hc_register_device(
+                        &hub->connection,
+                        &hub->attached_devs[port]);
         if (opResult != EOK) {
                 dprintf(USB_LOG_LEVEL_ERROR, "could not assign address of device in hcd");
@@ -358 +479 @@
  */
 static void usb_hub_removed_device(
-    usb_hub_info_t * hub, int hc, uint16_t port, usb_target_t target) {
+    usb_hub_info_t * hub,uint16_t port) {
         //usb_device_request_setup_packet_t request;
         int opResult;
@@ -365 +486 @@
          * devide manager
          */
-
-        hub->attached_devs[port].devman_handle=0;
+        
         //close address
         if(hub->attached_devs[port].address!=0){
-                opResult = usb_drv_release_address(hc,hub->attached_devs[port].address);
+                //opResult = usb_drv_release_address(hc,hub->attached_devs[port].address);
+                opResult = usb_hc_unregister_device(
+                                &hub->connection, hub->attached_devs[port].address);
                 if(opResult != EOK) {
                         dprintf(USB_LOG_LEVEL_WARNING, "could not release address of " \
@@ -375 +497 @@
                 }
                 hub->attached_devs[port].address = 0;
+                hub->attached_devs[port].handle = 0;
         }else{
                 dprintf(USB_LOG_LEVEL_WARNING, "this is strange, disconnected device had no address");
                 //device was disconnected before it`s port was reset - return default address
-                usb_drv_release_default_address(hc);
+                //usb_drv_release_default_address(hc);
+                usb_hc_release_default_address(&hub->connection);
         }
 }
@@ -388 +512 @@
  * @param target
  */
-static void usb_hub_process_interrupt(usb_hub_info_t * hub, int hc,
-        uint16_t port, usb_address_t address) {
+static void usb_hub_process_interrupt(usb_hub_info_t * hub, 
+        uint16_t port) {
         dprintf(USB_LOG_LEVEL_DEBUG, "interrupt at port %d", port);
         //determine type of change
+        usb_endpoint_pipe_t *pipe = &hub->endpoints.control;
+        int opResult = usb_endpoint_pipe_start_session(pipe);
+        
+        if(opResult != EOK){
+                dprintf(USB_LOG_LEVEL_ERROR, "cannot open pipe %d", opResult);
+        }
+
+        /*
         usb_target_t target;
         target.address=address;
         target.endpoint=0;
+        */
+
         usb_port_status_t status;
         size_t rcvd_size;
         usb_device_request_setup_packet_t request;
-        int opResult;
+        //int opResult;
         usb_hub_set_port_status_request(&request, port);
         //endpoint 0
 
-        opResult = usb_drv_sync_control_read(
-                        hc, target,
-                        &request,
+        opResult = usb_endpoint_pipe_control_read(
+                        pipe,
+                        &request, sizeof(usb_device_request_setup_packet_t),
                         &status, 4, &rcvd_size
                         );
@@ -417 +551 @@
         //something connected/disconnected
         if (usb_port_connect_change(&status)) {
-                opResult = usb_hub_clear_port_feature(hc, target.address,
+                opResult = usb_hub_clear_port_feature(pipe,
                     port, USB_HUB_FEATURE_C_PORT_CONNECTION);
                 // TODO: check opResult
                 if (usb_port_dev_connected(&status)) {
                         dprintf(USB_LOG_LEVEL_INFO, "some connection changed");
-                        usb_hub_init_add_device(hc, port, target);
+                        usb_hub_init_add_device(hub, port);
                 } else {
-                        usb_hub_removed_device(hub, hc, port, target);
+                        usb_hub_removed_device(hub, port);
                 }
         }
@@ -431 +565 @@
                 dprintf(USB_LOG_LEVEL_INFO, "port reset complete");
                 if (usb_port_enabled(&status)) {
-                        usb_hub_finalize_add_device(hub, hc, port, target);
+                        usb_hub_finalize_add_device(hub, port);
                 } else {
                         dprintf(USB_LOG_LEVEL_WARNING, "ERROR: port reset, but port still not enabled");
@@ -447 +581 @@
         /// \TODO handle other changes
         /// \TODO debug log for various situations
+        usb_endpoint_pipe_end_session(pipe);
+
 
 }
@@ -464 +600 @@
                 fibril_mutex_unlock(&usb_hub_list_lock);
                 usb_hub_info_t * hub_info = ((usb_hub_info_t*)lst_item->data);
+                int opResult;
+
+                opResult = usb_endpoint_pipe_start_session(&hub_info->endpoints.status_change);
+                if(opResult != EOK){
+                        continue;
+                }
                 /*
                  * Check status change pipe of this hub.
                  */
-
+                /*
                 usb_target_t target;
                 target.address = hub_info->address;
@@ -473 +615 @@
                 dprintf(USB_LOG_LEVEL_INFO, "checking changes for hub at addr %d",
                     target.address);
-
+                */
                 size_t port_count = hub_info->port_count;
 
                 /*
                  * Connect to respective HC.
-                 */
+                 *
                 int hc = usb_drv_hc_connect_auto(hub_info->device, 0);
                 if (hc < 0) {
                         continue;
-                }
+                }*/
 
                 /// FIXME: count properly
@@ -489 +631 @@
                 void *change_bitmap = malloc(byte_length);
                 size_t actual_size;
-                usb_handle_t handle;
+                //usb_handle_t handle;
 
                 /*
                  * Send the request.
                  */
-                int opResult = usb_drv_async_interrupt_in(hc, target,
-                                change_bitmap, byte_length, &actual_size,
-                                &handle);
-
-                usb_drv_async_wait_for(handle);
+                opResult = usb_endpoint_pipe_read(
+                                &hub_info->endpoints.status_change,
+                                change_bitmap, byte_length, &actual_size
+                                );
+
+                //usb_drv_async_wait_for(handle);
 
                 if (opResult != EOK) {
@@ -511 +654 @@
                         if (interrupt) {
                                 usb_hub_process_interrupt(
-                                        hub_info, hc, port, hub_info->address);
+                                        hub_info, port);
                         }
                 }
+                usb_endpoint_pipe_end_session(&hub_info->endpoints.status_change);
                 free(change_bitmap);
-
-                async_hangup(hc);
+                
+
+                //async_hangup(hc);
                 fibril_mutex_lock(&usb_hub_list_lock);
         }