From 7f52b867cae7ecbf607c4639e3fae8e7d0cd2771 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Sat, 2 Aug 2014 06:52:42 -0600
Subject: WM8904:  Add an option to control WM8904 register dumping

---
 nuttx/drivers/audio/Kconfig        | 6 ++++++
 nuttx/drivers/audio/Make.defs      | 2 +-
 nuttx/drivers/audio/wm8904.c       | 4 ++--
 nuttx/drivers/audio/wm8904.h       | 2 +-
 nuttx/drivers/audio/wm8904_debug.c | 6 ++++--
 nuttx/include/nuttx/audio/wm8904.h | 4 +++-
 6 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/nuttx/drivers/audio/Kconfig b/nuttx/drivers/audio/Kconfig
index 6ce5b9f72..b226e2f04 100644
--- a/nuttx/drivers/audio/Kconfig
+++ b/nuttx/drivers/audio/Kconfig
@@ -131,6 +131,12 @@ config WM8904_WORKER_STACKSIZE
 	int "WM8904 worker thread stack size"
 	default 768
 
+config WM8904_REGDUMP
+	bool "WM8904 register dump"
+	default n
+	---help---
+		Enable logic to dump the contents of all WM8904 registers.
+
 endif # AUDIO_WM8904
 
 config AUDIO_NULL
diff --git a/nuttx/drivers/audio/Make.defs b/nuttx/drivers/audio/Make.defs
index f5a094d13..049882967 100644
--- a/nuttx/drivers/audio/Make.defs
+++ b/nuttx/drivers/audio/Make.defs
@@ -45,7 +45,7 @@ endif
 
 ifeq ($(CONFIG_AUDIO_WM8904),y)
 CSRCS += wm8904.c
-ifeq ($(CONFIG_DEBUG_AUDIO),y)
+ifeq ($(CONFIG_WM8904_REGDUMP),y)
 CSRCS += wm8904_debug.c
 endif
 endif
diff --git a/nuttx/drivers/audio/wm8904.c b/nuttx/drivers/audio/wm8904.c
index d2e2c4a27..d9e5eab9f 100644
--- a/nuttx/drivers/audio/wm8904.c
+++ b/nuttx/drivers/audio/wm8904.c
@@ -132,7 +132,7 @@ struct wm8904_dev_s
  * Private Function Prototypes
  ****************************************************************************/
 
-#ifndef CONFIG_DEBUG_AUDIO
+#ifndef CONFIG_WM8904_REGDUMP
 static
 #endif
        uint16_t wm8904_readreg(FAR struct wm8904_dev_s *priv,
@@ -259,7 +259,7 @@ static const struct audio_ops_s g_audioops =
  *
  ****************************************************************************/
 
-#ifndef CONFIG_DEBUG_AUDIO
+#ifndef CONFIG_WM8904_REGDUMP
 static
 #endif
 uint16_t wm8904_readreg(FAR struct wm8904_dev_s *priv, uint8_t regaddr)
diff --git a/nuttx/drivers/audio/wm8904.h b/nuttx/drivers/audio/wm8904.h
index bff12ceee..2a41da94d 100644
--- a/nuttx/drivers/audio/wm8904.h
+++ b/nuttx/drivers/audio/wm8904.h
@@ -991,7 +991,7 @@
  *
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG_AUDIO
+#ifdef CONFIG_WM8904_REGDUMP
 struct wm8904_dev_s;
 uint16_t wm8904_readreg(FAR struct wm8904_dev_s *priv, uint8_t regaddr);
 #endif
diff --git a/nuttx/drivers/audio/wm8904_debug.c b/nuttx/drivers/audio/wm8904_debug.c
index f4e5714b1..df6e9abb2 100644
--- a/nuttx/drivers/audio/wm8904_debug.c
+++ b/nuttx/drivers/audio/wm8904_debug.c
@@ -54,6 +54,8 @@
 
 #include "wm8904.h"
 
+#ifdef CONFIG_WM8904_REGDUMP
+
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
@@ -202,7 +204,6 @@ static const struct wm8904_debug_s g_wm8904_debug[] =
  *
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG_AUDIO
 void wm8904_dump_registers(FAR struct audio_lowerhalf_s *dev,
                            FAR const char *msg)
 {
@@ -217,4 +218,5 @@ void wm8904_dump_registers(FAR struct audio_lowerhalf_s *dev,
                             g_wm8904_debug[i].regaddr));
     }
 }
-#endif
+
+#endif /* CONFIG_WM8904_REGDUMP */
diff --git a/nuttx/include/nuttx/audio/wm8904.h b/nuttx/include/nuttx/audio/wm8904.h
index 887f822ac..ae8377724 100644
--- a/nuttx/include/nuttx/audio/wm8904.h
+++ b/nuttx/include/nuttx/audio/wm8904.h
@@ -66,6 +66,8 @@
  * CONFIG_WM8904_NUM_BUFFERS - Preferred number of buffers
  * CONFIG_WM8904_WORKER_STACKSIZE - Stack size to use when creating the the
  *   WM8904 worker thread.
+ * CONFIG_WM8904_REGDUMP - Enable logic to dump all WM8904 registers to
+ *   the SYSLOG device.
  */
 
 /* Pre-requisites */
@@ -232,7 +234,7 @@ FAR struct audio_lowerhalf_s *
  *
  ****************************************************************************/
 
-#ifdef CONFIG_DEBUG_AUDIO
+#ifdef CONFIG_WM8904_REGDUMP
 void wm8904_dump_registers(FAR struct audio_lowerhalf_s *dev,
                            FAR const char *msg);
 #else
-- 
cgit v1.2.3