realtime_demo_bios: update the demo using cmb to replace the cmbk2g
authorMing Wei <a0868762@ti.com>
Wed, 25 Jan 2017 16:07:51 +0000 (10:07 -0600)
committerMing Wei <a0868762@ti.com>
Wed, 25 Jan 2017 16:07:51 +0000 (10:07 -0600)
Signed-off-by: Ming Wei <a0868762@ti.com>
15 files changed:
realtime_demo_bios/k2g/.cproject
realtime_demo_bios/k2g/.xdchelp [deleted file]
realtime_demo_bios/k2g/build/makefile
realtime_demo_bios/k2g/build/objects.mk
realtime_demo_bios/k2g/build/src/subdir_rules.mk
realtime_demo_bios/k2g/build/src/subdir_vars.mk
realtime_demo_bios/k2g/build/subdir_rules.mk
realtime_demo_bios/k2g/include/analog_test.h
realtime_demo_bios/k2g/include/audio_cfg.h [moved from realtime_demo_bios/k2g/include/audio_dc_cfg.h with 76% similarity]
realtime_demo_bios/k2g/include/edma_cfg.h
realtime_demo_bios/k2g/include/mcasp_cfg.h
realtime_demo_bios/k2g/src/audio_cfg.c [moved from realtime_demo_bios/k2g/src/audio_dc_cfg.c with 50% similarity]
realtime_demo_bios/k2g/src/edma_cfg.c
realtime_demo_bios/k2g/src/main.c
realtime_demo_bios/k2g/src/mcasp_cfg.c

index 9dd600e4d61081e7d01b142f05fa81a990f21fb8..d102d05617ca20f145854d32e4c016f7983ab1c1 100644 (file)
@@ -45,7 +45,8 @@
                                                                        <listOptionValue builtIn="false" value="&quot;${PDK_INSTALL_PATH}/ti/drv/mcasp&quot;"/>\r
                                                                        <listOptionValue builtIn="false" value="&quot;${PDK_INSTALL_PATH}/ti/board&quot;"/>\r
                                                                        <listOptionValue builtIn="false" value="&quot;${PDK_INSTALL_PATH}/ti/board/src/evmK2G/include&quot;"/>\r
-                                                                       <listOptionValue builtIn="false" value="&quot;${PDK_INSTALL_PATH}/ti/addon/cmbk2g/include&quot;"/>\r
+                                                                       <listOptionValue builtIn="false" value="&quot;${PDK_INSTALL_PATH}/ti/addon/cmb&quot;"/>\r
+                                                                       <listOptionValue builtIn="false" value="&quot;${PDK_INSTALL_PATH}/ti/addon/cmb/src/evmK2G/include&quot;"/>\r
                                                                        <listOptionValue builtIn="false" value="&quot;${PDK_INSTALL_PATH}&quot;"/>\r
                                                                        <listOptionValue builtIn="false" value="&quot;${CSL_INSTALL_PATH}&quot;"/>\r
                                                                </option>\r
@@ -56,7 +57,7 @@
                                                                        <listOptionValue builtIn="false" value="evmK2G"/>\r
                                                                        <listOptionValue builtIn="false" value="PLATFORM_INIT_IN"/>\r
                                                                        <listOptionValue builtIn="false" value="BUILD_DSP"/>\r
-                                                                       <listOptionValue builtIn="false" value="CMBK2G_AUDIO_DAC=1"/>\r
+                                                                       <listOptionValue builtIn="false" value="CMB_AUDIO_DAC=1"/>\r
                                                                </option>\r
                                                                <option id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.DIAG_WARNING.1939740913" name="Treat diagnostic &lt;id&gt; as warning (--diag_warning, -pdsw)" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.DIAG_WARNING" valueType="stringList">\r
                                                                        <listOptionValue builtIn="false" value="225"/>\r
@@ -79,7 +80,7 @@
                                                                <option id="com.ti.ccstudio.buildDefinitions.C6000_8.1.linkerID.MAP_FILE.945167607" name="Link information (map) listed into &lt;file&gt; (--map_file, -m)" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.linkerID.MAP_FILE" value="&quot;${ProjName}.map&quot;" valueType="string"/>\r
                                                                <option id="com.ti.ccstudio.buildDefinitions.C6000_8.1.linkerID.LIBRARY.795000517" name="Include library file or command file as input (--library, -l)" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.linkerID.LIBRARY" valueType="libs">\r
                                                                        <listOptionValue builtIn="false" value="&quot;libc.a&quot;"/>\r
-                                                                       <listOptionValue builtIn="false" value="ti.addon.cmbk2g.ae66"/>\r
+                                                                       <listOptionValue builtIn="false" value="ti.addon.cmb.ae66"/>\r
                                                                        <listOptionValue builtIn="false" value="ti.board.ae66"/>\r
                                                                        <listOptionValue builtIn="false" value="ti.drv.mcasp.ae66"/>\r
                                                                        <listOptionValue builtIn="false" value="aer_c.ae64P"/>\r
@@ -93,7 +94,7 @@
                                                                        <listOptionValue builtIn="false" value="&quot;${CG_TOOL_ROOT}/lib&quot;"/>\r
                                                                        <listOptionValue builtIn="false" value="&quot;${CG_TOOL_ROOT}/include&quot;"/>\r
                                                                        <listOptionValue builtIn="false" value="&quot;${PDK_INSTALL_PATH}/ti/board/lib/evmK2G/c66/release&quot;"/>\r
-                                                                       <listOptionValue builtIn="false" value="&quot;${PDK_INSTALL_PATH}/ti/addon/cmbk2g/lib/k2g/c66/release&quot;"/>\r
+                                                                       <listOptionValue builtIn="false" value="&quot;${PDK_INSTALL_PATH}/ti/addon/cmb/lib/k2g/c66/release&quot;"/>\r
                                                                        <listOptionValue builtIn="false" value="&quot;${PDK_INSTALL_PATH}/ti/drv/mcasp/lib/k2g/c66/release&quot;"/>\r
                                                                        <listOptionValue builtIn="false" value="&quot;${TI_MAS_AER_C64PX_INSTALL_DIR}/packages/ti/mas/aer/lib&quot;"/>\r
                                                                        <listOptionValue builtIn="false" value="&quot;${TI_MAS_VOLIB_C66_INSTALL_DIR}/packages/ti/mas/&quot;"/>\r
                                                                <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW.1501735578" name="Platform (-p)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW" value="evmTCI66AK2G02Custom" valueType="string"/>\r
                                                                <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE.618088451" name="Build-profile (-r)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE" value="debug" valueType="string"/>\r
                                                                <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR.1032420246" name="Compiler tools directory (-c)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR" value="&quot;${CG_TOOL_ROOT}&quot;" valueType="string"/>\r
-                                                               <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_CONFIGURATION_FILE.2009343288" name="Build configuration file (-b)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_CONFIGURATION_FILE" value="" valueType="string"/>\r
+                                                               <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_CONFIGURATION_FILE.2009343288" name="Build configuration file (-b)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_CONFIGURATION_FILE" value="&quot;${PROJECT_ROOT}/build/configPkg/config.bld&quot;" valueType="string"/>\r
                                                        </tool>\r
                                                </toolChain>\r
                                        </folderInfo>\r
                                        <sourceEntries>\r
-                                               <entry excluding="audiosample.cfg" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>\r
+                                               <entry excluding="build/configPkg/package/cfg/K2G_bf_rt_pe66.cfg|build/configPkg/package/build.cfg|audiosample.cfg" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>\r
                                        </sourceEntries>\r
                                </configuration>\r
                        </storageModule>\r
                                                                <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW.2015810350" name="Platform (-p)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.PLATFORM_RAW" value="ti.platforms.evmTCI66AK2G02" valueType="string"/>\r
                                                                <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE.969415792" name="Build-profile (-r)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_PROFILE" value="debug" valueType="string"/>\r
                                                                <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR.837297218" name="Compiler tools directory (-c)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.CODEGEN_TOOL_DIR" value="&quot;${CG_TOOL_ROOT}&quot;" valueType="string"/>\r
-                                                               <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_CONFIGURATION_FILE.498028139" name="Build configuration file (-b)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_CONFIGURATION_FILE" value="&quot;${PROJECT_ROOT}/make/configPkg/config.bld&quot;" valueType="string"/>\r
+                                                               <option id="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_CONFIGURATION_FILE.498028139" name="Build configuration file (-b)" superClass="com.ti.rtsc.buildDefinitions.XDC_3.16.tool.BUILD_CONFIGURATION_FILE" value="&quot;${PROJECT_ROOT}/build/configPkg/config.bld&quot;" valueType="string"/>\r
                                                        </tool>\r
                                                </toolChain>\r
                                        </folderInfo>\r
                                        <sourceEntries>\r
-                                               <entry excluding="src|audiosample.cfg" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>\r
                                                <entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src/sysbios"/>\r
+                                               <entry excluding="build/configPkg/package/cfg/K2G_bf_rt_pe66.cfg|build/configPkg/package/build.cfg|src|audiosample.cfg" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>\r
                                        </sourceEntries>\r
                                </configuration>\r
                        </storageModule>\r
diff --git a/realtime_demo_bios/k2g/.xdchelp b/realtime_demo_bios/k2g/.xdchelp
deleted file mode 100644 (file)
index e69de29..0000000
index 8624c09d925e0a3eab289361830dfbfbdebe3881..0b2a64bea12bf019f57d4fbf84cdd1a1e330fbf9 100644 (file)
@@ -26,7 +26,7 @@ ORDERED_OBJS += \
 "./syseram.obj" \
 "./sysiram.obj" \
 "./sysmss.obj" \
-"./src/audio_dc_cfg.obj" \
+"./src/audio_cfg.obj" \\r
 "./src/edma_cfg.obj" \
 "./src/main.obj" \
 "./src/mcasp_cfg.obj" \
@@ -34,7 +34,6 @@ ORDERED_OBJS += \
 "./src/sample_cs.obj" \
 "./src/sample_k2g_cfg.obj" \
 "./src/sample_k2g_int_reg.obj" \
-"./src/sine.obj" \
 "./src/test_exit.obj" \
 "../src/sysbios/BIOS.obj" \
 "../src/sysbios/c62_TaskSupport_asm.obj" \
@@ -47,7 +46,7 @@ ORDERED_OBJS += \
 "../bflinker.cmd" \
 $(GEN_CMDS__FLAG) \
 -llibc.a \
--lti.addon.cmbk2g.ae66 \\r
+-lti.addon.cmb.ae66 \\r
 -lti.board.ae66 \
 -lti.drv.mcasp.ae66 \
 -laer_c.ae64P \
@@ -191,7 +190,7 @@ all: K2G_bf_rt.out
 K2G_bf_rt.out: $(OBJS) $(CMD_SRCS) $(GEN_CMDS)\r
        @echo 'Building target: $@'\r
        @echo 'Invoking: C6000 Linker'\r
-       "$(C6X_GEN_INSTALL_PATH)/bin/cl6x" -mv6600 --abi=eabi --opt_for_speed=5 -g --define=DEVICE_K2G --define=SOC_K2G --define=evmK2G --define=PLATFORM_INIT_IN --define=BUILD_DSP --diag_warning=225 --diag_wrap=off --display_error_number -z -m"K2G_bf_rt.map" --stack_size=0x2000 -i"${C6X_GEN_INSTALL_PATH}/lib" -i"${C6X_GEN_INSTALL_PATH}/include" -i"${PDK_INSTALL_PATH}/ti/board/lib/evmK2G/c66/release" -i"${PDK_INSTALL_PATH}/ti/addon/cmbk2g/lib/k2g/c66/release" -i"${PDK_INSTALL_PATH}/ti/drv/mcasp/lib/k2g/c66/release" -i"${AER_INSTALL_PATH}/packages/ti/mas/aer/lib" -i"${VOLIB_INSTALL_PATH}/packages/ti/mas/" --reread_libs --diag_wrap=off --display_error_number --warn_sections --xml_link_info="K2G_bf_rt_linkInfo.xml" --rom_model -o "K2G_bf_rt.out" $(ORDERED_OBJS)\r
+       "$(C6X_GEN_INSTALL_PATH)/bin/cl6x" -mv6600 --abi=eabi --opt_for_speed=5 -g --define=DEVICE_K2G --define=SOC_K2G --define=evmK2G --define=PLATFORM_INIT_IN --define=BUILD_DSP --diag_warning=225 --diag_wrap=off --display_error_number -z -m"K2G_bf_rt.map" --stack_size=0x2000 -i"${C6X_GEN_INSTALL_PATH}/lib" -i"${C6X_GEN_INSTALL_PATH}/include" -i"${PDK_INSTALL_PATH}/ti/board/lib/evmK2G/c66/release" -i"${PDK_INSTALL_PATH}/ti/addon/cmb/lib/k2g/c66/release" -i"${PDK_INSTALL_PATH}/ti/drv/mcasp/lib/k2g/c66/release" -i"${AER_INSTALL_PATH}/packages/ti/mas/aer/lib" -i"${VOLIB_INSTALL_PATH}/packages/ti/mas/" --reread_libs --diag_wrap=off --display_error_number --warn_sections --xml_link_info="K2G_bf_rt_linkInfo.xml" --rom_model -o "K2G_bf_rt.out" $(ORDERED_OBJS)\r
        @echo 'Finished building target: $@'\r
        @echo ' '\r
 \r
@@ -205,8 +204,8 @@ K2G_bf_rt.hex: $(EXE_OUTPUTS)
 clean:\r
        -$(RM) $(GEN_MISC_FILES__QUOTED)$(EXE_OUTPUTS__QUOTED)$(GEN_FILES__QUOTED)$(BIN_OUTPUTS__QUOTED)$(GEN_OPTS__QUOTED)$(GEN_CMDS__QUOTED)\r
        -$(RMDIR) $(GEN_MISC_DIRS__QUOTED)\r
-       -$(RM) "fil.d" "mhm.d" "mss.d" "mssproc.d" "sys.d" "sysasnr.d" "sysbf.d" "sysbfflt.d" "sysdrc.d" "syseram.d" "sysiram.d" "sysmss.d" "src\audio_dc_cfg.d" "src\edma_cfg.d" "src\main.d" "src\mcasp_cfg.d" "src\mcasp_osal.d" "src\sample_cs.d" "src\sample_k2g_cfg.d" "src\sample_k2g_int_reg.d" "src\sine.d" "src\test_exit.d" \r
-       -$(RM) "fil.obj" "mhm.obj" "mss.obj" "mssproc.obj" "sys.obj" "sysasnr.obj" "sysbf.obj" "sysbfflt.obj" "sysdrc.obj" "syseram.obj" "sysiram.obj" "sysmss.obj" "src\audio_dc_cfg.obj" "src\edma_cfg.obj" "src\main.obj" "src\mcasp_cfg.obj" "src\mcasp_osal.obj" "src\sample_cs.obj" "src\sample_k2g_cfg.obj" "src\sample_k2g_int_reg.obj" "src\sine.obj" "src\test_exit.obj" \r
+       -$(RM) "fil.d" "mhm.d" "mss.d" "mssproc.d" "sys.d" "sysasnr.d" "sysbf.d" "sysbfflt.d" "sysdrc.d" "syseram.d" "sysiram.d" "sysmss.d" "src\audio_cfg.d" "src\edma_cfg.d" "src\main.d" "src\mcasp_cfg.d" "src\mcasp_osal.d" "src\sample_cs.d" "src\sample_k2g_cfg.d" "src\sample_k2g_int_reg.d" "src\test_exit.d" \r
+       -$(RM) "fil.obj" "mhm.obj" "mss.obj" "mssproc.obj" "sys.obj" "sysasnr.obj" "sysbf.obj" "sysbfflt.obj" "sysdrc.obj" "syseram.obj" "sysiram.obj" "sysmss.obj" "src\audio_cfg.obj" "src\edma_cfg.obj" "src\main.obj" "src\mcasp_cfg.obj" "src\mcasp_osal.obj" "src\sample_cs.obj" "src\sample_k2g_cfg.obj" "src\sample_k2g_int_reg.obj" "src\test_exit.obj" \r
        -@echo 'Finished clean'\r
        -@echo ' '\r
 \r
