Changeset 747ef72 in mainline for uspace/drv/bus/usb/ohci/hc.c

Timestamp:

2011-11-10T11:29:10Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

54464f6a, c2245a3, c6f189f7

Parents:

2e1b9dc (diff), 2d1ba51 (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 USB changes.

Interface changes:

• GET_ADDRESS has been renamed to GET_MY_ADDRESS and the handle parameter was dropped. Tis call no longer cascades up to the root hub, but it is answered in the first place the information is available (nearest hub)
• Reintroduced address reservation for USB_DEFAULT_ADDRESS. The interface now enables device drivers to request specific address on initialization and either insists on that address or accept any other if the address is not available. Note that it is not possible to get the default address if the driver does not insist.
• Any endpoint registered is removed when address is released and a warning is produced if there were any such endpoints.
• It is no longer necessary or possible to pass device speed information when registering endpoints.

Driver fixes: memory leaks and crashes (not only) in error paths.
Fixes or removes flaky device_remove implementation in device drivers.

File:

• uspace/drv/bus/usb/ohci/hc.c (modified) (3 diffs)

uspace/drv/bus/usb/ohci/hc.c

@@ -127 +127 @@
         assert(hub_fun);
 
-        const usb_address_t hub_address =
-            usb_device_manager_get_free_address(
-                &instance->generic.dev_manager, USB_SPEED_FULL);
-        if (hub_address <= 0) {
+        /* Try to get address 1 for root hub. */
+        instance->rh.address = 1;
+        int ret = usb_device_manager_request_address(
+            &instance->generic.dev_manager, &instance->rh.address, false,
+            USB_SPEED_FULL);
+        if (ret != EOK) {
                 usb_log_error("Failed to get OHCI root hub address: %s\n",
-                    str_error(hub_address));
-                return hub_address;
-        }
-        instance->rh.address = hub_address;
-        usb_device_manager_bind(
-            &instance->generic.dev_manager, hub_address, hub_fun->handle);
+                    str_error(ret));
+                return ret;
+        }
+        usb_device_manager_bind_address(&instance->generic.dev_manager,
+            instance->rh.address, hub_fun->handle);
 
 #define CHECK_RET_UNREG_RETURN(ret, message...) \
@@ -143 +144 @@
         usb_log_error(message); \
         usb_endpoint_manager_remove_ep( \
-            &instance->generic.ep_manager, hub_address, 0, USB_DIRECTION_BOTH, \
-            NULL, NULL);\
-        usb_device_manager_release( \
-            &instance->generic.dev_manager, hub_address); \
+            &instance->generic.ep_manager, instance->rh.address, 0, \
+            USB_DIRECTION_BOTH, NULL, NULL); \
+        usb_device_manager_release_address( \
+            &instance->generic.dev_manager, instance->rh.address); \
         return ret; \
 } else (void)0
-        int ret = usb_endpoint_manager_add_ep(
-            &instance->generic.ep_manager, hub_address, 0, USB_DIRECTION_BOTH,
-            USB_TRANSFER_CONTROL, USB_SPEED_FULL, 64, 0, NULL, NULL);
+        ret = usb_endpoint_manager_add_ep(
+            &instance->generic.ep_manager, instance->rh.address, 0,
+            USB_DIRECTION_BOTH, USB_TRANSFER_CONTROL, USB_SPEED_FULL, 64,
+            0, NULL, NULL);
         CHECK_RET_UNREG_RETURN(ret,
             "Failed to register root hub control endpoint: %s.\n",
@@ -193 +195 @@
         list_initialize(&instance->pending_batches);
 
-        hcd_init(&instance->generic, BANDWIDTH_AVAILABLE_USB11,
-            bandwidth_count_usb11);
+        hcd_init(&instance->generic, USB_SPEED_FULL,
+            BANDWIDTH_AVAILABLE_USB11, bandwidth_count_usb11);
         instance->generic.private_data = instance;
         instance->generic.schedule = hc_schedule;