PASDK-258: Minor clean up removing dead wood from test_dsp application.
authorGovind Jeyaram <govind.j@ti.com>
Fri, 10 Mar 2017 21:42:24 +0000 (13:42 -0800)
committerGovind Jeyaram <govind.j@ti.com>
Fri, 10 Mar 2017 21:42:24 +0000 (13:42 -0800)
19 files changed:
pasdk/test_dsp/.cproject
pasdk/test_dsp/application/acp_main_cus.c
pasdk/test_dsp/application/itopo/evmk2g/alpha/pa_i13_evmk2g_io_a.h
pasdk/test_dsp/application/itopo/evmk2g/atboot.c
pasdk/test_dsp/application/itopo/evmk2g/io.c
pasdk/test_dsp/application/main.c
pasdk/test_dsp/boards/k2g/drivers/dap_e17.c [deleted file]
pasdk/test_dsp/boards/k2g/drivers/dap_e17.h [deleted file]
pasdk/test_dsp/framework/alphaFuncProc.c
pasdk/test_dsp/framework/alphaIntervalProc.c
pasdk/test_dsp/framework/audioStreamInpProc.c
pasdk/test_dsp/framework/fwkSim.c [deleted file]
pasdk/test_dsp/framework/fwkSim.h [deleted file]
pasdk/test_dsp/framework/systemInit.c
pasdk/test_dsp/sap/sap.c
pasdk/test_dsp/sio/dap/dap.c [deleted file]
pasdk/test_dsp/sio/dbgDob.c [deleted file]
pasdk/test_dsp/sio/dbgDob.h [deleted file]
pasdk/test_dsp/sio/sio.c

index cf3a6326310353213a2551d08a1be8eba9ac2893..dc017622673b3f303003e0504210cb09f0157594 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="ICSS_EMAC_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_02/psdk_cust/pdk_k2g_1_0_1_0_eng/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"/>
                                        <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/>
@@ -75,7 +75,6 @@
                                                                        <listOptionValue builtIn="false" value="PAF_DEVICE=0xDA000000"/>
                                                                        <listOptionValue builtIn="false" value="NON_CACHE_STATUS"/>
                                                                        <listOptionValue builtIn="false" value="INCLUDE_HDMI_CONFIG"/>
-                                                                       <listOptionValue builtIn="false" value="TEST_MULTICHANNEL"/>
                                                                        <listOptionValue builtIn="false" value="DCS7_UART_EDMA_ENABLE"/>
                                                                        <listOptionValue builtIn="false" value="UARTCALLBACK"/>
                                                                        <listOptionValue builtIn="false" value="EVM_K2G"/>
                                                        </tool>
                                                </toolChain>
                                        </folderInfo>
+                                       <folderInfo id="com.ti.ccstudio.buildDefinitions.C6000.Debug.2083839127.1374921523" name="/" resourcePath="sap">
+                                               <toolChain id="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.DebugToolchain.1285420181" 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.848854970" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.1997130179"/>
+                                                       <option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.717751810.942916424" name="Compiler version" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.717751810"/>
+                                                       <targetPlatform id="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.targetPlatformDebug" name="Platform" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.targetPlatformDebug"/>
+                                                       <tool id="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.compilerDebug.1013576106" name="C6000 Compiler" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.compilerDebug.1216493005">
+                                                               <option id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.DIAG_SUPPRESS.231277527" 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>
+                                                               <inputType id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compiler.inputType__C_SRCS.891486964" 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.67037821" 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.1025688520" 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.1268699390" 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.947022978" name="C6000 Linker" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.linkerDebug.610272205"/>
+                                                       <tool id="com.ti.ccstudio.buildDefinitions.C6000_8.1.hex.524612780" name="C6000 Hex Utility" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.hex.1351503720"/>
+                                                       <tool id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.1385515173" name="XDCtools" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.798429122"/>
+                                               </toolChain>
+                                       </folderInfo>
                                        <folderInfo id="com.ti.ccstudio.buildDefinitions.C6000.Debug.2083839127.2019589329" name="/" resourcePath="common">
                                                <toolChain id="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.DebugToolchain.304371788" 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" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.1997130179"/>
                                                </toolChain>
                                        </folderInfo>
                                        <sourceEntries>
-                                               <entry excluding="application/app_pkgs.cmd|boards|src|application/src" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+                                               <entry excluding="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>
                                        <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/processor_audio_sdk_1_00_00_02/psdk_cust/pdk_k2g_1_0_1_0_eng/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"/>
                                        <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/processor_audio_sdk_1_00_00_02/psdk_cust/pdk_k2g_1_0_1_0_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/processor_audio_sdk_1_00_00_02/psdk_cust/pdk_k2g_1_0_1_0_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="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="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/processor_audio_sdk_1_00_00_02/psdk_cust/pdk_k2g_1_0_1_0_eng/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"/>
                                        <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/processor_audio_sdk_1_00_00_02/psdk_cust/pdk_k2g_1_0_1_0_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/processor_audio_sdk_1_00_00_02/psdk_cust/pdk_k2g_1_0_1_0_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="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="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 806caac5aef3b501c008f16a7b483756d0fe5cc3..9560b142fe54d5ce068b3d1ea34f5b47de59efe4 100644 (file)
@@ -91,17 +91,11 @@ Void ACP_main_cus ()
         extern const ACP_Unit cus_atboot_s_patch[];
 
         extern const ACP_Unit cus_sigma32_s[];
-#ifndef SIMULATE_SIO
         extern const ACP_Unit cus_sigma33_s[];
                extern const ACP_Unit cus_sigma34_s[];
                extern const ACP_Unit cus_sigma35_s[];
                extern const ACP_Unit cus_sigma36_s[];
-#else // SIMULATE_SIO
-        //extern const ACP_Unit cus_sigma33_s[];
-        extern const ACP_Unit cus_sigma34_s[];
-        //extern const ACP_Unit cus_sigma35_s[];
-        //extern const ACP_Unit cus_sigma36_s[];
-#endif // SIMULATE_SIO
+
         //extern const ACP_Unit cus_sigma37_s[];
         //extern const ACP_Unit cus_sigma38_s[];
         //extern const ACP_Unit cus_sigma39_s[];
@@ -116,11 +110,7 @@ Void ACP_main_cus ()
 
         extern const ACP_Unit cus_sigma48_s[];
         extern const ACP_Unit cus_sigma49_s[];
-#ifndef SIMULATE_SIO
                extern const ACP_Unit cus_sigma50_s[];
-#else // SIMULATE_SIO
-        //extern const ACP_Unit cus_sigma50_s[];
-#endif // SIMULATE_SIO
         extern const ACP_Unit cus_sigma51_s[];
         extern const ACP_Unit cus_sigma52_s[];
         //extern const ACP_Unit cus_sigma53_s[];
@@ -143,17 +133,11 @@ Void ACP_main_cus ()
 
         // CUStom Input switching alpha codes
         shortcut[32] = cus_sigma32_s;
-#ifndef SIMULATE_SIO
         shortcut[33] = cus_sigma33_s;
         shortcut[34] = cus_sigma34_s;
                shortcut[35] = cus_sigma35_s;
                shortcut[36] = cus_sigma36_s;
-#else // SIMULATE_SIO
-        //shortcut[33] = cus_sigma33_s;
-        shortcut[34] = cus_sigma34_s;
-        //shortcut[35] = cus_sigma35_s;
-        //shortcut[36] = cus_sigma36_s;
-#endif // SIMULATE_SIO
+
         //shortcut[37] = cus_sigma37_s;
         //shortcut[38] = cus_sigma38_s;
         //shortcut[39] = cus_sigma39_s;
@@ -167,15 +151,9 @@ Void ACP_main_cus ()
         //shortcut[47] = cus_sigma47_s;
 
         // CUStom Output switching alpha codes
-#ifndef SIMULATE_SIO
         shortcut[48] = cus_sigma48_s;
         shortcut[49] = cus_sigma49_s;
         shortcut[50] = cus_sigma50_s;
-#else // SIMULATE_SIO
-        shortcut[48] = cus_sigma48_s;
-        shortcut[49] = cus_sigma49_s;
-        //shortcut[50] = cus_sigma50_s;
-#endif // SIMULATE_SIO
         shortcut[51] = cus_sigma51_s;
         shortcut[52] = cus_sigma52_s;
         //shortcut[53] = cus_sigma53_s;
index 74cf156df0e378d8a0482e8bef3d0c32efc0cab8..246931f1d3ac95c082fe0ef33aac075e02784bb7 100644 (file)
@@ -45,7 +45,6 @@ All rights reserved.
 // -----------------------------------------------------------------------------
 // IB SIO Select Register is set by the execPAIIn* shortcuts
 