index dacbada1c1baafbd616b28ddc7b6ef39d3e55ba8..b1fa05fb041bf1d41c1e26f6031eaff5cb2dcd1b 100644 (file)
@@ -4,5 +4,5 @@
 \r
 USER_OBJS :=\r
 \r
-LIBS := -llibc.a -lti.addon.cmbk2g.ae66 -lti.board.ae66 -lti.drv.mcasp.ae66 -laer_c.ae64P -lvau/lib/vau_c.ae66 -lvpe/lib/vpe_a.ae66 -lvpe/lib/vpe_c.ae66 -lutil/lib/util_c.ae66 -lmhm/lib/mhm_c.ae66\r
+LIBS := -llibc.a -lti.addon.cmb.ae66 -lti.board.ae66 -lti.drv.mcasp.ae66 -laer_c.ae64P -lvau/lib/vau_c.ae66 -lvpe/lib/vpe_a.ae66 -lvpe/lib/vpe_c.ae66 -lutil/lib/util_c.ae66 -lmhm/lib/mhm_c.ae66\r
 \r
index 039da23a5d0926b04abf3c33fd2b41bfa94b7c7e..3616fd9c17126daecc4c372605f43f13a6338830 100644 (file)
@@ -3,73 +3,66 @@
 ################################################################################\r
 \r
 # Each subdirectory must supply rules for building sources it contributes\r
-src/audio_dc_cfg.obj: ../../../realtime_demo_bios/k2g/src/audio_dc_cfg.c $(GEN_OPTS) $(GEN_HDRS)\r
+src/audio_cfg.obj: ../../../realtime_demo_bios/k2g/src/audio_cfg.c $(GEN_OPTS) $(GEN_HDRS)\r
        @echo 'Building file: $<'\r
        @echo 'Invoking: C6000 Compiler'\r
-       "${C6X_GEN_INSTALL_PATH}/bin/cl6x" -mv6600 --abi=eabi --opt_for_speed=5 --include_path="${EDMA3LLD_BIOS6_INSTALLDIR}/packages" --include_path="${C6X_GEN_INSTALL_PATH}/include" --include_path="${PDK_INSTALL_PATH}/ti/board/diag/nand/src" --include_path="../../../realtime_demo_bios/k2g/include" --include_path="../../../common/components" --include_path="${PDK_INSTALL_PATH}/ti/drv/mcasp" --include_path="${PDK_INSTALL_PATH}/ti/board" --include_path="${PDK_INSTALL_PATH}/ti/board/src/evmK2G/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmbk2g/include" --include_path="${PDK_INSTALL_PATH}" --include_path="${PDK_INSTALL_PATH}/ti/csl" -g --define=DEVICE_K2G --define=SOC_K2G --define=evmK2G --define=PLATFORM_INIT_IN --define=BUILD_DSP --diag_warning=225 --diag_wrap=off --display_error_number --preproc_with_compile --preproc_dependency="src/audio_dc_cfg.d" --obj_directory="src" $(GEN_OPTS__FLAG) "$<"\r
+       "${C6X_GEN_INSTALL_PATH}/bin/cl6x" -mv6600 --abi=eabi --opt_for_speed=5 --include_path="${EDMA3LLD_BIOS6_INSTALLDIR}/packages" --include_path="${C6X_GEN_INSTALL_PATH}/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmb/src/evmK2G/include" --include_path="../../../realtime_demo_bios/k2g/include" --include_path="../../../common/components" --include_path="${PDK_INSTALL_PATH}/ti/drv/mcasp" --include_path="${PDK_INSTALL_PATH}/ti/board" --include_path="${PDK_INSTALL_PATH}/ti/board/src/evmK2G/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmb" --include_path="${PDK_INSTALL_PATH}" --include_path="${PDK_INSTALL_PATH}/ti/csl" -g --define=DEVICE_K2G --define=SOC_K2G --define=evmK2G --define=PLATFORM_INIT_IN --define=BUILD_DSP --diag_warning=225 --diag_wrap=off --display_error_number --preproc_with_compile --preproc_dependency="src/audio_cfg.d" --obj_directory="src" $(GEN_OPTS__FLAG) "$<"\r
        @echo 'Finished building: $<'\r
        @echo ' '\r
 \r
 src/edma_cfg.obj: ../../../realtime_demo_bios/k2g/src/edma_cfg.c $(GEN_OPTS) $(GEN_HDRS)\r
        @echo 'Building file: $<'\r
        @echo 'Invoking: C6000 Compiler'\r
-       "${C6X_GEN_INSTALL_PATH}/bin/cl6x" -mv6600 --abi=eabi --opt_for_speed=5 --include_path="${EDMA3LLD_BIOS6_INSTALLDIR}/packages" --include_path="${C6X_GEN_INSTALL_PATH}/include" --include_path="${PDK_INSTALL_PATH}/ti/board/diag/nand/src" --include_path="../../../realtime_demo_bios/k2g/include" --include_path="../../../common/components" --include_path="${PDK_INSTALL_PATH}/ti/drv/mcasp" --include_path="${PDK_INSTALL_PATH}/ti/board" --include_path="${PDK_INSTALL_PATH}/ti/board/src/evmK2G/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmbk2g/include" --include_path="${PDK_INSTALL_PATH}" --include_path="${PDK_INSTALL_PATH}/ti/csl" -g --define=DEVICE_K2G --define=SOC_K2G --define=evmK2G --define=PLATFORM_INIT_IN --define=BUILD_DSP --diag_warning=225 --diag_wrap=off --display_error_number --preproc_with_compile --preproc_dependency="src/edma_cfg.d" --obj_directory="src" $(GEN_OPTS__FLAG) "$<"\r
+       "${C6X_GEN_INSTALL_PATH}/bin/cl6x" -mv6600 --abi=eabi --opt_for_speed=5 --include_path="${EDMA3LLD_BIOS6_INSTALLDIR}/packages" --include_path="${C6X_GEN_INSTALL_PATH}/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmb/src/evmK2G/include" --include_path="../../../realtime_demo_bios/k2g/include" --include_path="../../../common/components" --include_path="${PDK_INSTALL_PATH}/ti/drv/mcasp" --include_path="${PDK_INSTALL_PATH}/ti/board" --include_path="${PDK_INSTALL_PATH}/ti/board/src/evmK2G/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmb" --include_path="${PDK_INSTALL_PATH}" --include_path="${PDK_INSTALL_PATH}/ti/csl" -g --define=DEVICE_K2G --define=SOC_K2G --define=evmK2G --define=PLATFORM_INIT_IN --define=BUILD_DSP --diag_warning=225 --diag_wrap=off --display_error_number --preproc_with_compile --preproc_dependency="src/edma_cfg.d" --obj_directory="src" $(GEN_OPTS__FLAG) "$<"\r
        @echo 'Finished building: $<'\r
        @echo ' '\r
 \r
 src/main.obj: ../../../realtime_demo_bios/k2g/src/main.c $(GEN_OPTS) $(GEN_HDRS)\r
        @echo 'Building file: $<'\r
        @echo 'Invoking: C6000 Compiler'\r
-       "${C6X_GEN_INSTALL_PATH}/bin/cl6x" -mv6600 --abi=eabi --opt_for_speed=5 --include_path="${EDMA3LLD_BIOS6_INSTALLDIR}/packages" --include_path="${C6X_GEN_INSTALL_PATH}/include" --include_path="${PDK_INSTALL_PATH}/ti/board/diag/nand/src" --include_path="../../../realtime_demo_bios/k2g/include" --include_path="../../../common/components" --include_path="${PDK_INSTALL_PATH}/ti/drv/mcasp" --include_path="${PDK_INSTALL_PATH}/ti/board" --include_path="${PDK_INSTALL_PATH}/ti/board/src/evmK2G/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmbk2g/include" --include_path="${PDK_INSTALL_PATH}" --include_path="${PDK_INSTALL_PATH}/ti/csl" -g --define=DEVICE_K2G --define=SOC_K2G --define=evmK2G --define=PLATFORM_INIT_IN --define=BUILD_DSP --diag_warning=225 --diag_wrap=off --display_error_number --preproc_with_compile --preproc_dependency="src/main.d" --obj_directory="src" $(GEN_OPTS__FLAG) "$<"\r
+       "${C6X_GEN_INSTALL_PATH}/bin/cl6x" -mv6600 --abi=eabi --opt_for_speed=5 --include_path="${EDMA3LLD_BIOS6_INSTALLDIR}/packages" --include_path="${C6X_GEN_INSTALL_PATH}/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmb/src/evmK2G/include" --include_path="../../../realtime_demo_bios/k2g/include" --include_path="../../../common/components" --include_path="${PDK_INSTALL_PATH}/ti/drv/mcasp" --include_path="${PDK_INSTALL_PATH}/ti/board" --include_path="${PDK_INSTALL_PATH}/ti/board/src/evmK2G/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmb" --include_path="${PDK_INSTALL_PATH}" --include_path="${PDK_INSTALL_PATH}/ti/csl" -g --define=DEVICE_K2G --define=SOC_K2G --define=evmK2G --define=PLATFORM_INIT_IN --define=BUILD_DSP --diag_warning=225 --diag_wrap=off --display_error_number --preproc_with_compile --preproc_dependency="src/main.d" --obj_directory="src" $(GEN_OPTS__FLAG) "$<"\r
        @echo 'Finished building: $<'\r
        @echo ' '\r
 \r
 src/mcasp_cfg.obj: ../../../realtime_demo_bios/k2g/src/mcasp_cfg.c $(GEN_OPTS) $(GEN_HDRS)\r
        @echo 'Building file: $<'\r
        @echo 'Invoking: C6000 Compiler'\r
-       "${C6X_GEN_INSTALL_PATH}/bin/cl6x" -mv6600 --abi=eabi --opt_for_speed=5 --include_path="${EDMA3LLD_BIOS6_INSTALLDIR}/packages" --include_path="${C6X_GEN_INSTALL_PATH}/include" --include_path="${PDK_INSTALL_PATH}/ti/board/diag/nand/src" --include_path="../../../realtime_demo_bios/k2g/include" --include_path="../../../common/components" --include_path="${PDK_INSTALL_PATH}/ti/drv/mcasp" --include_path="${PDK_INSTALL_PATH}/ti/board" --include_path="${PDK_INSTALL_PATH}/ti/board/src/evmK2G/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmbk2g/include" --include_path="${PDK_INSTALL_PATH}" --include_path="${PDK_INSTALL_PATH}/ti/csl" -g --define=DEVICE_K2G --define=SOC_K2G --define=evmK2G --define=PLATFORM_INIT_IN --define=BUILD_DSP --diag_warning=225 --diag_wrap=off --display_error_number --preproc_with_compile --preproc_dependency="src/mcasp_cfg.d" --obj_directory="src" $(GEN_OPTS__FLAG) "$<"\r
+       "${C6X_GEN_INSTALL_PATH}/bin/cl6x" -mv6600 --abi=eabi --opt_for_speed=5 --include_path="${EDMA3LLD_BIOS6_INSTALLDIR}/packages" --include_path="${C6X_GEN_INSTALL_PATH}/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmb/src/evmK2G/include" --include_path="../../../realtime_demo_bios/k2g/include" --include_path="../../../common/components" --include_path="${PDK_INSTALL_PATH}/ti/drv/mcasp" --include_path="${PDK_INSTALL_PATH}/ti/board" --include_path="${PDK_INSTALL_PATH}/ti/board/src/evmK2G/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmb" --include_path="${PDK_INSTALL_PATH}" --include_path="${PDK_INSTALL_PATH}/ti/csl" -g --define=DEVICE_K2G --define=SOC_K2G --define=evmK2G --define=PLATFORM_INIT_IN --define=BUILD_DSP --diag_warning=225 --diag_wrap=off --display_error_number --preproc_with_compile --preproc_dependency="src/mcasp_cfg.d" --obj_directory="src" $(GEN_OPTS__FLAG) "$<"\r
        @echo 'Finished building: $<'\r
        @echo ' '\r
 \r
 src/mcasp_osal.obj: ../../../realtime_demo_bios/k2g/src/mcasp_osal.c $(GEN_OPTS) $(GEN_HDRS)\r
        @echo 'Building file: $<'\r
        @echo 'Invoking: C6000 Compiler'\r
-       "${C6X_GEN_INSTALL_PATH}/bin/cl6x" -mv6600 --abi=eabi --opt_for_speed=5 --include_path="${EDMA3LLD_BIOS6_INSTALLDIR}/packages" --include_path="${C6X_GEN_INSTALL_PATH}/include" --include_path="${PDK_INSTALL_PATH}/ti/board/diag/nand/src" --include_path="../../../realtime_demo_bios/k2g/include" --include_path="../../../common/components" --include_path="${PDK_INSTALL_PATH}/ti/drv/mcasp" --include_path="${PDK_INSTALL_PATH}/ti/board" --include_path="${PDK_INSTALL_PATH}/ti/board/src/evmK2G/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmbk2g/include" --include_path="${PDK_INSTALL_PATH}" --include_path="${PDK_INSTALL_PATH}/ti/csl" -g --define=DEVICE_K2G --define=SOC_K2G --define=evmK2G --define=PLATFORM_INIT_IN --define=BUILD_DSP --diag_warning=225 --diag_wrap=off --display_error_number --preproc_with_compile --preproc_dependency="src/mcasp_osal.d" --obj_directory="src" $(GEN_OPTS__FLAG) "$<"\r
+       "${C6X_GEN_INSTALL_PATH}/bin/cl6x" -mv6600 --abi=eabi --opt_for_speed=5 --include_path="${EDMA3LLD_BIOS6_INSTALLDIR}/packages" --include_path="${C6X_GEN_INSTALL_PATH}/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmb/src/evmK2G/include" --include_path="../../../realtime_demo_bios/k2g/include" --include_path="../../../common/components" --include_path="${PDK_INSTALL_PATH}/ti/drv/mcasp" --include_path="${PDK_INSTALL_PATH}/ti/board" --include_path="${PDK_INSTALL_PATH}/ti/board/src/evmK2G/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmb" --include_path="${PDK_INSTALL_PATH}" --include_path="${PDK_INSTALL_PATH}/ti/csl" -g --define=DEVICE_K2G --define=SOC_K2G --define=evmK2G --define=PLATFORM_INIT_IN --define=BUILD_DSP --diag_warning=225 --diag_wrap=off --display_error_number --preproc_with_compile --preproc_dependency="src/mcasp_osal.d" --obj_directory="src" $(GEN_OPTS__FLAG) "$<"\r
        @echo 'Finished building: $<'\r
        @echo ' '\r
 \r
 src/sample_cs.obj: ../../../realtime_demo_bios/k2g/src/sample_cs.c $(GEN_OPTS) $(GEN_HDRS)\r
        @echo 'Building file: $<'\r
        @echo 'Invoking: C6000 Compiler'\r
