Changes in uspace/drv/usbhub/usbhub.c [6bb83c7:357a302] in mainline

File:

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

uspace/drv/usbhub/usbhub.c

@@ -39 +39 @@
 
 #include <usb_iface.h>
+#include <usb/ddfiface.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>
 
@@ -50 +50 @@
 #include "port_status.h"
 #include "usb/usb.h"
-#include "usb/pipes.h"
-
-static usb_iface_t hub_usb_iface = {
-        .get_hc_handle = usb_drv_find_hc
-};
 
 static device_ops_t hub_device_ops = {
-        .interfaces[USB_DEV_IFACE] = &hub_usb_iface
+        .interfaces[USB_DEV_IFACE] = &usb_iface_hub_impl
 };
 
@@ -66 +61 @@
 //*********************************************
 
-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->device_connection,
-                        device);
-        usb_hc_connection_initialize_from_device(&result->connection,
-                        device);
-        usb_endpoint_pipe_initialize_default_control(&result->endpoints.control,
-            &result->device_connection);
-        
-
         //result->device = device;
         result->port_count = -1;
@@ -81 +68 @@
         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
 
@@ -91 +91 @@
         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) {
@@ -119 +111 @@
         dprintf(USB_LOG_LEVEL_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));
+        result->attached_devs = (usb_hub_attached_device_t*)
+            malloc((result->port_count+1) * sizeof(usb_hub_attached_device_t));
         int i;
         for(i=0;i<result->port_count+1;++i){
-                result->attached_devs[i].handle=0;
+                result->attached_devs[i].devman_handle=0;
                 result->attached_devs[i].address=0;
         }
@@ -148 +140 @@
         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
@@ -162 +158 @@
         // 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){
@@ -175 +171 @@
         /// \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){
@@ -183 +179 @@
         }
         //set configuration
