PASDK-477:Merge remote-tracking branch 'origin/dev_pasdk_qin_dtsx' into pasdk_frank_p...
authorFrank Livingston <frank-livingston@ti.com>
Wed, 6 Dec 2017 15:31:37 +0000 (09:31 -0600)
committerFrank Livingston <frank-livingston@ti.com>
Wed, 6 Dec 2017 15:31:37 +0000 (09:31 -0600)
37 files changed:
build_all.bat
docs/PASDK_release_notes.doc
docs/PASDK_release_notes.pdf
docs/PASDK_release_notes_dolby_ip.doc
docs/PASDK_release_notes_dolby_ip.pdf
docs/PASDK_setup_guide.docx
docs/PASDK_setup_guide.pdf
dolby_ip/bmda
dolby_ip/car
dolby_ip/dap
dolby_ip/ddp
dolby_ip/mat-thd
dolby_ip/oar
pasdk/common/aspDecOpCircBuf_common.h
pasdk/paf
pasdk/shared/config.bld
pasdk/test_arm/.ccsproject
pasdk/test_arm/.cproject
pasdk/test_arm/application/app.cfg
pasdk/test_arm/application/app_dh.cmd
pasdk/test_arm/application/app_dtsx.cmd
pasdk/test_arm/application/app_noip.cmd
pasdk/test_arm/application/main.c
pasdk/test_arm/framework/aspDecOpCircBuf_slave.c
pasdk/test_arm/framework/audioStreamDecodeProc.c
pasdk/test_arm/framework/itopo/params.c
pasdk/test_arm/framework/itopo/patchs.c
pasdk/test_dsp/.ccsproject
pasdk/test_dsp/.cproject
pasdk/test_dsp/application/app.cfg
pasdk/test_dsp/application/itopo/evmk2g/sample_k2g_cfg.c
pasdk/test_dsp/application/itopo/evmk2g/sap_d10.c
pasdk/test_dsp/framework/aspDecOpCircBuf_master.c
pasdk/test_dsp/framework/audioStreamInpProc.c
pasdk/test_dsp/framework/audioStreamOutProc.c
scripts/libarch_setup_env.bat
tools

index 84d989e6c1f93c146cde2e88d7eda11d7e4d363b..628741ad8b60b4a734bb2f807bd8a9139249ac70 100644 (file)
@@ -51,9 +51,9 @@ if "%PASDK_ROOT_DIR:~-1%"=="\" set PASDK_ROOT_DIR=%PASDK_ROOT_DIR:~0,-1%
 if "%3" NEQ "SDF" goto install_tools
 :: Set PASDK target and version
 set PASDK_TARGET_PLATFORM=k2g
-set PASDK_VERSION=01_00_00_06
+set PASDK_VERSION=01_01_00_00
 :: Set FD package version
-set FD_PKG_VERSION=01_00_00_06
+set FD_PKG_VERSION=01_01_00_00
 
 :: Set release directory
 set RELEASE_DIR=%PASDK_ROOT_DIR%\release
index 6c7755c40341bf621c93d9ea129960ccf27968c1..669c339be5a38b27136a19e14ded2529e8eec695 100644 (file)
Binary files a/docs/PASDK_release_notes.doc and b/docs/PASDK_release_notes.doc differ
index 871e308acfa2ef107f06a622c6807296d99b3449..1d33139bdc34f1eb68b705f98633a8c8c26ca362 100644 (file)
Binary files a/docs/PASDK_release_notes.pdf and b/docs/PASDK_release_notes.pdf differ
index 7b7cf37723905bd5d8f69ca4d7b40cbdb4c43f09..b8c3d767f6159b23d18976043823bb846b3a5ba2 100644 (file)
Binary files a/docs/PASDK_release_notes_dolby_ip.doc and b/docs/PASDK_release_notes_dolby_ip.doc differ
index dd4bb145413c60895288ac96351110db075a447b..ca7f03ce6fc52eefff90a0a1982cef95b624f0d2 100644 (file)
Binary files a/docs/PASDK_release_notes_dolby_ip.pdf and b/docs/PASDK_release_notes_dolby_ip.pdf differ
index 4d18fddd03eb5874eba1424a8198ca1022641618..ff8bb368411e5e3412e04cdabbbc596fc70a9405 100644 (file)
Binary files a/docs/PASDK_setup_guide.docx and b/docs/PASDK_setup_guide.docx differ
index e34faebac2dabc7ac654be71bc2a9c726ab0c1dc..27c5cfb10068474f23051dcdcbaeffde31e0a267 100644 (file)
Binary files a/docs/PASDK_setup_guide.pdf and b/docs/PASDK_setup_guide.pdf differ
index cd20a603515e3f84432fdae26547a4fb69a50cd2..2c1686c793c9fdc6976866c41b64eb083d2665bb 160000 (submodule)
@@ -1 +1 @@
-Subproject commit cd20a603515e3f84432fdae26547a4fb69a50cd2
+Subproject commit 2c1686c793c9fdc6976866c41b64eb083d2665bb
index 8e283728048f76c89cb49464003779322ce48353..919d50bf0460cc81a7547d3a8f4bc1d8663d1d38 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 8e283728048f76c89cb49464003779322ce48353
+Subproject commit 919d50bf0460cc81a7547d3a8f4bc1d8663d1d38
index f0cf2176e072a1796c22b55ac6b0d3678d8c89e1..54070644206dceb2054247dd03ff05e79e31b459 160000 (submodule)
@@ -1 +1 @@
-Subproject commit f0cf2176e072a1796c22b55ac6b0d3678d8c89e1
+Subproject commit 54070644206dceb2054247dd03ff05e79e31b459
index f058fcaa5020981292401e60a8702bd7519bf5b0..4637f1ca42bb56b2a15039cea97e65bdf3dcdaf4 160000 (submodule)
@@ -1 +1 @@
-Subproject commit f058fcaa5020981292401e60a8702bd7519bf5b0
+Subproject commit 4637f1ca42bb56b2a15039cea97e65bdf3dcdaf4
index e48ecb2b31b734d31d10776c34c51aca360b23cd..690dee88b945cf94ec18a030473bec5daa6a480b 160000 (submodule)
@@ -1 +1 @@
-Subproject commit e48ecb2b31b734d31d10776c34c51aca360b23cd
+Subproject commit 690dee88b945cf94ec18a030473bec5daa6a480b
index 3286eaefa6a0d98c97acba093b7cd60761b81409..3bfe0c3d345b19660fae06c11e4b47cf43f284bc 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 3286eaefa6a0d98c97acba093b7cd60761b81409
+Subproject commit 3bfe0c3d345b19660fae06c11e4b47cf43f284bc
index cd0fe196dfcfae4e9494cb2e1df7ef8f0a52eaec..e84ecc872f81f5f08416d464ae2e23b9ad44f0a8 100644 (file)
@@ -43,12 +43,12 @@ All rights reserved.
 
 //#include "dbgBenchmark.h" // PCM high-sampling rate + SRC + CAR benchmarking
 
-//#define CB_RW_OP_CAP_PP // debug
+//#define CB_RW_OP_CAP_PP 1// debug
 #ifdef CB_RW_OP_CAP_PP
 #define CB_OP_NONE        0
 #define CB_OP_W           1     // ARM write
 #define CB_OP_R           2     // DSP read
-#define CB_OP_COUNT_MAX   10000
+#define CB_OP_COUNT_MAX   15000
 #endif
 
 // CB control
@@ -84,7 +84,7 @@ All rights reserved.
 // Need to define CB size in different terms than existing macros.
 // (***) FL: !!! REVISIT!!! Allocating memory for max # channels (e.g. 32 for THD).
 // GROSS over allocation for THD 192 kHz, 6ch max.
-#define THD_HSR_FUDGE_FACTOR                    ( 368640 + 240000 )  
+#define THD_HSR_FUDGE_FACTOR                    ( 368640 + 240000 + 384000 )  
 #define ASP_DECOP_CB_PCM_BUF_SZ                 ( ASP_DECOP_CB_MAX_NUM_PCM_CH * ASP_DECOP_CB_MAX_NUM_PCM_FRAMES * ASP_DECOP_CB_MAX_PCM_FRAME_LEN + THD_HSR_FUDGE_FACTOR)
 // FL: unused
 //#define ASP_DECOP_CB_PCM_BUF_SZ_32CH48kMAT      ( ASP_DECOP_CB_MAX_NUM_PCM_CH_MAT * ASP_DECOP_CB_MAX_NUM_PCM_FRAMES * ASP_DECOP_CB_MAX_PCM_FRAME_LEN_48kMAT )
index 354fcc264e3ad40ca0efe87720468f6b11f68df2..7da11b2c0f79cb545c930d1aa5aefbc274cdb3b8 160000 (submodule)
--- a/pasdk/paf
+++ b/pasdk/paf
@@ -1 +1 @@
-Subproject commit 354fcc264e3ad40ca0efe87720468f6b11f68df2
+Subproject commit 7da11b2c0f79cb545c930d1aa5aefbc274cdb3b8
index 90c148118f777f9fed027798c69ed52cdec42c47..db86d62c46eed44dbeee399a67d153d25f6d1540 100644 (file)
@@ -44,8 +44,8 @@ var Build = xdc.useModule('xdc.bld.BuildEnvironment');
  *    Address          Size             Comment
  *  -------------------------------------------------------------
  *    0C00_0000   0008_0000  ( 512 KB)  SR_MSMC     (ipc:data)
- *    0C08_0000   0004_0000  ( 256 KB)  HOST_MSMC   (code, data)
- *    0C0C_0000   0004_0000  ( 256 KB)  CORE0_MSMC  (code, data)
+ *    0C08_0000   0003_0000  ( 192 KB)  HOST_MSMC   (code, data)
+ *    0C0B_0000   0005_0000  ( 384 KB)  MSMC_RSVD   (code, data)
  *    8000_0000   0020_0000  (   2 MB)  SR_0        (ipc)
  *    8020_0000   0060_0000  (   6 MB)  COMMON_DDR3 (data)
  *    8100_0000   0100_0000  (  16 MB)  COMMON2_DDR3(code, data)      // aligned to MAR memory region  
