projects / processor-sdk / audio-preprocessing.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 909b6b0)
audio-preprocessing-fw: change real time demo to use the cmbk2g library
authorMing Wei <a0868762@ti.com>
Wed, 4 Jan 2017 23:25:35 +0000 (17:25 -0600)
committerMing Wei <a0868762@ti.com>
Wed, 4 Jan 2017 23:25:35 +0000 (17:25 -0600)
Signed-off-by: Ming Wei <a0868762@ti.com>
13 files changed:
realtime_demo_bios/k2g/.cproject patch | blob | history
realtime_demo_bios/k2g/build/makefile patch | blob | history
realtime_demo_bios/k2g/build/objects.mk patch | blob | history
realtime_demo_bios/k2g/build/src/subdir_rules.mk patch | blob | history
realtime_demo_bios/k2g/build/subdir_rules.mk patch | blob | history
realtime_demo_bios/k2g/include/analog_test.h patch | blob | history
realtime_demo_bios/k2g/include/audio_dc_cfg.h patch | blob | history
realtime_demo_bios/k2g/include/edma_cfg.h patch | blob | history
realtime_demo_bios/k2g/include/mcasp_cfg.h patch | blob | history
realtime_demo_bios/k2g/src/audio_dc_cfg.c patch | blob | history
realtime_demo_bios/k2g/src/edma_cfg.c patch | blob | history
realtime_demo_bios/k2g/src/main.c patch | blob | history
realtime_demo_bios/k2g/src/mcasp_cfg.c patch | blob | history

diff --git a/realtime_demo_bios/k2g/.cproject b/realtime_demo_bios/k2g/.cproject
index e033145d258bd0f0e3799ce7b2cd178b8f2fff80..9dd600e4d61081e7d01b142f05fa81a990f21fb8 100644 (file)
--- a/realtime_demo_bios/k2g/.cproject
+++ b/realtime_demo_bios/k2g/.cproject
@@ -45,7 +45,7 @@
                                                                        <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/audk2g/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}&quot;"/>\r
                                                                        <listOptionValue builtIn="false" value="&quot;${CSL_INSTALL_PATH}&quot;"/>\r
                                                                </option>\r
@@ -56,6 +56,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
                                                                </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
@@ -78,7 +79,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.audk2g.ae66"/>\r
+                                                                       <listOptionValue builtIn="false" value="ti.addon.cmbk2g.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
@@ -92,7 +93,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/audk2g/lib/k2g/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/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
diff --git a/realtime_demo_bios/k2g/build/makefile b/realtime_demo_bios/k2g/build/makefile
index e0cabd2d93769b9d47a844788a590ff7ed47b2ec..5aa444d30ab8494adf75245c0c6117b200baebfa 100644 (file)
--- a/realtime_demo_bios/k2g/build/makefile
+++ b/realtime_demo_bios/k2g/build/makefile
@@ -46,7 +46,7 @@ ORDERED_OBJS += \
 "../bflinker.cmd" \
 $(GEN_CMDS__FLAG) \
 -llibc.a \
--lti.addon.audk2g.ae66 \
+-lti.addon.cmbk2g.ae66 \\r
 -lti.board.ae66 \
 -lti.drv.mcasp.ae66 \
 -laer_c.ae64P \
@@ -190,7 +190,7 @@ all: audioAnalogLoopbackTest.out
 audioAnalogLoopbackTest.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"audioAnalogLoopbackTest.map" --stack_size=0x2000 -i"${C6X_GEN_INSTALL_PATH}/lib" -i"${C6X_GEN_INSTALL_PATH}/include" -i"C:/ti/pdk_k2g_1_0_4/packages/ti/board/lib/evmK2G/c66/release" -i"C:/ti/pdk_k2g_1_0_4/packages/ti/addon/audk2g/lib/k2g/c66/release" -i"C:/ti/pdk_k2g_1_0_4/packages/ti/drv/mcasp/lib/k2g/c66/release" -i"C:/ti/aer_c64Px_obj_17_0_0_0/packages/ti/mas/aer/lib" -i"C:/ti/volib_C66_2_1_0_1/packages/ti/mas/" --reread_libs --diag_wrap=off --display_error_number --warn_sections --xml_link_info="audioAnalogLoopbackTest_linkInfo.xml" --rom_model -o "audioAnalogLoopbackTest.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"audioAnalogLoopbackTest.map" --stack_size=0x2000 -i"${C6X_GEN_INSTALL_PATH}/lib" -i"${C6X_GEN_INSTALL_PATH}/include" -i"C:/ti/pdk_k2g_1_0_4/packages/ti/board/lib/evmK2G/c66/release" -i"C:/ti/pdk_k2g_1_0_4/packages/ti/addon/cmbk2g/lib/k2g/c66/release" -i"C:/ti/pdk_k2g_1_0_4/packages/ti/drv/mcasp/lib/k2g/c66/release" -i"C:/ti/aer_c64Px_obj_17_0_0_0/packages/ti/mas/aer/lib" -i"C:/ti/volib_C66_2_1_0_1/packages/ti/mas/" --reread_libs --diag_wrap=off --display_error_number --warn_sections --xml_link_info="audioAnalogLoopbackTest_linkInfo.xml" --rom_model -o "audioAnalogLoopbackTest.out" $(ORDERED_OBJS)\r
        @echo 'Finished building target: $@'\r
        @echo ' '\r
 \r
diff --git a/realtime_demo_bios/k2g/build/objects.mk b/realtime_demo_bios/k2g/build/objects.mk
index ba12ef3c85b50742e4ffdc8e64d39130eeed7d0a..dacbada1c1baafbd616b28ddc7b6ef39d3e55ba8 100644 (file)
--- a/realtime_demo_bios/k2g/build/objects.mk
+++ b/realtime_demo_bios/k2g/build/objects.mk
@@ -4,5 +4,5 @@
 \r
 USER_OBJS :=\r
 \r
-LIBS := -llibc.a -lti.addon.audk2g.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.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
 \r
diff --git a/realtime_demo_bios/k2g/build/src/subdir_rules.mk b/realtime_demo_bios/k2g/build/src/subdir_rules.mk
index 10f9f92adcc1b3e35e9e7cfa336c737f3bf6f0d7..039da23a5d0926b04abf3c33fd2b41bfa94b7c7e 100644 (file)
--- a/realtime_demo_bios/k2g/build/src/subdir_rules.mk
+++ b/realtime_demo_bios/k2g/build/src/subdir_rules.mk
@@ -6,70 +6,70 @@
 src/audio_dc_cfg.obj: ../../../realtime_demo_bios/k2g/src/audio_dc_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/audk2g/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/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
        @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/audk2g/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/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
        @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/audk2g/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/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
        @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/audk2g/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/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
        @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/audk2g/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/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
        @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/audk2g/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/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
        @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/audk2g/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/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
        @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/audk2g/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
