Changeset 5fd9c30 in mainline for uspace/drv/bus/usb/uhci/uhci_rh.c

Timestamp:

2017-10-21T20:52:56Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

766043c

Parents:

74b852b

Message:

usbhost refactoring: let transfer_batch be initialized by bus

Currently makes older HCs fail, work in progress.

File:

• uspace/drv/bus/usb/uhci/uhci_rh.c (modified) (3 diffs)

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

@@ -39 +39 @@
 #include <usb/classes/hub.h>
 #include <usb/request.h>
+#include <usb/host/endpoint.h>
 #include <usb/usb.h>
 
@@ -106 +107 @@
         do {
                 batch->error = virthub_base_request(&instance->base, target,
-                    usb_transfer_batch_direction(batch), (void*)batch->setup_buffer,
+                    batch->dir, (void*) batch->setup.buffer,
                     batch->buffer, batch->buffer_size, &batch->transfered_size);
                 if (batch->error == ENAK)
@@ -113 +114 @@
                 //ENAK is technically an error condition
         } while (batch->error == ENAK);
-        usb_transfer_batch_finish(batch, NULL);
-        usb_transfer_batch_destroy(batch);
+        usb_transfer_batch_finish(batch);
         return EOK;
 }