summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 9ab8511)
raw | patch | inline | side by side (from parent 1: 9ab8511)
author | Ming Wei <a0868762@ti.com> | |
Tue, 31 Jan 2017 17:19:58 +0000 (11:19 -0600) | ||
committer | Ming Wei <a0868762@ti.com> | |
Tue, 31 Jan 2017 17:19:58 +0000 (11:19 -0600) |
Signed-off-by: Ming Wei <a0868762@ti.com>
realtime_demo_bios/k2g/src/main.c | patch | blob | history | |
realtime_demo_bios/k2g/src/mcasp_cfg.c | patch | blob | history |
index 982aa1ff3941a773ad26b6ca9b94276b3627487d..9c3f34bff93fd8bde6df3fdf4dca70c2db0c0c3b 100644 (file)
{\r
80, /* ADC gain */\r
CMB_ADC_INL_SE_VINL1, /* Left input mux for ADC1L */\r
- CMB_ADC_INL_SE_VINL2, /* Left input mux for ADC2L */\r
+ CMB_ADC_INL_SE_VINL3, /* Left input mux for ADC2L */\r
CMB_ADC_INR_SE_VINR1, /* Right input mux for ADC1R */\r
- CMB_ADC_INR_SE_VINR2, /* Right input mux for ADC2R */\r
+ CMB_ADC_INR_SE_VINR3, /* Right input mux for ADC2R */\r
CMB_ADC_RX_WLEN_24BIT, /* ADC word length */\r
CMB_ADC_DATA_FORMAT_I2S, /* ADC data format */\r
0\r
testRet(1);\r
}\r
\r
+ /* reset Audio ADC module 0 */\r
+ status = cmb_AudioAdcReset(CMB_ADC_DEVICE_0);\r
+ cmb_delay(10000);\r
+ /* reset Audio ADC module 1 */\r
+ status = cmb_AudioAdcReset(CMB_ADC_DEVICE_1);\r
+ cmb_delay(10000);\r
+\r
/* Initialize Audio ADC module */\r
status = audioAdcConfig(CMB_ADC_DEVICE_0, &adcCfg);\r
if(status != Cmb_EOK)\r
index d0d8722adba3b146ba87aca93792ca0d420c1951..196692e3d014cf13a343740a51999e5ffbce49b9 100644 (file)
Ptr wkBuf[NUM_BUFS];\r
Ptr outBuf[NUM_BUFS];\r
\r
-int chanToMicMapping[8] = {0, 1, 4, 5, 2, 3, 6, 7};\r
+/* channel 0 (serilizer 1 left) - mic1 */\r
+/* channel 1 (serilizer 1 right) - mic2 */\r
+/* channel 2 (serilizer 2 left) - mic5 */\r
+/* channel 3 (serilizer 2 right) - mic6 */\r
+/* channel 4 (serilizer 3 left) - mic3 */\r
+/* channel 5 (serilizer 3 right) - mic4 */\r
+/* channel 6 (serilizer 4 left) - mic8 */\r
+/* channel 7 (serilizer 4 right) - mic7 */\r
+int chanToMicMapping[8] = {0, 1, 4, 5, 3, 2, 7, 6};\r
\r
/* Error flag */\r
uint32_t gblErrFlag = 0;\r
#else\r
tempOutPtr = outBuf[gtxFrameIndexCount];\r
#endif\r
- // set the tempMicPtr to mic_in[4]\r
- tempMicPtr = (unsigned char *)mics_in[4];\r
+ // set the tempMicPtr to mic_in[7] (mic8)\r
+ tempMicPtr = (unsigned char *)mics_in[7];\r
// set the TX pointer to left cahhnel\r
tempTxPtr = txBuf[gtxFrameIndexCount];\r
// copy upsampled and Q15 to Q31 converted MSS output to TX left channel\r