PASDK-585:Update PDK & EDMA3 LLD
authorFrank Livingston <frank-livingston@ti.com>
Sat, 3 Mar 2018 01:09:34 +0000 (19:09 -0600)
committerFrank Livingston <frank-livingston@ti.com>
Sat, 3 Mar 2018 01:09:34 +0000 (19:09 -0600)
16 files changed:
pasdk/paf
pasdk/test_dsp/.cproject
pasdk/test_dsp/.project
pasdk/test_dsp/application/itopo/evmk2g/audio_dc_cfg.c
pasdk/test_dsp/application/itopo/evmk2g/audio_dc_cfg.h
pasdk/test_dsp/application/itopo/evmk2g/edma_cfg.c
pasdk/test_dsp/application/itopo/evmk2g/edma_cfg.h
pasdk/test_dsp/application/itopo/evmk2g/mcasp_cfg.c
pasdk/test_dsp/application/itopo/evmk2g/mcasp_cfg.h
pasdk/test_dsp/application/itopo/evmk2g/sap_d10.c
pasdk/test_dsp/application/main.c
pasdk/test_dsp/framework/audioStreamInpProcNewIO.c
pasdk/test_dsp/framework/audioStreamOutIo.c
pasdk/test_dsp/framework/itopo/params.c
pasdk/test_dsp/framework/systemInit.c
pasdk/test_dsp/io/test/audio_tsk.c

index b9d615ea3ab476a82f1adf9a4e949f234a48f4df..30d0b4048eb99179583a3a6a20cc178964ae13f5 160000 (submodule)
--- a/pasdk/paf
+++ b/pasdk/paf
@@ -1 +1 @@
-Subproject commit b9d615ea3ab476a82f1adf9a4e949f234a48f4df
+Subproject commit 30d0b4048eb99179583a3a6a20cc178964ae13f5
index 343579b9da0672955cef8b0ced91d7b68e028ee5..9b0d6ef61cb5bdf1ae2a64189c3f7082dd3a0107 100644 (file)
                                        <stringMacro name="USB_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="UART_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="QMSS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="PDK_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti/pdk_k2g_1_0_7/packages"/>
+                                       <stringMacro name="PDK_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti/pdk_k2g_1_0_9/packages"/>
                                        <stringMacro name="SRIO_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="SA_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="PRUSS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                                                <listOptionValue builtIn="false" value="LINKER_COMMAND_FILE="/>
                                                                <listOptionValue builtIn="false" value="RTSC_MBS_VERSION=2.2.0"/>
                                                                <listOptionValue builtIn="false" value="OUTPUT_TYPE=rtscApplication:executable"/>
-                                                               <listOptionValue builtIn="false" value="PRODUCTS=ti.mas.dsplib.c66x:3.4.0.0;com.ti.sdo.edma3:2.12.4;com.ti.rtsc.IPC:3.47.1.00;com.ti.rtsc.SYSBIOS:6.52.0.12;com.ti.uia:2.21.2.07;com.ti.rtsc.XDAIS:7.24.0.04;com.ti.pdk.k2g:1.0.7;"/>
-                                                               <listOptionValue builtIn="false" value="PRODUCT_MACRO_IMPORTS={&quot;com.ti.rtsc.SYSBIOS&quot;:[&quot;${BIOS_INCLUDE_PATH}&quot;,&quot;${BIOS_LIBRARY_PATH}&quot;,&quot;${BIOS_LIBRARIES}&quot;,&quot;${BIOS_SYMBOLS}&quot;],&quot;com.ti.uia&quot;:[&quot;${COM_TI_UIA_INCLUDE_PATH}&quot;,&quot;${COM_TI_UIA_LIBRARY_PATH}&quot;,&quot;${COM_TI_UIA_LIBRARIES}&quot;,&quot;${COM_TI_UIA_SYMBOLS}&quot;],&quot;com.ti.pdk.k2g&quot;:[&quot;${TI_PDK_INCLUDE_PATH}&quot;,&quot;${TI_PDK_LIBRARY_PATH}&quot;,&quot;${TI_PDK_LIBRARIES}&quot;,&quot;${TI_PDK_SYMBOLS}&quot;],&quot;com.ti.rtsc.IPC&quot;:[&quot;${IPC_INCLUDE_PATH}&quot;,&quot;${IPC_LIBRARY_PATH}&quot;,&quot;${IPC_LIBRARIES}&quot;,&quot;${IPC_SYMBOLS}&quot;]}"/>
+                                                               <listOptionValue builtIn="false" value="PRODUCTS=ti.mas.dsplib.c66x:3.4.0.0;com.ti.sdo.edma3:2.12.5;com.ti.rtsc.IPC:3.47.1.00;com.ti.rtsc.SYSBIOS:6.52.0.12;com.ti.uia:2.21.2.07;com.ti.rtsc.XDAIS:7.24.0.04;com.ti.pdk.k2g:1.0.9;"/>
+                                                               <listOptionValue builtIn="false" value="PRODUCT_MACRO_IMPORTS={&quot;com.ti.rtsc.SYSBIOS&quot;:[&quot;${BIOS_INCLUDE_PATH}&quot;,&quot;${BIOS_LIBRARY_PATH}&quot;,&quot;${BIOS_LIBRARIES}&quot;,&quot;${BIOS_SYMBOLS}&quot;],&quot;com.ti.uia&quot;:[&quot;${COM_TI_UIA_INCLUDE_PATH}&quot;,&quot;${COM_TI_UIA_LIBRARY_PATH}&quot;,&quot;${COM_TI_UIA_LIBRARIES}&quot;,&quot;${COM_TI_UIA_SYMBOLS}&quot;],&quot;com.ti.pdk.k2g&quot;:[&quot;${TI_PDK_INCLUDE_PATH}&quot;,&quot;${TI_PDK_LIBRARY_PATH}&quot;,&quot;${TI_PDK_LIBRARIES}&quot;,&quot;${TI_PDK_SYMBOLS}&quot;],&quot;com.ti.rtsc.IPC&quot;:[&quot;${IPC_INCLUDE_PATH}&quot;,&quot;${IPC_LIBRARY_PATH}&quot;,&quot;${IPC_LIBRARIES}&quot;,&quot;${IPC_SYMBOLS}&quot;],&quot;com.ti.sdo.edma3&quot;:[&quot;${EDMA3_LLD_INCLUDE_PATH}&quot;,&quot;${EDMA3_LLD_LIBRARY_PATH}&quot;,&quot;${EDMA3_LLD_LIBRARIES}&quot;,&quot;${EDMA3_LLD_SYMBOLS}&quot;]}"/>
                                                        </option>
                                                        <option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.1947093935" name="Compiler version" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION" value="8.1.0" valueType="string"/>
                                                        <targetPlatform id="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.targetPlatformDebug.1858514919" name="Platform" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.targetPlatformDebug"/>
                                                        <builder buildPath="${BuildDirectory}" id="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.builderDebug.1401532186" keepEnvironmentInBuildfile="false" name="GNU Make" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.builderDebug"/>
                                                        <tool id="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.compilerDebug.159937220" name="C6000 Compiler" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.exe.compilerDebug">
                                                                <option id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.DEFINE.517832782" name="Pre-define NAME (--define, -D)" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.DEFINE" valueType="definedSymbols">
+                                                                       <listOptionValue builtIn="false" value="${EDMA3_LLD_SYMBOLS}"/>
                                                                        <listOptionValue builtIn="false" value="${TI_PDK_SYMBOLS}"/>
                                                                        <listOptionValue builtIn="false" value="${IPC_SYMBOLS}"/>
                                                                        <listOptionValue builtIn="false" value="${COM_TI_UIA_SYMBOLS}"/>
                                                                <option id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.SILICON_VERSION.469204688" name="Target processor version (--silicon_version, -mv)" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.SILICON_VERSION" value="6600" valueType="string"/>
                                                                <option id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.ABI.1519528029" 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"/>
                                                                <option id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.INCLUDE_PATH.823325232" name="Add dir to #include search path (--include_path, -I)" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.INCLUDE_PATH" valueType="includePath">
+                                                                       <listOptionValue builtIn="false" value="&quot;${EDMA3_LLD_INCLUDE_PATH}&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${TI_PDK_INCLUDE_PATH}&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${IPC_INCLUDE_PATH}&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${COM_TI_UIA_INCLUDE_PATH}&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${BIOS_INCLUDE_PATH}&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${CG_TOOL_ROOT}/include&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PDK_INSTALL_PATH}/ti/csl&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${PDK_INSTALL_PATH}/ti/addon/audk2g/include&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${PDK_INSTALL_PATH}/ti/addon/aud/include&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PDK_INSTALL_PATH}/ti/board&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PDK_INSTALL_PATH}/ti/drv/mcasp&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PDK_INSTALL_PATH}&quot;"/>
                                                                <option id="com.ti.ccstudio.buildDefinitions.C6000_8.1.linkerID.OUTPUT_FILE.1320578071" name="Specify output file name (--output_file, -o)" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.linkerID.OUTPUT_FILE" value="&quot;${ProjName}.out&quot;" valueType="string"/>
                                                                <option id="com.ti.ccstudio.buildDefinitions.C6000_8.1.linkerID.MAP_FILE.1368476175" 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"/>
                                                                <option id="com.ti.ccstudio.buildDefinitions.C6000_8.1.linkerID.LIBRARY.1908778769" name="Include library file or command file as input (--library, -l)" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.linkerID.LIBRARY" valueType="libs">
