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

File:

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

uspace/drv/usbhub/usbhub.c

@@ -224 +224 @@
         }
         
-        usb_endpoint_pipe_start_session(hub_info->control_pipe);
+        usb_pipe_start_session(hub_info->control_pipe);
         //set hub configuration
         opResult = usb_hub_set_configuration(hub_info);
@@ -239 +239 @@
                 return opResult;
         }
-        usb_endpoint_pipe_end_session(hub_info->control_pipe);
+        usb_pipe_end_session(hub_info->control_pipe);
 
 
@@ -321 +321 @@
         //reset port
         usb_hub_set_reset_port_request(&request, port);
-        opResult = usb_endpoint_pipe_control_write(
+        opResult = usb_pipe_control_write(
                         hub->control_pipe,
                         &request,sizeof(usb_device_request_setup_packet_t),
@@ -354 +354 @@
         }
         //create connection to device
-        usb_endpoint_pipe_t new_device_pipe;
+        usb_pipe_t new_device_pipe;
         usb_device_connection_t new_device_connection;
         usb_device_connection_initialize_on_default_address(
@@ -360 +360 @@
                         &hub->connection
                         );
-        usb_endpoint_pipe_initialize_default_control(
+        usb_pipe_initialize_default_control(
                         &new_device_pipe,
                         &new_device_connection);
-        usb_endpoint_pipe_probe_default_control(&new_device_pipe);
+        usb_pipe_probe_default_control(&new_device_pipe);
 
         /* Request address from host controller. */
@@ -379 +379 @@
         //opResult = usb_drv_req_set_address(hc, USB_ADDRESS_DEFAULT,
         //    new_device_address);
-        usb_endpoint_pipe_start_session(&new_device_pipe);
+        usb_pipe_start_session(&new_device_pipe);
         opResult = usb_request_set_address(&new_device_pipe,new_device_address);
-        usb_endpoint_pipe_end_session(&new_device_pipe);
+        usb_pipe_end_session(&new_device_pipe);
         if (opResult != EOK) {
                 usb_log_error("could not set address for new device %d\n",opResult);
@@ -488 +488 @@
         usb_log_debug("interrupt at port %d\n", port);
         //determine type of change
-        usb_endpoint_pipe_t *pipe = hub->control_pipe;
+        usb_pipe_t *pipe = hub->control_pipe;
         
         int opResult;
@@ -499 +499 @@
         //endpoint 0
 
-        opResult = usb_endpoint_pipe_control_read(
+        opResult = usb_pipe_control_read(
                         pipe,
                         &request, sizeof(usb_device_request_setup_packet_t),
@@ -560 +560 @@
 int usb_hub_check_hub_changes(usb_hub_info_t * hub_info){
         int opResult;
-        opResult = usb_endpoint_pipe_start_session(
+        opResult = usb_pipe_start_session(
                         hub_info->status_change_pipe);
         if(opResult != EOK){
@@ -578 +578 @@
          * Send the request.
          */
-        opResult = usb_endpoint_pipe_read(
+        opResult = usb_pipe_read(
                         hub_info->status_change_pipe,
                         change_bitmap, byte_length, &actual_size
@@ -586 +586 @@
                 free(change_bitmap);
                 usb_log_warning("something went wrong while getting status of hub\n");
-                usb_endpoint_pipe_end_session(hub_info->status_change_pipe);
+                usb_pipe_end_session(hub_info->status_change_pipe);
                 return opResult;
         }
         unsigned int port;
-        opResult = usb_endpoint_pipe_start_session(hub_info->control_pipe);
+        opResult = usb_pipe_start_session(hub_info->control_pipe);
         if(opResult!=EOK){
                 usb_log_error("could not start control pipe session %d\n", opResult);
-                usb_endpoint_pipe_end_session(hub_info->status_change_pipe);
+                usb_pipe_end_session(hub_info->status_change_pipe);
                 return opResult;
         }
@@ -600 +600 @@
                 usb_log_error("could not start host controller session %d\n",
                                 opResult);
-                usb_endpoint_pipe_end_session(hub_info->control_pipe);
-                usb_endpoint_pipe_end_session(hub_info->status_change_pipe);
+                usb_pipe_end_session(hub_info->control_pipe);
+                usb_pipe_end_session(hub_info->status_change_pipe);
                 return opResult;
         }
@@ -615 +615 @@
         }
         usb_hc_connection_close(&hub_info->connection);
-        usb_endpoint_pipe_end_session(hub_info->control_pipe);
-        usb_endpoint_pipe_end_session(hub_info->status_change_pipe);
+        usb_pipe_end_session(hub_info->control_pipe);
+        usb_pipe_end_session(hub_info->status_change_pipe);
         free(change_bitmap);
         return EOK;