-       "${C6X_GEN_INSTALL_PATH}/bin/cl6x" -mv6600 --abi=eabi --opt_for_speed=5 --include_path="${EDMA3LLD_BIOS6_INSTALLDIR}/packages" --include_path="${C6X_GEN_INSTALL_PATH}/include" --include_path="${PDK_INSTALL_PATH}/ti/board/diag/nand/src" --include_path="../../../realtime_demo_bios/k2g/include" --include_path="../../../common/components" --include_path="${PDK_INSTALL_PATH}/ti/drv/mcasp" --include_path="${PDK_INSTALL_PATH}/ti/board" --include_path="${PDK_INSTALL_PATH}/ti/board/src/evmK2G/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmbk2g/include" --include_path="${PDK_INSTALL_PATH}" --include_path="${PDK_INSTALL_PATH}/ti/csl" -g --define=DEVICE_K2G --define=SOC_K2G --define=evmK2G --define=PLATFORM_INIT_IN --define=BUILD_DSP --diag_warning=225 --diag_wrap=off --display_error_number --preproc_with_compile --preproc_dependency="src/sample_cs.d" --obj_directory="src" $(GEN_OPTS__FLAG) "$<"\r
+       "${C6X_GEN_INSTALL_PATH}/bin/cl6x" -mv6600 --abi=eabi --opt_for_speed=5 --include_path="${EDMA3LLD_BIOS6_INSTALLDIR}/packages" --include_path="${C6X_GEN_INSTALL_PATH}/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmb/src/evmK2G/include" --include_path="../../../realtime_demo_bios/k2g/include" --include_path="../../../common/components" --include_path="${PDK_INSTALL_PATH}/ti/drv/mcasp" --include_path="${PDK_INSTALL_PATH}/ti/board" --include_path="${PDK_INSTALL_PATH}/ti/board/src/evmK2G/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmb" --include_path="${PDK_INSTALL_PATH}" --include_path="${PDK_INSTALL_PATH}/ti/csl" -g --define=DEVICE_K2G --define=SOC_K2G --define=evmK2G --define=PLATFORM_INIT_IN --define=BUILD_DSP --diag_warning=225 --diag_wrap=off --display_error_number --preproc_with_compile --preproc_dependency="src/sample_cs.d" --obj_directory="src" $(GEN_OPTS__FLAG) "$<"\r
        @echo 'Finished building: $<'\r
        @echo ' '\r
 \r
 src/sample_k2g_cfg.obj: ../../../realtime_demo_bios/k2g/src/sample_k2g_cfg.c $(GEN_OPTS) $(GEN_HDRS)\r
        @echo 'Building file: $<'\r
        @echo 'Invoking: C6000 Compiler'\r
-       "${C6X_GEN_INSTALL_PATH}/bin/cl6x" -mv6600 --abi=eabi --opt_for_speed=5 --include_path="${EDMA3LLD_BIOS6_INSTALLDIR}/packages" --include_path="${C6X_GEN_INSTALL_PATH}/include" --include_path="${PDK_INSTALL_PATH}/ti/board/diag/nand/src" --include_path="../../../realtime_demo_bios/k2g/include" --include_path="../../../common/components" --include_path="${PDK_INSTALL_PATH}/ti/drv/mcasp" --include_path="${PDK_INSTALL_PATH}/ti/board" --include_path="${PDK_INSTALL_PATH}/ti/board/src/evmK2G/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmbk2g/include" --include_path="${PDK_INSTALL_PATH}" --include_path="${PDK_INSTALL_PATH}/ti/csl" -g --define=DEVICE_K2G --define=SOC_K2G --define=evmK2G --define=PLATFORM_INIT_IN --define=BUILD_DSP --diag_warning=225 --diag_wrap=off --display_error_number --preproc_with_compile --preproc_dependency="src/sample_k2g_cfg.d" --obj_directory="src" $(GEN_OPTS__FLAG) "$<"\r
+       "${C6X_GEN_INSTALL_PATH}/bin/cl6x" -mv6600 --abi=eabi --opt_for_speed=5 --include_path="${EDMA3LLD_BIOS6_INSTALLDIR}/packages" --include_path="${C6X_GEN_INSTALL_PATH}/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmb/src/evmK2G/include" --include_path="../../../realtime_demo_bios/k2g/include" --include_path="../../../common/components" --include_path="${PDK_INSTALL_PATH}/ti/drv/mcasp" --include_path="${PDK_INSTALL_PATH}/ti/board" --include_path="${PDK_INSTALL_PATH}/ti/board/src/evmK2G/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmb" --include_path="${PDK_INSTALL_PATH}" --include_path="${PDK_INSTALL_PATH}/ti/csl" -g --define=DEVICE_K2G --define=SOC_K2G --define=evmK2G --define=PLATFORM_INIT_IN --define=BUILD_DSP --diag_warning=225 --diag_wrap=off --display_error_number --preproc_with_compile --preproc_dependency="src/sample_k2g_cfg.d" --obj_directory="src" $(GEN_OPTS__FLAG) "$<"\r
        @echo 'Finished building: $<'\r
        @echo ' '\r
 \r
 src/sample_k2g_int_reg.obj: ../../../realtime_demo_bios/k2g/src/sample_k2g_int_reg.c $(GEN_OPTS) $(GEN_HDRS)\r
        @echo 'Building file: $<'\r
        @echo 'Invoking: C6000 Compiler'\r
-       "${C6X_GEN_INSTALL_PATH}/bin/cl6x" -mv6600 --abi=eabi --opt_for_speed=5 --include_path="${C6X_GEN_INSTALL_PATH}/include" --include_path="${PDK_INSTALL_PATH}/ti/board/diag/nand/src" --include_path="../../../realtime_demo_bios/k2g/include" --include_path="../../../common/components" --include_path="${PDK_INSTALL_PATH}/ti/drv/mcasp" --include_path="${PDK_INSTALL_PATH}/ti/board" --include_path="${PDK_INSTALL_PATH}/ti/board/src/evmK2G/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmbk2g/include" --include_path="${PDK_INSTALL_PATH}" --include_path="${PDK_INSTALL_PATH}/ti/csl" -g --define=DEVICE_K2G --define=SOC_K2G --define=evmK2G --define=PLATFORM_INIT_IN --define=BUILD_DSP --diag_warning=225 --diag_wrap=off --display_error_number --preproc_with_compile --preproc_dependency="src/sample_k2g_int_reg.d" --obj_directory="src" $(GEN_OPTS__FLAG) "$<"\r
-       @echo 'Finished building: $<'\r
-       @echo ' '\r
-\r
-src/sine.obj: ../../../realtime_demo_bios/k2g/src/sine.c $(GEN_OPTS) $(GEN_HDRS)\r
-       @echo 'Building file: $<'\r
-       @echo 'Invoking: C6000 Compiler'\r
-       "${C6X_GEN_INSTALL_PATH}/bin/cl6x" -mv6600 --abi=eabi --opt_for_speed=5 --include_path="${EDMA3LLD_BIOS6_INSTALLDIR}/packages" --include_path="${C6X_GEN_INSTALL_PATH}/include" --include_path="${PDK_INSTALL_PATH}/ti/board/diag/nand/src" --include_path="../../../realtime_demo_bios/k2g/include" --include_path="../../../common/components" --include_path="${PDK_INSTALL_PATH}/ti/drv/mcasp" --include_path="${PDK_INSTALL_PATH}/ti/board" --include_path="${PDK_INSTALL_PATH}/ti/board/src/evmK2G/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmbk2g/include" --include_path="${PDK_INSTALL_PATH}" --include_path="${PDK_INSTALL_PATH}/ti/csl" -g --define=DEVICE_K2G --define=SOC_K2G --define=evmK2G --define=PLATFORM_INIT_IN --define=BUILD_DSP --diag_warning=225 --diag_wrap=off --display_error_number --preproc_with_compile --preproc_dependency="src/sine.d" --obj_directory="src" $(GEN_OPTS__FLAG) "$<"\r
+       "${C6X_GEN_INSTALL_PATH}/bin/cl6x" -mv6600 --abi=eabi --opt_for_speed=5 --include_path="${C6X_GEN_INSTALL_PATH}/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmb/src/evmK2G/include" --include_path="../../../realtime_demo_bios/k2g/include" --include_path="../../../common/components" --include_path="${PDK_INSTALL_PATH}/ti/drv/mcasp" --include_path="${PDK_INSTALL_PATH}/ti/board" --include_path="${PDK_INSTALL_PATH}/ti/board/src/evmK2G/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmb" --include_path="${PDK_INSTALL_PATH}" --include_path="${PDK_INSTALL_PATH}/ti/csl" -g --define=DEVICE_K2G --define=SOC_K2G --define=evmK2G --define=PLATFORM_INIT_IN --define=BUILD_DSP --diag_warning=225 --diag_wrap=off --display_error_number --preproc_with_compile --preproc_dependency="src/sample_k2g_int_reg.d" --obj_directory="src" $(GEN_OPTS__FLAG) "$<"\r
        @echo 'Finished building: $<'\r
        @echo ' '\r
 \r
 src/test_exit.obj: ../../../realtime_demo_bios/k2g/src/test_exit.c $(GEN_OPTS) $(GEN_HDRS)\r
        @echo 'Building file: $<'\r
        @echo 'Invoking: C6000 Compiler'\r
-       "${C6X_GEN_INSTALL_PATH}/bin/cl6x" -mv6600 --abi=eabi --opt_for_speed=5 --include_path="${EDMA3LLD_BIOS6_INSTALLDIR}/packages" --include_path="${C6X_GEN_INSTALL_PATH}/include" --include_path="${PDK_INSTALL_PATH}/ti/board/diag/nand/src" --include_path="../../../realtime_demo_bios/k2g/include" --include_path="../../../common/components" --include_path="${PDK_INSTALL_PATH}/ti/drv/mcasp" --include_path="${PDK_INSTALL_PATH}/ti/board" --include_path="${PDK_INSTALL_PATH}/ti/board/src/evmK2G/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmbk2g/include" --include_path="${PDK_INSTALL_PATH}" --include_path="${PDK_INSTALL_PATH}/ti/csl" -g --define=DEVICE_K2G --define=SOC_K2G --define=evmK2G --define=PLATFORM_INIT_IN --define=BUILD_DSP --diag_warning=225 --diag_wrap=off --display_error_number --preproc_with_compile --preproc_dependency="src/test_exit.d" --obj_directory="src" $(GEN_OPTS__FLAG) "$<"\r
+       "${C6X_GEN_INSTALL_PATH}/bin/cl6x" -mv6600 --abi=eabi --opt_for_speed=5 --include_path="${EDMA3LLD_BIOS6_INSTALLDIR}/packages" --include_path="${C6X_GEN_INSTALL_PATH}/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmb/src/evmK2G/include" --include_path="../../../realtime_demo_bios/k2g/include" --include_path="../../../common/components" --include_path="${PDK_INSTALL_PATH}/ti/drv/mcasp" --include_path="${PDK_INSTALL_PATH}/ti/board" --include_path="${PDK_INSTALL_PATH}/ti/board/src/evmK2G/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmb" --include_path="${PDK_INSTALL_PATH}" --include_path="${PDK_INSTALL_PATH}/ti/csl" -g --define=DEVICE_K2G --define=SOC_K2G --define=evmK2G --define=PLATFORM_INIT_IN --define=BUILD_DSP --diag_warning=225 --diag_wrap=off --display_error_number --preproc_with_compile --preproc_dependency="src/test_exit.d" --obj_directory="src" $(GEN_OPTS__FLAG) "$<"\r
        @echo 'Finished building: $<'\r
        @echo ' '\r
 \r
index dfd64424bf27402e9eee5e58770516977d1ce027..82d068ecc8cf263e26d604636c42a13342e403eb 100644 (file)
@@ -4,7 +4,7 @@
 \r
 # Add inputs and outputs from these tool invocations to the build variables \r
 C_SRCS += \
-../src/audio_dc_cfg.c \
+../src/audio_cfg.c \
 ../src/edma_cfg.c \
 ../src/main.c \
 ../src/mcasp_cfg.c \
@@ -12,11 +12,10 @@ C_SRCS += \
 ../src/sample_cs.c \
 ../src/sample_k2g_cfg.c \
 ../src/sample_k2g_int_reg.c \
-../src/sine.c \
 ../src/test_exit.c \r
 \r
 OBJS += \
-./src/audio_dc_cfg.obj \
+./src/audio_cfg.obj \
 ./src/edma_cfg.obj \
 ./src/main.obj \
 ./src/mcasp_cfg.obj \
@@ -24,11 +23,10 @@ OBJS += \
 ./src/sample_cs.obj \
 ./src/sample_k2g_cfg.obj \
 ./src/sample_k2g_int_reg.obj \
-./src/sine.obj \
 ./src/test_exit.obj \r
 \r
 C_DEPS += \
-./src/audio_dc_cfg.d \
+./src/audio_cfg.d \
 ./src/edma_cfg.d \
 ./src/main.d \
 ./src/mcasp_cfg.d \
@@ -36,11 +34,10 @@ C_DEPS += \
 ./src/sample_cs.d \
 ./src/sample_k2g_cfg.d \
 ./src/sample_k2g_int_reg.d \
-./src/sine.d \
 ./src/test_exit.d \r
 \r
 C_DEPS__QUOTED += \
-"src\audio_dc_cfg.d" \
+"src\audio_cfg.d" \
 "src\edma_cfg.d" \
 "src\main.d" \
 "src\mcasp_cfg.d" \
@@ -48,11 +45,10 @@ C_DEPS__QUOTED += \
 "src\sample_cs.d" \
 "src\sample_k2g_cfg.d" \
 "src\sample_k2g_int_reg.d" \
-"src\sine.d" \
 "src\test_exit.d" \r
 \r
 OBJS__QUOTED += \
-"src\audio_dc_cfg.obj" \
+"src\audio_cfg.obj" \
 "src\edma_cfg.obj" \
 "src\main.obj" \
 "src\mcasp_cfg.obj" \
@@ -60,11 +56,10 @@ OBJS__QUOTED += \
 "src\sample_cs.obj" \
 "src\sample_k2g_cfg.obj" \
 "src\sample_k2g_int_reg.obj" \
-"src\sine.obj" \
 "src\test_exit.obj" \r
 \r
 C_SRCS__QUOTED += \
-"../src/audio_dc_cfg.c" \
+"../src/audio_cfg.c" \
 "../src/edma_cfg.c" \
 "../src/main.c" \
 "../src/mcasp_cfg.c" \
@@ -72,7 +67,6 @@ C_SRCS__QUOTED += \
 "../src/sample_cs.c" \
 "../src/sample_k2g_cfg.c" \
 "../src/sample_k2g_int_reg.c" \
-"../src/sine.c" \
 "../src/test_exit.c" \r
 \r
 \r
index 27eb034cc47fc649a37f72872b4ce66c49dfdf8c..7d898e12ba487a0f5ef58c1a84e002571030f533 100644 (file)
@@ -16,84 +16,84 @@ configPkg: | configPkg/linker.cmd
 fil.obj: ../../../common/components/fil.c $(GEN_OPTS) $(GEN_HDRS)\r
        @echo 'Building file: $<'\r
        @echo 'Invoking: C6000 Compiler'\r
