PASDK-376:Initial merge of DH & DTS:X
authorFrank Livingston <frank-livingston@ti.com>
Fri, 1 Sep 2017 02:41:23 +0000 (21:41 -0500)
committerFrank Livingston <frank-livingston@ti.com>
Fri, 1 Sep 2017 02:41:23 +0000 (21:41 -0500)
12 files changed:
1  2 
pasdk/test_arm/.cproject
pasdk/test_arm/framework/aspDecOpCircBuf_slave.c
pasdk/test_arm/framework/audioStreamDecodeProc.c
pasdk/test_arm/framework/itopo/patchs.c
pasdk/test_dsp/.cproject
pasdk/test_dsp/application/app.cfg
pasdk/test_dsp/application/itopo/evmk2g/alpha/i13_a.h
pasdk/test_dsp/application/itopo/evmk2g/atboot.c
pasdk/test_dsp/framework/audioStreamInpProc.c
pasdk/test_dsp/framework/itopo/patchs.c
scripts/build_ccs_projects.bat
tools

index 7b6964bf22508bc7f1834bffaed9285a5f33695b,d3c8e75269aa1f1e2522c0151d917068c4921a71..e5aef4731c3401b754fd26d7c9334cb748d4956b
                                                </tool>
                                        </fileInfo>
                                        <sourceEntries>
-                                               <entry excluding="common/components/clk.c|application/src|src" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
 -                                              <entry excluding="common/components/clk.c|application/app_pkgs.cmd|application/src|src" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
++                                              <entry excluding="application/app_dtsx.cmd|common/components/clk.c|application/src|src" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
                                        </sourceEntries>
                                </configuration>
                        </storageModule>
                                        <stringMacro name="AIF2_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="CSL_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="MMCSD_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="PDK_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti/processor_audio_sdk_1_00_00_05/psdk_cust/pdk_k2g_1_0_1_2_eng/packages"/>
                                        <stringMacro name="ICSS_EMAC_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
 -                                      <stringMacro name="PDK_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti/pdk_k2g_1_0_6/packages"/>
++                                      <stringMacro name="PDK_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti/processor_audio_sdk_1_00_00_05/psdk_cust/pdk_k2g_1_0_1_2_eng/packages"/>
                                        <stringMacro name="USB_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="I2C_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="CPPI_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                                </toolChain>
                                        </folderInfo>
                                        <sourceEntries>
-                                               <entry excluding="application/app_pkgs.cmd|application/src|src" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
 -                                              <entry excluding="application/src|src" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
++                                              <entry excluding="application/app_dtsx.cmd|application/app_pkgs.cmd|application/src|src" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
                                        </sourceEntries>
                                </configuration>
                        </storageModule>
index 9a18688e098ab51cef2595bbfcbf052c54fef664,1c6d608e8c9acb3779acf14d2388a8aa2c202850..3c319db135e11e194b7ea8f0a2db43374e500d6c
@@@ -53,18 -53,25 +53,41 @@@ All rights reserved
  #include <pcm.h>
  #include <pcm_mds.h>
  
 -//#define _DDPAT_
++#ifdef DTS_BUILD
++//
++// DTS build
++//
++#define _DTS_
++
++#else
++//
++// DH build
++//
++
 +#define _DDPAT_
++#define _THD_
++    
++#endif
++
++//#define _SRC4_
++
++
++
  #ifdef _DDPAT_
  #include <ddpat.h>
  #include <ddpat_tid.h>
  #endif
  
- #define _THD_
 -//#define _THD_
  #ifdef _THD_
  #include <thd.h>
  #include <thd_tid.h>
  #endif
- //#define _SRC4_
 -#define _DTS_
+ #ifdef _DTS_
+ #include <dtsuhda.h>
+ #include <dtsuhda_tid.h>
+ #endif
 -//#define _SRC4_
  #ifdef _SRC4_
  #include <src.h>
  #include <src_tih.h>
