From owner-svn-src-projects@FreeBSD.ORG Sun Jun 14 06:53:56 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 317DB106566B; Sun, 14 Jun 2009 06:53:56 +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 063238FC08; Sun, 14 Jun 2009 06:53:56 +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 n5E6rtfp038633; Sun, 14 Jun 2009 06:53:55 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5E6rt0n038632; Sun, 14 Jun 2009 06:53:55 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <200906140653.n5E6rt0n038632@svn.freebsd.org> From: Warner Losh Date: Sun, 14 Jun 2009 06:53:55 +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: r194174 - projects/mips/sys/mips/octeon1 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: Sun, 14 Jun 2009 06:53:56 -0000 Author: imp Date: Sun Jun 14 06:53:55 2009 New Revision: 194174 URL: http://svn.freebsd.org/changeset/base/194174 Log: Various nits to make this compile. Modified: projects/mips/sys/mips/octeon1/octeon_machdep.c Modified: projects/mips/sys/mips/octeon1/octeon_machdep.c ============================================================================== --- projects/mips/sys/mips/octeon1/octeon_machdep.c Sun Jun 14 06:49:13 2009 (r194173) +++ projects/mips/sys/mips/octeon1/octeon_machdep.c Sun Jun 14 06:53:55 2009 (r194174) @@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -231,19 +232,17 @@ void octeon_uart_write_hex (uint32_t wl) octeon_uart_write_string(0, wstr); } - +#ifdef __not_used__ #define OCT_CONS_BUFLEN 200 static char console_str_buff0[OCT_CONS_BUFLEN + 1]; #include - //#define USE_KERN_SUBR_PRINTF - #ifndef USE_KERN_SUBR_PRINTF static int oct_printf (const char *fmt, va_list ap); #endif -int kern_cons_printf (const char *fmt, ...) +int kern_cons_printf(const char *fmt, ...) { va_list ap; @@ -258,7 +257,7 @@ int kern_cons_printf (const char *fmt, . } #ifndef USE_KERN_SUBR_PRINTF -static int oct_printf (const char *fmt, va_list ap) +static int oct_printf(const char *fmt, va_list ap) { snprintf(console_str_buff0, OCT_CONS_BUFLEN, fmt, ap); octeon_uart_write_string(0, console_str_buff0); @@ -266,8 +265,7 @@ static int oct_printf (const char *fmt, } #endif - -int console_printf (const char *fmt, ...) +int console_printf(const char *fmt, ...) { va_list ap; @@ -277,8 +275,7 @@ int console_printf (const char *fmt, ... octeon_uart_write_string(0, console_str_buff0); return (0); } - - +#endif /* @@ -795,7 +792,7 @@ static int octeon_process_app_desc_ver_6 cvmx_desc_ptr = (cvmx_bootinfo_t *) ((long) app_desc_ptr->cvmx_desc_vaddr); if ((cvmx_desc_ptr == NULL) || (cvmx_desc_ptr == (cvmx_bootinfo_t *)0xffffffff)) { - printf ("Bad cvmx_desc_ptr 0x%X\n", cvmx_desc_ptr); + printf ("Bad cvmx_desc_ptr %p\n", cvmx_desc_ptr); return 1; } @@ -804,7 +801,7 @@ static int octeon_process_app_desc_ver_6 cvmx_desc_ptr->minor_version; if (cvmx_desc_ptr->major_version != 1) { - printf("Incompatible CVMX descriptor from bootloader: %d.%d 0x%X\n", + printf("Incompatible CVMX descriptor from bootloader: %d.%d %p\n", (int) cvmx_desc_ptr->major_version, (int) cvmx_desc_ptr->minor_version, cvmx_desc_ptr); while (1); /* Never return */