Fixed hard-coded adat/mclk multiplier

This commit is contained in:
Ross Owen
2015-03-04 15:59:52 +00:00
parent ea931680ad
commit 389546a2b5

View File

@@ -907,6 +907,7 @@ chanend ?c_config, chanend ?c)
#ifdef ADAT_TX #ifdef ADAT_TX
chan c_adat_out; chan c_adat_out;
unsigned adatSmuxMode = 0; unsigned adatSmuxMode = 0;
unsigned adatMultiple = 0;
#endif #endif
unsigned curSamFreq = DEFAULT_FREQ; unsigned curSamFreq = DEFAULT_FREQ;
@@ -990,6 +991,7 @@ chanend ?c_config, chanend ?c)
#ifdef ADAT_TX #ifdef ADAT_TX
/* Calculate ADAT SMUX mode (1, 2, 4) */ /* Calculate ADAT SMUX mode (1, 2, 4) */
adatSmuxMode = curSamFreq / 44100; adatSmuxMode = curSamFreq / 44100;
adatMultiple = mClk / 44100;
#endif #endif
} }
else if ((MCLK_48 % curSamFreq) == 0) else if ((MCLK_48 % curSamFreq) == 0)
@@ -998,6 +1000,7 @@ chanend ?c_config, chanend ?c)
#ifdef ADAT_TX #ifdef ADAT_TX
/* Calculate ADAT SMUX mode (1, 2, 4) */ /* Calculate ADAT SMUX mode (1, 2, 4) */
adatSmuxMode = curSamFreq / 48000; adatSmuxMode = curSamFreq / 48000;
adatMultiple = mClk / 48000;
#endif #endif
} }
@@ -1147,7 +1150,7 @@ chanend ?c_config, chanend ?c)
// adatSmuxMode = 1 for FS = 44K1 or 48K0 // adatSmuxMode = 1 for FS = 44K1 or 48K0
// = 2 for FS = 88K2 or 96K0 // = 2 for FS = 88K2 or 96K0
// = 4 for FS = 176K4 or 192K0 // = 4 for FS = 176K4 or 192K0
outuint(c_adat_out, mClk/curSamFreq); outuint(c_adat_out, adatMultiple);
outuint(c_adat_out, adatSmuxMode); outuint(c_adat_out, adatSmuxMode);
#endif #endif
command = deliver(c_mix_out, command = deliver(c_mix_out,