Changeset 98d7550 in mainline for uspace/drv/ohci/batch.c

Timestamp:

2011-05-18T20:18: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:

7941bd6

Parents:

17fc40c (diff), 030937e (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:

Doxygen and code style fixes, improve error handling in root hub registration

Remove kernel debug output in interrupt handlers accessing memory mapped registers.

File:

• uspace/drv/ohci/batch.c (modified) (4 diffs)

uspace/drv/ohci/batch.c

@@ -100 +100 @@
  */
 usb_transfer_batch_t * batch_get(ddf_fun_t *fun, endpoint_t *ep,
-    char *buffer, size_t buffer_size, char* setup_buffer, size_t setup_size,
+    char *buffer, size_t buffer_size,
+    const char *setup_buffer, size_t setup_size,
     usbhc_iface_transfer_in_callback_t func_in,
     usbhc_iface_transfer_out_callback_t func_out, void *arg)
@@ -120 +121 @@
             ohci_transfer_batch_dispose);
 
-        hcd_endpoint_t *hcd_ep = hcd_endpoint_get(ep);
+        const hcd_endpoint_t *hcd_ep = hcd_endpoint_get(ep);
         assert(hcd_ep);
 
@@ -129 +130 @@
         data->td_count =
             ((buffer_size + OHCI_TD_MAX_TRANSFER - 1) / OHCI_TD_MAX_TRANSFER);
+        /* Control transfer need Setup and Status stage */
         if (ep->transfer_type == USB_TRANSFER_CONTROL) {
                 data->td_count += 2;
@@ -407 +409 @@
         char *buffer = instance->data_buffer;
         while (remain_size > 0) {
-                size_t transfer_size = remain_size > OHCI_TD_MAX_TRANSFER ?
-                    OHCI_TD_MAX_TRANSFER : remain_size;
+                const size_t transfer_size = remain_size > OHCI_TD_MAX_TRANSFER
+                    ? OHCI_TD_MAX_TRANSFER : remain_size;
 
                 td_init(data->tds[td_current], instance->ep->direction,