Changeset 50ba203 in mainline for uspace/drv/usbhub

Timestamp:

2011-02-20T15:46:48Z (15 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

Location:

uspace/drv/usbhub

Files:

• usbhub.c (modified) (7 diffs)
• usbhub.h (modified) (3 diffs)

uspace/drv/usbhub/usbhub.c

@@ -36 +36 @@
 #include <bool.h>
 #include <errno.h>
+#include <str_error.h>
 
 #include <usb_iface.h>
 #include <usb/usbdrv.h>
 #include <usb/descriptor.h>
+#include <usb/recognise.h>
 #include <usb/devreq.h>
 #include <usb/request.h>
@@ -76 +78 @@
         result->device = device;
 
+<<<<<<< TREE
         result->usb_device = usb_new(usb_hcd_attached_device_info_t);
         
+=======
+
+        dprintf(USB_LOG_LEVEL_DEBUG, "phone to hc = %d", hc);
+        if (hc < 0) {
+                return result;
+        }
+        //get some hub info
+        usb_address_t addr = usb_drv_get_my_address(hc, device);
+        dprintf(USB_LOG_LEVEL_DEBUG, "address of newly created hub = %d", addr);
+        /*if(addr<0){
+                //return result;
+
+        }*/
+
+        result->address = addr;
+
+>>>>>>> MERGE-SOURCE
         // get hub descriptor
 
@@ -148 +168 @@
         int port;
         int opResult;
+<<<<<<< TREE
         //usb_target_t target;
         //target.address = hub_info->usb_device->address;
         //target.endpoint = 0;
+=======
+        usb_target_t target;
+        target.address = hub_info->address;
+        target.endpoint = 0;
+>>>>>>> MERGE-SOURCE
 
         //get configuration descriptor
@@ -212 +238 @@
         dprintf(USB_LOG_LEVEL_INFO, "hub dev added");
         dprintf(USB_LOG_LEVEL_DEBUG, "\taddress %d, has %d ports ",
-                        hub_info->usb_device->address,
+                        hub_info->address,
                         hub_info->port_count);
         dprintf(USB_LOG_LEVEL_DEBUG, "\tused configuration %d",config_descriptor.configuration_number);
@@ -317 +343 @@
         }
 
+        devman_handle_t hc_handle;
+        opResult = usb_drv_find_hc(hub->device, &hc_handle);
+        if (opResult != EOK) {
+                usb_log_error("Failed to get handle of host controller: %s.\n",
+                    str_error(opResult));
+                return;
+        }
+
         devman_handle_t child_handle;
-        opResult = usb_drv_register_child_in_devman(hc, hub->device,
-            new_device_address, &child_handle);
+        opResult = usb_device_register_child_in_devman(new_device_address,
+            hc_handle, hub->device, &child_handle);
         if (opResult != EOK) {
                 dprintf(USB_LOG_LEVEL_ERROR, "could not start driver for new device");
@@ -472 +506 @@
                 /*
                 usb_target_t target;
-                target.address = hub_info->usb_device->address;
+                target.address = hub_info->address;
                 target.endpoint = 1;/// \TODO get from endpoint descriptor
                 dprintf(USB_LOG_LEVEL_INFO, "checking changes for hub at addr %d",
@@ -515 +549 @@
                         if (interrupt) {
                                 usb_hub_process_interrupt(
+<<<<<<< TREE
                                         hub_info, port);
+=======
+                                        hub_info, hc, port, hub_info->address);
+>>>>>>> MERGE-SOURCE
                         }
                 }

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;