Changeset 1d758fc in mainline for uspace/drv/bus/usb/uhci

Timestamp:

2018-02-12T10:11:47Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

5fe3f954

Parents:

2f762a7

git-author:

Ondřej Hlavatý <aearsis@…> (2018-02-05 03:28:50)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-02-12 10:11:47)

Message:

usb: rethinking DMA buffers

Location:

uspace/drv/bus/usb/uhci

Files:

• uhci_batch.c (modified) (4 diffs)
• uhci_rh.c (modified) (1 diff)

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

@@ -98 +98 @@
         usb_transfer_batch_t *usb_batch = &uhci_batch->base;
 
-        uhci_batch->td_count = (usb_batch->buffer_size + usb_batch->ep->max_packet_size - 1)
+        uhci_batch->td_count = (usb_batch->size + usb_batch->ep->max_packet_size - 1)
                 / usb_batch->ep->max_packet_size;
 
@@ -190 +190 @@
         }
 
-        assert(batch->transferred_size <= batch->buffer_size);
+        assert(batch->transferred_size <= batch->size);
 
         return true;
@@ -228 +228 @@
 
         size_t td = 0;
-        size_t remain_size = uhci_batch->base.buffer_size;
+        size_t remain_size = uhci_batch->base.size;
         char *buffer = uhci_transfer_batch_data_buffer(uhci_batch);
 
@@ -297 +297 @@
         size_t td = 1;
         unsigned toggle = 1;
-        size_t remain_size = uhci_batch->base.buffer_size;
+        size_t remain_size = uhci_batch->base.size;
         char *buffer = uhci_transfer_batch_data_buffer(uhci_batch);
 

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->dma_buffer.virt, batch->buffer_size, &batch->transferred_size);
+                    batch->dma_buffer.virt, batch->size, &batch->transferred_size);
                 if (batch->error == ENAK)
                         async_usleep(instance->base.endpoint_descriptor.poll_interval * 1000);