Changeset 9ca8539 in mainline

Timestamp:

2011-05-27T08:40:18Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

74341ed

Parents:

1889786 (diff), ffca03c (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:

hub local power flag revisited

Location:

uspace/drv

Files:

• ohci/root_hub.c (modified) (2 diffs)
• usbhub/usbhub.c (modified) (4 diffs)

uspace/drv/ohci/root_hub.c

@@ -420 +420 @@
  * create answer to port status_request
  *
- * Copy content of corresponding port status register to answer buffer.
+ * Copy content of corresponding port status register to answer buffer. The
+ * format of the port status register and port status data is the same (
+ * see OHCI root hub and USB hub documentation).
  *
  * @param instance root hub instance
@@ -450 +452 @@
  * create answer to port status_request
  *
- * Copy content of hub status register to answer buffer.
+ * This copies flags in hub status register into the buffer. The format of the
+ * status register and status message is the same, according to USB hub
+ * specification and OHCI root hub specification.
  *
  * @param instance root hub instance

uspace/drv/usbhub/usbhub.c

@@ -67 +67 @@
     usb_hub_status_t status);
 
-static int usb_process_hub_power_change(usb_hub_info_t * hub_info,
+static int usb_process_hub_local_power_change(usb_hub_info_t * hub_info,
     usb_hub_status_t status);
 
@@ -386 +386 @@
         int opResult;
         if (usb_hub_is_status(status,USB_HUB_FEATURE_HUB_OVER_CURRENT)){
-                opResult = usb_hub_clear_feature(hub_info->control_pipe,
-                    USB_HUB_FEATURE_HUB_LOCAL_POWER);
-                if (opResult != EOK) {
-                        usb_log_error("cannot power off hub: %d\n",
-                            opResult);
+                //poweroff all ports
+                unsigned int port;
+                for(port = 1;port <= hub_info->port_count;++port){
+                        opResult = usb_hub_clear_port_feature(
+                            hub_info->control_pipe,port,
+                            USB_HUB_FEATURE_PORT_POWER);
+                        if (opResult != EOK) {
+                                usb_log_warning(
+                                    "cannot power off port %d;  %d\n",
+                                    port, opResult);
+                        }
                 }
         } else {
-                opResult = usb_hub_set_feature(hub_info->control_pipe,
-                    USB_HUB_FEATURE_HUB_LOCAL_POWER);
-                if (opResult != EOK) {
-                        usb_log_error("cannot power on hub: %d\n",
-                            opResult);
+                //power all ports
+                unsigned int port;
+                for(port = 1;port <= hub_info->port_count;++port){
+                        opResult = usb_hub_set_port_feature(
+                            hub_info->control_pipe,port,
+                            USB_HUB_FEATURE_PORT_POWER);
+                        if (opResult != EOK) {
+                                usb_log_warning(
+                                    "cannot power off port %d;  %d\n",
+                                    port, opResult);
+                        }
                 }
         }
@@ -404 +416 @@
 
 /**
- * process hub power change
- *
- * If the power has been lost, reestablish it.
- * If it was reestablished, re-power all ports.
+ * process hub local power change
+ *
+ * This change is ignored.
  * @param hub_info hub instance
  * @param status hub status bitmask
  * @return error code
  */
-static int usb_process_hub_power_change(usb_hub_info_t * hub_info,
+static int usb_process_hub_local_power_change(usb_hub_info_t * hub_info,
     usb_hub_status_t status) {
         int opResult = EOK;
-        if (!usb_hub_is_status(status,USB_HUB_FEATURE_HUB_LOCAL_POWER)) {
-                //restart power on hub
-                opResult = usb_hub_set_feature(hub_info->control_pipe,
-                    USB_HUB_FEATURE_HUB_LOCAL_POWER);
-                if (opResult != EOK) {
-                        usb_log_error("cannot power on hub: %d\n",
-                            opResult);
-                }
-        } else {//power reestablished on hub- restart ports
-                size_t port;
-                for (port = 1; port <= hub_info->port_count; ++port) {
-                        opResult = usb_hub_set_port_feature(
-                            hub_info->control_pipe,
-                            port, USB_HUB_FEATURE_PORT_POWER);
-                        if (opResult != EOK) {
-                                usb_log_error("Cannot power on port %zu: %s.\n",
-                                    port, str_error(opResult));
-                        }
-                }
-        }
-        if(opResult!=EOK){
-                return opResult;//no feature clearing
-        }
         opResult = usb_hub_clear_feature(hub_info->control_pipe,
             USB_HUB_FEATURE_C_HUB_LOCAL_POWER);
@@ -487 +475 @@
         if (
             usb_hub_is_status(status,16+USB_HUB_FEATURE_C_HUB_LOCAL_POWER)) {
-                usb_process_hub_power_change(hub_info, status);
+                usb_process_hub_local_power_change(hub_info, status);
         }
 }