From 68330b7b771bd14c00c799d6cb93057eb3e73035 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Fri, 18 Jul 2014 15:35:12 -0600
Subject: Framework for a WM8904 audio driver.  The initial driver check-in is
 simply Ken Pettit's VS1053 driver forced to compile with only WM8904
 definitions

---
 nuttx/include/nuttx/audio/i2s.h    |  2 +-
 nuttx/include/nuttx/audio/wm8904.h | 26 ++++++++++++++++++++------
 2 files changed, 21 insertions(+), 7 deletions(-)

(limited to 'nuttx/include')

diff --git a/nuttx/include/nuttx/audio/i2s.h b/nuttx/include/nuttx/audio/i2s.h
index 74bc4aba9..8ef782053 100644
--- a/nuttx/include/nuttx/audio/i2s.h
+++ b/nuttx/include/nuttx/audio/i2s.h
@@ -177,7 +177,7 @@
  *              performed in the context of the worker thread.
  *   arg      - An opaque argument that will be provided to the callback
  *              when the transfer complete.
- *   timeout  - The timeout value to use.  The transfer will be canceled
+ *   timeout  - The timeout value to use.  The transfer will be cancelled
  *              and an ETIMEDOUT error will be reported if this timeout
  *              elapsed without completion of the DMA transfer.  Units
  *              are system clock ticks.  Zero means no timeout.
diff --git a/nuttx/include/nuttx/audio/wm8904.h b/nuttx/include/nuttx/audio/wm8904.h
index bf00e8a75..4e4ae9c65 100644
--- a/nuttx/include/nuttx/audio/wm8904.h
+++ b/nuttx/include/nuttx/audio/wm8904.h
@@ -61,8 +61,24 @@
 
 /* Pre-requisistes */
 
+#ifndef CONFIG_AUDIO
+#  error CONFIG_AUDIO is required for audio subsystem support
+#endif
+
+#ifndef CONFIG_I2S
+#  error CONFIG_I2S is required by the WM8904 driver
+#endif
+
+#ifndef CONFIG_I2C
+#  error CONFIG_I2C is required by the WM8904 driver
+#endif
+
 #ifndef CONFIG_I2C_TRANSFER
-#  error "CONFIG_I2C_TRANSFER is required in the I2C configuration"
+#  error CONFIG_I2C_TRANSFER is required in the I2C configuration
+#endif
+
+#ifndef CONFIG_SCHED_WORKQUEUE
+#  error CONFIG_SCHED_WORKQUEUE is required by the WM8904 driver
 #endif
 
 /* Default configuration values */
@@ -73,7 +89,6 @@
 #define WM8904_DETACH(s)         ((s)->attach(s,NULL,NULL))
 #define WM8904_ENABLE(s)         ((s)->enable(s,true))
 #define WM8904_DISABLE(s)        ((s)->enable(s,false))
-#define WM8904_CLEAR(s)          ((s)->clear(s))
 
 /****************************************************************************
  * Public Types
@@ -109,15 +124,14 @@ struct wm8904_lower_s
    * interrupts should be configured on both rising and falling edges
    * so that contact and loss-of-contact events can be detected.
    *
-   * attach  - Attach the WM8904 interrupt handler to the GPIO interrupt
+   * attach  - Attach or detacth the WM8904 interrupt handler to the GPIO
+   *           interrupt
    * enable  - Enable or disable the GPIO interrupt
-   * clear   - Acknowledge/clear any pending GPIO interrupt
    */
 
   int  (*attach)(FAR const struct wm8904_lower_s *lower, wm8904_handler_t isr,
                  FAR void *arg);
   void (*enable)(FAR const struct wm8904_lower_s *lower, bool enable);
-  void (*clear)(FAR const struct wm8904_lower_s *lower);
 };
 
 /****************************************************************************
@@ -137,7 +151,7 @@ extern "C"
  ****************************************************************************/
 
 /****************************************************************************
- * Name: wm8904_register
+ * Name: wm8904_initialize
  *
  * Description:
  *   Initialize the WM8904 device.
-- 
cgit v1.2.3