Changeset 3b9f1fd in mainline for uspace/drv/usbhub/usbhub.h

Timestamp:

2010-12-12T14:50:18Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

403bb26, 8e8289d, c9113d2

Parents:

1f3158c (diff), 16ecc28 (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 from smekideki

File:

• uspace/drv/usbhub/usbhub.h (modified) (1 diff)

uspace/drv/usbhub/usbhub.h

@@ -46 +46 @@
         /** Number of ports. */
         int port_count;
-        /** General device info. */
-        usb_hcd_attached_device_info_t * device;
+        /** General usb device info. */
+        usb_hcd_attached_device_info_t * usb_device;
+        /** General device info*/
+        device_t * device;
+
 } usb_hub_info_t;
 
-int usb_add_hub_device(device_t *);
+/**
+ * function running the hub-controlling loop.
+ * @param noparam fundtion does not need any parameters
+ */
+int usb_hub_control_loop(void * noparam);
+
+/** Callback when new hub device is detected.
+ *
+ * @param dev New device.
+ * @return Error code.
+ */
+int usb_add_hub_device(device_t *dev);
+
+/**
+ * check changes on all registered hubs
+ */
+void usb_hub_check_hub_changes(void);
+
+
+//int usb_add_hub_device(device_t *);
+
+
 
 #endif