-       "${C6X_GEN_INSTALL_PATH}/bin/cl6x" -mv6600 --abi=eabi --opt_for_speed=5 --include_path="${C6X_GEN_INSTALL_PATH}/include" --include_path="${PDK_INSTALL_PATH}/ti/board/diag/nand/src" --include_path="../../../realtime_demo_bios/k2g/include" --include_path="../../../common/components" --include_path="${PDK_INSTALL_PATH}/ti/drv/mcasp" --include_path="${PDK_INSTALL_PATH}/ti/board" --include_path="${PDK_INSTALL_PATH}/ti/board/src/evmK2G/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmbk2g/include" --include_path="${PDK_INSTALL_PATH}" --include_path="${PDK_INSTALL_PATH}/ti/csl" -g --define=DEVICE_K2G --define=SOC_K2G --define=evmK2G --define=PLATFORM_INIT_IN --define=BUILD_DSP --diag_warning=225 --diag_wrap=off --display_error_number --preproc_with_compile --preproc_dependency="fil.d" $(GEN_OPTS__FLAG) "$<"\r
+       "${C6X_GEN_INSTALL_PATH}/bin/cl6x" -mv6600 --abi=eabi --opt_for_speed=5 --include_path="${C6X_GEN_INSTALL_PATH}/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmb/src/evmK2G/include" --include_path="../../../realtime_demo_bios/k2g/include" --include_path="../../../common/components" --include_path="${PDK_INSTALL_PATH}/ti/drv/mcasp" --include_path="${PDK_INSTALL_PATH}/ti/board" --include_path="${PDK_INSTALL_PATH}/ti/board/src/evmK2G/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmb" --include_path="${PDK_INSTALL_PATH}" --include_path="${PDK_INSTALL_PATH}/ti/csl" -g --define=DEVICE_K2G --define=SOC_K2G --define=evmK2G --define=PLATFORM_INIT_IN --define=BUILD_DSP --diag_warning=225 --diag_wrap=off --display_error_number --preproc_with_compile --preproc_dependency="fil.d" $(GEN_OPTS__FLAG) "$<"\r
        @echo 'Finished building: $<'\r
        @echo ' '\r
 \r
 mhm.obj: ../../../common/components/mhm/src/mhm.c $(GEN_OPTS) $(GEN_HDRS)\r
        @echo 'Building file: $<'\r
        @echo 'Invoking: C6000 Compiler'\r
-       "${C6X_GEN_INSTALL_PATH}/bin/cl6x" -mv6600 --abi=eabi --opt_for_speed=5 --include_path="${C6X_GEN_INSTALL_PATH}/include" --include_path="${PDK_INSTALL_PATH}/ti/board/diag/nand/src" --include_path="../../../realtime_demo_bios/k2g/include" --include_path="../../../common/components" --include_path="${PDK_INSTALL_PATH}/ti/drv/mcasp" --include_path="${PDK_INSTALL_PATH}/ti/board" --include_path="${PDK_INSTALL_PATH}/ti/board/src/evmK2G/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmbk2g/include" --include_path="${PDK_INSTALL_PATH}" --include_path="${PDK_INSTALL_PATH}/ti/csl" -g --define=DEVICE_K2G --define=SOC_K2G --define=evmK2G --define=PLATFORM_INIT_IN --define=BUILD_DSP --diag_warning=225 --diag_wrap=off --display_error_number --preproc_with_compile --preproc_dependency="mhm.d" $(GEN_OPTS__FLAG) "$<"\r
+       "${C6X_GEN_INSTALL_PATH}/bin/cl6x" -mv6600 --abi=eabi --opt_for_speed=5 --include_path="${C6X_GEN_INSTALL_PATH}/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmb/src/evmK2G/include" --include_path="../../../realtime_demo_bios/k2g/include" --include_path="../../../common/components" --include_path="${PDK_INSTALL_PATH}/ti/drv/mcasp" --include_path="${PDK_INSTALL_PATH}/ti/board" --include_path="${PDK_INSTALL_PATH}/ti/board/src/evmK2G/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmb" --include_path="${PDK_INSTALL_PATH}" --include_path="${PDK_INSTALL_PATH}/ti/csl" -g --define=DEVICE_K2G --define=SOC_K2G --define=evmK2G --define=PLATFORM_INIT_IN --define=BUILD_DSP --diag_warning=225 --diag_wrap=off --display_error_number --preproc_with_compile --preproc_dependency="mhm.d" $(GEN_OPTS__FLAG) "$<"\r
        @echo 'Finished building: $<'\r
        @echo ' '\r
 \r
 mss.obj: ../../../common/components/mss/src/mss.c $(GEN_OPTS) $(GEN_HDRS)\r
        @echo 'Building file: $<'\r
        @echo 'Invoking: C6000 Compiler'\r
-       "${C6X_GEN_INSTALL_PATH}/bin/cl6x" -mv6600 --abi=eabi --opt_for_speed=5 --include_path="${C6X_GEN_INSTALL_PATH}/include" --include_path="${PDK_INSTALL_PATH}/ti/board/diag/nand/src" --include_path="../../../realtime_demo_bios/k2g/include" --include_path="../../../common/components" --include_path="${PDK_INSTALL_PATH}/ti/drv/mcasp" --include_path="${PDK_INSTALL_PATH}/ti/board" --include_path="${PDK_INSTALL_PATH}/ti/board/src/evmK2G/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmbk2g/include" --include_path="${PDK_INSTALL_PATH}" --include_path="${PDK_INSTALL_PATH}/ti/csl" -g --define=DEVICE_K2G --define=SOC_K2G --define=evmK2G --define=PLATFORM_INIT_IN --define=BUILD_DSP --diag_warning=225 --diag_wrap=off --display_error_number --preproc_with_compile --preproc_dependency="mss.d" $(GEN_OPTS__FLAG) "$<"\r
+       "${C6X_GEN_INSTALL_PATH}/bin/cl6x" -mv6600 --abi=eabi --opt_for_speed=5 --include_path="${C6X_GEN_INSTALL_PATH}/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmb/src/evmK2G/include" --include_path="../../../realtime_demo_bios/k2g/include" --include_path="../../../common/components" --include_path="${PDK_INSTALL_PATH}/ti/drv/mcasp" --include_path="${PDK_INSTALL_PATH}/ti/board" --include_path="${PDK_INSTALL_PATH}/ti/board/src/evmK2G/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmb" --include_path="${PDK_INSTALL_PATH}" --include_path="${PDK_INSTALL_PATH}/ti/csl" -g --define=DEVICE_K2G --define=SOC_K2G --define=evmK2G --define=PLATFORM_INIT_IN --define=BUILD_DSP --diag_warning=225 --diag_wrap=off --display_error_number --preproc_with_compile --preproc_dependency="mss.d" $(GEN_OPTS__FLAG) "$<"\r
        @echo 'Finished building: $<'\r
        @echo ' '\r
 \r
 mssproc.obj: ../../../common/components/mss/src/mssproc.c $(GEN_OPTS) $(GEN_HDRS)\r
        @echo 'Building file: $<'\r
        @echo 'Invoking: C6000 Compiler'\r
-       "${C6X_GEN_INSTALL_PATH}/bin/cl6x" -mv6600 --abi=eabi --opt_for_speed=5 --include_path="${C6X_GEN_INSTALL_PATH}/include" --include_path="${PDK_INSTALL_PATH}/ti/board/diag/nand/src" --include_path="../../../realtime_demo_bios/k2g/include" --include_path="../../../common/components" --include_path="${PDK_INSTALL_PATH}/ti/drv/mcasp" --include_path="${PDK_INSTALL_PATH}/ti/board" --include_path="${PDK_INSTALL_PATH}/ti/board/src/evmK2G/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmbk2g/include" --include_path="${PDK_INSTALL_PATH}" --include_path="${PDK_INSTALL_PATH}/ti/csl" -g --define=DEVICE_K2G --define=SOC_K2G --define=evmK2G --define=PLATFORM_INIT_IN --define=BUILD_DSP --diag_warning=225 --diag_wrap=off --display_error_number --preproc_with_compile --preproc_dependency="mssproc.d" $(GEN_OPTS__FLAG) "$<"\r
+       "${C6X_GEN_INSTALL_PATH}/bin/cl6x" -mv6600 --abi=eabi --opt_for_speed=5 --include_path="${C6X_GEN_INSTALL_PATH}/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmb/src/evmK2G/include" --include_path="../../../realtime_demo_bios/k2g/include" --include_path="../../../common/components" --include_path="${PDK_INSTALL_PATH}/ti/drv/mcasp" --include_path="${PDK_INSTALL_PATH}/ti/board" --include_path="${PDK_INSTALL_PATH}/ti/board/src/evmK2G/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmb" --include_path="${PDK_INSTALL_PATH}" --include_path="${PDK_INSTALL_PATH}/ti/csl" -g --define=DEVICE_K2G --define=SOC_K2G --define=evmK2G --define=PLATFORM_INIT_IN --define=BUILD_DSP --diag_warning=225 --diag_wrap=off --display_error_number --preproc_with_compile --preproc_dependency="mssproc.d" $(GEN_OPTS__FLAG) "$<"\r
        @echo 'Finished building: $<'\r
        @echo ' '\r
 \r
 sys.obj: ../../../common/components/sys.c $(GEN_OPTS) $(GEN_HDRS)\r
        @echo 'Building file: $<'\r
        @echo 'Invoking: C6000 Compiler'\r
-       "${C6X_GEN_INSTALL_PATH}/bin/cl6x" -mv6600 --abi=eabi --opt_for_speed=5 --include_path="${C6X_GEN_INSTALL_PATH}/include" --include_path="${PDK_INSTALL_PATH}/ti/board/diag/nand/src" --include_path="../../../realtime_demo_bios/k2g/include" --include_path="../../../common/components" --include_path="${PDK_INSTALL_PATH}/ti/drv/mcasp" --include_path="${PDK_INSTALL_PATH}/ti/board" --include_path="${PDK_INSTALL_PATH}/ti/board/src/evmK2G/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmbk2g/include" --include_path="${PDK_INSTALL_PATH}" --include_path="${PDK_INSTALL_PATH}/ti/csl" -g --define=DEVICE_K2G --define=SOC_K2G --define=evmK2G --define=PLATFORM_INIT_IN --define=BUILD_DSP --diag_warning=225 --diag_wrap=off --display_error_number --preproc_with_compile --preproc_dependency="sys.d" $(GEN_OPTS__FLAG) "$<"\r
+       "${C6X_GEN_INSTALL_PATH}/bin/cl6x" -mv6600 --abi=eabi --opt_for_speed=5 --include_path="${C6X_GEN_INSTALL_PATH}/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmb/src/evmK2G/include" --include_path="../../../realtime_demo_bios/k2g/include" --include_path="../../../common/components" --include_path="${PDK_INSTALL_PATH}/ti/drv/mcasp" --include_path="${PDK_INSTALL_PATH}/ti/board" --include_path="${PDK_INSTALL_PATH}/ti/board/src/evmK2G/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmb" --include_path="${PDK_INSTALL_PATH}" --include_path="${PDK_INSTALL_PATH}/ti/csl" -g --define=DEVICE_K2G --define=SOC_K2G --define=evmK2G --define=PLATFORM_INIT_IN --define=BUILD_DSP --diag_warning=225 --diag_wrap=off --display_error_number --preproc_with_compile --preproc_dependency="sys.d" $(GEN_OPTS__FLAG) "$<"\r
        @echo 'Finished building: $<'\r
        @echo ' '\r
 \r
 sysasnr.obj: ../../../common/components/sysasnr.c $(GEN_OPTS) $(GEN_HDRS)\r
        @echo 'Building file: $<'\r
        @echo 'Invoking: C6000 Compiler'\r
-       "${C6X_GEN_INSTALL_PATH}/bin/cl6x" -mv6600 --abi=eabi --opt_for_speed=5 --include_path="${C6X_GEN_INSTALL_PATH}/include" --include_path="${PDK_INSTALL_PATH}/ti/board/diag/nand/src" --include_path="../../../realtime_demo_bios/k2g/include" --include_path="../../../common/components" --include_path="${PDK_INSTALL_PATH}/ti/drv/mcasp" --include_path="${PDK_INSTALL_PATH}/ti/board" --include_path="${PDK_INSTALL_PATH}/ti/board/src/evmK2G/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmbk2g/include" --include_path="${PDK_INSTALL_PATH}" --include_path="${PDK_INSTALL_PATH}/ti/csl" -g --define=DEVICE_K2G --define=SOC_K2G --define=evmK2G --define=PLATFORM_INIT_IN --define=BUILD_DSP --diag_warning=225 --diag_wrap=off --display_error_number --preproc_with_compile --preproc_dependency="sysasnr.d" $(GEN_OPTS__FLAG) "$<"\r
+       "${C6X_GEN_INSTALL_PATH}/bin/cl6x" -mv6600 --abi=eabi --opt_for_speed=5 --include_path="${C6X_GEN_INSTALL_PATH}/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmb/src/evmK2G/include" --include_path="../../../realtime_demo_bios/k2g/include" --include_path="../../../common/components" --include_path="${PDK_INSTALL_PATH}/ti/drv/mcasp" --include_path="${PDK_INSTALL_PATH}/ti/board" --include_path="${PDK_INSTALL_PATH}/ti/board/src/evmK2G/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmb" --include_path="${PDK_INSTALL_PATH}" --include_path="${PDK_INSTALL_PATH}/ti/csl" -g --define=DEVICE_K2G --define=SOC_K2G --define=evmK2G --define=PLATFORM_INIT_IN --define=BUILD_DSP --diag_warning=225 --diag_wrap=off --display_error_number --preproc_with_compile --preproc_dependency="sysasnr.d" $(GEN_OPTS__FLAG) "$<"\r
        @echo 'Finished building: $<'\r
        @echo ' '\r
 \r
 sysbf.obj: ../../../common/components/sysbf.c $(GEN_OPTS) $(GEN_HDRS)\r
        @echo 'Building file: $<'\r
        @echo 'Invoking: C6000 Compiler'\r
-       "${C6X_GEN_INSTALL_PATH}/bin/cl6x" -mv6600 --abi=eabi --opt_for_speed=5 --include_path="${C6X_GEN_INSTALL_PATH}/include" --include_path="${PDK_INSTALL_PATH}/ti/board/diag/nand/src" --include_path="../../../realtime_demo_bios/k2g/include" --include_path="../../../common/components" --include_path="${PDK_INSTALL_PATH}/ti/drv/mcasp" --include_path="${PDK_INSTALL_PATH}/ti/board" --include_path="${PDK_INSTALL_PATH}/ti/board/src/evmK2G/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmbk2g/include" --include_path="${PDK_INSTALL_PATH}" --include_path="${PDK_INSTALL_PATH}/ti/csl" -g --define=DEVICE_K2G --define=SOC_K2G --define=evmK2G --define=PLATFORM_INIT_IN --define=BUILD_DSP --diag_warning=225 --diag_wrap=off --display_error_number --preproc_with_compile --preproc_dependency="sysbf.d" $(GEN_OPTS__FLAG) "$<"\r
+       "${C6X_GEN_INSTALL_PATH}/bin/cl6x" -mv6600 --abi=eabi --opt_for_speed=5 --include_path="${C6X_GEN_INSTALL_PATH}/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmb/src/evmK2G/include" --include_path="../../../realtime_demo_bios/k2g/include" --include_path="../../../common/components" --include_path="${PDK_INSTALL_PATH}/ti/drv/mcasp" --include_path="${PDK_INSTALL_PATH}/ti/board" --include_path="${PDK_INSTALL_PATH}/ti/board/src/evmK2G/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmb" --include_path="${PDK_INSTALL_PATH}" --include_path="${PDK_INSTALL_PATH}/ti/csl" -g --define=DEVICE_K2G --define=SOC_K2G --define=evmK2G --define=PLATFORM_INIT_IN --define=BUILD_DSP --diag_warning=225 --diag_wrap=off --display_error_number --preproc_with_compile --preproc_dependency="sysbf.d" $(GEN_OPTS__FLAG) "$<"\r
        @echo 'Finished building: $<'\r
        @echo ' '\r
 \r
 sysbfflt.obj: ../../../common/components/sysbfflt.c $(GEN_OPTS) $(GEN_HDRS)\r
        @echo 'Building file: $<'\r
        @echo 'Invoking: C6000 Compiler'\r