+       "${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/audk2g/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="${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
        @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/audk2g/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/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
        @echo 'Finished building: $<'\r
        @echo ' '\r
 \r
diff --git a/realtime_demo_bios/k2g/build/subdir_rules.mk b/realtime_demo_bios/k2g/build/subdir_rules.mk
index 48eb15f240ae1c228d9fbfc5820400e840b81ccd..5e7199935dac0ba4e77c0bd564d3fb782a104cef 100644 (file)
--- a/realtime_demo_bios/k2g/build/subdir_rules.mk
+++ b/realtime_demo_bios/k2g/build/subdir_rules.mk
@@ -16,77 +16,77 @@ 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/audk2g/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/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
        @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/audk2g/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/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
        @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/audk2g/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/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
        @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/audk2g/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/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
        @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/audk2g/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/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
        @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/audk2g/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/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
        @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/audk2g/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/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
        @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/audk2g/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/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
        @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/audk2g/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/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
        @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/audk2g/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/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
        @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/audk2g/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/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
        @echo 'Finished building: $<'\r
        @echo ' '\r
 \r
diff --git a/realtime_demo_bios/k2g/include/analog_test.h b/realtime_demo_bios/k2g/include/analog_test.h
index 7bc559a4591999a2f44c5ad636e30ed8e8cae3f0..2d5608d5a67170931c4d143fd8f8006e2ccca58d 100644 (file)
--- a/realtime_demo_bios/k2g/include/analog_test.h
+++ b/realtime_demo_bios/k2g/include/analog_test.h
@@ -41,7 +41,7 @@
 #ifndef _ANALOG_TEST_H_\r
 #define _ANALOG_TEST_H_\r
 \r
-#include <audk2g.h>\r
+#include <cmbk2g.h>\r
 \r
 #include <xdc/std.h>\r
 #include <xdc/runtime/Memory.h>\r
@@ -65,7 +65,7 @@
 #include <mcasp_drv.h>\r
 #include <include/McaspLocal.h>\r
 \r
-#include "audk2g_audio.h"\r
+#include "cmbk2g_audio.h"\r
 #include "audio_dc_cfg.h"\r
 #include "mcasp_cfg.h"\r
 #include "edma_cfg.h"\r
diff --git a/realtime_demo_bios/k2g/include/audio_dc_cfg.h b/realtime_demo_bios/k2g/include/audio_dc_cfg.h
index 36c9132821016c2de342d35bcd28cdbf0a1e7001..101b9e211e495131677746e0f4657aadc4071fd1 100644 (file)
--- a/realtime_demo_bios/k2g/include/audio_dc_cfg.h
+++ b/realtime_demo_bios/k2g/include/audio_dc_cfg.h
@@ -46,26 +46,26 @@
 typedef struct _AdcConfig\r
 {\r
        uint8_t          gain;\r
-       Audk2gAdcLeftInputMux  adc1LMux;\r
-       Audk2gAdcLeftInputMux  adc2LMux;\r
-       Audk2gAdcRightInputMux adc1RMux;\r
-       Audk2gAdcRightInputMux adc2RMux;\r
-       Audk2gAdcRxWordLen     wlen;\r
-       Audk2gAdcDataFormat    format;\r
+       Cmbk2gAdcLeftInputMux  adc1LMux;\r
+       Cmbk2gAdcLeftInputMux  adc2LMux;\r
+       Cmbk2gAdcRightInputMux adc1RMux;\r
+       Cmbk2gAdcRightInputMux adc2RMux;\r
+       Cmbk2gAdcRxWordLen     wlen;\r
+       Cmbk2gAdcDataFormat    format;\r
        uint8_t          intEnable;\r
-} Audk2gAdcConfig;\r
+} Cmbk2gAdcConfig;\r
 \r
 typedef struct _DacConfig\r
 {\r
-       Audk2gDacAmuteCtrl    amuteCtrl;\r
+       Cmbk2gDacAmuteCtrl    amuteCtrl;\r
        uint8_t         amuteEnable;\r
-       Audk2gDacSamplingMode samplingMode;\r
-       Audk2gDacDataFormat   dataFormat;\r
+       Cmbk2gDacSamplingMode samplingMode;\r
+       Cmbk2gDacDataFormat   dataFormat;\r
        uint8_t         softMuteEnable;\r
-       Audk2gDacAttnMode     attnMode;\r
-       Audk2gDacDeempCtrl    deempCtrl;\r
+       Cmbk2gDacAttnMode     attnMode;\r
+       Cmbk2gDacDeempCtrl    deempCtrl;\r
        uint8_t         volume;\r
-} Audk2gDacConfig;\r
+} Cmbk2gDacConfig;\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    Audk2g_EOK on Success or error code\r
+ *  \return    Cmbk2g_EOK on Success or error code\r
  */\r
-Audk2g_STATUS audioAdcConfig(Audk2gAdcDevId  devId, Audk2gAdcConfig *config);\r
+Cmbk2g_STATUS audioAdcConfig(Cmbk2gAdcDevId  devId, Cmbk2gAdcConfig *config);\r
 \r
 /**\r
  *  \brief    Initializes DAC module\r
@@ -89,9 +89,9 @@ Audk2g_STATUS audioAdcConfig(Audk2gAdcDevId  devId, Audk2gAdcConfig *config);
  *  \param     devId  [IN]  DAC Device Id\r
  *  \param     config [IN]  DAC configuration parameters\r
  *\r
- *  \return    Audk2g_EOK on Success or error code\r
+ *  \return    Cmbk2g_EOK on Success or error code\r
  */\r
-Audk2g_STATUS audioDacConfig(Audk2gDacDevId devId, Audk2gDacConfig *config);\r
+Cmbk2g_STATUS audioDacConfig(Cmbk2gDacDevId devId, Cmbk2gDacConfig *config);\r
 \r
 #endif /* _AUDIO_DC_CFG_H_ */\r
 \r
diff --git a/realtime_demo_bios/k2g/include/edma_cfg.h b/realtime_demo_bios/k2g/include/edma_cfg.h
index 9ddb70cb068a06b2eeddf8b865df1a0a7a9d5b72..d26a6d017acf2bab7fa54e486718799e9fb7692e 100644 (file)
--- a/realtime_demo_bios/k2g/include/edma_cfg.h
+++ b/realtime_demo_bios/k2g/include/edma_cfg.h
@@ -46,9 +46,9 @@
 /**\r
  *  \brief    Configures eDMA module\r
  *\r
- *  \return    Audk2g_EOK on Success or error code\r
+ *  \return    Cmbk2g_EOK on Success or error code\r
  */\r
-Audk2g_STATUS eDmaConfig(void);\r
+Cmbk2g_STATUS eDmaConfig(void);\r
 \r
 #endif /* _EDMA_CFG_H_ */\r
 \r