@@ -98,7 +98,7 @@ Build.platformTable["ti.platforms.evmTCI66AK2G02:host"] = {
     
         [ "HOST_MSMC",  {
             name: "HOST_MSMC", space: "code/data", access: "RWX",
-            base: 0x0C080000, len: 0x00040000,
+            base: 0x0C080000, len: 0x00030000,
             comment: "HOST MSMC SRAM"
         }], 
         
@@ -156,10 +156,10 @@ Build.platformTable["ti.platforms.evmTCI66AK2G02:core0"] = {
     
         ["SR_MSMC", SR_MSMC], 
     
-        [ "CORE0_MSMC",  {
-            name: "CORE0_MSMC", space: "code/data", access: "RWX",
-            base: 0x0C0C0000, len: 0x00040000,
-            comment: "CORE0 MSMC SRAM"
+        [ "MSMC_RSVD",  {
+            name: "MSMC_RSVD", space: "code/data", access: "RWX",
+            base: 0x0C0B0000, len: 0x00050000,
+            comment: "RSVD MSMC SRAM"
         }], 
         
         ["SR_0", SR_0], 
index 8f8af5dc741f245739a90d74dfdca7a94b9ca519..1f7a4a7a4953dc1626885e029452739b4358cb05 100644 (file)
@@ -10,5 +10,5 @@
        <createSlaveProjects value=""/>
        <templateProperties value="id=com.ti.rtsc.SYSBIOS.example_43,type=rtsc,products=com.ti.rtsc.SYSBIOS,target=gnu.targets.arm.A15F,buildProfile=release,isHybrid=true,"/>
        <isTargetManual value="false"/>
-       <origin value="c:/ti/processor_sdk_audio_1_00_00_06/pasdk/test_arm"/>
+       <origin value="c:/ti/processor_sdk_audio_1_01_00_00/pasdk/test_arm"/>
 </projectOptions>
index a68615b440dd862fb0027ddc8e70edea68a0a69a..8f30fa89d42b64719eb6effa3a0ef6fb5c350e06 100644 (file)
                                                                <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.JAVA_PROPERTIES.111979217" name="Java properties (-D)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.JAVA_PROPERTIES" valueType="stringList">
                                                                        <listOptionValue builtIn="false" value="xdc.platform.custom.check=false"/>
                                                                        <listOptionValue builtIn="false" value="ProjName=pa_i13_evmk2g_arm"/>
+                                                                       <listOptionValue builtIn="false" value="HsDevBuild=1"/>
                                                                </option>
                                                        </tool>
                                                </toolChain>
                                        </folderInfo>
                                        <sourceEntries>
-                                               <entry excluding="application/app_noip.cmd|66AK2Gxx.lds|application/app_dtsx.cmd|application/src|src" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+                                               <entry excluding="application/src|application/app_noip.cmd|66AK2Gxx.lds|application/app_dtsx.cmd|src" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
                                        </sourceEntries>
                                </configuration>
                        </storageModule>
                                                </toolChain>
                                        </folderInfo>
                                        <sourceEntries>
-                                               <entry excluding="application/app_pkgs.cmd|application/src|src|66AK2Gxx.lds" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+                                               <entry excluding="application/src|application/app_pkgs.cmd|src|66AK2Gxx.lds" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
                                        </sourceEntries>
                                </configuration>
                        </storageModule>
                                                                <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.JAVA_PROPERTIES.1428832896" name="Java properties (-D)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.JAVA_PROPERTIES" valueType="stringList">
                                                                        <listOptionValue builtIn="false" value="xdc.platform.custom.check=false"/>
                                                                        <listOptionValue builtIn="false" value="ProjName=pa_i13_evmk2g_arm"/>
+                                                                       <listOptionValue builtIn="false" value="HsDevBuild=1"/>
                                                                </option>
                                                        </tool>
                                                </toolChain>
                                        </folderInfo>
                                        <sourceEntries>
-                                               <entry excluding="application/app_noip.cmd|66AK2Gxx.lds|application/app_dtsx.cmd|application/app_pkgs.cmd|application/src|src" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+                                               <entry excluding="application/src|application/app_noip.cmd|66AK2Gxx.lds|application/app_dtsx.cmd|application/app_pkgs.cmd|src" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
                                        </sourceEntries>
                                </configuration>
                        </storageModule>
                                                                <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.JAVA_PROPERTIES.1965573761" name="Java properties (-D)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.JAVA_PROPERTIES" valueType="stringList">
                                                                        <listOptionValue builtIn="false" value="xdc.platform.custom.check=false"/>
                                                                        <listOptionValue builtIn="false" value="ProjName=pa_i13_evmk2g_arm"/>
+                                                                       <listOptionValue builtIn="false" value="HsDevBuild=1"/>
                                                                </option>
                                                        </tool>
                                                </toolChain>
                                        </folderInfo>
                                        <sourceEntries>
-                                               <entry excluding="application/app_dtsx.cmd|66AK2Gxx.lds|application/app_dh.cmd|application/app.cmd|application/src|src" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+                                               <entry excluding="application/app_noip.cmd|application/src|66AK2Gxx.lds|application/app_dh.cmd|application/app.cmd|src" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
                                        </sourceEntries>
                                </configuration>
                        </storageModule>
                                                                <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.JAVA_PROPERTIES.2100470902" name="Java properties (-D)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.JAVA_PROPERTIES" valueType="stringList">
                                                                        <listOptionValue builtIn="false" value="xdc.platform.custom.check=false"/>
                                                                        <listOptionValue builtIn="false" value="ProjName=pa_i13_evmk2g_arm"/>
+                                                                       <listOptionValue builtIn="false" value="HsDevBuild=1"/>
                                                                </option>
                                                        </tool>
                                                </toolChain>
                                        </folderInfo>
                                        <sourceEntries>
-                                               <entry excluding="application/app_dtsx.cmd|66AK2Gxx.lds|application/app_dh.cmd|application/app.cmd|application/app_pkgs.cmd|application/src|src" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+                                               <entry excluding="application/app_noip.cmd|application/src|66AK2Gxx.lds|application/app_dh.cmd|application/app.cmd|application/app_pkgs.cmd|src" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
                                        </sourceEntries>
                                </configuration>
                        </storageModule>
                                                                <listOptionValue builtIn="false" value="RTSC_MBS_VERSION=2.2.0"/>
                                                                <listOptionValue builtIn="false" value="OUTPUT_TYPE=rtscApplication:executable"/>
                                                        </option>
-                                                       <option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.1325683515" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION" value="GNU_4.8.4:Linaro" valueType="string"/>
+                                                       <option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.1325683515" name="Compiler version" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION" value="GNU_4.8.4:Linaro" valueType="string"/>
                                                        <targetPlatform id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.exe.targetPlatformDebug.366640443" name="Platform" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.exe.targetPlatformDebug"/>
-                                                       <builder buildPath="${BuildDirectory}" id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.exe.builderDebug.1718919506" name="GNU Make.Debug_NoIP" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.exe.builderDebug"/>
+                                                       <builder buildPath="${BuildDirectory}" id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.exe.builderDebug.1718919506" keepEnvironmentInBuildfile="false" name="GNU Make" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.exe.builderDebug"/>
                                                        <tool id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.exe.compilerDebug.1012357385" name="GNU Compiler" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.exe.compilerDebug">
-                                                               <option id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.DEFINE.277165982" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.DEFINE" valueType="definedSymbols">
+                                                               <option id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.DEFINE.277165982" name="Define symbols (-D)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.DEFINE" valueType="definedSymbols">
                                                                        <listOptionValue builtIn="false" value="k2g02"/>
                                                                        <listOptionValue builtIn="false" value="arm0"/>
                                                                        <listOptionValue builtIn="false" value="ARMCOMPILE"/>
                                                                        <listOptionValue builtIn="false" value="far="/>
                                                                        <listOptionValue builtIn="false" value="NON_CACHE_STATUS"/>
                                                                </option>
-                                                               <option id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.MCPU.1078717161" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.MCPU" value="cortex-a15" valueType="string"/>
-                                                               <option id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.MTUNE.1131422358" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.MTUNE" value="cortex-a15" valueType="string"/>
-                                                               <option id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.CODE_STATE.645335595" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.CODE_STATE" value="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.CODE_STATE.ARM" valueType="enumerated"/>
-                                                               <option id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.MFLOAT_ABI.1704231657" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.MFLOAT_ABI" value="hard" valueType="string"/>
-                                                               <option id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.INCLUDE_PATH.495050966" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.INCLUDE_PATH" valueType="includePath">
+                                                               <option id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.MCPU.1078717161" name="Target CPU (-mcpu)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.MCPU" value="cortex-a15" valueType="string"/>
+                                                               <option id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.MTUNE.1131422358" name="Tune code for the given processor (-mtune)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.MTUNE" value="cortex-a15" valueType="string"/>
+                                                               <option id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.CODE_STATE.645335595" name="Code state" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.CODE_STATE" value="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.CODE_STATE.ARM" valueType="enumerated"/>
+                                                               <option id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.MFLOAT_ABI.1704231657" 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"/>
+                                                               <option id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.INCLUDE_PATH.495050966" name="Include paths (-I)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.INCLUDE_PATH" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${CG_TOOL_INCLUDE_PATH}&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/paf/pa/asp/com&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/paf/pa/asp/std&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/test_dsp/sio_dev2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PDK_INSTALL_PATH}&quot;"/>
                                                                </option>
-                                                               <option id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.DEBUG.1599139822" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.DEBUG" value="true" valueType="boolean"/>
-                                                               <option id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.DWARF_VERSION.863270835" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.DWARF_VERSION" value="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.DWARF_VERSION.3" valueType="enumerated"/>
-                                                               <option id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.STRICT_DWARF.1770133332" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.STRICT_DWARF" value="true" valueType="boolean"/>
+                                                               <option id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.DEBUG.1599139822" name="Generate debug information (-g)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.DEBUG" value="true" valueType="boolean"/>
+                                                               <option id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.DWARF_VERSION.863270835" name="Generate debug information in DWARF version (-gdwarf-)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.DWARF_VERSION" value="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.DWARF_VERSION.3" valueType="enumerated"/>
+                                                               <option id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.STRICT_DWARF.1770133332" name="Do not emit DWARF additions beyond selected version (-gstrict-dwarf)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.STRICT_DWARF" value="true" valueType="boolean"/>
                                                                <inputType id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compiler.inputType__C_SRCS.101312477" name="C Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compiler.inputType__C_SRCS"/>
                                                                <inputType id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compiler.inputType__CPP_SRCS.890339217" name="C++ Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compiler.inputType__CPP_SRCS"/>
                                                                <inputType id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compiler.inputType__ASM_SRCS.523218828" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compiler.inputType__ASM_SRCS"/>
                                                                <inputType id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compiler.inputType__ASM2_SRCS.309883238" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compiler.inputType__ASM2_SRCS"/>
                                                        </tool>
                                                        <tool id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.exe.linkerDebug.145487676" name="GNU Linker" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.exe.linkerDebug">
-                                                               <option id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.linkerID.DEFSYM.1468338699" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.linkerID.DEFSYM" valueType="stringList">
+                                                               <option id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.linkerID.DEFSYM.1468338699" name="Define a symbol (--defsym)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.linkerID.DEFSYM" valueType="stringList">
                                                                        <listOptionValue builtIn="false" value="ARM_CORE=1"/>
                                                                        <listOptionValue builtIn="false" value="STACKSIZE=0x10000"/>
                                                                        <listOptionValue builtIn="false" value="HEAPSIZE=0x400"/>
                                                                </option>
-                                                               <option id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.linkerID.OUTPUT_FILE.990805307" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.linkerID.OUTPUT_FILE" value="&quot;${ProjName}.out&quot;" valueType="string"/>
-                                                               <option id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.linkerID.MAP_FILE.1186967305" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.linkerID.MAP_FILE" value="&quot;${ProjName}.map&quot;" valueType="string"/>
-                                                               <option id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.linkerID.NOSTARTFILES.1793440144" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.linkerID.NOSTARTFILES" value="true" valueType="boolean"/>
-                                                               <option id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.linkerID.STATIC.2110555409" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.linkerID.STATIC" value="true" valueType="boolean"/>
-                                                               <option id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.linkerID.GC_SECTIONS.1640494175" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.linkerID.GC_SECTIONS" value="true" valueType="boolean"/>
-                                                               <option id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.linkerID.SCRIPTS.1056415006" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.linkerID.SCRIPTS" valueType="stringList">
+                                                               <option id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.linkerID.OUTPUT_FILE.990805307" name="Output file (-o)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.linkerID.OUTPUT_FILE" value="&quot;${ProjName}.out&quot;" valueType="string"/>
+                                                               <option id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.linkerID.MAP_FILE.1186967305" name="Write a map file (-Map)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.linkerID.MAP_FILE" value="&quot;${ProjName}.map&quot;" valueType="string"/>
+                                                               <option id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.linkerID.NOSTARTFILES.1793440144" name="Do not use the standard system startup files when linking (-nostartfiles)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.linkerID.NOSTARTFILES" value="true" valueType="boolean"/>
+                                                               <option id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.linkerID.STATIC.2110555409" name="Do not link with the shared libraries (-static)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.linkerID.STATIC" value="true" valueType="boolean"/>
+                                                               <option id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.linkerID.GC_SECTIONS.1640494175" name="Remove unused sections (--gc-sections)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.linkerID.GC_SECTIONS" value="true" valueType="boolean"/>
+                                                               <option id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.linkerID.SCRIPTS.1056415006" name="Linker command files (-T, --script)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.linkerID.SCRIPTS" valueType="stringList">
                                                                        <listOptionValue builtIn="false" value="&quot;../application/app_noip.cmd&quot;"/>
                                                                </option>
-                                                               <option id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.linkerID.LIBRARY.1302584260" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.linkerID.LIBRARY" valueType="libs">
+                                                               <option id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.linkerID.LIBRARY.1302584260" name="Libraries (-l, --library)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.linkerID.LIBRARY" valueType="libs">
                                                                        <listOptionValue builtIn="false" value="&quot;gcc&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;m&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;nosys&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;c&quot;"/>
                                                                </option>
-                                                               <option id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.linkerID.SEARCH_PATH.234948830" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.linkerID.SEARCH_PATH" valueType="libPaths">
+                                                               <option id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.linkerID.SEARCH_PATH.234948830" name="Library search path (-L, --library-path)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.linkerID.SEARCH_PATH" valueType="libPaths">
                                                                        <listOptionValue builtIn="false" value="&quot;${xdc_find:gnu/targets/arm/libs/install-native/arm-none-eabi/lib/fpu:${ProjName}}&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/paf/pa/build/a15/release&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/paf/pa/util/da10x_misc/a15/release&quot;"/>
                                                        </tool>
                                                        <tool id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.hex.135573450" name="GNU Objcopy Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.hex"/>
                                                        <tool id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.238314026" name="XDCtools" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool">
-                                                               <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH.200853359" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH" valueType="stringList">
+                                                               <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH.200853359" name="Package repositories (--xdcpath)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.XDC_PATH" valueType="stringList">
                                                                        <listOptionValue builtIn="false" value="${BIOS_CG_ROOT}/packages"/>
                                                                        <listOptionValue builtIn="false" value="${COM_TI_UIA_INSTALL_DIR}/packages"/>
                                                                        <listOptionValue builtIn="false" value="${XDAIS_CG_ROOT}/packages"/>
                                                                        <listOptionValue builtIn="false" value="${IPC_CG_ROOT}/packages"/>
                                                                        <listOptionValue builtIn="false" value="${TARGET_CONTENT_BASE}"/>
                                                                </option>
-                                                               <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET.608934084" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET" value="gnu.targets.arm.A15F" valueType="string"/>
-                                                               <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM.444368780" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM" value="ti.platforms.evmTCI66AK2G02:host" valueType="string"/>
-                                                               <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW.527227584" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW" value="ti.platforms.evmTCI66AK2G02" valueType="string"/>
-                                                               <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE.136725373" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE" value="release" valueType="string"/>
-                                                               <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_CONFIGURATION_FILE.1455633864" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_CONFIGURATION_FILE" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/shared/config.bld&quot;" valueType="string"/>
-                                                               <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR.1193503091" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR" value="&quot;${CG_TOOL_ROOT}&quot;" valueType="string"/>
-                                                               <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CFG_ARGS.1093312199" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CFG_ARGS" value="&quot;{ profile: \&quot;debug\&quot; }&quot;" valueType="string"/>
-                                                               <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.JAVA_PROPERTIES.1994053961" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.JAVA_PROPERTIES" valueType="stringList">
+                                                               <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET.608934084" name="Target (-t)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.TARGET" value="gnu.targets.arm.A15F" valueType="string"/>
+                                                               <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM.444368780" name="Platform (-p)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM" value="ti.platforms.evmTCI66AK2G02:host" valueType="string"/>
+                                                               <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW.527227584" name="Platform (-p)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW" value="ti.platforms.evmTCI66AK2G02" valueType="string"/>
+                                                               <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE.136725373" name="Build-profile (-r)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE" value="release" valueType="string"/>
+                                                               <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_CONFIGURATION_FILE.1455633864" name="Build configuration file (-b)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_CONFIGURATION_FILE" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/shared/config.bld&quot;" valueType="string"/>
+                                                               <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR.1193503091" name="Compiler tools directory (-c)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR" value="&quot;${CG_TOOL_ROOT}&quot;" valueType="string"/>
+                                                               <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CFG_ARGS.1093312199" name="Configuration script arguments (--cfgArgs)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CFG_ARGS" value="&quot;{ profile: \&quot;debug\&quot; }&quot;" valueType="string"/>
+                                                               <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.JAVA_PROPERTIES.1994053961" name="Java properties (-D)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.JAVA_PROPERTIES" valueType="stringList">
                                                                        <listOptionValue builtIn="false" value="xdc.platform.custom.check=false"/>
                                                                        <listOptionValue builtIn="false" value="ProjName=pa_i13_evmk2g_arm"/>
+                                                                       <listOptionValue builtIn="false" value="HsDevBuild=1"/>
                                                                </option>
                                                        </tool>
                                                </toolChain>
                                        </folderInfo>
                                        <sourceEntries>
-                                               <entry excluding="application/app_dh.cmd|66AK2Gxx.lds|application/app_dtsx.cmd|application/src|src" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+                                               <entry excluding="application/src|application/app_dh.cmd|66AK2Gxx.lds|application/app_dtsx.cmd|src" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
                                        </sourceEntries>
                                </configuration>
                        </storageModule>
index 799506d594bee572dc907d62206cd516ea90c54b..c99f0ea0a23f4fef0fd4428919c0ee1c33b40302 100644 (file)
@@ -73,6 +73,18 @@ var UIAEvt          = xdc.useModule('ti.uia.events.UIAEvt');
 xdc.useModule('ti.sdo.utils.MultiProc');
 
 
+var HsDevBuild = environment["HsDevBuild"];
+var hsDevBuild = (HsDevBuild == "1" ? true : false);
+if (hsDevBuild == true)
+{
+    /* Added per recommendation from CATAPPS-171 */
+    /* HS device build */
+    var gicHwi = xdc.useModule('ti.sysbios.family.arm.gic.Hwi');
+    gicHwi.enableSecureMode = false;
+    gicHwi.BPR = 3;
+    gicHwi.NUM_PRIORITY_BITS = 4;
+}
+
 /*
  *  ======== IPC Configuration ========
  */
@@ -81,7 +93,7 @@ xdc.global.SrMsmcMem_cacheEnable = true;
 xdc.global.SrDDr3Mem_cacheEnable = true;
 xdc.global.SrDDr3_2Mem_cacheEnable = false;
 xdc.global.procName = "HOST";
-/* var ipc_cfg = xdc.loadCapsule("C:/ti/processor_sdk_audio_1_00_00_06/pasdk/shared/ipc.cfg.xs"); */
+/* var ipc_cfg = xdc.loadCapsule("C:/ti/processor_sdk_audio_1_01_00_00/pasdk/shared/ipc.cfg.xs"); */
 var ipc_cfg = xdc.loadCapsule("../../shared/ipc.cfg.xs");
 
 /* select ipc libraries */
@@ -233,39 +245,6 @@ Hwi.dispatcherAutoNestingSupport = false;
 
 var ProjName = environment["ProjName"];
 var topo = ProjName.replace( /pa_([a-z])[0-9]+_.*/, "$1");
-var AudioClockSim = environment["AudioClockSim"];
-var acSimBuild = (AudioClockSim == "1" ? true : false);
-
-if (acSimBuild == true)
-{
-    // 
-    // IPC simulation
-    // 
-
-    /* Add timer to simulate Rx audio IPC message */
-    var timer0Params = new Timer.Params();
-    timer0Params.instance.name = "timerRxAudio";
-    timer0Params.period = 5330;
-    timer0Params.startMode = xdc.module("ti.sysbios.interfaces.ITimer").StartMode_USER;
-    Program.global.timerRxAudio = Timer.create(1, null, timer0Params);
-
-    /* Add timer to simulate Tx audio IPC message */
-    var timer1Params = new Timer.Params();
-    timer1Params.instance.name = "timerTxAudio";
-    timer1Params.startMode = xdc.module("ti.sysbios.interfaces.ITimer").StartMode_USER;
-    timer1Params.period = 5330;
-    Program.global.timerTxAudio = Timer.create(2, null, timer1Params);
-
-    /* Add semaphore for Rx audio DMA */
-    var semaphore0Params = new Semaphore.Params();
-    semaphore0Params.instance.name = "semaphoreRxAudio";
-    Program.global.semaphoreRxAudio = Semaphore.create(null, semaphore0Params);
-
-    /* Add semaphore for Tx audio DMA */
-    var semaphore1Params = new Semaphore.Params();
-    semaphore1Params.instance.name = "semaphoreTxAudio";
-    Program.global.semaphoreTxAudio = Semaphore.create(null, semaphore1Params);
-}
 
 /* Set default stack size for tasks */
 Task.defaultStackSize = 2048;
@@ -283,7 +262,7 @@ task0Params.arg0 = $externPtr("asdp_params_PA" + topo);
 task0Params.arg1 = $externPtr("asdp_patchs_PA" + topo);
 task0Params.priority = -1; //3;
 Program.global.TaskAsdp = Task.create("&taskAsdpFxn", task0Params);
-Program.sectMap[".far:taskStackSectionAsdp"] = "HOST_MSMC";
+Program.sectMap[".far:taskStackSectionAsdp"] = "HOST_DDR3";
 
 /* Add System Initialization task */
 var task1Params = new Task.Params();
@@ -303,10 +282,14 @@ Program.sectMap[".far:taskStackSection"] = "HOST_DDR3"; // SDRAM in pa.cfg
 /* Add MSMC SRAM heap */ // formerly L3RAM
 var heapMem1Params = new HeapMem.Params();
 heapMem1Params.instance.name = "heapMemMsmcSram";
-heapMem1Params.size = (224-4)*1024; //128*1024
+//heapMem1Params.size = (224-4)*1024; //128*1024
+heapMem1Params.size = 192*1024; //128*1024
 heapMem1Params.sectionName = ".msmcSramHeap";
 Program.global.heapMemMsmcSram = HeapMem.create(heapMem1Params);
 Program.sectMap[".msmcSramHeap"] = "HOST_MSMC";
+// Remove section to exclude heapMem2Params.size 0's for heap initialization from ARM image.
+// Must have corresponding NOLOAD specifier for this section in linker command file.
+Program.sectionsExclude = "^\.msmcSramHeap"; 
 
 /* Add DDR3 heap */ // formerly SDRAM
 var heapMem2Params = new HeapMem.Params();
@@ -315,6 +298,9 @@ heapMem2Params.size = 5350528+ (3*1024*1024); // Added 3 MB for DTS decoder;//43
 heapMem2Params.sectionName = ".ddr3Heap";
 Program.global.heapMemDdr3 = HeapMem.create(heapMem2Params);
 Program.sectMap[".ddr3Heap"] = "HOST_DDR3";
+// Remove section to exclude heapMem2Params.size 0's for heap initialization from ARM image.
+// Must have corresponding NOLOAD specifier for this section in linker command file.
+Program.sectionsExclude = "^\.ddr3Heap"; 
 
 Program.global.heapMemL2Sram = Program.global.heapMemMsmcSram;
 
index 5d4019835575f32ee33cd33d91d6f10207ab18f7..f0223bfcc9cd4aed1369d4f360c519b2852a0d0f 100644 (file)
@@ -34,15 +34,15 @@ All rights reserved.
 
 /* ARM linker command file for DH */
 
-/* SEARCH_DIR ( C:\ti\processor_sdk_audio_1_00_00_06\pasdk\paf\pa\build\a15\release ) */
-/* SEARCH_DIR ( C:\ti\processor_sdk_audio_1_00_00_06\pasdk\paf\pa\util\da10x_misc\a15\release ) */
-/* SEARCH_DIR ( C:\ti\processor_sdk_audio_1_00_00_06\dolby_ip\intrinsics\Dolby_Intrinsics_Imp\lib_float_A15 ) */
-/* SEARCH_DIR ( C:\ti\processor_sdk_audio_1_00_00_06\dolby_ip\ddp\Dolby_Digital_Plus_Decoder_Imp\Source_Code\make\ddp_udc_lib\a15 )     */
-/* SEARCH_DIR ( C:\ti\processor_sdk_audio_1_00_00_06\dolby_ip\ddp\Dolby_Digital_Plus_Decoder_Imp\Source_Code\make\ddp_udc_wrapper\a15 ) */
-/* SEARCH_DIR ( C:\ti\processor_sdk_audio_1_00_00_06\dolby_ip\mat-thd\Dolby_MAT_Decoder_Imp\Source_Code\mat_dec\make\dthd_dec_lib\a15 ) */
-/* SEARCH_DIR ( C:\ti\processor_sdk_audio_1_00_00_06\dolby_ip\mat-thd\Dolby_MAT_Decoder_Imp\Source_Code\mat_dec\make\mat_dec_lib\a15 )  */
-/* SEARCH_DIR ( C:\ti\processor_sdk_audio_1_00_00_06\dolby_ip\mat-thd\Dolby_MAT_Decoder_Imp\Source_Code\mat_dec\make\thd_alg_lib\a15 )  */
-/* SEARCH_DIR ( C:\ti\processor_sdk_audio_1_00_00_06\dolby_ip\dh-ip\build\a15\release ) */
+/* SEARCH_DIR ( C:\ti\processor_sdk_audio_1_01_00_00\pasdk\paf\pa\build\a15\release ) */
+/* SEARCH_DIR ( C:\ti\processor_sdk_audio_1_01_00_00\pasdk\paf\pa\util\da10x_misc\a15\release ) */
+/* SEARCH_DIR ( C:\ti\processor_sdk_audio_1_01_00_00\dolby_ip\intrinsics\Dolby_Intrinsics_Imp\lib_float_A15 ) */
+/* SEARCH_DIR ( C:\ti\processor_sdk_audio_1_01_00_00\dolby_ip\ddp\Dolby_Digital_Plus_Decoder_Imp\Source_Code\make\ddp_udc_lib\a15 )     */
+/* SEARCH_DIR ( C:\ti\processor_sdk_audio_1_01_00_00\dolby_ip\ddp\Dolby_Digital_Plus_Decoder_Imp\Source_Code\make\ddp_udc_wrapper\a15 ) */
+/* SEARCH_DIR ( C:\ti\processor_sdk_audio_1_01_00_00\dolby_ip\mat-thd\Dolby_MAT_Decoder_Imp\Source_Code\mat_dec\make\dthd_dec_lib\a15 ) */
+/* SEARCH_DIR ( C:\ti\processor_sdk_audio_1_01_00_00\dolby_ip\mat-thd\Dolby_MAT_Decoder_Imp\Source_Code\mat_dec\make\mat_dec_lib\a15 )  */
+/* SEARCH_DIR ( C:\ti\processor_sdk_audio_1_01_00_00\dolby_ip\mat-thd\Dolby_MAT_Decoder_Imp\Source_Code\mat_dec\make\thd_alg_lib\a15 )  */
+/* SEARCH_DIR ( C:\ti\processor_sdk_audio_1_01_00_00\dolby_ip\dh-ip\build\a15\release ) */
 
 INPUT ( c67x_cintrins_elf.lib simulate_dma_elf.lib )
 INPUT ( acp_elf.lib asp_std_elf.lib com_asp_elf.lib com_dec_elf.lib pcm1_elf.lib statusop_common_elf.lib )
@@ -73,4 +73,18 @@ SECTIONS
         *(.gCapIbBuf)
         *(.gCapAfBuf)
     } > DDR3
+    
+    /*
+       Remove section to exclude heapMem2Params.size 0's for heap initialization from ARM image.
+       Must have corresponding "Program.sectionsExclude" in SYSBIOS configuration file.
+    */
+    .msmcSramHeap (NOLOAD):
+    {
+        *(.msmcSramHeap)  
+    } > HOST_MSMC
+    
+    .ddr3Heap (NOLOAD):
+    {
+        *(.ddr3Heap)  
+    } > HOST_DDR3
 }
index cc4128e5bbac1bb833bf570f7ec541f51b6c6b95..aa075496f81bbab1a19ad2cd7db92f0ec7bf3da9 100644 (file)
@@ -34,18 +34,18 @@ All rights reserved.
 
 /* ARM linker command file for DTS:X */
 
-/* SEARCH_DIR ( C:\ti\processor_sdk_audio_1_00_00_06\pasdk\paf\pa\build\a15\release ) */
-/* SEARCH_DIR ( C:\ti\processor_sdk_audio_1_00_00_06\pasdk\paf\pa\util\da10x_misc\a15\release ) */
-/* SEARCH_DIR ( C:\ti\processor_sdk_audio_1_00_00_06\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\dts-3d\misc\build\a15\Release ) */
-/* SEARCH_DIR ( C:\ti\processor_sdk_audio_1_00_00_06\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\dts-base\misc\build\a15\Release ) */
-/* SEARCH_DIR ( C:\ti\processor_sdk_audio_1_00_00_06\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\common-flib\misc\build\a15\Release ) */
-/* SEARCH_DIR ( C:\ti\processor_sdk_audio_1_00_00_06\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\lbr\misc\build\a15\lbr\Release ) */
-/* SEARCH_DIR ( C:\ti\processor_sdk_audio_1_00_00_06\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\lbr\misc\build\a15\lbrdec\Release ) */
-/* SEARCH_DIR ( C:\ti\processor_sdk_audio_1_00_00_06\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\parma-dec\misc\build\a15\Release ) */
-/* SEARCH_DIR ( C:\ti\processor_sdk_audio_1_00_00_06\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\dtshd-c-decoder\misc\build\a15\lib\Release ) */
-/* SEARCH_DIR ( C:\ti\processor_sdk_audio_1_00_00_06\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\la-strm-reconstruction\misc\build\a15\Release ) */
-/* SEARCH_DIR ( C:\ti\processor_sdk_audio_1_00_00_06\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\alg\misc\build\a15\Release ) */
-/* SEARCH_DIR ( C:\ti\processor_sdk_audio_1_00_00_06\3p-ip-dts\dtsx-ip\build\a15\release ) */
+/* SEARCH_DIR ( C:\ti\processor_sdk_audio_1_01_00_00\pasdk\paf\pa\build\a15\release ) */
+/* SEARCH_DIR ( C:\ti\processor_sdk_audio_1_01_00_00\pasdk\paf\pa\util\da10x_misc\a15\release ) */
+/* SEARCH_DIR ( C:\ti\processor_sdk_audio_1_01_00_00\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\dts-3d\misc\build\a15\Release ) */
+/* SEARCH_DIR ( C:\ti\processor_sdk_audio_1_01_00_00\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\dts-base\misc\build\a15\Release ) */
+/* SEARCH_DIR ( C:\ti\processor_sdk_audio_1_01_00_00\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\common-flib\misc\build\a15\Release ) */
+/* SEARCH_DIR ( C:\ti\processor_sdk_audio_1_01_00_00\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\lbr\misc\build\a15\lbr\Release ) */
+/* SEARCH_DIR ( C:\ti\processor_sdk_audio_1_01_00_00\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\lbr\misc\build\a15\lbrdec\Release ) */
+/* SEARCH_DIR ( C:\ti\processor_sdk_audio_1_01_00_00\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\parma-dec\misc\build\a15\Release ) */
+/* SEARCH_DIR ( C:\ti\processor_sdk_audio_1_01_00_00\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\dtshd-c-decoder\misc\build\a15\lib\Release ) */
+/* SEARCH_DIR ( C:\ti\processor_sdk_audio_1_01_00_00\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\la-strm-reconstruction\misc\build\a15\Release ) */
+/* SEARCH_DIR ( C:\ti\processor_sdk_audio_1_01_00_00\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src\alg\misc\build\a15\Release ) */
+/* SEARCH_DIR ( C:\ti\processor_sdk_audio_1_01_00_00\3p-ip-dts\dtsx-ip\build\a15\release ) */
 
 INPUT ( c67x_cintrins_elf.lib simulate_dma_elf.lib )
 INPUT ( acp_elf.lib asp_std_elf.lib com_asp_elf.lib com_dec_elf.lib pcm1_elf.lib statusop_common_elf.lib )
index f8b94174f316105c4838f0d8b8fd99b59075f146..9d4d10167b11ba9ad3052acb9bc8c542ffe9e421 100644 (file)
@@ -60,4 +60,18 @@ SECTIONS
         *(.gCapIbBuf)
         *(.gCapAfBuf)
     } > DDR3
+    
+    /*
+       Remove section to exclude heapMem2Params.size 0's for heap initialization from ARM image.
+       Must have corresponding "Program.sectionsExclude" in SYSBIOS configuration file.
+    */
+    .msmcSramHeap (NOLOAD):
+    {
+        *(.msmcSramHeap)  
+    } > HOST_MSMC
+    
+    .ddr3Heap (NOLOAD):
+    {
+        *(.ddr3Heap)  
+    } > HOST_DDR3    
 }
