Module Name: src
Committed By: jmcneill
Date: Mon Jan 17 17:32:11 UTC 2011
Modified Files:
src/sys/dev/acpi: acpi_wdrt.c
Log Message:
use PRIx64 instead of llx, fixes build on amd64
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/acpi/acpi_wdrt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/acpi_wdrt.c
diff -u src/sys/dev/acpi/acpi_wdrt.c:1.1 src/sys/dev/acpi/acpi_wdrt.c:1.2
--- src/sys/dev/acpi/acpi_wdrt.c:1.1 Mon Jan 17 15:49:13 2011
+++ src/sys/dev/acpi/acpi_wdrt.c Mon Jan 17 17:32:11 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_wdrt.c,v 1.1 2011/01/17 15:49:13 jmcneill Exp $ */
+/* $NetBSD: acpi_wdrt.c,v 1.2 2011/01/17 17:32:11 jmcneill Exp $ */
/*
* Copyright (c) 2011 Jared D. McNeill <jmcne...@invisible.ca>
@@ -35,7 +35,7 @@
/* #define ACPIWDRT_DEBUG */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_wdrt.c,v 1.1 2011/01/17 15:49:13 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_wdrt.c,v 1.2 2011/01/17 17:32:11 jmcneill Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -194,7 +194,7 @@
sc->sc_count_reg = wdrt->CountRegister;
aprint_naive("\n");
- aprint_normal(": mem 0x%llx,0x%llx\n",
+ aprint_normal(": mem 0x%" PRIx64 ",0x%" PRIx64 "\n",
sc->sc_control_reg.Address, sc->sc_count_reg.Address);
if (wdrt->PciVendorId != 0xffff && wdrt->PciDeviceId != 0xffff) {
@@ -344,7 +344,8 @@
rv = AcpiOsReadMemory(sc->sc_control_reg.Address,
val, sc->sc_control_reg.BitWidth);
- DPRINTF(("%s: %s 0x%llx/%u 0x%08x (%u)\n", device_xname(sc->sc_dev),
+ DPRINTF(("%s: %s 0x%" PRIx64 "/%u 0x%08x (%u)\n",
+ device_xname(sc->sc_dev),
__func__, sc->sc_control_reg.Address, sc->sc_control_reg.BitWidth,
*val, rv));
@@ -361,7 +362,8 @@
rv = AcpiOsWriteMemory(sc->sc_control_reg.Address,
val, sc->sc_control_reg.BitWidth);
- DPRINTF(("%s: %s 0x%llx/%u 0x%08x (%u)\n", device_xname(sc->sc_dev),
+ DPRINTF(("%s: %s 0x%" PRIx64 "/%u 0x%08x (%u)\n",
+ device_xname(sc->sc_dev),
__func__, sc->sc_control_reg.Address, sc->sc_control_reg.BitWidth,
val, rv));
@@ -379,7 +381,8 @@
rv = AcpiOsReadMemory(sc->sc_count_reg.Address,
val, sc->sc_count_reg.BitWidth);
- DPRINTF(("%s: %s 0x%llx/%u 0x%08x (%u)\n", device_xname(sc->sc_dev),
+ DPRINTF(("%s: %s 0x%" PRIx64 "/%u 0x%08x (%u)\n",
+ device_xname(sc->sc_dev),
__func__, sc->sc_count_reg.Address, sc->sc_count_reg.BitWidth,
*val, rv));
@@ -397,7 +400,8 @@
rv = AcpiOsWriteMemory(sc->sc_count_reg.Address,
val, sc->sc_count_reg.BitWidth);
- DPRINTF(("%s: %s 0x%llx/%u 0x%08x (%u)\n", device_xname(sc->sc_dev),
+ DPRINTF(("%s: %s 0x%" PRIx64 "/%u 0x%08x (%u)\n",
+ device_xname(sc->sc_dev),
__func__, sc->sc_count_reg.Address, sc->sc_count_reg.BitWidth,
val, rv));