diff --git a/realtime_demo_bios/k2g/include/mcasp_cfg.h b/realtime_demo_bios/k2g/include/mcasp_cfg.h
index e6e221a339564cc0cab4e452969b0d3c7a3252c5..2d5e96d603aea4b1b97bcdeeadea5c2bbe93a1b2 100644 (file)
--- a/realtime_demo_bios/k2g/include/mcasp_cfg.h
+++ b/realtime_demo_bios/k2g/include/mcasp_cfg.h
@@ -66,8 +66,8 @@
  *  \brief   Configures McASP module and creates the channel\r
  *           for audio Tx and Rx\r
  *\r
- *  \return    Audk2g_EOK on Success or error code\r
+ *  \return    Cmbk2g_EOK on Success or error code\r
  */\r
-Audk2g_STATUS mcaspAudioConfig(void);\r
+Cmbk2g_STATUS mcaspAudioConfig(void);\r
 \r
 #endif /* _MCASP_CONFIG_H_ */\r
diff --git a/realtime_demo_bios/k2g/src/audio_dc_cfg.c b/realtime_demo_bios/k2g/src/audio_dc_cfg.c
index eff6a4518f8e145ea7ee6e5504c5d533ca329c87..e4ee598a08926f13f17d7abd5da4ae653478c41e 100644 (file)
--- a/realtime_demo_bios/k2g/src/audio_dc_cfg.c
+++ b/realtime_demo_bios/k2g/src/audio_dc_cfg.c
@@ -49,87 +49,87 @@
  *  \param     devId  [IN]  ADC Device Id\r
  *  \param     config [IN]  ADC configuration parameters\r
  *\r
- *  \return    Audk2g_EOK on Success or error code\r
+ *  \return    Cmbk2g_EOK on Success or error code\r
  */\r
