Initial CAR integration (256 kB L2).
authorFrank Livingston <frank-livingston@ti.com>
Thu, 22 Sep 2016 19:34:43 +0000 (14:34 -0500)
committerFrank Livingston <frank-livingston@ti.com>
Thu, 22 Sep 2016 19:34:43 +0000 (14:34 -0500)
processor_audio_sdk_1_00_00_00/pasdk/test_dsp/.cproject
processor_audio_sdk_1_00_00_00/pasdk/test_dsp/application/app.cfg
processor_audio_sdk_1_00_00_00/pasdk/test_dsp/application/app.cmd
processor_audio_sdk_1_00_00_00/pasdk/test_dsp/application/itopo/evmk2g/alpha/i13_a.h
processor_audio_sdk_1_00_00_00/pasdk/test_dsp/application/itopo/evmk2g/atboot.c
processor_audio_sdk_1_00_00_00/pasdk/test_dsp/framework/itopo/patchs.c

index 9516ae02d722075edb0bf7c58454dc02de408189..cb885db25eb0604b6f00d6f2e72ab78ba55ca8b7 100644 (file)
@@ -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="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="PDK_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti/pdk_k2g_1_0_1/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"/>
                                        <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="PRUSS_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="SBL_BOOT_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="PRUSS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="FATFS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="BOARD_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="SBL_BOOT_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="BOARD_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="SPI_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                </macros>
                                <externalSettings/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/shared&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/test_dsp/boards/k2g/drivers&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/ddp/Dolby_Digital_Plus_Decoder_Imp/Source_Code/alpha&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/oar/Source_Code&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/oar/Source_Code/alg&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/oar/Source_Code/alpha&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/car/Source_Code&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/car/Source_Code/alg&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/car/Source_Code/alpha&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/dap/Dolby_Audio_Processing_Home_Theatre_Imp/Source_Code&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/dap/Dolby_Audio_Processing_Home_Theatre_Imp/Source_Code/alg&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/dap/Dolby_Audio_Processing_Home_Theatre_Imp/Source_Code/alpha&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/dap/Dolby_Audio_Processing_Home_Theatre_Imp/Source_Code&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/oar/Source_Code/alg&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/oar/Source_Code&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/bmda/Source_Code/alpha&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/bmda/Source_Code/alg&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/bmda/Source_Code&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/bmda/Source_Code/alg&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/bmda/Source_Code/alpha&quot;"/>
                                                                </option>
                                                                <option id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.ABI.1329388145" name="Application binary interface (coffabi not supported) [See 'General' page to edit] (--abi)" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.ABI" value="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.ABI.eabi" valueType="enumerated"/>
                                                                <option id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.MEM_MODEL__DATA.1734581769" name="Data access model (--mem_model:data)" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.MEM_MODEL__DATA" value="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.MEM_MODEL__DATA.far_aggregates" valueType="enumerated"/>
                                        <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/pdk_k2g_1_0_1/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_1/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"/>
                                        <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="PRUSS_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="SBL_BOOT_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="PRUSS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="FATFS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="BOARD_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="SBL_BOOT_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="BOARD_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="SPI_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                </macros>
                                <externalSettings/>
                                        <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="IQN2_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <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="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="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="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="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/>
                                        <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/pdk_k2g_1_0_1/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_1/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"/>
                                        <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="PRUSS_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="SBL_BOOT_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="PRUSS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="FATFS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="BOARD_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="SBL_BOOT_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="BOARD_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="SPI_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                </macros>
                                <externalSettings/>
index 4bbeb6b5a56bee70d2082a7d6180a0f17d2c51f8..1312f89c9b248a62232b48dd1ac2ad7097c29c28 100644 (file)
@@ -182,7 +182,7 @@ LoggingSetup.sysbiosHwiLogging = false; // true
 LoggingSetup.loadLogging = false; //true;
 LoggingSetup.mainLogging = true;
 LoggingSetup.mainLoggingRuntimeControl = false;
-LoggingSetup.mainLoggerSize = 81960;
+LoggingSetup.mainLoggerSize = 327680; //81960;
 //LoggingSetup.memorySectionName = "CORE0_DDR3"; //"CORE0_MSMC";
 
 /* Configure Load Logging */ // FL: doesn't work
@@ -352,7 +352,7 @@ Idle.idleFxns[2] = "&idleNotifyInfoChange"; // Idle function for Notify Informat
 /* Add L2 SRAM heap */ // formerly IRAM
 var heapMem0Params = new HeapMem.Params();
 heapMem0Params.instance.name = "heapMemL2Sram";
-heapMem0Params.size = 96000; // from pa.cfg
+heapMem0Params.size = 256*1024; // 96000; // from pa.cfg
 heapMem0Params.sectionName = ".l2SramHeap";
 Program.global.heapMemL2Sram = HeapMem.create(heapMem0Params);
 Program.sectMap[".l2SramHeap"] = "L2SRAM";
