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

Timestamp:

2011-08-25T14:21:57Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

961c29e8

Parents:

e20eaed

Message:

libushost: promote endpoint data dtor to destruction hook

ohci: use new usb c driver architecture

File:

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

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

@@ -61 +61 @@
 static int hc_init_memory(hc_t *instance);
 static int interrupt_emulator(hc_t *instance);
-
+/*----------------------------------------------------------------------------*/
+static int schedule(hcd_t *hcd, usb_transfer_batch_t *batch)
+{
+        assert(hcd);
+        return hc_schedule(hcd->private_data, batch);
+}
 /*----------------------------------------------------------------------------*/
 /** Get number of commands used in IRQ code.
@@ -163 +168 @@
 }
 /*----------------------------------------------------------------------------*/
-static int schedule(hcd_t *hcd, usb_transfer_batch_t *batch)
-{
-        assert(hcd);
-        return hc_schedule(hcd->private_data, batch);
-}
-/*----------------------------------------------------------------------------*/
 /** Initialize OHCI hc driver structure
  *
@@ -203 +202 @@
         instance->generic.private_data = instance;
         instance->generic.schedule = schedule;
-        instance->generic.ep_add_hook = ohci_endpoint_assign;
+        instance->generic.ep_add_hook = ohci_endpoint_init;
 
         ret = hc_init_memory(instance);
@@ -224 +223 @@
 
         return EOK;
+}
+/*----------------------------------------------------------------------------*/
+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);
+        /* Enqueue ep */
+        switch (ep->transfer_type) {
+        case USB_TRANSFER_CONTROL:
+                instance->registers->control &= ~C_CLE;
+                endpoint_list_add_ep(list, ohci_ep);
+                instance->registers->control_current = 0;
+                instance->registers->control |= C_CLE;
+                break;
+        case USB_TRANSFER_BULK:
+                instance->registers->control &= ~C_BLE;
+                endpoint_list_add_ep(
+                    &instance->lists[ep->transfer_type], ohci_endpoint_get(ep));
+                instance->registers->control |= C_BLE;
+                break;
+        case USB_TRANSFER_ISOCHRONOUS:
+        case USB_TRANSFER_INTERRUPT:
+                instance->registers->control &= (~C_PLE & ~C_IE);
+                endpoint_list_add_ep(
+                    &instance->lists[ep->transfer_type], ohci_endpoint_get(ep));
+                instance->registers->control |= C_PLE | C_IE;
+                break;
+        }
+}
+/*----------------------------------------------------------------------------*/
+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);
+        switch (ep->transfer_type) {
+        case USB_TRANSFER_CONTROL:
+                instance->registers->control &= ~C_CLE;
+                endpoint_list_remove_ep(list, ohci_ep);
+                instance->registers->control_current = 0;
+                instance->registers->control |= C_CLE;
+                break;
+        case USB_TRANSFER_BULK:
+                instance->registers->control &= ~C_BLE;
+                endpoint_list_remove_ep(list, ohci_ep);
+                instance->registers->control |= C_BLE;
+                break;
+        case USB_TRANSFER_ISOCHRONOUS:
+        case USB_TRANSFER_INTERRUPT:
+                instance->registers->control &= (~C_PLE & ~C_IE);
+                endpoint_list_remove_ep(list, ohci_ep);
+                instance->registers->control |= C_PLE | C_IE;
+                break;
+        default:
+                break;
+        }
 }
 /*----------------------------------------------------------------------------*/
@@ -249 +304 @@
                 return ENOMEM;
 
-        int ret = ohci_endpoint_assign(&instance->generic, ep);
+        int ret = ohci_endpoint_init(&instance->generic, ep);
         if (ret != EOK) {
                 endpoint_destroy(ep);
@@ -260 +315 @@
                 return ret;
         }
-
-        /* Enqueue ep */
-        switch (ep->transfer_type) {
-        case USB_TRANSFER_CONTROL:
-                instance->registers->control &= ~C_CLE;
-                endpoint_list_add_ep(
-                    &instance->lists[ep->transfer_type], ohci_endpoint_get(ep));
-                instance->registers->control_current = 0;
-                instance->registers->control |= C_CLE;
-                break;
-        case USB_TRANSFER_BULK:
-                instance->registers->control &= ~C_BLE;
-                endpoint_list_add_ep(
-                    &instance->lists[ep->transfer_type], ohci_endpoint_get(ep));
-                instance->registers->control |= C_BLE;
-                break;
-        case USB_TRANSFER_ISOCHRONOUS:
-        case USB_TRANSFER_INTERRUPT:
-                instance->registers->control &= (~C_PLE & ~C_IE);
-                endpoint_list_add_ep(
-                    &instance->lists[ep->transfer_type], ohci_endpoint_get(ep));
-                instance->registers->control |= C_PLE | C_IE;
-                break;
-        }
+        hc_enqueue_endpoint(instance, ep);
 
         return EOK;
@@ -311 +343 @@
         ohci_endpoint_t *ohci_ep = ohci_endpoint_get(ep);
         if (ohci_ep) {
-                /* Dequeue ep */
-                switch (ep->transfer_type) {
-                case USB_TRANSFER_CONTROL:
-                        instance->registers->control &= ~C_CLE;
-                        endpoint_list_remove_ep(
-                            &instance->lists[ep->transfer_type], ohci_ep);
-                        instance->registers->control_current = 0;
-                        instance->registers->control |= C_CLE;
-                        break;
-                case USB_TRANSFER_BULK:
-                        instance->registers->control &= ~C_BLE;
-                        endpoint_list_remove_ep(
-                            &instance->lists[ep->transfer_type], ohci_ep);
-                        instance->registers->control |= C_BLE;
-                        break;
-                case USB_TRANSFER_ISOCHRONOUS:
-                case USB_TRANSFER_INTERRUPT:
-                        instance->registers->control &= (~C_PLE & ~C_IE);
-                        endpoint_list_remove_ep(
-                            &instance->lists[ep->transfer_type], ohci_ep);
-                        instance->registers->control |= C_PLE | C_IE;
-                        break;
-                default:
-                        break;
-                }
+                hc_dequeue_endpoint(instance, ep);
         } else {
                 usb_log_warning("Endpoint without hcd equivalent structure.\n");