From 0a11e8dfd514fbbfe51fc4d9a23b7c81c0f5f232 Mon Sep 17 00:00:00 2001
From: Frank Livingston <frank-livingston@ti.com>
Date: Thu, 1 Sep 2016 11:15:31 -0500
Subject: [PATCH] Add DDP to ARM, remove AE0 from DSP

---
 .../pasdk/test_arm/.cproject                  | 27 +++++++++++--------
 .../pasdk/test_arm/application/app.cmd        | 10 +++----
 .../pasdk/test_arm/framework/itopo/patchs.c   |  5 ++--
 .../pasdk/test_dsp/framework/itopo/patchs.c   |  2 +-
 4 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/processor_audio_sdk_1_00_00_00/pasdk/test_arm/.cproject b/processor_audio_sdk_1_00_00_00/pasdk/test_arm/.cproject
index 701672f0..3bf6d894 100644
--- a/processor_audio_sdk_1_00_00_00/pasdk/test_arm/.cproject
+++ b/processor_audio_sdk_1_00_00_00/pasdk/test_arm/.cproject
@@ -11,8 +11,8 @@
 					<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="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_1/packages"/>
+					<stringMacro name="ICSS_EMAC_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
 					<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"/>
@@ -28,13 +28,13 @@
 					<stringMacro name="IQN_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
 					<stringMacro name="PKTLIB_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
 					<stringMacro name="SRIO_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-					<stringMacro name="DFE_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
 					<stringMacro name="PRUSS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-					<stringMacro name="SBL_BOOT_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-					<stringMacro name="FATFS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+					<stringMacro name="DFE_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
 					<stringMacro name="UART_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-					<stringMacro name="NWAL_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+					<stringMacro name="FATFS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+					<stringMacro name="SBL_BOOT_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
 					<stringMacro name="BOARD_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+					<stringMacro name="NWAL_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
 					<stringMacro name="SPI_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
 				</macros>
 				<externalSettings/>
@@ -165,7 +165,12 @@
 						<toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.exe.DebugToolchain.469116147" name="TI Build Tools" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.exe.DebugToolchain" unusedChildren="">
 							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.1822087327.704097804" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.1822087327"/>
 							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.1106749875.1997196583" name="Compiler version" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.1106749875"/>
-							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.exe.compilerDebug.1212267112" name="GNU Compiler" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.exe.compilerDebug.1227706836"/>
+							<targetPlatform id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.exe.targetPlatformDebug" name="Platform" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.exe.targetPlatformDebug"/>
+							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.exe.compilerDebug.1212267112" name="GNU Compiler" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.exe.compilerDebug.1227706836">
+								<inputType id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compiler.inputType__C_SRCS.1380961088" 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.1628619286" 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.34099253" name="Assembly Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compiler.inputType__ASM_SRCS"/>
+							</tool>
 							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.exe.linkerDebug.1059227636" name="GNU Linker" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.exe.linkerDebug.1772732929"/>
 							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.hex.872105449" name="GNU Objcopy Utility" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.hex.578276684"/>
 							<tool id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.1926416484" name="XDCtools" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.1108422400"/>
@@ -188,8 +193,8 @@
 					<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="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_1/packages"/>
+					<stringMacro name="ICSS_EMAC_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
 					<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"/>
@@ -205,13 +210,13 @@
 					<stringMacro name="IQN_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
 					<stringMacro name="PKTLIB_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
 					<stringMacro name="SRIO_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-					<stringMacro name="DFE_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
 					<stringMacro name="PRUSS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-					<stringMacro name="SBL_BOOT_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-					<stringMacro name="FATFS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+					<stringMacro name="DFE_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
 					<stringMacro name="UART_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-					<stringMacro name="NWAL_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+					<stringMacro name="FATFS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+					<stringMacro name="SBL_BOOT_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
 					<stringMacro name="BOARD_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+					<stringMacro name="NWAL_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
 					<stringMacro name="SPI_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
 				</macros>
 				<externalSettings/>
diff --git a/processor_audio_sdk_1_00_00_00/pasdk/test_arm/application/app.cmd b/processor_audio_sdk_1_00_00_00/pasdk/test_arm/application/app.cmd
index e1f47751..f34af217 100644
--- a/processor_audio_sdk_1_00_00_00/pasdk/test_arm/application/app.cmd
+++ b/processor_audio_sdk_1_00_00_00/pasdk/test_arm/application/app.cmd
@@ -33,14 +33,14 @@ All rights reserved.
 */
 
 SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_00\pasdk\paf\pa\build\a15\release )
-/* SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_00\pasdk\intrinsics\Dolby_Intrinsics_Imp\lib_float_A15 ) */
-/* SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_00\pasdk\ddp\Dolby_Digital_Plus_Decoder_Imp\Source_Code\make\ddp_udc_lib\a15 ) */
-/* SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_00\pasdk\ddp\Dolby_Digital_Plus_Decoder_Imp\Source_Code\make\ddp_udc_wrapper\a15 ) */
+SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_00\pasdk\intrinsics\Dolby_Intrinsics_Imp\lib_float_A15 )
+SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_00\pasdk\ddp\Dolby_Digital_Plus_Decoder_Imp\Source_Code\make\ddp_udc_lib\a15 )
+SEARCH_DIR ( C:\ti\processor_audio_sdk_1_00_00_00\pasdk\ddp\Dolby_Digital_Plus_Decoder_Imp\Source_Code\make\ddp_udc_wrapper\a15 )
 
 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  )
-/* INPUT ( dlb_intrinsics_generic_float32_release.a ) */
-/* INPUT ( ddp_dec_lib_generic_wrapper_release.a ddp_dec_lib_generic_float32_release.a ) */
+INPUT ( dlb_intrinsics_generic_float32_release.a )
+INPUT ( ddp_dec_lib_generic_wrapper_release.a ddp_dec_lib_generic_float32_release.a )
 
 SECTIONS
 {
diff --git a/processor_audio_sdk_1_00_00_00/pasdk/test_arm/framework/itopo/patchs.c b/processor_audio_sdk_1_00_00_00/pasdk/test_arm/framework/itopo/patchs.c
index 7e2e0100..f5831920 100644
--- a/processor_audio_sdk_1_00_00_00/pasdk/test_arm/framework/itopo/patchs.c
+++ b/processor_audio_sdk_1_00_00_00/pasdk/test_arm/framework/itopo/patchs.c
@@ -52,14 +52,13 @@ All rights reserved.
 #include <pcm.h>
 #include <pcm_mds.h>
 
-//#define _DDPAT_
-//#define _SRC4_
-
+#define _DDPAT_
 #ifdef _DDPAT_
 #include <ddpat.h>
 #include <ddpat_tid.h>
 #endif
 
+//#define _SRC4_
 #ifdef _SRC4_
 #include <src.h>
 #include <src_tih.h>
diff --git a/processor_audio_sdk_1_00_00_00/pasdk/test_dsp/framework/itopo/patchs.c b/processor_audio_sdk_1_00_00_00/pasdk/test_dsp/framework/itopo/patchs.c
index cc359227..7f8b3dc6 100644
--- a/processor_audio_sdk_1_00_00_00/pasdk/test_dsp/framework/itopo/patchs.c
+++ b/processor_audio_sdk_1_00_00_00/pasdk/test_dsp/framework/itopo/patchs.c
@@ -73,7 +73,7 @@ const PAF_ASP_LinkInit *const patchs_decLinkInit[] =
 
 #include <aspstd.h>
 
-#define _AE0_
+//#define _AE0_
 #ifdef _AE0_
 #include <ae.h>
 #include <ae_mds.h>
-- 
2.26.2