Changeset 09daa8b in mainline for uspace/drv/usbhub/usbhub.c

Timestamp:

2011-03-20T21:50:20Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

fd9f6e4c

Parents:

59e01689

Message:

using usb/devdrv interface to simplify hub communication initialization
small code correction in devdrv.c and devdrv.h

File:

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

uspace/drv/usbhub/usbhub.c

@@ -53 +53 @@
 #include "usb/classes/classes.h"
 
-static ddf_dev_ops_t hub_device_ops = {
-        .interfaces[USB_DEV_IFACE] = &usb_iface_hub_impl
-};
-
-/** Hub status-change endpoint description
- *
- * For more see usb hub specification in 11.15.1 of
- */
-static usb_endpoint_description_t status_change_endpoint_description = {
-        .transfer_type = USB_TRANSFER_INTERRUPT,
-        .direction = USB_DIRECTION_IN,
-        .interface_class = USB_CLASS_HUB,
-        .interface_subclass = 0,
-        .interface_protocol = 0,
-        .flags = 0
-};
-
 int usb_hub_control_loop(void * hub_info_param){
         usb_hub_info_t * hub_info = (usb_hub_info_t*)hub_info_param;
@@ -78 +61 @@
                 async_usleep(1000 * 1000 );/// \TODO proper number once
         }
-        usb_log_error("something in ctrl loop went wrong, errno %d",errorCode);
+        usb_log_error("something in ctrl loop went wrong, errno %d\n",errorCode);
 
         return 0;
@@ -91 +74 @@
 
 /**
- * Initialize connnections to host controller, device, and device
- * control endpoint
- * @param hub
- * @param device
+ * create usb_hub_info_t structure
+ *
+ * Does only basic copying of known information into new structure.
+ * @param usb_dev usb device structure
+ * @return basic usb_hub_info_t structure
+ */
+static usb_hub_info_t * usb_hub_info_create(usb_device_t * usb_dev) {
+        usb_hub_info_t * result = usb_new(usb_hub_info_t);
+        if(!result) return NULL;
+        result->usb_device = usb_dev;
+        result->status_change_pipe = usb_dev->pipes[0].pipe;
+        result->control_pipe = &usb_dev->ctrl_pipe;
+        result->is_default_address_used = false;
+        return result;
+}
+
+/**
+ * Load hub-specific information into hub_info structure.
+ *
+ * Particularly read port count and initialize structure holding port
+ * information.
+ * This function is hub-specific and should be run only after the hub is
+ * configured using usb_hub_set_configuration function.
+ * @param hub_info pointer to structure with usb hub data
+ * @return error code
+ */
+static int usb_hub_get_hub_specific_info(usb_hub_info_t * hub_info){
+        // get hub descriptor
+        usb_log_debug("creating serialized descriptor\n");
+        void * serialized_descriptor = malloc(USB_HUB_MAX_DESCRIPTOR_SIZE);
+        usb_hub_descriptor_t * descriptor;
+
+        /* this was one fix of some bug, should not be needed anymore
+        int opResult = usb_request_set_configuration(&result->endpoints.control, 1);
+        if(opResult!=EOK){
+                usb_log_error("could not set default configuration, errno %d",opResult);
+                return opResult;
+        }
+         */
+        size_t received_size;
+        int opResult = usb_request_get_descriptor(&hub_info->usb_device->ctrl_pipe,
+                        USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_DEVICE,
+                        USB_DESCTYPE_HUB,
+                        0, 0, serialized_descriptor,
+                        USB_HUB_MAX_DESCRIPTOR_SIZE, &received_size);
+
+        if (opResult != EOK) {
+                usb_log_error("failed when receiving hub descriptor, badcode = %d\n",
+                                opResult);
+                free(serialized_descriptor);
+                return opResult;
+        }
+        usb_log_debug2("deserializing descriptor\n");
+        descriptor = usb_deserialize_hub_desriptor(serialized_descriptor);
+        if(descriptor==NULL){
+                usb_log_warning("could not deserialize descriptor \n");
+                return opResult;
+        }
+        usb_log_info("setting port count to %d\n",descriptor->ports_count);
+        hub_info->port_count = descriptor->ports_count;
+        hub_info->attached_devs = (usb_hc_attached_device_t*)
+            malloc((hub_info->port_count+1) * sizeof(usb_hc_attached_device_t));
+        int i;
+        for(i=0;i<hub_info->port_count+1;++i){
+                hub_info->attached_devs[i].handle=0;
+                hub_info->attached_devs[i].address=0;
+        }
+        usb_log_debug2("freeing data\n");
+        free(serialized_descriptor);
+        free(descriptor->devices_removable);
+        free(descriptor);
+        return EOK;
+}
+/**
+ * Set configuration of hub
+ *
+ * Check whether there is at least one configuration and sets the first one.
+ * This function should be run prior to running any hub-specific action.
+ * @param hub_info
  * @return
  */