index 08cd68faedeea65799058f606d2cf3b54b28211c..f6f7a0ec0625290d36a15d0addfe1655fd293357 100644 (file)
@@ -48,6 +48,17 @@ All rights reserved.
 #include "pfp/pfp.h"
 #include "pfp_app.h"        /* contains all PFP ID's */
 
+//
+// FL: Temporary code for ARM image size reduction
+//
+#include <string.h>
+#include <ti/sysbios/hal/Cache.h>
+#include <ti/sysbios/heaps/HeapMem.h>
+// Number of control bytes used in heap buffer after heap initialized by SYSBIOS before main()
+#define HEAP_CONTROL_SZ ( 8 )
+// ARM open loop delay count
+#define OPEN_LOOP_DELAY_CNT ( 10000000 )
+
 extern void BOARD_initPerfCounters();
 extern uint32_t readTime32(void);
 
@@ -59,9 +70,30 @@ Int main()
     Int status;
     Int k;
     //UInt32 tsStart, tsEnd, delta; // debug: check ARM SYS/BIOS timestamp provider
+    HeapMem_ExtendedStats heapmem_stats;
+    Ptr buf;
+    SizeT size;
     
     Log_info0("Enter main()");
 
+    // (***) FL: clear ARM dedicated heap buffers
+    // Temporary workaround to avoid including 0's in ARM image.
+    // If heaps aren't cleared:
+    //   1) DSP:ASIT: IPC state is corrupted because of incorrect memory segments for PCM2, DDP2 & THD2 beta table entries.
+    //   2) DSP:ASIT: DSP hangs in GateMP_open() inside first call to statusOp_Init().
+    HeapMem_getExtendedStats(heapMemMsmcSram, &heapmem_stats);
+    buf = (Ptr)heapmem_stats.buf+HEAP_CONTROL_SZ;
+    size = (SizeT)heapmem_stats.size-HEAP_CONTROL_SZ;
+    memset(buf, 0, size);
+    Cache_wb(buf, size, Cache_Type_ALLD, 0);
+    Cache_wait();
+    HeapMem_getExtendedStats(heapMemDdr3, &heapmem_stats);
+    buf = (Ptr)heapmem_stats.buf+HEAP_CONTROL_SZ;
+    size = (SizeT)heapmem_stats.size-HEAP_CONTROL_SZ;
+    memset(buf, 0, size);
+    Cache_wb(buf, size, Cache_Type_ALLD, 0);
+    Cache_wait();
+
 #if 0 // debug: check ARM SYS/BIOS timestamp provider
     BOARD_initPerfCounters();
 #endif
