Merge update.
authorSu <qsu@ti.com>
Wed, 21 Jun 2017 17:34:03 +0000 (13:34 -0400)
committerSu <qsu@ti.com>
Wed, 21 Jun 2017 17:34:03 +0000 (13:34 -0400)
pasdk/paf
pasdk/test_arm/.cproject
pasdk/test_arm/framework/audioStreamDecodeProc.c
pasdk/test_arm/framework/systemInit.c
pasdk/test_dsp/.cproject
pasdk/test_dsp/framework/audioStreamInpProc.c
pasdk/test_dsp/framework/systemInit.c

index 60243bd625ff3c3be4eb20f6f64a31c3016af7e3..0eb6eae795286dea8cfe55db55997a827ecb3c5a 160000 (submodule)
--- a/pasdk/paf
+++ b/pasdk/paf
@@ -1 +1 @@
-Subproject commit 60243bd625ff3c3be4eb20f6f64a31c3016af7e3
+Subproject commit 0eb6eae795286dea8cfe55db55997a827ecb3c5a
index 73fbcfcac8b4642baf96767419e6331d7cd56b8a..bffafe71eef6ed79490d3d2427d40547495cb4ae 100644 (file)
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/dolby_ip/ddp/Dolby_Digital_Plus_Decoder_Imp/Source_Code/include&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/dolby_ip/mat-thd/Dolby_MAT_Decoder_Imp/Source_Code/alg&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/3p-ip-dts/Source_Code/sdk-dts-uhd-no-guidedparma-src/alg/src&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/3p-ip-dts/Source_Code/sdk-dts-uhd-no-guidedparma-src/alg/alpha&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PDK_INSTALL_PATH}&quot;"/>
                                                                </option>
                                                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.MFLOAT_ABI.576208136" name="Specify if floating point hardware should be used (-mfloat-abi)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.MFLOAT_ABI" value="hard" valueType="string"/>
index 4d1f3716f05d3473838292f0739d9a7d1722fd0e..60e0f129d86bcc483796edcfca95a371a616da01 100644 (file)
@@ -276,29 +276,8 @@ Void taskAsdpFxn(
         TRACE_TERSE2("TaskAsdp: AS%d: initialization phase - %d completed", as+zMS, i);
         LINNO_RPRT(TaskAsdp, -i-3);
     }
-      
-#ifdef NON_CACHE_STATUS
-    //
-    // init Status structure Gate
+    
     //
-    if (statusOp_Init(GATEMP_INDEX_DEC) == STATUSOP_INIT_FAIL)
-    {
-        TRACE_TERSE1("TaskAsdp: Gate Index %d:initialization status GateMP Fail.", GATEMP_INDEX_DEC);
-    }
-    if (statusOp_Init(GATEMP_INDEX_DDP) == STATUSOP_INIT_FAIL)
-    {
-        TRACE_TERSE1("TaskAsdp: Gate Index %d:initialization status GateMP Fail.", GATEMP_INDEX_DDP);
-    }
-    if (statusOp_Init(GATEMP_INDEX_PCM) == STATUSOP_INIT_FAIL)
-    {
-        TRACE_TERSE1("TaskAsdp: Gate Index %d:initialization status GateMP Fail.", GATEMP_INDEX_PCM);
-    }
-    if (statusOp_Init(GATEMP_INDEX_THD) == STATUSOP_INIT_FAIL)
-    {
-        TRACE_TERSE1("TaskAsdp: Gate Index %d:initialization status GateMP Fail.", GATEMP_INDEX_THD);
-    }
-#endif
-
     //
     // End of Initialization -- final memory usage report.
     //
index 86d83f30917ce022949b0ef82c6fc2641d748566..308c597d1b0a9db9873671cb52065772e1c27442 100644 (file)
@@ -50,6 +50,7 @@ All rights reserved.
 #include "aspDecOpCircBuf_slave.h"
 #include "audioStreamProc_common.h"
 #include "audioStreamDecodeProc.h"