-static int usb_hub_init_communication(usb_hub_info_t * hub){
-        usb_log_debug("Initializing hub USB communication (hub->device->handle=%zu).\n", hub->device->handle);
-        int opResult;
-        opResult = usb_device_connection_initialize_from_device(
-                        &hub->device_connection,
-                        hub->device);
-        if(opResult != EOK){
-                usb_log_error("could not initialize connection to hc, errno %d",opResult);
-                return opResult;
-        }
-        usb_log_debug("Initializing USB wire abstraction.\n");
-        opResult = usb_hc_connection_initialize_from_device(&hub->connection,
-                        hub->device);
-        if(opResult != EOK){
-                usb_log_error("could not initialize connection to device, errno %d",
-                                opResult);
-                return opResult;
-        }
-        usb_log_debug("Initializing default control pipe.\n");
-        opResult = usb_endpoint_pipe_initialize_default_control(&hub->endpoints.control,
-            &hub->device_connection);
-        if(opResult != EOK){
-                usb_log_error("could not initialize connection to device endpoint, errno %d",
-                                opResult);
-                return opResult;
-        }
-
-        opResult = usb_endpoint_pipe_probe_default_control(&hub->endpoints.control);
-        if (opResult != EOK) {
-                usb_log_error("failed probing endpoint 0, %d", opResult);
-                return opResult;
-        }
-
-        return EOK;
-}
-
-/**
- * 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;
-        
+static int usb_hub_set_configuration(usb_hub_info_t * hub_info){
         //device descriptor
         usb_standard_device_descriptor_t std_descriptor;
-        opResult = usb_request_get_device_descriptor(&hub->endpoints.control,
+        int opResult = usb_request_get_device_descriptor(
+                &hub_info->usb_device->ctrl_pipe,
             &std_descriptor);
         if(opResult!=EOK){
-                usb_log_error("could not get device descriptor, %d",opResult);
-                return opResult;
-        }
-        usb_log_info("hub has %d configurations",
+                usb_log_error("could not get device descriptor, %d\n",opResult);
+                return opResult;
+        }
+        usb_log_info("hub has %d configurations\n",
                         std_descriptor.configuration_count);
         if(std_descriptor.configuration_count<1){
-                usb_log_error("THERE ARE NO CONFIGURATIONS AVAILABLE");
+                usb_log_error("THERE ARE NO CONFIGURATIONS AVAILABLE\n");
                 //shouldn`t I return?
         }
@@ -164 +176 @@
         size_t descriptors_size = 0;
         opResult = usb_request_get_full_configuration_descriptor_alloc(
-            &hub->endpoints.control, 0,
+            &hub_info->usb_device->ctrl_pipe, 0,
             (void **) &descriptors, &descriptors_size);
         if (opResult != EOK) {
@@ -175 +187 @@
 
         /* Set configuration. */
-        opResult = usb_request_set_configuration(&hub->endpoints.control,
+        opResult = usb_request_set_configuration(&hub_info->usb_device->ctrl_pipe,
             config_descriptor->configuration_number);
 
@@ -183 +195 @@
                 return opResult;
         }
-        usb_log_debug("\tused configuration %d",
+        usb_log_debug("\tused configuration %d\n",
                         config_descriptor->configuration_number);
-
-        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, descriptors_size,
-            &hub->device_connection);
-        if (opResult != EOK) {
-                usb_log_error("Failed to initialize status change pipe: %s",
-                    str_error(opResult));
-                return opResult;
-        }
-        if (!endpoint_mapping[0].present) {
-                usb_log_error("Not accepting device, " \
-                    "cannot understand what is happenning");
-                return EREFUSED;
-        }
-
         free(descriptors);
         return EOK;
