Changes in uspace/drv/usbhub/usbhub.h [578a2547:3e490eb] in mainline

File:

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

uspace/drv/usbhub/usbhub.h

@@ -43 +43 @@
 
 #include <usb/hub.h>
+#include <usb/classes/hub.h>
 
 #include <usb/pipes.h>
 #include <usb/devdrv.h>
 
-#include "ports.h"
+#include <fibril_synch.h>
 
 
+/** Information about single port on a hub. */
+typedef struct {
+        /** Mutex needed by CV for checking port reset. */
+        fibril_mutex_t reset_mutex;
+        /** CV for waiting to port reset completion. */
+        fibril_condvar_t reset_cv;
+        /** Whether port reset is completed.
+         * Guarded by @c reset_mutex.
+         */
+        bool reset_completed;
+
+        /** Information about attached device. */
+        usb_hc_attached_device_t attached_device;
+} usb_hub_port_t;
+
+/** Initialize hub port information.
+ *
+ * @param port Port to be initialized.
+ */
+static inline void usb_hub_port_init(usb_hub_port_t *port) {
+        port->attached_device.address = -1;
+        port->attached_device.handle = 0;
+        fibril_mutex_initialize(&port->reset_mutex);
+        fibril_condvar_initialize(&port->reset_cv);
+}
 
 /** Information about attached hub. */
@@ -56 +82 @@
         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;
@@ -89 +115 @@
 } 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);
 
+int usb_hub_check_hub_changes(usb_hub_info_t * hub_info_param);
+
+bool hub_port_changes_callback(usb_device_t *dev,
+    uint8_t *change_bitmap, size_t change_bitmap_size, void *arg);
 #endif
 /**