Changes in uspace/drv/usbhub/usbhub.c [fbefd0e:09daa8b] in mainline

File:

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

uspace/drv/usbhub/usbhub.c

@@ -132 +132 @@
                 return opResult;
         }
-        usb_log_debug("setting port count to %d\n",descriptor->ports_count);
+        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*)
@@ -157 +157 @@
 static int usb_hub_set_configuration(usb_hub_info_t * hub_info){
         //device descriptor
-        usb_standard_device_descriptor_t *std_descriptor
-            = &hub_info->usb_device->descriptors.device;
-        usb_log_debug("hub has %d configurations\n",
-            std_descriptor->configuration_count);
-        if(std_descriptor->configuration_count<1){
+        usb_standard_device_descriptor_t std_descriptor;
+        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\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\n");
                 //shouldn`t I return?
-                //definitely
-                return EINVAL;
-        }
-
+        }
+
+        /* Retrieve full configuration descriptor. */
+        uint8_t *descriptors = NULL;
+        size_t descriptors_size = 0;
+        opResult = usb_request_get_full_configuration_descriptor_alloc(
+            &hub_info->usb_device->ctrl_pipe, 0,
+            (void **) &descriptors, &descriptors_size);
+        if (opResult != EOK) {
+                usb_log_error("Could not get configuration descriptor: %s.\n",
+                    str_error(opResult));
+                return opResult;
+        }
         usb_standard_configuration_descriptor_t *config_descriptor
-            = (usb_standard_configuration_descriptor_t *)
-            hub_info->usb_device->descriptors.configuration;
+            = (usb_standard_configuration_descriptor_t *) descriptors;
 
         /* Set configuration. */
-        int opResult = usb_request_set_configuration(
-            &hub_info->usb_device->ctrl_pipe,
+        opResult = usb_request_set_configuration(&hub_info->usb_device->ctrl_pipe,
             config_descriptor->configuration_number);
 
@@ -184 +197 @@
         usb_log_debug("\tused configuration %d\n",
                         config_descriptor->configuration_number);
-
+        free(descriptors);
         return EOK;
 }
@@ -211 +224 @@
         }
         
-        usb_pipe_start_session(hub_info->control_pipe);
+        usb_endpoint_pipe_start_session(hub_info->control_pipe);
         //set hub configuration
         opResult = usb_hub_set_configuration(hub_info);
@@ -226 +239 @@
                 return opResult;
         }
-        usb_pipe_end_session(hub_info->control_pipe);
+        usb_endpoint_pipe_end_session(hub_info->control_pipe);
 
 
         /// \TODO what is this?
-        usb_log_debug("Creating `hub' function.\n");
+        usb_log_debug("adding to ddf");
         ddf_fun_t *hub_fun = ddf_fun_create(hub_info->usb_device->ddf_dev,
                         fun_exposed, "hub");
@@ -244 +257 @@
         fid_t fid = fibril_create(usb_hub_control_loop, hub_info);
         if (fid == 0) {
-                usb_log_error("failed to start monitoring fibril for new hub.\n");
+                usb_log_error("failed to start monitoring fibril for new hub");
                 return ENOMEM;
         }
         fibril_add_ready(fid);
-        usb_log_debug("Hub fibril created.\n");
-
-        usb_log_info("Controlling hub `%s' (%d ports).\n",
-            hub_info->usb_device->ddf_dev->name, hub_info->port_count);
+        usb_log_debug("hub fibril created");
+        usb_log_debug("has %d ports ",hub_info->port_count);
         return EOK;
 }
@@ -290 +301 @@
         //if this hub already uses default address, it cannot request it once more
         if(hub->is_default_address_used) return;