+}
+
+/**
+ * Initialize hub device driver fibril
+ *
+ * Creates hub representation and fibril that periodically checks hub`s status.
+ * Hub representation is passed to the fibril.
+ * @param usb_dev generic usb device information
+ * @return error code
+ */
+int usb_hub_add_device(usb_device_t * usb_dev){
+        if(!usb_dev) return EINVAL;
+        usb_hub_info_t * hub_info = usb_hub_info_create(usb_dev);
+        //create hc connection
+        usb_log_debug("Initializing USB wire abstraction.\n");
+        int opResult = usb_hc_connection_initialize_from_device(
+                        &hub_info->connection,
+                        hub_info->usb_device->ddf_dev);
+        if(opResult != EOK){
+                usb_log_error("could not initialize connection to device, errno %d\n",
+                                opResult);
+                free(hub_info);
+                return opResult;
+        }
         
-}
-
-
-/**
- * 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(ddf_dev_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;
-        result->device = device;
-        result->is_default_address_used = false;
-
-        //result->usb_device = usb_new(usb_hcd_attached_device_info_t);
-        size_t received_size;
-
-        // get hub descriptor
-        usb_log_debug("creating serialized descripton");
-        void * serialized_descriptor = malloc(USB_HUB_MAX_DESCRIPTOR_SIZE);
-        usb_hub_descriptor_t * descriptor;
-        usb_log_debug("starting control transaction");
-        usb_endpoint_pipe_start_session(&result->endpoints.control);
-        opResult = usb_request_set_configuration(&result->endpoints.control, 1);
-        assert(opResult == EOK);
-
-        opResult = usb_request_get_descriptor(&result->endpoints.control,
-                        USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_DEVICE,
-                        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) {
-                usb_log_error("failed when receiving hub descriptor, badcode = %d",
-                                opResult);
-                free(serialized_descriptor);
-                free(result);
-                return NULL;
-        }
-        usb_log_debug2("deserializing descriptor");
-        descriptor = usb_deserialize_hub_desriptor(serialized_descriptor);
-        if(descriptor==NULL){
-                usb_log_warning("could not deserialize descriptor ");
-                free(result);
-                return NULL;
-        }
-
-        usb_log_info("setting port count to %d",descriptor->ports_count);
-        result->port_count = descriptor->ports_count;
-        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].handle=0;
-                result->attached_devs[i].address=0;
-        }
-        usb_log_debug2("freeing data");
-        free(serialized_descriptor);
-        free(descriptor->devices_removable);
-        free(descriptor);
-
-        //finish
-
-        usb_log_info("hub info created");
-
-        return result;
-}
-
-/**
- * Create hub representation and add it into hub list
- * @param dev
- * @return
- */
-int usb_add_hub_device(ddf_dev_t *dev) {
-        usb_log_info("add_hub_device(handle=%d)", (int) dev->handle);
-
-        //dev->ops = &hub_device_ops;
-        (void) hub_device_ops;
-
-        usb_hub_info_t * hub_info = usb_create_hub_info(dev);
-        if(!hub_info){
-                return EINTR;
-        }
-
-        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){
-                usb_log_error("could not get configuration descriptors, %d",
-                                opResult);
-                return opResult;
-        }
-        //power ports
-        usb_device_request_setup_packet_t request;
-        int port;
-        for (port = 1; port < hub_info->port_count+1; ++port) {
-                usb_hub_set_power_port_request(&request, port);
-                opResult = usb_endpoint_pipe_control_write(&hub_info->endpoints.control,
-                                &request,sizeof(usb_device_request_setup_packet_t), NULL, 0);
-                usb_log_info("powering port %d",port);
-                if (opResult != EOK) {
-                        usb_log_warning("something went wrong when setting hub`s %dth port", port);
-                }
-        }
-        //ports powered, hub seems to be enabled
-        usb_endpoint_pipe_end_session(&hub_info->endpoints.control);
-
-        //add the hub to list
-        //is this needed now?
-        fibril_mutex_lock(&usb_hub_list_lock);
-        usb_lst_append(&usb_hub_list, hub_info);
-        fibril_mutex_unlock(&usb_hub_list_lock);
-        usb_log_debug("hub info added to list");
-
+        usb_endpoint_pipe_start_session(hub_info->control_pipe);
+        //set hub configuration
+        opResult = usb_hub_set_configuration(hub_info);
+        if(opResult!=EOK){
+                usb_log_error("could not set hub configuration, errno %d\n",opResult);
+                free(hub_info);
+                return opResult;
+        }
+        //get port count and create attached_devs
+        opResult = usb_hub_get_hub_specific_info(hub_info);
+        if(opResult!=EOK){
+                usb_log_error("could not set hub configuration, errno %d\n",opResult);
+                free(hub_info);
+                return opResult;
+        }
+        usb_endpoint_pipe_end_session(hub_info->control_pipe);
+
+
+        /// \TODO what is this?
         usb_log_debug("adding to ddf");
