Changeset 6843a9c in mainline for uspace/drv/bus/usb/usbhub/usbhub.h

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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:

Merge mainline changes

Trivial conflicts.

File:

• uspace/drv/bus/usb/usbhub/usbhub.h (modified) (2 diffs)

uspace/drv/bus/usb/usbhub/usbhub.h

@@ -57 +57 @@
         /** Port structures, one for each port */
         usb_hub_port_t *ports;
-        /** Connection to hcd */
-        usb_hc_connection_t connection;
         /** Generic usb device data*/
         usb_device_t *usb_device;
@@ -77 +75 @@
         /** Status indicator */
         bool running;
+        /** Hub supports port power switching. */
+        bool power_switched;
+        /** Each port is switched individually. */
+        bool per_port_power;
 };
 
 int usb_hub_device_add(usb_device_t *usb_dev);
+int usb_hub_device_remove(usb_device_t *usb_dev);
 int usb_hub_device_gone(usb_device_t *usb_dev);