Changeset 6bb83c7 in mainline for uspace/drv/usbhub/usbhub.c

Timestamp:

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

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

070f11e, 62066b4

Parents:

50ba203

Message:

usbhub uses new api, it is compilable. cannot guarantee functionality

File:

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

uspace/drv/usbhub/usbhub.c

@@ -68 +68 @@
 usb_hub_info_t * usb_create_hub_info(device_t * device) {
         usb_hub_info_t* result = usb_new(usb_hub_info_t);
-        usb_device_connection_initialize_from_device(&result->connection, device);
+        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->connection);
+            &result->device_connection);
         
 
@@ -78 +81 @@
         result->device = device;
 
-<<<<<<< TREE
-        result->usb_device = usb_new(usb_hcd_attached_device_info_t);
+        //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;
-
->>>>>>> MERGE-SOURCE
         // get hub descriptor
 
@@ -134 +119 @@
         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;
         }
@@ -166 +151 @@
         usb_hub_info_t * hub_info = usb_create_hub_info(dev);
         usb_endpoint_pipe_start_session(&hub_info->endpoints.control);
+
         int port;
         int opResult;
-<<<<<<< TREE
         //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;
->>>>>>> MERGE-SOURCE
 
         //get configuration descriptor
@@ -237 +217 @@
 
         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);
@@ -279 +260 @@
         int opResult;
         dprintf(USB_LOG_LEVEL_INFO, "some connection changed");
+        assert(hub->endpoints.control.hc_phone);
         //get default address
-        ///////////////here ended pipe api upgrading
-        gfdl;gfdgldglglkfgklfjfkld;sjgk;fgklsjgld
-        opResult = usb_drv_reserve_default_address(hc);
+        //opResult = usb_drv_reserve_default_address(hc);
+        opResult = usb_hc_reserve_default_address(&hub->connection, false);
         if (opResult != EOK) {
                 dprintf(USB_LOG_LEVEL_WARNING, "cannot assign default address, it is probably used");
@@ -289 +270 @@
         //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);
         }
 }
@@ -307 +289 @@
  */
 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,
+                        false/// \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");
@@ -378 +378 @@
  */
 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;
@@ -385 +385 @@
          * 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 " \
@@ -395 +396 @@
                 }
                 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);
         }
 }
@@ -412 +415 @@
         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;
+        int opResult = usb_endpoint_pipe_start_session(pipe);
+        
         if(opResult != EOK){
-                continue;
+                dprintf(USB_LOG_LEVEL_ERROR, "cannot open pipe %d", opResult);
         }
 
@@ -446 +450 @@
         //something connected/disconnected
         if (usb_port_connect_change(&status)) {
-                opResult = usb_hub_clear_port_feature(&hub->endpoints.control,
+                opResult = usb_hub_clear_port_feature(pipe,
                     port, USB_HUB_FEATURE_C_PORT_CONNECTION);
                 // TODO: check opResult
@@ -476 +480 @@
         /// \TODO handle other changes
         /// \TODO debug log for various situations
-        usb_endpoint_pipe_end_session(&hub->endpoints.control);
+        usb_endpoint_pipe_end_session(pipe);
 
 
@@ -526 +530 @@
                 void *change_bitmap = malloc(byte_length);
                 size_t actual_size;
-                usb_handle_t handle;
+                //usb_handle_t handle;
 
                 /*
@@ -533 +537 @@
                 opResult = usb_endpoint_pipe_read(
                                 &hub_info->endpoints.status_change,
-                                change_bitmap, byte_length, &actual_size,
+                                change_bitmap, byte_length, &actual_size
                                 );
 
-                usb_drv_async_wait_for(handle);
+                //usb_drv_async_wait_for(handle);
 
                 if (opResult != EOK) {
@@ -549 +553 @@
                         if (interrupt) {
                                 usb_hub_process_interrupt(
-<<<<<<< TREE
                                         hub_info, port);
-=======
-                                        hub_info, hc, port, hub_info->address);
->>>>>>> MERGE-SOURCE
                         }
                 }