-        ddf_fun_t *hub_fun = ddf_fun_create(dev, fun_exposed, "hub");
+        ddf_fun_t *hub_fun = ddf_fun_create(hub_info->usb_device->ddf_dev,
+                        fun_exposed, "hub");
         assert(hub_fun != NULL);
         hub_fun->ops = NULL;
@@ -349 +254 @@
         assert(rc == EOK);
 
+        //create fibril for the hub control loop
         fid_t fid = fibril_create(usb_hub_control_loop, hub_info);
         if (fid == 0) {
@@ -355 +261 @@
         }
         fibril_add_ready(fid);
-
         usb_log_debug("hub fibril created");
-        //(void)hub_info;
-        //usb_hub_check_hub_changes();
-        
-        usb_log_info("hub dev added");
-        //address is lost...
-        usb_log_debug("\taddress %d, has %d ports ",
-                        //hub_info->endpoints.control.,
-                        hub_info->port_count);
-
+        usb_log_debug("has %d ports ",hub_info->port_count);
         return EOK;
-        //return ENOTSUP;
 }
 
@@ -388 +284 @@
         int opResult = usb_hc_release_default_address(&hub->connection);
         if(opResult!=EOK){
-                usb_log_error("could not release default address, errno %d",opResult);
+                usb_log_error("could not release default address, errno %d\n",opResult);
                 return opResult;
         }
@@ -405 +301 @@
         //if this hub already uses default address, it cannot request it once more
         if(hub->is_default_address_used) return;
-        int opResult = usb_hub_clear_port_feature(&hub->endpoints.control,
+        usb_log_info("some connection changed\n");
+        assert(hub->control_pipe->hc_phone);
+        int opResult = usb_hub_clear_port_feature(hub->control_pipe,
                                 port, USB_HUB_FEATURE_C_PORT_CONNECTION);
         if(opResult != EOK){
-                usb_log_warning("could not clear port-change-connection flag");
-        }
-
+                usb_log_warning("could not clear port-change-connection flag\n");
+        }
         usb_device_request_setup_packet_t request;
