summaryrefslogtreecommitdiffstats
path: root/sys/contrib
diff options
context:
space:
mode:
authorjmallett <jmallett@FreeBSD.org>2012-11-24 02:12:24 +0000
committerjmallett <jmallett@FreeBSD.org>2012-11-24 02:12:24 +0000
commit6e1c3b3cfb99a41d2ce0cdd2cd4db4182bb826cd (patch)
treec1fb9bb05efef23baa5c782af86b008a8fedd4db /sys/contrib
parentd15ac5b46e09876d5f3003476234efbe7d6518c5 (diff)
downloadFreeBSD-src-6e1c3b3cfb99a41d2ce0cdd2cd4db4182bb826cd.zip
FreeBSD-src-6e1c3b3cfb99a41d2ce0cdd2cd4db4182bb826cd.tar.gz
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.
Diffstat (limited to 'sys/contrib')
-rw-r--r--sys/contrib/octeon-sdk/cvmx-spi.c2
-rw-r--r--sys/contrib/octeon-sdk/cvmx-utils.h3
2 files changed, 3 insertions, 2 deletions
diff --git a/sys/contrib/octeon-sdk/cvmx-spi.c b/sys/contrib/octeon-sdk/cvmx-spi.c
index f901f890..5822c02 100644
--- a/sys/contrib/octeon-sdk/cvmx-spi.c
+++ b/sys/contrib/octeon-sdk/cvmx-spi.c
@@ -182,9 +182,7 @@ int cvmx_spi_restart_interface(int interface, cvmx_spi_mode_t mode, int timeout)
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);
diff --git a/sys/contrib/octeon-sdk/cvmx-utils.h b/sys/contrib/octeon-sdk/cvmx-utils.h
index 6acd0fa..228c11d 100644
--- a/sys/contrib/octeon-sdk/cvmx-utils.h
+++ b/sys/contrib/octeon-sdk/cvmx-utils.h
@@ -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
OpenPOWER on IntegriCloud