Merge branch 'MAINTAIN_6v11'

This commit is contained in:
Ross Owen
2015-04-08 11:47:16 +01:00
4 changed files with 7 additions and 2 deletions

View File

@@ -245,6 +245,7 @@ static inline unsigned DoSampleTransfer(chanend c_out, int readBuffNo, unsigned
else
{
#ifndef MIXER // Interfaces straight to decouple()
inuint(c_out);
#if NUM_USB_CHAN_IN > 0
#pragma loop unroll
for(int i = 0; i < I2S_CHANS_ADC; i++)