+                                                                       <listOptionValue builtIn="false" value="${EDMA3_LLD_LIBRARIES}"/>
                                                                        <listOptionValue builtIn="false" value="${IPC_LIBRARIES}"/>
                                                                        <listOptionValue builtIn="false" value="${COM_TI_UIA_LIBRARIES}"/>
                                                                        <listOptionValue builtIn="false" value="${BIOS_LIBRARIES}"/>
                                                                        <listOptionValue builtIn="false" value="${TI_PDK_LIBRARIES}"/>
                                                                        <listOptionValue builtIn="false" value="libc.a"/>
-                                                                       <listOptionValue builtIn="false" value="ti.addon.audk2g.ae66"/>
+                                                                       <listOptionValue builtIn="false" value="ti.addon.aud.ae66"/>
                                                                        <listOptionValue builtIn="false" value="ti.board.ae66"/>
                                                                        <listOptionValue builtIn="false" value="ti.drv.mcasp.ae66"/>
                                                                </option>
                                                                <option id="com.ti.ccstudio.buildDefinitions.C6000_8.1.linkerID.SEARCH_PATH.1207169447" name="Add &lt;dir&gt; to library search path (--search_path, -i)" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.linkerID.SEARCH_PATH" valueType="libPaths">
+                                                                       <listOptionValue builtIn="false" value="&quot;${EDMA3_LLD_LIBRARY_PATH}&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${TI_PDK_LIBRARY_PATH}&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${IPC_LIBRARY_PATH}&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${COM_TI_UIA_LIBRARY_PATH}&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${BIOS_LIBRARY_PATH}&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${CG_TOOL_ROOT}/lib&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${CG_TOOL_ROOT}/include&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${PDK_INSTALL_PATH}/ti/addon/audk2g/lib/k2g/c66/release&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${PDK_INSTALL_PATH}/ti/addon/aud/lib/k2g/c66/release&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PDK_INSTALL_PATH}/ti/board/lib/evmK2G/c66/release&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PDK_INSTALL_PATH}/ti/drv/mcasp/lib/k2g/c66/release&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/pasdk/paf/pa/build/c66x/release&quot;"/>
index c595be5abeefac8394cbad6d77d270fb886a83a1..34b9b53608f0460069cb82f81a88da442f257c03 100644 (file)
                </variable>
                <variable>
                        <name>PDK_INSTALL_PATH</name>
-                       <value>file:/C:/ti/pdk_k2g_1_0_7/packages</value>
+                       <value>file:/C:/ti/pdk_k2g_1_0_9/packages</value>
                </variable>
                <variable>
                        <name>PKTLIB_INSTALL_PATH</name>
index 21bbf18a7bf734ba2435e7b374907ad723d6d0b4..2acb76042095290b92747574ff8d9ef7b1b019b9 100644 (file)
@@ -45,7 +45,7 @@ All rights reserved.
 #include <stdarg.h>
 #include "string.h"
 #include <xdc/runtime/Log.h>
-#include "audk2g_audio.h"
+#include "aud_audio.h"
 
 #define HSR4_I2C_ADDR 0x5D
 #define        HSR4_I2C_PORT_NUM CSL_I2C_1
@@ -56,7 +56,7 @@ I2C_Handle i2cHandle = NULL;
 I2C_Transaction i2cTransaction;
 uint32_t gI2cDelay=I2C_TRANSACTION_TIMEOUT;
 
-Audk2g_STATUS audioHDMIConfig(void);
+Aud_STATUS audioHDMIConfig(void);
 int alpha_i2c_write(unsigned short, ...);
 void set_audio_desc(unsigned char ,unsigned char ,unsigned char ,unsigned char ,unsigned char );
 void hrptredid();
@@ -79,82 +79,82 @@ int gret_val=0;
  *
  *  \return    Platform_EOK on Success or error code
  */
