Changeset 113aef8 in mainline

Timestamp:

2011-01-29T08:58:46Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

d956aa5

Parents:

245b56b5

Message:

TD debug messages refatoring

Location:

uspace/drv/uhci

Files:

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

uspace/drv/uhci/uhci_struct/transfer_descriptor.c

@@ -10 +10 @@
           0 | LINK_POINTER_TERMINATE_FLAG;
 
-        uhci_print_verbose("Creating link field: %x.\n", instance->next);
 
         assert(size < 1024);
@@ -16 +15 @@
           | ((error_count & TD_STATUS_ERROR_COUNT_MASK) << TD_STATUS_ERROR_COUNT_POS)
           | TD_STATUS_ERROR_ACTIVE;
-
-        uhci_print_verbose("Creating status field: %x.\n", instance->status);
 
         instance->device = 0
@@ -25 +22 @@
                 | ((pid & TD_DEVICE_PID_MASK) << TD_DEVICE_PID_POS);
 
-        uhci_print_verbose("Creating device field: %x.\n", instance->device);
+        instance->buffer_ptr = 0;
+
+        instance->next_va = NULL;
+        instance->callback = NULL;
 
         if (size) {
                 instance->buffer_ptr = (uintptr_t)addr_to_phys(buffer);
-
-                uhci_print_verbose("Creating buffer field: %p(%p).\n",
-                        buffer, instance->buffer_ptr);
-
-                if (size >= 8) {
-                        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]);
-                }
-        } else {
-                instance->buffer_ptr = 0;
         }
 
-        instance->next_va = NULL;
-        instance->callback = NULL;
-        uhci_print_info("Created a new TD.\n");
+        uhci_print_info("Created TD: %X:%X:%X:%X(%p).\n",
+                instance->next, instance->status, instance->device,
+          instance->buffer_ptr, buffer);
+
+        if (size) {
+                unsigned char * buff = buffer;
+                uhci_print_verbose("TD Buffer dump(%p-%dB): ", buffer, size);
+                unsigned i = 0;
+                /* TODO: Verbose? */
+                for (; i < size; ++i) {
+                        printf((i & 1) ? "%x " : "%x", buff[i]);
+                }
+                printf("\n");
+        }
 }
 

uspace/drv/uhci/utils/malloc32.h

@@ -42 +42 @@
 #include <as.h>
 
+#define UHCI_STRCUTURES_ALIGNMENT 16
+#define UHCI_REQUIRED_PAGE_SIZE 4096
+
 static inline void * addr_to_phys(void *addr)
 {
@@ -52 +55 @@
 
 static inline void * malloc32(size_t size)
-/* TODO: this is ugly */
-        { return memalign(16, size); }
+        { return memalign(UHCI_STRCUTURES_ALIGNMENT, size); }
 
 static inline void * get_page()
 {
-        void * free_address = as_get_mappable_page(4096);
+        void * free_address = as_get_mappable_page(UHCI_REQUIRED_PAGE_SIZE);
         assert(free_address);
         if (free_address == 0)
                 return 0;
         void* ret =
-          as_area_create(free_address, 4096, AS_AREA_READ | AS_AREA_WRITE |AS_AREA_CACHEABLE);
+          as_area_create(free_address, UHCI_REQUIRED_PAGE_SIZE,
+                  AS_AREA_READ | AS_AREA_WRITE);
         if (ret != free_address)
                 return 0;