Module Name: src
Committed By: christos
Date: Tue Jul 17 00:42:06 UTC 2018
Modified Files:
src/sys/dev/fdt: dw_apb_uart.c dwcmmc_fdt.c fdt_subr.c
Log Message:
Use PRI?64 instead of ll?
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/fdt/dw_apb_uart.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/fdt/dwcmmc_fdt.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/fdt/fdt_subr.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/fdt/dw_apb_uart.c
diff -u src/sys/dev/fdt/dw_apb_uart.c:1.2 src/sys/dev/fdt/dw_apb_uart.c:1.3
--- src/sys/dev/fdt/dw_apb_uart.c:1.2 Sun May 27 15:54:45 2018
+++ src/sys/dev/fdt/dw_apb_uart.c Mon Jul 16 20:42:06 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: dw_apb_uart.c,v 1.2 2018/05/27 19:54:45 jmcneill Exp $ */
+/* $NetBSD: dw_apb_uart.c,v 1.3 2018/07/17 00:42:06 christos Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <[email protected]>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: dw_apb_uart.c,v 1.2 2018/05/27 19:54:45 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: dw_apb_uart.c,v 1.3 2018/07/17 00:42:06 christos Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -133,7 +133,7 @@ dw_apb_uart_attach(device_t parent, devi
error = bus_space_map(bst, addr, size, 0, &bsh);
if (error) {
- aprint_error(": couldn't map %#llx: %d", (uint64_t)addr, error);
+ aprint_error(": couldn't map %#" PRIx64 ": %d", (uint64_t)addr, error);
return;
}
Index: src/sys/dev/fdt/dwcmmc_fdt.c
diff -u src/sys/dev/fdt/dwcmmc_fdt.c:1.5 src/sys/dev/fdt/dwcmmc_fdt.c:1.6
--- src/sys/dev/fdt/dwcmmc_fdt.c:1.5 Mon Jul 2 09:45:23 2018
+++ src/sys/dev/fdt/dwcmmc_fdt.c Mon Jul 16 20:42:06 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: dwcmmc_fdt.c,v 1.5 2018/07/02 13:45:23 jmcneill Exp $ */
+/* $NetBSD: dwcmmc_fdt.c,v 1.6 2018/07/17 00:42:06 christos Exp $ */
/*-
* Copyright (c) 2015-2018 Jared McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwcmmc_fdt.c,v 1.5 2018/07/02 13:45:23 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwcmmc_fdt.c,v 1.6 2018/07/17 00:42:06 christos Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -129,7 +129,7 @@ dwcmmc_fdt_attach(device_t parent, devic
sc->sc_dmat = faa->faa_dmat;
error = bus_space_map(sc->sc_bst, addr, size, 0, &sc->sc_bsh);
if (error) {
- aprint_error(": couldn't map %#llx: %d\n",
+ aprint_error(": couldn't map %#" PRIx64 ": %d\n",
(uint64_t)addr, error);
return;
}
Index: src/sys/dev/fdt/fdt_subr.c
diff -u src/sys/dev/fdt/fdt_subr.c:1.22 src/sys/dev/fdt/fdt_subr.c:1.23
--- src/sys/dev/fdt/fdt_subr.c:1.22 Mon Jun 11 15:54:39 2018
+++ src/sys/dev/fdt/fdt_subr.c Mon Jul 16 20:42:06 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_subr.c,v 1.22 2018/06/11 19:54:39 jakllsch Exp $ */
+/* $NetBSD: fdt_subr.c,v 1.23 2018/07/17 00:42:06 christos Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdt_subr.c,v 1.22 2018/06/11 19:54:39 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_subr.c,v 1.23 2018/07/17 00:42:06 christos Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -289,8 +289,8 @@ fdtbus_get_reg64(int phandle, u_int inde
*paddr = fdtbus_decode_range(OF_parent(phandle), addr);
const char *name = fdt_get_name(fdtbus_get_data(),
fdtbus_phandle2offset(phandle), NULL);
- aprint_debug("fdt: [%s] decoded addr #%u: %llx -> %llx\n",
- name, index, addr, *paddr);
+ aprint_debug("fdt: [%s] decoded addr #%u: %" PRIx64
+ " -> %" PRIx64 "\n", name, index, addr, *paddr);
}
if (psize)
*psize = size;
