Changeset b53ca1e in mainline for uspace/drv/usbhub/usbhub.c

Timestamp:

2011-02-14T18:06:48Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

567d002

Parents:

54d9058 (diff), bfe0eb5 (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 development/ changes

File:

• uspace/drv/usbhub/usbhub.c (modified) (5 diffs)

uspace/drv/usbhub/usbhub.c

@@ -84 +84 @@
         }*/
 
-        result->usb_device = usb_new(usb_hcd_attached_device_info_t);
-        result->usb_device->address = addr;
+        result->address = addr;
 
         // get hub descriptor
@@ -155 +154 @@
         int opResult;
         usb_target_t target;
-        target.address = hub_info->usb_device->address;
+        target.address = hub_info->address;
         target.endpoint = 0;
 
@@ -216 +215 @@
         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);
@@ -465 +464 @@
 
                 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",
@@ -507 +506 @@
                         if (interrupt) {
                                 usb_hub_process_interrupt(
-                                        hub_info, hc, port, hub_info->usb_device->address);
+                                        hub_info, hc, port, hub_info->address);
                         }
                 }