+#include "statusOp_common.h"
 
 const PAFHJT_t *pafhjt;
 
@@ -123,6 +124,31 @@ Void taskSysInitFxn(Void)
         NULL,
         srHeapNonCacheDdr3);
     
+#ifdef NON_CACHE_STATUS
+    //
+    // init Status structure Gate: Has to done before statusOp_Init() call from DSP
+    //
+    if (statusOp_Init(GATEMP_INDEX_DEC) == STATUSOP_INIT_FAIL)
+    {
+        TRACE_TERSE1("TaskAsdp: Gate Index %d:initialization status GateMP Fail.", GATEMP_INDEX_DEC);
+    }
+    if (statusOp_Init(GATEMP_INDEX_DDP) == STATUSOP_INIT_FAIL)
+    {
+        TRACE_TERSE1("TaskAsdp: Gate Index %d:initialization status GateMP Fail.", GATEMP_INDEX_DDP);
+    }
+    if (statusOp_Init(GATEMP_INDEX_PCM) == STATUSOP_INIT_FAIL)
+    {
+        TRACE_TERSE1("TaskAsdp: Gate Index %d:initialization status GateMP Fail.", GATEMP_INDEX_PCM);
+    }
+    if (statusOp_Init(GATEMP_INDEX_THD) == STATUSOP_INIT_FAIL)
+    {
+        TRACE_TERSE1("TaskAsdp: Gate Index %d:initialization status GateMP Fail.", GATEMP_INDEX_THD);
+    }
+    if (statusOp_Init(GATEMP_INDEX_DTS) == STATUSOP_INIT_FAIL)
+       {
+               TRACE_TERSE1("TaskAsdp: Gate Index %d:initialization status GateMP Fail.", GATEMP_INDEX_DTS);
+       }
+#endif
 
     /* Initialize HJT */
     pafhjt = &PAFHJT_RAM;
index 29cebf1b76f0d74fa5567dd3a9b514ee45066189..466ca60d20a7c2f12aafce1537cc819facd1b21f 100644 (file)
@@ -69,6 +69,7 @@
                                                        <tool id="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.compilerDebug.1216493005" name="C6000 Compiler" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.compilerDebug">
                                                                <option id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.DEFINE.903477341" name="Pre-define NAME (--define, -D)" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.DEFINE" valueType="definedSymbols">
                                                                        <listOptionValue builtIn="false" value="dsp0"/>
+                                                                       <listOptionValue builtIn="false" value="DTS_BUILD"/>
                                                                        <listOptionValue builtIn="false" value="k2g02"/>
                                                                        <listOptionValue builtIn="false" value="SOC_K2G"/>
                                                                        <listOptionValue builtIn="false" value="DEVICE_K2G"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/dolby_ip/dap/Dolby_Audio_Processing_Home_Theatre_Imp/Source_Code&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/dolby_ip/dap/Dolby_Audio_Processing_Home_Theatre_Imp/Source_Code/alg&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/dolby_ip/dap/Dolby_Audio_Processing_Home_Theatre_Imp/Source_Code/alpha&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/3p-ip-dts/Source_Code/sdk-dts-uhd-no-guidedparma-src/alg/alpha&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/3p-ip-dts/Source_Code/sdk-dts-uhd-no-guidedparma-src/alg/src&quot;"/>
                                                                </option>
                                                                <option id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.ABI.1329388145" name="Application binary interface (coffabi not supported) [See 'General' page to edit] (--abi)" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.ABI" value="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.ABI.eabi" valueType="enumerated"/>
                                                                <option id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.MEM_MODEL__DATA.1734581769" name="Data access model (--mem_model:data)" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.MEM_MODEL__DATA" value="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.MEM_MODEL__DATA.far_aggregates" valueType="enumerated"/>
