Module Name: src
Committed By: cliff
Date: Wed Nov 18 01:15:32 UTC 2009
Modified Files:
src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_pcie.c
Log Message:
- use PRIxBUSADDR as needed
- make cfg_oba, ecfg_oba type bus_addr_t
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/arch/mips/rmi/rmixl_pcie.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/mips/rmi/rmixl_pcie.c
diff -u src/sys/arch/mips/rmi/rmixl_pcie.c:1.1.2.3 src/sys/arch/mips/rmi/rmixl_pcie.c:1.1.2.4
--- src/sys/arch/mips/rmi/rmixl_pcie.c:1.1.2.3 Sun Nov 15 23:11:06 2009
+++ src/sys/arch/mips/rmi/rmixl_pcie.c Wed Nov 18 01:15:32 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_pcie.c,v 1.1.2.3 2009/11/15 23:11:06 cliff Exp $ */
+/* $NetBSD: rmixl_pcie.c,v 1.1.2.4 2009/11/18 01:15:32 cliff Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_pcie.c,v 1.1.2.3 2009/11/15 23:11:06 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_pcie.c,v 1.1.2.4 2009/11/18 01:15:32 cliff Exp $");
#include "opt_pci.h"
#include "pci.h"
@@ -188,7 +188,7 @@
ba *= (1024 * 1024); \
bar = RMIXL_PCIE_CONCAT3(RMIXL_PCIE_,reg,_BAR)(ba, 1); \
DPRINTF(("PCIE %s BAR was not enabled by firmware\n" \
- "enabling %s at phys %" PRIx64 ", size %lu MB\n", \
+ "enabling %s at phys %#" PRIxBUSADDR ", size %lu MB\n", \
__STRING(reg), __STRING(reg), ba, size)); \
RMIXL_IOREG_WRITE(RMIXL_IO_DEV_BRIDGE + \
RMIXL_PCIE_CONCAT3(RMIXL_SBC_PCIE_,reg,_BAR), bar); \
@@ -843,9 +843,9 @@
bus_addr_t ba;
int err;
static bus_space_handle_t cfg_bsh;
- static pcitag_t cfg_oba = -1;
+ static bus_addr_t cfg_oba = -1;
static bus_space_handle_t ecfg_bsh;
- static pcitag_t ecfg_oba = -1;
+ static bus_addr_t ecfg_oba = -1;
/*
* bus space depends on offset
