From 11c43920ee9648f2eeed1a759e08110a850fd9e7 Mon Sep 17 00:00:00 2001
From: Ross Owen <ross@xmos.com>
Date: Thu, 29 Oct 2015 20:45:07 +0000
Subject: [PATCH] Removed PDM_PCM_IN define (replaced with check for
 NUM_PDM_MICS > 0). Also use of PDM_TILE on pcm_pdm_mic() task call.

---
 module_usb_audio/audio.h  |  2 +-
 module_usb_audio/audio.xc |  6 +++---
 module_usb_audio/main.xc  | 17 ++++++++---------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/module_usb_audio/audio.h b/module_usb_audio/audio.h
index d8c56ac1..304656e8 100644
--- a/module_usb_audio/audio.h
+++ b/module_usb_audio/audio.h
@@ -26,7 +26,7 @@ void audio(chanend c_in,
 #if (XUD_TILE != 0)
    , server interface i_dfu dfuInterface
 #endif
-#ifdef PDM_PCM_IN
+#if (NUM_PDM_MICS > 0) 
     , chanend c_pdm_in
 #endif
 );
diff --git a/module_usb_audio/audio.xc b/module_usb_audio/audio.xc
index 99e9f97d..36ae61df 100755
--- a/module_usb_audio/audio.xc
+++ b/module_usb_audio/audio.xc
@@ -434,7 +434,7 @@ unsigned static deliver(chanend c_out, chanend ?c_spd_out,
 #if(defined(SPDIF_RX) || defined(ADAT_RX))
     chanend c_dig_rx,
 #endif
-#ifdef PDM_PCM_IN
+#if (NUM_PDM_MICS > 0)
     chanend c_pdm_pcm,
 #endif
 
@@ -940,7 +940,7 @@ chanend ?c_config, chanend ?c
 #if XUD_TILE != 0
 , server interface i_dfu dfuInterface
 #endif
-#ifdef PDM_PCM_IN
+#if (NUM_PDM_MICS > 0)
 , chanend c_pdm_in
 #endif
 )
@@ -1211,7 +1211,7 @@ chanend ?c_config, chanend ?c
 #if defined (ADAT_RX) || defined (SPDIF_RX)
                    c_dig_rx,
 #endif
-#ifdef PDM_PCM_IN
+#if (NUM_PDM_MICS > 0)
                    c_pdm_in,
 #endif
                    c);
diff --git a/module_usb_audio/main.xc b/module_usb_audio/main.xc
index c14c6c61..93cef778 100755
--- a/module_usb_audio/main.xc
+++ b/module_usb_audio/main.xc
@@ -43,8 +43,8 @@
 
 #include "clocking.h"
 
-#ifdef PDM_PCM_IN
-void pcm_pdm_mic(chanend c_pcm_out);
+#if (NUM_PDM_MICS > 0)
+#include "pcm_pdm_mic.h"
 #endif
 
 void genclock();
@@ -413,7 +413,7 @@ void usb_audio_io(chanend c_aud_in, chanend ?c_adc,
 #if (XUD_TILE != 0)
     , server interface i_dfu dfuInterface
 #endif
-#ifdef PDM_PCM_IN
+#if (NUM_PDM_MICS > 0)
     , chanend c_pdm_pcm
 #endif
 )
@@ -456,7 +456,7 @@ void usb_audio_io(chanend c_aud_in, chanend ?c_adc,
 #if XUD_TILE != 0
                 , dfuInterface
 #endif
-#ifdef PDM_PCM_IN
+#if (NUM_PDM_MICS > 0) 
                 , c_pdm_pcm
 #endif
             );
@@ -543,7 +543,7 @@ int main()
     #define dfuInterface null
 #endif
 
-#ifdef PDM_PCM_IN
+#if (NUM_PDM_MICS > 0)
     chan c_pdm_pcm;
 #endif
 
@@ -590,7 +590,7 @@ int main()
 #if XUD_TILE != 0
             , dfuInterface
 #endif
-#ifdef PDM_PCM_IN
+#if (NUM_PDM_MICS > 0)
             , c_pdm_pcm
 #endif
 
@@ -655,9 +655,8 @@ int main()
         }
 #endif
 
-#ifdef PDM_PCM_IN    
-        // TODO tile     
-        on stdcore[0]: pcm_pdm_mic(c_pdm_pcm);
+#if (NUM_PDM_MICS > 0) 
+        on stdcore[PDM_TILE]: pcm_pdm_mic(c_pdm_pcm);
 #endif
         USER_MAIN_CORES
     }