-#ifndef SIMULATE_SIO
 #define  execPAIInNone          0xf120
 #define  execPAIInHDMIStereo    0xf121
 #define  execPAIInHDMI             0xf122
@@ -60,33 +59,6 @@ All rights reserved.
 #define DEVINP_ADC              4
 #define DEVINP_N                5
 
-#else // SIMULATE_SIO
-#define  execPAIInNone          0xf120
-#define  execPAIInDigital       0xf121
-#define  execPAIInAnalog        0xf122
-#define  execPAIInAnalogStereo  0xf123
-#define  execPAIInSing          0xf126
-#define  execPAIInHDMI          0xf128
-#define  execPAIInHDMIStereo    0xf129
-#define  execPAIIn1394Stereo    0xf12d
-#define  execPAIIn1394          0xf12e
-#define  execPAIInRingIO        0xf12f
-
-// These values reflect the definition of devinp[]
-#define DEVINP_NULL             0
-#define DEVINP_DIR              1
-#define DEVINP_ADC1             2
-#define DEVINP_ADC_STEREO       3
-#define DEVINP_1394_STEREO      4
-#define DEVINP_1394             5
-#define DEVINP_RIO              6
-#define DEVINP_HDMI             7
-#define DEVINP_HDMI_STEREO      8
-#define DEVINP_N                9
-
-#endif // SIMULATE_SIO
-
-
 #define wroteIBSioCommandNone           0xca00+STD_BETA_IB,0x0500+DEVINP_NULL
 #define wroteIBSioCommandHDMIStereo     0xca00+STD_BETA_IB,0x0500+DEVINP_HDMI_STEREO
 #define wroteIBSioCommandHDMI              0xca00+STD_BETA_IB,0x0500+DEVINP_HDMI
index 2f8a87336e86652aac4dee542347db1534b0d089..21d86adab8f2b13f26bf3ac689c5d1517fdbe96c 100644 (file)
@@ -48,14 +48,6 @@ All rights reserved.
 
 #include "dbgBenchmark.h" // PCM high-sampling rate + SRC + CAR benchmarking
 
-#ifndef SIMULATE_SIO
-//
-// NOT simulating IO
-//
-
-#ifdef TEST_MULTICHANNEL
-//#define DDP_ATBOOT_CFG
-
 #ifndef DDP_ATBOOT_CFG
 //
 // NOT DDP at-boot configuration
@@ -109,70 +101,6 @@ All rights reserved.
     execPAIInHDMIStereo
     
 #endif // DDP_ATBOOT_CFG