-        usb_log_info("some connection changed");
-        assert(hub->endpoints.control.hc_phone);
+        
         //get default address
         opResult = usb_hc_reserve_default_address(&hub->connection, speed);
         
         if (opResult != EOK) {
-                usb_log_warning("cannot assign default address, it is probably used %d",
+                usb_log_warning("cannot assign default address, it is probably used %d\n",
                                 opResult);
                 return;
@@ -426 +322 @@
         usb_hub_set_reset_port_request(&request, port);
         opResult = usb_endpoint_pipe_control_write(
-                        &hub->endpoints.control,
+                        hub->control_pipe,
                         &request,sizeof(usb_device_request_setup_packet_t),
                         NULL, 0
                         );
         if (opResult != EOK) {
-                usb_log_error("something went wrong when reseting a port %d",opResult);
+                usb_log_error("something went wrong when reseting a port %d\n",opResult);
                 //usb_hub_release_default_address(hc);
                 usb_hub_release_default_address(hub);
@@ -445 +341 @@
  */
 static void usb_hub_finalize_add_device( usb_hub_info_t * hub,
-                uint16_t port, bool isLowSpeed) {
+                uint16_t port, usb_speed_t speed) {
 
         int opResult;
-        usb_log_info("finalizing add device");
-        opResult = usb_hub_clear_port_feature(&hub->endpoints.control,
+        usb_log_info("finalizing add device\n");
+        opResult = usb_hub_clear_port_feature(hub->control_pipe,
             port, USB_HUB_FEATURE_C_PORT_RESET);
 
         if (opResult != EOK) {
-                usb_log_error("failed to clear port reset feature");
+                usb_log_error("failed to clear port reset feature\n");
                 usb_hub_release_default_address(hub);
                 return;
@@ -468 +364 @@
                         &new_device_connection);
         usb_endpoint_pipe_probe_default_control(&new_device_pipe);
-        /// \TODO get highspeed info
-        usb_speed_t speed = isLowSpeed?USB_SPEED_LOW:USB_SPEED_FULL;
-
 
         /* Request address from host controller. */
@@ -478 +371 @@
                         );
         if (new_device_address < 0) {
-                usb_log_error("failed to get free USB address");
+                usb_log_error("failed to get free USB address\n");
                 opResult = new_device_address;
                 usb_hub_release_default_address(hub);
                 return;
         }
-        usb_log_info("setting new address %d",new_device_address);
+        usb_log_info("setting new address %d\n",new_device_address);
         //opResult = usb_drv_req_set_address(hc, USB_ADDRESS_DEFAULT,
         //    new_device_address);
@@ -490 +383 @@
         usb_endpoint_pipe_end_session(&new_device_pipe);
         if (opResult != EOK) {
-                usb_log_error("could not set address for new device %d",opResult);
+                usb_log_error("could not set address for new device %d\n",opResult);
                 usb_hub_release_default_address(hub);
                 return;
@@ -505 +398 @@
         //??
     opResult = usb_device_register_child_in_devman(new_device_address,
-            hub->connection.hc_handle, hub->device, &child_handle,
+            hub->connection.hc_handle, hub->usb_device->ddf_dev, &child_handle,
             NULL, NULL, NULL);
 
         if (opResult != EOK) {
-                usb_log_error("could not start driver for new device %d",opResult);
+                usb_log_error("could not start driver for new device %d\n",opResult);
                 return;
         }
@@ -520 +413 @@
                         &hub->attached_devs[port]);
         if (opResult != EOK) {
-                usb_log_error("could not assign address of device in hcd %d",opResult);
-                return;
-        }
-        usb_log_info("new device address %d, handle %zu",
+                usb_log_error("could not assign address of device in hcd %d\n",opResult);
+                return;
+        }
+        usb_log_info("new device address %d, handle %zu\n",
             new_device_address, child_handle);
 
@@ -537 +430 @@
     usb_hub_info_t * hub,uint16_t port) {
 
-        int opResult = usb_hub_clear_port_feature(&hub->endpoints.control,
+        int opResult = usb_hub_clear_port_feature(hub->control_pipe,
                                 port, USB_HUB_FEATURE_C_PORT_CONNECTION);
         if(opResult != EOK){
-                usb_log_warning("could not clear port-change-connection flag");
+                usb_log_warning("could not clear port-change-connection flag\n");
         }
         /** \TODO remove device from device manager - not yet implemented in
@@ -559 +452 @@
                  */
         }else{
-                usb_log_warning("this is strange, disconnected device had no address");
+                usb_log_warning("this is strange, disconnected device had no address\n");
                 //device was disconnected before it`s port was reset - return default address
                 usb_hub_release_default_address(hub);
@@ -577 +470 @@
                 uint16_t port){
         int opResult;
-        opResult = usb_hub_clear_port_feature(&hub->endpoints.control,
+        opResult = usb_hub_clear_port_feature(hub->control_pipe,
             port, USB_HUB_FEATURE_PORT_POWER);
         if(opResult!=EOK){
-                usb_log_error("cannot power off port %d;  %d",
+                usb_log_error("cannot power off port %d;  %d\n",
                                 port, opResult);
         }
@@ -593 +486 @@
 static void usb_hub_process_interrupt(usb_hub_info_t * hub, 
         uint16_t port) {
-        usb_log_debug("interrupt at port %d", port);
+        usb_log_debug("interrupt at port %d\n", port);
         //determine type of change
-        usb_endpoint_pipe_t *pipe = &hub->endpoints.control;
+        usb_endpoint_pipe_t *pipe = hub->control_pipe;
         
         int opResult;
@@ -612 +505 @@
                         );
         if (opResult != EOK) {
-                usb_log_error("could not get port status");
+                usb_log_error("could not get port status\n");
                 return;
         }
         if (rcvd_size != sizeof (usb_port_status_t)) {
-                usb_log_error("received status has incorrect size");
+                usb_log_error("received status has incorrect size\n");
                 return;
         }
@@ -622 +515 @@
         if (usb_port_connect_change(&status)) {
                 if (usb_port_dev_connected(&status)) {
-                        usb_log_info("some connection changed");
+                        usb_log_info("some connection changed\n");
                         usb_hub_init_add_device(hub, port, usb_port_speed(&status));
                 } else {
@@ -634 +527 @@
                         usb_hub_over_current(hub,port);
                 }else{
-                        usb_log_info("over current condition was auto-resolved on port %d",
+                        usb_log_info("over current condition was auto-resolved on port %d\n",
                                         port);
                 }
@@ -642 +535 @@
                 usb_log_info("port reset complete");
                 if (usb_port_enabled(&status)) {
-                        usb_hub_finalize_add_device(hub, port, usb_port_low_speed(&status));
+                        usb_hub_finalize_add_device(hub, port, usb_port_speed(&status));
                 } else {
-                        usb_log_warning("port reset, but port still not enabled");
+                        usb_log_warning("port reset, but port still not enabled\n");
                 }
         }
@@ -653 +546 @@
         usb_port_set_dev_connected(&status, false);
         if (status>>16) {
-                usb_log_info("there was some unsupported change on port %d: %X",
+                usb_log_info("there was some unsupported change on port %d: %X\n",
                                 port,status);
 
         }
-        /// \TODO handle other changes - is there any?
 }
 
@@ -668 +560 @@
 int usb_hub_check_hub_changes(usb_hub_info_t * hub_info){
         int opResult;
-        opResult = usb_endpoint_pipe_start_session(&hub_info->endpoints.status_change);
+        opResult = usb_endpoint_pipe_start_session(
+                        hub_info->status_change_pipe);
         if(opResult != EOK){
-                usb_log_error("could not initialize communication for hub; %d",
+                usb_log_error("could not initialize communication for hub; %d\n",
                                 opResult);
                 return opResult;
@@ -686 +579 @@
          */
         opResult = usb_endpoint_pipe_read(
-                        &hub_info->endpoints.status_change,
+                        hub_info->status_change_pipe,
                         change_bitmap, byte_length, &actual_size
                         );
@@ -692 +585 @@
         if (opResult != EOK) {
                 free(change_bitmap);
-                usb_log_warning("something went wrong while getting status of hub");
-                usb_endpoint_pipe_end_session(&hub_info->endpoints.status_change);
+                usb_log_warning("something went wrong while getting status of hub\n");
+                usb_endpoint_pipe_end_session(hub_info->status_change_pipe);
                 return opResult;
         }
         unsigned int port;
-        opResult = usb_endpoint_pipe_start_session(&hub_info->endpoints.control);
-        if(opResult!=EOK){
-                usb_log_error("could not start control pipe session %d", opResult);
-                usb_endpoint_pipe_end_session(&hub_info->endpoints.status_change);
+        opResult = usb_endpoint_pipe_start_session(hub_info->control_pipe);
+        if(opResult!=EOK){
+                usb_log_error("could not start control pipe session %d\n", opResult);
+                usb_endpoint_pipe_end_session(hub_info->status_change_pipe);
                 return opResult;
         }
         opResult = usb_hc_connection_open(&hub_info->connection);
         if(opResult!=EOK){
-                usb_log_error("could not start host controller session %d",
+                usb_log_error("could not start host controller session %d\n",
                                 opResult);
-                usb_endpoint_pipe_end_session(&hub_info->endpoints.control);
-                usb_endpoint_pipe_end_session(&hub_info->endpoints.status_change);
+                usb_endpoint_pipe_end_session(hub_info->control_pipe);
+                usb_endpoint_pipe_end_session(hub_info->status_change_pipe);
                 return opResult;
         }
@@ -722 +615 @@
         }
         usb_hc_connection_close(&hub_info->connection);
-        usb_endpoint_pipe_end_session(&hub_info->endpoints.control);
-        usb_endpoint_pipe_end_session(&hub_info->endpoints.status_change);
+        usb_endpoint_pipe_end_session(hub_info->control_pipe);
+        usb_endpoint_pipe_end_session(hub_info->status_change_pipe);
         free(change_bitmap);
         return EOK;