Module Name: src
Committed By: jmcneill
Date: Tue Oct 23 08:38:18 UTC 2018
Modified Files:
src/sys/arch/arm/footbridge: footbridge_pci.c
src/sys/arch/evbarm/ifpga: ifpga_pci.c
src/sys/arch/evbarm/iq80310: iq80310_pci.c
src/sys/arch/evbarm/ixdp425: ixdp425_pci.c
src/sys/arch/evbarm/ixm1200: ixm1200_pci.c
Log Message:
Fix printf format strings - pci_intr_handle_t is uint64_t now on arm
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/arm/footbridge/footbridge_pci.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbarm/ifpga/ifpga_pci.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/iq80310/iq80310_pci.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/ixdp425/ixdp425_pci.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/ixm1200/ixm1200_pci.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/footbridge/footbridge_pci.c
diff -u src/sys/arch/arm/footbridge/footbridge_pci.c:1.29 src/sys/arch/arm/footbridge/footbridge_pci.c:1.30
--- src/sys/arch/arm/footbridge/footbridge_pci.c:1.29 Wed Apr 19 08:30:00 2017
+++ src/sys/arch/arm/footbridge/footbridge_pci.c Tue Oct 23 08:38:18 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: footbridge_pci.c,v 1.29 2017/04/19 08:30:00 skrll Exp $ */
+/* $NetBSD: footbridge_pci.c,v 1.30 2018/10/23 08:38:18 jmcneill Exp $ */
/*
* Copyright (c) 1997,1998 Mark Brinicombe.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: footbridge_pci.c,v 1.29 2017/04/19 08:30:00 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: footbridge_pci.c,v 1.30 2018/10/23 08:38:18 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -314,18 +314,18 @@ const char *
footbridge_pci_intr_string(void *pcv, pci_intr_handle_t ih, char *buf, size_t len)
{
#ifdef PCI_DEBUG
- printf("footbridge_pci_intr_string(pcv=%p, ih=0x%lx)\n", pcv, ih);
+ printf("footbridge_pci_intr_string(pcv=%p, ih=0x%" PRIx64 ")\n", pcv, ih);
#endif
if (ih == 0)
- panic("footbridge_pci_intr_string: bogus handle 0x%lx", ih);
+ panic("footbridge_pci_intr_string: bogus handle 0x%" PRIx64, ih);
#if NISA > 0
if (ih >= 0x80 && ih <= 0x8f) {
- snprintf(buf, len, "isairq %ld", (ih & 0x0f));
+ snprintf(buf, len, "isairq %" PRIu64, (ih & 0x0f));
return buf;
}
#endif
- snprintf(buf, len, "irq %ld", ih);
+ snprintf(buf, len, "irq %" PRIu64, ih);
return buf;
}
@@ -342,7 +342,7 @@ footbridge_pci_intr_establish(
const char *intrstr;
#ifdef PCI_DEBUG
- printf("footbridge_pci_intr_establish(pcv=%p, ih=0x%lx, level=%d, func=%p, arg=%p)\n",
+ printf("footbridge_pci_intr_establish(pcv=%p, ih=0x%" PRIx64 ", level=%d, func=%p, arg=%p)\n",
pcv, ih, level, func, arg);
#endif
Index: src/sys/arch/evbarm/ifpga/ifpga_pci.c
diff -u src/sys/arch/evbarm/ifpga/ifpga_pci.c:1.20 src/sys/arch/evbarm/ifpga/ifpga_pci.c:1.21
--- src/sys/arch/evbarm/ifpga/ifpga_pci.c:1.20 Fri Apr 21 12:18:59 2017
+++ src/sys/arch/evbarm/ifpga/ifpga_pci.c Tue Oct 23 08:38:18 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ifpga_pci.c,v 1.20 2017/04/21 12:18:59 jmcneill Exp $ */
+/* $NetBSD: ifpga_pci.c,v 1.21 2018/10/23 08:38:18 jmcneill Exp $ */
/*
* Copyright (c) 2001 ARM Ltd
@@ -64,7 +64,7 @@
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ifpga_pci.c,v 1.20 2017/04/21 12:18:59 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ifpga_pci.c,v 1.21 2018/10/23 08:38:18 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -340,7 +340,7 @@ ifpga_pci_intr_string(void *pcv, pci_int
if (ih == 0)
panic("ifpga_pci_intr_string: bogus handle 0x%lx", ih);
- snprintf(buf, len, "pciint%ld", ih - IFPGA_INTRNUM_PCIINT0);
+ snprintf(buf, len, "pciint%" PRIu64, ih - IFPGA_INTRNUM_PCIINT0);
return buf;
}
Index: src/sys/arch/evbarm/iq80310/iq80310_pci.c
diff -u src/sys/arch/evbarm/iq80310/iq80310_pci.c:1.13 src/sys/arch/evbarm/iq80310/iq80310_pci.c:1.14
--- src/sys/arch/evbarm/iq80310/iq80310_pci.c:1.13 Sat Mar 29 19:28:27 2014
+++ src/sys/arch/evbarm/iq80310/iq80310_pci.c Tue Oct 23 08:38:18 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: iq80310_pci.c,v 1.13 2014/03/29 19:28:27 christos Exp $ */
+/* $NetBSD: iq80310_pci.c,v 1.14 2018/10/23 08:38:18 jmcneill Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iq80310_pci.c,v 1.13 2014/03/29 19:28:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iq80310_pci.c,v 1.14 2018/10/23 08:38:18 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -232,7 +232,7 @@ iq80310_pci_intr_map(const struct pci_at
const char *
iq80310_pci_intr_string(void *v, pci_intr_handle_t ih, char *buf, size_t len)
{
- snprintf(buf, len, "iq80310 irq %ld", ih);
+ snprintf(buf, len, "iq80310 irq %" PRIu64, ih);
return buf;
}
Index: src/sys/arch/evbarm/ixdp425/ixdp425_pci.c
diff -u src/sys/arch/evbarm/ixdp425/ixdp425_pci.c:1.11 src/sys/arch/evbarm/ixdp425/ixdp425_pci.c:1.12
--- src/sys/arch/evbarm/ixdp425/ixdp425_pci.c:1.11 Sat Mar 29 19:28:27 2014
+++ src/sys/arch/evbarm/ixdp425/ixdp425_pci.c Tue Oct 23 08:38:18 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ixdp425_pci.c,v 1.11 2014/03/29 19:28:27 christos Exp $ */
+/* $NetBSD: ixdp425_pci.c,v 1.12 2018/10/23 08:38:18 jmcneill Exp $ */
#define PCI_DEBUG
/*
* Copyright (c) 2003
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixdp425_pci.c,v 1.11 2014/03/29 19:28:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixdp425_pci.c,v 1.12 2018/10/23 08:38:18 jmcneill Exp $");
/*
* IXDP425 PCI interrupt support.
@@ -217,7 +217,7 @@ ixdp425_pci_intr_map(const struct pci_at
static const char *
ixdp425_pci_intr_string(void *v, pci_intr_handle_t ih, char *buf, size_t len)
{
- snprintf(buf, len, "ixp425 irq %ld", ih);
+ snprintf(buf, len, "ixp425 irq %" PRIu64, ih);
return buf;
}
Index: src/sys/arch/evbarm/ixm1200/ixm1200_pci.c
diff -u src/sys/arch/evbarm/ixm1200/ixm1200_pci.c:1.11 src/sys/arch/evbarm/ixm1200/ixm1200_pci.c:1.12
--- src/sys/arch/evbarm/ixm1200/ixm1200_pci.c:1.11 Sat Mar 29 19:28:27 2014
+++ src/sys/arch/evbarm/ixm1200/ixm1200_pci.c Tue Oct 23 08:38:18 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ixm1200_pci.c,v 1.11 2014/03/29 19:28:27 christos Exp $ */
+/* $NetBSD: ixm1200_pci.c,v 1.12 2018/10/23 08:38:18 jmcneill Exp $ */
#define PCI_DEBUG
/*
* Copyright (c) 2002, 2003
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixm1200_pci.c,v 1.11 2014/03/29 19:28:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixm1200_pci.c,v 1.12 2018/10/23 08:38:18 jmcneill Exp $");
/*
* IXM1200 PCI interrupt support.
@@ -92,7 +92,7 @@ ixm1200_pci_intr_map(const struct pci_at
const char *
ixm1200_pci_intr_string(void *v, pci_intr_handle_t ih, char *buf, size_t len)
{
- snprintf(buf, len, "IXM1200 irq %ld", ih);
+ snprintf(buf, len, "IXM1200 irq %" PRIu64, ih);
return buf;
}