-       "${C6X_GEN_INSTALL_PATH}/bin/cl6x" -mv6600 --abi=eabi --opt_for_speed=5 --include_path="${C6X_GEN_INSTALL_PATH}/include" --include_path="${PDK_INSTALL_PATH}/ti/board/diag/nand/src" --include_path="../../../realtime_demo_bios/k2g/include" --include_path="../../../common/components" --include_path="${PDK_INSTALL_PATH}/ti/drv/mcasp" --include_path="${PDK_INSTALL_PATH}/ti/board" --include_path="${PDK_INSTALL_PATH}/ti/board/src/evmK2G/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmbk2g/include" --include_path="${PDK_INSTALL_PATH}" --include_path="${PDK_INSTALL_PATH}/ti/csl" -g --define=DEVICE_K2G --define=SOC_K2G --define=evmK2G --define=PLATFORM_INIT_IN --define=BUILD_DSP --diag_warning=225 --diag_wrap=off --display_error_number --preproc_with_compile --preproc_dependency="sysbfflt.d" $(GEN_OPTS__FLAG) "$<"\r
+       "${C6X_GEN_INSTALL_PATH}/bin/cl6x" -mv6600 --abi=eabi --opt_for_speed=5 --include_path="${C6X_GEN_INSTALL_PATH}/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmb/src/evmK2G/include" --include_path="../../../realtime_demo_bios/k2g/include" --include_path="../../../common/components" --include_path="${PDK_INSTALL_PATH}/ti/drv/mcasp" --include_path="${PDK_INSTALL_PATH}/ti/board" --include_path="${PDK_INSTALL_PATH}/ti/board/src/evmK2G/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmb" --include_path="${PDK_INSTALL_PATH}" --include_path="${PDK_INSTALL_PATH}/ti/csl" -g --define=DEVICE_K2G --define=SOC_K2G --define=evmK2G --define=PLATFORM_INIT_IN --define=BUILD_DSP --diag_warning=225 --diag_wrap=off --display_error_number --preproc_with_compile --preproc_dependency="sysbfflt.d" $(GEN_OPTS__FLAG) "$<"\r
        @echo 'Finished building: $<'\r
        @echo ' '\r
 \r
 sysdrc.obj: ../../../common/components/sysdrc.c $(GEN_OPTS) $(GEN_HDRS)\r
        @echo 'Building file: $<'\r
        @echo 'Invoking: C6000 Compiler'\r
-       "${C6X_GEN_INSTALL_PATH}/bin/cl6x" -mv6600 --abi=eabi --opt_for_speed=5 --include_path="${C6X_GEN_INSTALL_PATH}/include" --include_path="${PDK_INSTALL_PATH}/ti/board/diag/nand/src" --include_path="../../../realtime_demo_bios/k2g/include" --include_path="../../../common/components" --include_path="${PDK_INSTALL_PATH}/ti/drv/mcasp" --include_path="${PDK_INSTALL_PATH}/ti/board" --include_path="${PDK_INSTALL_PATH}/ti/board/src/evmK2G/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmbk2g/include" --include_path="${PDK_INSTALL_PATH}" --include_path="${PDK_INSTALL_PATH}/ti/csl" -g --define=DEVICE_K2G --define=SOC_K2G --define=evmK2G --define=PLATFORM_INIT_IN --define=BUILD_DSP --diag_warning=225 --diag_wrap=off --display_error_number --preproc_with_compile --preproc_dependency="sysdrc.d" $(GEN_OPTS__FLAG) "$<"\r
+       "${C6X_GEN_INSTALL_PATH}/bin/cl6x" -mv6600 --abi=eabi --opt_for_speed=5 --include_path="${C6X_GEN_INSTALL_PATH}/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmb/src/evmK2G/include" --include_path="../../../realtime_demo_bios/k2g/include" --include_path="../../../common/components" --include_path="${PDK_INSTALL_PATH}/ti/drv/mcasp" --include_path="${PDK_INSTALL_PATH}/ti/board" --include_path="${PDK_INSTALL_PATH}/ti/board/src/evmK2G/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmb" --include_path="${PDK_INSTALL_PATH}" --include_path="${PDK_INSTALL_PATH}/ti/csl" -g --define=DEVICE_K2G --define=SOC_K2G --define=evmK2G --define=PLATFORM_INIT_IN --define=BUILD_DSP --diag_warning=225 --diag_wrap=off --display_error_number --preproc_with_compile --preproc_dependency="sysdrc.d" $(GEN_OPTS__FLAG) "$<"\r
        @echo 'Finished building: $<'\r
        @echo ' '\r
 \r
 syseram.obj: ../../../common/components/syseram.c $(GEN_OPTS) $(GEN_HDRS)\r
        @echo 'Building file: $<'\r
        @echo 'Invoking: C6000 Compiler'\r
-       "${C6X_GEN_INSTALL_PATH}/bin/cl6x" -mv6600 --abi=eabi --opt_for_speed=5 --include_path="${C6X_GEN_INSTALL_PATH}/include" --include_path="${PDK_INSTALL_PATH}/ti/board/diag/nand/src" --include_path="../../../realtime_demo_bios/k2g/include" --include_path="../../../common/components" --include_path="${PDK_INSTALL_PATH}/ti/drv/mcasp" --include_path="${PDK_INSTALL_PATH}/ti/board" --include_path="${PDK_INSTALL_PATH}/ti/board/src/evmK2G/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmbk2g/include" --include_path="${PDK_INSTALL_PATH}" --include_path="${PDK_INSTALL_PATH}/ti/csl" -g --define=DEVICE_K2G --define=SOC_K2G --define=evmK2G --define=PLATFORM_INIT_IN --define=BUILD_DSP --diag_warning=225 --diag_wrap=off --display_error_number --preproc_with_compile --preproc_dependency="syseram.d" $(GEN_OPTS__FLAG) "$<"\r
+       "${C6X_GEN_INSTALL_PATH}/bin/cl6x" -mv6600 --abi=eabi --opt_for_speed=5 --include_path="${C6X_GEN_INSTALL_PATH}/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmb/src/evmK2G/include" --include_path="../../../realtime_demo_bios/k2g/include" --include_path="../../../common/components" --include_path="${PDK_INSTALL_PATH}/ti/drv/mcasp" --include_path="${PDK_INSTALL_PATH}/ti/board" --include_path="${PDK_INSTALL_PATH}/ti/board/src/evmK2G/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmb" --include_path="${PDK_INSTALL_PATH}" --include_path="${PDK_INSTALL_PATH}/ti/csl" -g --define=DEVICE_K2G --define=SOC_K2G --define=evmK2G --define=PLATFORM_INIT_IN --define=BUILD_DSP --diag_warning=225 --diag_wrap=off --display_error_number --preproc_with_compile --preproc_dependency="syseram.d" $(GEN_OPTS__FLAG) "$<"\r
        @echo 'Finished building: $<'\r
        @echo ' '\r
 \r
 sysiram.obj: ../../../common/components/sysiram.c $(GEN_OPTS) $(GEN_HDRS)\r
        @echo 'Building file: $<'\r
        @echo 'Invoking: C6000 Compiler'\r
-       "${C6X_GEN_INSTALL_PATH}/bin/cl6x" -mv6600 --abi=eabi --opt_for_speed=5 --include_path="${C6X_GEN_INSTALL_PATH}/include" --include_path="${PDK_INSTALL_PATH}/ti/board/diag/nand/src" --include_path="../../../realtime_demo_bios/k2g/include" --include_path="../../../common/components" --include_path="${PDK_INSTALL_PATH}/ti/drv/mcasp" --include_path="${PDK_INSTALL_PATH}/ti/board" --include_path="${PDK_INSTALL_PATH}/ti/board/src/evmK2G/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmbk2g/include" --include_path="${PDK_INSTALL_PATH}" --include_path="${PDK_INSTALL_PATH}/ti/csl" -g --define=DEVICE_K2G --define=SOC_K2G --define=evmK2G --define=PLATFORM_INIT_IN --define=BUILD_DSP --diag_warning=225 --diag_wrap=off --display_error_number --preproc_with_compile --preproc_dependency="sysiram.d" $(GEN_OPTS__FLAG) "$<"\r
+       "${C6X_GEN_INSTALL_PATH}/bin/cl6x" -mv6600 --abi=eabi --opt_for_speed=5 --include_path="${C6X_GEN_INSTALL_PATH}/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmb/src/evmK2G/include" --include_path="../../../realtime_demo_bios/k2g/include" --include_path="../../../common/components" --include_path="${PDK_INSTALL_PATH}/ti/drv/mcasp" --include_path="${PDK_INSTALL_PATH}/ti/board" --include_path="${PDK_INSTALL_PATH}/ti/board/src/evmK2G/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmb" --include_path="${PDK_INSTALL_PATH}" --include_path="${PDK_INSTALL_PATH}/ti/csl" -g --define=DEVICE_K2G --define=SOC_K2G --define=evmK2G --define=PLATFORM_INIT_IN --define=BUILD_DSP --diag_warning=225 --diag_wrap=off --display_error_number --preproc_with_compile --preproc_dependency="sysiram.d" $(GEN_OPTS__FLAG) "$<"\r
        @echo 'Finished building: $<'\r
        @echo ' '\r
 \r
 sysmss.obj: ../../../common/components/sysmss.c $(GEN_OPTS) $(GEN_HDRS)\r
        @echo 'Building file: $<'\r
        @echo 'Invoking: C6000 Compiler'\r
-       "${C6X_GEN_INSTALL_PATH}/bin/cl6x" -mv6600 --abi=eabi --opt_for_speed=5 --include_path="${C6X_GEN_INSTALL_PATH}/include" --include_path="${PDK_INSTALL_PATH}/ti/board/diag/nand/src" --include_path="../../../realtime_demo_bios/k2g/include" --include_path="../../../common/components" --include_path="${PDK_INSTALL_PATH}/ti/drv/mcasp" --include_path="${PDK_INSTALL_PATH}/ti/board" --include_path="${PDK_INSTALL_PATH}/ti/board/src/evmK2G/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmbk2g/include" --include_path="${PDK_INSTALL_PATH}" --include_path="${PDK_INSTALL_PATH}/ti/csl" -g --define=DEVICE_K2G --define=SOC_K2G --define=evmK2G --define=PLATFORM_INIT_IN --define=BUILD_DSP --diag_warning=225 --diag_wrap=off --display_error_number --preproc_with_compile --preproc_dependency="sysmss.d" $(GEN_OPTS__FLAG) "$<"\r
+       "${C6X_GEN_INSTALL_PATH}/bin/cl6x" -mv6600 --abi=eabi --opt_for_speed=5 --include_path="${C6X_GEN_INSTALL_PATH}/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmb/src/evmK2G/include" --include_path="../../../realtime_demo_bios/k2g/include" --include_path="../../../common/components" --include_path="${PDK_INSTALL_PATH}/ti/drv/mcasp" --include_path="${PDK_INSTALL_PATH}/ti/board" --include_path="${PDK_INSTALL_PATH}/ti/board/src/evmK2G/include" --include_path="${PDK_INSTALL_PATH}/ti/addon/cmb" --include_path="${PDK_INSTALL_PATH}" --include_path="${PDK_INSTALL_PATH}/ti/csl" -g --define=DEVICE_K2G --define=SOC_K2G --define=evmK2G --define=PLATFORM_INIT_IN --define=BUILD_DSP --diag_warning=225 --diag_wrap=off --display_error_number --preproc_with_compile --preproc_dependency="sysmss.d" $(GEN_OPTS__FLAG) "$<"\r
        @echo 'Finished building: $<'\r
        @echo ' '\r
 \r
index 2d5608d5a67170931c4d143fd8f8006e2ccca58d..f4b6fb94fd257eff4840b543a752e7a64f9061b7 100644 (file)
@@ -1,5 +1,5 @@
 /*\r
- * Copyright (c) 2015, Texas Instruments Incorporated\r
+ * Copyright (c) 2017, Texas Instruments Incorporated\r
  * All rights reserved.\r
  *\r
  * Redistribution and use in source and binary forms, with or without\r
@@ -41,7 +41,8 @@
 #ifndef _ANALOG_TEST_H_\r
 #define _ANALOG_TEST_H_\r
 \r
-#include <cmbk2g.h>\r
+#include <cmb.h>\r
+#include <evmc66x_i2c.h>\r
 \r
 #include <xdc/std.h>\r
 #include <xdc/runtime/Memory.h>\r
@@ -65,8 +66,8 @@
 #include <mcasp_drv.h>\r
 #include <include/McaspLocal.h>\r
 \r
-#include "cmbk2g_audio.h"\r
-#include "audio_dc_cfg.h"\r
+#include "cmb.h"\r
+#include "audio_cfg.h"\r
 #include "mcasp_cfg.h"\r
 #include "edma_cfg.h"\r
 \r
similarity index 76%
rename from realtime_demo_bios/k2g/include/audio_dc_cfg.h
rename to realtime_demo_bios/k2g/include/audio_cfg.h
index 101b9e211e495131677746e0f4657aadc4071fd1..7b811b04aa1772f31049e902818b6d09710f079f 100644 (file)
 typedef struct _AdcConfig\r
 {\r
        uint8_t          gain;\r
-       Cmbk2gAdcLeftInputMux  adc1LMux;\r
-       Cmbk2gAdcLeftInputMux  adc2LMux;\r
-       Cmbk2gAdcRightInputMux adc1RMux;\r
-       Cmbk2gAdcRightInputMux adc2RMux;\r
-       Cmbk2gAdcRxWordLen     wlen;\r
-       Cmbk2gAdcDataFormat    format;\r
+       CmbAdcLeftInputMux  adc1LMux;\r
+       CmbAdcLeftInputMux  adc2LMux;\r
+       CmbAdcRightInputMux adc1RMux;\r
+       CmbAdcRightInputMux adc2RMux;\r
+       CmbAdcRxWordLen     wlen;\r
+       CmbAdcDataFormat    format;\r
        uint8_t          intEnable;\r
-} Cmbk2gAdcConfig;\r
+} CmbAdcConfig;\r
 \r
 typedef struct _DacConfig\r
 {\r
-       Cmbk2gDacAmuteCtrl    amuteCtrl;\r
+       CmbDacAmuteCtrl    amuteCtrl;\r
        uint8_t         amuteEnable;\r
-       Cmbk2gDacSamplingMode samplingMode;\r
-       Cmbk2gDacDataFormat   dataFormat;\r
+       CmbDacSamplingMode samplingMode;\r
+       CmbDacDataFormat   dataFormat;\r
        uint8_t         softMuteEnable;\r
-       Cmbk2gDacAttnMode     attnMode;\r
-       Cmbk2gDacDeempCtrl    deempCtrl;\r
+       CmbDacAttnMode     attnMode;\r
+       CmbDacDeempCtrl    deempCtrl;\r
        uint8_t         volume;\r
-} Cmbk2gDacConfig;\r
+} CmbDacConfig;\r
 \r
 /**\r
  *  \brief    Initializes ADC module\r
@@ -76,9 +76,9 @@ typedef struct _DacConfig
  *  \param     devId  [IN]  ADC Device Id\r
  *  \param     config [IN]  ADC configuration parameters\r
  *\r
- *  \return    Cmbk2g_EOK on Success or error code\r
+ *  \return    Cmb_EOK on Success or error code\r
  */\r
