Changeset e20eaed in mainline for uspace/drv/bus/usb/ohci/batch.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/batch.c (modified) (10 diffs)

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

@@ -39 +39 @@
 
 #include "batch.h"
-#include "hcd_endpoint.h"
+#include "ohci_endpoint.h"
 #include "utils/malloc32.h"
 #include "hw_struct/endpoint_descriptor.h"
@@ -122 +122 @@
         } else (void)0
 
-        const hcd_endpoint_t *hcd_ep = hcd_endpoint_get(batch->ep);
-        assert(hcd_ep);
+        const ohci_endpoint_t *ohci_ep = ohci_endpoint_get(batch->ep);
+        assert(ohci_ep);
 
         ohci_transfer_batch_t *data = calloc(sizeof(ohci_transfer_batch_t), 1);
@@ -135 +135 @@
         }
 
-        /* We need an extra place for TD that is currently assigned to hcd_ep*/
+        /* We need an extra place for TD that is assigned to ohci_ep */
         data->tds = calloc(sizeof(td_t*), data->td_count + 1);
         CHECK_NULL_DISPOSE_RETURN(data->tds,
@@ -141 +141 @@
 
         /* Add TD left over by the previous transfer */
-        data->tds[0] = hcd_ep->td;
+        data->tds[0] = ohci_ep->td;
         data->leave_td = 0;
         unsigned i = 1;
@@ -150 +150 @@
         }
 
-        data->ed = hcd_ep->ed;
+        data->ed = ohci_ep->ed;
         batch->private_data = data;
         batch->private_data_dtor = ohci_batch_dispose;
@@ -213 +213 @@
             ohci_batch_dispose);
 
-        const hcd_endpoint_t *hcd_ep = hcd_endpoint_get(ep);
-        assert(hcd_ep);
+        const ohci_endpoint_t *ohci_ep = ohci_endpoint_get(ep);
+        assert(ohci_ep);
 
         ohci_transfer_batch_t *data = calloc(sizeof(ohci_transfer_batch_t), 1);
@@ -233 +233 @@
 
         /* Add TD left over by the previous transfer */
-        data->tds[0] = hcd_ep->td;
+        data->tds[0] = ohci_ep->td;
         data->leave_td = 0;
         unsigned i = 1;
@@ -242 +242 @@
         }
 
-        data->ed = hcd_ep->ed;
+        data->ed = ohci_ep->ed;
 
         /* NOTE: OHCI is capable of handling buffer that crosses page boundaries
@@ -303 +303 @@
         data->leave_td = i;
         assert(data->leave_td <= data->td_count);
-        hcd_endpoint_t *hcd_ep = hcd_endpoint_get(instance->ep);
-        assert(hcd_ep);
-        hcd_ep->td = data->tds[i];
+
+        ohci_endpoint_t *ohci_ep = ohci_endpoint_get(instance->ep);
+        assert(ohci_ep);
+        ohci_ep->td = data->tds[i];
         assert(i > 0);
         for (--i;i < data->td_count; ++i)
@@ -312 +313 @@
         /* Clear possible ED HALT */
         data->ed->td_head &= ~ED_TDHEAD_HALTED_FLAG;
-        const uint32_t pa = addr_to_phys(hcd_ep->td);
+        const uint32_t pa = addr_to_phys(ohci_ep->td);
         assert(pa == (data->ed->td_head & ED_TDHEAD_PTR_MASK));
         assert(pa == (data->ed->td_tail & ED_TDTAIL_PTR_MASK));