Changeset db51a6a6 in mainline for uspace/drv/bus/usb/uhci

Timestamp:

2018-01-22T12:20:14Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

998773d

Parents:

b3c39690

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-22 12:18:02)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-01-22 12:20:14)

Message:

typo: transferred is spelled with two r

Location:

uspace/drv/bus/usb/uhci

Files:

• hc.c (modified) (1 diff)
• uhci_batch.c (modified) (3 diffs)
• uhci_rh.c (modified) (1 diff)

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

@@ -362 +362 @@
                 async_usleep(2000);
                 batch->base.error = EINTR;
-                batch->base.transfered_size = 0;
+                batch->base.transferred_size = 0;
                 usb_transfer_batch_finish(&batch->base);
         }

uspace/drv/bus/usb/uhci/uhci_batch.c

@@ -163 +163 @@
             uhci_batch, USB_TRANSFER_BATCH_ARGS(*batch),
             uhci_batch->td_count);
-        batch->transfered_size = 0;
+        batch->transferred_size = 0;
 
         uhci_endpoint_t *uhci_ep = (uhci_endpoint_t *) batch->ep;
@@ -185 +185 @@
                 }
 
-                batch->transfered_size
+                batch->transferred_size
                     += td_act_size(&uhci_batch->tds[i]);
                 if (td_is_short(&uhci_batch->tds[i]))
@@ -191 +191 @@
         }
 substract_ret:
-        if (batch->transfered_size > 0 && batch->ep->transfer_type == USB_TRANSFER_CONTROL) {
-                assert(batch->transfered_size >= USB_SETUP_PACKET_SIZE);
-                batch->transfered_size -= USB_SETUP_PACKET_SIZE;
+        if (batch->transferred_size > 0 && batch->ep->transfer_type == USB_TRANSFER_CONTROL) {
+                assert(batch->transferred_size >= USB_SETUP_PACKET_SIZE);
+                batch->transferred_size -= USB_SETUP_PACKET_SIZE;
         }
 
         if (batch->dir == USB_DIRECTION_IN) {
-                assert(batch->transfered_size <= batch->buffer_size);
+                assert(batch->transferred_size <= batch->buffer_size);
                 memcpy(batch->buffer,
                     uhci_transfer_batch_data_buffer(uhci_batch),
-                    batch->transfered_size);
+                    batch->transferred_size);
         }
 

uspace/drv/bus/usb/uhci/uhci_rh.c

@@ -107 +107 @@
                 batch->error = virthub_base_request(&instance->base, batch->target,
                     batch->dir, (void*) batch->setup.buffer,
-                    batch->buffer, batch->buffer_size, &batch->transfered_size);
+                    batch->buffer, batch->buffer_size, &batch->transferred_size);
                 if (batch->error == ENAK)
                         async_usleep(instance->base.endpoint_descriptor.poll_interval * 1000);