-Audk2g_STATUS audioAdcConfig(Audk2gAdcDevId  devId, AdcConfig *config)
+Aud_STATUS audioAdcConfig(AudAdcDevId  devId, AdcConfig *config)
 {
-       Audk2g_STATUS status;
+       Aud_STATUS status;
 
        if(config == NULL)
        {
-               IFPRINT(audk2g_write("Invalid Inputs\n"));
-               return (Audk2g_EINVALID);
+               IFPRINT(aud_write("Invalid Inputs\n"));
+               return (Aud_EINVALID);
        }
 
        /* Initialize all the HW instances of ADC */
-       status = audk2g_AudioAdcInit(devId);
-       if(status != Audk2g_EOK)
+       status = aud_AudioAdcInit(devId);
+       if(status != Aud_EOK)
        {
-               IFPRINT(audk2g_write("audioAdcConfig : audk2g_AudioAdcInit Failed\n"));
+               IFPRINT(aud_write("audioAdcConfig : aud_AudioAdcInit Failed\n"));
                return (status);
        }
 
        /* Set ADC channel gain */
-       status = audk2g_AudioAdcSetGain(devId, AUDK2G_ADC_CH_ALL, config->gain);
-       if(status != Audk2g_EOK)
+       status = aud_AudioAdcSetGain(devId, AUD_ADC_CH_ALL, config->gain);
+       if(status != Aud_EOK)
        {
-               IFPRINT(audk2g_write("audioAdcConfig : audk2g_AudioAdcSetGain Failed\n"));
+               IFPRINT(aud_write("audioAdcConfig : aud_AudioAdcSetGain Failed\n"));
                return (status);
        }
 
        /* Configure Left input mux for ADC1L */
-       status = audk2g_AudioAdcSetLeftInputMux(devId, AUDK2G_ADC_CH1_LEFT,
+       status = aud_AudioAdcSetLeftInputMux(devId, AUD_ADC_CH1_LEFT,
                                                 config->adc1LMux);
-       if(status != Audk2g_EOK)
+       if(status != Aud_EOK)
        {
-               IFPRINT(audk2g_write("audioAdcConfig : audk2g_AudioAdcSetLeftInputMux Failed\n"));
+               IFPRINT(aud_write("audioAdcConfig : aud_AudioAdcSetLeftInputMux Failed\n"));
                return (status);
        }
 
        /* Configure Left input mux for ADC2L*/
-       status = audk2g_AudioAdcSetLeftInputMux(devId, AUDK2G_ADC_CH2_LEFT,
+       status = aud_AudioAdcSetLeftInputMux(devId, AUD_ADC_CH2_LEFT,
                                                 config->adc2LMux);
-       if(status != Audk2g_EOK)
+       if(status != Aud_EOK)
        {
-               IFPRINT(audk2g_write("audioAdcConfig : audk2g_AudioAdcSetLeftInputMux Failed\n"));
+               IFPRINT(aud_write("audioAdcConfig : aud_AudioAdcSetLeftInputMux Failed\n"));
                return (status);
        }
 
        /* Configure Right input mux for ADC1R */
-       status = audk2g_AudioAdcSetRightInputMux(devId, AUDK2G_ADC_CH1_RIGHT,
+       status = aud_AudioAdcSetRightInputMux(devId, AUD_ADC_CH1_RIGHT,
                                                  config->adc1RMux);
-       if(status != Audk2g_EOK)
+       if(status != Aud_EOK)
        {
-               IFPRINT(audk2g_write("audioAdcConfig : audk2g_AudioAdcSetRightInputMux Failed\n"));
+               IFPRINT(aud_write("audioAdcConfig : aud_AudioAdcSetRightInputMux Failed\n"));
                return (status);
        }
 
        /* Configure Right input mux for ADC2R */
-       status = audk2g_AudioAdcSetRightInputMux(devId, AUDK2G_ADC_CH2_RIGHT,
+       status = aud_AudioAdcSetRightInputMux(devId, AUD_ADC_CH2_RIGHT,
                                                  config->adc2RMux);
-       if(status != Audk2g_EOK)
+       if(status != Aud_EOK)
        {
-               IFPRINT(audk2g_write("audioAdcConfig : audk2g_AudioAdcSetRightInputMux Failed\n"));
+               IFPRINT(aud_write("audioAdcConfig : aud_AudioAdcSetRightInputMux Failed\n"));
                return (status);
        }
 
        /* Configure audio data format */
-       status = audk2g_AudioAdcDataConfig(devId, config->wlen, config->format);
-       if(status != Audk2g_EOK)
+       status = aud_AudioAdcDataConfig(devId, config->wlen, config->format);
+       if(status != Aud_EOK)
        {
-               IFPRINT(audk2g_write("audioAdcConfig : audk2g_AudioAdcDataConfig Failed\n"));
+               IFPRINT(aud_write("audioAdcConfig : aud_AudioAdcDataConfig Failed\n"));
                return (status);
        }
 
        /* Configure all the interrupts */
-       status = audk2g_AudioAdcConfigIntr(devId, AUDK2G_ADC_INTR_ALL,
+       status = aud_AudioAdcConfigIntr(devId, AUD_ADC_INTR_ALL,
                                            config->intEnable);
-       if(status != Audk2g_EOK)
+       if(status != Aud_EOK)
        {
-               IFPRINT(audk2g_write("audioAdcConfig : audk2g_AudioAdcConfigIntr Failed\n"));
+               IFPRINT(aud_write("audioAdcConfig : aud_AudioAdcConfigIntr Failed\n"));
                return (status);
        }
 
@@ -172,79 +172,79 @@ Audk2g_STATUS audioAdcConfig(Audk2gAdcDevId  devId, AdcConfig *config)
  *
  *  \return    Platform_EOK on Success or error code
  */
-Audk2g_STATUS audioDacConfig(Audk2gDacDevId devId, DacConfig *config)
+Aud_STATUS audioDacConfig(AudDacDevId devId, DacConfig *config)
 {
-       Audk2g_STATUS status;
+       Aud_STATUS status;
 
        if(config == NULL)
        {
-               IFPRINT(audk2g_write("Invalid Inputs\n"));
-               return (Audk2g_EINVALID);
+               IFPRINT(aud_write("Invalid Inputs\n"));
+               return (Aud_EINVALID);
        }
 
        /* Initialize Audio DAC */
-       status = audk2g_AudioDacInit(devId);
-       if(status != Audk2g_EOK)
+       status = aud_AudioDacInit(devId);
+       if(status != Aud_EOK)
        {
-               IFPRINT(audk2g_write("audioDacConfig : audk2g_AudioDacInit Failed\n"));
+               IFPRINT(aud_write("audioDacConfig : aud_AudioDacInit Failed\n"));
                return (status);
        }
 
        /* Configure AMUTE control event */
-       status = audk2g_AudioDacAmuteCtrl(devId, config->amuteCtrl,
+       status = aud_AudioDacAmuteCtrl(devId, config->amuteCtrl,
                                           config->amuteEnable);
-       if(status != Audk2g_EOK)
+       if(status != Aud_EOK)
        {
-               IFPRINT(audk2g_write("audioDacConfig : audk2g_AudioDacAmuteCtrl Failed\n"));
+               IFPRINT(aud_write("audioDacConfig : aud_AudioDacAmuteCtrl Failed\n"));
                return (status);
        }
 
        /* Set sampling mode */
-       status = audk2g_AudioDacSetSamplingMode(devId, config->samplingMode);
-       if(status != Audk2g_EOK)
+       status = aud_AudioDacSetSamplingMode(devId, config->samplingMode);
+       if(status != Aud_EOK)
        {
-               IFPRINT(audk2g_write("audioDacConfig : audk2g_AudioDacSetSamplingMode Failed\n"));
+               IFPRINT(aud_write("audioDacConfig : aud_AudioDacSetSamplingMode Failed\n"));
                return (status);
        }
 
        /* Set data format */
-       status = audk2g_AudioDacSetDataFormat(devId, config->dataFormat);
-       if(status != Audk2g_EOK)
+       status = aud_AudioDacSetDataFormat(devId, config->dataFormat);
+       if(status != Aud_EOK)
        {
-               IFPRINT(audk2g_write("audioDacConfig : audk2g_AudioDacSetDataFormat Failed\n"));
+               IFPRINT(aud_write("audioDacConfig : aud_AudioDacSetDataFormat Failed\n"));
                return (status);
        }
 
        /* Enable soft mute control */
-       status = audk2g_AudioDacSoftMuteCtrl(devId, AUDK2G_DAC_CHAN_ALL,
+       status = aud_AudioDacSoftMuteCtrl(devId, AUD_DAC_CHAN_ALL,
                                              config->softMuteEnable);
-       if(status != Audk2g_EOK)
+       if(status != Aud_EOK)
        {
-               IFPRINT(audk2g_write("audioDacConfig : audk2g_AudioDacSoftMuteCtrl Failed\n"));
+               IFPRINT(aud_write("audioDacConfig : aud_AudioDacSoftMuteCtrl Failed\n"));
                return (status);
        }
 
        /* Set attenuation mode */
-       status = audk2g_AudioDacSetAttnMode(devId, config->attnMode);
-       if(status != Audk2g_EOK)
+       status = aud_AudioDacSetAttnMode(devId, config->attnMode);
+       if(status != Aud_EOK)
        {
-               IFPRINT(audk2g_write("audioDacConfig : audk2g_AudioDacSetAttnMode Failed\n"));
+               IFPRINT(aud_write("audioDacConfig : aud_AudioDacSetAttnMode Failed\n"));
                return (status);
        }
 
        /* Set De-emphasis control */
-       status = audk2g_AudioDacDeempCtrl(devId, config->deempCtrl);
-       if(status != Audk2g_EOK)
+       status = aud_AudioDacDeempCtrl(devId, config->deempCtrl);
+       if(status != Aud_EOK)
        {
-               IFPRINT(audk2g_write("audioDacConfig : audk2g_AudioDacDeempCtrl Failed\n"));
+               IFPRINT(aud_write("audioDacConfig : aud_AudioDacDeempCtrl Failed\n"));
                return (status);
        }
 
        /* Set DAC volume */
-       status = audk2g_AudioDacSetVolume(devId, AUDK2G_DAC_CHAN_ALL, config->volume);
-       if(status != Audk2g_EOK)
+       status = aud_AudioDacSetVolume(devId, AUD_DAC_CHAN_ALL, config->volume);
+       if(status != Aud_EOK)
        {
-               IFPRINT(audk2g_write("audioDacConfig : audk2g_AudioDacSetVolume Failed\n"));
+               IFPRINT(aud_write("audioDacConfig : aud_AudioDacSetVolume Failed\n"));
                return (status);
        }
 
@@ -259,18 +259,18 @@ Audk2g_STATUS audioDacConfig(Audk2gDacDevId devId, DacConfig *config)
  *
  *  \return    Platform_EOK on Success or error code
  */
-Audk2g_STATUS audioDirConfig(void)
+Aud_STATUS audioDirConfig(void)
 {
-       Audk2g_STATUS status;
+       Aud_STATUS status;
        int8_t          fsout;
 #ifdef CHECK_ERROR_STATUS
        uint32_t        timeout;
 #endif
 
-       status = audk2g_AudioDirInit();
-       if(status != Audk2g_EOK)
+       status = aud_AudioDirInit();
+       if(status != Aud_EOK)
        {
-               IFPRINT(audk2g_write("audioDirConfig : Audio DIR Configuration Failed!\n"));
+               IFPRINT(aud_write("audioDirConfig : Audio DIR Configuration Failed!\n"));
                return (status);
        }
 
@@ -281,45 +281,45 @@ Audk2g_STATUS audioDirConfig(void)
        timeout = ERROR_STATUS_WAIT_TIMEOUT;
        while (timeout)
        {
-               if(!audk2g_AudioDirGetErrStatus())
+               if(!aud_AudioDirGetErrStatus())
                {
-                       IFPRINT(audk2g_write("audioDirConfig : DIR in PLL Mode\n"));
+                       IFPRINT(aud_write("audioDirConfig : DIR in PLL Mode\n"));
                        break;
                }
 
-               IFPRINT(audk2g_write("audioDirConfig : Waiting for DIR to Enter PLL Mode...\n"));
-               audk2g_delay(10);
+               IFPRINT(aud_write("audioDirConfig : Waiting for DIR to Enter PLL Mode...\n"));
+               aud_delay(10);
                timeout--;
        }
 
        if(!timeout)
        {
-               IFPRINT(audk2g_write("audioDirConfig : DIR is not in PLL Mode!!\n"));
+               IFPRINT(aud_write("audioDirConfig : DIR is not in PLL Mode!!\n"));
                return (Platform_EFAIL);
        }
 #endif
 
-       fsout = audk2g_AudioDirGetFsOut();
+       fsout = aud_AudioDirGetFsOut();
        if(fsout == 2)
        {
-               IFPRINT(audk2g_write("audioDirConfig : Out of Range Sampling Frequency\n"));
+               IFPRINT(aud_write("audioDirConfig : Out of Range Sampling Frequency\n"));
        }
        else if(fsout == 0)
        {
-               IFPRINT(audk2g_write("audioDirConfig : Calculated Sampling Frequency Output is 43 kHz\9645.2 kHz\n"));
+               IFPRINT(aud_write("audioDirConfig : Calculated Sampling Frequency Output is 43 kHz\9645.2 kHz\n"));
        }
        else if(fsout == 1)
        {
-               IFPRINT(audk2g_write("audioDirConfig : Calculated Sampling Frequency Output is 46.8 kHz\9649.2 kHz\n"));
+               IFPRINT(aud_write("audioDirConfig : Calculated Sampling Frequency Output is 46.8 kHz\9649.2 kHz\n"));
        }
        else if(fsout == 3)
        {
-               IFPRINT(audk2g_write("audioDirConfig : Calculated Sampling Frequency Output is 31.2 kHz\9632.8 kHz\n"));
+               IFPRINT(aud_write("audioDirConfig : Calculated Sampling Frequency Output is 31.2 kHz\9632.8 kHz\n"));
        }
        else
        {
-               IFPRINT(audk2g_write("audioDirConfig : Error in Reading FSOUT status \n"));
-               status = Audk2g_EFAIL;
+               IFPRINT(aud_write("audioDirConfig : Error in Reading FSOUT status \n"));
+               status = Aud_EFAIL;
        }
 
        return (status);
@@ -440,7 +440,7 @@ void hrptredid()
        int ret_val=I2C_STS_SUCCESS;
 
        do{ret_val=alpha_i2c_write(HSDIO_EDID_SPEAKER_ALLOCATION_BLOCK(0xFF));}while (ret_val !=I2C_STS_SUCCESS);
-       audk2g_delay(10);
+       aud_delay(10);
        do{ret_val=alpha_i2c_write(HSDIO_EDID_SPEAKER_ALLOCATION_BLOCK_2(0x7));}while (ret_val !=I2C_STS_SUCCESS);
 
        set_audio_desc(0,1,2,0x7f,7);   // PCM 2 channel, 32kHz, 44.1kHz, 48kHz, 88.2kHz, 96kHz, 176.4 KHz, 192 KHz, 16bit, 20bit, 24bit
@@ -507,7 +507,7 @@ unsigned int read_hdmi_videosyncstatus()
        Uint8 length=0;
        int ret_val=0;
 
-       audk2g_delay(10);
+       aud_delay(10);
        ret_val=alpha_i2c_write(HSDIO_INPUT_SYNC_STS);
        Log_info0("read_hdmi_videosyncstatus: After writing HSDIO_INPUT_SYNC_STS.");
 
@@ -559,7 +559,7 @@ void clear_hdmi_hmint()
 {
        int ret_val=0;
 
-       audk2g_delay(10);
+       aud_delay(10);
        ret_val=alpha_i2c_write(HSDIO_ALERT_STS); //clear the interrupt on ~HMINT by reading the Alert Status register
 
        if(ret_val !=I2C_STS_SUCCESS)
@@ -583,7 +583,7 @@ Uint32 read_hdmi_samprate()
        int ret_val=7;
 
        Log_info0("Audio DC CFG: Entered read_hdmi_samprate");
-       audk2g_delay(10);
+       aud_delay(10);
        ret_val=alpha_i2c_write(HSDIO_AUDIO_INPUT_FREQ_STS);\
        if(ret_val==I2C_STS_SUCCESS)
        {
@@ -623,11 +623,11 @@ Uint32 read_hdmi_samprate()
  *  via the serial (I2C1) command interface for the necessary
  *  audio operations.
  *
- *  \return    Audk2g_EOK on Success
+ *  \return    Aud_EOK on Success
  */
-Audk2g_STATUS audioHDMIConfig(void)
+Aud_STATUS audioHDMIConfig(void)
 {
-       Audk2g_STATUS status = Audk2g_EOK;
+       Aud_STATUS status = Aud_EOK;
 
        I2C_HwAttrs   i2c_cfg;
 
index 3199c94dc3899b6dfe7ff07bc461971b3e6442dd..adb981184a839f6eca19385534c2e0057a55c260 100644 (file)
@@ -43,8 +43,8 @@ All rights reserved.
 #ifndef _AUDIO_DC_CFG_H_
 #define _AUDIO_DC_CFG_H_
 
-#include "audk2g.h"
-#include "audk2g_audio.h"
+#include "aud.h"
+#include "aud_audio.h"
 /* TI-RTOS Header files */
 #include <ti/drv/i2c/I2C.h>
 #include <ti/drv/i2c/soc/I2C_soc.h>
@@ -55,14 +55,14 @@ All rights reserved.
  */
 typedef struct _AdcConfig
 {
-       uint8_t          gain;
-       Audk2gAdcLeftInputMux  adc1LMux;
-       Audk2gAdcLeftInputMux  adc2LMux;
-       Audk2gAdcRightInputMux adc1RMux;
-       Audk2gAdcRightInputMux adc2RMux;
-       Audk2gAdcRxWordLen     wlen;
-       Audk2gAdcDataFormat    format;
-       uint8_t          intEnable;
+       uint8_t             gain;
+       AudAdcLeftInputMux  adc1LMux;
+       AudAdcLeftInputMux  adc2LMux;
+       AudAdcRightInputMux adc1RMux;
+       AudAdcRightInputMux adc2RMux;
+       AudAdcRxWordLen     wlen;
+       AudAdcDataFormat    format;
+       uint8_t             intEnable;
 } AdcConfig;
 
 /**
@@ -71,14 +71,14 @@ typedef struct _AdcConfig
  */
 typedef struct _DacConfig
 {
-       Audk2gDacAmuteCtrl    amuteCtrl;
-       uint8_t         amuteEnable;
-       Audk2gDacSamplingMode samplingMode;
-       Audk2gDacDataFormat   dataFormat;
-       uint8_t         softMuteEnable;
-       Audk2gDacAttnMode     attnMode;
-       Audk2gDacDeempCtrl    deempCtrl;
-       uint8_t         volume;
+       AudDacAmuteCtrl    amuteCtrl;
+       uint8_t            amuteEnable;
+       AudDacSamplingMode samplingMode;
+       AudDacDataFormat   dataFormat;
+       uint8_t            softMuteEnable;
+       AudDacAttnMode     attnMode;
+       AudDacDeempCtrl    deempCtrl;
+       uint8_t            volume;
 } DacConfig;
 
 /**
@@ -92,7 +92,7 @@ typedef struct _DacConfig
  *
  *  \return    Platform_EOK on Success or error code
  */
-Audk2g_STATUS audioAdcConfig(Audk2gAdcDevId  devId, AdcConfig *config);
+Aud_STATUS audioAdcConfig(AudAdcDevId  devId, AdcConfig *config);
 
 /**
  *  \brief    Initializes DAC module
@@ -105,7 +105,7 @@ Audk2g_STATUS audioAdcConfig(Audk2gAdcDevId  devId, AdcConfig *config);
  *
  *  \return    Platform_EOK on Success or error code
  */
-Audk2g_STATUS audioDacConfig(Audk2gDacDevId devId, DacConfig *config);
+Aud_STATUS audioDacConfig(AudDacDevId devId, DacConfig *config);
 
 /**
  *  \brief    Initializes DIR module
@@ -113,9 +113,9 @@ Audk2g_STATUS audioDacConfig(Audk2gDacDevId devId, DacConfig *config);
  *  This function initializes and configures the DIR modules
  *  on audio daughter card
  *
- *  \return    Audk2g_STATUS on Success or error code
+ *  \return    Aud_STATUS on Success or error code
  */
-Audk2g_STATUS audioDirConfig(void);
+Aud_STATUS audioDirConfig(void);
 
 /**
  *  \brief    Initializes HSR41 module
@@ -123,9 +123,9 @@ Audk2g_STATUS audioDirConfig(void);
  *  This function initializes and configures the HDMI module
  *  with the audio daughter card
  *
- *  \return    Audk2g_STATUS on Success
+ *  \return    Aud_STATUS on Success
  */
-Audk2g_STATUS audioHDMIConfig(void);
+Aud_STATUS audioHDMIConfig(void);
 
 /**
  *  \brief    Read HDMI input sampling rate
index 62cc8294f30c941d0da6303d8158c8cd1c8a8659..0bf3330c5a9b8fccf52b4bab5cfcba4c4f31e685 100644 (file)
@@ -102,7 +102,7 @@ extern UART_HwAttrs uartInitCfg[];
  *
  *  \return    Platform_EOK on Success or error code
  */
-Audk2g_STATUS eDmaConfig(void)
+Aud_STATUS eDmaConfig(void)
 {
     EDMA3_DRV_Result edmaResult = 0;
 
@@ -110,8 +110,8 @@ Audk2g_STATUS eDmaConfig(void)
     hEdma0 = edma3init(CSL_EDMACC_0, &edmaResult);
     if((hEdma0 == NULL) || (edmaResult != 0))
     {
-               IFPRINT(audk2g_write("eDMA instance 0 Initialization Failed\n"));
-               return (Audk2g_EFAIL);
+               IFPRINT(aud_write("eDMA instance 0 Initialization Failed\n"));
+               return (Aud_EFAIL);
        }
 #ifdef DCS7_UART_EDMA_ENABLE
     uartInitCfg[0].edmaHandle = hEdma0;
@@ -120,11 +120,11 @@ Audk2g_STATUS eDmaConfig(void)
     hEdma1 = edma3init(CSL_EDMACC_1, &edmaResult);
     if((hEdma1 == NULL) || (edmaResult != 0))
     {
-               IFPRINT(audk2g_write("eDMA instance 1 Initialization Failed\n"));
-               return (Audk2g_EFAIL);
+               IFPRINT(aud_write("eDMA instance 1 Initialization Failed\n"));
+               return (Aud_EFAIL);
        }
 
-       return (Audk2g_EOK);
+       return (Aud_EOK);
 }
 
 /**
index 14d1d44ae1ec3b854d7b7d585ecba38c749a1b39..54ee23b9b400f6436320fd1d8a5a31e21c9a97c1 100644 (file)
@@ -55,7 +55,7 @@ All rights reserved.
  *
  *  \return    Platform_EOK on Success or error code
  */
-Audk2g_STATUS eDmaConfig(void);
+Aud_STATUS eDmaConfig(void);
 
 #endif /* _EDMA_CFG_H_ */
 
index c6dba5f10de5b49ff26a3df49eb7988d269aa5f2..d1c12ff42dfb928c7d14b87b2554c665c35fd38f 100644 (file)
@@ -480,14 +480,14 @@ void GblErr(Mcasp_errCbStatus arg)
 /* DAC default configuration parameters */
 DacConfig  DAC_Cfg =
 {
-       AUDK2G_DAC_AMUTE_CTRL_DAC_DISABLE_CMD,   /* Amute event */
-       0,                          /* Amute control */
-       AUDK2G_DAC_SAMPLING_MODE_AUTO,     /* Sampling mode */
-       AUDK2G_DAC_DATA_FORMAT_I2S,        /* Data format */
-       0,                          /* Soft mute control */
-       AUDK2G_DAC_ATTENUATION_WIDE_RANGE, /* Attenuation mode */
-       AUDK2G_DAC_DEEMP_DISABLE,            /* De-emph control */
-       100                          /* Volume */
+       AUD_DAC_AMUTE_CTRL_DAC_DISABLE_CMD,   /* Amute event */
+       0,                                    /* Amute control */
+       AUD_DAC_SAMPLING_MODE_AUTO,           /* Sampling mode */
+       AUD_DAC_DATA_FORMAT_I2S,              /* Data format */
+       0,                                    /* Soft mute control */
+       AUD_DAC_ATTENUATION_WIDE_RANGE,       /* Attenuation mode */
+       AUD_DAC_DEEMP_DISABLE,                /* De-emph control */
+       100                                   /* Volume */
 };
 
 /**
@@ -497,13 +497,13 @@ DacConfig  DAC_Cfg =
  */
 void configAudioDAC(void)
 {
-       Audk2g_STATUS status;
+       Aud_STATUS status;
 
-       audk2g_delay(10000);
+       aud_delay(10000);
 
        /* Initialize Audio DAC module */
-       status = audioDacConfig(AUDK2G_DAC_DEVICE_ALL, &DAC_Cfg);
-       if(status != Audk2g_EOK)
+       status = audioDacConfig(AUD_DAC_DEVICE_ALL, &DAC_Cfg);
+       if(status != Aud_EOK)
        {
                //platform_write("Audio DAC Configuration Failed!\n");
                //testRet(1);
@@ -514,9 +514,9 @@ void configAudioDAC(void)
  *  \brief   Configures McASP module and creates the channel
  *           for audio Tx and Rx
  *
- *  \return    Audk2g_EOK on Success or error code
+ *  \return    Aud_EOK on Success or error code
  */
-Audk2g_STATUS mcaspAudioConfig(void)
+Aud_STATUS mcaspAudioConfig(void)
 {
     int32_t status;
 
@@ -564,7 +564,7 @@ Audk2g_STATUS mcaspAudioConfig(void)
        if((status != MCASP_COMPLETED) || (hMcaspDevTx == NULL))
        {
                //IFPRINT(platform_write("mcaspBindDev for Tx Failed\n"));
-               return (Audk2g_EFAIL);
+               return (Aud_EFAIL);
        }
 
        /* Bind McASP2 for Rx */
@@ -572,7 +572,7 @@ Audk2g_STATUS mcaspAudioConfig(void)
        if((status != MCASP_COMPLETED) || (hMcaspDevRx == NULL))
        {
                //IFPRINT(platform_write("mcaspBindDev for Rx Failed\n"));
-               return (Audk2g_EFAIL);
+               return (Aud_EFAIL);
        }
 
 #else /* HDMI or HDMI_STEREO */
@@ -581,7 +581,7 @@ Audk2g_STATUS mcaspAudioConfig(void)
        if((status != MCASP_COMPLETED) || (hMcaspDevRx == NULL))
        {
                //IFPRINT(platform_write("mcaspBindDev for Rx Failed\n"));
-               return (Audk2g_EFAIL);
+               return (Aud_EFAIL);
        }
 
        hMcaspDevTx = hMcaspDevRx;
@@ -604,7 +604,7 @@ Audk2g_STATUS mcaspAudioConfig(void)
        if((status != MCASP_COMPLETED) || (hMcaspTxChan == NULL))
        {
                //IFPRINT(platform_write("mcaspCreateChan for Tx Failed\n"));
-               return (Audk2g_EFAIL);
+               return (Aud_EFAIL);
        }
 
        /* Create McASP channel for Rx */
@@ -620,19 +620,19 @@ Audk2g_STATUS mcaspAudioConfig(void)
        if((status != MCASP_COMPLETED) || (hMcaspRxChan == NULL))
        {
                //IFPRINT(platform_write("mcaspCreateChan for Rx Failed\n"));
-               return (Audk2g_EFAIL);
+               return (Aud_EFAIL);
        }
 
-       return (Audk2g_EOK);
+       return (Aud_EOK);
 } /* mcaspAudioConfig */
 
 
-Audk2g_STATUS mcaspRx(void)
+Aud_STATUS mcaspRx(void)
 {
 
 }
 
-Audk2g_STATUS mcaspRxDeInit(void)
+Aud_STATUS mcaspRxDeInit(void)
 {
        mcaspDeleteChan(hMcaspRxChan);
        hMcaspRxChan = NULL;
@@ -640,27 +640,27 @@ Audk2g_STATUS mcaspRxDeInit(void)
        mcaspUnBindDev(hMcaspDevRx);
        hMcaspDevRx = NULL;
 
-    return (Audk2g_EOK);
+    return (Aud_EOK);
 }
 
-Audk2g_STATUS mcaspChanReset(Ptr hMcaspDev, Ptr hMcaspChan)
+Aud_STATUS mcaspChanReset(Ptr hMcaspDev, Ptr hMcaspChan)
 {
     if(hMcaspChan != NULL) {
         mcaspDeleteChan(hMcaspChan);
     }
 }
 
-Audk2g_STATUS mcaspRxReset(void)
+Aud_STATUS mcaspRxReset(void)
 {
     if(hMcaspRxChan != NULL) {
                mcaspDeleteChan(hMcaspRxChan);
                hMcaspRxChan = NULL;
     }
 
-       return (Audk2g_EOK);
+       return (Aud_EOK);
 }
 
-Audk2g_STATUS mcaspRxCreate(void)
+Aud_STATUS mcaspRxCreate(void)
 {
     int32_t status;
 
@@ -677,23 +677,23 @@ Audk2g_STATUS mcaspRxCreate(void)
        if((status != MCASP_COMPLETED) || (hMcaspRxChan == NULL))
        {
                //IFPRINT(platform_write("mcaspCreateChan for Rx Failed\n"));
-               return (Audk2g_EFAIL);
+               return (Aud_EFAIL);
        }
 
-       return (Audk2g_EOK);
+       return (Aud_EOK);
 }
 
-Audk2g_STATUS mcaspTxReset(void)
+Aud_STATUS mcaspTxReset(void)
 {
     if(hMcaspTxChan != NULL) {
                mcaspDeleteChan(hMcaspTxChan);
                hMcaspTxChan = NULL;
     }
 
-       return (Audk2g_EOK);
+       return (Aud_EOK);
 }
 
-Audk2g_STATUS mcaspTxCreate(void)
+Aud_STATUS mcaspTxCreate(void)
 {
     int32_t status;
 
@@ -709,15 +709,15 @@ Audk2g_STATUS mcaspTxCreate(void)
        if((status != MCASP_COMPLETED) || (hMcaspTxChan == NULL))
        {
                //IFPRINT(platform_write("mcaspCreateChan for Tx Failed\n"));
-               return (Audk2g_EFAIL);
+               return (Aud_EFAIL);
        }
 
-       return (Audk2g_EOK);
+       return (Aud_EOK);
 }
 #endif
 
 
-Audk2g_STATUS mcaspRecfgWordWidth(Ptr hMcaspChan, uint16_t wordWidth)
+Aud_STATUS mcaspRecfgWordWidth(Ptr hMcaspChan, uint16_t wordWidth)
 {
     Mcasp_ChanParams chanParams;
     int32_t status;
@@ -727,10 +727,10 @@ Audk2g_STATUS mcaspRecfgWordWidth(Ptr hMcaspChan, uint16_t wordWidth)
     status = mcaspControlChan(hMcaspChan, Mcasp_IOCTL_CHAN_PARAMS_WORD_WIDTH, &chanParams);
 
     if((status != MCASP_COMPLETED)) {
-        return (Audk2g_EFAIL);
+        return (Aud_EFAIL);
     }
     else {
-        return (Audk2g_EOK);
+        return (Aud_EOK);
     }
 } /* mcaspRecfgWordWidth */
 
@@ -932,9 +932,9 @@ mcaspLLDconfig LLDconfigTxDAC16ch =    // for SAP_D10_TX_DAC_16CH
 /**
  *  \brief Create a channel of McASP LLD and return the handle.
  *
- *  \return    Audk2g_EOK on Success or error code
+ *  \return    Aud_EOK on Success or error code
  */
-Audk2g_STATUS mcasplldChanCreate(mcaspLLDconfig *lldCfg, Ptr *pChanHandle)
+Aud_STATUS mcasplldChanCreate(mcaspLLDconfig *lldCfg, Ptr *pChanHandle)
 {
     int32_t status;
 
@@ -953,7 +953,7 @@ Audk2g_STATUS mcasplldChanCreate(mcaspLLDconfig *lldCfg, Ptr *pChanHandle)
         status = mcaspBindDev(&mcaspDevHandles[lldCfg->mcaspPort], lldCfg->mcaspPort, &mcaspParams);
         if((status != MCASP_COMPLETED) || (mcaspDevHandles[lldCfg->mcaspPort] == NULL)) {
             //IFPRINT(platform_write("mcaspBindDev for Tx Failed\n"));
-            return (Audk2g_EFAIL);
+            return (Aud_EFAIL);
         }
     }
 
@@ -976,10 +976,10 @@ Audk2g_STATUS mcasplldChanCreate(mcaspLLDconfig *lldCfg, Ptr *pChanHandle)
     if((status != MCASP_COMPLETED) || (*pChanHandle == NULL))
     {
         //IFPRINT(platform_write("mcaspCreateChan for Tx Failed\n"));
-        return (Audk2g_EFAIL);
+        return (Aud_EFAIL);
     }
 
-    return (Audk2g_EOK);
+    return (Aud_EOK);
 }  /* mcasplldChanCreate */
 
 /* Nothing past this point */
index 127bc2f0bfd0195483bffc45e2f01ebd55fb4007..78e567848847f7afff6348b41d6bc23b3e7af889 100644 (file)
@@ -146,14 +146,14 @@ extern mcaspLLDconfig LLDconfigTxDAC16ch;
  *
  *  \return    Platform_EOK on Success or error code
  */
-Audk2g_STATUS mcaspAudioConfig(void);
+Aud_STATUS mcaspAudioConfig(void);
 
-Audk2g_STATUS mcaspTxCreate(void);
-Audk2g_STATUS mcaspTxReset(void);
-Audk2g_STATUS mcaspRxCreate(void);
-Audk2g_STATUS mcaspRxReset(void);
-Audk2g_STATUS mcaspRecfgWordWidth(Ptr hMcaspChan, uint16_t wordWidth);
+Aud_STATUS mcaspTxCreate(void);
+Aud_STATUS mcaspTxReset(void);
+Aud_STATUS mcaspRxCreate(void);
+Aud_STATUS mcaspRxReset(void);
+Aud_STATUS mcaspRecfgWordWidth(Ptr hMcaspChan, uint16_t wordWidth);
 int mcaspCheckOverUnderRun(Ptr mcaspChanHandle);
-Audk2g_STATUS mcasplldChanCreate(mcaspLLDconfig *lldCfg, Ptr *pChanHandle);
+Aud_STATUS mcasplldChanCreate(mcaspLLDconfig *lldCfg, Ptr *pChanHandle);
 
 #endif /* _MCASP_CONFIG_H_ */
index 706ebc467a1fb6ad183947b3133c9e8acb5cd882..6a06f3a5d4ea1ad5942854da444e89433a03a032 100644 (file)
@@ -68,7 +68,7 @@ All rights reserved.
 #include <sap_d10.h>
 #include <audio_dc_cfg.h>
 #include "vproccmds_a.h"
-#include "evmc66x_gpio.h"  // in "${PDK_INSTALL_PATH}/ti/addon/audk2g/include"
+#include "evmc66x_gpio.h"  // in "${PDK_INSTALL_PATH}/ti/addon/aud/include"
 
 #include "dbgBenchmark.h" // PCM high-sampling rate + SRC + CAR benchmarking
 #include "mcasp_cfg.h"
@@ -86,10 +86,10 @@ void HSR4_readStatus (PAF_SIO_InputStatus *pStatus);
 unsigned int HDMIGpioGetState (void);
 
 /** GPIO number for I2S Header HSR4's ~HMINT pin - GPIO port 0 */
-#define AUDK2G_AUDIO_HSR_HMINTz_GPIO      (105)   // missing from audio addon
+#define AUD_AUDIO_HSR_HMINTz_GPIO      (105)   // missing from audio addon
 
 /** GPIO number for I2S Header HSR4's ~RESET pin - GPIO port 0 */
-#define AUDK2G_AUDIO_HSR_RESETz_GPIO      (104)   // missing from audio addon
+#define AUD_AUDIO_HSR_RESETz_GPIO      (104)   // missing from audio addon
 
 // -----------------------------------------------------------------------------
 // State machine variables and defines
@@ -694,81 +694,81 @@ const SAP_D10_Tx_Params SAP_D10_TX_DAC_16CH =
 /* DAC default configuration parameters */
 DacConfig  dacCfg =
 {
-       AUDK2G_DAC_AMUTE_CTRL_SCKI_LOST,   /* Amute event */
-       0,                          /* Amute control */
-       AUDK2G_DAC_SAMPLING_MODE_SINGLE_RATE,     /* Sampling mode */
-       AUDK2G_DAC_DATA_FORMAT_I2S,        /* Data format */
-       0,                          /* Soft mute control */
-       AUDK2G_DAC_ATTENUATION_WIDE_RANGE, /* Attenuation mode */
-       AUDK2G_DAC_DEEMP_44KHZ,            /* De-emph control */
-       100                         /* Volume */
+       AUD_DAC_AMUTE_CTRL_SCKI_LOST,       /* Amute event */
+       0,                                  /* Amute control */
+       AUD_DAC_SAMPLING_MODE_SINGLE_RATE,  /* Sampling mode */
+       AUD_DAC_DATA_FORMAT_I2S,            /* Data format */
+       0,                                  /* Soft mute control */
+       AUD_DAC_ATTENUATION_WIDE_RANGE,     /* Attenuation mode */
+       AUD_DAC_DEEMP_44KHZ,                /* De-emph control */
+       100                                 /* Volume */
 };
 /* ADC default configuration parameters */
 AdcConfig adcCfg =
 {
-       90,                  /* ADC gain */
-       AUDK2G_ADC_INL_SE_VINL1,    /* Left input mux for ADC1L */
-       AUDK2G_ADC_INL_SE_VINL2,    /* Left input mux for ADC2L */
-       AUDK2G_ADC_INR_SE_VINR1,    /* Right input mux for ADC1R */
-       AUDK2G_ADC_INR_SE_VINR2,    /* Right input mux for ADC2R */
-       AUDK2G_ADC_RX_WLEN_24BIT,   /* ADC word length */
-       AUDK2G_ADC_DATA_FORMAT_I2S, /* ADC data format */
+       90,                      /* ADC gain */
+       AUD_ADC_INL_SE_VINL1,    /* Left input mux for ADC1L */
+       AUD_ADC_INL_SE_VINL2,    /* Left input mux for ADC2L */
+       AUD_ADC_INR_SE_VINR1,    /* Right input mux for ADC1R */
+       AUD_ADC_INR_SE_VINR2,    /* Right input mux for ADC2R */
+       AUD_ADC_RX_WLEN_24BIT,   /* ADC word length */
+       AUD_ADC_DATA_FORMAT_I2S, /* ADC data format */
        0
 };
 
-Audk2g_STATUS setAudioDacConfig(void)
+Aud_STATUS setAudioDacConfig(void)
 {
-       Audk2g_STATUS status;
+       Aud_STATUS status;
 
        /* Initialize Audio DAC module */
-       status = audioDacConfig(AUDK2G_DAC_DEVICE_ALL, &dacCfg); // defined in sap\audio_dc_cfg.c
+       status = audioDacConfig(AUD_DAC_DEVICE_ALL, &dacCfg); // defined in sap\audio_dc_cfg.c
        if (status)
                Log_info0("SAP_D10: Audio DAC Configuration Failed!!!\n");
        return status;
 
 }
 
-// Configure GPIO for HSR HDMI signaling. This needs to be added to audk2g_AudioInit()
-// in ti\addon\audk2g\src\audk2g.c.
-Audk2g_STATUS audk2g_AudioInit_Extra()
+// Configure GPIO for HSR HDMI signaling. This needs to be added to aud_AudioInit()
+// in ti\addon\aud\src\aud.c.
+Aud_STATUS aud_AudioInit_Extra()
 {
        /* Configure GPIO for HSR HDMI Signaling - GPIO0 104 (~RESET) & 105 (~HMINT) */
-       audk2g_pinMuxSetMode(114, AUDK2G_PADCONFIG_MUX_MODE_QUATERNARY);
-       audk2g_gpioSetDirection(AUDK2G_GPIO_PORT_0, AUDK2G_AUDIO_HSR_HMINTz_GPIO, AUDK2G_GPIO_IN);
+       aud_pinMuxSetMode(114, AUD_PADCONFIG_MUX_MODE_QUATERNARY);
+       aud_gpioSetDirection(AUD_GPIO_PORT_0, AUD_AUDIO_HSR_HMINTz_GPIO, AUD_GPIO_IN);
 
-       audk2g_pinMuxSetMode(113, AUDK2G_PADCONFIG_MUX_MODE_QUATERNARY);
-       audk2g_gpioSetDirection(AUDK2G_GPIO_PORT_0, AUDK2G_AUDIO_HSR_RESETz_GPIO, AUDK2G_GPIO_OUT);
-       audk2g_gpioSetOutput(AUDK2G_GPIO_PORT_0, AUDK2G_AUDIO_HSR_RESETz_GPIO);
+       aud_pinMuxSetMode(113, AUD_PADCONFIG_MUX_MODE_QUATERNARY);
+       aud_gpioSetDirection(AUD_GPIO_PORT_0, AUD_AUDIO_HSR_RESETz_GPIO, AUD_GPIO_OUT);
+       aud_gpioSetOutput(AUD_GPIO_PORT_0, AUD_AUDIO_HSR_RESETz_GPIO);
 
-       return Audk2g_EOK;
+       return Aud_EOK;
 }
 
 static inline XDAS_Int32 initD10 (DEV2_Handle device)
 {
-       Audk2g_STATUS status = Audk2g_EOK;
+       Aud_STATUS status = Aud_EOK;
 
        /* Initialize common audio configurations */
-       status = audk2g_AudioInit(); // defined in in ti\addon\audk2g\src\audk2g.c
-       if(status != Audk2g_EOK)
+       status = aud_AudioInit(); // defined in in ti\addon\aud\src\aud.c
+       if(status != Aud_EOK)
        {
-               Log_info0("audk2g_AudioInit Failed!\n");
+               Log_info0("aud_AudioInit Failed!\n");
                return status;
        }
        else
-               Log_info0("audk2g_AudioInit Passed!\n");
+               Log_info0("aud_AudioInit Passed!\n");
 
-       status = (Audk2g_STATUS)audk2g_AudioInit_Extra();
-       if(status != Audk2g_EOK)
+       status = (Aud_STATUS)aud_AudioInit_Extra();
+       if(status != Aud_EOK)
        {
-               Log_info0("audk2g_AudioInit_Extra Failed!\n");
+               Log_info0("aud_AudioInit_Extra Failed!\n");
                return status;
        }
        else
-               Log_info0("audk2g_AudioInit_Extra Passed!\n");
+               Log_info0("aud_AudioInit_Extra Passed!\n");
 
        /* Initialize Audio ADC module */
-       status = audioAdcConfig(AUDK2G_ADC_DEVICE_ALL, &adcCfg);
-       if(status != Audk2g_EOK)
+       status = audioAdcConfig(AUD_ADC_DEVICE_ALL, &adcCfg);
+       if(status != Aud_EOK)
        {
                Log_info0("Audio ADC Configuration Failed!\n");
                return status;
@@ -779,7 +779,7 @@ static inline XDAS_Int32 initD10 (DEV2_Handle device)
        /* Setup DIR 9001 for SPDIF input operation */
        //status = platformAudioSelectClkSrc(AUDIO_CLK_SRC_DIR);
        status = audioDirConfig();
-       if(status != Audk2g_EOK)
+       if(status != Aud_EOK)
        {
                Log_info0("Audio DIR Init Failed!\n");
                return status;
@@ -793,7 +793,7 @@ static inline XDAS_Int32 initD10 (DEV2_Handle device)
        /* Initialize the HDMI Card      */
     while(HDMIGpioGetState());
        status = audioHDMIConfig();
-       if(status != Audk2g_EOK)
+       if(status != Aud_EOK)
        {
                Log_info0("Audio HDMI Init Failed!\n");
                return status;
@@ -802,8 +802,8 @@ static inline XDAS_Int32 initD10 (DEV2_Handle device)
                Log_info0("Audio HDMI Init Passed!\n");
 #endif
 
-       status = audk2g_AudioSelectClkSrc(AUDK2G_AUDIO_CLK_SRC_DIR);
-       audk2g_delay(50000); // Without delay between these 2 calls system aborts.
+       status = aud_AudioSelectClkSrc(AUD_AUDIO_CLK_SRC_DIR);
+       aud_delay(50000); // Without delay between these 2 calls system aborts.
        status = setAudioDacConfig();
 
        Log_info1("Leaving initD10 with status = %d", status);
@@ -820,26 +820,26 @@ static inline XDAS_Int32 initD10 (DEV2_Handle device)
 // of TX0 (DAC) and TX2 (DIT).
 static XDAS_Int32 clockMuxTx (int sel, int force)
 {
-       Audk2g_STATUS status = 0;
+       Aud_STATUS status = 0;
     // select clkxDiv table
     if (sel == D10_MCLK_DIR)
     {
-       status = audk2g_AudioSelectClkSrc(AUDK2G_AUDIO_CLK_SRC_DIR);
+       status = aud_AudioSelectClkSrc(AUD_AUDIO_CLK_SRC_DIR);
        pClkxDiv = (unsigned char *) clkxDivDIR;
     }
     else if (sel == D10_MCLK_HDMI)
     {
-       status = audk2g_AudioSelectClkSrc(AUDK2G_AUDIO_CLK_SRC_I2S);
+       status = aud_AudioSelectClkSrc(AUD_AUDIO_CLK_SRC_I2S);
        pClkxDiv = (unsigned char *) clkxDivHDMI;
     }
     else if (sel == D10_MCLK_OSC)
     {
-       status = audk2g_AudioSelectClkSrc((Audk2gAudioClkSrc)AUDK2G_AUDIO_CLK_SRC_OSC);
+       status = aud_AudioSelectClkSrc((AudAudioClkSrc)AUD_AUDIO_CLK_SRC_OSC);
        pClkxDiv = (unsigned char *) clkxDivADC;
        }
     Log_info1("SAP_D10: Inside clockMuxTx with sel = %d", sel);
 
-    audk2g_delay(20000);
+    aud_delay(20000);
 
     return status;
 } //clockMuxTx
@@ -869,10 +869,10 @@ static int manageInput (DEV2_Handle device, const SAP_D10_Rx_Params *pParams, PA
     if ((((pParams->d10rx.mode & D10_MCLK_MASK) >> D10_MCLK_SHIFT) == D10_MCLK_DIR) &
         (((pParams->d10rx.mode & D10_MODE_MASK) >> D10_MODE_SHIFT) == D10_MODE_STD))
     {
-        pStatusIn->lock = !(audk2g_AudioDirGetClkStatus());
-        pStatusIn->nonaudio = !(audk2g_AudioDirGetAudioStatus());
-        pStatusIn->emphasis = audk2g_AudioDirGetEmphStatus();
-        pStatusIn->sampleRateMeasured = RateTable_spdif[audk2g_AudioDirGetFsOut()];
+        pStatusIn->lock = !(aud_AudioDirGetClkStatus());
+        pStatusIn->nonaudio = !(aud_AudioDirGetAudioStatus());
+        pStatusIn->emphasis = aud_AudioDirGetEmphStatus();
+        pStatusIn->sampleRateMeasured = RateTable_spdif[aud_AudioDirGetFsOut()];
                pStatusIn->sampleRateData = pStatusIn->sampleRateMeasured;
                PrevSampRate = pStatusIn->sampleRateMeasured;
 
@@ -1127,7 +1127,7 @@ XDAS_Int32 D10_sapControl (DEV2_Handle device, const PAF_SIO_Params *pParams, XD
                     // the periodic manage_output calls.
                     int sel = (pDapD10TxParams->d10tx.mode & D10_MCLK_MASK) >> D10_MCLK_SHIFT;
                     clockMuxTx (sel, -1);
-                    audk2g_delay(50000); // GJ REVISIT: Without delay between Tx McASP & DAC configs, system aborts.
+                    aud_delay(50000); // GJ REVISIT: Without delay between Tx McASP & DAC configs, system aborts.
                     setAudioDacConfig();
                                        dacHardUnMute ();
 
@@ -1225,7 +1225,7 @@ XDAS_Int32 D10_sapControl (DEV2_Handle device, const PAF_SIO_Params *pParams, XD
 
 
 unsigned int HDMIGpioGetState (void) {
-       return(audk2g_gpioReadInput(AUDK2G_GPIO_PORT_0, AUDK2G_AUDIO_HSR_HMINTz_GPIO));
+       return(aud_gpioReadInput(AUD_GPIO_PORT_0, AUD_AUDIO_HSR_HMINTz_GPIO));
 }
 
 void setD10ClkMux(UInt16 mode)
index 2a3a5323a8407ad51866063f01b15153428c5682..a9530ea4dab4c26a9fd9d0cb0fff13911c74ae7a 100644 (file)
@@ -47,8 +47,8 @@ All rights reserved.
 
 #include <board.h>
 #include "evmc66x_i2c.h"
-#include <audk2g.h>
-#include <audk2g_audio.h>
+#include <aud.h>
+#include <aud_audio.h>
 #include "audio_dc_cfg.h"
 #include "edma_cfg.h"
 
@@ -63,7 +63,7 @@ extern void evmI2CInit(uint8_t i2cportnumber); // missing in evmc66x_i2c.h
 #ifdef IO_LOOPBACK_TEST
 extern void McaspDevice_init();
 extern void D10_init();
-extern Audk2g_STATUS mcaspAudioConfig();
+extern Aud_STATUS mcaspAudioConfig();
 extern void audioIoCreate(void);
 extern void ioSemaphoreCreate(void);
 #endif
@@ -74,7 +74,7 @@ extern void ioSemaphoreCreate(void);
 Int main()
 {
     Int status;
-    Audk2g_STATUS AudStatus;
+    Aud_STATUS AudStatus;
     Int k;
     Board_initCfg cfg;
 
@@ -117,7 +117,7 @@ Int main()
     Log_info0("Configure EDMA");
     /* Configure eDMA module */
     AudStatus = eDmaConfig();
-    if(AudStatus != Audk2g_EOK)
+    if(AudStatus != Aud_EOK)
     {
         //System_printf("eDMA Configuration Failed!\n");
         Log_info0("eDMA Configuration Failed!");
@@ -137,20 +137,20 @@ Int main()
 
 #ifdef INPUT_SPDIF
     // Input is DIR
-    AudStatus = audk2g_AudioSelectClkSrc(AUDK2G_AUDIO_CLK_SRC_DIR);
+    AudStatus = aud_AudioSelectClkSrc(AUD_AUDIO_CLK_SRC_DIR);
 #else
     // Input is HDMI
-    AudStatus = audk2g_AudioSelectClkSrc(AUDK2G_AUDIO_CLK_SRC_I2S);
+    AudStatus = aud_AudioSelectClkSrc(AUD_AUDIO_CLK_SRC_I2S);
 #endif
-    if(AudStatus != Audk2g_EOK)
+    if(AudStatus != Aud_EOK)
     {
-        Log_info0("audk2g_AudioSelectClkSrc Failed!\n");
+        Log_info0("aud_AudioSelectClkSrc Failed!\n");
     }
-    audk2g_delay(50000); // Without delay between these 2 calls system aborts.
+    aud_delay(50000); // Without delay between these 2 calls system aborts.
 
        /* Initialize McASP module */
        status = mcaspAudioConfig();
-       if(status != Audk2g_EOK)
+       if(status != Aud_EOK)
        {
                Log_info0("McASP Configuration Failed!\n");
        }
index 1ad72dd65d4a0ca9ed0612347ef7ad730d0ea2bd..7540e15f6f578ce8ffa02fa66c232e9145e892f5 100644 (file)
@@ -49,8 +49,8 @@ All rights reserved.
 #include "asperr.h"
 #include "common.h"
 
-#include "audk2g.h"
-#include "audk2g_audio.h"
+#include "aud.h"
+#include "aud_audio.h"
 #include "mcasp_cfg.h"
 #include "ioConfig.h"    //TODO: remove this header
 #include "ioBuff.h"
@@ -322,6 +322,23 @@ Int inputReadyForProcessing;
 
         case ASIT_DECODE_PROCESSING:
             if(events & ASIT_DEC_EVENTS) {
+                
+#if 1 // debug 
+                if (events & ASIT_EVTMSK_INPDATA)
+                {
+                    // shows timing of Input (Rx McASP EDMA)
+                    // ADC B5
+                    {
+                        static Uint8 toggleState = 0;
+                        if (toggleState == 0)
+                            GPIOSetOutput(GPIO_PORT_0, GPIO_PIN_99);
+                        else
+                            GPIOClearOutput(GPIO_PORT_0, GPIO_PIN_99);
+                        toggleState = ~(toggleState);
+                    }
+                }
+#endif           
+                
                 // Decode processing for either PCM or bitstream
                 // New state will be decided inside the function
                 asitErr = asitDecodeProcessing(pP, pQ, pAsitCfg, events);
@@ -520,7 +537,7 @@ Int asitSourceDetection(const PAF_ASIT_Params *pP,
 
                 // Reconfigure McASP LLD to transfer 32-bit unpacked data
                 mcaspErr = mcaspRecfgWordWidth(pInp->hMcaspChan, Mcasp_WordLength_32);
-                if(mcaspErr != Audk2g_EOK) {
+                if(mcaspErr != Aud_EOK) {
                     return ASIT_ERR_MCASP_CFG;
                 }
 
@@ -929,7 +946,7 @@ int asitIoCompsInit(PAF_AST_InpBuf * pInpBuf, PAF_AST_IoInp * pInpIo)
         if(!pInpIo->swapData) {
             Int mcaspErr;
             mcaspErr = mcaspRecfgWordWidth(pInpIo->hMcaspChan, Mcasp_WordLength_16);
-            if(mcaspErr != Audk2g_EOK) {
+            if(mcaspErr != Aud_EOK) {
                 return ASIT_ERR_MCASP_CFG;
             }
 
@@ -998,7 +1015,7 @@ Int asitRecfgPhyXfer(PAF_AST_IoInp *pInp, size_t xferSize)
     if(!pInp->swapData) {
         // If it was PCM, reconfigure McASP LLD to receive 16-bit packed bits
         mcaspErr = mcaspRecfgWordWidth(pInp->hMcaspChan, Mcasp_WordLength_16);
-        if(mcaspErr != Audk2g_EOK) {
+        if(mcaspErr != Aud_EOK) {
             return ASIT_ERR_MCASP_CFG;
         }
 
@@ -1082,7 +1099,7 @@ void asitPhyTransferStart(PAF_AST_IoInp *pInpIo)
 }
 
 Int d10Initialized = 0;
-//extern Audk2g_STATUS mcaspAudioConfig(void);
+//extern Aud_STATUS mcaspAudioConfig(void);
 extern void McaspDevice_init(void);
 
 /*======================================================================================
@@ -1090,7 +1107,7 @@ extern void McaspDevice_init(void);
  *====================================================================================*/
 Int asitSelectDevices(const PAF_ASIT_Patchs *pQ, PAF_AST_Config *pAstCfg, PAF_AST_IoInp *pInp)
 {
-    Audk2g_STATUS status;
+    Aud_STATUS status;
     mcaspLLDconfig *lldCfg;
     Ptr mcaspChanHandle;
     Int zMD, interface;
@@ -1122,7 +1139,7 @@ Int asitSelectDevices(const PAF_ASIT_Patchs *pQ, PAF_AST_Config *pAstCfg, PAF_AS
     if(lldCfg->hMcaspChan == NULL) {
         mcaspChanHandle = NULL;
         status = mcasplldChanCreate(lldCfg, &mcaspChanHandle);
-        if(status != Audk2g_EOK) {
+        if(status != Aud_EOK) {
             Log_info0("McASP channel creation failed!\n");
             return ASIT_ERR_MCASP_CFG;
         }
@@ -1140,7 +1157,7 @@ Int asitSelectDevices(const PAF_ASIT_Patchs *pQ, PAF_AST_Config *pAstCfg, PAF_AS
       ) {
         Int mcaspErr;
         mcaspErr = mcaspRecfgWordWidth(pInp->hMcaspChan, Mcasp_WordLength_16);
-        if(mcaspErr != Audk2g_EOK) {
+        if(mcaspErr != Aud_EOK) {
             return ASIT_ERR_MCASP_CFG;
         }
 
index c70438c9c7860528d7599f8726f7054bdb733e1d..6768889362bfeac37d6063a866749057ae7e4c95 100644 (file)
@@ -74,13 +74,13 @@ Int asopSelectDevices(void *pConfig, PAF_AST_IoOut *pOut)
     }
 
     if(pOut->hMcaspChan == NULL) {
-        Audk2g_STATUS status;
+        Aud_STATUS status;
         mcaspLLDconfig * lldCfg;
         Ptr mcaspChanHandle;
 
         lldCfg = (mcaspLLDconfig *)pConfig;
         status = mcasplldChanCreate(lldCfg, &mcaspChanHandle);
-        if(status != Audk2g_EOK) {
+        if(status != Aud_EOK) {
             return -1;
         }
 
@@ -242,6 +242,8 @@ Int asopSetCheckRateX(
                 return ((getVal & 0xff) | ASPERR_RATE_CHECK);
             }
 #endif // FL, New IO
+            // FL: ugly little experiment
+            //*(volatile UInt32 *)0x23400B0 |= 7;
         }
     }
 
index 0938e75a2efebbd8f6a28f249345fd92e82240bb..354b77863e1f2496fb1b3713b89c11a8a1e033f4 100644 (file)
@@ -512,7 +512,8 @@ const IALG_MemRec inpMemTabPrimary[] =
     // SDRAM circular buffer
     // 2 buffers * 256 samples/buffer * 8 words/sample * 3 bytes/word
     {
-        (6 * 60 * 1024) + 2,                                    // size 184320 + 1 16-bit word for EDMA padding
+        (6 * 60 * 1024) + 2,                                    // size 360 kB + 1 16-bit word for EDMA padding
+        //(4 * 60 * 1024) + 2,                                    // size 240 kB + 1 16-bit word for EDMA padding
         //180 * 1024,                                           // size
         //6 * 60 * 1024,                                        // size
         128,                                                    // alignment
index b4a01b15b6006d661b1f32b3d0e1cc80c2588557..84ad3792fabce370422f92845a2cebf79f532a17 100644 (file)
@@ -234,15 +234,15 @@ Void taskSysInitFxn(Void)
 
 #if 1 // debug
     // Any of these can be used on ARM, but DSP must configure the GPIO since pinMuxSetMode() is only available on DSP
-    audk2g_pinMuxSetMode(101,AUDK2G_PADCONFIG_MUX_MODE_QUATERNARY); // PAD101 to QUATERNARY, GPIO (B5 on AudioDaughterCard J12)
+    aud_pinMuxSetMode(101,AUD_PADCONFIG_MUX_MODE_QUATERNARY); // PAD101 to QUATERNARY, GPIO (B5 on AudioDaughterCard J12)
     GPIOSetDirection(GPIO_PORT_0, GPIO_PIN_99, GPIO_OUT); // GPIO0,pin99 output
     GPIOSetOutput(GPIO_PORT_0, GPIO_PIN_99);
     GPIOClearOutput(GPIO_PORT_0, GPIO_PIN_99);
-    audk2g_pinMuxSetMode(117,AUDK2G_PADCONFIG_MUX_MODE_QUATERNARY); // PAD117 to QUATERNARY, GPIO (B8 on AudioDaughterCard J12)
+    aud_pinMuxSetMode(117,AUD_PADCONFIG_MUX_MODE_QUATERNARY); // PAD117 to QUATERNARY, GPIO (B8 on AudioDaughterCard J12)
     GPIOSetDirection(GPIO_PORT_0, GPIO_PIN_106, GPIO_OUT); // GPIO0,pin106 output
     GPIOSetOutput(GPIO_PORT_0, GPIO_PIN_106);
     GPIOClearOutput(GPIO_PORT_0, GPIO_PIN_106);
-    audk2g_pinMuxSetMode(118,AUDK2G_PADCONFIG_MUX_MODE_QUATERNARY); // PAD118 to QUATERNARY, GPIO (B9 on AudioDaughterCard J12)
+    aud_pinMuxSetMode(118,AUD_PADCONFIG_MUX_MODE_QUATERNARY); // PAD118 to QUATERNARY, GPIO (B9 on AudioDaughterCard J12)
     GPIOSetDirection(GPIO_PORT_0, GPIO_PIN_107, GPIO_OUT); // GPIO0,pin107 output
     GPIOSetOutput(GPIO_PORT_0, GPIO_PIN_107);
     GPIOClearOutput(GPIO_PORT_0, GPIO_PIN_107);
index f43c35fd51fb5c164bcbe7f745e453820bea3942..ddef39709f0f730d2ab0794d4873df055bb4966e 100644 (file)
@@ -160,7 +160,7 @@ void mcaspAppCallbackTx(void* arg, MCASP_Packet *mcasp_packet)
  *  Waits for the McASP data transfer completion and copies the
  *  Rx data to Tx buffers
  *
- *  \return    Audk2g_EOK on Success or error code
+ *  \return    Aud_EOK on Success or error code
  */
 Void taskAsipFxn(
     const PAF_ASIT_Params *pP,  //JX: asip_params_PAi defined in itopo/params.c