Changeset 6bb83c7 in mainline for uspace/drv/usbhub/usbhub.h

Timestamp:

2011-02-20T21:33:03Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

070f11e, 62066b4

Parents:

50ba203

Message:

usbhub uses new api, it is compilable. cannot guarantee functionality

File:

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

uspace/drv/usbhub/usbhub.h

@@ -42 +42 @@
 #define NAME "usbhub"
 
-<<<<<<< TREE
-#include "usb/hcdhubd.h"
+//#include "usb/hcdhubd.h"
+#include <usb/usbdrv.h>
+#include <usb/hub.h>
 
 #include <usb/pipes.h>
-
-=======
->>>>>>> MERGE-SOURCE
-/** basic information about device attached to hub */
-typedef struct{
-        usb_address_t address;
-        devman_handle_t devman_handle;
-}usb_hub_attached_device_t;
 
 /* Hub endpoints. */
@@ -68 +61 @@
         int port_count;
         /** attached device handles, for each port one */
-        usb_hub_attached_device_t * attached_devs;
-        /** USB address of the hub. */
-        usb_address_t address;
+        usb_hc_attached_device_t * attached_devs;
+        /** General usb device info. */
+        //usb_hcd_attached_device_info_t * usb_device;
         /** General device info*/
         device_t * device;
-<<<<<<< TREE
         /** connection to hcd */
-        usb_device_connection_t connection;
+        //usb_device_connection_t connection;
+        usb_hc_connection_t connection;
+        /** */
+        usb_device_connection_t device_connection;
         /** hub endpoints */
         usb_hub_endpoints_t endpoints;
-
-=======
->>>>>>> MERGE-SOURCE
 } usb_hub_info_t;