Changeset 4046c1ea in mainline for uspace/drv/uhci/uhci_struct/transfer_descriptor.c

Timestamp:

2011-01-29T00:14:07Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

1431e8f

Parents:

b3258ad (diff), 44d8853 (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.

Message:

Merge parent branch

File:

• uspace/drv/uhci/uhci_struct/transfer_descriptor.c (modified) (2 diffs)

uspace/drv/uhci/uhci_struct/transfer_descriptor.c

@@ -52 +52 @@
         uhci_print_verbose("Creating device field: %x.\n", instance->device);
 
-        instance->buffer_ptr = (uintptr_t)addr_to_phys(buffer);
-
-        uhci_print_verbose("Creating buffer field: %p(%p).\n",
-          buffer, instance->buffer_ptr);
-
         char buffer_dump[BUFFER_LEN];
         buffer_to_str(buffer_dump, BUFFER_LEN, buffer, size);
         uhci_print_verbose("Buffer dump (%zuB): %s.\n", size, buffer_dump);
 
+        if (size) {
+                instance->buffer_ptr = (uintptr_t)addr_to_phys(buffer);
+
+                uhci_print_verbose("Creating buffer field: %p(%p).\n",
+                        buffer, instance->buffer_ptr);
+        } else {
+                instance->buffer_ptr = 0;
+        }
+
+
         instance->next_va = NULL;
         instance->callback = NULL;
+        uhci_print_info("Created a new TD.\n");
 }
 
@@ -98 +104 @@
         callback_run(instance->callback,
                 convert_outcome(instance->status),
-                instance->status >> TD_STATUS_ACTLEN_POS & TD_STATUS_ACTLEN_MASK
+                ((instance->status >> TD_STATUS_ACTLEN_POS) + 1) & TD_STATUS_ACTLEN_MASK
         );
 }