index e46a327db43197ce276bd808b610d028db302b43,559ba308120ca5a1dd01db8a6e5f2126f579d9e2..f127cb673623463f08da59bcae761c664b4ef6a3
                                                </tool>
                                        </fileInfo>
                                        <sourceEntries>
-                                               <entry excluding="common/components/clk.c|sio/dap|sio/dbgDob.c|framework/fwkSim.c|application/app_pkgs.cmd|boards|src|application/src" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
 -                                              <entry excluding="application/app.cmd|common/components/clk.c|sio/dap|sio/dbgDob.c|framework/fwkSim.c|application/app_pkgs.cmd|boards|src|application/src" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
++                                              <entry excluding="application/app_dtsx.cmd|common/components/clk.c|sio/dap|sio/dbgDob.c|framework/fwkSim.c|application/app_pkgs.cmd|boards|src|application/src" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
                                        </sourceEntries>
                                </configuration>
                        </storageModule>
                                                                        <listOptionValue builtIn="false" value="1934"/>
                                                                        <listOptionValue builtIn="false" value="48"/>
                                                                </option>
 -                                                              <inputType id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__C_SRCS.1824732127" name="C Sources" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__C_SRCS"/>
 -                                                              <inputType id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__CPP_SRCS.1665883168" name="C++ Sources" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__CPP_SRCS"/>
 -                                                              <inputType id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__ASM_SRCS.653362611" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__ASM_SRCS"/>
 -                                                              <inputType id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__ASM2_SRCS.1440852321" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__ASM2_SRCS"/>
 +                                                              <inputType id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__C_SRCS.1078859754" name="C Sources" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__C_SRCS"/>
 +                                                              <inputType id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__CPP_SRCS.1560325728" name="C++ Sources" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__CPP_SRCS"/>
 +                                                              <inputType id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__ASM_SRCS.1604638528" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__ASM_SRCS"/>
 +                                                              <inputType id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__ASM2_SRCS.228175291" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__ASM2_SRCS"/>
                                                        </tool>
 -                                                      <tool id="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.linkerDebug.204160850" name="C6000 Linker" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.linkerDebug.928583158"/>
 -                                                      <tool id="com.ti.ccstudio.buildDefinitions.C6000_8.1.hex.1295458366" name="C6000 Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.hex.705932720"/>
 -                                                      <tool id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.1963852953" name="XDCtools" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.2018514191"/>
 +                                                      <tool id="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.linkerDebug.760811549" name="C6000 Linker" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.linkerDebug.1752751650"/>
 +                                                      <tool id="com.ti.ccstudio.buildDefinitions.C6000_8.1.hex.473021937" name="C6000 Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.hex.797693098"/>
 +                                                      <tool id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.775885737" name="XDCtools" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.845143209"/>
                                                </toolChain>
                                        </folderInfo>
 -                                      <folderInfo id="com.ti.ccstudio.buildDefinitions.C6000.Debug.2083839127.1924763286.common" name="/" resourcePath="common">
 -                                              <toolChain id="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.DebugToolchain.2121879146" name="TI Build Tools" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.DebugToolchain" unusedChildren="">
 -                                                      <option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.1997130179.38556327.1127455731" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.1997130179"/>
 -                                                      <option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.717751810.355153927.698910806" name="Compiler version" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.717751810"/>
 -                                                      <targetPlatform id="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.targetPlatformDebug.897140182" name="Platform" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.targetPlatformDebug"/>
 -                                                      <tool id="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.compilerDebug.1293862301" name="C6000 Compiler" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.compilerDebug.423813254">
 -                                                              <inputType id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__C_SRCS.746964485" name="C Sources" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__C_SRCS"/>
 -                                                              <inputType id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__CPP_SRCS.956460121" name="C++ Sources" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__CPP_SRCS"/>
 -                                                              <inputType id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__ASM_SRCS.818534177" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__ASM_SRCS"/>
 -                                                              <inputType id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__ASM2_SRCS.1250391507" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__ASM2_SRCS"/>
 +                                      <fileInfo id="com.ti.ccstudio.buildDefinitions.C6000.Debug.2083839127.249844620.1567619021" name="sap.c" rcbsApplicability="disable" resourcePath="sap/sap.c" toolsToInvoke="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.compilerDebug.197097673.1469578356">
 +                                              <tool id="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.compilerDebug.197097673.1469578356" name="C6000 Compiler" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.compilerDebug.197097673">
 +                                                      <option id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.OPT_LEVEL.1412019603" name="Optimization level (--opt_level, -O)" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.OPT_LEVEL" value="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.OPT_LEVEL.3" valueType="enumerated"/>
 +                                                      <inputType id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__C_SRCS.94022499" name="C Sources" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__C_SRCS"/>
 +                                                      <inputType id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__CPP_SRCS.1676883303" name="C++ Sources" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__CPP_SRCS"/>
 +                                                      <inputType id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__ASM_SRCS.366168810" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__ASM_SRCS"/>
 +                                                      <inputType id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__ASM2_SRCS.1237856306" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__ASM2_SRCS"/>
 +                                              </tool>
 +                                      </fileInfo>
 +                                      <folderInfo id="com.ti.ccstudio.buildDefinitions.C6000.Debug.2083839127.249844620.common" name="/" resourcePath="common">
 +                                              <toolChain id="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.DebugToolchain.2093052442" name="TI Build Tools" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.DebugToolchain" unusedChildren="">
 +                                                      <option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.1997130179.38556327.52846953" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.1997130179"/>
 +                                                      <option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.717751810.355153927.186663977" name="Compiler version" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.717751810"/>
 +                                                      <targetPlatform id="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.targetPlatformDebug.1085674756" name="Platform" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.targetPlatformDebug"/>
 +                                                      <tool id="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.compilerDebug.1799917885" name="C6000 Compiler" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.compilerDebug.106674691">
 +                                                              <inputType id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__C_SRCS.1901774989" name="C Sources" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__C_SRCS"/>
 +                                                              <inputType id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__CPP_SRCS.1916544199" name="C++ Sources" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__CPP_SRCS"/>
 +                                                              <inputType id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__ASM_SRCS.1144413061" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__ASM_SRCS"/>
 +                                                              <inputType id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__ASM2_SRCS.1528722511" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__ASM2_SRCS"/>
                                                        </tool>
 -                                                      <tool id="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.linkerDebug.1301984638" name="C6000 Linker" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.linkerDebug.928583158"/>
 -                                                      <tool id="com.ti.ccstudio.buildDefinitions.C6000_8.1.hex.1021401126" name="C6000 Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.hex.705932720"/>
 -                                                      <tool id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.31232571" name="XDCtools" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.2018514191"/>
 +                                                      <tool id="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.linkerDebug.1030662957" name="C6000 Linker" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.linkerDebug.1752751650"/>
 +                                                      <tool id="com.ti.ccstudio.buildDefinitions.C6000_8.1.hex.199758612" name="C6000 Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.hex.797693098"/>
 +                                                      <tool id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.1054468248" name="XDCtools" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.845143209"/>
                                                </toolChain>
                                        </folderInfo>
 +                                      <fileInfo id="com.ti.ccstudio.buildDefinitions.C6000.Debug.2083839127.249844620.common/pfp/pfp.c" name="pfp.c" rcbsApplicability="disable" resourcePath="common/pfp/pfp.c" toolsToInvoke="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.compilerDebug.1238766202">
 +                                              <tool id="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.compilerDebug.1238766202" name="C6000 Compiler" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.compilerDebug.1799917885">
 +                                                      <option id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.OPT_LEVEL.1531773689" name="Optimization level (--opt_level, -O)" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.OPT_LEVEL" value="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.OPT_LEVEL.3" valueType="enumerated"/>
 +                                                      <inputType id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__C_SRCS.1556830013" name="C Sources" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__C_SRCS"/>
 +                                                      <inputType id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__CPP_SRCS.2130741427" name="C++ Sources" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__CPP_SRCS"/>
 +                                                      <inputType id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__ASM_SRCS.576433957" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__ASM_SRCS"/>
 +                                                      <inputType id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__ASM2_SRCS.1467997897" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__ASM2_SRCS"/>
 +                                              </tool>
 +                                      </fileInfo>
 +                                      <fileInfo id="com.ti.ccstudio.buildDefinitions.C6000.Debug.2083839127.249844620.543350190" name="mib.c" rcbsApplicability="disable" resourcePath="mib/mib.c" toolsToInvoke="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.compilerDebug.106674691.984972002">
 +                                              <tool id="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.compilerDebug.106674691.984972002" name="C6000 Compiler" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.compilerDebug.106674691">
 +                                                      <option id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.OPT_LEVEL.53836185" name="Optimization level (--opt_level, -O)" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.OPT_LEVEL" value="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.OPT_LEVEL.3" valueType="enumerated"/>
 +                                                      <inputType id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__C_SRCS.622075618" name="C Sources" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__C_SRCS"/>
 +                                                      <inputType id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__CPP_SRCS.1922876896" name="C++ Sources" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__CPP_SRCS"/>
 +                                                      <inputType id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__ASM_SRCS.376443321" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__ASM_SRCS"/>
 +                                                      <inputType id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__ASM2_SRCS.1607701921" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__ASM2_SRCS"/>
 +                                              </tool>
 +                                      </fileInfo>
                                        <sourceEntries>
