Changeset 7977fa1 in mainline

Timestamp:

2011-01-25T19:16:03Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

89a0485a

Parents:

d5f7a8ab

Message:

Add append function, check return value of TD init

Location:

uspace/drv/uhci

Files:

• uhci.c (modified) (3 diffs)
• uhci_struct/transfer_descriptor.h (modified) (2 diffs)

uspace/drv/uhci/uhci.c

@@ -10 +10 @@
 
 static int init_tranfer_lists(transfer_list_t list[]);
+
+//static int init_transfer();
 
 int uhci_init(device_t *device, void *regs)
@@ -80 +82 @@
             usb_str_transfer_type(transfer_type),
             size);
+
         if (size >= 1024)
                 return ENOTSUP;
@@ -104 +107 @@
         CHECK_RET_FREE_JOB(ret, "Failed to allocate tranfer descriptor.\n");
 
-        transfer_descriptor_init(td, 3, size, false, target, USB_PID_IN);
+        ret = transfer_descriptor_init(td, 3, size, false, target, USB_PID_IN);
+        if (ret != EOK) {
+                uhci_print_error("Failed to initialize transfer descriptor.\n");
+                trans_free(td);
+                trans_free(job);
+                return ret;
+        }
+        td->callback = job;
 
 

uspace/drv/uhci/uhci_struct/transfer_descriptor.h

@@ -38 +38 @@
 #include <usb/usb.h>
 
+#include "translating_malloc.h"
 #include "callback.h"
 #include "link_pointer.h"
@@ -120 +121 @@
 }
 
+static inline void transfer_descriptor_append(
+  transfer_descriptor_t *instance, transfer_descriptor_t *item)
+{
+        assert(instance);
+        instance->next_va = item;
+        instance->next = (uintptr_t)addr_to_phys( item ) & LINK_POINTER_ADDRESS_MASK;
+}
+
 #endif
 /**