-Cmbk2g_STATUS audioAdcConfig(Cmbk2gAdcDevId  devId, Cmbk2gAdcConfig *config);\r
+Cmb_STATUS audioAdcConfig(CmbAdcDevId  devId, CmbAdcConfig *config);\r
 \r
 /**\r
  *  \brief    Initializes DAC module\r
@@ -89,9 +89,9 @@ Cmbk2g_STATUS audioAdcConfig(Cmbk2gAdcDevId  devId, Cmbk2gAdcConfig *config);
  *  \param     devId  [IN]  DAC Device Id\r
  *  \param     config [IN]  DAC configuration parameters\r
  *\r
- *  \return    Cmbk2g_EOK on Success or error code\r
+ *  \return    Cmb_EOK on Success or error code\r
  */\r
-Cmbk2g_STATUS audioDacConfig(Cmbk2gDacDevId devId, Cmbk2gDacConfig *config);\r
+Cmb_STATUS audioDacConfig(CmbDacDevId devId, CmbDacConfig *config);\r
 \r
 #endif /* _AUDIO_DC_CFG_H_ */\r
 \r
index d26a6d017acf2bab7fa54e486718799e9fb7692e..137083a385b7278c3a795aecda8555158143b129 100644 (file)
@@ -46,9 +46,9 @@
 /**\r
  *  \brief    Configures eDMA module\r
  *\r
- *  \return    Cmbk2g_EOK on Success or error code\r
+ *  \return    Cmb_EOK on Success or error code\r
  */\r
-Cmbk2g_STATUS eDmaConfig(void);\r
+Cmb_STATUS eDmaConfig(void);\r
 \r
 #endif /* _EDMA_CFG_H_ */\r
 \r
index d6f4cbcd0e744a7f2fd7e19cd71a583657beaed8..770fedaaae193ab637f44e0d5c548d422d6fa170 100644 (file)
@@ -66,8 +66,8 @@
  *  \brief   Configures McASP module and creates the channel\r
  *           for audio Tx and Rx\r
  *\r
- *  \return    Cmbk2g_EOK on Success or error code\r
+ *  \return    Cmb_EOK on Success or error code\r
  */\r
-Cmbk2g_STATUS mcaspAudioConfig(void);\r
+Cmb_STATUS mcaspAudioConfig(void);\r
 \r
 #endif /* _MCASP_CONFIG_H_ */\r
similarity index 50%
rename from realtime_demo_bios/k2g/src/audio_dc_cfg.c
rename to realtime_demo_bios/k2g/src/audio_cfg.c
index e4ee598a08926f13f17d7abd5da4ae653478c41e..4239f5ecc2acee81dfd57ed162395ceccdcdf412 100644 (file)
@@ -38,7 +38,7 @@
  *\r
  */\r
 \r
-#include "audio_dc_cfg.h"\r
+#include "audio_cfg.h"\r
 \r
 /**\r
  *  \brief    Initializes ADC module\r
  *  \param     devId  [IN]  ADC Device Id\r
  *  \param     config [IN]  ADC configuration parameters\r
  *\r
- *  \return    Cmbk2g_EOK on Success or error code\r
+ *  \return    Cmb_EOK on Success or error code\r
  */\r
