Changeset db7ed07 in mainline

Timestamp:

2011-01-28T11:45:40Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c13ecfe

Parents:

7fc092a

Message:

Added callback_run

Location:

uspace/drv/uhci

Files:

• callback.c (modified) (2 diffs)
• callback.h (modified) (3 diffs)

uspace/drv/uhci/callback.c

@@ -1 +1 @@
 #include <errno.h>
+#include <mem.h>
 
 #include "callback.h"
@@ -26 +27 @@
         return EOK;
 }
+/*----------------------------------------------------------------------------*/
+void callback_run(
+callback_t *instance, usb_transaction_outcome_t outcome, size_t act_size)
+{
+        assert(instance);
+
+        /* update the old buffer */
+        if (instance->new_buffer) {
+                memcpy(instance->new_buffer, instance->old_buffer, instance->buffer_size);
+                trans_free(instance->new_buffer);
+                instance->new_buffer = NULL;
+        }
+
+        if (instance->callback_in) {
+                assert(instance->callback_out == NULL);
+                instance->callback_in(
+                  instance->dev, act_size, outcome, instance->arg);
+        }
+}

uspace/drv/uhci/callback.h

@@ -35 +35 @@
 #define DRV_UHCI_CALLBACK_H
 
-#include <mem.h>
 #include <usbhc_iface.h>
+#include <usb/usb.h>
 
 #include "debug.h"
@@ -49 +49 @@
         void *arg;
         size_t buffer_size;
+        size_t actual_size;
         device_t *dev;
 } callback_t;
@@ -69 +70 @@
                 trans_free(instance->new_buffer);
 }
+
+void callback_run(
+  callback_t *instance, usb_transaction_outcome_t outcome, size_t act_size);
 #endif
 /**