Fork us on GitHub Follow us on Facebook Follow us on Twitter

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


Ignore:
Timestamp:
2011-04-18T20:06:55Z (11 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master
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:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/ehci-hcd/pci.c

    r5ab4a48 r4125b7d  
    117117                                mem_address = res->res.mem_range.address;
    118118                                mem_size = res->res.mem_range.size;
    119                                 usb_log_debug2("Found mem: %llx %zu.\n",
     119                                usb_log_debug2("Found mem: %" PRIxn" %zu.\n",
    120120                                    mem_address, mem_size);
    121121                                mem_found = true;
     
    186186        CHECK_RET_HANGUP_RETURN(ret, "Failed(%d) to read PCI config space.\n",
    187187            ret);
    188         usb_log_info("Register space BAR at %p:%x.\n", address, value);
     188        usb_log_info("Register space BAR at %p:%" PRIxn ".\n", (void *) address, value);
    189189
    190190        /* clear lower byte, it's not part of the BASE address */
    191191        uintptr_t registers = (value & 0xffffff00);
    192         usb_log_info("Memory registers BASE address:%p.\n", registers);
     192        usb_log_info("Memory registers BASE address:%p.\n", (void *) registers);
    193193
    194194        /* if nothing setup the hc, we don't need to turn it off */
     
    201201            AS_AREA_READ | AS_AREA_WRITE);
    202202        CHECK_RET_HANGUP_RETURN(ret, "Failed(%d) to map registers %p:%p.\n",
    203             ret, regs, registers);
     203            ret, regs, (void *) registers);
    204204
    205205        /* calculate value of BASE */
     
    221221            IPC_M_CONFIG_SPACE_READ_32, eecp + USBLEGCTLSTS_OFFSET, &value);
    222222        CHECK_RET_HANGUP_RETURN(ret, "Failed(%d) to read USBLEGCTLSTS.\n", ret);
    223         usb_log_debug("USBLEGCTLSTS: %x.\n", value);
     223        usb_log_debug("USBLEGCTLSTS: %" PRIxn ".\n", value);
    224224
    225225        /* Read the first EEC. i.e. Legacy Support register */
     
    228228            IPC_M_CONFIG_SPACE_READ_32, eecp + USBLEGSUP_OFFSET, &value);
    229229        CHECK_RET_HANGUP_RETURN(ret, "Failed(%d) to read USBLEGSUP.\n", ret);
    230         usb_log_debug2("USBLEGSUP: %x.\n", value);
     230        usb_log_debug2("USBLEGSUP: %" PRIxn ".\n", value);
    231231
    232232        /* Request control from firmware/BIOS, by writing 1 to highest byte.
     
    248248
    249249        if ((value & USBLEGSUP_BIOS_CONTROL) == 0) {
    250                 usb_log_info("BIOS released control after %d usec.\n", wait);
     250                usb_log_info("BIOS released control after %zu usec.\n", wait);
    251251        } else {
    252252                /* BIOS failed to hand over control, this should not happen. */
    253253                usb_log_warning( "BIOS failed to release control after "
    254                     "%d usecs, force it.\n", wait);
     254                    "%zu usecs, force it.\n", wait);
    255255                ret = async_req_3_0(parent_phone, DEV_IFACE_ID(PCI_DEV_IFACE),
    256256                    IPC_M_CONFIG_SPACE_WRITE_32, eecp + USBLEGSUP_OFFSET,
     
    271271            IPC_M_CONFIG_SPACE_READ_32, eecp + USBLEGCTLSTS_OFFSET, &value);
    272272        CHECK_RET_HANGUP_RETURN(ret, "Failed(%d) to read USBLEGCTLSTS.\n", ret);
    273         usb_log_debug2("USBLEGCTLSTS: %x.\n", value);
     273        usb_log_debug2("USBLEGCTLSTS: %" PRIxn ".\n", value);
    274274
    275275        /* Read again Legacy Support register */
     
    277277            IPC_M_CONFIG_SPACE_READ_32, eecp + USBLEGSUP_OFFSET, &value);
    278278        CHECK_RET_HANGUP_RETURN(ret, "Failed(%d) to read USBLEGSUP.\n", ret);
    279         usb_log_debug2("USBLEGSUP: %x.\n", value);
     279        usb_log_debug2("USBLEGSUP: %" PRIxn ".\n", value);
    280280
    281281        /*
Note: See TracChangeset for help on using the changeset viewer.