summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f47aea4)
raw | patch | inline | side by side (parent: f47aea4)
author | Ming Wei <a0868762@ti.com> | |
Wed, 1 Mar 2017 22:42:46 +0000 (16:42 -0600) | ||
committer | Ming Wei <a0868762@ti.com> | |
Wed, 1 Mar 2017 22:42:46 +0000 (16:42 -0600) |
Signed-off-by: Ming Wei <a0868762@ti.com>
realtime_demo_bios/k2g/app_gen.bat | [new file with mode: 0644] | patch | blob |
realtime_demo_bios/k2g/ccs/.cproject | patch | blob | history | |
realtime_demo_bios/k2g/ccs/.project | patch | blob | history | |
realtime_demo_bios/k2g/pre-built/mmcsd/MLO | [new file with mode: 0644] | patch | blob |
realtime_demo_bios/k2g/pre-built/mmcsd/app | [new file with mode: 0644] | patch | blob |
realtime_demo_bios/k2g/src/audio_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/makefile.libs | patch | blob | history | |
realtime_demo_bios/k2g/src/mcasp_cfg.c | patch | blob | history |
diff --git a/realtime_demo_bios/k2g/app_gen.bat b/realtime_demo_bios/k2g/app_gen.bat
--- /dev/null
@@ -0,0 +1,3 @@
+..\..\..\..\..\pdk_k2g_1_0_5\packages\ti\boot\sbl\tools\out2rprc\bin\out2rprc.exe ccs\Debug\K2G_bf_rt.out ccs\Debug\K2G_bf_rt.rprc\r
+..\..\..\..\..\pdk_k2g_1_0_5\packages\ti\boot\sbl\tools\multicoreImageGen\bin\MulticoreImageGen.exe LE 55 pre-built\mmcsd\app 5 ccs\Debug\K2G_bf_rt.rprc\r
+copy ..\..\..\..\..\pdk_k2g_1_0_5\packages\ti\boot\sbl\binary\evmK2G\mmcsd\bin\MLO pre-built\mmcsd\MLO\r
index 86f4afea4f514940ad55f2c367213d45c76d757e..e2df7e66778d29cdf6797ea94f9aaf191df949e8 100644 (file)
<option id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.ABI.1026608973" name="Application binary interface (coffabi not supported) (--abi)" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.ABI" value="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.ABI.eabi" valueType="enumerated"/>\r
<option id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.INCLUDE_PATH.2101330476" name="Add dir to #include search path (--include_path, -I)" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.INCLUDE_PATH" valueType="includePath">\r
<listOptionValue builtIn="false" value="C:/ti/ccsv6/tools/compiler/ti-cgt-c6000_8.1.0/include"/>\r
- <listOptionValue builtIn="false" value="C:/ti/pdk_k2g_1_0_4/packages/ti/board/diag/nand/src"/>\r
- <listOptionValue builtIn="false" value="C:/ti/processor_sdk_rtos_k2g_3_03_00_00/demos/audio-preprocessing/realtime_demo_bios/k2g/include"/>\r
- <listOptionValue builtIn="false" value="C:/ti/processor_sdk_rtos_k2g_3_03_00_00/demos/audio-preprocessing/common/components"/>\r
- <listOptionValue builtIn="false" value="C:/ti/pdk_k2g_1_0_4/packages/ti/drv/mcasp"/>\r
- <listOptionValue builtIn="false" value="C:/ti/pdk_k2g_1_0_4/packages/ti/board"/>\r
- <listOptionValue builtIn="false" value="C:/ti/pdk_k2g_1_0_4/packages/ti/board/src/evmK2G/include"/>\r
- <listOptionValue builtIn="false" value="C:/ti/pdk_k2g_1_0_4/packages/ti/addon/cmb"/>\r
- <listOptionValue builtIn="false" value="C:/ti/pdk_k2g_1_0_4/packages/ti/addon/cmb/src/evmK2G/include"/>\r
- <listOptionValue builtIn="false" value="C:/ti/pdk_k2g_1_0_4/packages"/>\r
- <listOptionValue builtIn="false" value="C:/ti/pdk_k2g_1_0_4/packages/ti/csl"/>\r
+ <listOptionValue builtIn="false" value="${PDK_INSTALL_PATH}/ti/board/diag/nand/src"/>\r
+ <listOptionValue builtIn="false" value=""${PROJECT_ROOT}/../../../realtime_demo_bios/k2g/include""/>\r
+ <listOptionValue builtIn="false" value="${PROJECT_ROOT}/../../../common/components"/>\r
+ <listOptionValue builtIn="false" value="${PDK_INSTALL_PATH}/ti/drv/mcasp"/>\r
+ <listOptionValue builtIn="false" value="${PDK_INSTALL_PATH}/ti/board"/>\r
+ <listOptionValue builtIn="false" value="${PDK_INSTALL_PATH}/ti/board/src/evmK2G/include"/>\r
+ <listOptionValue builtIn="false" value="${PDK_INSTALL_PATH}/ti/addon/cmb"/>\r
+ <listOptionValue builtIn="false" value="${PDK_INSTALL_PATH}/ti/addon/cmb/src/evmK2G/include"/>\r
+ <listOptionValue builtIn="false" value="${PDK_INSTALL_PATH}"/>\r
+ <listOptionValue builtIn="false" value="${PDK_INSTALL_PATH}/ti/csl"/>\r
</option>\r
<option id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.DEBUGGING_MODEL.99170131" name="Debugging model" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.DEBUGGING_MODEL" value="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.DEBUGGING_MODEL.SYMDEBUG__DWARF" valueType="enumerated"/>\r
<option id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.DEFINE.2070968829" name="Pre-define NAME (--define, -D)" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.DEFINE" valueType="definedSymbols">\r
index aa3960f8efc1381a0650a7afb03f5b0c70d59a5a..23e713d6a4a77fed176ad698c3e892dff476b966 100644 (file)
<variableList>\r
<variable>\r
<name>CSL_INSTALL_PATH</name>\r
- <value>$%7BPARENT-6-PROJECT_LOC%7D/pdk_k2g_1_0_4/packages/ti/csl</value>\r
+ <value>$%7BPARENT-6-PROJECT_LOC%7D/pdk_k2g_1_0_5/packages/ti/csl</value>\r
</variable>\r
<variable>\r
<name>PDK_INSTALL_PATH</name>\r
- <value>$%7BPARENT-6-PROJECT_LOC%7D/pdk_k2g_1_0_4/packages</value>\r
+ <value>$%7BPARENT-6-PROJECT_LOC%7D/pdk_k2g_1_0_5/packages</value>\r
</variable>\r
</variableList>\r
</projectDescription>\r
diff --git a/realtime_demo_bios/k2g/pre-built/mmcsd/MLO b/realtime_demo_bios/k2g/pre-built/mmcsd/MLO
new file mode 100644 (file)
index 0000000..2160b48
Binary files /dev/null and b/realtime_demo_bios/k2g/pre-built/mmcsd/MLO differ
index 0000000..2160b48
Binary files /dev/null and b/realtime_demo_bios/k2g/pre-built/mmcsd/MLO differ
diff --git a/realtime_demo_bios/k2g/pre-built/mmcsd/app b/realtime_demo_bios/k2g/pre-built/mmcsd/app
new file mode 100644 (file)
index 0000000..1e26258
Binary files /dev/null and b/realtime_demo_bios/k2g/pre-built/mmcsd/app differ
index 0000000..1e26258
Binary files /dev/null and b/realtime_demo_bios/k2g/pre-built/mmcsd/app differ
index 4239f5ecc2acee81dfd57ed162395ceccdcdf412..dcd7decb927e3af5c163de31818bb77535715518 100644 (file)
\r
#include "audio_cfg.h"\r
\r
+#include "ti/drv/uart/UART_stdio.h"\r
+\r
/**\r
* \brief Initializes ADC module\r
*\r
if(config == NULL)\r
{\r
IFPRINT(cmb_write("Invalid Inputs\n"));\r
+ IFPRINT(UART_printf("Invalid Inputs\n"));\r
return (Cmb_EINVALID);\r
}\r
\r
if(status != Cmb_EOK)\r
{\r
IFPRINT(cmb_write("audioAdcConfig : platformaudioAdcConfig Failed\n"));\r
+ IFPRINT(UART_printf("audioAdcConfig : platformaudioAdcConfig Failed\n"));\r
return (status);\r
}\r
\r
if(status != Cmb_EOK)\r
{\r
IFPRINT(cmb_write("audioAdcConfig : platformAudioAdcSetGain Failed\n"));\r
+ IFPRINT(UART_printf("audioAdcConfig : platformAudioAdcSetGain Failed\n"));\r
return (status);\r
}\r
\r
if(status != Cmb_EOK)\r
{\r
IFPRINT(cmb_write("audioAdcConfig : platformAudioAdcSetLeftInputMux Failed\n"));\r
+ IFPRINT(UART_printf("audioAdcConfig : platformAudioAdcSetLeftInputMux Failed\n"));\r
return (status);\r
}\r
\r
if(status != Cmb_EOK)\r
{\r
IFPRINT(cmb_write("audioAdcConfig : platformAudioAdcSetLeftInputMux Failed\n"));\r
+ IFPRINT(UART_printf("audioAdcConfig : platformAudioAdcSetLeftInputMux Failed\n"));\r
return (status);\r
}\r
\r
if(status != Cmb_EOK)\r
{\r
IFPRINT(cmb_write("audioAdcConfig : platformAudioAdcSetRightInputMux Failed\n"));\r
+ IFPRINT(UART_printf("audioAdcConfig : platformAudioAdcSetRightInputMux Failed\n"));\r
return (status);\r
}\r
\r
if(status != Cmb_EOK)\r
{\r
IFPRINT(cmb_write("audioAdcConfig : platformAudioAdcSetRightInputMux Failed\n"));\r
+ IFPRINT(UART_printf("audioAdcConfig : platformAudioAdcSetRightInputMux Failed\n"));\r
return (status);\r
}\r
\r
if(status != Cmb_EOK)\r
{\r
IFPRINT(cmb_write("audioAdcConfig : platformAudioAdcDataConfig Failed\n"));\r
+ IFPRINT(UART_printf("audioAdcConfig : platformAudioAdcDataConfig Failed\n"));\r
return (status);\r
}\r
\r
if(status != Cmb_EOK)\r
{\r
IFPRINT(cmb_write("audioAdcConfig : platformAudioAdcConfigIntr Failed\n"));\r
+ IFPRINT(UART_printf("audioAdcConfig : platformAudioAdcConfigIntr Failed\n"));\r
return (status);\r
}\r
\r
if(config == NULL)\r
{\r
IFPRINT(cmb_write("Invalid Inputs\n"));\r
+ IFPRINT(UART_printf("Invalid Inputs\n"));\r
return (Cmb_EINVALID);\r
}\r
\r
if(status != Cmb_EOK)\r
{\r
IFPRINT(cmb_write("audioDacConfig : platformaudioDacConfig Failed\n"));\r
+ IFPRINT(UART_printf("audioDacConfig : platformaudioDacConfig Failed\n"));\r
return (status);\r
}\r
\r
index 721c37a9aa6100d2a3b897ff7a5a19270e241554..fe5580c670de3db1f8acf35ad454cbec5453946e 100644 (file)
if((hEdma0 == NULL) || (edmaResult != 0))\r
{\r
IFPRINT(cmb_write("eDMA instance 0 Initialization Failed\n"));\r
+ IFPRINT(UART_printf("eDMA instance 0 Initialization Failed\n"));\r
return (Cmb_EFAIL);\r
}\r
\r
if((hEdma1 == NULL) || (edmaResult != 0))\r
{\r
IFPRINT(cmb_write("eDMA instance 1 Initialization Failed\n"));\r
+ IFPRINT(UART_printf("eDMA instance 1 Initialization Failed\n"));\r
return (Cmb_EFAIL);\r
}\r
\r
index 40fe00de22099ece9fc7fa1ed6ef23d4606ce08a..8308efdcc99ad69750c30d14e556e8d885605831 100644 (file)
#include "../../../common/components/fil.h"\r
#include "../../../common/components/sys.h"\r
\r
+#include "ti/drv/uart/UART_stdio.h"\r
+\r
/* Global System Configuration Structure */\r
sysConfig_t sysConfig = {\r
SYS_MICS_MAX, /* #microphones */\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
+ Board_initCfg arg = BOARD_INIT_PINMUX_CONFIG | BOARD_INIT_MODULE_CLOCK | BOARD_INIT_UART_STDIO;\r
status = Board_init(arg);\r
\r
#if 1\r
if(status != Cmb_EOK)\r
{\r
cmb_write("Platform Init Failed!\n");\r
+ UART_printf("Platform Init Failed!\n");\r
testRet(1);\r
}\r
\r
\r
\r
cmb_write("\n******************************************\n");\r
- cmb_write( " CMB Analog Loopback Test \n");\r
+ cmb_write( " Audio Preprocessing Demo \n");\r
cmb_write( "******************************************\n");\r
\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
+ cmb_write("\nThis Demo Takes the Audio Input from 8 Mics from CMB\n");\r
+ cmb_write("Runs the BF+ASNR+MSS+DRC Signal Processing Chain on Mic1 through Mic7\n");\r
+ cmb_write("The Processed Audio Output will be Sent to Left Channels of K2G EVM On-Board Line-Out\n");\r
+ cmb_write("The Mic8 will be Sent to Right Channels of K2G EVM On-Board Line-Out\n");\r
+ cmb_write("Please Plug a Headphone to K2G EVM On-Board Line-Out\n");\r
+\r
+ UART_printf("\n******************************************\n");\r
+ UART_printf( " Audio Preprocessing Demo \n");\r
+ UART_printf( "******************************************\n");\r
+\r
+ UART_printf("\nThis Demo Takes the Audio Input from 8 Mics from CMB\n");\r
+ UART_printf("Runs the BF+ASNR+MSS+DRC Signal Processing Chain on Mic1 through Mic7\n");\r
+ UART_printf("The Processed Audio Output will be Sent to Left Channels of K2G EVM On-Board Line-Out\n");\r
+ UART_printf("The Mic8 will be Sent to Right Channels of K2G EVM On-Board Line-Out\n");\r
+ UART_printf("Please Plug a Headphone to K2G EVM On-Board Line-Out\n");\r
\r
/* Initialize McASP HW details */\r
McaspDevice_init();\r
if(status != Cmb_EOK)\r
{\r
cmb_write("eDMA Configuration Failed!\n");\r
+ UART_printf("eDMA Configuration Failed!\n");\r
testRet(1);\r
}\r
\r
if(status != Cmb_EOK)\r
{\r
cmb_write("Audio Init Failed!\n");\r
+ UART_printf("Audio Init Failed!\n");\r
testRet(1);\r
}\r
\r
if(status != Cmb_EOK)\r
{\r
cmb_write("Audio ADC0 Configuration Failed!\n");\r
+ UART_printf("Audio ADC0 Configuration Failed!\n");\r
testRet(1);\r
}\r
cmb_delay(10000);\r
if(status != Cmb_EOK)\r
{\r
cmb_write("Audio ADC1 Configuration Failed!\n");\r
+ UART_printf("Audio ADC1 Configuration Failed!\n");\r
testRet(1);\r
}\r
cmb_delay(10000);\r
if(status != Cmb_EOK)\r
{\r
cmb_write("McASP Configuration Failed!\n");\r
+ UART_printf("McASP Configuration Failed!\n");\r
testRet(1);\r
}\r
\r
if(status != Cmb_EOK)\r
{\r
cmb_write("Audio DAC0 Configuration Failed!\n");\r
+ UART_printf("Audio DAC0 Configuration Failed!\n");\r
testRet(1);\r
}\r
}\r
index d5010b445afe682a83934fe249839f655e574d77..1204f7772935ff92f01c1c723a3831e1c7c97efc 100644 (file)
#
# This file was generated based on the configuration script:
-# C:\ti\processor_sdk_rtos_k2g_3_03_00_00\demos\audio-preprocessing\realtime_demo_bios\k2g\K2G_bf_rt.cfg
+# C:\ti\processor_sdk_rtos_k2g_3_03_00_01\demos\audio-preprocessing\realtime_demo_bios\k2g\K2G_bf_rt.cfg
#
# This makefile may be included in other makefiles that need to build
# the libraries containing the compiled source files generated as
#
# The absolute path to the generated source directory (at the time the
# sources were generated) is:
-# C:\ti\processor_sdk_rtos_k2g_3_03_00_00\demos\audio-preprocessing\realtime_demo_bios\k2g\src
+# C:\ti\processor_sdk_rtos_k2g_3_03_00_01\demos\audio-preprocessing\realtime_demo_bios\k2g\src
#
GEN_SRC_DIR ?= ../../src
index b41226db4c5b5ca31ccdc0d508ab4dcf5b23f6bd..37c8f0c0ebd3ba06e6391009512bb4d8f1888960 100644 (file)
\r
#include <ti/sysbios/knl/Semaphore.h> /* this looks obvious */\r
\r
+#include "ti/drv/uart/UART_stdio.h"\r
+\r
#define Timestamp_get Timestamp_get32 /* use 32-bit time stamps */\r
\r
#define MIN(a,b) (((a)>(b))?(b):(a)) /* Min/Max macros */\r
if(NULL == rxBuf[count])\r
{\r
IFPRINT(cmb_write("\r\nMEM_calloc failed for Rx\n"));\r
+ IFPRINT(UART_printf("\r\nMEM_calloc failed for Rx\n"));\r
}\r
}\r
\r
if(NULL == wkBuf[count])\r
{\r
IFPRINT(cmb_write("\r\nMEM_calloc failed for Wk\n"));\r
+ IFPRINT(UART_printf("\r\nMEM_calloc failed for Wk\n"));\r
}\r
}\r
\r
if(NULL == txBuf[count])\r
{\r
IFPRINT(cmb_write("\r\nMEM_calloc failed for Tx\n"));\r
+ IFPRINT(UART_printf("\r\nMEM_calloc failed for Tx\n"));\r
}\r
}\r
\r
if(NULL == outBuf[count])\r
{\r
IFPRINT(cmb_write("\r\nMEM_calloc failed for Out\n"));\r
+ IFPRINT(UART_printf("\r\nMEM_calloc failed for Out\n"));\r
}\r
}\r
#endif\r
if((status != MCASP_COMPLETED) && (status != MCASP_PENDING))\r
{\r
IFPRINT(cmb_write("mcaspSubmitChan for Rx Failed\n"));\r
+ IFPRINT(UART_printf("mcaspSubmitChan for Rx Failed\n"));\r
return (Cmb_EFAIL);\r
}\r
}\r
if((status != MCASP_COMPLETED) && (status != MCASP_PENDING))\r
{\r
IFPRINT(cmb_write("mcaspSubmitChan for Tx Failed\n"));\r
+ IFPRINT(UART_printf("mcaspSubmitChan for Tx Failed\n"));\r
return (Cmb_EFAIL);\r
}\r
}\r
if((status != MCASP_COMPLETED) || (hMcaspDevTx == NULL))\r
{\r
IFPRINT(cmb_write("mcaspBindDev for Tx Failed\n"));\r
+ IFPRINT(UART_printf("mcaspBindDev for Tx Failed\n"));\r
return (Cmb_EFAIL);\r
}\r
#endif\r
if((status != MCASP_COMPLETED) || (hMcaspDevRx == NULL))\r
{\r
IFPRINT(cmb_write("mcaspBindDev for Rx Failed\n"));\r
+ IFPRINT(UART_printf("mcaspBindDev for Rx Failed\n"));\r
return (Cmb_EFAIL);\r
}\r
\r
if((status != MCASP_COMPLETED) || (hMcaspTxChan == NULL))\r
{\r
IFPRINT(cmb_write("mcaspCreateChan for Tx Failed\n"));\r
+ IFPRINT(UART_printf("mcaspCreateChan for Tx Failed\n"));\r
return (Cmb_EFAIL);\r
}\r
\r
if((status != MCASP_COMPLETED) || (hMcaspRxChan == NULL))\r
{\r
IFPRINT(cmb_write("mcaspCreateChan for Rx Failed\n"));\r
+ IFPRINT(UART_printf("mcaspCreateChan for Rx Failed\n"));\r
return (Cmb_EFAIL);\r
}\r
\r
if(initBuffers() != Cmb_EOK)\r
{\r
IFPRINT(cmb_write("McASP Buffer Initialization Failed\n"));\r
+ IFPRINT(UART_printf("McASP Buffer Initialization Failed\n"));\r
return (Cmb_EFAIL);\r
}\r
\r
void testRet(uint32_t status)\r
{\r
cmb_write("\n\nAudio DC Analog Interface Test Completed!\n");\r
+ UART_printf("\n\nAudio DC Analog Interface Test Completed!\n");\r
\r
testExit(status);\r
}\r