Changes in uspace/drv/usbhub/usbhub.h [625f1ba:a83e138] in mainline

File:

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

uspace/drv/usbhub/usbhub.h

@@ -45 +45 @@
 
 #include <usb/pipes.h>
-#include <usb/devdrv.h>
+
+/* Hub endpoints. */
+typedef struct {
+        usb_endpoint_pipe_t control;
+        usb_endpoint_pipe_t status_change;
+} usb_hub_endpoints_t;
+
 
 
@@ -52 +58 @@
         /** Number of ports. */
         int port_count;
-
         /** attached device handles, for each port one */
         usb_hc_attached_device_t * attached_devs;
-        
+        /** General usb device info. */
+        //usb_hcd_attached_device_info_t * usb_device;
+        /** General device info*/
+        ddf_dev_t * device;
         /** connection to hcd */
+        //usb_device_connection_t connection;
         usb_hc_connection_t connection;
+        /** */
+        usb_device_connection_t device_connection;
+        /** hub endpoints */
+        usb_hub_endpoints_t endpoints;
 
-        /** default address is used indicator
-         *
-         * If default address is requested by this device, it cannot
-         * be requested by the same hub again, otherwise a deadlock will occur.
-         */
         bool is_default_address_used;
-
-        /** convenience pointer to status change pipe
-         *
-         * Status change pipe is initialized in usb_device structure. This is
-         * pointer into this structure, so that it does not have to be
-         * searched again and again for the 'right pipe'.
-         */
-        usb_pipe_t * status_change_pipe;
-
-        /** convenience pointer to control pipe
-         *
-         * Control pipe is initialized in usb_device structure. This is
-         * pointer into this structure, so that it does not have to be
-         * searched again and again for the 'right pipe'.
-         */
-        usb_pipe_t * control_pipe;
-
-        /** generic usb device data*/
-        usb_device_t * usb_device;
 } usb_hub_info_t;
 
@@ -91 +80 @@
  */
 int usb_hub_control_loop(void * hub_info_param);
+
+/** Callback when new hub device is detected.
+ *
+ * @param dev New device.
+ * @return Error code.
+ */
+int usb_add_hub_device(ddf_dev_t *dev);
 
 /**
@@ -101 +97 @@
 
 
-int usb_hub_add_device(usb_device_t * usb_dev);
+
+
 
 #endif