Changes in uspace/lib/usb/src/hub.c [9f9b31ad:3954a63b] in mainline

File:

• uspace/lib/usb/src/hub.c (modified) (6 diffs)

uspace/lib/usb/src/hub.c

@@ -142 +142 @@
             DEV_IFACE_ID(USBHC_DEV_IFACE),
             IPC_M_USBHC_RELEASE_ADDRESS, address);
-}
-
-static void unregister_control_endpoint_on_default_address(
-    usb_hc_connection_t *connection)
-{
-        usb_device_connection_t dev_conn;
-        int rc = usb_device_connection_initialize_on_default_address(&dev_conn,
-            connection);
-        if (rc != EOK) {
-                return;
-        }
-
-        usb_pipe_t ctrl_pipe;
-        rc = usb_pipe_initialize_default_control(&ctrl_pipe, &dev_conn);
-        if (rc != EOK) {
-                return;
-        }
-
-        usb_pipe_unregister(&ctrl_pipe, connection);
 }
 
@@ -254 +235 @@
                 goto leave_release_default_address;
         }
-
-        /* Before sending any traffic, we need to register this
-         * endpoint.
-         */
-        rc = usb_pipe_register(&ctrl_pipe, 0, connection);
-        if (rc != EOK) {
-                rc = EREFUSED;
-                goto leave_release_default_address;
-        }
         rc = usb_pipe_probe_default_control(&ctrl_pipe);
         if (rc != EOK) {
@@ -272 +244 @@
         if (rc != EOK) {
                 rc = ENOTCONN;
-                goto leave_unregister_endpoint;
+                goto leave_release_default_address;
         }
 
@@ -284 +256 @@
 
         /*
-         * Register the control endpoint for the new device.
-         */
-        rc = usb_pipe_register(&ctrl_pipe, 0, connection);
-        if (rc != EOK) {
-                rc = EREFUSED;
-                goto leave_unregister_endpoint;
-        }
-
-        /*
-         * Release the original endpoint.
-         */
-        unregister_control_endpoint_on_default_address(connection);
-
-        /*
          * Once the address is changed, we can return the default address.
          */
         usb_hc_release_default_address(connection);
-
 
         /*
@@ -316 +273 @@
         }
 
-
-
         /*
          * And now inform the host controller about the handle.
@@ -353 +308 @@
         usb_pipe_end_session(&ctrl_pipe);
 
-leave_unregister_endpoint:
-        usb_pipe_unregister(&ctrl_pipe, connection);
-
 leave_release_default_address:
         usb_hc_release_default_address(connection);