Changes in uspace/drv/usbhub/usbhub.h [dff940f8:39c3d95d] in mainline

File:

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

uspace/drv/usbhub/usbhub.h

@@ -27 +27 @@
  */
 
-/** @addtogroup drvusbhub
+/** @addtogroup usb
  * @{
  */
@@ -36 +36 @@
 #define DRV_USBHUB_USBHUB_H
 
-#include <ipc/devman.h>
-#include <usb/usb.h>
-#include <ddf/driver.h>
-
 #define NAME "usbhub"
 
-#include <usb/hub.h>
+#include "usb/hcdhubd.h"
 
-#include <usb/pipes.h>
-
-/* Hub endpoints. */
-typedef struct {
-        usb_endpoint_pipe_t control;
-        usb_endpoint_pipe_t status_change;
-} usb_hub_endpoints_t;
-
-
+/** basic information about device attached to hub */
+typedef struct{
+        usb_address_t address;
+        devman_handle_t devman_handle;
+}usb_hub_attached_device_t;
 
 /** Information about attached hub. */
@@ -58 +50 @@
         /** Number of ports. */
         int port_count;
-        /** attached device handles, for each port one */
-        usb_hc_attached_device_t * attached_devs;
+        /** attached device handles */
+        usb_hub_attached_device_t * attached_devs;
         /** General usb device info. */
-        //usb_hcd_attached_device_info_t * usb_device;
+        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;
+        device_t * device;
+
 } usb_hub_info_t;
 
 /**
  * function running the hub-controlling loop.
- * @param hub_info_param hub info pointer
+ * @param noparam fundtion does not need any parameters
  */
-int usb_hub_control_loop(void * hub_info_param);
+int usb_hub_control_loop(void * noparam);
 
 /** Callback when new hub device is detected.
@@ -84 +70 @@
  * @return Error code.
  */
-int usb_add_hub_device(ddf_dev_t *dev);
+int usb_add_hub_device(device_t *dev);
 
 /**
- * check changes on specified hub
- * @param hub_info_param pointer to usb_hub_info_t structure
+ * check changes on all registered hubs
  */
-void usb_hub_check_hub_changes(usb_hub_info_t * hub_info_param);
+void usb_hub_check_hub_changes(void);
 
 
+//int usb_add_hub_device(device_t *);