From owner-svn-src-projects@FreeBSD.ORG Mon Jul 6 18:12:50 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2E50D1065676; Mon, 6 Jul 2009 18:12:50 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0323F8FC1E; Mon, 6 Jul 2009 18:12:50 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n66ICntq088745; Mon, 6 Jul 2009 18:12:49 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n66ICnso088743; Mon, 6 Jul 2009 18:12:49 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <200907061812.n66ICnso088743@svn.freebsd.org> From: Warner Losh Date: Mon, 6 Jul 2009 18:12:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r195411 - projects/mips/sys/mips/octeon1/dev/rgmii X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Jul 2009 18:12:50 -0000 Author: imp Date: Mon Jul 6 18:12:49 2009 New Revision: 195411 URL: http://svn.freebsd.org/changeset/base/195411 Log: Minor fixes to printf formats. Modified: projects/mips/sys/mips/octeon1/dev/rgmii/octeon_fpa.c Modified: projects/mips/sys/mips/octeon1/dev/rgmii/octeon_fpa.c ============================================================================== --- projects/mips/sys/mips/octeon1/dev/rgmii/octeon_fpa.c Mon Jul 6 18:10:27 2009 (r195410) +++ projects/mips/sys/mips/octeon1/dev/rgmii/octeon_fpa.c Mon Jul 6 18:12:49 2009 (r195411) @@ -36,7 +36,7 @@ void octeon_dump_fpa (void) return; } printf(" FPA Ctrl-Status-reg 0x%llX := 0x%llX EN %X M1_E %X M0_E %X\n", - OCTEON_FPA_CTL_STATUS, status.word64, + OCTEON_FPA_CTL_STATUS, (unsigned long long)status.word64, status.bits.enb, status.bits.mem1_err, status.bits.mem0_err); for (i = 0; i < OCTEON_FPA_QUEUES; i++) { printf(" Pool: %d\n", i); @@ -61,7 +61,7 @@ void octeon_dump_fpa_pool (u_int pool) return; } printf(" FPA Ctrl-Status-reg 0x%llX := 0x%llX EN %X M1_E %X M0_E %X\n", - OCTEON_FPA_CTL_STATUS, status.word64, + OCTEON_FPA_CTL_STATUS, (unsigned long long)status.word64, status.bits.enb, status.bits.mem1_err, status.bits.mem0_err); q_avail.word64 = oct_read64((OCTEON_FPA_QUEUE_AVAILABLE + (pool)*8ull)); printf(" FPA Pool: %u Avail-reg 0x%llX := Size: 0x%X\n", pool, @@ -168,8 +168,8 @@ void octeon_fpa_fill_pool_mem (u_int poo memory = (void *) OCTEON_ALIGN(memory); #ifdef FPA_DEBUG_TERSE - printf("FPA fill: %u Count: %u SizeBytes: %u SizeBytesAligned: %u 1st: 0x%X = 0x%X\n", - pool, elem_num, elem_size_bytes, block_size, memory, OCTEON_PTR2PHYS(memory)); + printf("FPA fill: %u Count: %u SizeBytes: %u SizeBytesAligned: %u 1st: 0x%X = %p\n", + pool, elem_num, elem_size_bytes, block_size, memory, (void *)OCTEON_PTR2PHYS(memory)); #endif // memory = (void *) ((((u_int) memory / OCTEON_FPA_POOL_ALIGNMENT) + 1) * OCTEON_FPA_POOL_ALIGNMENT);