Changes in uspace/drv/usbhub/usbhub.c [d81ef61c:28cb8bf7] in mainline

File:

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

uspace/drv/usbhub/usbhub.c

@@ -36 +36 @@
 #include <bool.h>
 #include <errno.h>
+#include <str_error.h>
 
 #include <usb_iface.h>
 #include <usb/usbdrv.h>
 #include <usb/descriptor.h>
+#include <usb/recognise.h>
 #include <usb/devreq.h>
-#include <usb/request.h>
 #include <usb/classes/hub.h>
 
@@ -48 +49 @@
 #include "port_status.h"
 #include "usb/usb.h"
-#include "usb/pipes.h"
 
 static usb_iface_t hub_usb_iface = {
@@ -64 +64 @@
 //*********************************************
 
-usb_hub_info_t * usb_create_hub_info(device_t * device) {
+usb_hub_info_t * usb_create_hub_info(device_t * device, int hc) {
         usb_hub_info_t* result = usb_new(usb_hub_info_t);
-        usb_device_connection_initialize_from_device(&result->connection, device);
-        usb_endpoint_pipe_initialize_default_control(&result->endpoints.control,
-            &result->connection);
-        
-
         //result->device = device;
         result->port_count = -1;
@@ -76 +71 @@
         result->device = device;
 
-        result->usb_device = usb_new(usb_hcd_attached_device_info_t);
-        
+
+        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;
+
         // get hub descriptor
 
@@ -86 +94 @@
         int opResult;
         dprintf(USB_LOG_LEVEL_DEBUG, "starting control transaction");
-        usb_endpoint_pipe_start_session(&result->endpoints.control);
-        opResult = usb_request_get_descriptor(&result->endpoints.control,
+        
+        opResult = usb_drv_req_get_descriptor(hc, addr,
                         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);
-
-        /* Initialize the interrupt endpoint. 
-        usb_endpoint_pipe_initalize(
-                &hub_data->endpoints->status_change,
-                &endpiont_descriptor, &hub_data->connection);
-
-         */ /// \TODO add this call
 
         if (opResult != EOK) {
@@ -143 +143 @@
         dev->ops = &hub_device_ops;
 
-
-        usb_hub_info_t * hub_info = usb_create_hub_info(dev);
-        usb_endpoint_pipe_start_session(&hub_info->endpoints.control);
+        //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);
         int port;
         int opResult;
-        //usb_target_t target;
-        //target.address = hub_info->usb_device->address;
-        //target.endpoint = 0;
+        usb_target_t target;
+        target.address = hub_info->address;
+        target.endpoint = 0;
 
         //get configuration descriptor
@@ -156 +161 @@
         // and all should be checked
         usb_standard_device_descriptor_t std_descriptor;
-        opResult = usb_request_get_device_descriptor(&hub_info->endpoints.control,
+        opResult = usb_drv_req_get_device_descriptor(hc, target.address,
             &std_descriptor);
         if(opResult!=EOK){
@@ -169 +174 @@
         /// \TODO check other configurations
         usb_standard_configuration_descriptor_t config_descriptor;
-        opResult = usb_request_get_bare_configuration_descriptor(
-            &hub_info->endpoints.control, 0,
+        opResult = usb_drv_req_get_bare_configuration_descriptor(hc,
+        target.address, 0,
         &config_descriptor);
         if(opResult!=EOK){
@@ -177 +182 @@
         }
         //set configuration
-        opResult = usb_request_set_configuration(&hub_info->endpoints.control,
+        opResult = usb_drv_req_set_configuration(hc, target.address,
     config_descriptor.configuration_number);
 
@@ -187 +192 @@
         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);
+                opResult = usb_drv_sync_control_write(hc, target, &request, NULL, 0);
                 dprintf(USB_LOG_LEVEL_INFO, "powering port %d",port);
                 if (opResult != EOK) {
@@ -196 +200 @@
         //ports powered, hub seems to be enabled
 
-        usb_endpoint_pipe_end_session(&hub_info->endpoints.control);
-        //async_hangup(hc);
+        async_hangup(hc);
 
         //add the hub to list
@@ -212 +215 @@
         dprintf(USB_LOG_LEVEL_INFO, "hub dev added");
         dprintf(USB_LOG_LEVEL_DEBUG, "\taddress %d, has %d ports ",
-                        hub_info->usb_device->address,
+                        hub_info->address,
                         hub_info->port_count);
         dprintf(USB_LOG_LEVEL_DEBUG, "\tused configuration %d",config_descriptor.configuration_number);
@@ -249 +252 @@
  * @param target
  */
-static void usb_hub_init_add_device(usb_hub_info_t * hub, uint16_t port) {
+static void usb_hub_init_add_device(int hc, uint16_t port, usb_target_t target) {
         usb_device_request_setup_packet_t request;
         int opResult;
         dprintf(USB_LOG_LEVEL_INFO, "some connection changed");
         //get default address
-        ///////////////here ended pipe api upgrading
-        gfdl;gfdgldglglkfgklfjfkld;sjgk;fgklsjgld
         opResult = usb_drv_reserve_default_address(hc);
         if (opResult != EOK) {
@@ -317 +318 @@
         }
 
+        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_drv_register_child_in_devman(hc, hub->device,
-            new_device_address, &child_handle);
+        opResult = usb_device_register_child_in_devman(new_device_address,
+            hc_handle, hub->device, &child_handle);
         if (opResult != EOK) {
                 dprintf(USB_LOG_LEVEL_ERROR, "could not start driver for new device");
@@ -374 +383 @@
  * @param target
  */
-static void usb_hub_process_interrupt(usb_hub_info_t * hub, 
-        uint16_t port) {
+static void usb_hub_process_interrupt(usb_hub_info_t * hub, int hc,
+        uint16_t port, usb_address_t address) {
         dprintf(USB_LOG_LEVEL_DEBUG, "interrupt at port %d", port);
         //determine type of change
-        int opResult = usb_endpoint_pipe_start_session(&hub->endpoints.control);
-        usb_endpoint_pipe_t *pipe = &hub->endpoints.control;
-        if(opResult != EOK){
-                continue;
-        }
-
-        /*
         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_endpoint_pipe_control_read(
-                        pipe,
-                        &request, sizeof(usb_device_request_setup_packet_t),
+        opResult = usb_drv_sync_control_read(
+                        hc, target,
+                        &request,
                         &status, 4, &rcvd_size
                         );
@@ -412 +412 @@
         //something connected/disconnected
         if (usb_port_connect_change(&status)) {
-                opResult = usb_hub_clear_port_feature(&hub->endpoints.control,
+                opResult = usb_hub_clear_port_feature(hc, target.address,
                     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(hub, port);
+                        usb_hub_init_add_device(hc, port, target);
                 } else {
-                        usb_hub_removed_device(hub, port);
+                        usb_hub_removed_device(hub, hc, port, target);
                 }
         }
@@ -426 +426 @@
                 dprintf(USB_LOG_LEVEL_INFO, "port reset complete");
                 if (usb_port_enabled(&status)) {
-                        usb_hub_finalize_add_device(hub, port);
+                        usb_hub_finalize_add_device(hub, hc, port, target);
                 } else {
                         dprintf(USB_LOG_LEVEL_WARNING, "ERROR: port reset, but port still not enabled");
@@ -442 +442 @@
         /// \TODO handle other changes
         /// \TODO debug log for various situations
-        usb_endpoint_pipe_end_session(&hub->endpoints.control);
-
 
 }
@@ -461 +459 @@
                 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->usb_device->address;
+                target.address = hub_info->address;
                 target.endpoint = 1;/// \TODO get from endpoint descriptor
                 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
@@ -497 +489 @@
                  * Send the request.
                  */
-                opResult = usb_endpoint_pipe_read(
-                                &hub_info->endpoints.status_change,
+                int opResult = usb_drv_async_interrupt_in(hc, target,
                                 change_bitmap, byte_length, &actual_size,
-                                );
+                                &handle);
 
                 usb_drv_async_wait_for(handle);
@@ -515 +506 @@
                         if (interrupt) {
                                 usb_hub_process_interrupt(
-                                        hub_info, port);
+                                        hub_info, hc, port, hub_info->address);
                         }
                 }
-                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);
         }