svn commit: r195414 - projects/mips/sys/mips/octeon1
Warner Losh
imp at FreeBSD.org
Mon Jul 6 18:18:27 UTC 2009
Author: imp
Date: Mon Jul 6 18:18:27 2009
New Revision: 195414
URL: http://svn.freebsd.org/changeset/base/195414
Log:
64-bit fixes: fix printf formats and prefer MIPS_PHYS_TO_KSEG0.
Modified:
projects/mips/sys/mips/octeon1/octeon_ebt3000_cf.c
projects/mips/sys/mips/octeon1/octeon_machdep.c
Modified: projects/mips/sys/mips/octeon1/octeon_ebt3000_cf.c
==============================================================================
--- projects/mips/sys/mips/octeon1/octeon_ebt3000_cf.c Mon Jul 6 18:17:48 2009 (r195413)
+++ projects/mips/sys/mips/octeon1/octeon_ebt3000_cf.c Mon Jul 6 18:18:27 2009 (r195414)
@@ -509,7 +509,7 @@ static void cf_identify (driver_t *drv,
if (!octeon_board_real())
return;
- base_addr = (void *) OCTEON_PHYS2PTR(OCTEON_CF_COMMON_BASE_ADDR);
+ base_addr = (void *) MIPS_PHYS_TO_KSEG0(OCTEON_CF_COMMON_BASE_ADDR);
for (bus_region = 0; bus_region < 8; bus_region++)
{
Modified: projects/mips/sys/mips/octeon1/octeon_machdep.c
==============================================================================
--- projects/mips/sys/mips/octeon1/octeon_machdep.c Mon Jul 6 18:17:48 2009 (r195413)
+++ projects/mips/sys/mips/octeon1/octeon_machdep.c Mon Jul 6 18:18:27 2009 (r195414)
@@ -563,8 +563,9 @@ void ciu_dump_interrutps_enabled (int co
}
ciu_intr_bits = oct_read64(ciu_intr_reg_addr);
- printf(" CIU core %d int: %d en: %d ip: %d Add: 0x%llX enabled: 0x%llX SR: %X\n",
- core_num, intx, enx, ciu_ip, ciu_intr_reg_addr, ciu_intr_bits, mips_rd_status());
+ printf(" CIU core %d int: %d en: %d ip: %d Add: %p enabled: 0x%llX SR: %x\n",
+ core_num, intx, enx, ciu_ip, (void *)ciu_intr_reg_addr,
+ (unsigned long long)ciu_intr_bits, mips_rd_status());
}
More information about the svn-src-projects
mailing list