-                                               <entry excluding="common/components/clk.c|sio/dap|sio/dbgDob.c|framework/fwkSim.c|application/app_pkgs.cmd|boards|src|application/src" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
 -                                              <entry excluding="application/app.cmd|boards|src|application/src" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
++                                              <entry excluding="application/app_dtsx.cmd|common/components/clk.c|sio/dap|sio/dbgDob.c|framework/fwkSim.c|application/app_pkgs.cmd|boards|src|application/src" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
                                        </sourceEntries>
                                </configuration>
                        </storageModule>
                                                </tool>
                                        </fileInfo>
                                        <sourceEntries>
-                                               <entry excluding="common/components/clk.c|sio/dap|sio/dbgDob.c|framework/fwkSim.c|boards|src|application/src" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
 -                                              <entry excluding="application/app.cmd|common/components/clk.c|sio/dap|sio/dbgDob.c|framework/fwkSim.c|application/app_pkgs.cmd|boards|src|application/src" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
++                                              <entry excluding="application/app_dtsx.cmd|common/components/clk.c|sio/dap|sio/dbgDob.c|framework/fwkSim.c|boards|src|application/src" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
                                        </sourceEntries>
                                </configuration>
                        </storageModule>
Simple merge
index 55368b74c491397489c44fd0cbfd236680e7adea,08f3cdef898bae4978fb5a5b7bf0e0bdedcd98b6..5e5fc07413d845cdc7c0a4c1412cb67c2b0f1c93
@@@ -57,11 -57,13 +57,18 @@@ All rights reserved
  #include <ae_a.h>
  #include <ml_a.h>
  #include <src_a.h>
 -//#include <ddpat_a.h>
 -//#include <thd_a.h>
 -//#include <car_a.h>
 -//#include <oar_a.h>
 -//#include <bmda_a.h>
 -//#include <dap_a.h>
