Merge branch 'master' of git://git/apps/sc_usb_audio

CHANGELOG.rst

@@ -4,6 +4,7 @@ sc_usb_audio Change Log
 7.0.0
 ------
     - ADDED:      I2S down-sampling (I2S_DOWNSAMPLE_FACTOR)
+    - ADDED:      I2S resynchronisation when in slave mode (CODEC_MASTER=1)
     - CHANGE:     Various memory optimisations when MAX_FREQ = MIN_FREQ
     - CHANGE:     Memory optimisations in audio buffering
     - CHANGE:     Various memory optimisations in UAC1 mode

module_usb_audio/audio_io/audio_io.xc

@@ -101,8 +101,8 @@ extern buffered in port:32  p_i2s_adc[I2S_WIRES_ADC];
 extern buffered out port:32 p_lrclk;
 extern buffered out port:32 p_bclk;
 #else
-extern in port p_lrclk;
+extern buffered in port:32 p_lrclk;
-extern in port p_bclk;
+extern buffered in port:32 p_bclk;
 #endif
 
 unsigned dsdMode = DSD_MODE_OFF;
@@ -472,6 +472,10 @@ unsigned static deliver(chanend c_out, chanend ?c_spd_out,
     int started = 0;
 #endif
 
+#ifdef CODEC_MASTER
+    int firstIteration = 1;
+#endif
+
 #if (DSD_CHANS_DAC != 0)
     unsigned dsdMarker = DSD_MARKER_2;    /* This alternates between DSD_MARKER_1 and DSD_MARKER_2 */
     int dsdCount = 0;
@@ -519,12 +523,27 @@ unsigned static deliver(chanend c_out, chanend ?c_spd_out,
 
     InitPorts(divide);
 
-    /* TODO In master mode, the i/o loop assumes L/RCLK = 32bit clocks.  We should check this every interation
-     * and resync if we got a bclk glitch */
-
     /* Main Audio I/O loop */
     while (1)
     {
+#ifdef CODEC_MASTER
+        /* In CODEC master mode, the I/O loop assumes L/RCLK = 32bit clocks.
+         * Check this every iteration and resync if we get a bclk glitch.
+         */
+        int syncError = 0;
+
+        if (!firstIteration)
+        {
+            InitPorts(divide);
+        }
+        else
+        {
+            firstIteration = 0;
+        }
+
+        while (!syncError)
+#endif // CODEC_MASTER
+        {
 #if (DSD_CHANS_DAC != 0) && (NUM_USB_CHAN_OUT > 0)
             if(dsdMode == DSD_MODE_NATIVE)
             {
@@ -652,6 +671,15 @@ unsigned static deliver(chanend c_out, chanend ?c_spd_out,
                     // Manual IN instruction since compiler generates an extra setc per IN (bug #15256)
                     unsigned sample;
                     asm volatile("in %0, res[%1]" : "=r"(sample)  : "r"(p_i2s_adc[index++]));
+#ifdef CODEC_MASTER
+                    unsigned lrval;
+                    p_lrclk :> lrval;
+#ifdef I2S_MODE_TDM
+                    syncError += (lrval != 0x00000000);
+#else
+                    syncError += (lrval != 0x80000000);
+#endif // I2S_MODE_TDM
+#endif // CODEC_MASTER
 
                     /* Note the use of readBuffNo changes based on frameCount */
                     samplesIn[buffIndex][((frameCount-2)&(I2S_CHANS_PER_FRAME-1))+i] = bitrev(sample); // channels 0, 2, 4.. on each line.
@@ -773,6 +801,22 @@ unsigned static deliver(chanend c_out, chanend ?c_spd_out,
                     /* Manual IN instruction since compiler generates an extra setc per IN (bug #15256) */
                     unsigned sample;
                     asm volatile("in %0, res[%1]" : "=r"(sample)  : "r"(p_i2s_adc[index++]));
+#ifdef CODEC_MASTER
+                    unsigned lrval;
+                    p_lrclk :> lrval;
+#ifdef I2S_MODE_TDM
+                    if (frameCount == (I2S_CHANS_PER_FRAME-2))
+                    {
+                        syncError += (lrval != 0x80000000);
+                    }
+                    else
+                    {
+                       syncError += (lrval != 0x00000000);
+                    }
+#else
+                    syncError += (lrval != 0x7FFFFFFF);
+#endif // I2S_MODE_TDM
+#endif // CODEC_MASTER
 
                     samplesIn[buffIndex][((frameCount-1)&(I2S_CHANS_PER_FRAME-1))+i] = bitrev(sample); // channels 1, 3, 5.. on each line.
 #if ((I2S_DOWNSAMPLE_FACTOR > 1) && !I2S_DOWNSAMPLE_MONO)
@@ -906,6 +950,7 @@ unsigned static deliver(chanend c_out, chanend ?c_spd_out,
                 }
             }
         }
+    }
 
 #pragma xta endpoint "deliver_return"
     return 0;

module_usb_audio/main.xc

@@ -116,8 +116,8 @@ on tile[AUDIO_IO_TILE] : buffered in port:32 p_i2s_adc[I2S_WIRES_ADC] =
 on tile[AUDIO_IO_TILE] : buffered out port:32 p_lrclk       = PORT_I2S_LRCLK;
 on tile[AUDIO_IO_TILE] : buffered out port:32 p_bclk        = PORT_I2S_BCLK;
 #else
-on tile[AUDIO_IO_TILE] : in port p_lrclk                    = PORT_I2S_LRCLK;
+on tile[AUDIO_IO_TILE] : buffered in port:32 p_lrclk        = PORT_I2S_LRCLK;
-on tile[AUDIO_IO_TILE] : in port p_bclk                     = PORT_I2S_BCLK;
+on tile[AUDIO_IO_TILE] : buffered in port:32 p_bclk         = PORT_I2S_BCLK;
 #endif
 
 on tile[AUDIO_IO_TILE] : port p_mclk_in                     = PORT_MCLK_IN;

module_usb_audio/ports/audioports.h

@@ -70,8 +70,8 @@ void ConfigAudioPortsWrapper(
                 buffered out port:32 ?p_lrclk,
                 buffered out port:32 p_bclk,
 #else
-                in port ?p_lrclk,
+                buffered in port:32 ?p_lrclk,
-                in port p_bclk,
+                buffered in port:32 p_bclk,
 #endif
 #endif
                 unsigned int divide, unsigned curSamFreq, unsigned int dsdMode);