Changeset 3da5eb9 in mainline for uspace/drv/uhci/uhci_struct

Timestamp:

2011-01-28T19:07:41Z (15 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

f0e25e8

Parents:

01656f2

Message:

Fixed: add buffer pointer to TD on initialization

Added status info on Inactive transfer debug output

Location:

uspace/drv/uhci/uhci_struct

Files:

• transfer_descriptor.c (modified) (2 diffs)
• transfer_descriptor.h (modified) (2 diffs)

uspace/drv/uhci/uhci_struct/transfer_descriptor.c

@@ -3 +3 @@
 void transfer_descriptor_init(transfer_descriptor_t *instance,
   int error_count, size_t size, bool isochronous, usb_target_t target,
-        int pid)
+        int pid, void *buffer)
 {
         assert(instance);
 
         instance->next =
-          0 | LINK_POINTER_VERTICAL_FLAG | LINK_POINTER_TERMINATE_FLAG;
+          0 | LINK_POINTER_TERMINATE_FLAG;
+
+        uhci_print_verbose("Creating link field: %x.\n", instance->next);
 
         assert(size < 1024);
@@ -18 +20 @@
 
         instance->device = 0
-                | ((size & TD_DEVICE_MAXLEN_MASK) << TD_DEVICE_MAXLEN_POS)
+                | (((size - 1) & TD_DEVICE_MAXLEN_MASK) << TD_DEVICE_MAXLEN_POS)
                 | ((target.address & TD_DEVICE_ADDRESS_MASK) << TD_DEVICE_ADDRESS_POS)
                 | ((target.endpoint & TD_DEVICE_ENDPOINT_MASK) << TD_DEVICE_ENDPOINT_POS)
                 | ((pid & TD_DEVICE_PID_MASK) << TD_DEVICE_PID_POS);
+
+        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 * buff = buffer;
+
+        uhci_print_verbose("Buffer dump(8B): %x %x %x %x %x %x %x %x.\n",
+          buff[0], buff[1], buff[2], buff[3], buff[4], buff[5], buff[6], buff[7]);
 
         instance->next_va = NULL;

uspace/drv/uhci/uhci_struct/transfer_descriptor.h

@@ -98 +98 @@
 void transfer_descriptor_init(transfer_descriptor_t *instance,
   int error_count, size_t size, bool isochronous, usb_target_t target,
-        int pid);
+        int pid, void *buffer);
 
 static inline transfer_descriptor_t * transfer_descriptor_get(
-  int error_count, size_t size, bool isochronous, usb_target_t target, int pid)
+  int error_count, size_t size, bool isochronous, usb_target_t target,
+  int pid, void *buffer)
 {
         transfer_descriptor_t * instance =
@@ -108 +109 @@
         if (instance)
                 transfer_descriptor_init(
-                  instance, error_count, size, isochronous, target, pid);
+                  instance, error_count, size, isochronous, target, pid, buffer);
         return instance;
 }