index 2c475872e1d1e82ba7fc1ab5fc6ae3e21c6a7d28..8b131e6574b3b2301128c5e3c5be21f2e8b8cc53 100644 (file)
@@ -569,26 +569,6 @@ Void taskAsipFxn(
     Cache_inv((Ptr)(IACP_STD_BETA_TABLE.pStatus[STD_BETA_DTSUHDA]), size, Cache_Type_ALLD, 0);
     Cache_wait();
     
-#ifdef NON_CACHE_STATUS
-    // Get the shared status structure GateMP handles. Initialized at slave.
-    if (statusOp_Init(GATEMP_INDEX_DEC) == STATUSOP_INIT_FAIL)
-    {
-        Log_info1("TaskAfp: Gate Index %d:Open status GateMP Fail.", GATEMP_INDEX_DEC);
-    }
-    if (statusOp_Init(GATEMP_INDEX_DDP) == STATUSOP_INIT_FAIL)
-    {
-        Log_info1("TaskAfp: Gate Index %d:Open status GateMP Fail.", GATEMP_INDEX_DDP);
-    }
-    if (statusOp_Init(GATEMP_INDEX_PCM) == STATUSOP_INIT_FAIL)
-    {
-        Log_info1("TaskAfp: Gate Index %d:Open status GateMP Fail.", GATEMP_INDEX_PCM);
-    }
-    if (statusOp_Init(GATEMP_INDEX_THD) == STATUSOP_INIT_FAIL)
-    {
-        Log_info1("TaskAfp: Gate Index %d:Open status GateMP Fail.", GATEMP_INDEX_THD);
-    }
-#endif
-
     // (***) FL: revisit
     // invalidate Dec configuration
     Cache_inv(&gPAF_AST_config.xDec[0], DECODEN*sizeof(PAF_AST_Decode), Cache_Type_ALLD, 0);
index 3e2f79824959ed33d0e92d038cd41bf4c3db3503..f008d6d329063f29faa9bd25d9332f7413aa3bae 100644 (file)
@@ -56,6 +56,7 @@ All rights reserved.
 #include "audioStreamInpProc.h"
 #include "audioStreamOutProc.h"
 #include "systemInit.h"
+#include "statusOp_common.h"
 
 // FL: debug
 #include "evmc66x_pinmux.h"
@@ -176,6 +177,31 @@ Void taskSysInitFxn(Void)
         srHeapDdr3,
         srHeapNonCacheDdr3);
 
+#ifdef NON_CACHE_STATUS
+    //
+    // init Status structure Gate: ARM should have called statusOp_Init() before this.
+    //
+    if (statusOp_Init(GATEMP_INDEX_DEC) == STATUSOP_INIT_FAIL)
+    {
+        TRACE_TERSE1("TaskAsdp: Gate Index %d:initialization status GateMP Fail.", GATEMP_INDEX_DEC);
+    }
+    if (statusOp_Init(GATEMP_INDEX_DDP) == STATUSOP_INIT_FAIL)
+    {
+        TRACE_TERSE1("TaskAsdp: Gate Index %d:initialization status GateMP Fail.", GATEMP_INDEX_DDP);
+    }
+    if (statusOp_Init(GATEMP_INDEX_PCM) == STATUSOP_INIT_FAIL)
+    {
+        TRACE_TERSE1("TaskAsdp: Gate Index %d:initialization status GateMP Fail.", GATEMP_INDEX_PCM);
+    }
+    if (statusOp_Init(GATEMP_INDEX_THD) == STATUSOP_INIT_FAIL)
+    {
+        TRACE_TERSE1("TaskAsdp: Gate Index %d:initialization status GateMP Fail.", GATEMP_INDEX_THD);
+    }
+    if (statusOp_Init(GATEMP_INDEX_DTS) == STATUSOP_INIT_FAIL)
+    {
+        TRACE_TERSE1("TaskAsdp: Gate Index %d:initialization status GateMP Fail.", GATEMP_INDEX_DTS);
+    }
+#endif
 #ifdef MEMSTAT_REPORT
     // Output current heap memory usage
     PAF_ALG_memStatusPrint("System Initialization, Initial MEMSTAT REPORT",