X-Git-Url: https://git.ti.com/gitweb?p=processor-sdk%2Faudio-preprocessing.git;a=blobdiff_plain;f=realtime_demo_bios%2Fk2g%2Fsrc%2Fmain.c;h=9c3f34bff93fd8bde6df3fdf4dca70c2db0c0c3b;hp=8da48c4e4b33b132594535c55ea5d81739f60c3f;hb=83b570ea49cc0c87fcdb879fbef5a1ec595cdaa2;hpb=cdffe4e66cfbe3c365dee5a05ef3f723a25cdaa6 diff --git a/realtime_demo_bios/k2g/src/main.c b/realtime_demo_bios/k2g/src/main.c index 8da48c4..9c3f34b 100644 --- a/realtime_demo_bios/k2g/src/main.c +++ b/realtime_demo_bios/k2g/src/main.c @@ -140,28 +140,28 @@ static void system_init(void) } /* system_init */ /* ADC default configuration parameters */ -Cmbk2gAdcConfig adcCfg = +CmbAdcConfig adcCfg = { 80, /* ADC gain */ - CMBK2G_ADC_INL_SE_VINL1, /* Left input mux for ADC1L */ - CMBK2G_ADC_INL_SE_VINL2, /* Left input mux for ADC2L */ - CMBK2G_ADC_INR_SE_VINR1, /* Right input mux for ADC1R */ - CMBK2G_ADC_INR_SE_VINR2, /* Right input mux for ADC2R */ - CMBK2G_ADC_RX_WLEN_24BIT, /* ADC word length */ - CMBK2G_ADC_DATA_FORMAT_I2S, /* ADC data format */ + CMB_ADC_INL_SE_VINL1, /* Left input mux for ADC1L */ + CMB_ADC_INL_SE_VINL3, /* Left input mux for ADC2L */ + CMB_ADC_INR_SE_VINR1, /* Right input mux for ADC1R */ + CMB_ADC_INR_SE_VINR3, /* Right input mux for ADC2R */ + CMB_ADC_RX_WLEN_24BIT, /* ADC word length */ + CMB_ADC_DATA_FORMAT_I2S, /* ADC data format */ 0 }; /* DAC default configuration parameters */ -Cmbk2gDacConfig dacCfg = +CmbDacConfig dacCfg = { - CMBK2G_DAC_AMUTE_CTRL_SCKI_LOST, /* Amute event */ + CMB_DAC_AMUTE_CTRL_SCKI_LOST, /* Amute event */ 0, /* Amute control */ - CMBK2G_DAC_SAMPLING_MODE_AUTO, /* Sampling mode */ - CMBK2G_DAC_DATA_FORMAT_I2S, /* Data format */ + CMB_DAC_SAMPLING_MODE_AUTO, /* Sampling mode */ + CMB_DAC_DATA_FORMAT_I2S, /* Data format */ 0, /* Soft mute control */ - CMBK2G_DAC_ATTENUATION_WIDE_RANGE, /* Attenuation mode */ - CMBK2G_DAC_DEEMP_44KHZ, /* De-emph control */ + CMB_DAC_ATTENUATION_WIDE_RANGE, /* Attenuation mode */ + CMB_DAC_DEEMP_44KHZ, /* De-emph control */ 80 /* Volume */ }; @@ -187,27 +187,6 @@ void pinMuxSetMode_local(uint32_t padCfgId, PadCfgMuxMode muxMode) CSL_FINS(*(padCfgBase + padCfgId), BOOTCFG_PADCONFIG0_MUXMODE, muxMode); } -char write_buffer[MAX_WRITE_LEN]; -void cmbk2g_write(const char *fmt, ... ) -{ - va_list arg_ptr; - uint32_t length; - - /* Initial platform_write to temporary buffer.. at least try some sort of sanity check so we don't write all over - * memory if the print is too large. - */ - if (strlen(fmt) > MAX_WRITE_LEN) {return;} - - va_start( arg_ptr, fmt ); - length = vsprintf( (char *)write_buffer, fmt, arg_ptr ); - va_end( arg_ptr ); - - printf( "%s", write_buffer ); - //fflush(stdout); - - return; -} - void McaspDevice_init(void); /** @@ -217,9 +196,9 @@ void McaspDevice_init(void); * which are required for audio processing. Need to call this function * before doing any HW related operations. * - * \return Cmbk2g_EOK on Success or error code + * \return Cmb_EOK on Success or error code */ -Cmbk2g_STATUS initPlatform(void) +Cmb_STATUS initPlatform(void) { Board_STATUS status = BOARD_SOK; Board_initCfg arg = BOARD_INIT_PINMUX_CONFIG | BOARD_INIT_MODULE_CLOCK; @@ -251,11 +230,11 @@ Cmbk2g_STATUS initPlatform(void) ///gpioSetOutput(GPIO_PORT_1, 54); /* Configure platform log messages to standard printf */ - ///Cmbk2g_write_configure(Cmbk2g_WRITE_UART); + ///Cmb_write_configure(Cmb_WRITE_UART); /* Initialize UART */ - ///Cmbk2g_uart_init(); - ///Cmbk2g_uart_set_baudrate(115200); + ///Cmb_uart_init(); + ///Cmb_uart_set_baudrate(115200); return(status); } @@ -267,16 +246,16 @@ Cmbk2g_STATUS initPlatform(void) */ void main (void) { - Cmbk2g_STATUS status; + Cmb_STATUS status; status = initPlatform(); - if(status != Cmbk2g_EOK) + if(status != Cmb_EOK) { - cmbk2g_write("Platform Init Failed!\n"); + cmb_write("Platform Init Failed!\n"); testRet(1); } - cmbk2g_delay(10000); + cmb_delay(10000); system_init(); /* initialize system context, etc. */ @@ -290,53 +269,60 @@ void main (void) ///sysVauCreate(); /* Create VAU */ - cmbk2g_write("\n******************************************\n"); - cmbk2g_write( " CMB Analog Loopback Test \n"); - cmbk2g_write( "******************************************\n"); + cmb_write("\n******************************************\n"); + cmb_write( " CMB Analog Loopback Test \n"); + cmb_write( "******************************************\n"); - cmbk2g_write("\nTest Verifies ADC and DAC Channels\n"); - cmbk2g_write("Test Runs in Audio Loopback Mode\n"); - cmbk2g_write("Confirm that CMB Mic 1 and Mic 8 Input are Played at On-Board Line-Out Left and Right Channels\n"); + cmb_write("\nTest Verifies ADC and DAC Channels\n"); + cmb_write("Test Runs in Audio Loopback Mode\n"); + cmb_write("Confirm that CMB Mic 1 and Mic 8 Input are Played at On-Board Line-Out Left and Right Channels\n"); /* Initialize McASP HW details */ McaspDevice_init(); /* Configure eDMA module */ status = eDmaConfig(); - if(status != Cmbk2g_EOK) + if(status != Cmb_EOK) { - cmbk2g_write("eDMA Configuration Failed!\n"); + cmb_write("eDMA Configuration Failed!\n"); testRet(1); } /* Initialize common audio configurations */ - status = (Cmbk2g_STATUS)cmbk2g_AudioInit(); - if(status != Cmbk2g_EOK) + status = (Cmb_STATUS)cmb_AudioInit(); + if(status != Cmb_EOK) { - cmbk2g_write("Audio Init Failed!\n"); + cmb_write("Audio Init Failed!\n"); testRet(1); } + /* reset Audio ADC module 0 */ + status = cmb_AudioAdcReset(CMB_ADC_DEVICE_0); + cmb_delay(10000); + /* reset Audio ADC module 1 */ + status = cmb_AudioAdcReset(CMB_ADC_DEVICE_1); + cmb_delay(10000); + /* Initialize Audio ADC module */ - status = audioAdcConfig(CMBK2G_ADC_DEVICE_0, &adcCfg); - if(status != Cmbk2g_EOK) + status = audioAdcConfig(CMB_ADC_DEVICE_0, &adcCfg); + if(status != Cmb_EOK) { - cmbk2g_write("Audio ADC0 Configuration Failed!\n"); + cmb_write("Audio ADC0 Configuration Failed!\n"); testRet(1); } - status = audioAdcConfig(CMBK2G_ADC_DEVICE_1, &adcCfg); - if(status != Cmbk2g_EOK) + status = audioAdcConfig(CMB_ADC_DEVICE_1, &adcCfg); + if(status != Cmb_EOK) { - cmbk2g_write("Audio ADC1 Configuration Failed!\n"); + cmb_write("Audio ADC1 Configuration Failed!\n"); testRet(1); } /* Initialize McASP module */ status = mcaspAudioConfig(); - if(status != Cmbk2g_EOK) + if(status != Cmb_EOK) { - cmbk2g_write("McASP Configuration Failed!\n"); + cmb_write("McASP Configuration Failed!\n"); testRet(1); } @@ -349,16 +335,16 @@ void main (void) * * \return none */ -#if CMBK2G_AUDIO_DAC +#if CMB_AUDIO_DAC void configAudioDAC(void) { - Cmbk2g_STATUS status; + Cmb_STATUS status; /* Initialize Audio DAC0 module */ - status = audioDacConfig(CMBK2G_DAC_DEVICE_0, &dacCfg); - if(status != Cmbk2g_EOK) + status = audioDacConfig(CMB_DAC_DEVICE_0, &dacCfg); + if(status != Cmb_EOK) { - cmbk2g_write("Audio DAC0 Configuration Failed!\n"); + cmb_write("Audio DAC0 Configuration Failed!\n"); testRet(1); } }