Changes in uspace/drv/bus/usb/ohci/hc.c [0cd8089:8b54fe6] in mainline

File:

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

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

@@ -127 +127 @@
         assert(hub_fun);
 
-        /* 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) {
+        const usb_address_t hub_address =
+            usb_device_manager_get_free_address(
+                &instance->generic.dev_manager, USB_SPEED_FULL);
+        if (hub_address <= 0) {
                 usb_log_error("Failed to get OHCI root hub address: %s\n",
-                    str_error(ret));
-                return ret;
-        }
-        usb_device_manager_bind_address(&instance->generic.dev_manager,
-            instance->rh.address, hub_fun->handle);
+                    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);
 
 #define CHECK_RET_UNREG_RETURN(ret, message...) \
 if (ret != EOK) { \
         usb_log_error(message); \
-        usb_endpoint_manager_remove_ep( \
-            &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); \
+        usb_endpoint_manager_unregister_ep( \
+            &instance->generic.ep_manager, hub_address, 0, USB_DIRECTION_BOTH);\
+        usb_device_manager_release( \
+            &instance->generic.dev_manager, hub_address); \
         return ret; \
 } else (void)0
-        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);
+        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);
         CHECK_RET_UNREG_RETURN(ret,
             "Failed to register root hub control endpoint: %s.\n",
@@ -195 +192 @@
         list_initialize(&instance->pending_batches);
 
-        hcd_init(&instance->generic, USB_SPEED_FULL,
-            BANDWIDTH_AVAILABLE_USB11, bandwidth_count_usb11);
+        ret = hcd_init(&instance->generic, BANDWIDTH_AVAILABLE_USB11,
+            bandwidth_count_usb11);
+        CHECK_RET_RETURN(ret, "Failed to initialize generic driver: %s.\n",
+            str_error(ret));
         instance->generic.private_data = instance;
         instance->generic.schedule = hc_schedule;
         instance->generic.ep_add_hook = ohci_endpoint_init;
-        instance->generic.ep_remove_hook = ohci_endpoint_fini;
 
         ret = hc_init_memory(instance);
@@ -223 +221 @@
 }
 /*----------------------------------------------------------------------------*/
-void hc_enqueue_endpoint(hc_t *instance, const endpoint_t *ep)
-{
-        assert(instance);
-        assert(ep);
-
+void hc_enqueue_endpoint(hc_t *instance, endpoint_t *ep)
+{
         endpoint_list_t *list = &instance->lists[ep->transfer_type];
         ohci_endpoint_t *ohci_ep = ohci_endpoint_get(ep);
-        assert(list);
-        assert(ohci_ep);
-
         /* Enqueue ep */
         switch (ep->transfer_type) {
@@ -255 +247 @@
 }
 /*----------------------------------------------------------------------------*/
-void hc_dequeue_endpoint(hc_t *instance, const endpoint_t *ep)
-{
-        assert(instance);
-        assert(ep);
-
+void hc_dequeue_endpoint(hc_t *instance, endpoint_t *ep)
+{
         /* Dequeue ep */
         endpoint_list_t *list = &instance->lists[ep->transfer_type];
         ohci_endpoint_t *ohci_ep = ohci_endpoint_get(ep);
-
-        assert(list);
-        assert(ohci_ep);
         switch (ep->transfer_type) {
         case USB_TRANSFER_CONTROL:
@@ -579 +565 @@
 
         /*Init HCCA */
-        instance->hcca = hcca_get();
+        instance->hcca = malloc32(sizeof(hcca_t));
         if (instance->hcca == NULL)
                 return ENOMEM;
@@ -585 +571 @@
         usb_log_debug2("OHCI HCCA initialized at %p.\n", instance->hcca);
 
-        for (unsigned i = 0; i < 32; ++i) {
+        unsigned i = 0;
+        for (; i < 32; ++i) {
                 instance->hcca->int_ep[i] =
                     instance->lists[USB_TRANSFER_INTERRUPT].list_head_pa;