-Audk2g_STATUS audioAdcConfig(Audk2gAdcDevId  devId, Audk2gAdcConfig *config)\r
+Cmbk2g_STATUS audioAdcConfig(Cmbk2gAdcDevId  devId, Cmbk2gAdcConfig *config)\r
 {\r
-       Audk2g_STATUS status;\r
+       Cmbk2g_STATUS status;\r
 \r
        if(config == NULL)\r
        {\r
-               IFPRINT(audk2g_write("Invalid Inputs\n"));\r
-               return (Audk2g_EINVALID);\r
+               IFPRINT(cmbk2g_write("Invalid Inputs\n"));\r
+               return (Cmbk2g_EINVALID);\r
        }\r
 \r
        /* Initialize all the HW instances of ADC */\r
        //status = platformAudioAdcInit(devId);\r
-       status = (Audk2g_STATUS)audk2g_AudioAdcInit((Audk2gAdcDevId)devId);\r
-       if(status != Audk2g_EOK)\r
+       status = (Cmbk2g_STATUS)cmbk2g_AudioAdcInit((Cmbk2gAdcDevId)devId);\r
+       if(status != Cmbk2g_EOK)\r
        {\r
-               IFPRINT(audk2g_write("audioAdcConfig : platformaudioAdcConfig Failed\n"));\r
+               IFPRINT(cmbk2g_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 = (Audk2g_STATUS)audk2g_AudioAdcSetGain((Audk2gAdcDevId)devId, (Audk2gAdcChanId)AUDK2G_ADC_CH_ALL, config->gain);\r
-       if(status != Audk2g_EOK)\r
+    status = (Cmbk2g_STATUS)cmbk2g_AudioAdcSetGain((Cmbk2gAdcDevId)devId, (Cmbk2gAdcChanId)CMBK2G_ADC_CH_ALL, config->gain);\r
+       if(status != Cmbk2g_EOK)\r
        {\r
-               IFPRINT(audk2g_write("audioAdcConfig : platformAudioAdcSetGain Failed\n"));\r
+               IFPRINT(cmbk2g_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 = (Audk2g_STATUS)audk2g_AudioAdcSetLeftInputMux((Audk2gAdcDevId)devId, (Audk2gAdcChanId)AUDK2G_ADC_CH1_LEFT, (Audk2gAdcLeftInputMux)(config->adc1LMux));\r
-       if(status != Audk2g_EOK)\r
+    status = (Cmbk2g_STATUS)cmbk2g_AudioAdcSetLeftInputMux((Cmbk2gAdcDevId)devId, (Cmbk2gAdcChanId)CMBK2G_ADC_CH1_LEFT, (Cmbk2gAdcLeftInputMux)(config->adc1LMux));\r
+       if(status != Cmbk2g_EOK)\r
        {\r
-               IFPRINT(audk2g_write("audioAdcConfig : platformAudioAdcSetLeftInputMux Failed\n"));\r
+               IFPRINT(cmbk2g_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 = (Audk2g_STATUS)audk2g_AudioAdcSetLeftInputMux((Audk2gAdcDevId)devId, (Audk2gAdcChanId)AUDK2G_ADC_CH2_LEFT, (Audk2gAdcLeftInputMux)(config->adc2LMux));\r
-       if(status != Audk2g_EOK)\r
+       status = (Cmbk2g_STATUS)cmbk2g_AudioAdcSetLeftInputMux((Cmbk2gAdcDevId)devId, (Cmbk2gAdcChanId)CMBK2G_ADC_CH2_LEFT, (Cmbk2gAdcLeftInputMux)(config->adc2LMux));\r
+       if(status != Cmbk2g_EOK)\r
        {\r
-               IFPRINT(audk2g_write("audioAdcConfig : platformAudioAdcSetLeftInputMux Failed\n"));\r
+               IFPRINT(cmbk2g_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 = (Audk2g_STATUS)audk2g_AudioAdcSetRightInputMux((Audk2gAdcDevId)devId, (Audk2gAdcChanId)AUDK2G_ADC_CH1_RIGHT, (Audk2gAdcRightInputMux)(config->adc1RMux));\r
-       if(status != Audk2g_EOK)\r
+    status = (Cmbk2g_STATUS)cmbk2g_AudioAdcSetRightInputMux((Cmbk2gAdcDevId)devId, (Cmbk2gAdcChanId)CMBK2G_ADC_CH1_RIGHT, (Cmbk2gAdcRightInputMux)(config->adc1RMux));\r
+       if(status != Cmbk2g_EOK)\r
        {\r
-               IFPRINT(audk2g_write("audioAdcConfig : platformAudioAdcSetRightInputMux Failed\n"));\r
+               IFPRINT(cmbk2g_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 = (Audk2g_STATUS)audk2g_AudioAdcSetRightInputMux((Audk2gAdcDevId)devId, (Audk2gAdcChanId)AUDK2G_ADC_CH2_RIGHT, (Audk2gAdcRightInputMux)(config->adc2RMux));\r
-       if(status != Audk2g_EOK)\r
+    status = (Cmbk2g_STATUS)cmbk2g_AudioAdcSetRightInputMux((Cmbk2gAdcDevId)devId, (Cmbk2gAdcChanId)CMBK2G_ADC_CH2_RIGHT, (Cmbk2gAdcRightInputMux)(config->adc2RMux));\r
+       if(status != Cmbk2g_EOK)\r
        {\r
-               IFPRINT(audk2g_write("audioAdcConfig : platformAudioAdcSetRightInputMux Failed\n"));\r
+               IFPRINT(cmbk2g_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 = (Audk2g_STATUS)audk2g_AudioAdcDataConfig((Audk2gAdcDevId)devId, (Audk2gAdcRxWordLen)(config->wlen), (Audk2gAdcDataFormat)(config->format));\r
-       if(status != Audk2g_EOK)\r
+       status = (Cmbk2g_STATUS)cmbk2g_AudioAdcDataConfig((Cmbk2gAdcDevId)devId, (Cmbk2gAdcRxWordLen)(config->wlen), (Cmbk2gAdcDataFormat)(config->format));\r
+       if(status != Cmbk2g_EOK)\r
        {\r
-               IFPRINT(audk2g_write("audioAdcConfig : platformAudioAdcDataConfig Failed\n"));\r
+               IFPRINT(cmbk2g_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 = (Audk2g_STATUS)audk2g_AudioAdcConfigIntr((Audk2gAdcDevId)devId, (Audk2gAdcIntr)AUDK2G_ADC_INTR_ALL, config->intEnable);\r
-       if(status != Audk2g_EOK)\r
+    status = (Cmbk2g_STATUS)cmbk2g_AudioAdcConfigIntr((Cmbk2gAdcDevId)devId, (Cmbk2gAdcIntr)CMBK2G_ADC_INTR_ALL, config->intEnable);\r
+       if(status != Cmbk2g_EOK)\r
        {\r
-               IFPRINT(audk2g_write("audioAdcConfig : platformAudioAdcConfigIntr Failed\n"));\r
+               IFPRINT(cmbk2g_write("audioAdcConfig : platformAudioAdcConfigIntr Failed\n"));\r
                return (status);\r
        }\r
 \r
@@ -145,89 +145,89 @@ Audk2g_STATUS audioAdcConfig(Audk2gAdcDevId  devId, Audk2gAdcConfig *config)
  *  \param     devId  [IN]  DAC Device Id\r
  *  \param     config [IN]  DAC configuration parameters\r
  *\r
- *  \return    Audk2g_EOK on Success or error code\r
+ *  \return    Cmbk2g_EOK on Success or error code\r
  */\r
-#if AUDK2G_AUDIO_DAC\r
-Audk2g_STATUS audioDacConfig(Audk2gDacDevId devId, Audk2gDacConfig *config)\r
+#if CMBK2G_AUDIO_DAC\r
+Cmbk2g_STATUS audioDacConfig(Cmbk2gDacDevId devId, Cmbk2gDacConfig *config)\r
 {\r
-       Audk2g_STATUS status;\r
+       Cmbk2g_STATUS status;\r
 \r
        if(config == NULL)\r
        {\r
-               IFPRINT(audk2g_write("Invalid Inputs\n"));\r
-               return (Audk2g_EINVALID);\r
+               IFPRINT(cmbk2g_write("Invalid Inputs\n"));\r
+               return (Cmbk2g_EINVALID);\r
        }\r
 \r
        /* Initialize Audio DAC */\r
        //status = platformAudioDacInit(devId);\r
-    status = (Audk2g_STATUS)audk2g_AudioDacInit((Audk2gDacDevId)devId);\r
-       if(status != Audk2g_EOK)\r
+    status = (Cmbk2g_STATUS)cmbk2g_AudioDacInit((Cmbk2gDacDevId)devId);\r
+       if(status != Cmbk2g_EOK)\r
        {\r
-               IFPRINT(audk2g_write("audioDacConfig : platformaudioDacConfig Failed\n"));\r
+               IFPRINT(cmbk2g_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 = (Audk2g_STATUS)audk2g_AudioDacAmuteCtrl((Audk2gDacDevId)devId, (Audk2gDacAmuteCtrl)(config->amuteCtrl), config->amuteEnable);\r
-       if(status != Audk2g_EOK)\r
+    status = (Cmbk2g_STATUS)cmbk2g_AudioDacAmuteCtrl((Cmbk2gDacDevId)devId, (Cmbk2gDacAmuteCtrl)(config->amuteCtrl), config->amuteEnable);\r
+       if(status != Cmbk2g_EOK)\r
        {\r
-               IFPRINT(audk2g_write("audioDacConfig : platformAudioDacAmuteCtrl Failed\n"));\r
+               IFPRINT(cmbk2g_write("audioDacConfig : platformAudioDacAmuteCtrl Failed\n"));\r
                return (status);\r
        }\r
 \r
        /* Set sampling mode */\r
        //status = platformAudioDacSetSamplingMode(devId, config->samplingMode);\r
-    status = (Audk2g_STATUS)audk2g_AudioDacSetSamplingMode((Audk2gDacDevId)devId, (Audk2gDacSamplingMode)(config->samplingMode));\r
-       if(status != Audk2g_EOK)\r
+    status = (Cmbk2g_STATUS)cmbk2g_AudioDacSetSamplingMode((Cmbk2gDacDevId)devId, (Cmbk2gDacSamplingMode)(config->samplingMode));\r
+       if(status != Cmbk2g_EOK)\r
        {\r
-               IFPRINT(audk2g_write("audioDacConfig : platformAudioDacSetSamplingMode Failed\n"));\r
+               IFPRINT(cmbk2g_write("audioDacConfig : platformAudioDacSetSamplingMode Failed\n"));\r
                return (status);\r
        }\r
 \r
        /* Set data format */\r
        //status = platformAudioDacSetDataFormat(devId, config->dataFormat);\r
-    status = (Audk2g_STATUS)audk2g_AudioDacSetDataFormat((Audk2gDacDevId)devId, (Audk2gDacDataFormat)(config->dataFormat));\r
-       if(status != Audk2g_EOK)\r
+    status = (Cmbk2g_STATUS)cmbk2g_AudioDacSetDataFormat((Cmbk2gDacDevId)devId, (Cmbk2gDacDataFormat)(config->dataFormat));\r
+       if(status != Cmbk2g_EOK)\r
        {\r
-               IFPRINT(audk2g_write("audioDacConfig : platformAudioDacSetDataFormat Failed\n"));\r
+               IFPRINT(cmbk2g_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 = (Audk2g_STATUS)audk2g_AudioDacSoftMuteCtrl((Audk2gDacDevId)devId, (Audk2gDacChanId)AUDK2G_DAC_CHAN_ALL, config->softMuteEnable);\r
-       if(status != Audk2g_EOK)\r
+    status = (Cmbk2g_STATUS)cmbk2g_AudioDacSoftMuteCtrl((Cmbk2gDacDevId)devId, (Cmbk2gDacChanId)CMBK2G_DAC_CHAN_ALL, config->softMuteEnable);\r
+       if(status != Cmbk2g_EOK)\r
        {\r
-               IFPRINT(audk2g_write("audioDacConfig : platformAudioDacSoftMuteCtrl Failed\n"));\r
+               IFPRINT(cmbk2g_write("audioDacConfig : platformAudioDacSoftMuteCtrl Failed\n"));\r
                return (status);\r
        }\r
 \r
        /* Set attenuation mode */\r
        //status = platformAudioDacSetAttnMode(devId, config->attnMode);\r
-    status = (Audk2g_STATUS)audk2g_AudioDacSetAttnMode((Audk2gDacDevId)devId, (Audk2gDacAttnMode)(config->attnMode));\r
-       if(status != Audk2g_EOK)\r
+    status = (Cmbk2g_STATUS)cmbk2g_AudioDacSetAttnMode((Cmbk2gDacDevId)devId, (Cmbk2gDacAttnMode)(config->attnMode));\r
+       if(status != Cmbk2g_EOK)\r
        {\r
-               IFPRINT(audk2g_write("audioDacConfig : platformAudioDacSetAttnMode Failed\n"));\r
+               IFPRINT(cmbk2g_write("audioDacConfig : platformAudioDacSetAttnMode Failed\n"));\r
                return (status);\r
        }\r
 \r
        /* Set De-emphasis control */\r
        //status = platformAudioDacDeempCtrl(devId, config->deempCtrl);\r
-    status = (Audk2g_STATUS)audk2g_AudioDacDeempCtrl((Audk2gDacDevId)devId, (Audk2gDacDeempCtrl)(config->deempCtrl));\r
-       if(status != Audk2g_EOK)\r
+    status = (Cmbk2g_STATUS)cmbk2g_AudioDacDeempCtrl((Cmbk2gDacDevId)devId, (Cmbk2gDacDeempCtrl)(config->deempCtrl));\r
+       if(status != Cmbk2g_EOK)\r
        {\r
-               IFPRINT(audk2g_write("audioDacConfig : platformAudioDacDeempCtrl Failed\n"));\r
+               IFPRINT(cmbk2g_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 = (Audk2g_STATUS)audk2g_AudioDacSetVolume((Audk2gDacDevId)devId, (Audk2gDacChanId)AUDK2G_DAC_CHAN_ALL, config->volume);\r
-       if(status != Audk2g_EOK)\r
+    status = (Cmbk2g_STATUS)cmbk2g_AudioDacSetVolume((Cmbk2gDacDevId)devId, (Cmbk2gDacChanId)CMBK2G_DAC_CHAN_ALL, config->volume);\r
+       if(status != Cmbk2g_EOK)\r
        {\r
-               IFPRINT(audk2g_write("audioDacConfig : platformAudioDacSetVolume Failed\n"));\r
+               IFPRINT(cmbk2g_write("audioDacConfig : platformAudioDacSetVolume Failed\n"));\r
                return (status);\r
        }\r
 #endif\r
diff --git a/realtime_demo_bios/k2g/src/edma_cfg.c b/realtime_demo_bios/k2g/src/edma_cfg.c
index f242c75f05fba49856ca16c23dbbea98f6abe37d..685647bf05a4a15df6a73f2ef96380f1f716a6c6 100644 (file)
--- a/realtime_demo_bios/k2g/src/edma_cfg.c
+++ b/realtime_demo_bios/k2g/src/edma_cfg.c
@@ -92,9 +92,9 @@ EDMA3_DRV_Handle hEdma1;
 /**\r
  *  \brief    Configures eDMA module\r
  *\r
- *  \return    Audk2g_EOK on Success or error code\r
+ *  \return    Cmbk2g_EOK on Success or error code\r
  */\r
-Audk2g_STATUS eDmaConfig(void)\r
+Cmbk2g_STATUS eDmaConfig(void)\r
 {\r
     EDMA3_DRV_Result edmaResult = 0;\r
     uint32_t temp;\r
@@ -107,19 +107,19 @@ Audk2g_STATUS eDmaConfig(void)
     hEdma0 = edma3init(CSL_EDMACC_0, &edmaResult);\r
     if((hEdma0 == NULL) || (edmaResult != 0))\r
     {\r
-               IFPRINT(audk2g_write("eDMA instance 0 Initialization Failed\n"));\r
-               return (Audk2g_EFAIL);\r
+               IFPRINT(cmbk2g_write("eDMA instance 0 Initialization Failed\n"));\r
+               return (Cmbk2g_EFAIL);\r
        }\r
 \r
        /* Initialize eDMA 1 */\r
     hEdma1 = edma3init(CSL_EDMACC_1, &edmaResult);\r
     if((hEdma1 == NULL) || (edmaResult != 0))\r
     {\r
-               IFPRINT(audk2g_write("eDMA instance 1 Initialization Failed\n"));\r
-               return (Audk2g_EFAIL);\r
+               IFPRINT(cmbk2g_write("eDMA instance 1 Initialization Failed\n"));\r
+               return (Cmbk2g_EFAIL);\r
        }\r
 \r
-       return (Audk2g_EOK);\r
+       return (Cmbk2g_EOK);\r
 }\r
 \r
 /**\r
diff --git a/realtime_demo_bios/k2g/src/main.c b/realtime_demo_bios/k2g/src/main.c
index 1369f0cdd1482c5df0b2681ddf1fda005d94ce58..260b2a30df7ee226f672b21966d519553c6344ce 100644 (file)
--- a/realtime_demo_bios/k2g/src/main.c
+++ b/realtime_demo_bios/k2g/src/main.c
@@ -133,28 +133,28 @@ static void system_init(void)
 } /* system_init */\r
 \r
 /* ADC default configuration parameters */\r
-Audk2gAdcConfig adcCfg =\r
+Cmbk2gAdcConfig adcCfg =\r
 {\r
        80,                  /* ADC gain */\r
-       AUDK2G_ADC_INL_SE_VINL1,    /* Left input mux for ADC1L */\r
-       AUDK2G_ADC_INL_SE_VINL2,    /* Left input mux for ADC2L */\r
-       AUDK2G_ADC_INR_SE_VINR1,    /* Right input mux for ADC1R */\r
-       AUDK2G_ADC_INR_SE_VINR2,    /* Right input mux for ADC2R */\r
-       AUDK2G_ADC_RX_WLEN_24BIT,   /* ADC word length */\r
-       AUDK2G_ADC_DATA_FORMAT_I2S, /* ADC data format */\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
        0\r
 };\r
 \r
 /* DAC default configuration parameters */\r
-Audk2gDacConfig  dacCfg =\r
+Cmbk2gDacConfig  dacCfg =\r
 {\r
-       AUDK2G_DAC_AMUTE_CTRL_SCKI_LOST,   /* Amute event */\r
+       CMBK2G_DAC_AMUTE_CTRL_SCKI_LOST,   /* Amute event */\r
        0,                          /* Amute control */\r
-       AUDK2G_DAC_SAMPLING_MODE_AUTO,     /* Sampling mode */\r
-       AUDK2G_DAC_DATA_FORMAT_I2S,        /* Data format */\r
+       CMBK2G_DAC_SAMPLING_MODE_AUTO,     /* Sampling mode */\r
+       CMBK2G_DAC_DATA_FORMAT_I2S,        /* Data format */\r
        0,                          /* Soft mute control */\r
-       AUDK2G_DAC_ATTENUATION_WIDE_RANGE, /* Attenuation mode */\r
-       AUDK2G_DAC_DEEMP_44KHZ,            /* De-emph control */\r
+       CMBK2G_DAC_ATTENUATION_WIDE_RANGE, /* Attenuation mode */\r
+       CMBK2G_DAC_DEEMP_44KHZ,            /* De-emph control */\r
        80                          /* Volume */\r
 };\r
 \r
@@ -181,7 +181,7 @@ void pinMuxSetMode_local(uint32_t padCfgId, PadCfgMuxMode muxMode)
 }\r
 \r
 char write_buffer[MAX_WRITE_LEN];\r
-void audk2g_write(const char *fmt, ... )\r
+void cmbk2g_write(const char *fmt, ... )\r
 {\r
        va_list         arg_ptr;\r
        uint32_t        length;\r
@@ -210,9 +210,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    Audk2g_EOK on Success or error code\r
+ *  \return    Cmbk2g_EOK on Success or error code\r
  */\r
-Audk2g_STATUS initPlatform(void)\r
+Cmbk2g_STATUS initPlatform(void)\r
 {\r
        Board_STATUS status = BOARD_SOK;\r
        Board_initCfg arg = BOARD_INIT_PINMUX_CONFIG | BOARD_INIT_MODULE_CLOCK;\r
@@ -244,11 +244,11 @@ Audk2g_STATUS initPlatform(void)
        ///gpioSetOutput(GPIO_PORT_1, 54);\r
 \r
        /* Configure platform log messages to standard printf */\r
-    ///Audk2g_write_configure(Audk2g_WRITE_UART);\r
+    ///Cmbk2g_write_configure(Cmbk2g_WRITE_UART);\r
 \r
     /* Initialize UART */\r
-    ///Audk2g_uart_init();\r
-    ///Audk2g_uart_set_baudrate(115200);\r
+    ///Cmbk2g_uart_init();\r
+    ///Cmbk2g_uart_set_baudrate(115200);\r
 \r
     return(status);\r
 }\r
@@ -260,16 +260,16 @@ Audk2g_STATUS initPlatform(void)
  */\r
 void main (void)\r
 {\r
-       Audk2g_STATUS status;\r
+       Cmbk2g_STATUS status;\r
 \r
        status = initPlatform();\r
-       if(status != Audk2g_EOK)\r
+       if(status != Cmbk2g_EOK)\r
        {\r
-               audk2g_write("Platform Init Failed!\n");\r
+               cmbk2g_write("Platform Init Failed!\n");\r
                testRet(1);\r
        }\r
 \r
-       audk2g_delay(10000);\r
+       cmbk2g_delay(10000);\r
 \r
 \r
        system_init();      /* initialize system context, etc. */\r
@@ -280,53 +280,53 @@ void main (void)
        ///sysVauCreate();     /* Create VAU */\r
 \r
 \r
-       audk2g_write("\n******************************************\n");\r
-       audk2g_write(  "        CMB Analog Loopback Test          \n");\r
-    audk2g_write(  "******************************************\n");\r
+       cmbk2g_write("\n******************************************\n");\r
+       cmbk2g_write(  "        CMB Analog Loopback Test          \n");\r
+    cmbk2g_write(  "******************************************\n");\r
 \r
-    audk2g_write("\nTest Verifies ADC and DAC Channels\n");\r
-       audk2g_write("Test Runs in Audio Loopback Mode\n");\r
-       audk2g_write("Confirm that CMB Mic 1 and Mic 8 Input are Played at On-Board Line-Out Left and Right Channels\n");\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
 \r
        /* Initialize McASP HW details */\r
        McaspDevice_init();\r
 \r
        /* Configure eDMA module */\r
        status = eDmaConfig();\r
-       if(status != Audk2g_EOK)\r
+       if(status != Cmbk2g_EOK)\r
        {\r
-               audk2g_write("eDMA Configuration Failed!\n");\r
+               cmbk2g_write("eDMA Configuration Failed!\n");\r
                testRet(1);\r
        }\r
 \r
        /* Initialize common audio configurations */\r
-       status = (Audk2g_STATUS)audk2g_AudioInit();\r
-       if(status != Audk2g_EOK)\r
+       status = (Cmbk2g_STATUS)cmbk2g_AudioInit();\r
+       if(status != Cmbk2g_EOK)\r
        {\r
-               audk2g_write("Audio Init Failed!\n");\r
+               cmbk2g_write("Audio Init Failed!\n");\r
                testRet(1);\r
        }\r
 \r
        /* Initialize Audio ADC module */\r
-       status = audioAdcConfig(AUDK2G_ADC_DEVICE_0, &adcCfg);\r
-       if(status != Audk2g_EOK)\r
+       status = audioAdcConfig(CMBK2G_ADC_DEVICE_0, &adcCfg);\r
+       if(status != Cmbk2g_EOK)\r
        {\r
-               audk2g_write("Audio ADC0 Configuration Failed!\n");\r
+               cmbk2g_write("Audio ADC0 Configuration Failed!\n");\r
                testRet(1);\r
        }\r
 \r
-       status = audioAdcConfig(AUDK2G_ADC_DEVICE_1, &adcCfg);\r
-       if(status != Audk2g_EOK)\r
+       status = audioAdcConfig(CMBK2G_ADC_DEVICE_1, &adcCfg);\r
+       if(status != Cmbk2g_EOK)\r
        {\r
-               audk2g_write("Audio ADC1 Configuration Failed!\n");\r
+               cmbk2g_write("Audio ADC1 Configuration Failed!\n");\r
                testRet(1);\r
        }\r
 \r
        /* Initialize McASP module */\r
        status = mcaspAudioConfig();\r
-       if(status != Audk2g_EOK)\r
+       if(status != Cmbk2g_EOK)\r
        {\r
-               audk2g_write("McASP Configuration Failed!\n");\r
+               cmbk2g_write("McASP Configuration Failed!\n");\r
                testRet(1);\r
        }\r
 \r
@@ -339,16 +339,16 @@ void main (void)
  *\r
  *  \return    none\r
  */\r
-#if AUDK2G_AUDIO_DAC\r
+#if CMBK2G_AUDIO_DAC\r
 void configAudioDAC(void)\r
 {\r
-       Audk2g_STATUS status;\r
+       Cmbk2g_STATUS status;\r
 \r
        /* Initialize Audio DAC0 module */\r
-       status = audioDacConfig(AUDK2G_DAC_DEVICE_0, &dacCfg);\r
-       if(status != Audk2g_EOK)\r
+       status = audioDacConfig(CMBK2G_DAC_DEVICE_0, &dacCfg);\r
+       if(status != Cmbk2g_EOK)\r
        {\r
-               audk2g_write("Audio DAC0 Configuration Failed!\n");\r
+               cmbk2g_write("Audio DAC0 Configuration Failed!\n");\r
                testRet(1);\r
        }\r
 }\r
diff --git a/realtime_demo_bios/k2g/src/mcasp_cfg.c b/realtime_demo_bios/k2g/src/mcasp_cfg.c
index 0fb790c9d5e51fcadeabcfc1b938c1796ce0afb0..44a23b74ae78aa2dd29b675ad7ad18326e9ec14c 100644 (file)
--- a/realtime_demo_bios/k2g/src/mcasp_cfg.c
+++ b/realtime_demo_bios/k2g/src/mcasp_cfg.c
@@ -39,7 +39,7 @@
  */\r
 \r
 #include "mcasp_cfg.h"\r
-#include "../include/audk2g.h"\r
+#include "../include/cmbk2g.h"\r
 \r
 \r
 /* The infamous xdc/std.h must come before any header file which uses XDC symbols */\r
@@ -156,7 +156,7 @@ Mcasp_HwSetupData mcaspRcvSetup = {
 };\r
 \r
 /* McASP HW setup for transmit */\r
-#if (AUDK2G_AUDIO_DAC)\r
+#if (CMBK2G_AUDIO_DAC)\r
 Mcasp_HwSetupData mcaspXmtSetup = {\r
         /* .xmask    = */ 0xFFFFFFFF, /* 16 bits are to be used     */\r
         /* .xfmt     = */ 0x000180F0, /*\r
@@ -209,7 +209,7 @@ Mcasp_ChanParams  mcaspRxChanParam =
        TRUE\r
 };\r
 \r
-#if (AUDK2G_AUDIO_DAC)\r
+#if (CMBK2G_AUDIO_DAC)\r
 /* McAsp channel parameters for transmit             */\r
 Mcasp_ChanParams  mcaspTxChanParam =\r
 {\r
@@ -337,9 +337,9 @@ void mcaspAppCallback(void *arg, MCASP_Packet *ioBuf)
 /**\r
  *  \brief   Initializes McASP data buffers and submits to McASP driver\r
  *\r
- *  \return    Audk2g_EOK on Success or error code\r
+ *  \return    Cmbk2g_EOK on Success or error code\r
  */\r
-Audk2g_STATUS initBuffers(void)\r
+Cmbk2g_STATUS initBuffers(void)\r
 {\r
        Error_Block  eb;\r
     uint32_t     count = 0;\r
@@ -356,7 +356,7 @@ Audk2g_STATUS initBuffers(void)
                                                             BUFALIGN, &eb);\r
         if(NULL == rxBuf[count])\r
         {\r
-            IFPRINT(audk2g_write("\r\nMEM_calloc failed for Rx\n"));\r
+            IFPRINT(cmbk2g_write("\r\nMEM_calloc failed for Rx\n"));\r
         }\r
     }\r
 \r
@@ -367,11 +367,11 @@ Audk2g_STATUS initBuffers(void)
                                                             BUFALIGN, &eb);\r
         if(NULL == wkBuf[count])\r
         {\r
-            IFPRINT(audk2g_write("\r\nMEM_calloc failed for Wk\n"));\r
+            IFPRINT(cmbk2g_write("\r\nMEM_calloc failed for Wk\n"));\r
         }\r
     }\r
 \r
-#if (AUDK2G_AUDIO_DAC)\r
+#if (CMBK2G_AUDIO_DAC)\r
     /* Allocate buffers for the McASP data exchanges */\r
     for(count = 0; count < NUM_BUFS; count++)\r
     {\r
@@ -379,7 +379,7 @@ Audk2g_STATUS initBuffers(void)
                                                                 BUFALIGN, &eb);\r
         if(NULL == txBuf[count])\r
         {\r
-            IFPRINT(audk2g_write("\r\nMEM_calloc failed for Tx\n"));\r
+            IFPRINT(cmbk2g_write("\r\nMEM_calloc failed for Tx\n"));\r
         }\r
     }\r
 \r
@@ -390,7 +390,7 @@ Audk2g_STATUS initBuffers(void)
                                                                 BUFALIGN, &eb);\r
         if(NULL == outBuf[count])\r
         {\r
-            IFPRINT(audk2g_write("\r\nMEM_calloc failed for Out\n"));\r
+            IFPRINT(cmbk2g_write("\r\nMEM_calloc failed for Out\n"));\r
         }\r
     }\r
 #endif\r
@@ -412,12 +412,12 @@ Audk2g_STATUS initBuffers(void)
                status = mcaspSubmitChan(hMcaspRxChan, &rxFrame[count]);\r
                if((status != MCASP_COMPLETED) && (status != MCASP_PENDING))\r
                {\r
-                       IFPRINT(audk2g_write("mcaspSubmitChan for Rx Failed\n"));\r
-                       return (Audk2g_EFAIL);\r
+                       IFPRINT(cmbk2g_write("mcaspSubmitChan for Rx Failed\n"));\r
+                       return (Cmbk2g_EFAIL);\r
                }\r
     }\r
 \r
-#if (AUDK2G_AUDIO_DAC)\r
+#if (CMBK2G_AUDIO_DAC)\r
     for(count = 0; count < NUM_BUFS; count++)\r
     {\r
        memset((uint8_t *)txBuf[count], 0xCC, (BUFSIZE * TX_NUM_SERIALIZER));\r
@@ -435,25 +435,25 @@ Audk2g_STATUS initBuffers(void)
                status = mcaspSubmitChan(hMcaspTxChan, &txFrame[count]);\r
                if((status != MCASP_COMPLETED) && (status != MCASP_PENDING))\r
                {\r
-                       IFPRINT(audk2g_write("mcaspSubmitChan for Tx Failed\n"));\r
-                       return (Audk2g_EFAIL);\r
+                       IFPRINT(cmbk2g_write("mcaspSubmitChan for Tx Failed\n"));\r
+                       return (Cmbk2g_EFAIL);\r
                }\r
     }\r
 #endif\r
-    return (Audk2g_EOK);\r
+    return (Cmbk2g_EOK);\r
 }\r
 \r
 /**\r
  *  \brief   Configures McASP module and creates the channel\r
  *           for audio Tx and Rx\r
  *\r
- *  \return    Audk2g_EOK on Success or error code\r
+ *  \return    Cmbk2g_EOK on Success or error code\r
  */\r
-Audk2g_STATUS mcaspAudioConfig(void)\r
+Cmbk2g_STATUS mcaspAudioConfig(void)\r
 {\r
        Int status;\r
 \r
-#if (AUDK2G_AUDIO_DAC)\r
+#if (CMBK2G_AUDIO_DAC)\r
        hMcaspDevTx  = NULL;\r
        hMcaspTxChan = NULL;\r
 #endif\r
@@ -461,50 +461,50 @@ Audk2g_STATUS mcaspAudioConfig(void)
        hMcaspRxChan = NULL;\r
 \r
        /* Initialize McASP Tx and Rx parameters */\r
-#if (AUDK2G_AUDIO_DAC)\r
+#if (CMBK2G_AUDIO_DAC)\r
        mcaspTxParams = Mcasp_PARAMS;\r
 #endif\r
        mcaspRxParams = Mcasp_PARAMS;\r
 \r
-#if (AUDK2G_AUDIO_DAC)\r
+#if (CMBK2G_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 (AUDK2G_AUDIO_DAC)\r
+#if (CMBK2G_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 (AUDK2G_AUDIO_DAC)\r
+#if (CMBK2G_AUDIO_DAC)\r
        mcaspTxParams.hwiNumber = 8;\r
 #endif\r
        mcaspRxParams.hwiNumber = 8;\r
 \r
        /* Initialize eDMA handle */\r
        mcaspRxChanParam.edmaHandle  = hEdma1;\r
-#if (AUDK2G_AUDIO_DAC)\r
+#if (CMBK2G_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(audk2g_write("mcaspBindDev for Tx Failed\n"));\r
-               return (Audk2g_EFAIL);\r
+               IFPRINT(cmbk2g_write("mcaspBindDev for Tx Failed\n"));\r
+               return (Cmbk2g_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(audk2g_write("mcaspBindDev for Rx Failed\n"));\r
-               return (Audk2g_EFAIL);\r
+               IFPRINT(cmbk2g_write("mcaspBindDev for Rx Failed\n"));\r
+               return (Cmbk2g_EFAIL);\r
        }\r
 \r
-#if (AUDK2G_AUDIO_DAC)\r
+#if (CMBK2G_AUDIO_DAC)\r
        /* Create McASP channel for Tx */\r
        status = mcaspCreateChan(&hMcaspTxChan, hMcaspDevTx,\r
                                 MCASP_OUTPUT,\r
@@ -512,8 +512,8 @@ Audk2g_STATUS mcaspAudioConfig(void)
                                 mcaspAppCallback, &txChanMode);\r
        if((status != MCASP_COMPLETED) || (hMcaspTxChan == NULL))\r
        {\r
-               IFPRINT(audk2g_write("mcaspCreateChan for Tx Failed\n"));\r
-               return (Audk2g_EFAIL);\r
+               IFPRINT(cmbk2g_write("mcaspCreateChan for Tx Failed\n"));\r
+               return (Cmbk2g_EFAIL);\r
        }\r
 \r
        configAudioDAC();\r
@@ -526,18 +526,18 @@ Audk2g_STATUS mcaspAudioConfig(void)
                                 mcaspAppCallback, &rxChanMode);\r
        if((status != MCASP_COMPLETED) || (hMcaspRxChan == NULL))\r
        {\r
-               IFPRINT(audk2g_write("mcaspCreateChan for Rx Failed\n"));\r
-               return (Audk2g_EFAIL);\r
+               IFPRINT(cmbk2g_write("mcaspCreateChan for Rx Failed\n"));\r
+               return (Cmbk2g_EFAIL);\r
        }\r
 \r
        /* Initialize the buffers and submit for McASP Tx/Rx */\r
-       if(initBuffers() != Audk2g_EOK)\r
+       if(initBuffers() != Cmbk2g_EOK)\r
        {\r
-               IFPRINT(audk2g_write("McASP Buffer Initialization Failed\n"));\r
-               return (Audk2g_EFAIL);\r
+               IFPRINT(cmbk2g_write("McASP Buffer Initialization Failed\n"));\r
+               return (Cmbk2g_EFAIL);\r
        }\r
 \r
-       return (Audk2g_EOK);\r
+       return (Cmbk2g_EOK);\r
 }\r
 \r
 /**\r
@@ -547,7 +547,7 @@ Audk2g_STATUS mcaspAudioConfig(void)
  */\r
 void testRet(uint32_t status)\r
 {\r
-       audk2g_write("\n\nAudio DC Analog Interface Test Completed!\n");\r
+       cmbk2g_write("\n\nAudio DC Analog Interface Test Completed!\n");\r
 \r
        testExit(status);\r
 }\r
@@ -558,7 +558,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    Audk2g_EOK on Success or error code\r
+ *  \return    Cmbk2g_EOK on Success or error code\r
  */\r
 #define DUMP_SEC                       5\r
 #define FRAME_PER_SEC          100\r
@@ -597,16 +597,16 @@ Void Audio_echo_Task(void)
 \r
        /* Reclaim full buffer from the input stream */\r
        Semaphore_pend(semR, BIOS_WAIT_FOREVER);\r
-#if (AUDK2G_AUDIO_DAC)\r
+#if (CMBK2G_AUDIO_DAC)\r
        Semaphore_pend(semT, BIOS_WAIT_FOREVER);\r
 #endif\r
         /* Reclaim full buffer from the input stream */\r
-#if (AUDK2G_AUDIO_DAC)\r
+#if (CMBK2G_AUDIO_DAC)\r
        gtxFrameIndexCount = txFrameIndex;\r
 #endif\r
        grxFrameIndexCount = rxFrameIndex;\r
 \r
-#if (AUDK2G_AUDIO_DAC)\r
+#if (CMBK2G_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
@@ -816,7 +816,7 @@ Void Audio_echo_Task(void)
        }\r
 #endif   // Signal Processing Path\r
 #endif   // Mcasp_BufferFormat\r
-#endif   // AUDK2G_AUDIO_DAC\r
+#endif   // CMBK2G_AUDIO_DAC\r
 \r
         // Audio debug dump\r
         if (gAudDumpBufIdx<FRAME_PER_SEC*DUMP_SEC)\r
@@ -839,7 +839,7 @@ Void Audio_echo_Task(void)
                        gAudDumpBufIdx++;\r
         }\r
 \r
-#if (AUDK2G_AUDIO_DAC)\r
+#if (CMBK2G_AUDIO_DAC)\r
         /* Issue full buffer to the output stream                             */\r
         /* TX frame processing */\r
                txFrame[gtxFrameIndexCount].cmd    = MCASP_WRITE;\r
Project for various Processor-SDK related git repositories - RTOS software for audio pre-processing for use case such as speech recognition.