Changeset d6f78857 in mainline

Timestamp:

2011-02-04T17:02:02Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

2899980

Parents:

9e4f6a7

Message:

More debug output

reduce timeout

Location:

uspace/drv/uhci-hcd

Files:

• main.c (modified) (1 diff)
• uhci.c (modified) (2 diffs)
• uhci.h (modified) (1 diff)
• utils/malloc32.h (modified) (1 diff)

uspace/drv/uhci-hcd/main.c

@@ -134 +134 @@
          */
         sleep(5);
-        usb_log_enable(USB_LOG_LEVEL_DEBUG, NAME);
+        usb_log_enable(USB_LOG_LEVEL_INFO, NAME);
 
         return driver_main(&uhci_driver);

uspace/drv/uhci-hcd/uhci.c

@@ -238 +238 @@
                                         it, it->status, addr_to_phys((void*)it) );
                                 usb_log_debug("First to send: %x\n",
-                                        (current_list->queue_head->element & (~0xf)) );
+                                        (current_list->queue_head->element) );
                         }
 
@@ -269 +269 @@
 
                 uintptr_t frame_list = pio_read_32(&instance->registers->flbaseadd);
-                usb_log_debug("Framelist address: %p vs. %p.\n",
-                        frame_list, addr_to_phys(instance->frame_list));
+                if (frame_list != (uintptr_t)addr_to_phys(instance->frame_list)) {
+                        usb_log_debug("Framelist address: %p vs. %p.\n",
+                                frame_list, addr_to_phys(instance->frame_list));
+                }
                 int frnum = pio_read_16(&instance->registers->frnum) & 0x3ff;
-                usb_log_debug("Framelist item: %d \n", frnum );
+                usb_log_debug2("Framelist item: %d \n", frnum );
 
                 queue_head_t* qh = instance->transfers_interrupt.queue_head;

uspace/drv/uhci-hcd/uhci.h

@@ -70 +70 @@
 #define TRANSFER_QUEUES 4
 #define UHCI_FRAME_LIST_COUNT 1024
-#define UHCI_CLEANER_TIMEOUT 1000000
+#define UHCI_CLEANER_TIMEOUT 10000
 #define UHCI_DEBUGER_TIMEOUT 500000
 

uspace/drv/uhci-hcd/utils/malloc32.h

@@ -71 +71 @@
 }
 
-static inline void * memalign32(size_t size, size_t alignment)
-        { return memalign(alignment, size); }
-
 static inline void free32(void *addr)
         { if (addr) free(addr); }