Changeset cf2ccd4 in mainline for uspace/drv/uhci-hcd/hc.c

Timestamp:

2011-04-22T09:26:50Z (14 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

7304663

Parents:

1553cbf (diff), 1775ebc (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:

new report structure and usbhid merge

File:

• uspace/drv/uhci-hcd/hc.c (modified) (7 diffs)

uspace/drv/uhci-hcd/hc.c ¶

@@ -101 +101 @@
             ret, io, str_error(ret));
         instance->registers = io;
-        usb_log_debug("Device registers at %p(%u) accessible.\n",
+        usb_log_debug("Device registers at %p (%zuB) accessible.\n",
             io, reg_size);
 
@@ -330 +330 @@
 {
         assert(instance);
-//      status |= 1; //Uncomment to work around qemu hang
+        status |= 1; //Uncomment to work around qemu hang
         /* Lower 2 bits are transaction error and transaction complete */
         if (status & (UHCI_STATUS_INTERRUPT | UHCI_STATUS_ERROR_INTERRUPT)) {
@@ -423 +423 @@
                 if (frame_list != addr_to_phys(instance->frame_list)) {
                         usb_log_debug("Framelist address: %p vs. %p.\n",
-                            frame_list, addr_to_phys(instance->frame_list));
+                            (void *) frame_list,
+                            (void *) addr_to_phys(instance->frame_list));
                 }
 
@@ -432 +433 @@
                 uintptr_t real_pa = addr_to_phys(QH(interrupt));
                 if (expected_pa != real_pa) {
-                        usb_log_debug("Interrupt QH: %p(frame: %d) vs. %p.\n",
-                            expected_pa, frnum, real_pa);
+                        usb_log_debug("Interrupt QH: %p (frame %d) vs. %p.\n",
+                            (void *) expected_pa, frnum, (void *) real_pa);
                 }
 
@@ -440 +441 @@
                 if (expected_pa != real_pa) {
                         usb_log_debug("Control Slow QH: %p vs. %p.\n",
-                            expected_pa, real_pa);
+                            (void *) expected_pa, (void *) real_pa);
                 }
 
@@ -447 +448 @@
                 if (expected_pa != real_pa) {
                         usb_log_debug("Control Full QH: %p vs. %p.\n",
-                            expected_pa, real_pa);
+                            (void *) expected_pa, (void *) real_pa);
                 }
 
@@ -454 +455 @@
                 if (expected_pa != real_pa ) {
                         usb_log_debug("Bulk QH: %p vs. %p.\n",
-                            expected_pa, real_pa);
+                            (void *) expected_pa, (void *) real_pa);
                 }
                 async_usleep(UHCI_DEBUGER_TIMEOUT);