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

Timestamp:

2011-08-25T13:53:38Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

620c710

Parents:

23b0fe8

Message:

ohci: Rename hcd_endpoint ⇒ ohci_endpoint to avoid hcd confusion

File:

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

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

@@ -42 +42 @@
 
 #include "hc.h"
-#include "hcd_endpoint.h"
+#include "ohci_endpoint.h"
 
 #define OHCI_USED_INTERRUPTS \
@@ -203 +203 @@
         instance->generic.private_data = instance;
         instance->generic.schedule = schedule;
-        instance->generic.ep_add_hook = NULL;
+        instance->generic.ep_add_hook = ohci_endpoint_assign;
 
         ret = hc_init_memory(instance);
@@ -249 +249 @@
                 return ENOMEM;
 
-        int ret = hcd_endpoint_assign(ep);
+        int ret = ohci_endpoint_assign(&instance->generic, ep);
         if (ret != EOK) {
                 endpoint_destroy(ep);
@@ -261 +261 @@
         }
 
-        /* Enqueue hcd_ep */
+        /* Enqueue ep */
         switch (ep->transfer_type) {
         case USB_TRANSFER_CONTROL:
                 instance->registers->control &= ~C_CLE;
                 endpoint_list_add_ep(
-                    &instance->lists[ep->transfer_type], hcd_endpoint_get(ep));
+                    &instance->lists[ep->transfer_type], ohci_endpoint_get(ep));
                 instance->registers->control_current = 0;
                 instance->registers->control |= C_CLE;
@@ -273 +273 @@
                 instance->registers->control &= ~C_BLE;
                 endpoint_list_add_ep(
-                    &instance->lists[ep->transfer_type], hcd_endpoint_get(ep));
+                    &instance->lists[ep->transfer_type], ohci_endpoint_get(ep));
                 instance->registers->control |= C_BLE;
                 break;
@@ -280 +280 @@
                 instance->registers->control &= (~C_PLE & ~C_IE);
                 endpoint_list_add_ep(
-                    &instance->lists[ep->transfer_type], hcd_endpoint_get(ep));
+                    &instance->lists[ep->transfer_type], ohci_endpoint_get(ep));
                 instance->registers->control |= C_PLE | C_IE;
                 break;
@@ -309 +309 @@
         }
 
-        hcd_endpoint_t *hcd_ep = hcd_endpoint_get(ep);
-        if (hcd_ep) {
-                /* Dequeue hcd_ep */
+        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], hcd_ep);
+                            &instance->lists[ep->transfer_type], ohci_ep);
                         instance->registers->control_current = 0;
                         instance->registers->control |= C_CLE;
@@ -323 +323 @@
                         instance->registers->control &= ~C_BLE;
                         endpoint_list_remove_ep(
-                            &instance->lists[ep->transfer_type], hcd_ep);
+                            &instance->lists[ep->transfer_type], ohci_ep);
                         instance->registers->control |= C_BLE;
                         break;
@@ -330 +330 @@
                         instance->registers->control &= (~C_PLE & ~C_IE);
                         endpoint_list_remove_ep(
-                            &instance->lists[ep->transfer_type], hcd_ep);
+                            &instance->lists[ep->transfer_type], ohci_ep);
                         instance->registers->control |= C_PLE | C_IE;
                         break;