Changeset f9d0a86 in mainline for uspace/lib/drv/generic/remote_usbhc.c

Timestamp:

2017-11-14T12:24:42Z (6 years ago)

Author:

Aearsis <Hlavaty.Ondrej@…>

Branches:

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

Children:

6cad776

Parents:

887c9de (diff), d2d142a (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.

git-author:

Aearsis <Hlavaty.Ondrej@…> (2017-11-14 01:04:19)

git-committer:

Aearsis <Hlavaty.Ondrej@…> (2017-11-14 12:24:42)

Message:

Merge tag '0.7.1'

The merge wasn't clean, because of changes in build system. The most
significant change was partial revert of usbhc callback refactoring,
which now does not take usb transfer batch, but few named fields again.

File:

• uspace/lib/drv/generic/remote_usbhc.c (modified) (4 diffs)

uspace/lib/drv/generic/remote_usbhc.c

@@ -39 +39 @@
 #include <errno.h>
 #include <devman.h>
-#include <usb/host/usb_transfer_batch.h>
 
 #include "usbhc_iface.h"
@@ -445 +444 @@
 }
 
-static int callback_out(usb_transfer_batch_t *batch)
-{
-        async_transaction_t *trans = batch->on_complete_data;
-
-        const int err = async_answer_0(trans->caller, batch->error);
+static int callback_out(void *arg, int error, size_t transfered_size)
+{
+        async_transaction_t *trans = arg;
+
+        const int err = async_answer_0(trans->caller, error);
 
         async_transaction_destroy(trans);
@@ -456 +455 @@
 }
 
-static int callback_in(usb_transfer_batch_t *batch)
-{
-        async_transaction_t *trans = batch->on_complete_data;
+static int callback_in(void *arg, int error, size_t transfered_size)
+{
+        async_transaction_t *trans = arg;
 
         if (trans->data_caller) {
-                if (batch->error == EOK) {
-                        batch->error = async_data_read_finalize(trans->data_caller,
-                            trans->buffer, batch->transfered_size);
+                if (error == EOK) {
+                        error = async_data_read_finalize(trans->data_caller,
+                            trans->buffer, transfered_size);
                 } else {
                         async_answer_0(trans->data_caller, EINTR);
@@ -469 +468 @@
         }
 
-        const int err = async_answer_0(trans->caller, batch->error);
+        const int err = async_answer_0(trans->caller, error);
         async_transaction_destroy(trans);
         return err;