Changeset d142e75 in mainline

Timestamp:

2011-03-17T13:23:05Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

87037c48

Parents:

eb2a48a (diff), 039c66c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Development branch changes

Location:

uspace

Files:

• doc/doxygroups.h (modified) (1 diff)
• drv/usbhub/usbhub.c (modified) (14 diffs)
• drv/usbhub/usbhub.h (modified) (1 diff)

uspace/doc/doxygroups.h

@@ -256 +256 @@
          */
 
-        /**
-         * @defgroup drvusbuhcirh UHCI root hub driver
-         * @ingroup drvusbuhci
-         * @brief Driver for UHCI complaint root hub.
-         */
-
-        /**
-         * @defgroup drvusbuhcirh UHCI host controller driver
-         * @ingroup drvusbuhci
-         * @brief Driver for UHCI complaint USB host controller.
-         */
+                /**
+                 * @defgroup drvusbuhcirh UHCI root hub driver
+                 * @ingroup drvusbuhci
+                 * @brief Driver for UHCI complaint root hub.
+                 */
+
+                /**
+                 * @defgroup drvusbuhcihc UHCI host controller driver
+                 * @ingroup drvusbuhci
+                 * @brief Driver for UHCI complaint USB host controller.
+                 */
 
         /**

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;
-        while(true){
-                usb_hub_check_hub_changes(hub_info);
+        int errorCode = EOK;
+
+        while(errorCode == EOK){
+                errorCode = 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;
 }
@@ -380 +384 @@
  * @param target
  */
-static void usb_hub_init_add_device(usb_hub_info_t * hub, uint16_t port) {
+static void usb_hub_init_add_device(usb_hub_info_t * hub, uint16_t port,
+                bool isLowSpeed) {
         usb_device_request_setup_packet_t request;
         int opResult;
@@ -386 +391 @@
         assert(hub->endpoints.control.hc_phone);
         //get default address
-        //opResult = usb_drv_reserve_default_address(hc);
-        opResult = usb_hc_reserve_default_address(&hub->connection, USB_SPEED_LOW);
+        usb_speed_t speed = isLowSpeed?USB_SPEED_LOW:USB_SPEED_FULL;
+        opResult = usb_hc_reserve_default_address(&hub->connection, speed);
         
         if (opResult != EOK) {
@@ -446 +451 @@
         usb_address_t new_device_address = usb_hc_request_address(
                         &hub->connection,
-                        speed/// \TODO fullspeed??
+                        speed
                         );
         if (new_device_address < 0) {
@@ -510 +515 @@
 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
@@ -519 +522 @@
         //close address
         if(hub->attached_devs[port].address!=0){
-                //opResult = usb_drv_release_address(hc,hub->attached_devs[port].address);
+                /*uncomment this code to use it when DDF allows device removal
                 opResult = usb_hc_unregister_device(
                                 &hub->connection, hub->attached_devs[port].address);
@@ -528 +531 @@
                 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");
@@ -597 +601 @@
                 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(hub, port, usb_port_low_speed(&status));
                 } else {
                         usb_hub_removed_device(hub, port);
@@ -635 +639 @@
 /**
  * Check changes on particular hub
- * @param hub_info_param
- */
-void usb_hub_check_hub_changes(usb_hub_info_t * hub_info){
+ * @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){
         int opResult;
         opResult = usb_endpoint_pipe_start_session(&hub_info->endpoints.status_change);
@@ -643 +649 @@
                 dprintf(USB_LOG_LEVEL_ERROR,
                                 "could not initialize communication for hub; %d", opResult);
-                return;
+                return opResult;
         }
 
@@ -665 +671 @@
                 dprintf(USB_LOG_LEVEL_WARNING, "something went wrong while getting status of hub");
                 usb_endpoint_pipe_end_session(&hub_info->endpoints.status_change);
-                return;
+                return opResult;
         }
         unsigned int port;
@@ -673 +679 @@
                                 opResult);
                 usb_endpoint_pipe_end_session(&hub_info->endpoints.status_change);
-                return;
+                return opResult;
         }
         opResult = usb_hc_connection_open(&hub_info->connection);
@@ -681 +687 @@
                 usb_endpoint_pipe_end_session(&hub_info->endpoints.control);
                 usb_endpoint_pipe_end_session(&hub_info->endpoints.status_change);
-                return;
+                return opResult;
         }
 
@@ -697 +703 @@
         usb_endpoint_pipe_end_session(&hub_info->endpoints.status_change);
         free(change_bitmap);
+        return EOK;
 }
 

uspace/drv/usbhub/usbhub.h

@@ -87 +87 @@
 
 /**
- * check changes on specified hub
+ * Check changes on specified 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
  */
-void usb_hub_check_hub_changes(usb_hub_info_t * hub_info_param);
+int usb_hub_check_hub_changes(usb_hub_info_t * hub_info_param);