summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMing Wei2018-05-15 10:35:59 -0500
committerMing Wei2018-05-15 10:35:59 -0500
commit168190e92cfc3c71095c5c485b27a87c817c39d3 (patch)
tree9f48f763270933f45b0567268e9c27049506eaf9
parent29c05572b82251bac73cd685afcffdb8549eaaaf (diff)
parentcfd80bc62ed5e80cac63967348b2f815bb7f1a2a (diff)
downloadcircmicarray-addon-168190e92cfc3c71095c5c485b27a87c817c39d3.tar.gz
circmicarray-addon-168190e92cfc3c71095c5c485b27a87c817c39d3.tar.xz
circmicarray-addon-168190e92cfc3c71095c5c485b27a87c817c39d3.zip
Merge pull request #3 in PROCESSOR-SDK/circmicarray-addon from PRSDK-4000 to master
* commit 'cfd80bc62ed5e80cac63967348b2f815bb7f1a2a': cmb: fixes for PRSDK-4000 (OMAP-L137) cmb: fixes for PRSDK-4000 (K2G)
-rw-r--r--cmb/test/evmK2G/analog/loopback/src/mcasp_cfg.c10
-rw-r--r--cmb/test/evmOMAPL137/analog/loopback/src/mcasp_cfg.c8
2 files changed, 14 insertions, 4 deletions
diff --git a/cmb/test/evmK2G/analog/loopback/src/mcasp_cfg.c b/cmb/test/evmK2G/analog/loopback/src/mcasp_cfg.c
index 21e4e1f..f160b30 100644
--- a/cmb/test/evmK2G/analog/loopback/src/mcasp_cfg.c
+++ b/cmb/test/evmK2G/analog/loopback/src/mcasp_cfg.c
@@ -94,6 +94,8 @@ extern HeapMem_Handle heapHandle;
94void GblErr(int arg); 94void GblErr(int arg);
95signed char* getGlobalAddr(signed char* addr); 95signed char* getGlobalAddr(signed char* addr);
96 96
97#define TX_FIFO_EVENT_DMA_RATIO 1
98#define RX_FIFO_EVENT_DMA_RATIO 1
97/* McASP HW setup for receive */ 99/* McASP HW setup for receive */
98Mcasp_HwSetupData mcaspRcvSetup = { 100Mcasp_HwSetupData mcaspRcvSetup = {
99 /* .rmask = */ 0xFFFFFFFF, /* 16 bits are to be used */ 101 /* .rmask = */ 0xFFFFFFFF, /* 16 bits are to be used */
@@ -173,7 +175,9 @@ Mcasp_ChanParams mcaspRxChanParam =
173 ///Mcasp_BufferFormat_MULTISER_MULTISLOT_SEMI_INTERLEAVED_1, 175 ///Mcasp_BufferFormat_MULTISER_MULTISLOT_SEMI_INTERLEAVED_1,
174 Mcasp_BufferFormat_MULTISER_MULTISLOT_SEMI_INTERLEAVED_2, 176 Mcasp_BufferFormat_MULTISER_MULTISLOT_SEMI_INTERLEAVED_2,
175 TRUE, 177 TRUE,
176 TRUE 178 RX_FIFO_EVENT_DMA_RATIO,
179 TRUE,
180 Mcasp_WordBitsSelect_LSB
177}; 181};
178 182
179#if (CMB_AUDIO_DAC) 183#if (CMB_AUDIO_DAC)
@@ -194,7 +198,9 @@ Mcasp_ChanParams mcaspTxChanParam =
194 Mcasp_BufferFormat_1SER_MULTISLOT_INTERLEAVED, 198 Mcasp_BufferFormat_1SER_MULTISLOT_INTERLEAVED,
195 ///Mcasp_BufferFormat_1SER_MULTISLOT_NON_INTERLEAVED, 199 ///Mcasp_BufferFormat_1SER_MULTISLOT_NON_INTERLEAVED,
196 TRUE, 200 TRUE,
197 TRUE 201 TX_FIFO_EVENT_DMA_RATIO,
202 TRUE,
203 Mcasp_WordBitsSelect_LSB
198}; 204};
199#endif 205#endif
200 206
diff --git a/cmb/test/evmOMAPL137/analog/loopback/src/mcasp_cfg.c b/cmb/test/evmOMAPL137/analog/loopback/src/mcasp_cfg.c
index 251299f..2ef4769 100644
--- a/cmb/test/evmOMAPL137/analog/loopback/src/mcasp_cfg.c
+++ b/cmb/test/evmOMAPL137/analog/loopback/src/mcasp_cfg.c
@@ -90,6 +90,8 @@ extern HeapMem_Handle myHeap;
90 90
91 91
92 92
93#define TX_FIFO_EVENT_DMA_RATIO 1
94#define RX_FIFO_EVENT_DMA_RATIO 1
93Mcasp_HwSetupData mcaspRcvSetup = { 95Mcasp_HwSetupData mcaspRcvSetup = {
94 /* .rmask = */ 0xFFFFFFFF, /* All the data bits are to be used */ 96 /* .rmask = */ 0xFFFFFFFF, /* All the data bits are to be used */
95#if defined (DSP_MODE) 97#if defined (DSP_MODE)
@@ -268,7 +270,8 @@ Mcasp_ChanParams mcasp_chanparam[2]=
268#endif 270#endif
269 TRUE, 271 TRUE,
270 RX_FIFO_EVENT_DMA_RATIO, 272 RX_FIFO_EVENT_DMA_RATIO,
271 FALSE 273 TRUE,
274 Mcasp_WordBitsSelect_LSB
272 }, 275 },
273 { 276 {
274 TX_NUM_SERIALIZER, /* number of serialisers */ 277 TX_NUM_SERIALIZER, /* number of serialisers */
@@ -290,7 +293,8 @@ Mcasp_ChanParams mcasp_chanparam[2]=
290#endif 293#endif
291 TRUE, 294 TRUE,
292 TX_FIFO_EVENT_DMA_RATIO, 295 TX_FIFO_EVENT_DMA_RATIO,
293 FALSE 296 TRUE,
297 Mcasp_WordBitsSelect_LSB
294 } 298 }
295}; 299};
296 300