++#include <pafdecopcb_a.h>
++
++#ifndef DTS_BUILD
 +#include <ddpat_a.h>
 +#include <thd_a.h>
 +#include <car_a.h>
 +#include <oar_a.h>
 +#include <bmda_a.h>
- //#include <dap_a.h>
- #include <pafdecopcb_a.h>
++#else
++
+ #include <dtsuhda_a.h>
+ #include <dtsuhdb_a.h>
 -#include <pafdecopcb_a.h>
++#endif
++
  #endif /* _I13_A_H_ */
index 2b0bdf0649ff8dee2dda65de98593aa29572634e,f78d2a8d1d5f8bb04ebee5f5ae3eb73c10571c71..b20d170c3cccef8db5b2d9b88b604d3b72ce46b5
@@@ -48,6 -48,22 +48,24 @@@ All rights reserved
  
  #include "dbgBenchmark.h" // PCM high-sampling rate + SRC + CAR benchmarking
  
++#ifdef DTS_BUILD
+ #define DTS_ATBOOT_CFG 1
++#endif
+ #ifdef DTS_ATBOOT_CFG    
+ //DTS_ATBOOT_CFG
+ #define CUS_ATBOOT_S \
+       writeDECChannelMapTo16(PAF_LEFT,PAF_RGHT,8,9,2,12,10,11,-3,-3,-3,-3,-3,-3,-3,-3), \
+       writeENCChannelMapFrom16(PAF_LEFT,PAF_RGHT,8,9,2,12,10,11,-3,-3,-3,-3,-3,-3,-3,-3), \
+       writeVOLControlMasterN(0), \
+       writeVOLOffsetMasterN(0x7fff), \
+       writeSYSRecreationModeDirect, \
+       writeSYSChannelConfigurationRequestSurround4_1, \
+       execPAIOutAnalog, \
+       execPAIInHDMIStereo
+ #else 
+ //Not DTS_ATBOOT_CFG
  #ifndef DDP_ATBOOT_CFG
  //
  // NOT DDP at-boot configuration