index 3f0b688248644b2e81c1f8a7a49bff043bf1ef1c..45a59506304401b62495336cbfe04f50860ebe75 100644 (file)
@@ -498,6 +498,10 @@ Int cbWriteStop(
 //Int16 gSampleCountBuf[10];
 //Int16 gCalcDeltaSampsBuf[10];
 //Int8 gPrimedFlagCnt=0;
+// debug
+//Int32 gPcmOvershootWrap1=0;
+//Int32 gPcmOvershootWrap2=0;
+//Int32 gPcmOvershootNoWrap=0;
 
 // (***) FL: revisit
 // Write audio frame to circular buffer
@@ -620,6 +624,7 @@ Int cbWriteAf(
                         ((pPcmBuf + pAfWrt->sampleCount) >= pPcmBufRd))
                     {
                         pCb->errPcmOvrCnt++;
+                        //gPcmOvershootWrap1 = pPcmBuf + pAfWrt->sampleCount - pPcmBufRd; // debug
                         pcmOvr = 1;
                     }
                     
@@ -632,6 +637,7 @@ Int cbWriteAf(
                             ((pPcmBuf + pAfWrt->sampleCount) >= pPcmBufRd))
                         {
                             pCb->errPcmOvrCnt++;
+                            //gPcmOvershootWrap2 = pPcmBuf + pAfWrt->sampleCount - pPcmBufRd; // debug
                             pcmOvr = 1;
                         }                                                                
                     }
