Changeset 89a0485a in mainline for uspace/drv/uhci/callback.h

Timestamp:

2011-01-25T20:44:28Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

b00163f

Parents:

7977fa1

Message:

Move function implementations to .c files

Unify error reporting in uhci_in()

File:

• uspace/drv/uhci/callback.h (modified) (1 diff)

uspace/drv/uhci/callback.h

@@ -53 +53 @@
 
 
-static inline int callback_init(callback_t *instance, device_t *dev,
+int callback_init(callback_t *instance, device_t *dev,
   void *buffer, size_t size, usbhc_iface_transfer_in_callback_t func_in,
-  usbhc_iface_transfer_out_callback_t func_out, void *arg)
-{
-        assert(instance);
-        assert(func_in == NULL || func_out == NULL);
-        instance->new_buffer = trans_malloc(size);
-        if (!instance->new_buffer) {
-                uhci_print_error("Failed to allocate device acessible buffer.\n");
-                return ENOMEM;
-        }
+  usbhc_iface_transfer_out_callback_t func_out, void *arg);
 
-        if (func_out)
-                memcpy(instance->new_buffer, buffer, size);
-
-        instance->callback_out = func_out;
-        instance->callback_in = func_in;
-        instance->old_buffer = buffer;
-        instance->buffer_size = size;
-        instance->dev = dev;
-        return EOK;
-}
 #define callback_in_init(instance, dev, buffer, size, func, arg) \
         callback_init(instance, dev, buffer, size, func, NULL, arg)