index c0bc563839d0cc8376210f5094cceeb1dcb6fa23,62b57c8ca833a83287535e1ff3b99024f42a124b..a0fd61bd012a21479ef6ad8089e53ba133ff2d72
@@@ -48,18 -48,19 +48,28 @@@ All rights reserved
  
  #include "dbgBenchmark.h" // PCM high-sampling rate + SRC + CAR benchmarking
  
++#ifdef DTS_BUILD
++//
++// DTS build
++//
++#define _DTS_
++
++#else
++//
++// DH build
++//
++    
  #ifndef _ENABLE_BENCHMARK_PCMHSR_SRC_CAR_
  //
  // NOT performing PCM high-sampling rate + SRC + CAR benchmarking
  //
  
  //#define _AE0_
 -//#define _SRC4_
 -//#define _CAR_
 -//#define _OAR_
 -//#define _DAP_
 -//#define _BMDA_
 +#define _SRC4_
 +#define _CAR_
 +#define _OAR_
- //#define _DAP_
 +#define _BMDA_
  //#define _ML0_
 -#define _DTS_
  
  #else // _ENABLE_BENCHMARK_PCMHSR_SRC_CAR_
  //
  //
  
  //#define _AE0_
 -//#define _SRC4_
 -//#define _CAR_
 +#define _SRC4_
 +#define _CAR_
  //#define _OAR_
--//#define _DAP_
 -//#define _BMDA_
 +#define _BMDA_
  //#define _ML0_
 -#define _DTS_
  
  #endif // _ENABLE_BENCHMARK_PCMHSR_SRC_CAR_
++    
++#endif
++
  
  
  //
  #include <oar_tig.h>
  #endif
  
--#ifdef _DAP_
--#include <dap.h>
--#include <dap_tig.h>
--#endif
--
  #ifdef _BMDA_
  #include <bmda.h>
  #include <bmda_tig.h>
  #include <ml.h>
  #include <ml_mds.h>
  #endif
 +
+ #ifdef _DTS_
+ #include <dtsuhdb.h>
+ #include <dtsuhdb_mds.h>
+ #endif
  const PAF_ASP_LinkInit aspLinkInitAllI13[] =
  {
  #ifdef _AE0_
      PAF_ASP_LINKINIT(STD, OAR, TIG),
  #endif
  
--#ifdef _DAP_
--    PAF_ASP_LINKINIT(STD, DAP, TIG),
--#endif
--
  #ifdef _BMDA_
      PAF_ASP_LINKINIT(STD, BMDA, TIG),
  #endif
++
+ #ifdef _DTS_
+     PAF_ASP_LINKINIT(STD, DTSUHDB, MDS),
+ #endif
      PAF_ASP_LINKNONE,
  };
  