-        opResult = usb_request_set_configuration(&hub_info->endpoints.control,
+        opResult = usb_drv_req_set_configuration(hc, target.address,
     config_descriptor.configuration_number);
 
@@ -193 +189 @@
         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) {
@@ -202 +197 @@
         //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
@@ -217 +211 @@
 
         dprintf(USB_LOG_LEVEL_INFO, "hub dev added");
-        //address is lost...
         dprintf(USB_LOG_LEVEL_DEBUG, "\taddress %d, has %d ports ",
-                        //hub_info->endpoints.control.,
+                        hub_info->address,
                         hub_info->port_count);
         dprintf(USB_LOG_LEVEL_DEBUG, "\tused configuration %d",config_descriptor.configuration_number);
@@ -256 +249 @@
  * @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");
-        assert(hub->endpoints.control.hc_phone);
         //get default address
-        //opResult = usb_drv_reserve_default_address(hc);
-        opResult = usb_hc_reserve_default_address(&hub->connection, false);
+        opResult = usb_drv_reserve_default_address(hc);
         if (opResult != EOK) {
                 dprintf(USB_LOG_LEVEL_WARNING, "cannot assign default address, it is probably used");
@@ -270 +261 @@
         //reset port
         usb_hub_set_reset_port_request(&request, port);
-        opResult = usb_endpoint_pipe_control_write(
-                        &hub->endpoints.control,
-                        &request,sizeof(usb_device_request_setup_packet_t),
+        opResult = usb_drv_sync_control_write(
+                        hc, target,
+                        &request,
                         NULL, 0
                         );
         if (opResult != EOK) {
                 dprintf(USB_LOG_LEVEL_ERROR, "something went wrong when reseting a port");
-                //usb_hub_release_default_address(hc);
-                usb_hc_release_default_address(&hub->connection);
+                usb_hub_release_default_address(hc);
         }
 }
@@ -289 +279 @@
  */
 static void usb_hub_finalize_add_device( usb_hub_info_t * hub,
-                uint16_t port) {
+                int hc, uint16_t port, usb_target_t target) {
 
         int opResult;
         dprintf(USB_LOG_LEVEL_INFO, "finalizing add device");
-        opResult = usb_hub_clear_port_feature(&hub->endpoints.control,
+        opResult = usb_hub_clear_port_feature(hc, target.address,
             port, USB_HUB_FEATURE_C_PORT_RESET);
-
         if (opResult != EOK) {
                 dprintf(USB_LOG_LEVEL_ERROR, "failed to clear port reset feature");
-                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,
-                        false/// \TODO fullspeed??
-                        );
+                usb_hub_release_default_address(hc);
+                return;
+        }
+
+        /* Request address at from host controller. */
+        usb_address_t new_device_address = usb_drv_request_address(hc);
         if (new_device_address < 0) {
                 dprintf(USB_LOG_LEVEL_ERROR, "failed to get free USB address");
                 opResult = new_device_address;
-                usb_hc_release_default_address(&hub->connection);
+                usb_hub_release_default_address(hc);
                 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_request_set_address(&new_device_pipe,new_device_address);
+        opResult = usb_drv_req_set_address(hc, USB_ADDRESS_DEFAULT,
+            new_device_address);
 
         if (opResult != EOK) {
                 dprintf(USB_LOG_LEVEL_ERROR, "could not set address for new device");
-                usb_hc_release_default_address(&hub->connection);
-                return;
-        }
-
-
-        //opResult = usb_hub_release_default_address(hc);
-        opResult = usb_hc_release_default_address(&hub->connection);
+                usb_hub_release_default_address(hc);
+                return;
+        }
+
+
+        opResult = usb_hub_release_default_address(hc);
         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,
-            hub->connection.hc_handle, hub->device, &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");
                 return;
         }
-        hub->attached_devs[port].handle = child_handle;
+        hub->attached_devs[port].devman_handle = child_handle;
         hub->attached_devs[port].address = new_device_address;
 
-        //opResult = usb_drv_bind_address(hc, new_device_address, child_handle);
-        opResult = usb_hc_register_device(
-                        &hub->connection,
-                        &hub->attached_devs[port]);
+        opResult = usb_drv_bind_address(hc, new_device_address, child_handle);
         if (opResult != EOK) {
                 dprintf(USB_LOG_LEVEL_ERROR, "could not assign address of device in hcd");
@@ -378 +350 @@
  */
 static void usb_hub_removed_device(
-    usb_hub_info_t * hub,uint16_t port) {
+    usb_hub_info_t * hub, int hc, uint16_t port, usb_target_t target) {
         //usb_device_request_setup_packet_t request;
         int opResult;
@@ -385 +357 @@
          * 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_hc_unregister_device(
-                                &hub->connection, hub->attached_devs[port].address);
+                opResult = usb_drv_release_address(hc,hub->attached_devs[port].address);
                 if(opResult != EOK) {
                         dprintf(USB_LOG_LEVEL_WARNING, "could not release address of " \
@@ -396 +367 @@
                 }
                 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_hc_release_default_address(&hub->connection);
+                usb_drv_release_default_address(hc);
         }
 }
@@ -411 +380 @@
  * @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
-        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_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
                         );
@@ -450 +409 @@
         //something connected/disconnected
         if (usb_port_connect_change(&status)) {
-                opResult = usb_hub_clear_port_feature(pipe,
+                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);
                 }
         }
@@ -464 +423 @@
                 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");
@@ -480 +439 @@
         /// \TODO handle other changes
         /// \TODO debug log for various situations
-        usb_endpoint_pipe_end_session(pipe);
-
 
 }
@@ -499 +456 @@
                 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;
@@ -514 +465 @@
                 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
@@ -530 +481 @@
                 void *change_bitmap = malloc(byte_length);
                 size_t actual_size;
-                //usb_handle_t handle;
+                usb_handle_t handle;
 
                 /*
                  * Send the request.
                  */
-                opResult = usb_endpoint_pipe_read(
-                                &hub_info->endpoints.status_change,
-                                change_bitmap, byte_length, &actual_size
-                                );
-
-                //usb_drv_async_wait_for(handle);
+                int opResult = usb_drv_async_interrupt_in(hc, target,
+                                change_bitmap, byte_length, &actual_size,
+                                &handle);
+
+                usb_drv_async_wait_for(handle);
 
                 if (opResult != EOK) {
@@ -553 +503 @@
                         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);
         }