Changeset 709e868 in mainline for uspace/drv/usbhub/usbhub.h

Timestamp:

2011-04-09T18:42:13Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

501e5df, f11c288

Parents:

97e7e8a (diff), b79c31f9 (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:

several fixes for hub drivers (non-removable devices, ohci root hub, power settings) , documentation, refactoring

File:

• uspace/drv/usbhub/usbhub.h (modified) (3 diffs)

uspace/drv/usbhub/usbhub.h

@@ -37 +37 @@
 
 #include <ipc/devman.h>
-#include <usb/usb.h>
 #include <ddf/driver.h>
 
-#define NAME "usbhub"
-
 #include <usb/hub.h>
+#include <usb/classes/hub.h>
 
 #include <usb/pipes.h>
 #include <usb/devdrv.h>
+
+#include <fibril_synch.h>
+
+#define NAME "usbhub"
 
 #include "ports.h"
@@ -52 +54 @@
 
 /** Information about attached hub. */
-typedef struct {
+struct usb_hub_info_t{
         /** Number of ports. */
         size_t port_count;
 
-        /** Ports. */
+        /** attached device handles, for each port one */
         usb_hub_port_t *ports;
-        
+
         /** connection to hcd */
         usb_hc_connection_t connection;
@@ -87 +89 @@
         /** generic usb device data*/
         usb_device_t * usb_device;
-} usb_hub_info_t;
+};
 
-/**
- * function running the hub-controlling loop.
- * @param hub_info_param hub info pointer
- */
-int usb_hub_control_loop(void * hub_info_param);
-
-/**
- * Check changes on specified hub
- * @param hub_info_param pointer to usb_hub_info_t structure
- * @return error code if there is problem when initializing communication with
- * hub, EOK otherwise
- */
-int usb_hub_check_hub_changes(usb_hub_info_t * hub_info_param);
-
-void usb_hub_removed_device(usb_hub_info_t *, uint16_t);
-void usb_hub_over_current(usb_hub_info_t *, uint16_t);
+//int usb_hub_control_loop(void * hub_info_param);
 
 int usb_hub_add_device(usb_device_t * usb_dev);
+
+bool hub_port_changes_callback(usb_device_t *dev,
+    uint8_t *change_bitmap, size_t change_bitmap_size, void *arg);
+
+int usb_hub_release_default_address(usb_hub_info_t * hub);
 
 #endif