Author: jmallett
Date: Sat Nov 24 02:12:24 2012
New Revision: 243470
URL: http://svnweb.freebsd.org/changeset/base/243470
Log:
Use bootverbose to control debug printfs from the Cavium Simple Executive
code. Also remove an unnecessary CVMX_ENABLE_DEBUG_PRINTS conditional around
what is already a cvmx_dprintf.
Modified:
head/sys/contrib/octeon-sdk/cvmx-spi.c
head/sys/contrib/octeon-sdk/cvmx-utils.h
head/sys/mips/cavium/octeon_machdep.c
Modified: head/sys/contrib/octeon-sdk/cvmx-spi.c
==============================================================================
--- head/sys/contrib/octeon-sdk/cvmx-spi.c Sat Nov 24 02:00:29 2012
(r243469)
+++ head/sys/contrib/octeon-sdk/cvmx-spi.c Sat Nov 24 02:12:24 2012
(r243470)
@@ -182,9 +182,7 @@ int cvmx_spi_restart_interface(int inter
if (!(OCTEON_IS_MODEL(OCTEON_CN38XX) || OCTEON_IS_MODEL(OCTEON_CN58XX)))
return res;
-#if CVMX_ENABLE_DEBUG_PRINTS
cvmx_dprintf ("SPI%d: Restart %s\n", interface, modes[mode]);
-#endif
// Callback to perform SPI4 reset
INVOKE_CB(cvmx_spi_callbacks.reset_cb, interface,mode);
Modified: head/sys/contrib/octeon-sdk/cvmx-utils.h
==============================================================================
--- head/sys/contrib/octeon-sdk/cvmx-utils.h Sat Nov 24 02:00:29 2012
(r243469)
+++ head/sys/contrib/octeon-sdk/cvmx-utils.h Sat Nov 24 02:12:24 2012
(r243470)
@@ -76,6 +76,9 @@ extern "C" {
#ifdef CVMX_BUILD_FOR_LINUX_KERNEL
#define cvmx_dprintf printk
#define cvmx_dvprintf vprintk
+ #elif defined(CVMX_BUILD_FOR_FREEBSD_KERNEL)
+ void cvmx_dvprintf(const char *, va_list);
+ void cvmx_dprintf(const char *, ...) __attribute__ ((format(printf, 1,
2)));
#else
#define cvmx_dprintf printf
#define cvmx_dvprintf vprintf
Modified: head/sys/mips/cavium/octeon_machdep.c
==============================================================================
--- head/sys/mips/cavium/octeon_machdep.c Sat Nov 24 02:00:29 2012
(r243469)
+++ head/sys/mips/cavium/octeon_machdep.c Sat Nov 24 02:12:24 2012
(r243470)
@@ -446,6 +446,24 @@ SYSCTL_PROC(_machdep, OID_AUTO, led_disp
NULL, 0, sysctl_machdep_led_display, "A",
"String to display on LED display");
+void
+cvmx_dvprintf(const char *fmt, va_list ap)
+{
+ if (!bootverbose)
+ return;
+ vprintf(fmt, ap);
+}
+
+void
+cvmx_dprintf(const char *fmt, ...)
+{
+ va_list ap;
+
+ va_start(ap, fmt);
+ cvmx_dvprintf(fmt, ap);
+ va_end(ap);
+}
+
/**
* version of printf that works better in exception context.
*
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
