Module Name: src
Committed By: skrll
Date: Sun Nov 24 11:07:19 UTC 2019
Modified Files:
src/sys/arch/arm/imx: imx6_usbphy.c
src/sys/arch/arm/imx/fdt: imx6_gpio.c imx6_sdhc.c imx6_usb.c
imx6_usbphy.c
Log Message:
Use PRIxBUSADDR
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/imx/imx6_usbphy.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/imx/fdt/imx6_gpio.c \
src/sys/arch/arm/imx/fdt/imx6_usb.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/imx/fdt/imx6_sdhc.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/imx/fdt/imx6_usbphy.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/arch/arm/imx/imx6_usbphy.c
diff -u src/sys/arch/arm/imx/imx6_usbphy.c:1.2 src/sys/arch/arm/imx/imx6_usbphy.c:1.3
--- src/sys/arch/arm/imx/imx6_usbphy.c:1.2 Thu Jun 20 08:16:19 2019
+++ src/sys/arch/arm/imx/imx6_usbphy.c Sun Nov 24 11:07:19 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: imx6_usbphy.c,v 1.2 2019/06/20 08:16:19 hkenken Exp $ */
+/* $NetBSD: imx6_usbphy.c,v 1.3 2019/11/24 11:07:19 skrll Exp $ */
/*
* Copyright (c) 2017 Genetec Corporation. All rights reserved.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: imx6_usbphy.c,v 1.2 2019/06/20 08:16:19 hkenken Exp $");
+__KERNEL_RCSID(1, "$NetBSD: imx6_usbphy.c,v 1.3 2019/11/24 11:07:19 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -144,8 +144,8 @@ imx6_usbphy_attach(device_t parent, devi
error = bus_space_map(sc->sc_bst, addr, size, 0, &sc->sc_bsh);
if (error) {
- aprint_error(": couldn't map %#llx: %d",
- (uint64_t)addr, error);
+ aprint_error(": couldn't map %#" PRIxBUSADDR ": %d",
+ addr, error);
return;
}
Index: src/sys/arch/arm/imx/fdt/imx6_gpio.c
diff -u src/sys/arch/arm/imx/fdt/imx6_gpio.c:1.2 src/sys/arch/arm/imx/fdt/imx6_gpio.c:1.3
--- src/sys/arch/arm/imx/fdt/imx6_gpio.c:1.2 Mon Aug 19 03:45:51 2019
+++ src/sys/arch/arm/imx/fdt/imx6_gpio.c Sun Nov 24 11:07:19 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: imx6_gpio.c,v 1.2 2019/08/19 03:45:51 hkenken Exp $ */
+/* $NetBSD: imx6_gpio.c,v 1.3 2019/11/24 11:07:19 skrll Exp $ */
/*-
* Copyright (c) 2019 Genetec Corporation. All rights reserved.
* Written by Hashimoto Kenichi for Genetec Corporation.
@@ -25,7 +25,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx6_gpio.c,v 1.2 2019/08/19 03:45:51 hkenken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx6_gpio.c,v 1.3 2019/11/24 11:07:19 skrll Exp $");
#include "opt_fdt.h"
#include "gpio.h"
@@ -107,7 +107,7 @@ imxgpio_attach(device_t parent, device_t
error = bus_space_map(faa->faa_bst, addr, size, 0, &ioh);
if (error) {
- aprint_error(": couldn't map %#llx: %d", (uint64_t)addr, error);
+ aprint_error(": couldn't map %#" PRIxBUSADDR ": %d", addr, error);
return;
}
Index: src/sys/arch/arm/imx/fdt/imx6_usb.c
diff -u src/sys/arch/arm/imx/fdt/imx6_usb.c:1.2 src/sys/arch/arm/imx/fdt/imx6_usb.c:1.3
--- src/sys/arch/arm/imx/fdt/imx6_usb.c:1.2 Mon Aug 19 03:45:51 2019
+++ src/sys/arch/arm/imx/fdt/imx6_usb.c Sun Nov 24 11:07:19 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: imx6_usb.c,v 1.2 2019/08/19 03:45:51 hkenken Exp $ */
+/* $NetBSD: imx6_usb.c,v 1.3 2019/11/24 11:07:19 skrll Exp $ */
/*-
* Copyright (c) 2019 Genetec Corporation. All rights reserved.
* Written by Hashimoto Kenichi for Genetec Corporation.
@@ -25,7 +25,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx6_usb.c,v 1.2 2019/08/19 03:45:51 hkenken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx6_usb.c,v 1.3 2019/11/24 11:07:19 skrll Exp $");
#include "opt_fdt.h"
@@ -111,7 +111,7 @@ imx6_usb_attach(device_t parent, device_
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 %#" PRIxBUSADDR ": %d", addr, error);
return;
}
Index: src/sys/arch/arm/imx/fdt/imx6_sdhc.c
diff -u src/sys/arch/arm/imx/fdt/imx6_sdhc.c:1.4 src/sys/arch/arm/imx/fdt/imx6_sdhc.c:1.5
--- src/sys/arch/arm/imx/fdt/imx6_sdhc.c:1.4 Wed Oct 23 05:20:52 2019
+++ src/sys/arch/arm/imx/fdt/imx6_sdhc.c Sun Nov 24 11:07:19 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: imx6_sdhc.c,v 1.4 2019/10/23 05:20:52 hkenken Exp $ */
+/* $NetBSD: imx6_sdhc.c,v 1.5 2019/11/24 11:07:19 skrll Exp $ */
/*-
* Copyright (c) 2019 Genetec Corporation. All rights reserved.
* Written by Hashimoto Kenichi for Genetec Corporation.
@@ -25,7 +25,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx6_sdhc.c,v 1.4 2019/10/23 05:20:52 hkenken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx6_sdhc.c,v 1.5 2019/11/24 11:07:19 skrll Exp $");
#include "opt_fdt.h"
@@ -133,7 +133,7 @@ imx6_sdhc_attach(device_t parent, device
sc->sc_bst = faa->faa_bst;
error = bus_space_map(sc->sc_bst, addr, size, 0, &sc->sc_bsh);
if (error) {
- aprint_error(": couldn't map %#llx: %d", (uint64_t)addr, error);
+ aprint_error(": couldn't map %#" PRIxBUSADDR ": %d", addr, error);
return;
}
sc->sc_bsz = size;
Index: src/sys/arch/arm/imx/fdt/imx6_usbphy.c
diff -u src/sys/arch/arm/imx/fdt/imx6_usbphy.c:1.1 src/sys/arch/arm/imx/fdt/imx6_usbphy.c:1.2
--- src/sys/arch/arm/imx/fdt/imx6_usbphy.c:1.1 Wed Jul 24 13:12:33 2019
+++ src/sys/arch/arm/imx/fdt/imx6_usbphy.c Sun Nov 24 11:07:19 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: imx6_usbphy.c,v 1.1 2019/07/24 13:12:33 hkenken Exp $ */
+/* $NetBSD: imx6_usbphy.c,v 1.2 2019/11/24 11:07:19 skrll Exp $ */
/*-
* Copyright (c) 2019 Genetec Corporation. All rights reserved.
* Written by Hashimoto Kenichi for Genetec Corporation.
@@ -25,7 +25,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: imx6_usbphy.c,v 1.1 2019/07/24 13:12:33 hkenken Exp $");
+__KERNEL_RCSID(1, "$NetBSD: imx6_usbphy.c,v 1.2 2019/11/24 11:07:19 skrll Exp $");
#include "opt_fdt.h"
@@ -93,7 +93,7 @@ imx6_usbphy_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 %#" PRIxBUSADDR ": %d", addr, error);
return;
}
