Changeset 63862a0 in mainline

Timestamp:

2011-05-30T20:01:42Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

06f9d8fb, d754f59

Parents:

173922f (diff), be8d907 (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:

removed global hub powering

Location:

uspace/drv/usbhub

Files:

• ports.c (modified) (1 diff)
• ports.h (modified) (1 diff)
• usbhub.c (modified) (3 diffs)

uspace/drv/usbhub/ports.c

@@ -95 +95 @@
  * @param port port number, starting from 1
  */
-void usb_hub_process_interrupt(usb_hub_info_t *hub,
+void usb_hub_process_port_interrupt(usb_hub_info_t *hub,
     uint16_t port) {
         usb_log_debug("Interrupt at port %zu\n", (size_t) port);

uspace/drv/usbhub/ports.h

@@ -70 +70 @@
 
 
-void usb_hub_process_interrupt(usb_hub_info_t *hub,
+void usb_hub_process_port_interrupt(usb_hub_info_t *hub,
         uint16_t port);
 

uspace/drv/usbhub/usbhub.c

@@ -168 +168 @@
                 bool change = (change_bitmap[port / 8] >> (port % 8)) % 2;
                 if (change) {
-                        usb_hub_process_interrupt(hub, port);
+                        usb_hub_process_port_interrupt(hub, port);
                 }
         }
@@ -266 +266 @@
 
                 if (!has_individual_port_powering) {
-                        usb_log_debug("Has_global powering\n");
-                        opResult = usb_hub_set_feature(hub_info->control_pipe,
-                            USB_HUB_FEATURE_C_HUB_LOCAL_POWER);
-                        if (opResult != EOK) {
-                                usb_log_error("Cannot power hub: %s\n",
-                                    str_error(opResult));
-                        }
+                        //this setting actually makes no difference
+                        usb_log_debug("Hub has global powering\n");
                 }
 
@@ -280 +275 @@
                             port, USB_HUB_FEATURE_PORT_POWER);
                         if (opResult != EOK) {
-                                usb_log_error("cannot power on port %zu: %s.\n",
+                                usb_log_error("Cannot power on port %zu: %s.\n",
                                     port, str_error(opResult));
                         }