-Cmbk2g_STATUS audioAdcConfig(Cmbk2gAdcDevId  devId, Cmbk2gAdcConfig *config)\r
+Cmb_STATUS audioAdcConfig(CmbAdcDevId  devId, CmbAdcConfig *config)\r
 {\r
-       Cmbk2g_STATUS status;\r
+       Cmb_STATUS status;\r
 \r
        if(config == NULL)\r
        {\r
-               IFPRINT(cmbk2g_write("Invalid Inputs\n"));\r
-               return (Cmbk2g_EINVALID);\r
+               IFPRINT(cmb_write("Invalid Inputs\n"));\r
+               return (Cmb_EINVALID);\r
        }\r
 \r
        /* Initialize all the HW instances of ADC */\r
        //status = platformAudioAdcInit(devId);\r
-       status = (Cmbk2g_STATUS)cmbk2g_AudioAdcInit((Cmbk2gAdcDevId)devId);\r
-       if(status != Cmbk2g_EOK)\r
+       status = (Cmb_STATUS)cmb_AudioAdcInit((CmbAdcDevId)devId);\r
+       if(status != Cmb_EOK)\r
        {\r
-               IFPRINT(cmbk2g_write("audioAdcConfig : platformaudioAdcConfig Failed\n"));\r
+               IFPRINT(cmb_write("audioAdcConfig : platformaudioAdcConfig Failed\n"));\r
                return (status);\r
        }\r
 \r
        /* Set ADC channel gain */\r
        //status = platformAudioAdcSetGain(devId, ADC_CH_ALL, config->gain);\r
-    status = (Cmbk2g_STATUS)cmbk2g_AudioAdcSetGain((Cmbk2gAdcDevId)devId, (Cmbk2gAdcChanId)CMBK2G_ADC_CH_ALL, config->gain);\r
-       if(status != Cmbk2g_EOK)\r
+    status = (Cmb_STATUS)cmb_AudioAdcSetGain((CmbAdcDevId)devId, (CmbAdcChanId)CMB_ADC_CH_ALL, config->gain);\r
+       if(status != Cmb_EOK)\r
        {\r
-               IFPRINT(cmbk2g_write("audioAdcConfig : platformAudioAdcSetGain Failed\n"));\r
+               IFPRINT(cmb_write("audioAdcConfig : platformAudioAdcSetGain Failed\n"));\r
                return (status);\r
        }\r
 \r
        /* Configure Left input mux for ADC1L */\r
        //status = platformAudioAdcSetLeftInputMux(devId, ADC_CH1_LEFT, config->adc1LMux);\r
-    status = (Cmbk2g_STATUS)cmbk2g_AudioAdcSetLeftInputMux((Cmbk2gAdcDevId)devId, (Cmbk2gAdcChanId)CMBK2G_ADC_CH1_LEFT, (Cmbk2gAdcLeftInputMux)(config->adc1LMux));\r
-       if(status != Cmbk2g_EOK)\r
+    status = (Cmb_STATUS)cmb_AudioAdcSetLeftInputMux((CmbAdcDevId)devId, (CmbAdcChanId)CMB_ADC_CH1_LEFT, (CmbAdcLeftInputMux)(config->adc1LMux));\r
+       if(status != Cmb_EOK)\r
        {\r
-               IFPRINT(cmbk2g_write("audioAdcConfig : platformAudioAdcSetLeftInputMux Failed\n"));\r
+               IFPRINT(cmb_write("audioAdcConfig : platformAudioAdcSetLeftInputMux Failed\n"));\r
                return (status);\r
        }\r
 \r
        /* Configure Left input mux for ADC2L*/\r
        //status = platformAudioAdcSetLeftInputMux(devId, ADC_CH2_LEFT, config->adc2LMux);\r
-       status = (Cmbk2g_STATUS)cmbk2g_AudioAdcSetLeftInputMux((Cmbk2gAdcDevId)devId, (Cmbk2gAdcChanId)CMBK2G_ADC_CH2_LEFT, (Cmbk2gAdcLeftInputMux)(config->adc2LMux));\r
-       if(status != Cmbk2g_EOK)\r
+       status = (Cmb_STATUS)cmb_AudioAdcSetLeftInputMux((CmbAdcDevId)devId, (CmbAdcChanId)CMB_ADC_CH2_LEFT, (CmbAdcLeftInputMux)(config->adc2LMux));\r
+       if(status != Cmb_EOK)\r
        {\r
-               IFPRINT(cmbk2g_write("audioAdcConfig : platformAudioAdcSetLeftInputMux Failed\n"));\r
+               IFPRINT(cmb_write("audioAdcConfig : platformAudioAdcSetLeftInputMux Failed\n"));\r
                return (status);\r
        }\r
 \r
        /* Configure Right input mux for ADC1R */\r
        //status = platformAudioAdcSetRightInputMux(devId, ADC_CH1_RIGHT, config->adc1RMux);\r
-    status = (Cmbk2g_STATUS)cmbk2g_AudioAdcSetRightInputMux((Cmbk2gAdcDevId)devId, (Cmbk2gAdcChanId)CMBK2G_ADC_CH1_RIGHT, (Cmbk2gAdcRightInputMux)(config->adc1RMux));\r
-       if(status != Cmbk2g_EOK)\r
+    status = (Cmb_STATUS)cmb_AudioAdcSetRightInputMux((CmbAdcDevId)devId, (CmbAdcChanId)CMB_ADC_CH1_RIGHT, (CmbAdcRightInputMux)(config->adc1RMux));\r
+       if(status != Cmb_EOK)\r
        {\r
-               IFPRINT(cmbk2g_write("audioAdcConfig : platformAudioAdcSetRightInputMux Failed\n"));\r
+               IFPRINT(cmb_write("audioAdcConfig : platformAudioAdcSetRightInputMux Failed\n"));\r
                return (status);\r
        }\r
 \r
        /* Configure Right input mux for ADC2R */\r
        //status = platformAudioAdcSetRightInputMux(devId, ADC_CH2_RIGHT, config->adc2RMux);\r
-    status = (Cmbk2g_STATUS)cmbk2g_AudioAdcSetRightInputMux((Cmbk2gAdcDevId)devId, (Cmbk2gAdcChanId)CMBK2G_ADC_CH2_RIGHT, (Cmbk2gAdcRightInputMux)(config->adc2RMux));\r
-       if(status != Cmbk2g_EOK)\r
+    status = (Cmb_STATUS)cmb_AudioAdcSetRightInputMux((CmbAdcDevId)devId, (CmbAdcChanId)CMB_ADC_CH2_RIGHT, (CmbAdcRightInputMux)(config->adc2RMux));\r
+       if(status != Cmb_EOK)\r
        {\r
-               IFPRINT(cmbk2g_write("audioAdcConfig : platformAudioAdcSetRightInputMux Failed\n"));\r
+               IFPRINT(cmb_write("audioAdcConfig : platformAudioAdcSetRightInputMux Failed\n"));\r
                return (status);\r
        }\r
 \r
        /* Configure audio data format */\r
     //status = platformAudioAdcDataConfig(devId, config->wlen, config->format);\r
-       status = (Cmbk2g_STATUS)cmbk2g_AudioAdcDataConfig((Cmbk2gAdcDevId)devId, (Cmbk2gAdcRxWordLen)(config->wlen), (Cmbk2gAdcDataFormat)(config->format));\r
-       if(status != Cmbk2g_EOK)\r
+       status = (Cmb_STATUS)cmb_AudioAdcDataConfig((CmbAdcDevId)devId, (CmbAdcRxWordLen)(config->wlen), (CmbAdcDataFormat)(config->format));\r
+       if(status != Cmb_EOK)\r
        {\r
-               IFPRINT(cmbk2g_write("audioAdcConfig : platformAudioAdcDataConfig Failed\n"));\r
+               IFPRINT(cmb_write("audioAdcConfig : platformAudioAdcDataConfig Failed\n"));\r
                return (status);\r
        }\r
 \r
        /* Configure all the interrupts */\r
        //status = platformAudioAdcConfigIntr(devId, ADC_INTR_ALL, config->intEnable);\r
-    status = (Cmbk2g_STATUS)cmbk2g_AudioAdcConfigIntr((Cmbk2gAdcDevId)devId, (Cmbk2gAdcIntr)CMBK2G_ADC_INTR_ALL, config->intEnable);\r
-       if(status != Cmbk2g_EOK)\r
+    status = (Cmb_STATUS)cmb_AudioAdcConfigIntr((CmbAdcDevId)devId, (CmbAdcIntr)CMB_ADC_INTR_ALL, config->intEnable);\r
+       if(status != Cmb_EOK)\r
        {\r
-               IFPRINT(cmbk2g_write("audioAdcConfig : platformAudioAdcConfigIntr Failed\n"));\r
+               IFPRINT(cmb_write("audioAdcConfig : platformAudioAdcConfigIntr Failed\n"));\r
                return (status);\r
        }\r
 \r
@@ -145,89 +145,89 @@ Cmbk2g_STATUS audioAdcConfig(Cmbk2gAdcDevId  devId, Cmbk2gAdcConfig *config)
  *  \param     devId  [IN]  DAC Device Id\r
  *  \param     config [IN]  DAC configuration parameters\r
  *\r
- *  \return    Cmbk2g_EOK on Success or error code\r
+ *  \return    Cmb_EOK on Success or error code\r
  */\r
-#if CMBK2G_AUDIO_DAC\r
-Cmbk2g_STATUS audioDacConfig(Cmbk2gDacDevId devId, Cmbk2gDacConfig *config)\r
+#if CMB_AUDIO_DAC\r
+Cmb_STATUS audioDacConfig(CmbDacDevId devId, CmbDacConfig *config)\r
 {\r
-       Cmbk2g_STATUS status;\r
+       Cmb_STATUS status;\r
 \r
        if(config == NULL)\r
        {\r
-               IFPRINT(cmbk2g_write("Invalid Inputs\n"));\r
-               return (Cmbk2g_EINVALID);\r
+               IFPRINT(cmb_write("Invalid Inputs\n"));\r
+               return (Cmb_EINVALID);\r
        }\r
 \r
        /* Initialize Audio DAC */\r
        //status = platformAudioDacInit(devId);\r
-    status = (Cmbk2g_STATUS)cmbk2g_AudioDacInit((Cmbk2gDacDevId)devId);\r
-       if(status != Cmbk2g_EOK)\r
+    status = (Cmb_STATUS)cmb_AudioDacInit((CmbDacDevId)devId);\r
+       if(status != Cmb_EOK)\r
        {\r
-               IFPRINT(cmbk2g_write("audioDacConfig : platformaudioDacConfig Failed\n"));\r
+               IFPRINT(cmb_write("audioDacConfig : platformaudioDacConfig Failed\n"));\r
                return (status);\r
        }\r
 \r
 #if 0\r
        /* Configure AMUTE control event */\r
        //status = platformAudioDacAmuteCtrl(devId, config->amuteCtrl, config->amuteEnable);\r
-    status = (Cmbk2g_STATUS)cmbk2g_AudioDacAmuteCtrl((Cmbk2gDacDevId)devId, (Cmbk2gDacAmuteCtrl)(config->amuteCtrl), config->amuteEnable);\r
-       if(status != Cmbk2g_EOK)\r
+    status = (Cmb_STATUS)cmb_AudioDacAmuteCtrl((CmbDacDevId)devId, (CmbDacAmuteCtrl)(config->amuteCtrl), config->amuteEnable);\r
+       if(status != Cmb_EOK)\r
        {\r
-               IFPRINT(cmbk2g_write("audioDacConfig : platformAudioDacAmuteCtrl Failed\n"));\r
+               IFPRINT(cmb_write("audioDacConfig : platformAudioDacAmuteCtrl Failed\n"));\r
                return (status);\r
        }\r
 \r
        /* Set sampling mode */\r
        //status = platformAudioDacSetSamplingMode(devId, config->samplingMode);\r
-    status = (Cmbk2g_STATUS)cmbk2g_AudioDacSetSamplingMode((Cmbk2gDacDevId)devId, (Cmbk2gDacSamplingMode)(config->samplingMode));\r
-       if(status != Cmbk2g_EOK)\r
+    status = (Cmb_STATUS)cmb_AudioDacSetSamplingMode((CmbDacDevId)devId, (CmbDacSamplingMode)(config->samplingMode));\r
+       if(status != Cmb_EOK)\r
        {\r
-               IFPRINT(cmbk2g_write("audioDacConfig : platformAudioDacSetSamplingMode Failed\n"));\r
+               IFPRINT(cmb_write("audioDacConfig : platformAudioDacSetSamplingMode Failed\n"));\r
                return (status);\r
        }\r
 \r
        /* Set data format */\r
        //status = platformAudioDacSetDataFormat(devId, config->dataFormat);\r
-    status = (Cmbk2g_STATUS)cmbk2g_AudioDacSetDataFormat((Cmbk2gDacDevId)devId, (Cmbk2gDacDataFormat)(config->dataFormat));\r
-       if(status != Cmbk2g_EOK)\r
+    status = (Cmb_STATUS)cmb_AudioDacSetDataFormat((CmbDacDevId)devId, (CmbDacDataFormat)(config->dataFormat));\r
+       if(status != Cmb_EOK)\r
        {\r
-               IFPRINT(cmbk2g_write("audioDacConfig : platformAudioDacSetDataFormat Failed\n"));\r
+               IFPRINT(cmb_write("audioDacConfig : platformAudioDacSetDataFormat Failed\n"));\r
                return (status);\r
        }\r
 \r
        /* Enable soft mute control */\r
        //status = platformAudioDacSoftMuteCtrl(devId, DAC_CHAN_ALL, config->softMuteEnable);\r
-    status = (Cmbk2g_STATUS)cmbk2g_AudioDacSoftMuteCtrl((Cmbk2gDacDevId)devId, (Cmbk2gDacChanId)CMBK2G_DAC_CHAN_ALL, config->softMuteEnable);\r
-       if(status != Cmbk2g_EOK)\r
+    status = (Cmb_STATUS)cmb_AudioDacSoftMuteCtrl((CmbDacDevId)devId, (CmbDacChanId)CMB_DAC_CHAN_ALL, config->softMuteEnable);\r
+       if(status != Cmb_EOK)\r
        {\r
-               IFPRINT(cmbk2g_write("audioDacConfig : platformAudioDacSoftMuteCtrl Failed\n"));\r
+               IFPRINT(cmb_write("audioDacConfig : platformAudioDacSoftMuteCtrl Failed\n"));\r
                return (status);\r
        }\r
 \r
        /* Set attenuation mode */\r
        //status = platformAudioDacSetAttnMode(devId, config->attnMode);\r
-    status = (Cmbk2g_STATUS)cmbk2g_AudioDacSetAttnMode((Cmbk2gDacDevId)devId, (Cmbk2gDacAttnMode)(config->attnMode));\r
-       if(status != Cmbk2g_EOK)\r
+    status = (Cmb_STATUS)cmb_AudioDacSetAttnMode((CmbDacDevId)devId, (CmbDacAttnMode)(config->attnMode));\r
+       if(status != Cmb_EOK)\r
        {\r
-               IFPRINT(cmbk2g_write("audioDacConfig : platformAudioDacSetAttnMode Failed\n"));\r
+               IFPRINT(cmb_write("audioDacConfig : platformAudioDacSetAttnMode Failed\n"));\r
                return (status);\r
        }\r
 \r
        /* Set De-emphasis control */\r
        //status = platformAudioDacDeempCtrl(devId, config->deempCtrl);\r
-    status = (Cmbk2g_STATUS)cmbk2g_AudioDacDeempCtrl((Cmbk2gDacDevId)devId, (Cmbk2gDacDeempCtrl)(config->deempCtrl));\r
-       if(status != Cmbk2g_EOK)\r
+    status = (Cmb_STATUS)cmb_AudioDacDeempCtrl((CmbDacDevId)devId, (CmbDacDeempCtrl)(config->deempCtrl));\r
+       if(status != Cmb_EOK)\r
        {\r
-               IFPRINT(cmbk2g_write("audioDacConfig : platformAudioDacDeempCtrl Failed\n"));\r
+               IFPRINT(cmb_write("audioDacConfig : platformAudioDacDeempCtrl Failed\n"));\r
                return (status);\r
        }\r
 \r
        /* Set DAC volume */\r
        //status = platformAudioDacSetVolume(devId, DAC_CHAN_ALL, config->volume);\r
-    status = (Cmbk2g_STATUS)cmbk2g_AudioDacSetVolume((Cmbk2gDacDevId)devId, (Cmbk2gDacChanId)CMBK2G_DAC_CHAN_ALL, config->volume);\r
-       if(status != Cmbk2g_EOK)\r
+    status = (Cmb_STATUS)cmb_AudioDacSetVolume((CmbDacDevId)devId, (CmbDacChanId)CMB_DAC_CHAN_ALL, config->volume);\r
+       if(status != Cmb_EOK)\r
        {\r
-               IFPRINT(cmbk2g_write("audioDacConfig : platformAudioDacSetVolume Failed\n"));\r
+               IFPRINT(cmb_write("audioDacConfig : platformAudioDacSetVolume Failed\n"));\r
                return (status);\r
        }\r
 #endif\r
index 685647bf05a4a15df6a73f2ef96380f1f716a6c6..721c37a9aa6100d2a3b897ff7a5a19270e241554 100644 (file)
@@ -92,9 +92,9 @@ EDMA3_DRV_Handle hEdma1;
 /**\r
  *  \brief    Configures eDMA module\r
  *\r
- *  \return    Cmbk2g_EOK on Success or error code\r
+ *  \return    Cmb_EOK on Success or error code\r
  */\r
-Cmbk2g_STATUS eDmaConfig(void)\r
+Cmb_STATUS eDmaConfig(void)\r
 {\r
     EDMA3_DRV_Result edmaResult = 0;\r
     uint32_t temp;\r
@@ -107,19 +107,19 @@ Cmbk2g_STATUS eDmaConfig(void)
     hEdma0 = edma3init(CSL_EDMACC_0, &edmaResult);\r
     if((hEdma0 == NULL) || (edmaResult != 0))\r
     {\r
-               IFPRINT(cmbk2g_write("eDMA instance 0 Initialization Failed\n"));\r
-               return (Cmbk2g_EFAIL);\r
+               IFPRINT(cmb_write("eDMA instance 0 Initialization Failed\n"));\r
+               return (Cmb_EFAIL);\r
        }\r
 \r
        /* Initialize eDMA 1 */\r
     hEdma1 = edma3init(CSL_EDMACC_1, &edmaResult);\r
     if((hEdma1 == NULL) || (edmaResult != 0))\r
     {\r
-               IFPRINT(cmbk2g_write("eDMA instance 1 Initialization Failed\n"));\r
-               return (Cmbk2g_EFAIL);\r
+               IFPRINT(cmb_write("eDMA instance 1 Initialization Failed\n"));\r
+               return (Cmb_EFAIL);\r
        }\r
 \r
-       return (Cmbk2g_EOK);\r
+       return (Cmb_EOK);\r
 }\r
 \r
 /**\r
index 8da48c4e4b33b132594535c55ea5d81739f60c3f..982aa1ff3941a773ad26b6ca9b94276b3627487d 100644 (file)
@@ -140,28 +140,28 @@ static void system_init(void)
 } /* system_init */\r
 \r
 /* ADC default configuration parameters */\r
-Cmbk2gAdcConfig adcCfg =\r
+CmbAdcConfig adcCfg =\r
 {\r
        80,                  /* ADC gain */\r
-       CMBK2G_ADC_INL_SE_VINL1,    /* Left input mux for ADC1L */\r
-       CMBK2G_ADC_INL_SE_VINL2,    /* Left input mux for ADC2L */\r
-       CMBK2G_ADC_INR_SE_VINR1,    /* Right input mux for ADC1R */\r
-       CMBK2G_ADC_INR_SE_VINR2,    /* Right input mux for ADC2R */\r
-       CMBK2G_ADC_RX_WLEN_24BIT,   /* ADC word length */\r
-       CMBK2G_ADC_DATA_FORMAT_I2S, /* ADC data format */\r
+       CMB_ADC_INL_SE_VINL1,    /* Left input mux for ADC1L */\r
+       CMB_ADC_INL_SE_VINL2,    /* Left input mux for ADC2L */\r
+       CMB_ADC_INR_SE_VINR1,    /* Right input mux for ADC1R */\r
+       CMB_ADC_INR_SE_VINR2,    /* Right input mux for ADC2R */\r
+       CMB_ADC_RX_WLEN_24BIT,   /* ADC word length */\r
+       CMB_ADC_DATA_FORMAT_I2S, /* ADC data format */\r
        0\r
 };\r
 \r
 /* DAC default configuration parameters */\r
-Cmbk2gDacConfig  dacCfg =\r
+CmbDacConfig  dacCfg =\r
 {\r
-       CMBK2G_DAC_AMUTE_CTRL_SCKI_LOST,   /* Amute event */\r
+       CMB_DAC_AMUTE_CTRL_SCKI_LOST,   /* Amute event */\r
        0,                          /* Amute control */\r
-       CMBK2G_DAC_SAMPLING_MODE_AUTO,     /* Sampling mode */\r
-       CMBK2G_DAC_DATA_FORMAT_I2S,        /* Data format */\r
+       CMB_DAC_SAMPLING_MODE_AUTO,     /* Sampling mode */\r
+       CMB_DAC_DATA_FORMAT_I2S,        /* Data format */\r
        0,                          /* Soft mute control */\r
-       CMBK2G_DAC_ATTENUATION_WIDE_RANGE, /* Attenuation mode */\r
-       CMBK2G_DAC_DEEMP_44KHZ,            /* De-emph control */\r
+       CMB_DAC_ATTENUATION_WIDE_RANGE, /* Attenuation mode */\r
+       CMB_DAC_DEEMP_44KHZ,            /* De-emph control */\r
        80                          /* Volume */\r
 };\r
 \r
@@ -187,27 +187,6 @@ void pinMuxSetMode_local(uint32_t padCfgId, PadCfgMuxMode muxMode)
     CSL_FINS(*(padCfgBase + padCfgId), BOOTCFG_PADCONFIG0_MUXMODE, muxMode);\r
 }\r
 \r
-char write_buffer[MAX_WRITE_LEN];\r
-void cmbk2g_write(const char *fmt, ... )\r
-{\r
-       va_list         arg_ptr;\r
-       uint32_t        length;\r
-\r
-       /* Initial platform_write to temporary buffer.. at least try some sort of sanity check so we don't write all over\r
-        * memory if the print is too large.\r
-        */\r
-       if (strlen(fmt) > MAX_WRITE_LEN) {return;}\r
-\r
-       va_start( arg_ptr, fmt );\r
-       length = vsprintf( (char *)write_buffer, fmt, arg_ptr );\r
-       va_end( arg_ptr );\r
-\r
-       printf( "%s", write_buffer );\r
-       //fflush(stdout);\r
-\r
-       return;\r
-}\r
-\r
 void McaspDevice_init(void);\r
 \r
 /**\r
@@ -217,9 +196,9 @@ void McaspDevice_init(void);
  *  which are required for audio processing. Need to call this function\r
  *  before doing any HW related operations.\r
  *\r
- *  \return    Cmbk2g_EOK on Success or error code\r
+ *  \return    Cmb_EOK on Success or error code\r
  */\r
-Cmbk2g_STATUS initPlatform(void)\r
+Cmb_STATUS initPlatform(void)\r
 {\r
        Board_STATUS status = BOARD_SOK;\r
        Board_initCfg arg = BOARD_INIT_PINMUX_CONFIG | BOARD_INIT_MODULE_CLOCK;\r
@@ -251,11 +230,11 @@ Cmbk2g_STATUS initPlatform(void)
        ///gpioSetOutput(GPIO_PORT_1, 54);\r
 \r
        /* Configure platform log messages to standard printf */\r
-    ///Cmbk2g_write_configure(Cmbk2g_WRITE_UART);\r
+    ///Cmb_write_configure(Cmb_WRITE_UART);\r
 \r
     /* Initialize UART */\r
-    ///Cmbk2g_uart_init();\r
-    ///Cmbk2g_uart_set_baudrate(115200);\r
+    ///Cmb_uart_init();\r
+    ///Cmb_uart_set_baudrate(115200);\r
 \r
     return(status);\r
 }\r
@@ -267,16 +246,16 @@ Cmbk2g_STATUS initPlatform(void)
  */\r
 void main (void)\r
 {\r
-       Cmbk2g_STATUS status;\r
+       Cmb_STATUS status;\r
 \r
        status = initPlatform();\r
-       if(status != Cmbk2g_EOK)\r
+       if(status != Cmb_EOK)\r
        {\r
-               cmbk2g_write("Platform Init Failed!\n");\r
+               cmb_write("Platform Init Failed!\n");\r
                testRet(1);\r
        }\r
 \r
-       cmbk2g_delay(10000);\r
+       cmb_delay(10000);\r
 \r
 \r
        system_init();      /* initialize system context, etc. */\r
@@ -290,53 +269,53 @@ void main (void)
        ///sysVauCreate();     /* Create VAU */\r
 \r
 \r
-       cmbk2g_write("\n******************************************\n");\r
-       cmbk2g_write(  "        CMB Analog Loopback Test          \n");\r
-    cmbk2g_write(  "******************************************\n");\r
+       cmb_write("\n******************************************\n");\r
+       cmb_write(  "        CMB Analog Loopback Test          \n");\r
+    cmb_write(  "******************************************\n");\r
 \r
-    cmbk2g_write("\nTest Verifies ADC and DAC Channels\n");\r
-       cmbk2g_write("Test Runs in Audio Loopback Mode\n");\r
-       cmbk2g_write("Confirm that CMB Mic 1 and Mic 8 Input are Played at On-Board Line-Out Left and Right Channels\n");\r
+    cmb_write("\nTest Verifies ADC and DAC Channels\n");\r
+       cmb_write("Test Runs in Audio Loopback Mode\n");\r
+       cmb_write("Confirm that CMB Mic 1 and Mic 8 Input are Played at On-Board Line-Out Left and Right Channels\n");\r
 \r
        /* Initialize McASP HW details */\r
        McaspDevice_init();\r
 \r
        /* Configure eDMA module */\r
        status = eDmaConfig();\r
-       if(status != Cmbk2g_EOK)\r
+       if(status != Cmb_EOK)\r
        {\r
-               cmbk2g_write("eDMA Configuration Failed!\n");\r
+               cmb_write("eDMA Configuration Failed!\n");\r
                testRet(1);\r
        }\r
 \r
        /* Initialize common audio configurations */\r
-       status = (Cmbk2g_STATUS)cmbk2g_AudioInit();\r
-       if(status != Cmbk2g_EOK)\r
+       status = (Cmb_STATUS)cmb_AudioInit();\r
+       if(status != Cmb_EOK)\r
        {\r
-               cmbk2g_write("Audio Init Failed!\n");\r
+               cmb_write("Audio Init Failed!\n");\r
                testRet(1);\r
        }\r
 \r
        /* Initialize Audio ADC module */\r
-       status = audioAdcConfig(CMBK2G_ADC_DEVICE_0, &adcCfg);\r
-       if(status != Cmbk2g_EOK)\r
+       status = audioAdcConfig(CMB_ADC_DEVICE_0, &adcCfg);\r
+       if(status != Cmb_EOK)\r
        {\r
-               cmbk2g_write("Audio ADC0 Configuration Failed!\n");\r
+               cmb_write("Audio ADC0 Configuration Failed!\n");\r
                testRet(1);\r
        }\r
 \r
-       status = audioAdcConfig(CMBK2G_ADC_DEVICE_1, &adcCfg);\r
-       if(status != Cmbk2g_EOK)\r
+       status = audioAdcConfig(CMB_ADC_DEVICE_1, &adcCfg);\r
+       if(status != Cmb_EOK)\r
        {\r
-               cmbk2g_write("Audio ADC1 Configuration Failed!\n");\r
+               cmb_write("Audio ADC1 Configuration Failed!\n");\r
                testRet(1);\r
        }\r
 \r
        /* Initialize McASP module */\r
        status = mcaspAudioConfig();\r
-       if(status != Cmbk2g_EOK)\r
+       if(status != Cmb_EOK)\r
        {\r
-               cmbk2g_write("McASP Configuration Failed!\n");\r
+               cmb_write("McASP Configuration Failed!\n");\r
                testRet(1);\r
        }\r
 \r
@@ -349,16 +328,16 @@ void main (void)
  *\r
  *  \return    none\r
  */\r
-#if CMBK2G_AUDIO_DAC\r
+#if CMB_AUDIO_DAC\r
 void configAudioDAC(void)\r
 {\r
-       Cmbk2g_STATUS status;\r
+       Cmb_STATUS status;\r
 \r
        /* Initialize Audio DAC0 module */\r
-       status = audioDacConfig(CMBK2G_DAC_DEVICE_0, &dacCfg);\r
-       if(status != Cmbk2g_EOK)\r
+       status = audioDacConfig(CMB_DAC_DEVICE_0, &dacCfg);\r
+       if(status != Cmb_EOK)\r
        {\r
-               cmbk2g_write("Audio DAC0 Configuration Failed!\n");\r
+               cmb_write("Audio DAC0 Configuration Failed!\n");\r
                testRet(1);\r
        }\r
 }\r
index 318f2eb93629ce292bfcf8eac438396eb1d279e2..d0d8722adba3b146ba87aca93792ca0d420c1951 100644 (file)
@@ -43,7 +43,7 @@
 #include "sysbfflt.h"                 /* System support for BF filters */\r
 \r
 #include "mcasp_cfg.h"\r
-#include "../include/cmbk2g.h"\r
+#include "cmb.h"\r
 \r
 \r
 /* The infamous xdc/std.h must come before any header file which uses XDC symbols */\r
@@ -160,7 +160,7 @@ Mcasp_HwSetupData mcaspRcvSetup = {
 };\r
 \r
 /* McASP HW setup for transmit */\r
-#if (CMBK2G_AUDIO_DAC)\r
+#if (CMB_AUDIO_DAC)\r
 Mcasp_HwSetupData mcaspXmtSetup = {\r
         /* .xmask    = */ 0xFFFFFFFF, /* 16 bits are to be used     */\r
         /* .xfmt     = */ 0x000180F0, /*\r
@@ -217,7 +217,7 @@ Mcasp_ChanParams  mcaspRxChanParam =
        TRUE\r
 };\r
 \r
-#if (CMBK2G_AUDIO_DAC)\r
+#if (CMB_AUDIO_DAC)\r
 /* McAsp channel parameters for transmit             */\r
 Mcasp_ChanParams  mcaspTxChanParam =\r
 {\r
@@ -357,9 +357,9 @@ void mcaspAppCallback(void *arg, MCASP_Packet *ioBuf)
 /**\r
  *  \brief   Initializes McASP data buffers and submits to McASP driver\r
  *\r
- *  \return    Cmbk2g_EOK on Success or error code\r
+ *  \return    Cmb_EOK on Success or error code\r
  */\r
-Cmbk2g_STATUS initBuffers(void)\r
+Cmb_STATUS initBuffers(void)\r
 {\r
        Error_Block  eb;\r
     uint32_t     count = 0;\r
@@ -376,7 +376,7 @@ Cmbk2g_STATUS initBuffers(void)
                                                             BUFALIGN, &eb);\r
         if(NULL == rxBuf[count])\r
         {\r
-            IFPRINT(cmbk2g_write("\r\nMEM_calloc failed for Rx\n"));\r
+            IFPRINT(cmb_write("\r\nMEM_calloc failed for Rx\n"));\r
         }\r
     }\r
 \r
@@ -387,11 +387,11 @@ Cmbk2g_STATUS initBuffers(void)
                                                             BUFALIGN, &eb);\r
         if(NULL == wkBuf[count])\r
         {\r
-            IFPRINT(cmbk2g_write("\r\nMEM_calloc failed for Wk\n"));\r
+            IFPRINT(cmb_write("\r\nMEM_calloc failed for Wk\n"));\r
         }\r
     }\r
 \r
-#if (CMBK2G_AUDIO_DAC)\r
+#if (CMB_AUDIO_DAC)\r
     /* Allocate buffers for the McASP data exchanges */\r
     for(count = 0; count < NUM_BUFS; count++)\r
     {\r
@@ -399,7 +399,7 @@ Cmbk2g_STATUS initBuffers(void)
                                                                 BUFALIGN, &eb);\r
         if(NULL == txBuf[count])\r
         {\r
-            IFPRINT(cmbk2g_write("\r\nMEM_calloc failed for Tx\n"));\r
+            IFPRINT(cmb_write("\r\nMEM_calloc failed for Tx\n"));\r
         }\r
     }\r
 \r
