Changeset 92574f4 in mainline for uspace/drv/usbhub/usbhub.h

Timestamp:

2011-02-24T12:03:27Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

e7b7ebd5

Parents:

4837092 (diff), a80849c (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:

Merged development (changes in DDF, etc.).

Conflicts in uspace/drv/usbkbd/main.c

File:

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

uspace/drv/usbhub/usbhub.h

@@ -36 +36 @@
 #define DRV_USBHUB_USBHUB_H
 
+#include <ipc/devman.h>
+#include <usb/usb.h>
+#include <ddf/driver.h>
+
 #define NAME "usbhub"
 
-#include "usb/hcdhubd.h"
+#include <usb/hub.h>
 
-/** basic information about device attached to hub */
-typedef struct{
-        usb_address_t address;
-        devman_handle_t devman_handle;
-}usb_hub_attached_device_t;
+#include <usb/pipes.h>
+
+/* Hub endpoints. */
+typedef struct {
+        usb_endpoint_pipe_t control;
+        usb_endpoint_pipe_t status_change;
+} usb_hub_endpoints_t;
+
+
 
 /** Information about attached hub. */
@@ -50 +58 @@
         /** Number of ports. */
         int port_count;
-        /** attached device handles */
-        usb_hub_attached_device_t * attached_devs;
+        /** 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;
+        //usb_hcd_attached_device_info_t * usb_device;
         /** General device info*/
-        device_t * device;
-
+        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;
 } usb_hub_info_t;
 
@@ -70 +84 @@
  * @return Error code.
  */
-int usb_add_hub_device(device_t *dev);
+int usb_add_hub_device(ddf_dev_t *dev);
 
 /**