Changeset 50ba203 in mainline for uspace/drv/usbhub/usbhub.h

Timestamp:

2011-02-20T15:46:48Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

6bb83c7

Parents:

d81ef61c (diff), 0c00dac (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:

merge with usb/development

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 <driver.h>
+
 #define NAME "usbhub"
 
+<<<<<<< TREE
 #include "usb/hcdhubd.h"
 
 #include <usb/pipes.h>
 
+=======
+>>>>>>> MERGE-SOURCE
 /** basic information about device attached to hub */
 typedef struct{
@@ -62 +69 @@
         /** attached device handles, for each port one */
         usb_hub_attached_device_t * attached_devs;
-        /** General usb device info. */
-        usb_hcd_attached_device_info_t * usb_device;
+        /** USB address of the hub. */
+        usb_address_t address;
         /** General device info*/
         device_t * device;
+<<<<<<< TREE
         /** connection to hcd */
         usb_device_connection_t connection;
@@ -71 +79 @@
         usb_hub_endpoints_t endpoints;
 
+=======
+>>>>>>> MERGE-SOURCE
 } usb_hub_info_t;