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

Timestamp:

2011-10-31T06:52:54Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

c25e39b

Parents:

e8ab32f (diff), 3ce78580 (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 mainline

File:

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

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

@@ -142 +142 @@
 if (ret != EOK) { \
         usb_log_error(message); \
-        usb_endpoint_manager_unregister_ep( \
-            &instance->generic.ep_manager, hub_address, 0, USB_DIRECTION_BOTH);\
+        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); \
@@ -150 +151 @@
         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);
+            USB_TRANSFER_CONTROL, USB_SPEED_FULL, 64, 0, NULL, NULL);
         CHECK_RET_UNREG_RETURN(ret,
             "Failed to register root hub control endpoint: %s.\n",
@@ -192 +193 @@
         list_initialize(&instance->pending_batches);
 
-        ret = hcd_init(&instance->generic, BANDWIDTH_AVAILABLE_USB11,
+        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);
@@ -221 +221 @@
 }
 /*----------------------------------------------------------------------------*/
-void hc_enqueue_endpoint(hc_t *instance, endpoint_t *ep)
-{
+void hc_enqueue_endpoint(hc_t *instance, const endpoint_t *ep)
+{
+        assert(instance);
+        assert(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) {
@@ -247 +253 @@
 }
 /*----------------------------------------------------------------------------*/
-void hc_dequeue_endpoint(hc_t *instance, endpoint_t *ep)
-{
+void hc_dequeue_endpoint(hc_t *instance, const endpoint_t *ep)
+{
+        assert(instance);
+        assert(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: