diff options
author | jkim <jkim@FreeBSD.org> | 2013-06-26 23:52:10 +0000 |
---|---|---|
committer | jkim <jkim@FreeBSD.org> | 2013-06-26 23:52:10 +0000 |
commit | d6fbe88f0679a615b69608ec3ecb115885430183 (patch) | |
tree | 5308c8b7ecfe5d8a177052a821b0da7e79c86f9b | |
parent | d67aed2f532632a2528eefcb53d629a814b476b4 (diff) | |
download | FreeBSD-src-d6fbe88f0679a615b69608ec3ecb115885430183.zip FreeBSD-src-d6fbe88f0679a615b69608ec3ecb115885430183.tar.gz |
Consistently cast ACPICA 64-bit integer types when we print them.
-rw-r--r-- | sys/dev/acpi_support/atk0110.c | 4 | ||||
-rw-r--r-- | sys/dev/acpica/acpi_pcib_acpi.c | 2 | ||||
-rw-r--r-- | usr.sbin/acpi/acpidb/acpidb.c | 4 | ||||
-rw-r--r-- | usr.sbin/acpi/acpidump/acpi.c | 16 |
4 files changed, 13 insertions, 13 deletions
diff --git a/sys/dev/acpi_support/atk0110.c b/sys/dev/acpi_support/atk0110.c index c3f480e..7d30d5f 100644 --- a/sys/dev/acpi_support/atk0110.c +++ b/sys/dev/acpi_support/atk0110.c @@ -253,8 +253,8 @@ aibs_attach_sif(struct aibs_softc *sc, enum aibs_type st) "0x%08"PRIx64" %20s %5"PRIi64" / %5"PRIi64" " "0x%"PRIx64"\n", name[0], i, - as[i].i, desc, (int64_t)as[i].l, (int64_t)as[i].h, - oi[4].Integer.Value); + (uint64_t)as[i].i, desc, (int64_t)as[i].l, + (int64_t)as[i].h, (uint64_t)oi[4].Integer.Value); #endif snprintf(si, sizeof(si), "%i", i); SYSCTL_ADD_PROC(device_get_sysctl_ctx(sc->sc_dev), diff --git a/sys/dev/acpica/acpi_pcib_acpi.c b/sys/dev/acpica/acpi_pcib_acpi.c index e93aec9..36d9580 100644 --- a/sys/dev/acpica/acpi_pcib_acpi.c +++ b/sys/dev/acpica/acpi_pcib_acpi.c @@ -243,7 +243,7 @@ acpi_pcib_producer_handler(ACPI_RESOURCE *res, void *context) if (min + length - 1 != max) device_printf(sc->ap_dev, "Length mismatch for %d range: %jx vs %jx\n", type, - (uintmax_t)max - min + 1, (uintmax_t)length); + (uintmax_t)(max - min + 1), (uintmax_t)length); #ifdef __i386__ if (min > ULONG_MAX) { device_printf(sc->ap_dev, diff --git a/usr.sbin/acpi/acpidb/acpidb.c b/usr.sbin/acpi/acpidb/acpidb.c index 40522ca..3cd8d3f 100644 --- a/usr.sbin/acpi/acpidb/acpidb.c +++ b/usr.sbin/acpi/acpidb/acpidb.c @@ -176,8 +176,8 @@ aml_simulate_prompt(char *msg, UINT64 def_val) if (msg != NULL) { printf("%s", msg); } - printf("(default: 0x%jx ", val); - printf(" / %ju) >>", val); + printf("(default: 0x%jx ", (uintmax_t)val); + printf(" / %ju) >>", (uintmax_t)val); fflush(stdout); bzero(buf, sizeof buf); diff --git a/usr.sbin/acpi/acpidump/acpi.c b/usr.sbin/acpi/acpidump/acpi.c index c7f5bd8..d3f9685 100644 --- a/usr.sbin/acpi/acpidump/acpi.c +++ b/usr.sbin/acpi/acpidump/acpi.c @@ -537,7 +537,7 @@ acpi_handle_mcfg(ACPI_TABLE_HEADER *sdp) alloc = (ACPI_MCFG_ALLOCATION *)(mcfg + 1); for (i = 0; i < entries; i++, alloc++) { printf("\n"); - printf("\tBase Address=0x%016jx\n", alloc->Address); + printf("\tBase Address=0x%016jx\n", (uintmax_t)alloc->Address); printf("\tSegment Group=0x%04x\n", alloc->PciSegment); printf("\tStart Bus=%d\n", alloc->StartBusNumber); printf("\tEnd Bus=%d\n", alloc->EndBusNumber); @@ -554,16 +554,16 @@ acpi_handle_slit(ACPI_TABLE_HEADER *sdp) printf(BEGIN_COMMENT); acpi_print_sdt(sdp); slit = (ACPI_TABLE_SLIT *)sdp; - printf("\tLocality Count=%jd\n", slit->LocalityCount); + printf("\tLocality Count=%ju\n", (uintmax_t)slit->LocalityCount); printf("\n\t "); for (i = 0; i < slit->LocalityCount; i++) - printf(" %3jd", i); + printf(" %3ju", (uintmax_t)i); printf("\n\t +"); for (i = 0; i < slit->LocalityCount; i++) printf("----"); printf("\n"); for (i = 0; i < slit->LocalityCount; i++) { - printf("\t %3jd |", i); + printf("\t %3ju |", (uintmax_t)i); for (j = 0; j < slit->LocalityCount; j++) printf(" %3d", slit->Entry[i * slit->LocalityCount + j]); @@ -830,7 +830,7 @@ acpi_handle_dmar_drhd(ACPI_DMAR_HARDWARE_UNIT *drhd) #undef PRINTFLAG printf("\tSegment=%d\n", drhd->Segment); - printf("\tAddress=0x%0jx\n", drhd->Address); + printf("\tAddress=0x%0jx\n", (uintmax_t)drhd->Address); remaining = drhd->Header.Length - sizeof(ACPI_DMAR_HARDWARE_UNIT); if (remaining > 0) @@ -855,8 +855,8 @@ acpi_handle_dmar_rmrr(ACPI_DMAR_RESERVED_MEMORY *rmrr) printf("\tType=RMRR\n"); printf("\tLength=%d\n", rmrr->Header.Length); printf("\tSegment=%d\n", rmrr->Segment); - printf("\tBaseAddress=0x%0jx\n", rmrr->BaseAddress); - printf("\tLimitAddress=0x%0jx\n", rmrr->EndAddress); + printf("\tBaseAddress=0x%0jx\n", (uintmax_t)rmrr->BaseAddress); + printf("\tLimitAddress=0x%0jx\n", (uintmax_t)rmrr->EndAddress); remaining = rmrr->Header.Length - sizeof(ACPI_DMAR_RESERVED_MEMORY); if (remaining > 0) @@ -911,7 +911,7 @@ acpi_handle_dmar_rhsa(ACPI_DMAR_RHSA *rhsa) printf("\n"); printf("\tType=RHSA\n"); printf("\tLength=%d\n", rhsa->Header.Length); - printf("\tBaseAddress=0x%0jx\n", rhsa->BaseAddress); + printf("\tBaseAddress=0x%0jx\n", (uintmax_t)rhsa->BaseAddress); printf("\tProximityDomain=0x%08x\n", rhsa->ProximityDomain); } |