-        usb_log_debug("some connection changed\n");
+        usb_log_info("some connection changed\n");
         assert(hub->control_pipe->hc_phone);
         int opResult = usb_hub_clear_port_feature(hub->control_pipe,
@@ -310 +321 @@
         //reset port
         usb_hub_set_reset_port_request(&request, port);
-        opResult = usb_pipe_control_write(
+        opResult = usb_endpoint_pipe_control_write(
                         hub->control_pipe,
                         &request,sizeof(usb_device_request_setup_packet_t),
@@ -333 +344 @@
 
         int opResult;
-        usb_log_debug("finalizing add device\n");
+        usb_log_info("finalizing add device\n");
         opResult = usb_hub_clear_port_feature(hub->control_pipe,
             port, USB_HUB_FEATURE_C_PORT_RESET);
@@ -343 +354 @@
         }
         //create connection to device
-        usb_pipe_t new_device_pipe;
+        usb_endpoint_pipe_t new_device_pipe;
         usb_device_connection_t new_device_connection;
         usb_device_connection_initialize_on_default_address(
@@ -349 +360 @@
                         &hub->connection
                         );
-        usb_pipe_initialize_default_control(
+        usb_endpoint_pipe_initialize_default_control(
                         &new_device_pipe,
                         &new_device_connection);
-        usb_pipe_probe_default_control(&new_device_pipe);
+        usb_endpoint_pipe_probe_default_control(&new_device_pipe);
 
         /* Request address from host controller. */
@@ -365 +376 @@
                 return;
         }
-        usb_log_debug("setting new address %d\n",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);
-        usb_pipe_start_session(&new_device_pipe);
+        usb_endpoint_pipe_start_session(&new_device_pipe);
         opResult = usb_request_set_address(&new_device_pipe,new_device_address);
-        usb_pipe_end_session(&new_device_pipe);
+        usb_endpoint_pipe_end_session(&new_device_pipe);
         if (opResult != EOK) {
                 usb_log_error("could not set address for new device %d\n",opResult);
@@ -405 +416 @@
                 return;
         }
-        usb_log_info("Detected new device on `%s' (port %d), " \
-            "address %d (handle %llu).\n",
-            hub->usb_device->ddf_dev->name, (int) port,
+        usb_log_info("new device address %d, handle %zu\n",
             new_device_address, child_handle);
+
 }
 
@@ -478 +488 @@
         usb_log_debug("interrupt at port %d\n", port);
         //determine type of change
-        usb_pipe_t *pipe = hub->control_pipe;
+        usb_endpoint_pipe_t *pipe = hub->control_pipe;
         
         int opResult;
@@ -489 +499 @@
         //endpoint 0
 
-        opResult = usb_pipe_control_read(
+        opResult = usb_endpoint_pipe_control_read(
                         pipe,
                         &request, sizeof(usb_device_request_setup_packet_t),
@@ -505 +515 @@
         if (usb_port_connect_change(&status)) {
                 if (usb_port_dev_connected(&status)) {
-                        usb_log_debug("some connection changed\n");
+                        usb_log_info("some connection changed\n");
                         usb_hub_init_add_device(hub, port, usb_port_speed(&status));
                 } else {
@@ -517 +527 @@
                         usb_hub_over_current(hub,port);
                 }else{
-                        usb_log_debug("over current condition was auto-resolved on port %d\n",
+                        usb_log_info("over current condition was auto-resolved on port %d\n",
                                         port);
                 }
@@ -523 +533 @@
         //port reset
         if (usb_port_reset_completed(&status)) {
-                usb_log_debug("port reset complete\n");
+                usb_log_info("port reset complete");
                 if (usb_port_enabled(&status)) {
                         usb_hub_finalize_add_device(hub, port, usb_port_speed(&status));
@@ -550 +560 @@
 int usb_hub_check_hub_changes(usb_hub_info_t * hub_info){
         int opResult;
-        opResult = usb_pipe_start_session(
+        opResult = usb_endpoint_pipe_start_session(
                         hub_info->status_change_pipe);
         if(opResult != EOK){
@@ -568 +578 @@
          * Send the request.
          */
-        opResult = usb_pipe_read(
+        opResult = usb_endpoint_pipe_read(
                         hub_info->status_change_pipe,
                         change_bitmap, byte_length, &actual_size
@@ -576 +586 @@
                 free(change_bitmap);
                 usb_log_warning("something went wrong while getting status of hub\n");
-                usb_pipe_end_session(hub_info->status_change_pipe);
+                usb_endpoint_pipe_end_session(hub_info->status_change_pipe);
                 return opResult;
         }
         unsigned int port;
-        opResult = usb_pipe_start_session(hub_info->control_pipe);
+        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_pipe_end_session(hub_info->status_change_pipe);
+                usb_endpoint_pipe_end_session(hub_info->status_change_pipe);
                 return opResult;
         }
@@ -590 +600 @@
                 usb_log_error("could not start host controller session %d\n",
                                 opResult);
-                usb_pipe_end_session(hub_info->control_pipe);
-                usb_pipe_end_session(hub_info->status_change_pipe);
+                usb_endpoint_pipe_end_session(hub_info->control_pipe);
+                usb_endpoint_pipe_end_session(hub_info->status_change_pipe);
                 return opResult;
         }
@@ -605 +615 @@
         }
         usb_hc_connection_close(&hub_info->connection);
-        usb_pipe_end_session(hub_info->control_pipe);
-        usb_pipe_end_session(hub_info->status_change_pipe);
+        usb_endpoint_pipe_end_session(hub_info->control_pipe);
+        usb_endpoint_pipe_end_session(hub_info->status_change_pipe);
         free(change_bitmap);
         return EOK;