Diff: drivers/I2S.h

Revision:

16:04e1abb4cca3

Parent:

13:fa1b24df9025

Child:

17:7a4a4631672c

--- a/drivers/I2S.h	Fri Jan 20 11:08:01 2017 +0100
+++ b/drivers/I2S.h	Wed Jan 25 13:56:15 2017 +0100
@@ -71,7 +71,7 @@
      *  @return Currently set audio frequency
      */
     unsigned int get_audio_frequency(void) {
-    	return _hz;
+	return _hz;
     }
 
     /** Set the i2s bus protocol
@@ -122,14 +122,6 @@
 	return ret;
     }
     
-    /** Acquire exclusive access to this I2S bus
-     */
-    virtual void lock(void);
-
-    /** Release exclusive access to this I2S bus
-     */
-    virtual void unlock(void);
-
     /** Abort the on-going I2S transfer, and continue with transfer's in the queue if any.
      */
     void abort_transfer();
@@ -162,7 +154,7 @@
     int set_dma_priority(i2s_dma_prio_t prio);
 
     /** Harmonize the frequencies of the given I2S objects so that they are
-     *  exact multiple one of the other. It can be useful whenever two I2S
+     *  the exact multiple one of the other. It can be useful whenever two I2S
      *  peripherals have to work together and no drift is allowed between them.
      *
      *  @param dev_i2s_1 reference to the first I2S object.
@@ -177,9 +169,17 @@
      *  Must be used by application programmer to schedule/execute bottom-halves
      *  (i.e. transfer event callback functions) and automatically start queued
      *  transactions (i.e. transfers), e.g. by calling `events::EventQueue::dispatch_forever()`! */
-	static events::EventQueue i2s_bh_queue;
+    static events::EventQueue i2s_bh_queue;
 
 protected:
+    /** Acquire exclusive access to this I2S bus
+     */
+    virtual void lock(void);
+
+    /** Release exclusive access to this I2S bus
+     */
+    virtual void unlock(void);
+
     /** I2S TX DMA IRQ handler
      *
      */
@@ -228,7 +228,7 @@
      */
     void dequeue_transaction();
 
-    /* betzw - WAS : static */ CircularBuffer<Transaction<I2S>, TRANSACTION_QUEUE_SIZE_I2S> _transaction_buffer;
+    CircularBuffer<Transaction<I2S>, TRANSACTION_QUEUE_SIZE_I2S> _transaction_buffer;
 #endif // TRANSACTION_QUEUE_SIZE_I2S
 
 public: