Changeset 4125b7d in mainline for uspace/drv/ehci-hcd/pci.c

Timestamp:

2011-04-18T20:06:55Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

84a04dd, bbdf09e

Parents:

5ab4a48

Message:

usb_log_printf() checks for printf correctness

It is surprising how many printf warnings simple check could
produce .

Next time, it won't compile. Bad, huh?

File:

• uspace/drv/ehci-hcd/pci.c (modified) (8 diffs)

uspace/drv/ehci-hcd/pci.c

@@ -117 +117 @@
                                 mem_address = res->res.mem_range.address;
                                 mem_size = res->res.mem_range.size;
-                                usb_log_debug2("Found mem: %llx %zu.\n",
+                                usb_log_debug2("Found mem: %" PRIxn" %zu.\n",
                                     mem_address, mem_size);
                                 mem_found = true;
@@ -186 +186 @@
         CHECK_RET_HANGUP_RETURN(ret, "Failed(%d) to read PCI config space.\n",
             ret);
-        usb_log_info("Register space BAR at %p:%x.\n", address, value);
+        usb_log_info("Register space BAR at %p:%" PRIxn ".\n", (void *) address, value);
 
         /* clear lower byte, it's not part of the BASE address */
         uintptr_t registers = (value & 0xffffff00);
-        usb_log_info("Memory registers BASE address:%p.\n", registers);
+        usb_log_info("Memory registers BASE address:%p.\n", (void *) registers);
 
         /* if nothing setup the hc, we don't need to turn it off */
@@ -201 +201 @@
             AS_AREA_READ | AS_AREA_WRITE);
         CHECK_RET_HANGUP_RETURN(ret, "Failed(%d) to map registers %p:%p.\n",
-            ret, regs, registers);
+            ret, regs, (void *) registers);
 
         /* calculate value of BASE */
@@ -221 +221 @@
             IPC_M_CONFIG_SPACE_READ_32, eecp + USBLEGCTLSTS_OFFSET, &value);
         CHECK_RET_HANGUP_RETURN(ret, "Failed(%d) to read USBLEGCTLSTS.\n", ret);
-        usb_log_debug("USBLEGCTLSTS: %x.\n", value);
+        usb_log_debug("USBLEGCTLSTS: %" PRIxn ".\n", value);
 
         /* Read the first EEC. i.e. Legacy Support register */
@@ -228 +228 @@
             IPC_M_CONFIG_SPACE_READ_32, eecp + USBLEGSUP_OFFSET, &value);
         CHECK_RET_HANGUP_RETURN(ret, "Failed(%d) to read USBLEGSUP.\n", ret);
-        usb_log_debug2("USBLEGSUP: %x.\n", value);
+        usb_log_debug2("USBLEGSUP: %" PRIxn ".\n", value);
 
         /* Request control from firmware/BIOS, by writing 1 to highest byte.
@@ -248 +248 @@
 
         if ((value & USBLEGSUP_BIOS_CONTROL) == 0) {
-                usb_log_info("BIOS released control after %d usec.\n", wait);
+                usb_log_info("BIOS released control after %zu usec.\n", wait);
         } else {
                 /* BIOS failed to hand over control, this should not happen. */
                 usb_log_warning( "BIOS failed to release control after "
-                    "%d usecs, force it.\n", wait);
+                    "%zu usecs, force it.\n", wait);
                 ret = async_req_3_0(parent_phone, DEV_IFACE_ID(PCI_DEV_IFACE),
                     IPC_M_CONFIG_SPACE_WRITE_32, eecp + USBLEGSUP_OFFSET,
@@ -271 +271 @@
             IPC_M_CONFIG_SPACE_READ_32, eecp + USBLEGCTLSTS_OFFSET, &value);
         CHECK_RET_HANGUP_RETURN(ret, "Failed(%d) to read USBLEGCTLSTS.\n", ret);
-        usb_log_debug2("USBLEGCTLSTS: %x.\n", value);
+        usb_log_debug2("USBLEGCTLSTS: %" PRIxn ".\n", value);
 
         /* Read again Legacy Support register */
@@ -277 +277 @@
             IPC_M_CONFIG_SPACE_READ_32, eecp + USBLEGSUP_OFFSET, &value);
         CHECK_RET_HANGUP_RETURN(ret, "Failed(%d) to read USBLEGSUP.\n", ret);
-        usb_log_debug2("USBLEGSUP: %x.\n", value);
+        usb_log_debug2("USBLEGSUP: %" PRIxn ".\n", value);
 
         /*