Changes in uspace/drv/usbhub/usbhub.c [42a3a57:4e900c1] in mainline

File:

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

uspace/drv/usbhub/usbhub.c

@@ -72 +72 @@
 int usb_hub_control_loop(void * hub_info_param){
         usb_hub_info_t * hub_info = (usb_hub_info_t*)hub_info_param;
-        int errorCode = EOK;
-
-        while(errorCode == EOK){
-                errorCode = usb_hub_check_hub_changes(hub_info);
+        while(true){
+                usb_hub_check_hub_changes(hub_info);
                 async_usleep(1000 * 1000 );/// \TODO proper number once
         }
-        dprintf(USB_LOG_LEVEL_ERROR,
-                                "something in ctrl loop went wrong, errno %d",errorCode);
         return 0;
 }
@@ -122 +118 @@
                 dprintf(USB_LOG_LEVEL_ERROR,
                                 "could not initialize connection to device endpoint, errno %d",opResult);
-                return opResult;
-        }
-
-        opResult = usb_endpoint_pipe_probe_default_control(&hub->endpoints.control);
-        if (opResult != EOK) {
-                dprintf(USB_LOG_LEVEL_ERROR, "failed probing endpoint 0, %d", opResult);
-                return opResult;
-        }
-
-        return EOK;
+        }
+        return opResult;
 }
 
@@ -384 +372 @@
  * @param target
  */
-static void usb_hub_init_add_device(usb_hub_info_t * hub, uint16_t port,
-                bool isLowSpeed) {
+static void usb_hub_init_add_device(usb_hub_info_t * hub, uint16_t port) {
         usb_device_request_setup_packet_t request;
         int opResult;
@@ -391 +378 @@
         assert(hub->endpoints.control.hc_phone);
         //get default address
-        usb_speed_t speed = isLowSpeed?USB_SPEED_LOW:USB_SPEED_FULL;
-        opResult = usb_hc_reserve_default_address(&hub->connection, speed);
+        //opResult = usb_drv_reserve_default_address(hc);
+        opResult = usb_hc_reserve_default_address(&hub->connection, USB_SPEED_LOW);
         
         if (opResult != EOK) {
@@ -443 +430 @@
                         &new_device_pipe,
                         &new_device_connection);
-        usb_endpoint_pipe_probe_default_control(&new_device_pipe);
         /// \TODO get highspeed info
         usb_speed_t speed = isLowSpeed?USB_SPEED_LOW:USB_SPEED_FULL;
@@ -451 +437 @@
         usb_address_t new_device_address = usb_hc_request_address(
                         &hub->connection,
-                        speed
+                        speed/// \TODO fullspeed??
                         );
         if (new_device_address < 0) {
@@ -515 +501 @@
 static void usb_hub_removed_device(
     usb_hub_info_t * hub,uint16_t port) {
-                
+        //usb_device_request_setup_packet_t request;
+        int opResult;
+        
         /** \TODO remove device from device manager - not yet implemented in
          * devide manager
@@ -522 +510 @@
         //close address
         if(hub->attached_devs[port].address!=0){
-                /*uncomment this code to use it when DDF allows device removal
+                //opResult = usb_drv_release_address(hc,hub->attached_devs[port].address);
                 opResult = usb_hc_unregister_device(
                                 &hub->connection, hub->attached_devs[port].address);
@@ -531 +519 @@
                 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");
@@ -601 +588 @@
                 if (usb_port_dev_connected(&status)) {
                         dprintf(USB_LOG_LEVEL_INFO, "some connection changed");
-                        usb_hub_init_add_device(hub, port, usb_port_low_speed(&status));
+                        usb_hub_init_add_device(hub, port);
                 } else {
                         usb_hub_removed_device(hub, port);
@@ -639 +626 @@
 /**
  * Check changes on particular hub
- * @param hub_info_param pointer to usb_hub_info_t structure
- * @return error code if there is problem when initializing communication with
- * hub, EOK otherwise
- */
-int usb_hub_check_hub_changes(usb_hub_info_t * hub_info){
+ * @param hub_info_param
+ */
+void usb_hub_check_hub_changes(usb_hub_info_t * hub_info){
         int opResult;
         opResult = usb_endpoint_pipe_start_session(&hub_info->endpoints.status_change);
@@ -649 +634 @@
                 dprintf(USB_LOG_LEVEL_ERROR,
                                 "could not initialize communication for hub; %d", opResult);
-                return opResult;
+                return;
         }
 
@@ -671 +656 @@
                 dprintf(USB_LOG_LEVEL_WARNING, "something went wrong while getting status of hub");
                 usb_endpoint_pipe_end_session(&hub_info->endpoints.status_change);
-                return opResult;
+                return;
         }
         unsigned int port;
@@ -679 +664 @@
                                 opResult);
                 usb_endpoint_pipe_end_session(&hub_info->endpoints.status_change);
-                return opResult;
+                return;
         }
         opResult = usb_hc_connection_open(&hub_info->connection);
@@ -687 +672 @@
                 usb_endpoint_pipe_end_session(&hub_info->endpoints.control);
                 usb_endpoint_pipe_end_session(&hub_info->endpoints.status_change);
-                return opResult;
+                return;
         }
 
@@ -703 +688 @@
         usb_endpoint_pipe_end_session(&hub_info->endpoints.status_change);
         free(change_bitmap);
-        return EOK;
 }