@@ -410,7 +410,7 @@ Cmbk2g_STATUS initBuffers(void)
                                                                 BUFALIGN, &eb);\r
         if(NULL == outBuf[count])\r
         {\r
-            IFPRINT(cmbk2g_write("\r\nMEM_calloc failed for Out\n"));\r
+            IFPRINT(cmb_write("\r\nMEM_calloc failed for Out\n"));\r
         }\r
     }\r
 #endif\r
@@ -432,12 +432,12 @@ Cmbk2g_STATUS initBuffers(void)
                status = mcaspSubmitChan(hMcaspRxChan, &rxFrame[count]);\r
                if((status != MCASP_COMPLETED) && (status != MCASP_PENDING))\r
                {\r
-                       IFPRINT(cmbk2g_write("mcaspSubmitChan for Rx Failed\n"));\r
-                       return (Cmbk2g_EFAIL);\r
+                       IFPRINT(cmb_write("mcaspSubmitChan for Rx Failed\n"));\r
+                       return (Cmb_EFAIL);\r
                }\r
     }\r
 \r
-#if (CMBK2G_AUDIO_DAC)\r
+#if (CMB_AUDIO_DAC)\r
     for(count = 0; count < NUM_BUFS; count++)\r
     {\r
        memset((uint8_t *)txBuf[count], 0xCC, (BUFSIZE * TX_NUM_SERIALIZER));\r
@@ -455,25 +455,25 @@ Cmbk2g_STATUS initBuffers(void)
                status = mcaspSubmitChan(hMcaspTxChan, &txFrame[count]);\r
                if((status != MCASP_COMPLETED) && (status != MCASP_PENDING))\r
                {\r
-                       IFPRINT(cmbk2g_write("mcaspSubmitChan for Tx Failed\n"));\r
-                       return (Cmbk2g_EFAIL);\r
+                       IFPRINT(cmb_write("mcaspSubmitChan for Tx Failed\n"));\r
+                       return (Cmb_EFAIL);\r
                }\r
     }\r
 #endif\r
-    return (Cmbk2g_EOK);\r
+    return (Cmb_EOK);\r
 }\r
 \r
 /**\r
  *  \brief   Configures McASP module and creates the channel\r
  *           for audio Tx and Rx\r
  *\r
- *  \return    Cmbk2g_EOK on Success or error code\r
+ *  \return    Cmb_EOK on Success or error code\r
  */\r
-Cmbk2g_STATUS mcaspAudioConfig(void)\r
+Cmb_STATUS mcaspAudioConfig(void)\r
 {\r
        Int status;\r
 \r
-#if (CMBK2G_AUDIO_DAC)\r
+#if (CMB_AUDIO_DAC)\r
        hMcaspDevTx  = NULL;\r
        hMcaspTxChan = NULL;\r
 #endif\r
@@ -481,50 +481,50 @@ Cmbk2g_STATUS mcaspAudioConfig(void)
        hMcaspRxChan = NULL;\r
 \r
        /* Initialize McASP Tx and Rx parameters */\r
-#if (CMBK2G_AUDIO_DAC)\r
+#if (CMB_AUDIO_DAC)\r
        mcaspTxParams = Mcasp_PARAMS;\r
 #endif\r
        mcaspRxParams = Mcasp_PARAMS;\r
 \r
-#if (CMBK2G_AUDIO_DAC)\r
+#if (CMB_AUDIO_DAC)\r
        mcaspTxParams.mcaspHwSetup.tx.clk.clkSetupClk = 0x63;\r
        mcaspTxParams.mcaspHwSetup.rx.clk.clkSetupClk = 0x23;\r
 #endif\r
        mcaspRxParams.mcaspHwSetup.rx.clk.clkSetupClk = 0x23;\r
        mcaspRxParams.mcaspHwSetup.tx.clk.clkSetupClk = 0x63;\r
 \r
-#if (CMBK2G_AUDIO_DAC)\r
+#if (CMB_AUDIO_DAC)\r
        mcaspTxParams.mcaspHwSetup.glb.pdir |= 0x2000000; //Set Amute pin as output for Tx channel\r
 #endif\r
 \r
        /* Set the HW interrupt number */\r
-#if (CMBK2G_AUDIO_DAC)\r
+#if (CMB_AUDIO_DAC)\r
        mcaspTxParams.hwiNumber = 8;\r
 #endif\r
        mcaspRxParams.hwiNumber = 8;\r
 \r
        /* Initialize eDMA handle */\r
        mcaspRxChanParam.edmaHandle  = hEdma1;\r
-#if (CMBK2G_AUDIO_DAC)\r
+#if (CMB_AUDIO_DAC)\r
        mcaspTxChanParam.edmaHandle = hEdma1;\r
 \r
        /* Bind McASP2 for Tx */\r
        status = mcaspBindDev(&hMcaspDevTx, CSL_MCASP_2, &mcaspTxParams);\r
        if((status != MCASP_COMPLETED) || (hMcaspDevTx == NULL))\r
        {\r
-               IFPRINT(cmbk2g_write("mcaspBindDev for Tx Failed\n"));\r
-               return (Cmbk2g_EFAIL);\r
+               IFPRINT(cmb_write("mcaspBindDev for Tx Failed\n"));\r
+               return (Cmb_EFAIL);\r
        }\r
 #endif\r
        /* Bind McASP1 for Rx */\r
        status = mcaspBindDev(&hMcaspDevRx, CSL_MCASP_1, &mcaspRxParams);\r
        if((status != MCASP_COMPLETED) || (hMcaspDevRx == NULL))\r
        {\r
-               IFPRINT(cmbk2g_write("mcaspBindDev for Rx Failed\n"));\r
-               return (Cmbk2g_EFAIL);\r
+               IFPRINT(cmb_write("mcaspBindDev for Rx Failed\n"));\r
+               return (Cmb_EFAIL);\r
        }\r
 \r
-#if (CMBK2G_AUDIO_DAC)\r
+#if (CMB_AUDIO_DAC)\r
        /* Create McASP channel for Tx */\r
        status = mcaspCreateChan(&hMcaspTxChan, hMcaspDevTx,\r
                                 MCASP_OUTPUT,\r
@@ -532,8 +532,8 @@ Cmbk2g_STATUS mcaspAudioConfig(void)
                                 mcaspAppCallback, &txChanMode);\r
        if((status != MCASP_COMPLETED) || (hMcaspTxChan == NULL))\r
        {\r
-               IFPRINT(cmbk2g_write("mcaspCreateChan for Tx Failed\n"));\r
-               return (Cmbk2g_EFAIL);\r
+               IFPRINT(cmb_write("mcaspCreateChan for Tx Failed\n"));\r
+               return (Cmb_EFAIL);\r
        }\r
 \r
        configAudioDAC();\r
@@ -546,18 +546,18 @@ Cmbk2g_STATUS mcaspAudioConfig(void)
                                 mcaspAppCallback, &rxChanMode);\r
        if((status != MCASP_COMPLETED) || (hMcaspRxChan == NULL))\r
        {\r
-               IFPRINT(cmbk2g_write("mcaspCreateChan for Rx Failed\n"));\r
-               return (Cmbk2g_EFAIL);\r
+               IFPRINT(cmb_write("mcaspCreateChan for Rx Failed\n"));\r
+               return (Cmb_EFAIL);\r
        }\r
 \r
        /* Initialize the buffers and submit for McASP Tx/Rx */\r
-       if(initBuffers() != Cmbk2g_EOK)\r
+       if(initBuffers() != Cmb_EOK)\r
        {\r
-               IFPRINT(cmbk2g_write("McASP Buffer Initialization Failed\n"));\r
-               return (Cmbk2g_EFAIL);\r
+               IFPRINT(cmb_write("McASP Buffer Initialization Failed\n"));\r
+               return (Cmb_EFAIL);\r
        }\r
 \r
-       return (Cmbk2g_EOK);\r
+       return (Cmb_EOK);\r
 }\r
 \r
 /**\r
@@ -567,7 +567,7 @@ Cmbk2g_STATUS mcaspAudioConfig(void)
  */\r
 void testRet(uint32_t status)\r
 {\r
-       cmbk2g_write("\n\nAudio DC Analog Interface Test Completed!\n");\r
+       cmb_write("\n\nAudio DC Analog Interface Test Completed!\n");\r
 \r
        testExit(status);\r
 }\r
@@ -578,7 +578,7 @@ void testRet(uint32_t status)
  *  Waits for the McASP data transfer completion and copies the\r
  *  Rx data to Tx buffers\r
  *\r
- *  \return    Cmbk2g_EOK on Success or error code\r
+ *  \return    Cmb_EOK on Success or error code\r
  */\r
 #define DUMP_SEC                       5\r
 #define FRAME_PER_SEC          100\r
@@ -618,16 +618,16 @@ Void Audio_echo_Task(void)
 \r
        /* Reclaim full buffer from the input stream */\r
        Semaphore_pend(semR, BIOS_WAIT_FOREVER);\r
-#if (CMBK2G_AUDIO_DAC)\r
+#if (CMB_AUDIO_DAC)\r
        Semaphore_pend(semT, BIOS_WAIT_FOREVER);\r
 #endif\r
         /* Reclaim full buffer from the input stream */\r
-#if (CMBK2G_AUDIO_DAC)\r
+#if (CMB_AUDIO_DAC)\r
        gtxFrameIndexCount = txFrameIndex;\r
 #endif\r
        grxFrameIndexCount = rxFrameIndex;\r
 \r
-#if (CMBK2G_AUDIO_DAC)\r
+#if (CMB_AUDIO_DAC)\r
 \r
 #if 0  // Mcasp_BufferFormat_MULTISER_MULTISLOT_SEMI_INTERLEAVED_1\r
        // copy RX mic 1 to TX left channel and RX mic 5 to right channel\r
@@ -860,7 +860,7 @@ Void Audio_echo_Task(void)
        }\r
 #endif   // Signal Processing Path\r
 #endif   // Mcasp_BufferFormat\r
-#endif   // CMBK2G_AUDIO_DAC\r
+#endif   // CMB_AUDIO_DAC\r
 \r
         // Audio debug dump\r
         if (gAudDumpBufIdx<FRAME_PER_SEC*DUMP_SEC)\r
@@ -883,7 +883,7 @@ Void Audio_echo_Task(void)
                        gAudDumpBufIdx++;\r
         }\r
 \r
-#if (CMBK2G_AUDIO_DAC)\r
+#if (CMB_AUDIO_DAC)\r
         /* Issue full buffer to the output stream                             */\r
         /* TX frame processing */\r
                txFrame[gtxFrameIndexCount].cmd    = MCASP_WRITE;\r