@@@ -189,10 -198,10 +201,6 @@@ const PAF_ASP_LinkInit aspLinkInitStdI1
      PAF_ASP_LINKINIT(STD, OAR, TIG),
  #endif
  
--#ifdef _DAP_
--    PAF_ASP_LINKINIT(STD, DAP, TIG),
--#endif
--
  #ifdef _BMDA_
      PAF_ASP_LINKINIT(STD, BMDA, TIG),
  #endif
index 10b7c09ca7c766e372b61518be9093b219e2d0f9,20ccef61a35c9ccb16bce15a705e9d5bb86b2935..dc1e87ec26a115db062b42b20a81006cee141d25
@@@ -35,23 -35,23 +35,38 @@@ if "%1"=="Release" goto SetBuildProfile
  
  :: Set build profiles for SDF
  ::set PDK_PLATFORM_LIB_BUILD_PROFILE=Debug
 -set ARM_APP_BUILD_PROFILE=Debug_DTSX_IPPkgs
 -set DSP_APP_BUILD_PROFILE=Debug_DTSX_IPPkgs
++rem <<<<<<< HEAD
 +set ARM_APP_BUILD_PROFILE=Debug_DH_IPPkgs
 +set DSP_APP_BUILD_PROFILE=Debug_DH_IPPkgs
++rem =======
++rem set ARM_APP_BUILD_PROFILE=Debug_DTSX_IPPkgs
++rem set DSP_APP_BUILD_PROFILE=Debug_DTSX_IPPkgs
++rem >>>>>>> origin/dev_pasdk_frank_pasdk379Beta3Release
  goto build_ccs_projects
  
  :SetBuildProfilesDebug
  :: Set build profiles for debug
  ::set PDK_PLATFORM_LIB_BUILD_PROFILE=Debug
 -set ARM_APP_BUILD_PROFILE=Debug_DTSX
 -set DSP_APP_BUILD_PROFILE=Debug_DTSX
++rem <<<<<<< HEAD
 +set ARM_APP_BUILD_PROFILE=Debug_DH
 +set DSP_APP_BUILD_PROFILE=Debug_DH
++rem =======
++rem set ARM_APP_BUILD_PROFILE=Debug_DTSX
++rem set DSP_APP_BUILD_PROFILE=Debug_DTSX
++rem >>>>>>> origin/dev_pasdk_frank_pasdk379Beta3Release
  goto build_ccs_projects
  
  :SetBuildProfilesRelease
  :: Set build profiles for release
  :: FL: currently we only have a "Release" profile for the DSP
  ::set PDK_PLATFORM_LIB_BUILD_PROFILE=Debug
 -set ARM_APP_BUILD_PROFILE=Debug_DTSX
 -set DSP_APP_BUILD_PROFILE=Release_DTSX
++rem <<<<<<< HEAD
 +set ARM_APP_BUILD_PROFILE=Debug_DH
 +set DSP_APP_BUILD_PROFILE=Release_DH
++rem =======
++rem set ARM_APP_BUILD_PROFILE=Debug_DTSX
++rem set DSP_APP_BUILD_PROFILE=Release_DTSX
++rem >>>>>>> origin/dev_pasdk_frank_pasdk379Beta3Release
  
  
  :build_ccs_projects
diff --cc tools
index 18f010815af7c0ddca06bd6fb67e1a67f095736c,e2cb6ff14ef6cab6ce2ffe658c24d133cf6f1244..7c774085f59807d922509d08c8c80109a41e6130
--- 1/tools
--- 2/tools
+++ b/tools
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 18f010815af7c0ddca06bd6fb67e1a67f095736c
 -Subproject commit e2cb6ff14ef6cab6ce2ffe658c24d133cf6f1244
++Subproject commit 7c774085f59807d922509d08c8c80109a41e6130