-    //
-    //writeENCChannelMapFrom16(PAF_LEFT,PAF_RGHT,8,9,2,12,10,11,-3,-3,-3,-3,-3,-3,-3,-3), \     // Lrs/Rrs
-    //writeENCChannelMapFrom16(PAF_LEFT,PAF_RGHT,8,9,2,12,6,7,-3,-3,-3,-3,-3,-3,-3,-3), \       // Ltm/Rtm
-    //writeENCChannelMapFrom16(PAF_LEFT,PAF_RGHT,PAF_LSUR,PAF_RSUR,PAF_CNTR,PAF_SUBW,PAF_LBAK,PAF_RBAK,PAF_LTFT,PAF_RTFT,PAF_LTRR,PAF_RTRR,-3,-3,-3,-3), \      // Ltf/Rtf,Ltr/Rtr
-    //
-    //writeVOLControlMasterN(-80), \
-    //
-    //
-    //7.1
-    //writeSYSChannelConfigurationRequestSurround4_1, \
-    //
-    //5.1.2
-    //writeSYSChannelConfigurationRequestSurround2ATMOS_1(4), \                                 // L/R,C,LFE,Ls/Rs,Ltm/Rtm
-    //writeBMDAspeakerBackNone, \
-    //writeBMDAspeakerTopmiddleLarge, \
-    //
-    //writeDDPJOCDecodeModeDisable, \
-    //
-    //writeTHDDRCDisable, \
-    //writeTHDDRCCutN(0), \
-    //writeTHDDRCBoostN(0), \
-    //writeTHDLosslessDisable, \
-    //
-    //execPAIOutNone, \
-    //execPAIInNone
-    //execPAIOutAnalogSlave, \
-    //execPAIInAnalog
-    //execPAIOutAnalog, \
-    //execPAIInHDMI
-    //execPAIOutAnalog, \
-    //execPAIInDigital    
-    //
-    
-#else // TEST_MULTICHANNEL
-
-#define CUS_ATBOOT_S \
-    writeDECChannelMapTo16(PAF_LEFT,PAF_RGHT,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3), \
-    writeENCChannelMapFrom16(PAF_LEFT,PAF_RGHT,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3), \
-    writeVOLControlMasterN(0), \
-    writeVOLOffsetMasterN(0x7fff), \
-    writeSYSRecreationModeDirect, \
-    writeSYSChannelConfigurationRequestStereo, \
-    execPAIOutAnalog, \
-    execPAIInHDMIStereo
-#endif // TEST_MULTICHANNEL
-
-#else // SIMULATE_SIO
-//
-// Simulating IO
-//
-
-#define CUS_ATBOOT_S \
-    writeDECChannelMapTo16  (PAF_LEFT,PAF_RGHT,PAF_LSUR,PAF_RSUR,PAF_CNTR,PAF_SUBW,PAF_LBAK,PAF_RBAK,PAF_LWID,PAF_RWID,PAF_LHED,PAF_RHED,-3,-3,-3,-3), \
-    writeENCChannelMapFrom16(PAF_LEFT,PAF_RGHT,PAF_LSUR,PAF_RSUR,PAF_CNTR,PAF_SUBW,PAF_LBAK,PAF_RBAK,PAF_LWID,PAF_RWID,PAF_LHED,PAF_RHED,-3,-3,-3,-3), \
-    writeVOLControlMasterN(0), \
-    writeVOLOffsetMasterN(0x7fff), \
-    writeSYSRecreationModeDirect, \
-    writeSYSChannelConfigurationRequestSurround4_1, \
-    execPAIOutAnalog, \
-    execPAIInAnalog
-    //execPAIOutNone, \
-    //execPAIInNone
-
-#endif // SIMULATE_SIO
 
 #pragma DATA_SECTION(cus_atboot_s0_patch, ".none")
 const ACP_Unit cus_atboot_s0_patch[] = {
index 6316bbc90d7924ae5e1f7981752ef1ff27bac16e..78e87f076d03f04fa9fc3384a4b324de51cb9c8f 100644 (file)
@@ -53,12 +53,7 @@ All rights reserved.
 #include <outbuf_a.h>
 
 #include <pa_i13_evmk2g_io_a.h> //<pa_i13_evmda830_io_a.h>
-
-#ifndef SIMULATE_SIO
 #include <sap_d10.h>
-#else // SIMULATE_SIO
-#include <dap_e17.h>
-#endif // SIMULATE_SIO
 
 #define  rb32DECSourceDecode 0xc024,0x0b81
 #define  ob32DECSourceDecodeNone 0x0001,0x0000
@@ -77,7 +72,6 @@ All rights reserved.
 // Input device configurations & shortcut definitions
 //
 
-#ifndef SIMULATE_SIO
 const struct
 {
     Int n;
@@ -93,27 +87,6 @@ const struct
                (const PAF_SIO_Params *) &SAP_D10_RX_ADC_44100HZ,   // InAnalog
 };
 
-#else // SIMULATE_SIO
-const struct
-{
-    Int n;
-    const PAF_SIO_Params *x[DEVINP_N];
-} patchs_devinp[1] =
-{
-    DEVINP_N,
-        // These values reflect the definitions DEVINP_* in pa*io_a.h:
-        NULL,                                               // InNone
-        NULL, //(const PAF_SIO_Params *) &DAP_E17_RX_DIR,           // InDigital
-        (const PAF_SIO_Params *) &DAP_E17_RX_ADC_48000HZ,   // InAnalog
-        NULL, //(const PAF_SIO_Params *) &DAP_E17_RX_ADC_STEREO_48000HZ,    // InAnalogStereo
-        NULL, //(const PAF_SIO_Params *) &DAP_E17_RX_1394_STEREO,   // In1394Stereo
-        NULL, //(const PAF_SIO_Params *) &DAP_E17_RX_1394,          // In1394
-        NULL,                                                // InRingIO
-        NULL, //(const PAF_SIO_Params *) &DAP_E17_RX_HDMI,          // InHDMI
-        NULL, //(const PAF_SIO_Params *) &DAP_E17_RX_HDMI_STEREO    // InHDMIStereo
-};
-
-#endif // SIMULATE_SIO
 
 // .............................................................................
 // execPAIInNone
@@ -136,7 +109,6 @@ const ACP_Unit cus_sigma32_s[] = {
     CUS_SIGMA32_S,
 };
 
-#ifndef SIMULATE_SIO
 // execPAIInHDMIStereo
 #define CUS_SIGMA33_S \
     writeDECSourceSelectNone, \
@@ -248,203 +220,11 @@ const ACP_Unit cus_sigma36_s[] = {
     CUS_SIGMA36_S,
 };
 
-#else // SIMULATE_SIO
-// execPAIInDigital
-#define CUS_SIGMA33_S \
-  writeDECSourceSelectNone, \
-    writePA3Await(rb32DECSourceDecode,ob32DECSourceDecodeNone), \
-    writeIBUnknownTimeoutN(2*2048), \
-    writeIBScanAtHighSampleRateModeDisable, \
-    writePCMChannelConfigurationProgramStereoUnknown, \
-    writePCMScaleVolumeN(0), \
-    writeDECChannelMapFrom16(0,1,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3), \
-    writeIBEmphasisOverrideDisable, \
-    writeIBPrecisionDefaultOriginal, \
-    writeIBPrecisionOverrideDetect, \
-    writeIBSampleRateOverrideStandard, \
-    writeIBSioSelectN(DEVINP_DIR), \
-    wroteDECSourceProgramUnknown, \
-    writeDECSourceSelectAuto, \
-    0xcdf0,execPAIInDigital
-
-#pragma DATA_SECTION(cus_sigma33_s0, ".none")
-const ACP_Unit cus_sigma33_s0[] = {
-    0xc900 + 0 - 1,
-    CUS_SIGMA33_S,
-};
-
-const ACP_Unit cus_sigma33_s[] = {
-    0xc900 + sizeof (cus_sigma33_s0) / 2 - 1,
-    CUS_SIGMA33_S,
-};
-
-// execPAIInAnalog
-#define CUS_SIGMA34_S \
-    writeDECSourceSelectNone, \
-    writePA3Await(rb32DECSourceDecode,ob32DECSourceDecodeNone), \
-    writePCMChannelConfigurationProgramSurround4_1, \
-    writePCMScaleVolumeN(2*6), \
-    writeDECChannelMapFrom16(0,4,1,5,2,6,3,7,-3,-3,-3,-3,-3,-3,-3,-3), \
-    writeIBEmphasisOverrideNo, \
-    writeIBPrecisionOverride24, \
-    writeIBSampleRateOverride48000Hz, \
-    writeIBSioSelectN(DEVINP_ADC1), \
-    writeDECSourceSelectPCM,        \
-    0xcdf0,execPAIInAnalog
-
-#pragma DATA_SECTION(cus_sigma34_s0, ".none")
-const ACP_Unit cus_sigma34_s0[] = {
-    0xc900 + 0 - 1,
-    CUS_SIGMA34_S,
-};
-
-const ACP_Unit cus_sigma34_s[] = {
-    0xc900 + sizeof (cus_sigma34_s0) / 2 - 1,
-    CUS_SIGMA34_S,
-};
-
-// execPAIInAnalogStereo
-#define CUS_SIGMA35_S \
-    writeDECSourceSelectNone, \
-    writePA3Await(rb32DECSourceDecode,ob32DECSourceDecodeNone), \
-    writePCMChannelConfigurationProgramStereoUnknown, \
-    writePCMScaleVolumeN(2*6), \
-    writeDECChannelMapFrom16(0,1,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3), \
-    writeIBEmphasisOverrideNo, \
-    writeIBPrecisionOverride24, \
-    writeIBSampleRateOverride48000Hz, \
-    writeIBSioSelectN(DEVINP_ADC_STEREO), \
-    writeDECSourceSelectPCM,                 \
-    0xcdf0,execPAIInAnalogStereo
-
-#pragma DATA_SECTION(cus_sigma35_s0, ".none")
-const ACP_Unit cus_sigma35_s0[] = {
-    0xc900 + 0 - 1,
-    CUS_SIGMA35_S,
-};
-
-const ACP_Unit cus_sigma35_s[] = {
-    0xc900 + sizeof (cus_sigma35_s0) / 2 - 1,
-    CUS_SIGMA35_S,
-};
-
-// execPAIInSing
-#define CUS_SIGMA38_S \
-    writeDECSourceSelectNone, \
-    writePA3Await(rb32DECSourceDecode,ob32DECSourceDecodeNone), \
-    writeIBEmphasisOverrideNo, \
-    writeIBPrecisionOverride24, \
-    writeIBSampleRateOverride48000Hz, \
-    writeIBSioSelectN(DEVINP_ADC1), \
-    writeDECSourceSelectSing, \
-    0xcdf0,execPAIInSing
-
-#pragma DATA_SECTION(cus_sigma38_s0, ".none")
-const ACP_Unit cus_sigma38_s0[] = {
-    0xc900 + 0 - 1,
-    CUS_SIGMA38_S,
-};
-
-const ACP_Unit cus_sigma38_s[] = {
-    0xc900 + sizeof (cus_sigma38_s0) / 2 - 1,
-    CUS_SIGMA38_S,
-};
-
-// execPAIInHDMI
-#define CUS_SIGMA40_S \
-    writeDECSourceSelectNone, \
-    writePA3Await(rb32DECSourceDecode,ob32DECSourceDecodeNone), \
-    writePCMChannelConfigurationProgramSurround4_1, \
-    writePCMScaleVolumeN(0), \
-    writeDECChannelMapFrom16(0,4,1,5,2,6,3,7,-3,-3,-3,-3,-3,-3,-3,-3), \
-    writeIBUnknownTimeoutN(15*1024), \
-    writeIBScanAtHighSampleRateModeEnable, \
-    writeIBEmphasisOverrideNo, \
-    writeIBPrecisionOverride24, \
-    writeIBSampleRateOverrideStandard, \
-    writeIBSioSelectN(DEVINP_HDMI), \
-    wroteDECSourceProgramUnknown, \
-    writeDECSourceSelectAuto, \
-    0xcdf0,execPAIInHDMI
-
-#pragma DATA_SECTION(cus_sigma40_s0, ".none")
-const ACP_Unit cus_sigma40_s0[] = {
-    0xc900 + 0 - 1,
-    CUS_SIGMA40_S,
-};
-
-const ACP_Unit cus_sigma40_s[] = {
-    0xc900 + sizeof (cus_sigma40_s0) / 2 - 1,
-    CUS_SIGMA40_S,
-};
-
-// .............................................................................
-// execPAIIn1394Stereo
-#define CUS_SIGMA45_S \
-     writeDECSourceSelectNone, \
-    writePA3Await(rb32DECSourceDecode,ob32DECSourceDecodeNone), \
-    writePCMChannelConfigurationProgramStereoUnknown, \
-    writePCMScaleVolumeN(0), \
-    writeDECChannelMapFrom2(0,1), \
-    writeIBUnknownTimeoutN(8*1024), \
-    writeIBScanAtHighSampleRateModeEnable, \
-    writeIBEmphasisOverrideNo, \
-    writeIBPrecisionOverride24, \
-    writeIBSampleRateOverrideStandard, \
-    writeIBSioSelectN(DEVINP_1394_STEREO), \
-    wroteDECSourceProgramUnknown, \
-    writeDECSourceSelectAuto, \
-    0xcdf0,execPAIIn1394Stereo
-
-#pragma DATA_SECTION(cus_sigma45_s0, ".none")
-const ACP_Unit cus_sigma45_s0[] = {
-    0xc900 + 0 - 1,
-    CUS_SIGMA45_S,
-};
-
-const ACP_Unit cus_sigma45_s[] = {
-    0xc900 + sizeof (cus_sigma45_s0) / 2 - 1,
-    CUS_SIGMA45_S,
-};
-
-
-// execPAIIn1394
-#define CUS_SIGMA46_S \
-   writeDECSourceSelectNone, \
-    writePA3Await(rb32DECSourceDecode,ob32DECSourceDecodeNone), \
-    writePCMChannelConfigurationProgramSurround4_1, \
-    writePCMScaleVolumeN(0), \
-    writeDECChannelMapFrom16(0,4,1,5,2,6,3,7,-3,-3,-3,-3,-3,-3,-3,-3), \
-    writeIBUnknownTimeoutN(15*1024), \
-    writeIBScanAtHighSampleRateModeEnable, \
-    writeIBEmphasisOverrideNo, \
-    writeIBPrecisionOverride24, \
-    writeIBSampleRateOverrideStandard, \
-    writeIBSioSelectN(DEVINP_1394), \
-    wroteDECSourceProgramUnknown, \
-    writeDECSourceSelectAuto, \
-    0xcdf0,execPAIIn1394
-
-#pragma DATA_SECTION(cus_sigma46_s0, ".none")
-const ACP_Unit cus_sigma46_s0[] = {
-    0xc900 + 0 - 1,
-    CUS_SIGMA46_S,
-};
-
-const ACP_Unit cus_sigma46_s[] = {
-    0xc900 + sizeof (cus_sigma46_s0) / 2 - 1,
-    CUS_SIGMA46_S,
-};
-
-#endif // SIMULATE_SIO
-
-
 // -----------------------------------------------------------------------------
 //
 // Output device configurations & shortcut definitions
 //
 
-#ifndef SIMULATE_SIO
 const struct
 {
     Int n;
@@ -460,42 +240,8 @@ const struct
                (const PAF_SIO_Params *) &SAP_D10_TX_DAC_16CH,           // OutAnalog_16ch
 };
 
-#else // SIMULATE_SIO
-
-const struct
-{
-    Int n;
-    const PAF_SIO_Params *x[DEVOUT_N];
-} patchs_devout[1] =
-{
-    DEVOUT_N,
-        // These values reflect the definitions DEVOUT_* in pa*io_a.h:
-        NULL,                                               // OutNone
-        (const PAF_SIO_Params *) &DAP_E17_TX_DAC,           // OutAnalog
-        NULL, //(const PAF_SIO_Params *) &DAP_E17_TX_DIT,           // OutDigital
-        NULL, //(const PAF_SIO_Params *) &DAP_E17_TX_DAC_SLAVE,     // OutAnalogSlave
-        NULL, //(const PAF_SIO_Params *) &DAP_E17_TX_STEREO_DAC_SLAVE,  // OutAnalogSlaveStereo
-        NULL, //(const PAF_SIO_Params *) &DAP_E17_TX_2STEREO_DAC_SLAVE, // OutAnalogSlave2Stereo
-        NULL,                // OutRingIO
-        NULL,               // OutRingIO
-        NULL,               // OutRingIO
-        NULL, //(const PAF_SIO_Params *) &DAP_E17_TX_4TDM,             // OutTdm4
-        NULL, //(const PAF_SIO_Params *) &DAP_E17_TX_8TDM,             // OutTdm8
-};
-
-#endif // SIMULATE_SIO
 
 // .............................................................................
-#if 0 // (***) FL: remove change in Dec sourceSelect since this will cause break in TaskAsip
-// execPAIOutNone
-#define CUS_SIGMA48_S \
-    rb32DECSourceSelect_3, \
-    writeDECSourceSelectNone, \
-    writePA3Await(rb32DECSourceDecode,ob32DECSourceDecodeNone), \
-    writeOBSioSelectN(DEVOUT_NULL), \
-    wb32DECSourceSelect_3, \
-    0xcdf0,execPAIOutNone
-#else
 // execPAIOutNone
 #define CUS_SIGMA48_S \
        rb32DECSourceSelect_3, \
@@ -504,7 +250,6 @@ const struct
     writeOBSioSelectN(DEVOUT_NULL), \
     writePA3Await(rb32OBSioSelect,ob32OBSioSelect(DEVOUT_NULL)), \
     0xcdf0,execPAIOutNone
-#endif    
     
 #pragma DATA_SECTION(cus_sigma48_s0, ".none")
 const ACP_Unit cus_sigma48_s0[] = {
@@ -517,59 +262,16 @@ const ACP_Unit cus_sigma48_s[] = {
     CUS_SIGMA48_S,
 };
 
-#ifndef SIMULATE_SIO
 // .............................................................................
 // execPAIOutAnalog
-    #ifdef TEST_MULTICHANNEL
-        #if 0  // (***) FL: remove change in Dec sourceSelect since this will cause break in TaskAsip
-        #define CUS_SIGMA49_S \
-            rb32DECSourceSelect_3, \
-            writeDECSourceSelectNone, \
-            writePA3Await(rb32DECSourceDecode,ob32DECSourceDecodeNone), \
-            writeOBSioSelectN(DEVOUT_DAC), \
-            writeENCChannelMapTo16(0,4,1,5,2,6,3,7,-3,-3,-3,-3,-3,-3,-3,-3), \
-            wb32DECSourceSelect_3, \
-            0xcdf0,execPAIOutAnalog
-        #else
-        #define CUS_SIGMA49_S \
-               rb32DECSourceSelect_3, \
-                       writeDECSourceSelectNone, \
-                       writePA3Await(rb32DECSourceDecode,ob32DECSourceDecodeNone), \
-            writeOBSioSelectN(DEVOUT_DAC), \
-            writeENCChannelMapTo16(0,4,1,5,2,6,3,7,-3,-3,-3,-3,-3,-3,-3,-3), \
-                   wb32DECSourceSelect_3, \
-            0xcdf0,execPAIOutAnalog
-        #endif
-    #else // TEST_MULTICHANNEL
-        #define CUS_SIGMA49_S \
-            rb32DECSourceSelect_3, \
-            writeDECSourceSelectNone, \
-            writePA3Await(rb32DECSourceDecode,ob32DECSourceDecodeNone), \
-            writeOBSioSelectN(2), \
-            writeENCChannelMapTo16(0,1,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3), \
-            wb32DECSourceSelect_3, \
-            0xcdf0,execPAIOutAnalog
-        #endif // TEST_MULTICHANNEL
-
-#else // SIMULATE_SIO
-    #if 0 // (***) FL: remove change in Dec sourceSelect since this will cause break in TaskAsip
-    #define CUS_SIGMA49_S \
-        rb32DECSourceSelect_3, \
-        writeDECSourceSelectNone, \
-        writePA3Await(rb32DECSourceDecode,ob32DECSourceDecodeNone), \
-        writeOBSioSelectN(1), \
-        writeENCChannelMapTo16(3,7,2,6,1,5,0,4,-3,-3,-3,-3,-3,-3,-3,-3), \
-        wb32DECSourceSelect_3, \
-        0xcdf0,execPAIOutAnalog
-    #else
-    #define CUS_SIGMA49_S \
-        writeOBSioSelectN(1), \
-        writePA3Await(rb32OBSioSelect,ob32OBSioSelect(1)), \
-        writeENCChannelMapTo16(3,7,2,6,1,5,0,4,-3,-3,-3,-3,-3,-3,-3,-3), \
-        0xcdf0,execPAIOutAnalog
-    #endif    
-    
-#endif // SIMULATE_SIO
+#define CUS_SIGMA49_S \
+       rb32DECSourceSelect_3, \
+       writeDECSourceSelectNone, \
+       writePA3Await(rb32DECSourceDecode,ob32DECSourceDecodeNone), \
+       writeOBSioSelectN(DEVOUT_DAC), \
+       writeENCChannelMapTo16(0,4,1,5,2,6,3,7,-3,-3,-3,-3,-3,-3,-3,-3), \
+       wb32DECSourceSelect_3, \
+       0xcdf0,execPAIOutAnalog
 
 #pragma DATA_SECTION(cus_sigma49_s0, ".none")
 const ACP_Unit cus_sigma49_s0[] = {
@@ -582,19 +284,8 @@ const ACP_Unit cus_sigma49_s[] = {
     CUS_SIGMA49_S,
 };
 
-
 // .............................................................................
 // execPAIOutAnalogSlave
-#if 0 // (***) FL: remove change in Dec sourceSelect since this will cause break in TaskAsip
-#define CUS_SIGMA50_S \
-    rb32DECSourceSelect_3, \
-    writeDECSourceSelectNone, \
-    writePA3Await(rb32DECSourceDecode,ob32DECSourceDecodeNone), \
-    writeOBSioSelectN(DEVOUT_DAC_SLAVE), \
-       writeENCChannelMapTo16(0,4,1,5,2,6,3,7,-3,-3,-3,-3,-3,-3,-3,-3), \
-    wb32DECSourceSelect_3, \
-    0xcdf0,execPAIOutAnalogSlave
-#else
 #define CUS_SIGMA50_S \
     rb32DECSourceSelect_3, \
        writeDECSourceSelectNone, \
@@ -603,7 +294,6 @@ const ACP_Unit cus_sigma49_s[] = {
        writeENCChannelMapTo16(0,4,1,5,2,6,3,7,-3,-3,-3,-3,-3,-3,-3,-3), \
     wb32DECSourceSelect_3, \
     0xcdf0,execPAIOutAnalogSlave
-#endif    
 
 #pragma DATA_SECTION(cus_sigma50_s0, ".none")
 const ACP_Unit cus_sigma50_s0[] = {
index 54704b9d02cd73e1842e3ee1daee0d459dedee40..42602bcd89a9a96945e309a1ff9a006a7063b773 100644 (file)
@@ -45,18 +45,13 @@ All rights reserved.
 #include <ti/ipc/Ipc.h>
 #include <ti/sysbios/hal/Cache.h>
 
-#include "fwkSim.h"
 
-#ifndef SIMULATE_SIO
 #include <platform.h>
 #include <platform_audio.h>
 #include "audio_dc_cfg.h"
 #include "edma_cfg.h"
-#endif // SIMULATE_SIO
 
-#ifndef SIMULATE_SIO
 extern Void initDev2(Void);
-#endif // SIMULATE_SIO
 
 
 /*
@@ -65,20 +60,12 @@ extern Void initDev2(Void);
 Int main()
 {
     Int status;
-#ifndef SIMULATE_SIO
     Platform_STATUS pfStatus;
-#endif // SIMULATE_SIO
 
     //System_printf("Enter main()\n");
     Log_info0("Enter main()");
-    
-#ifdef SIMULATE_SIO
-    // Stop simulation
-    simStop();
-#endif // SIMULATE_SIO  
 
     //Platform setup!!!
-#ifndef SIMULATE_SIO
     /*
      * use ROV->SysMin to view the characters in the circular buffer
      */
@@ -113,12 +100,7 @@ Int main()
     //System_printf(  "****************************************************\n");
 
     Log_info0("exit Platform Setup");
-#else // SIMULATE_SIO
-    /* Initialize simulation */
-    simInit();
-#endif // SIMULATE_SIO    
 
-#ifndef SIMULATE_SIO
     Log_info0("Configure EDMA");
     /* Configure eDMA module */
     pfStatus = eDmaConfig();
@@ -131,7 +113,6 @@ Int main()
 
     Log_info0("initDev2");
     initDev2();
-#endif // SIMULATE_SIO
 
     Log_info0("IPC start");
     // Initialize IPC
diff --git a/pasdk/test_dsp/boards/k2g/drivers/dap_e17.c b/pasdk/test_dsp/boards/k2g/drivers/dap_e17.c
deleted file mode 100644 (file)
index 237329b..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-Copyright (c) 2016, Texas Instruments Incorporated - http://www.ti.com/
-All rights reserved.
-
-* Redistribution and use in source and binary forms, with or without 
-* modification, are permitted provided that the following conditions
-* are met:
-*
-* Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-*
-* Redistributions in binary form must reproduce the above copyright
-* notice, this list of conditions and the following disclaimer in the
-* documentation and/or other materials provided with the
-* distribution.
-*
-* Neither the name of Texas Instruments Incorporated nor the names of
-* its contributors may be used to endorse or promote products derived
-* from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*/
-
-//
-// I/O device configuration data structure definitions E17 (DA800 EVM).
-//
-
-// -----------------------------------------------------------------------------
-// Includes
-
-#include "drvPort.h" // FL: temporary
-
-#include <xdc/std.h>
-//#include <clk.h>
-//#include <sys.h>
-
-//#include <dap.h>
-#include <pafsio.h>
-//#include <paftyp_a.h>
-
-#include <dap_e17.h>
-
-// -----------------------------------------------------------------------------
-// DAP Input Parameter Definitions
-const DAP_E17_Rx_Params DAP_E17_RX_ADC_48000HZ =
-{
-    sizeof (DAP_E17_Rx_Params),                 // size
-    "DAP",                                      // name
-    MCASP_DEV1,                                 // moduleNum --> mcasp #
-    NULL, //(Void *)&rxConfigADC,                       // pConfig
-    -1,                                         // wordSize (unused)
-    -1,                                         // precision (unused)
-    NULL, // E17_dapControl,                             // control
-    0xE0000407,                                 // pinMask
-    72,                                         // mode
-    0,0                                         // unused[2]
-};
-
-// -----------------------------------------------------------------------------
-// DAP Output Parameter Definitions
-const DAP_E17_Tx_Params DAP_E17_TX_DAC =
-{
-    sizeof (DAP_E17_Tx_Params),                 // size
-    "DAP",                                      // name
-    MCASP_DEV1,                                 // moduleNum --> mcasp #
-    NULL, //(Void *)&txConfigDAC,                       // pConfig
-    3,                                          // wordSize (in bytes)
-    24,                                         // precision (in bits)
-    NULL, //E17_dapControl,                             // control
-    0x000001e0,
-    0,                                          // mode
-    0,0,0                                       // unused[3]
-};
diff --git a/pasdk/test_dsp/boards/k2g/drivers/dap_e17.h b/pasdk/test_dsp/boards/k2g/drivers/dap_e17.h
deleted file mode 100644 (file)
index 37225f3..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-
-/*
-Copyright (c) 2016, Texas Instruments Incorporated - http://www.ti.com/
-All rights reserved.
-
-* Redistribution and use in source and binary forms, with or without 
-* modification, are permitted provided that the following conditions
-* are met:
-*
-* Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-*
-* Redistributions in binary form must reproduce the above copyright
-* notice, this list of conditions and the following disclaimer in the
-* documentation and/or other materials provided with the
-* distribution.
-*
-* Neither the name of Texas Instruments Incorporated nor the names of
-* its contributors may be used to endorse or promote products derived
-* from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*/
-
-//
-// I/O device configuration data structure declarations for E17 board.
-//
-//
-//
-
-#ifndef DAP_E17_H
-#define DAP_E17_H
-
-#include "drvPort.h" // FL: temporary
-
-#include <xdc/std.h>
-#include <ti/xdais/xdas.h>
-
-//#include <dap.h>
-#include <pafsio.h>
-
-//
-// Device parameter data types, recieve
-//
-
-struct DAP_E17_Rx_Params_
-{
-    XDAS_UInt16 mode;
-    XDAS_UInt8 unused[2];
-};
-typedef struct DAP_E17_Rx_Params
-{
-    Int size;                           // Type-specific size
-    struct DXX_Params_ sio;             // Common parameters
-    struct DAP_Params_ dap;             // Device parameters
-    struct DAP_E17_Rx_Params_ e17rx;      // Board Receive parameters
-} DAP_E17_Rx_Params;
-
-extern const DAP_E17_Rx_Params DAP_E17_RX_ADC_48000HZ;      
-//
-// Device parameter data types, transmit
-//
-
-struct DAP_E17_Tx_Params_
-{
-    XDAS_UInt8 mode;
-    XDAS_UInt8 unused[3];
-};
-typedef struct DAP_E17_Tx_Params
-{
-    Int size;                           // Type-specific size
-    struct DXX_Params_ sio;             // Common parameters
-    struct DAP_Params_ dap;             // Device parameters
-    struct DAP_E17_Tx_Params_ e17tx;      // Board Transmit parameters
-} DAP_E17_Tx_Params;
-
-extern const DAP_E17_Tx_Params DAP_E17_TX_DAC;
-
-#endif // DAP_E17_H
-                                                                        
-                                                                        
index b7257d1be38a1f7a7a22a5a26875cfc3c7b5193c..bd1e26772babfca7014c06e4dbd858b789843134 100644 (file)
@@ -45,7 +45,7 @@ All rights reserved.
 #include <ti/sysbios/knl/Clock.h>
 #include <ti/sysbios/knl/Semaphore.h>
 #include <stdlib.h>
-#include "fwkSim.h"
+//#include "fwkSim.h"
 
 #include "paf_heapMgr.h"
 #include "alphaFuncProc.h"
index 789623c196b2f6da65c9c0bf420fcd89070a21ff..154a9884d68041ca9d014321ae900cb9ee80ffca 100644 (file)
@@ -57,7 +57,6 @@ All rights reserved.
 #include "paf_alg_print.h"
 #include "paf_heapMgr.h"
 
-//#include "fwkSim.h"
 #include "fwkPort.h"
 
 // Symbolic constants for translating heap Ids to handles
index 01f73fc2c8a299a2d25cb825109e8fe44032790e..417b57e162f13119b6a174157f8b078e313a13dc 100644 (file)
@@ -65,8 +65,6 @@ All rights reserved.
 #include "audioStreamProc_master.h"
 #include "audioStreamInpProc.h"
 
-// FL: porting
-#include "fwkSim.h"
 //#include "fwkPort.h"
 // FL: debug
 #include "dbgCapAf.h"
@@ -369,11 +367,6 @@ Void taskAsipFxn(
     Task_Handle taskHandle;
 
     Log_info0("Enter taskAsipFxn()");
-    
-#ifdef SIMULATE_SIO
-    /* Start simulation */
-    simStart();
-#endif // SIMULATE_SIO
 
     //
     // Audio Framework Parameters & Patch (*pP, *pQ)
diff --git a/pasdk/test_dsp/framework/fwkSim.c b/pasdk/test_dsp/framework/fwkSim.c
deleted file mode 100644 (file)
index 02f2d12..0000000
+++ /dev/null
@@ -1,182 +0,0 @@
-
-/*
-Copyright (c) 2016, Texas Instruments Incorporated - http://www.ti.com/
-All rights reserved.
-
-* Redistribution and use in source and binary forms, with or without 
-* modification, are permitted provided that the following conditions
-* are met:
-*
-* Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-*
-* Redistributions in binary form must reproduce the above copyright
-* notice, this list of conditions and the following disclaimer in the
-* documentation and/or other materials provided with the
-* distribution.
-*
-* Neither the name of Texas Instruments Incorporated nor the names of
-* its contributors may be used to endorse or promote products derived
-* from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*/
-
-/*
- *  ======== fwkSim.c ========
- */
-
-#include <xdc/std.h>
-#include <xdc/cfg/global.h>
-#include <xdc/runtime/Error.h>
-#include <xdc/runtime/Log.h>
-#include <ti/sysbios/knl/Clock.h>
-#include <ti/sysbios/knl/Semaphore.h>
-#include <ti/sysbios/hal/Hwi.h>
-#include <ti/sysbios/hal/Timer.h>
-#include <ti/sysbios/family/c64p/EventCombiner.h>
-#include <ti/csl/soc/k2g/src/cslr_soc.h>
-
-#include "fwkSim.h"
-
-#ifdef SIMULATE_SIO
-#define SIM_TIMER_HWI   ( 7 )
-
-// Global debug counters
-Uint32 gTimerRxCnt=0;
-Uint32 gTimerTxCnt=0;
-#endif // SIMULATE_SIO
-
-#ifdef SIMULATE_RX_ALPHA
-// Global debug counter
-Uint32 gClockRxAlphaCnt=0;
-#endif
-
-#ifdef SIMULATE_SIO
-/*
- *  ======== timerRxFxn ========
- */
-Void timerRxFxn(UArg a0)
-{
-    gTimerRxCnt++;
-    
-    /* Post semaphore indicating Rx audio frame */
-    Semaphore_post(semaphoreRxAudio); 
-}
-
-/*
- *  ======== timerTxFxn ========
- */
-Void timerTxFxn(UArg a0)
-{
-    gTimerTxCnt++;
-    
-    /* Post semaphore indicating Tx audio frame */
-    Semaphore_post(semaphoreTxAudio); 
-}
-
-// Simulation initialization
-Void simInit(Void)
-{
-    Hwi_Params hwiParams;
-    //Error_Block eb;
-    
-    // Initialize the error block
-    //Error_init(&eb);
-    
-    // Initialize simulation
-    // Plug the function and argument for Timer1L event and enable it
-    // Plug the function and argument for Timer2L event and enable it
-    EventCombiner_dispatchPlug(CSL_C66X_COREPAC_TIMER_1_INTL, &timerRxFxn, 0, TRUE);
-    EventCombiner_dispatchPlug(CSL_C66X_COREPAC_TIMER_2_INTL, &timerTxFxn, 0, TRUE);
-    
-    // Initialize the Hwi parameters
-    Hwi_Params_init(&hwiParams);
-    // The eventId must be set to the combined event for Timer1L or Timer2L event.
-    // The combined event is event 1 for both.  If the combined events are
-    // different, then another Hwi must be used for the other combined event.
-    hwiParams.eventId = CSL_C66X_COREPAC_EVT1;
-    // The arg must be set to hwiParams.eventId
-    hwiParams.arg = hwiParams.eventId;
-    // Enable the interrupt
-    hwiParams.enableInt = FALSE; //TRUE;
-    // Events Timer1L and Timer2L are on the same combined event so create a single Hwi.
-    // Create the Hwi on interrupt 15 then specify 'EventCombiner_dispatch'
-    // as the function.
-    //Hwi_create(SIM_TIMER_HWI, &EventCombiner_dispatch, &hwiParams, &eb);
-    Hwi_create(SIM_TIMER_HWI, &EventCombiner_dispatch, &hwiParams, NULL);
-}
-
-// Simulation start
-Void simStart(Void)
-{
-    UInt32 curTime;
-
-    // Start Rx audio clock --  Simulate Rx audio frame time */
-    //System_printf("Start Rx audio clock\n");
-    Log_info0("Start Rx audio clock");
-    Timer_start(timerRxAudio);
-    
-    // Wait for Rx-Tx delay system ticks before starting Tx audio clock.
-    // Control phase difference between Rx and Tx audio clocks.
-    curTime = Clock_getTicks();
-    while (Clock_getTicks() <= (curTime + RX_TX_AUDIO_DELTA_TICKS)) 
-    {
-        ;
-    }
-
-    // Start Tx audio clock -- Simulate Tx audio frame time
-    //System_printf("Start Tx audio clock\n");
-    Log_info0("Start Tx audio clock");
-    Timer_start(timerTxAudio);
-    
-    Hwi_enableInterrupt(SIM_TIMER_HWI);
-}
-
-// Simulation stop
-Void simStop(Void)
-{
-    Hwi_disableInterrupt(SIM_TIMER_HWI);
-    Hwi_clearInterrupt(SIM_TIMER_HWI);
-    EventCombiner_disableEvent(CSL_C66X_COREPAC_TIMER_1_INTL);
-    EventCombiner_disableEvent(CSL_C66X_COREPAC_TIMER_2_INTL);
-}
-#endif // SIMULATE_SIO
-
-#ifdef SIMULATE_RX_ALPHA
-/*
- *  ======== clockRxAlphaFxn ========
- */
-Void clockRxAlphaFxn(UArg a0)
-{
-    gClockRxAlphaCnt++;
-        
-    /* Post semaphore indicating Rx alpha command */
-    Semaphore_post(semaphoreRxAlpha); 
-}
-#endif
-
-// Simulate load 
-Void simLoad(
-    Uint32 loadTime // load time in system clock ticks
-)
-{
-    UInt32 curTime;
-    
-    curTime = Clock_getTicks();
-    while (Clock_getTicks() <= (curTime + loadTime)) 
-    {
-        ;
-    }
-}
diff --git a/pasdk/test_dsp/framework/fwkSim.h b/pasdk/test_dsp/framework/fwkSim.h
deleted file mode 100644 (file)
index 9c6ff25..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-
-/*
-Copyright (c) 2016, Texas Instruments Incorporated - http://www.ti.com/
-All rights reserved.
-
-* Redistribution and use in source and binary forms, with or without 
-* modification, are permitted provided that the following conditions
-* are met:
-*
-* Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-*
-* Redistributions in binary form must reproduce the above copyright
-* notice, this list of conditions and the following disclaimer in the
-* documentation and/or other materials provided with the
-* distribution.
-*
-* Neither the name of Texas Instruments Incorporated nor the names of
-* its contributors may be used to endorse or promote products derived
-* from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*/
-
-/*
- *  ======== fwkSim.h ========
- */
-
-#ifndef _FWK_SIM_H_
-#define _FWK_SIM_H_
-
-#include <xdc/std.h>
-#include <ti/xdais/xdas.h>
-
-// Min, max number of system clock ticks (default tick = 1 msec.)
-#define RX_ALPHA_MIN_TICKS      ( 50 )      // min setting =0
-#define RX_ALPHA_MAX_TICKS      ( 10000 )   // max setting =RAND_MAX
-#define RX_ALPHA_DELTA_TICKS    ( RX_ALPHA_MAX_TICKS - RX_ALPHA_MIN_TICKS)
-
-// Number of system clock ticks between start of Rx, Tx audio timers
-#define RX_TX_AUDIO_DELTA_TICKS ( 1 )
-
-// Simulated load time in system clock ticks
-#define DEC_CONTROL_LOAD        ( 1 )
-#define DEC_ACTIVATE_LOAD       ( 1 )
-#define DEC_RESET_LOAD          ( 1 )
-#define DEC_INFO_LOAD           ( 1 )
-#define DEC_DECODE_LOAD         ( 2 )
-#define DEC_DEACTIVATE_LOAD     ( 1 )
-
-// Global debug counters */
-extern Uint32 gTimerRxCnt;      // debug counter for timerRxAudio
-extern Uint32 gTimerTxCnt;      // debug counter for timerTxAudio
-extern Uint32 gClockRxAlphaCnt; // debug counter for clockRxAlpha
-
-/* ======== timerRxFxn ======== */
-// Simulate Rx audio frame clock.
-Void timerRxFxn(UArg a0);
-
-/*  ======== timerTxFxn ======== */
-// Simulate Tx audio frame clock.
-Void timerTxFxn(UArg a0);
-
-/*  ======== clockRxAlphaFxn ======== */
-// Simulate timing of Rx alpha command reception.
-// Commands are received at randomly computed time.
-// Commands executed are contained in command list in DSP build.
-Void clockRxAlphaFxn(UArg a0);
-
-// Simulation stop
-Void simStop(Void);
-
-// Simulation initialization
-Void simInit(Void);
-
-// Simulation start
-Void simStart(Void);
-
-// Simulate load 
-Void simLoad(Uint32 loadTime);
-
-#endif /* _FWK_SIM_H_ */
index 0503c39e45a49db6d1bff07868ae961e15bcd2d3..705520c28de4f62ffa7a20aab306a5e59793570d 100644 (file)
@@ -55,7 +55,6 @@ All rights reserved.
 #include "audioStreamProc_common.h" // ASIT/ASOT/ASDT config
 #include "audioStreamInpProc.h"
 #include "audioStreamOutProc.h"
-#include "fwkSim.h"
 
 extern Void ACP_main_cus(Void);     // (*** ?) FL: revisit -- check method of patching alpha codes
 extern Void taskSystemStreamFxn(Void);  // (*** ?) FL: revisit -- shouldn't need to call this from system init
index 174e76b143bf391df2fac8bab27199d93f33a2a4..1853ca3a559830696c4ae22dc2162f27cf278647 100644 (file)
@@ -67,12 +67,7 @@ All rights reserved.
 
 #define EDMA_HINV NULL
 
-#ifdef SAP_PORT_MCASP
 #include "sap_mcasp.h"
-#else
-#error "No port defined"
-#endif
-
 #include <pafsio.h>
 
 // This works to set a breakpoint
@@ -100,15 +95,8 @@ typedef xdc_Short MdInt;
 
 void swapHdmi(Ptr, int);
 
-//#define TEST_MULTICHANNEL
-
-
-#ifdef TEST_MULTICHANNEL
 #define SAP_UNDER_LEN 8
-//#define SAP_UNDER_LEN 1024 // GJ: experiment
-#else
-#define SAP_UNDER_LEN 1024
-#endif
+
 int sap_UNDER[SAP_UNDER_LEN]; // used for underrun
 int sap_OVER_1LANE = 0;     // used for overrun
 int sap_OVER_4LANE[4] = {0,0,0,0};      // used for overrun
diff --git a/pasdk/test_dsp/sio/dap/dap.c b/pasdk/test_dsp/sio/dap/dap.c
deleted file mode 100644 (file)
index 1bbe816..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-
-/*
-Copyright (c) 2016, Texas Instruments Incorporated - http://www.ti.com/
-All rights reserved.
-
-* Redistribution and use in source and binary forms, with or without 
-* modification, are permitted provided that the following conditions
-* are met:
-*
-* Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-*
-* Redistributions in binary form must reproduce the above copyright
-* notice, this list of conditions and the following disclaimer in the
-* documentation and/or other materials provided with the
-* distribution.
-*
-* Neither the name of Texas Instruments Incorporated nor the names of
-* its contributors may be used to endorse or promote products derived
-* from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*/
-
-#include <xdc/std.h>
-#include <xdc/cfg/global.h>
-#include <xdc/runtime/Log.h>
-#include <xdc/runtime/System.h>
-
-/*
- *  ======== idleDapWatchDog ========
- *  IDLE function for DAP watchdog
- */
-Void idleDapWatchDog()
-{
-    //System_printf("Enter idleDapWatchDog()\n");    
-    //Log_info0("Enter idleDapWatchDog()");
-}
diff --git a/pasdk/test_dsp/sio/dbgDob.c b/pasdk/test_dsp/sio/dbgDob.c
deleted file mode 100644 (file)
index 887e2dd..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-
-/*
-Copyright (c) 2016, Texas Instruments Incorporated - http://www.ti.com/
-All rights reserved.
-
-* Redistribution and use in source and binary forms, with or without 
-* modification, are permitted provided that the following conditions
-* are met:
-*
-* Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-*
-* Redistributions in binary form must reproduce the above copyright
-* notice, this list of conditions and the following disclaimer in the
-* documentation and/or other materials provided with the
-* distribution.
-*
-* Neither the name of Texas Instruments Incorporated nor the names of
-* its contributors may be used to endorse or promote products derived
-* from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*/
-
-#include <xdc/std.h>
-
-#include "common.h"
-#include "outbuf.h"
-#include "dbgDob.h"
-
-#define CAP_OB
-#ifdef CAP_OB
-// OB capture buffers
-#pragma DATA_SECTION(gCapObBuf, ".gCapObBuf");
-Int32 gCapObBuf[CAP_OB_MAX_NUM_CH][CAP_OB_MAX_NUM_SAMP];
-Int32 gCapObBufIdx=0;
-Int32 gCapObBufWrap=0;
-static UInt32 capObStopCnt=5000;
-#endif  // CAP_OB
-
-#ifdef CAP_OB
-// Capture data in OB buffer to memory
-Void capOb(
-    PAF_OutBufConfig *pOutBufConfig
-)
-{
-    Int8 numCh;
-    Int16 numSamp;
-    Int8 sampSz;
-    Int32 samp;
-    Int8 *pCh;
-    Int16 i, j, k;
-    Int32 *pCapBuf;
-
-    if (--capObStopCnt == 0)
-    {
-        //SW_BREAKPOINT;
-    }
-
-    numCh = pOutBufConfig->stride; // get number of channels
-    numSamp = pOutBufConfig->lengthofFrame; // get number of samples to capture
-    sampSz = pOutBufConfig->sizeofElement; // get sample size (bytes)
-    
-    if ((CAP_OB_MAX_NUM_SAMP - gCapObBufIdx) < numSamp)
-    {
-        //return;
-        gCapObBufIdx = 0;
-        gCapObBufWrap++;
-    }
-        
-    for (i=0; i<numCh; i++)
-    {
-        pCapBuf = &gCapObBuf[i][gCapObBufIdx];
-        pCh = &pOutBufConfig->pntr.pSmInt[i*sampSz];
-        for (j=0; j<numSamp; j++)
-        {
-            samp = (Int32)(*(pCh+sampSz-1));
-            for (k=sampSz-2; k>=0; k--)
-            {
-                samp <<= 8;
-                samp |= (UInt8)(*(pCh+k));
-            }
-            samp <<= 32-8*sampSz;
-            
-            *pCapBuf = samp;
-            pCapBuf++;
-            pCh += numCh * sampSz;
-        }
-    }
-    gCapObBufIdx += numSamp;
-}
-#endif // CAP_OB
diff --git a/pasdk/test_dsp/sio/dbgDob.h b/pasdk/test_dsp/sio/dbgDob.h
deleted file mode 100644 (file)
index ff6663e..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-
-/*
-Copyright (c) 2016, Texas Instruments Incorporated - http://www.ti.com/
-All rights reserved.
-
-* Redistribution and use in source and binary forms, with or without 
-* modification, are permitted provided that the following conditions
-* are met:
-*
-* Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-*
-* Redistributions in binary form must reproduce the above copyright
-* notice, this list of conditions and the following disclaimer in the
-* documentation and/or other materials provided with the
-* distribution.
-*
-* Neither the name of Texas Instruments Incorporated nor the names of
-* its contributors may be used to endorse or promote products derived
-* from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*/
-
-#include <xdc/std.h>
-
-#include "outbuf.h"
-
-// OB capture buffer parameters
-#define CAP_OB_MAX_NUM_CH           ( 8 )
-#define CAP_OB_MAX_NUM_FRAME        ( 100 )
-#define CAP_OB_MAX_SAMP_PER_FRAME   ( 256 )
-#define CAP_OB_MAX_NUM_SAMP         ( CAP_OB_MAX_NUM_FRAME * CAP_OB_MAX_SAMP_PER_FRAME )
-
-// OB capture buffers
-extern Int32 gCapOpBuf[CAP_OB_MAX_NUM_CH][CAP_OB_MAX_NUM_SAMP];
-extern Int32 gCapObBufIdx;
-
-// Capture data in OB buffer to memory
-Void capOb(
-    PAF_OutBufConfig *pOutBufConfig
-);
-
index 4252e376803db2d99cdbfc6f35006eea3c03e658..68ec7570da87cad9b88112ffb0917d8c7a77ec22 100644 (file)
@@ -57,16 +57,6 @@ All rights reserved.
 
 #include "fwkPort.h"
 #include "dbgDib.h"
-#include "dbgDob.h"
-
-#ifdef SIMULATE_SIO
-static PAF_InpBufConfig *gpInpBufConfig;
-static PAF_OutBufConfig *gpOutBufConfig;
-
-static Int8 gPafSampRate=PAF_SAMPLERATE_48000HZ;
-static Int16 gIbPcmFrameLength=0;
-
-#endif // SIMULATE_SIO
 
 // stub for SIO create()
 SIO_Handle SIO_create(
@@ -77,24 +67,8 @@ SIO_Handle SIO_create(
 )
 {
     SIO_Handle  stream;
-#ifdef SIMULATE_SIO
-    DEV_Handle  device;                 /* == stream */
-    Error_Block eb;
-#endif // SIMULATE_SIO
 
     Log_info2("SIO_create():mode=%d, size=%d", mode, size);
-#ifdef SIMULATE_SIO    
-    Error_init(&eb);
-    stream = (SIO_Handle)Memory_calloc(NULL, sizeof(SIO_Obj), 0, &eb);
-    
-    /* first field in SIO_Obj is a DEV_Obj */
-    device = (DEV_Handle)stream;    
-    
-    /* fill in device object fields */
-    device->mode = mode;                /* DEV_INPUT or DEV_OUTPUT */
-    
-    Log_info1("SIO_create():stream=0x%x", (IArg)stream);
-#else // SIMULATE_SIO
     SIO2_Attrs attrs2;
     attrs2.nbufs  = attrs->nbufs;
     attrs2.bufSeg = (IHeap_Handle)pafHeapMgr_readHeapHandle(attrs->segid);
@@ -104,7 +78,6 @@ SIO_Handle SIO_create(
     attrs2.timeout = attrs->timeout;
     attrs2.callback = attrs->callback;
     stream = SIO2_create(name, mode, size, &attrs2);
-#endif // SIMULATE_SIO
 
     return stream;
 }
@@ -116,43 +89,7 @@ SIO_ctrl(
     Arg arg
 )
 {
-#ifdef SIMULATE_SIO
-    PAF_SIO_InputStatus *pInputStatus;
-    XDAS_Int8 *pSourceProgram;
-#endif // SIMULATE_SIO
-
-#ifdef SIMULATE_SIO    
-    // Set values to same values from I-topo PCM, 48 kHz from DA830 EVM
-    switch (cmd)
-    {
-        case PAF_SIO_CONTROL_GET_INPUT_STATUS:
-            //Log_info3("SIO_ctrl():stream=0x%x, cmd=0x%x, arg=%d", (IArg)stream, cmd, arg);    
-            pInputStatus = (PAF_SIO_InputStatus *)arg;
-            pInputStatus->lock = 0x01;
-            pInputStatus->nonaudio = 0x01;
-            pInputStatus->emphasis = 0x01;
-            pInputStatus->sampleRateMeasured = gPafSampRate;
-            pInputStatus->sampleRateData = gPafSampRate;
-            break;
-        case PAF_SIO_CONTROL_GET_SOURCEPROGRAM:
-            //Log_info3("SIO_ctrl():stream=0x%x, cmd=0x%x, arg=%d", (IArg)stream, cmd, arg);
-            pSourceProgram = (XDAS_Int8 *)arg;
-            *pSourceProgram = PAF_SOURCE_PCM;
-            break;
-        case PAF_SIO_CONTROL_SET_PCMFRAMELENGTH:
-            //Log_info3("SIO_ctrl():stream=0x%x, cmd=0x%x, arg=%d", (IArg)stream, cmd, arg);    
-            gIbPcmFrameLength = arg;
-            break;
-        default:
-            //Log_info3("SIO_ctrl():unsupported command, stream=0x%x, cmd=0x%x, arg=%d", (IArg)stream, cmd, arg);    
-
-            break;
-    }
-    
-    return SYS_OK;
-#else
     return SIO2_ctrl(stream, cmd, arg);
-#endif
 }
 
 // stub for _SIO_idle
@@ -161,15 +98,7 @@ Int _SIO_idle(
     Bool flush
 )
 {
-#ifdef SIMULATE_SIO
-    Log_info2("SIO_idle():stream=0x%x, flush=%d,arg=%d", (IArg)stream, flush);
-#endif // SIMULATE_SIO
-    
-#ifndef SIMULATE_SIO
     return _SIO2_idle(stream, flush);
-#else // SIMULATE_SIO
-    return SYS_OK;
-#endif // SIMULATE_SIO
 }
 
 // stub for SIO_issue()
@@ -180,45 +109,7 @@ Int SIO_issue(
     Arg arg
 )
 {
-#ifdef SIMULATE_SIO        
-    switch (arg)
-    {
-        case 0:
-            //Log_info4("SIO_issue():Tx stream=0x%x, pbuf=0x%x, nbytes=%d, arg=0x%x", (IArg)stream, (IArg)pbuf, nbytes, arg);
-    
-            //
-            // Send full buffer to Tx SIO driver
-            //
-            
-            // Capture Tx data here.
-            // Get data in pbuf->pntr.pSmInt.
-            gpOutBufConfig = (PAF_OutBufConfig *)pbuf;
-            gpOutBufConfig->stride = 8;
-            gpOutBufConfig->sizeofElement = 3;
-            gpOutBufConfig->precision = 24;
-            gpOutBufConfig->sizeofBuffer = gpOutBufConfig->allocation;           
-            
-            capOb(gpOutBufConfig);
-            
-            break;
-        case PAF_SIO_REQUEST_SYNC:
-        case PAF_SIO_REQUEST_NEWFRAME:
-            //Log_info4("SIO_issue():Rx stream=0x%x, pbuf=0x%x, nbytes=%d, arg=0x%x", (IArg)stream, (IArg)pbuf, nbytes, arg);
-            
-            //
-            // Send empty buffer to Rx SIO driver
-            //
-            gpInpBufConfig = (PAF_InpBufConfig *)pbuf;
-            break;
-        default:
-            //Log_info4("SIO_issue():unsupported arg, stream=0x%x, pbuf=0x%x, nbytes=%d, arg=0x%x", (IArg)stream, (IArg)pbuf, nbytes, arg);
-            break;
-    }
-    
-    return SYS_OK;
-#else // SIMULATE_SIO
     return SIO2_issue(stream, pbuf, nbytes, arg);
-#endif // SIMULATE_SIO
 }
 
 // stub for SIO_reclaim()
@@ -228,59 +119,6 @@ Int SIO_reclaim(
     Arg *parg
 )
 {    
-#ifdef SIMULATE_SIO
-    DEV_Handle  device;                 /* == stream */
-    
-    /* first field in SIO_Obj is a DEV_Obj */
-    device = (DEV_Handle)stream;    
-
-    if (device->mode == 0) // Rx
-    {
-        Log_info4("SIO_reclaim():Rx stream=0x%x, ppbuf=0x%x, parg=0x%x, mode=%d", (IArg)stream, (IArg)ppbuf, (IArg)parg, device->mode);
-    
-        //
-        // Receive full buffer from Rx SIO driver.
-        //
-        gpInpBufConfig->sizeofBuffer = 180224;
-        gpInpBufConfig->sizeofElement = 4;
-        gpInpBufConfig->stride = 8;
-        //gpInpBufConfig->deliverZeros = 1;
-        gpInpBufConfig->frameLength = 2048; // = stride * PCM frame length = 8 ch * 256 samp/ch = 2048 samp
-        gpInpBufConfig->lengthofData = 2048;
-
-        // Generate Rx data here.
-        // Put data in gpInpBufConfig->pntr.pLgInt.
-        memset(gpInpBufConfig->pntr.pSmInt, 0, 
-            gpInpBufConfig->frameLength*gpInpBufConfig->sizeofElement);
-        genSinIb(gpInpBufConfig);
-        
-        *ppbuf = gpInpBufConfig;
-        
-        // Simulate Rx SIO_reclaim() pend
-        Semaphore_pend(semaphoreRxAudio, BIOS_WAIT_FOREVER); 
-
-        return sizeof(PAF_InpBufConfig);
-    }
-    else if (device->mode == 1) // Tx
-    {
-        Log_info4("SIO_reclaim():Tx stream=0x%x, ppbuf=0x%x, parg=0x%x, mode=%d", (IArg)stream, (IArg)ppbuf, (IArg)parg, device->mode);
-        
-        //
-        // Receive empty buffer from Tx SIO driver
-        //
-        *ppbuf = gpOutBufConfig;
-        // Simulate Tx SIO_reclaim() pend
-        Semaphore_pend(semaphoreTxAudio, BIOS_WAIT_FOREVER); 
-        return sizeof(PAF_OutBufConfig);
-    }
-    else
-    {
-        Log_info4("SIO_reclaim():unsupported device mode, stream=0x%x, ppbuf=0x%x, parg=0x%x, mode=%d", (IArg)stream, (IArg)ppbuf, (IArg)parg, device->mode);
-        return -1;
-    }
-#else // SIMULATE_SIO
     DEV2_Handle  device;                 /* == stream */
 
     /* first field in SIO_Obj is a DEV_Obj */
@@ -288,5 +126,4 @@ Int SIO_reclaim(
     Log_info4("SIO_reclaim:stream=0x%x, ppbuf=0x%x, parg=0x%x, mode=%d", (IArg)stream, (IArg)ppbuf, (IArg)parg, device->mode);
 
     return SIO2_reclaim(stream, ppbuf, parg);
-#endif // SIMULATE_SIO
 }