Merge pull request #4 in PROCESSOR-SDK/audio-preprocessing-fw from PRSDK-2194 to...

* commit '897b60ddf9da61349c7ddd8d3acb470b69e233e9':
  PRSDK-2194 Remove Library install path
  PRSDK-2194 Added RULES_MAKE macro

diff --git a/realtime_demo_bios/k2g/src/makefile.libs b/realtime_demo_bios/k2g/src/makefile.libs
index 423b57fb68588100be6e814e5bc4e5fc7790c54d..5d4397bc065bdd16349507bd6c6664d042486917 100644 (file)
--- a/realtime_demo_bios/k2g/src/makefile.libs
+++ b/realtime_demo_bios/k2g/src/makefile.libs
@@ -1,6 +1,6 @@
 #
 # This file was generated based on the configuration script:
-#     C:\ti\processor_sdk_rtos_k2g_3_03_00_01\demos\audio-preprocessing\realtime_demo_bios\k2g\K2G_bf_rt.cfg
+#     C:\ti\processor_sdk_rtos_k2g_4_03_00_05\demos\audio-preprocessing\realtime_demo_bios\k2g\K2G_bf_rt.cfg
 #
 # This makefile may be included in other makefiles that need to build
 # the libraries containing the compiled source files generated as
@@ -14,7 +14,7 @@
 #
 # The absolute path to the generated source directory (at the time the
 # sources were generated) is:
-#    C:\ti\processor_sdk_rtos_k2g_3_03_00_01\demos\audio-preprocessing\realtime_demo_bios\k2g\src
+#    C:\ti\processor_sdk_rtos_k2g_4_03_00_05\demos\audio-preprocessing\realtime_demo_bios\k2g\src
 #
 GEN_SRC_DIR ?= ../src
 

diff --git a/realtime_demo_bios/k2g/src/mcasp_cfg.c b/realtime_demo_bios/k2g/src/mcasp_cfg.c
index c378e6c56d66395759f22e37d5d2da38220684c8..4783502efb2e2641dde7b147665438b0dd8dd042 100644 (file)
--- a/realtime_demo_bios/k2g/src/mcasp_cfg.c
+++ b/realtime_demo_bios/k2g/src/mcasp_cfg.c
@@ -141,6 +141,8 @@ Error_Block eb;
 void GblErr(int arg);\r
 signed char*  getGlobalAddr(signed char* addr);\r
 \r
+#define TX_FIFO_EVENT_DMA_RATIO  1\r
+#define RX_FIFO_EVENT_DMA_RATIO  1\r
 /* McASP HW setup for receive */\r
 Mcasp_HwSetupData mcaspRcvSetup = {\r
         /* .rmask    = */ 0xFFFFFFFF, /* 16 bits are to be used     */\r
@@ -220,7 +222,9 @@ Mcasp_ChanParams  mcaspRxChanParam =
        ///Mcasp_BufferFormat_MULTISER_MULTISLOT_SEMI_INTERLEAVED_1,\r
        Mcasp_BufferFormat_MULTISER_MULTISLOT_SEMI_INTERLEAVED_2,\r
        TRUE,\r
-       TRUE\r
+       RX_FIFO_EVENT_DMA_RATIO,\r
+       TRUE,\r
+       Mcasp_WordBitsSelect_LSB\r
 };\r
 \r
 #if (CMB_AUDIO_DAC)\r
@@ -241,7 +245,9 @@ Mcasp_ChanParams  mcaspTxChanParam =
        Mcasp_BufferFormat_1SER_MULTISLOT_INTERLEAVED,\r
        ///Mcasp_BufferFormat_1SER_MULTISLOT_NON_INTERLEAVED,\r
        TRUE,\r
-       TRUE\r
+       TX_FIFO_EVENT_DMA_RATIO,\r
+       TRUE,\r
+       Mcasp_WordBitsSelect_LSB\r
 };\r
 #endif\r
 \r

diff --git a/realtime_demo_bios/omapl137/src/makefile.libs b/realtime_demo_bios/omapl137/src/makefile.libs
index ceb9a999e0c67ea82b92ae254e001b2093f6929d..19cfd2d0230f2c7ec231a7b9521afd0ad351a22b 100644 (file)
--- a/realtime_demo_bios/omapl137/src/makefile.libs
+++ b/realtime_demo_bios/omapl137/src/makefile.libs
@@ -1,6 +1,6 @@
 #
 # This file was generated based on the configuration script:
-#     C:\ti\processor_sdk_rtos_omapl13x_4_00_00_01\demos\audio-preprocessing\realtime_demo_bios\omapl137\OMAPL137_bf_rt.cfg
+#     C:\ti\processor_sdk_rtos_omapl137_4_03_00_05\demos\audio-preprocessing\realtime_demo_bios\omapl137\OMAPL137_bf_rt.cfg
 #
 # This makefile may be included in other makefiles that need to build
 # the libraries containing the compiled source files generated as
@@ -14,7 +14,7 @@
 #
 # The absolute path to the generated source directory (at the time the
 # sources were generated) is:
-#    C:\ti\processor_sdk_rtos_omapl13x_4_00_00_01\demos\audio-preprocessing\realtime_demo_bios\omapl137\src
+#    C:\ti\processor_sdk_rtos_omapl137_4_03_00_05\demos\audio-preprocessing\realtime_demo_bios\omapl137\src
 #
 GEN_SRC_DIR ?= ../src
 

diff --git a/realtime_demo_bios/omapl137/src/mcasp_cfg.c b/realtime_demo_bios/omapl137/src/mcasp_cfg.c
index e3a36c0bf9c159e49b33a31493d75eb0d9bd7aae..057ddb49f6154a898b90e048336d56723f39c324 100644 (file)
--- a/realtime_demo_bios/omapl137/src/mcasp_cfg.c
+++ b/realtime_demo_bios/omapl137/src/mcasp_cfg.c
@@ -89,6 +89,8 @@ extern HeapMem_Handle myHeap;
 /* ========================================================================== */
 
 
+#define TX_FIFO_EVENT_DMA_RATIO  1
+#define RX_FIFO_EVENT_DMA_RATIO  1
 
 Mcasp_HwSetupData mcaspRcvSetup = {
         /* .rmask    = */ 0xFFFFFFFF, /* All the data bits are to be used     */
@@ -268,7 +270,8 @@ Mcasp_ChanParams  mcasp_chanparam[2]=
 #endif
         TRUE,
                RX_FIFO_EVENT_DMA_RATIO,
-        FALSE
+        TRUE,
+           Mcasp_WordBitsSelect_LSB
     },
     {
         TX_NUM_SERIALIZER,                   /* number of serialisers       */
@@ -290,7 +293,8 @@ Mcasp_ChanParams  mcasp_chanparam[2]=
 #endif
         TRUE,
         TX_FIFO_EVENT_DMA_RATIO,
-        FALSE
+        TRUE,
+           Mcasp_WordBitsSelect_LSB
     }
 };