@@ -641,6 +647,7 @@ Int cbWriteAf(
                 {
                     // this write won't wrap
                     
+                    //gPcmOvershootNoWrap = pPcmBuf + pAfWrt->sampleCount - pPcmBufRd; // debug
                     pCb->errPcmOvrCnt++;
                     pcmOvr = 1;
                 }
@@ -853,17 +860,16 @@ Int cbWriteAf(
             //    pCb->afLagIdx += 1;
             //}
             
-            // Update CB primed flag
-            // calculate number of delta samples before allowing CB read
+            // Update CB primed flag.
+            // Calculate number of delta samples before allowing CB read.
             if (pCb->primedFlag == 0)
             {
                 pCb->primedFlag = 1;
                 
-                // Calculate number of output frames to block reader.
-                // This is sample count reader waits before allowed to actually read samples from the CB.
-                //pCb->deltaSamps = (pCb->targetNDSamps - pAfWrt->sampleCount + (pCb->strFrameLen-1)) / pCb->strFrameLen * pCb->strFrameLen;
-                // FL: CB read decrements by strFrameLen and tests for >0, so rounding to strFrameLen is unnecessary
-                pCb->deltaSamps = pCb->targetNDSamps - pAfWrt->sampleCount;
+                // THD has variable number of AUs per frame. 
+                // Some frames can be quite large (e.g. 96 AUs), and delta samples calculation small or even negative.
+                // In this case, there won't be any reader hold off, and no nominal delay in the CB.
+                pCb->deltaSamps = pCb->targetNDSamps;
                 
                 // debug
                 //gSampleCountBuf[gPrimedFlagCnt] = pAfWrt->sampleCount;
@@ -872,6 +878,12 @@ Int cbWriteAf(
                 //    gPrimedFlagCnt++;
             }
 
+            // Update delta samples using number of write audio frame samples.
+            if (pCb->deltaSamps > 0)
+            {
+               pCb->deltaSamps = pCb->deltaSamps - pAfWrt->sampleCount;
+            }
+            
             // Write back circular buffer configuration
             Cache_wb(pCb, sizeof(PAF_AST_DecOpCircBuf), Cache_Type_ALLD, 0);
             // write back audio frame
@@ -900,7 +912,7 @@ Int cbWriteAf(
                        }
             Cache_wait();
 
-#if 0 // (***) FL: shows timing of CB write
+#if 0 // also for CB_RW_OP_CAP_PP (***) FL: shows timing of CB write
             // debug
             {
                 static Uint8 toggleState = 0;
index 1b12149a5224391832ef6a7f41d7e68a07aade62..23ea1dbc16442f20be61949eb94034a62a113093 100644 (file)
@@ -133,7 +133,7 @@ UInt32 gSlaveDecDeactivateCnt   =0;
 //#define CAPTURE_DECODER_OUTSAMPLES_PP
 #ifdef CAPTURE_DECODER_OUTSAMPLES_PP
 
-#define CAP_FRAME_MAX            2000
+#define CAP_FRAME_MAX            10000
 Uint32 tempCap_frameCnt = 0;
 int tempCap_decSampleOut[CAP_FRAME_MAX] = {0};
 #endif
@@ -800,6 +800,15 @@ Void taskAsdpFxn(
                         if (tempCap_frameCnt < CAP_FRAME_MAX)
                         {
                             tempCap_decSampleOut[tempCap_frameCnt] = pAfWrt->sampleCount;
+                            // alternative toggle
+                            {
+                                static Uint8 toggleState = 0;
+                                if (toggleState == 0)
+                                    GPIOSetOutput(GPIO_PORT_1, GPIO_PIN_25);
+                                else
+                                    GPIOClearOutput(GPIO_PORT_1, GPIO_PIN_25);
+                               toggleState = ~(toggleState);
+                            }
                             tempCap_frameCnt++;
                         }
                         #endif
index 6de4a2a51875992956406bb3ff394500d80e05b3..e893dad419c5c637dbc00576503f54cf508157dd 100644 (file)
@@ -444,7 +444,10 @@ const PAF_ASDT_Params asdp_params_PAi =
     PAF_ASDT_params_decodeStatus,                           // z_pDecodeStatus
     &PAF_ASP_params_decAlgKey,                              // pDecAlgKey
     PAF_AST_streamsFromDecodes_std,                         // streamsFromDecodes
-    8192,                                                   // maxFramelength set to match maximum value possible for 48K stream
+    14592,                                                  // maxFramelength set to match maximum value possible for a stream,
+                                                            // max for 192k THD:
+                                                            // 14592 = ((nearest 256 mutiple of (90AUs/frame * 160sample/AU))
+                                                            // + 256 samples remaining in wrapper from previous deccode)
     PAF_ASDT_params_MetadataBufStatus,                      //metadata buffer status
     NULL //PAF_AST_params_AudioFrameBufStatus                      //Audio frame buffer status
 };
index 00407121bec9370d4c5efdc072f9b5260d80a68d..b329f3a47527f94601ba02f2652ed314b2a3b684 100644 (file)
@@ -1,6 +1,6 @@
 
 /*
-Copyright (c) 2016, Texas Instruments Incorporated - http://www.ti.com/
+Copyright (c) 2017, Texas Instruments Incorporated - http://www.ti.com/
 All rights reserved.
 
 * Redistribution and use in source and binary forms, with or without 
index 2bbd30689537d56a7504e0476b7400fe369f08c4..86aa3e376b8f640c724f3867cebf2f6cf981af67 100644 (file)
@@ -10,5 +10,5 @@
        <createSlaveProjects value=""/>
        <templateProperties value="id=com.ti.rtsc.SYSBIOS.example_28,type=rtsc,products=com.ti.rtsc.SYSBIOS,buildProfile=release,isHybrid=true,configuroOptions=--compileOptions &quot;-g --optimize_with_debug&quot;,"/>
        <isTargetManual value="true"/>
-       <origin value="c:/ti/processor_sdk_audio_1_00_00_06/pasdk/test_dsp"/>
+       <origin value="c:/ti/processor_sdk_audio_1_01_00_00/pasdk/test_dsp"/>
 </projectOptions>
index 3d256b1ff806a393bbc9fc45e033a407cb11f3e4..00d64ecaf620fd4aa0d372cebc72b6b12d4748b4 100644 (file)
                                                                <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.JAVA_PROPERTIES.1168868732" name="Java properties (-D)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.JAVA_PROPERTIES" valueType="stringList">
                                                                        <listOptionValue builtIn="false" value="xdc.platform.custom.check=false"/>
                                                                        <listOptionValue builtIn="false" value="ProjName=pa_i13_evmk2g_c66x"/>
+                                                                       <listOptionValue builtIn="false" value="HsDevBuild=1"/>
                                                                </option>
                                                                <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS.596568674" name="Additional compiler options (--compileOptions)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS" value="&quot;-g --optimize_with_debug&quot;" valueType="string"/>
                                                        </tool>
                                                                <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.JAVA_PROPERTIES.1106143106" name="Java properties (-D)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.JAVA_PROPERTIES" valueType="stringList">
                                                                        <listOptionValue builtIn="false" value="xdc.platform.custom.check=false"/>
                                                                        <listOptionValue builtIn="false" value="ProjName=pa_i13_evmk2g_c66x"/>
+                                                                       <listOptionValue builtIn="false" value="HsDevBuild=1"/>
                                                                </option>
                                                                <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS.117771061" name="Additional compiler options (--compileOptions)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS" value="&quot;-g --optimize_with_debug&quot;" valueType="string"/>
                                                        </tool>
                                        </folderInfo>
                                        <fileInfo id="com.ti.ccstudio.buildDefinitions.C6000.Debug.2083839127.249844620.1669775220" name="sap_d10.c" rcbsApplicability="disable" resourcePath="application/itopo/evmk2g/sap_d10.c" toolsToInvoke="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.compilerDebug.475429325.1258067745">
                                                <tool id="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.compilerDebug.475429325.1258067745" name="C6000 Compiler" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.compilerDebug.475429325">
-                                                       <option id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.DIAG_SUPPRESS.2073028960" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.DIAG_SUPPRESS" valueType="stringList">
+                                                       <option id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.DIAG_SUPPRESS.2073028960" name="Suppress diagnostic &lt;id&gt; (--diag_suppress, -pds)" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.DIAG_SUPPRESS" valueType="stringList">
                                                                <listOptionValue builtIn="false" value="1934"/>
                                                                <listOptionValue builtIn="false" value="48"/>
                                                        </option>
                                                                <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.JAVA_PROPERTIES.1528336416" name="Java properties (-D)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.JAVA_PROPERTIES" valueType="stringList">
                                                                        <listOptionValue builtIn="false" value="xdc.platform.custom.check=false"/>
                                                                        <listOptionValue builtIn="false" value="ProjName=pa_i13_evmk2g_c66x"/>
+                                                                       <listOptionValue builtIn="false" value="HsDevBuild=1"/>
                                                                </option>
                                                                <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS.66964221" name="Additional compiler options (--compileOptions)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS" value="&quot;-g --optimize_with_debug&quot;" valueType="string"/>
                                                        </tool>
                                        </folderInfo>
                                        <fileInfo id="com.ti.ccstudio.buildDefinitions.C6000.Debug.2083839127.1014163727.585566165" name="sap_d10.c" rcbsApplicability="disable" resourcePath="application/itopo/evmk2g/sap_d10.c" toolsToInvoke="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.compilerDebug.1825850684.232974373">
                                                <tool id="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.compilerDebug.1825850684.232974373" name="C6000 Compiler" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.compilerDebug.1825850684">
-                                                       <option id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.DIAG_SUPPRESS.721364311" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.DIAG_SUPPRESS" valueType="stringList">
+                                                       <option id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.DIAG_SUPPRESS.721364311" name="Suppress diagnostic &lt;id&gt; (--diag_suppress, -pds)" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.DIAG_SUPPRESS" valueType="stringList">
                                                                <listOptionValue builtIn="false" value="1934"/>
                                                                <listOptionValue builtIn="false" value="48"/>
                                                        </option>
                                                                <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.JAVA_PROPERTIES.126239795" name="Java properties (-D)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.JAVA_PROPERTIES" valueType="stringList">
                                                                        <listOptionValue builtIn="false" value="xdc.platform.custom.check=false"/>
                                                                        <listOptionValue builtIn="false" value="ProjName=pa_i13_evmk2g_c66x"/>
+                                                                       <listOptionValue builtIn="false" value="HsDevBuild=1"/>
                                                                </option>
                                                                <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS.1857138411" name="Additional compiler options (--compileOptions)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS" value="&quot;-g --optimize_with_debug&quot;" valueType="string"/>
                                                        </tool>
                                        </folderInfo>
                                        <fileInfo id="com.ti.ccstudio.buildDefinitions.C6000.Debug.2083839127.1638959510.345557170" name="sap_d10.c" rcbsApplicability="disable" resourcePath="application/itopo/evmk2g/sap_d10.c" toolsToInvoke="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.compilerDebug.1963399731.1093170606">
                                                <tool id="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.compilerDebug.1963399731.1093170606" name="C6000 Compiler" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.compilerDebug.1963399731">
-                                                       <option id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.DIAG_SUPPRESS.1109469710" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.DIAG_SUPPRESS" valueType="stringList">
+                                                       <option id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.DIAG_SUPPRESS.1109469710" name="Suppress diagnostic &lt;id&gt; (--diag_suppress, -pds)" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.DIAG_SUPPRESS" valueType="stringList">
                                                                <listOptionValue builtIn="false" value="1934"/>
                                                                <listOptionValue builtIn="false" value="48"/>
                                                        </option>
                                                                <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.JAVA_PROPERTIES.1994440010" name="Java properties (-D)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.JAVA_PROPERTIES" valueType="stringList">
                                                                        <listOptionValue builtIn="false" value="xdc.platform.custom.check=false"/>
                                                                        <listOptionValue builtIn="false" value="ProjName=pa_i13_evmk2g_c66x"/>
+                                                                       <listOptionValue builtIn="false" value="HsDevBuild=1"/>
                                                                </option>
                                                                <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS.1812107894" name="Additional compiler options (--compileOptions)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS" value="&quot;-g --optimize_with_debug&quot;" valueType="string"/>
                                                        </tool>
                                        </folderInfo>
                                        <fileInfo id="com.ti.ccstudio.buildDefinitions.C6000.Debug.2083839127.249844620.50173383.1872580266" name="sap_d10.c" rcbsApplicability="disable" resourcePath="application/itopo/evmk2g/sap_d10.c" toolsToInvoke="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.compilerDebug.1457431880.359631781">
                                                <tool id="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.compilerDebug.1457431880.359631781" name="C6000 Compiler" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.compilerDebug.1457431880">
-                                                       <option id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.DIAG_SUPPRESS.445631956" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.DIAG_SUPPRESS" valueType="stringList">
+                                                       <option id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.DIAG_SUPPRESS.445631956" name="Suppress diagnostic &lt;id&gt; (--diag_suppress, -pds)" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.DIAG_SUPPRESS" valueType="stringList">
                                                                <listOptionValue builtIn="false" value="1934"/>
                                                                <listOptionValue builtIn="false" value="48"/>
                                                        </option>
                                                                <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.JAVA_PROPERTIES.1242157342" name="Java properties (-D)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.JAVA_PROPERTIES" valueType="stringList">
                                                                        <listOptionValue builtIn="false" value="xdc.platform.custom.check=false"/>
                                                                        <listOptionValue builtIn="false" value="ProjName=pa_i13_evmk2g_c66x"/>
+                                                                       <listOptionValue builtIn="false" value="HsDevBuild=1"/>
                                                                </option>
                                                                <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS.1216126854" name="Additional compiler options (--compileOptions)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS" value="&quot;-g --optimize_with_debug&quot;" valueType="string"/>
                                                        </tool>
                                        </folderInfo>
                                        <fileInfo id="com.ti.ccstudio.buildDefinitions.C6000.Debug.2083839127.1014163727.1943689599.1160621272" name="sap_d10.c" rcbsApplicability="disable" resourcePath="application/itopo/evmk2g/sap_d10.c" toolsToInvoke="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.compilerDebug.1623730924.525817858">
                                                <tool id="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.compilerDebug.1623730924.525817858" name="C6000 Compiler" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.compilerDebug.1623730924">
-                                                       <option id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.DIAG_SUPPRESS.1092170510" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.DIAG_SUPPRESS" valueType="stringList">
+                                                       <option id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.DIAG_SUPPRESS.1092170510" name="Suppress diagnostic &lt;id&gt; (--diag_suppress, -pds)" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.DIAG_SUPPRESS" valueType="stringList">
                                                                <listOptionValue builtIn="false" value="1934"/>
                                                                <listOptionValue builtIn="false" value="48"/>
                                                        </option>
                                                                <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.JAVA_PROPERTIES.1319643304" name="Java properties (-D)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.JAVA_PROPERTIES" valueType="stringList">
                                                                        <listOptionValue builtIn="false" value="xdc.platform.custom.check=false"/>
                                                                        <listOptionValue builtIn="false" value="ProjName=pa_i13_evmk2g_c66x"/>
+                                                                       <listOptionValue builtIn="false" value="HsDevBuild=1"/>
                                                                </option>
                                                                <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS.1429136493" name="Additional compiler options (--compileOptions)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.COMPILE_OPTIONS" value="&quot;-g --optimize_with_debug&quot;" valueType="string"/>
                                                        </tool>
                                        </folderInfo>
                                        <fileInfo id="com.ti.ccstudio.buildDefinitions.C6000.Debug.2083839127.1982471180.544091701" name="sap_d10.c" rcbsApplicability="disable" resourcePath="application/itopo/evmk2g/sap_d10.c" toolsToInvoke="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.compilerDebug.661803326.1607667052">
                                                <tool id="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.compilerDebug.661803326.1607667052" name="C6000 Compiler" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.compilerDebug.661803326">
-                                                       <option id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.DIAG_SUPPRESS.1302685498" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.DIAG_SUPPRESS" valueType="stringList">
+                                                       <option id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.DIAG_SUPPRESS.1302685498" name="Suppress diagnostic &lt;id&gt; (--diag_suppress, -pds)" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.DIAG_SUPPRESS" valueType="stringList">
                                                                <listOptionValue builtIn="false" value="1934"/>
                                                                <listOptionValue builtIn="false" value="48"/>
                                                        </option>
index 8365f92df7485460022fb5f91a1813350ce9de81..3902bb791edd6547323cc429719db5db75a318eb 100644 (file)
@@ -87,7 +87,7 @@ xdc.global.SrMsmcMem_cacheEnable = true;
 xdc.global.SrDDr3Mem_cacheEnable = true;
 xdc.global.SrDDr3_2Mem_cacheEnable = false;
 xdc.global.procName = "CORE0";
-/* var ipc_cfg = xdc.loadCapsule("C:/ti/processor_sdk_audio_1_00_00_06/pasdk/shared/ipc.cfg.xs"); */
+/* var ipc_cfg = xdc.loadCapsule("C:/ti/processor_sdk_audio_1_01_00_00/pasdk/shared/ipc.cfg.xs"); */
 var ipc_cfg = xdc.loadCapsule("../../shared/ipc.cfg.xs");
 
 
@@ -159,9 +159,30 @@ Program.sectMap[".systemHeap"] = "CORE0_DDR3";
 /*
  * Build a custom SYS/BIOS library from sources.
  */
-BIOS.libType = (RB ? BIOS.LibType_NonInstrumented : BIOS.LibType_Instrumented);
-// BIOS.libType = BIOS.LibType_Custom;
-// BIOS.libType = BIOS.LibType_Debug;
+var HsDevBuild = environment["HsDevBuild"];
+var hsDevBuild = (HsDevBuild == "1" ? true : false);
+if (HsDevBuild == true)
+{
+    /* HS device build */
+    /* Added per recommendation from CATAPPS-171 */  
+    BIOS.useSK = true;
+    BIOS.setupSecureContext = true;
+    BIOS.libType = BIOS.LibType_Custom;
+}
+else
+{
+    /* GP device build */
+    BIOS.libType = (RB ? BIOS.LibType_NonInstrumented : BIOS.LibType_Instrumented);
+    //BIOS.libType = BIOS.LibType_Custom;
+    //BIOS.libType = BIOS.LibType_Debug;
+}
+//BIOS.useSK = true;
+//BIOS.setupSecureContext = true;
+////BIOS.libType = BIOS.LibType_Custom;BIOS.libType = (RB ? BIOS.LibType_NonInstrumented : BIOS.LibType_Instrumented);
+//BIOS.libType = BIOS.LibType_Custom;
+//// BIOS.libType = BIOS.LibType_Debug;
 
 /* System stack size (used by ISRs and Swis) */
 Program.stack = 0x2000;
@@ -271,7 +292,7 @@ task1Params.stackSection = ".far:taskStackSectionAip";
 task1Params.arg0 = 0;
 task1Params.priority = -1; //2;
 Program.global.TaskAip = Task.create("&taskAipFxn", task1Params);
-Program.sectMap[".far:taskStackSectionAip"] = "CORE0_MSMC"; // L3RAM in pa.cfg
+Program.sectMap[".far:taskStackSectionAip"] = "CORE0_DDR3"; // L3RAM in pa.cfg
 
 /* Add Audio Stream Input Processing (ASIP) task  */
 var task2Params = new Task.Params();
@@ -283,7 +304,7 @@ task2Params.arg0 = $externPtr("asip_params_PA" + topo);
 task2Params.arg1 = $externPtr("asip_patchs_PA" + topo);
 task2Params.priority = -1; //3;
 Program.global.TaskAsip = Task.create("&taskAsipFxn", task2Params);
-Program.sectMap[".far:taskStackSectionAsip"] = "CORE0_MSMC";
+Program.sectMap[".far:taskStackSectionAsip"] = "CORE0_DDR3";
 
 /* Add Audio Stream Output Processing (ASOP) task  */
 var task3Params = new Task.Params();
@@ -295,7 +316,7 @@ task3Params.arg0 = $externPtr("asop_params_PA" + topo);
 task3Params.arg1 = $externPtr("asop_patchs_PA" + topo);
 task3Params.priority = -1; //3;
 Program.global.TaskAsop = Task.create("&taskAsopFxn", task3Params);
-Program.sectMap[".far:taskStackSectionAsop"] = "CORE0_MSMC";
+Program.sectMap[".far:taskStackSectionAsop"] = "CORE0_DDR3";
 
 /* Add System Initialization task */
 var task4Params = new Task.Params();
@@ -345,7 +366,7 @@ heapMem1Params.instance.name = "heapMemMsmcSram";
 heapMem1Params.size = 128*1024;
 heapMem1Params.sectionName = ".msmcSramHeap";
 Program.global.heapMemMsmcSram = HeapMem.create(heapMem1Params);
-Program.sectMap[".msmcSramHeap"] = "CORE0_MSMC";
+Program.sectMap[".msmcSramHeap"] = "CORE0_DDR3";
 
 /* Add DDR3 heap */ // formerly SDRAM
 var heapMem2Params = new HeapMem.Params();
index a3eff1955ce917828ec79a74ea42285380e8aa51..1bea75b2afe56d4c390d234e8bef1985b3d89ec4 100644 (file)
@@ -1,6 +1,6 @@
 
 /*
-Copyright (c) 2016, Texas Instruments Incorporated - http://www.ti.com/
+Copyright (c) 2017, Texas Instruments Incorporated - http://www.ti.com/
 All rights reserved.
 
 * Redistribution and use in source and binary forms, with or without 
@@ -114,11 +114,11 @@ unsigned int numEdma3Tc[NUM_EDMA3_INSTANCES] = {2u, 2u};
  */
 unsigned int ccXferCompInt[NUM_EDMA3_INSTANCES][EDMA3_MAX_REGIONS] = {
                                                                                                        {
-                                                                                                       0x88, 0x89, 0x8a, 0x8b,
+                                                                                                       0x06, 0x89, 0x8a, 0x8b,
                                                                                                        0x8c, 0x8d, 0x8e, 0x8f,
                                                                                                        },
                                                                                                        {
-                                                                                                       0x90, 0x91, 0x92, 0x93,
+                                                                                                       0x07, 0x91, 0x92, 0x93,
                                                                                                        0x94, 0x95, 0x96, 0x97,
                                                                                                        },
                                                                                                };
index 92dfbbfb65c7a49ac6bebe68cdd0fcdf17f0904e..8a1d201e73005396b47a9be699d3fe99cac76028 100644 (file)
@@ -656,7 +656,7 @@ const SAP_D10_Tx_Params SAP_D10_TX_DAC_12CH =
     24,                                         // precision (in bits)
     D10_sapControl,                             // control
     0x1600003F,                                 // pinMask
-    0,                                          // mode
+    (D10_MCLK_HDMI << D10_MCLK_SHIFT),          // mode
     0,0,0                                       // unused[3]
 };
 
@@ -670,7 +670,7 @@ const SAP_D10_Tx_Params SAP_D10_TX_DAC_16CH =
     24,                                         // precision (in bits)
     D10_sapControl,                             // control
     0x160000FF,                                 // pinMask
-    0,                                          // mode
+    (D10_MCLK_HDMI << D10_MCLK_SHIFT),          // mode
     0,0,0                                       // unused[3]
 };
 
index 9d04a7c4ffa17fb17a84db056524393236c583d0..0d2c6726ef2bd4d29c637124acf3fe755d7d24bf 100644 (file)
@@ -739,26 +739,15 @@ Int cbReadAf(
     //
     // Hold off read of PCM samples from CB until Nominal Delay satisfied
     //
-    //if ((pCb->primedFlag == 0) || ((pCb->primedFlag==1) && (pCb->deltaSamps > 0))
     if ((pCb->primedFlag == 0) || (pCb->deltaSamps > 0))
     {
         pCb->readAfNdCnt++;
         
-        if (pCb->primedFlag == 1)
-        {
-            pCb->deltaSamps = pCb->deltaSamps - pCb->strFrameLen;
-            
-            // debug
-            //gDeltaSampsBuf[gDeltaSampsBufIdx] = pCb->deltaSamps;
-            //if (gDeltaSampsBufIdx < 20)
-            //    gDeltaSampsBufIdx++;
-        }
-        
         cbReadMuteWithLastAfInfo(pCb, pAfRd);
         
         // Write back circular buffer configuration.
         Cache_wb(pCb, sizeof(PAF_AST_DecOpCircBuf), Cache_Type_ALLD, 0);
-        Cache_wait();    
+        Cache_wait();
         
         // Leave the gate
         GateMP_leave(gateHandle, key);
@@ -785,7 +774,7 @@ Int cbReadAf(
             cbReadMuteWithLastAfInfo(pCb, pAfRd);
             //SW_BREAKPOINT; // debug
             
-#if 0 // (***) FL: shows timing of CB underflow
+#if 0 // also for CB_RW_OP_CAP_PP (***) FL: shows timing of CB underflow
             // debug
             {
                 static Uint8 toggleState = 0;
@@ -1100,7 +1089,7 @@ Int cbReadAf(
                 // Mute output on underflow
                 cbReadMuteWithLastAfInfo(pCb, pAfRd);
                 
-#if 0 // (***) FL: shows timing of CB underflow
+#if 0 // also for CB_RW_OP_CAP_PP (***) FL: shows timing of CB underflow
                 // debug
                 {
                     static Uint8 toggleState = 0;
@@ -1143,7 +1132,7 @@ Int cbReadAf(
         // Read AF complete, update Last CB AF Info
         cbUpdateLastAfInfo(pCb, pAfRd);
 
-#if 0 // (***) FL: shows timing of successful CB read
+#if 0 // also for CB_RW_OP_CAP_PP (***) FL: shows timing of successful CB read
         {
             static Uint8 toggleState = 0;
             if (toggleState == 0)
@@ -1163,9 +1152,9 @@ Int cbReadAf(
                 pCb->cb_samples_op[pCb->cb_opCnt] = pAfRd->sampleCount;
                 pCb->cb_op_owner[pCb->cb_opCnt] = CB_OP_R;
                 // log idxs
-                pCb->cb_afRdIdx[pCb->cb_opCnt] = pCb->afRdIdx;
+                pCb->cb_afRdIdx[pCb->cb_opCnt] = (pCb->pcmRdIdx == 0) ? (pCb->afRdIdx-1) : (pCb->afRdIdx);
                 pCb->cb_afWrtIdx[pCb->cb_opCnt] = pCb->afWrtIdx;
-                pCb->cb_numAfCb[pCb->cb_opCnt] = pCb->numAfCb; // numAfCb might not be pointing to this instance
+                pCb->cb_numAfCb[pCb->cb_opCnt] = (pCb->pcmRdIdx == 0) ? (pCb->numAfCb+1) : (pCb->numAfCb); // numAfCb might not be pointing to this instance
                 pCb->cb_opCnt++;
             }
         }
index ace2a1dc98405a10cddb490c22ea6adf663454ad..e39d3b90ff2755366a8c8e46c6e3625e5d5e1886 100644 (file)
@@ -571,36 +571,77 @@ Void taskAsipFxn(
     
     // (***) FL: revisit
     // invalidate Status structures for Beta Units initialized on Slave
-    Cache_inv((Ptr)(IACP_STD_BETA_TABLE.pStatus[STD_BETA_DECODE]), sizeof(Int), Cache_Type_ALLD, 0);
-    size = IACP_STD_BETA_TABLE.pStatus[STD_BETA_DECODE]->size;
-    Cache_inv((Ptr)(IACP_STD_BETA_TABLE.pStatus[STD_BETA_DECODE]), size, Cache_Type_ALLD, 0);
-    Cache_inv((Ptr)(IACP_STD_BETA_TABLE.pStatus[STD_BETA_PCM]), sizeof(Int), Cache_Type_ALLD, 0);
-    size = IACP_STD_BETA_TABLE.pStatus[STD_BETA_PCM]->size;
-    Cache_inv((Ptr)(IACP_STD_BETA_TABLE.pStatus[STD_BETA_PCM]), size, Cache_Type_ALLD, 0);
-    Cache_inv((Ptr)(IACP_STD_BETA_TABLE.pStatus[STD_BETA_PCM2]), sizeof(Int), Cache_Type_ALLD, 0);
-    size = IACP_STD_BETA_TABLE.pStatus[STD_BETA_PCM2]->size;
-    Cache_inv((Ptr)(IACP_STD_BETA_TABLE.pStatus[STD_BETA_PCM2]), size, Cache_Type_ALLD, 0);
-    Cache_inv((Ptr)(IACP_STD_BETA_TABLE.pStatus[STD_BETA_DDP]), sizeof(Int), Cache_Type_ALLD, 0);
-    size = IACP_STD_BETA_TABLE.pStatus[STD_BETA_DDP]->size;
-    Cache_inv((Ptr)(IACP_STD_BETA_TABLE.pStatus[STD_BETA_DDP]), size, Cache_Type_ALLD, 0);
-    Cache_inv((Ptr)(IACP_STD_BETA_TABLE.pStatus[STD_BETA_DDP2]), sizeof(Int), Cache_Type_ALLD, 0);
-    size = IACP_STD_BETA_TABLE.pStatus[STD_BETA_DDP2]->size;
-    Cache_inv((Ptr)(IACP_STD_BETA_TABLE.pStatus[STD_BETA_DDP2]), size, Cache_Type_ALLD, 0);
-    Cache_inv((Ptr)(IACP_STD_BETA_TABLE.pStatus[STD_BETA_THD]), sizeof(Int), Cache_Type_ALLD, 0);
-    size = IACP_STD_BETA_TABLE.pStatus[STD_BETA_THD]->size;
-    Cache_inv((Ptr)(IACP_STD_BETA_TABLE.pStatus[STD_BETA_THD]), size, Cache_Type_ALLD, 0);
-    Cache_inv((Ptr)(IACP_STD_BETA_TABLE.pStatus[STD_BETA_THD2]), sizeof(Int), Cache_Type_ALLD, 0);
-    size = IACP_STD_BETA_TABLE.pStatus[STD_BETA_THD2]->size;
-    Cache_inv((Ptr)(IACP_STD_BETA_TABLE.pStatus[STD_BETA_THD2]), size, Cache_Type_ALLD, 0);
-    size = IACP_STD_BETA_TABLE.pStatus[STD_BETA_DTSUHDA]->size;
-    Cache_inv((Ptr)(IACP_STD_BETA_TABLE.pStatus[STD_BETA_DTSUHDA]), size, Cache_Type_ALLD, 0);
-    Cache_inv((Ptr)(IACP_STD_BETA_TABLE.pStatus[STD_BETA_AAC]), sizeof(Int), Cache_Type_ALLD, 0);
-    size = IACP_STD_BETA_TABLE.pStatus[STD_BETA_AAC]->size;
-    Cache_inv((Ptr)(IACP_STD_BETA_TABLE.pStatus[STD_BETA_AAC]), size, Cache_Type_ALLD, 0);
-    Cache_inv((Ptr)(IACP_STD_BETA_TABLE.pStatus[STD_BETA_AAC2]), sizeof(Int), Cache_Type_ALLD, 0);
-    size = IACP_STD_BETA_TABLE.pStatus[STD_BETA_AAC2]->size;
-    Cache_inv((Ptr)(IACP_STD_BETA_TABLE.pStatus[STD_BETA_AAC2]), size, Cache_Type_ALLD, 0);
-    Cache_wait();
+    //
+    if (IACP_STD_BETA_TABLE.pStatus[STD_BETA_DECODE] != NULL)
+    {
+        Cache_inv((Ptr)(IACP_STD_BETA_TABLE.pStatus[STD_BETA_DECODE]), sizeof(Int), Cache_Type_ALLD, 0);
+        size = IACP_STD_BETA_TABLE.pStatus[STD_BETA_DECODE]->size;
+        Cache_inv((Ptr)(IACP_STD_BETA_TABLE.pStatus[STD_BETA_DECODE]), size, Cache_Type_ALLD, 0);
+        Cache_wait();
+    }
+    if (IACP_STD_BETA_TABLE.pStatus[STD_BETA_PCM] != NULL)
+    {
+        Cache_inv((Ptr)(IACP_STD_BETA_TABLE.pStatus[STD_BETA_PCM]), sizeof(Int), Cache_Type_ALLD, 0);
+        size = IACP_STD_BETA_TABLE.pStatus[STD_BETA_PCM]->size;
+        Cache_inv((Ptr)(IACP_STD_BETA_TABLE.pStatus[STD_BETA_PCM]), size, Cache_Type_ALLD, 0);
+        Cache_wait();
+    }
+    if (IACP_STD_BETA_TABLE.pStatus[STD_BETA_PCM2] != NULL)
+    {
+        Cache_inv((Ptr)(IACP_STD_BETA_TABLE.pStatus[STD_BETA_PCM2]), sizeof(Int), Cache_Type_ALLD, 0);
+        size = IACP_STD_BETA_TABLE.pStatus[STD_BETA_PCM2]->size;
+        Cache_inv((Ptr)(IACP_STD_BETA_TABLE.pStatus[STD_BETA_PCM2]), size, Cache_Type_ALLD, 0);
+        Cache_wait();
+    }
+    if (IACP_STD_BETA_TABLE.pStatus[STD_BETA_DDP] != NULL)
+    {
+        Cache_inv((Ptr)(IACP_STD_BETA_TABLE.pStatus[STD_BETA_DDP]), sizeof(Int), Cache_Type_ALLD, 0);
+        size = IACP_STD_BETA_TABLE.pStatus[STD_BETA_DDP]->size;
+        Cache_inv((Ptr)(IACP_STD_BETA_TABLE.pStatus[STD_BETA_DDP]), size, Cache_Type_ALLD, 0);
+        Cache_wait();
+    }
+    if (IACP_STD_BETA_TABLE.pStatus[STD_BETA_DDP2] != NULL)
+    {
+        Cache_inv((Ptr)(IACP_STD_BETA_TABLE.pStatus[STD_BETA_DDP2]), sizeof(Int), Cache_Type_ALLD, 0);
+        size = IACP_STD_BETA_TABLE.pStatus[STD_BETA_DDP2]->size;
+        Cache_inv((Ptr)(IACP_STD_BETA_TABLE.pStatus[STD_BETA_DDP2]), size, Cache_Type_ALLD, 0);
+        Cache_wait();
+    }
+    if (IACP_STD_BETA_TABLE.pStatus[STD_BETA_THD] != NULL)
+    {
+        Cache_inv((Ptr)(IACP_STD_BETA_TABLE.pStatus[STD_BETA_THD]), sizeof(Int), Cache_Type_ALLD, 0);
+        size = IACP_STD_BETA_TABLE.pStatus[STD_BETA_THD]->size;
+        Cache_inv((Ptr)(IACP_STD_BETA_TABLE.pStatus[STD_BETA_THD]), size, Cache_Type_ALLD, 0);
+        Cache_wait();
+    }
+    if (IACP_STD_BETA_TABLE.pStatus[STD_BETA_THD2] != NULL)
+    {
+        Cache_inv((Ptr)(IACP_STD_BETA_TABLE.pStatus[STD_BETA_THD2]), sizeof(Int), Cache_Type_ALLD, 0);
+        size = IACP_STD_BETA_TABLE.pStatus[STD_BETA_THD2]->size;
+        Cache_inv((Ptr)(IACP_STD_BETA_TABLE.pStatus[STD_BETA_THD2]), size, Cache_Type_ALLD, 0);
+        Cache_wait();
+    }
+    if (IACP_STD_BETA_TABLE.pStatus[STD_BETA_DTSUHDA] != NULL)
+    {
+        Cache_inv((Ptr)(IACP_STD_BETA_TABLE.pStatus[STD_BETA_DTSUHDA]), sizeof(Int), Cache_Type_ALLD, 0);
+        size = IACP_STD_BETA_TABLE.pStatus[STD_BETA_DTSUHDA]->size;
+        Cache_inv((Ptr)(IACP_STD_BETA_TABLE.pStatus[STD_BETA_DTSUHDA]), size, Cache_Type_ALLD, 0);
+        Cache_wait();
+    }
+    if (IACP_STD_BETA_TABLE.pStatus[STD_BETA_AAC] != NULL)
+    {
+        Cache_inv((Ptr)(IACP_STD_BETA_TABLE.pStatus[STD_BETA_AAC]), sizeof(Int), Cache_Type_ALLD, 0);
+        size = IACP_STD_BETA_TABLE.pStatus[STD_BETA_AAC]->size;
+        Cache_inv((Ptr)(IACP_STD_BETA_TABLE.pStatus[STD_BETA_AAC]), size, Cache_Type_ALLD, 0);
+        Cache_wait();
+    }
+    if (IACP_STD_BETA_TABLE.pStatus[STD_BETA_AAC2] != NULL)
+    {
+        Cache_inv((Ptr)(IACP_STD_BETA_TABLE.pStatus[STD_BETA_AAC2]), sizeof(Int), Cache_Type_ALLD, 0);
+        size = IACP_STD_BETA_TABLE.pStatus[STD_BETA_AAC2]->size;
+        Cache_inv((Ptr)(IACP_STD_BETA_TABLE.pStatus[STD_BETA_AAC2]), size, Cache_Type_ALLD, 0);
+        Cache_wait();
+    }
     
 #ifdef NON_CACHE_STATUS
     // Get the shared status structure GateMP handles. Initialized at slave.
index e45912efc8f25a79aaece85b444368d06d42775f..daafbc014501680768613a4a4e7a16d6db528bbc 100644 (file)
@@ -2559,7 +2559,7 @@ PAF_ASOT_decodeEncode(
             }
             // TODO: use pC->xOut[z].pOutBuf in following ->encode call
 
-#if 0 // (***) FL: shows timing of Output Rx SIO reclaim
+#if 0 // (***) FL: shows timing of Output Tx SIO reclaim
             // (***) debug // B8
             {
                 static Uint8 toggleState = 0;
index 767eb358b78260938617302ebf3e05c92a3b4407..905b57f25e4024e4d1f59ee2a8a10af3bb89af74 100644 (file)
@@ -1,5 +1,5 @@
 set CGTROOT=C:\ti\ccsv6\tools\compiler\ti-cgt-c6000_8.1.0
-set PDK_DIR=C:\ti\processor_sdk_audio_1_00_00_06\psdk_cust\pdk_k2g_1_0_1_2_eng
+set PDK_DIR=C:\ti\processor_sdk_audio_1_01_00_00\psdk_cust\pdk_k2g_1_0_1_2_eng
 set XDAIS_DIR=C:\ti\xdais_7_24_00_04
 set BIOS_DIR=C:\ti\bios_6_45_01_29
 set XDC_DIR=C:\ti\xdctools_3_32_00_06_core
diff --git a/tools b/tools
index e968bf9305327b5984fbfec4f142cfe60ec2e3f2..c4fe12228db0aa3ea55cd2626130f45e9722c3fb 160000 (submodule)
--- a/tools
+++ b/tools
@@ -1 +1 @@
-Subproject commit e968bf9305327b5984fbfec4f142cfe60ec2e3f2
+Subproject commit c4fe12228db0aa3ea55cd2626130f45e9722c3fb