index 6fccf474ccc4050060a924d976905ef51cdce014..ed66e796ab362e29aacb392f99fc8652f75663de 100644 (file)
@@ -34,9 +34,11 @@ All rights reserved.
 
 -i"C:\ti\processor_audio_sdk_1_00_00_00\pasdk\paf\pa\build\c66x\release"
 -i"C:\ti\processor_audio_sdk_1_00_00_00\pasdk\oar\CCS_OAR_lib\make"
+-i"C:\ti\processor_audio_sdk_1_00_00_00\pasdk\car\Source_Code\car\make\alg_car\tisim_eabi_c66_ccs"
+-i"C:\ti\processor_audio_sdk_1_00_00_00\pasdk\car\Source_Code\car\make\libcar\tisim_eabi_c66_ccs"
 -i"C:\ti\processor_audio_sdk_1_00_00_00\pasdk\dap\Dolby_Audio_Processing_Home_Theatre_Imp\Source_Code\dap_ht\make\algdap_ht\linux_omap_eabi_c66_c6run"
 -i"C:\ti\processor_audio_sdk_1_00_00_00\pasdk\dap\Dolby_Audio_Processing_Home_Theatre_Imp\Source_Code\dap_ht\make\libdap_ht\linux_omap_eabi_c66_c6run"
-/* -i"C:\ti\processor_audio_sdk_1_00_00_00\pasdk\bmda\Source_Code\make\c66x\release" */
+-i"C:\ti\processor_audio_sdk_1_00_00_00\pasdk\bmda\Source_Code\make\c66x\release"
 -i"C:\ti\processor_audio_sdk_1_00_00_00\pasdk\intrinsics\Dolby_Intrinsics_Imp\lib_elf_C66"
 -i"C:\ti\dsplib_c66x_3_4_0_0\packages\ti\dsplib\lib"
 
@@ -48,12 +50,16 @@ All rights reserved.
 -l"pce2_elf.lib"
 -l"pcm1_elf.lib"
 -l"dcs7_elf.lib"
+
 -l"dolby_oar_lib.lib"
--l"algdap_ht_c66_float_release.lib"
--l"libdap_ht_c66_float_release.lib"
+-l"libcar_c66_float_release.lib"
+-l"algcar_c66_float_release.lib"
+/* -l"algdap_ht_c66_float_release.lib" */
+/* -l"libdap_ht_c66_float_release.lib" */
 -l"dsplib.lib"
 /* -l"bmda_elf.lib" */
 -l"dlb_intrinsics_c66_float_release.lib"
+
 -l"ae0_elf.lib"
 
 SECTIONS
index 358fbe1730b9fe7bd1efc4e4b8a88bbde7649c78..64ae97d37005b137bceb9c3d42f49993c4a81cb7 100644 (file)
@@ -58,6 +58,7 @@ All rights reserved.
 #include <ddpat_a.h>\r
 //#include <thd_a.h>\r
 #include <oar_a.h>\r
-//#include <bmda_a.h>\r
+#include <car_a.h>\r
+#include <bmda_a.h>\r
 #include <dap_a.h>\r
 #endif /* _I13_A_H_ */\r
index 487b030bb43f3253137e37c1bdfacbc90b7aa6bc..28e1f019931d2f2abae35a7db7cf1dc0a4b90fdc 100644 (file)
@@ -55,7 +55,8 @@ All rights reserved.
     writeVOLControlMasterN(0), \
     writeVOLOffsetMasterN(0x7fff), \
     writeSYSRecreationModeDirect, \
-    writeSYSChannelConfigurationRequestSurround4_1, \
+    writeSYSChannelConfigurationRequestSurround2ATMOS_1(4), \
+    writeDDPJOCDecodeModeDisable, \
     execPAIOutAnalog, \
     execPAIInHDMIStereo
     //
index 6663df321fef1c60ea8cf0fa7e5e0bd308cd889c..501455eed6a9c1484e5617461c092b0bea8265c5 100644 (file)
@@ -74,12 +74,18 @@ All rights reserved.
 #define SUC_TIH_ISUC SRC_TIH_ISRC
 #endif
 
-#define _OAR_
+//#define _OAR_
 #ifdef _OAR_
 #include <oar.h>
 #include <oar_tig.h>
 #endif
 
+/#define _CAR_
+#ifdef _CAR_
+#include <car.h>
+#include <car_tig.h>
+#endif
+
 //#define _DAP_
 #ifdef _DAP_
 #include <dap.h>
@@ -107,6 +113,10 @@ const PAF_ASP_LinkInit aspLinkInitAllI13[] =
     PAF_ASP_LINKINIT(STD, OAR, TIG),
 #endif
 
+#ifdef _CAR_
+    PAF_ASP_LINKINIT(STD, CAR, TIG),
+#endif
+
 #ifdef _DAP_
     PAF_ASP_LINKINIT(STD, DAP, TIG),
 #endif
@@ -137,6 +147,10 @@ const PAF_ASP_LinkInit aspLinkInitStdI13[] =
     PAF_ASP_LINKINIT(STD, OAR, TIG),
 #endif
 
+#ifdef _CAR_
+    PAF_ASP_LINKINIT(STD, CAR, TIG),
+#endif
+
 #ifdef _DAP_
     PAF_ASP_LINKINIT(STD, DAP, TIG),
 #endif