Changeset 25696fea in mainline for uspace/drv/bus/usb/usbhub/usbhub.h

Timestamp:

2011-10-15T20:05:00Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

22ceff3a

Parents:

1ccc32f (diff), 721d4b6e (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 with mainline

File:

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

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

@@ -52 +52 @@
 
 /** Information about attached hub. */
-struct usb_hub_info_t {
+struct usb_hub_dev {
         /** Number of ports. */
         size_t port_count;
-
-        /** Attached device handles, for each port one */
+        /** 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;
@@ -76 +73 @@
         /** Condition variable for pending_ops_count. */
         fibril_condvar_t pending_ops_cv;
+        /** Pointer to devman usbhub function. */
+        ddf_fun_t *hub_fun;
+        /** Status indicator */
+        bool running;
 };
 
-int usb_hub_add_device(usb_device_t *usb_dev);
+int usb_hub_device_add(usb_device_t *usb_dev);
+int usb_hub_device_gone(usb_device_t *usb_dev);
 
 bool hub_port_changes_callback(usb_device_t *dev,