Customize ASDT params, patchs, and configuration
authorFrank Livingston <frank-livingston@ti.com>
Sun, 4 Sep 2016 21:00:53 +0000 (16:00 -0500)
committerFrank Livingston <frank-livingston@ti.com>
Sun, 4 Sep 2016 21:00:53 +0000 (16:00 -0500)
Customize ASDT params, patchs, and configuration for ASDT.
- Params with corresponding settings on ASIT/ASOT should have the same
value as the ASIT/ASOT values. This can be changed in future with ARM/DSP
common (shared) params data.
- ASDT config has local configuration (currently ACP handle) and pointer
  to commmon (shared) ARM/DSP configuration.

13 files changed:
processor_audio_sdk_1_00_00_00/pasdk/common/audioStreamProc_common.c
processor_audio_sdk_1_00_00_00/pasdk/common/audioStreamProc_common.h
processor_audio_sdk_1_00_00_00/pasdk/common/audioStreamProc_config.h
processor_audio_sdk_1_00_00_00/pasdk/common/paf_decOpCircBuf.c
processor_audio_sdk_1_00_00_00/pasdk/common/paf_decOpCircBuf.h
processor_audio_sdk_1_00_00_00/pasdk/test_arm/.cproject
processor_audio_sdk_1_00_00_00/pasdk/test_arm/application/app.cmd
processor_audio_sdk_1_00_00_00/pasdk/test_arm/framework/audioStreamDecodeProc.c
processor_audio_sdk_1_00_00_00/pasdk/test_arm/framework/audioStreamDecodeProc.h
processor_audio_sdk_1_00_00_00/pasdk/test_arm/framework/audioStreamDecodeProc_paramsFxns.c
processor_audio_sdk_1_00_00_00/pasdk/test_dsp/.cproject
processor_audio_sdk_1_00_00_00/pasdk/test_dsp/application/app.cmd
processor_audio_sdk_1_00_00_00/pasdk/test_dsp/framework/audioStreamInpProc.c

index 738c5e36c9edf541d79c2bb2697c02c125fb87fa..2c7918923169bd5706bd3a6863638f83a73dda05 100644 (file)
@@ -41,16 +41,19 @@ All rights reserved.
 
 #include "audioStreamProc_config.h"
 
-// Task data
+//
+// AST (ASIT/ASOT/ASDT) common (shared) configuration
+//
+
 #ifndef _TMS320C6X
-PAF_AST_Config gPAF_AST_config      __attribute__ ((section(".globalSectionPafAstConfig"))); /* Global configuration */
-//PAF_AST_Config *pC                  __attribute__ ((section(".globalSectionPafAstConfig"))); /* Global configuration pointer */
+PAF_AST_Config gPAF_AST_config      __attribute__ ((section(".commonSectionPafAstConfig"))); /* Common configuration */
+//PAF_AST_Config *pC                  __attribute__ ((section(".commonSectionPafAstConfig"))); /* Global configuration pointer */
 
 #else
 
-#pragma DATA_SECTION(gPAF_AST_config, ".globalSectionPafAstConfig")
-#pragma DATA_SECTION(pC, ".globalSectionPafAstConfig")
-PAF_AST_Config gPAF_AST_config; /* Global configuration */
+#pragma DATA_SECTION(gPAF_AST_config, ".commonSectionPafAstConfig")
+PAF_AST_Config gPAF_AST_config; /* Common configuration */
+//#pragma DATA_SECTION(pC, ".commonSectionPafAstConfig")
 //far PAF_AST_Config *pC;         /* Global configuration pointer */
 
 #endif
index e3ab8a710ba2fe1f793e9c1fb350abfc1f939ebe..a31d507d1dc966ad1efd59575030474062681f74 100644 (file)
@@ -210,12 +210,9 @@ All rights reserved.
 #define DEC_Handle PCM_Handle /* works for all: SNG, PCM, AC3, DTS, AAC */
 
 
-/* Global configuration */
+/* Common (shared) configuration */
 extern PAF_AST_Config gPAF_AST_config;
-extern far PAF_AST_Config *pC;
-
-// Temporary
-//extern Bool gAspInitDone;
+//extern far PAF_AST_Config *pC;
 
 
 #endif /* _ASP_COMMON_H_ */
index 0011b8134446d7b354fc11d5efee47879a51b325..7c47a85226f5385c63465eb5f8ee2314669115a4 100644 (file)
@@ -126,7 +126,7 @@ typedef struct PAF_AST_MQ {
 typedef struct PAF_AST_Config {
     Int                  as;
     ACP_Handle           acp;
-    ACP_Handle           acpSlave;
+    //ACP_Handle           acpSlave;
     PAF_AST_InpBuf       *xInp;     /* INPUT1 -INPUTN  */
     PAF_AST_Decode       *xDec;     /* DECODE1-DECODEN */
     PAF_AST_Stream       *xStr;     /* STREAM1-STREAMN */
index edd1d35479a7d83988601dd29e0b786cd32754bc..f017cdc2e1ccd7b0eb89ac32d0c9452da27ad986 100644 (file)
@@ -202,7 +202,7 @@ Int cbWriteStart(
 {
     PAF_AudioFrame *pAfCb;
     Int8 n;
-    Int8 i;
+    //Int8 i;
 
     // (***) FL: revisit
     // Invalidate circular buffer configuration.
index d721228f8d31d979b1a248e1bc8363b147ea9e79..b9e449411e1a5dbffc2854cba3e44ef292cdb213 100644 (file)
@@ -56,7 +56,7 @@ typedef struct PAF_AST_DecOpCircBuf
 {
     PAF_AudioFrame *afCb;   // audio frame CB
     PAF_AudioData *pcmBuf;  // PCM buffer, contains PCM data associated with audio frames
-    Int8          *metaBuf; // metafdata buffer, contains metadata associated with audio frames //QIN
+    Int8 *metaBuf;          // metafdata buffer, contains metadata associated with audio frames //QIN
     Int8 afRdIdx;           // audio frame CB read index
     Int8 afWrtIdx;          // audio frame CB write index
     Int16 pcmRdIdx;         // pcm buffer read index
index 3bf6d894305a1da2b68a9f580b767ab021f30f34..e343729216b53dec7252ede90a746df086f314f1 100644 (file)
@@ -11,8 +11,8 @@
                                        <stringMacro name="AIF2_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="CSL_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="MMCSD_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_1/packages"/>
                                        <stringMacro name="ICSS_EMAC_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_1/packages"/>
                                        <stringMacro name="USB_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="I2C_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="CPPI_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="IQN_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="PKTLIB_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="SRIO_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="PRUSS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="DFE_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="UART_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="FATFS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="PRUSS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="SBL_BOOT_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="BOARD_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="FATFS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="UART_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="NWAL_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="BOARD_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="SPI_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                </macros>
                                <externalSettings/>
@@ -83,7 +83,6 @@
                                                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.DWARF_VERSION.1855168378" name="Generate debug information in DWARF version (-gdwarf-)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.DWARF_VERSION" value="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.DWARF_VERSION.3" valueType="enumerated"/>
                                                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.INCLUDE_PATH.2049662485" name="Include paths (-I)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_GNU_4.0.compilerID.INCLUDE_PATH" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${CG_TOOL_INCLUDE_PATH}&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/packages&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/paf/pa/asp/com&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/paf/pa/asp/std&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/paf/pa/dec/com&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/paf/pa/f/s3&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/paf/pa/f/include&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/paf/pa/f/alpha&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/paf/pa/util/c67x_cintrins&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/common&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/shared&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/test_arm/framework&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/test_dsp/sio&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/test_dsp/sio_dev2&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/paf/pa/util/c67x_cintrins&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/ddp/Dolby_Digital_Plus_Decoder_Imp/Source_Code/alg&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/ddp/Dolby_Digital_Plus_Decoder_Imp/Source_Code/include&quot;"/>
                                                                </option>
                                        <stringMacro name="AIF2_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="CSL_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="MMCSD_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_1/packages"/>
                                        <stringMacro name="ICSS_EMAC_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_1/packages"/>
                                        <stringMacro name="USB_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="I2C_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="CPPI_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="IQN_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="PKTLIB_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="SRIO_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="PRUSS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="DFE_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="UART_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="FATFS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="PRUSS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="SBL_BOOT_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="BOARD_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="FATFS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="UART_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="NWAL_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="BOARD_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="SPI_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                </macros>
                                <externalSettings/>
index f34af2177e3d78fc973655584902c3be9166519a..13c729082d722587929cc555f907a2e70ea2d48a 100644 (file)
@@ -46,11 +46,16 @@ SECTIONS
 {
     .globalSection :
     {
-        *(.globalSectionPafAstConfig)
-        *(.globalSectionAcpStdBetaTable)
-        *(.globalSectionAcpCusBetaTable)
-        *(.globalSectionAcpCusPhiTable)
-        *(.globalSectionAcpCusSigmaTable)
+        *(.commonSectionPafAsdtConfig)
+    } > HOST_DDR3
+    
+    .commonSection :
+    {
+        *(.commonSectionPafAstConfig)
+        *(.commonSectionAcpStdBetaTable)
+        *(.commonSectionAcpCusBetaTable)
+        *(.commonSectionAcpCusPhiTable)
+        *(.commonSectionAcpCusSigmaTable)
     } > COMMON_DDR3
     
     .capBufSection (NOLOAD):
index 993a2a82157b2b1957236a7923443a78ec8ebc0b..73bf82f33e4470c44222811b9e98444408dbad09 100644 (file)
@@ -85,15 +85,19 @@ extern struct {
 extern const char AFChanPtrMap[PAF_MAXNUMCHAN+1][PAF_MAXNUMCHAN];
 extern PAF_ChannelConfigurationMaskTable PAF_ASP_stdCCMT;
 
-// Global debug counters */
-extern Uint32 gTaskAsdpCnt; // debug counter for ASDP task
+// ASDT configuration
+PAF_ASDT_Config gPAF_ASDT_config 
+__attribute__ ((section(".globalSectionPafAsdtConfig"))) = {
+    NULL,
+    &gPAF_AST_config
+};
 
 PAF_AudioFrame *gpDecAudioFrame=NULL;
 PAF_AudioData  *gDecAudioFrameChannelPointers[PAF_MAXNUMCHAN_AF];
 PAF_AudioSize  gDecAudioFrameChannelSizes[PAF_MAXNUMCHAN_AF];
 PAF_AudioData  *gDecOrigAudioFrameChannelPointers[PAF_MAXNUMCHAN_AF];
 
-// Debug counters
+// Global debug counters */
 UInt32 gSlaveStartErrCnt        =0;
 UInt32 gSlaveStartCnt           =0;
 UInt32 gSlaveSourceSelectCnt    =0;
@@ -113,11 +117,12 @@ UInt32 gSlaveDecDeactivateCnt   =0;
  */
 Void taskAsdpFxn(
 //    Int betaPrimeValue, // FL: revisit
-    const PAF_AST_Params *pP,
-    const PAF_AST_Patchs *pQ
+    const PAF_ASDT_Params *pP,
+    const PAF_ASDT_Patchs *pQ
 )
 {
-    PAF_AST_Config *pC;             /* Local configuration pointer */
+    PAF_ASDT_Config *pC;            /* Local configuration pointer */
+    PAF_AST_Config *pAstCfg;        /* Common (shared) configuration pointer */
     Int as;                         /* Audio Stream Number (1, 2, etc.) */
     Int z;                          /* input/encode/stream/decode/output counter */
     Int i;                          /* phase */
@@ -197,8 +202,9 @@ Void taskAsdpFxn(
     //
     // Audio Framework Configuration (*pC):
     //
-    pC = &gPAF_AST_config;
-    as = pC->as; // obtain audio stream number
+    pC = &gPAF_ASDT_config;
+    pAstCfg = pC->pAstCfg;
+    as = pAstCfg->as; // obtain audio stream number
     TRACE_TERSE1("TaskAsdp: Started with AS%d.", as);
     
     //
@@ -211,8 +217,8 @@ Void taskAsdpFxn(
     LINNO_RPRT(TaskAsdp, -1);
 
     // Get decoder and stream index associated with the master input
-    zMD = pC->masterDec;
-    zMS = pC->masterStr;
+    zMD = pAstCfg->masterDec;
+    zMS = pAstCfg->masterStr;
 
     // 
     // Initialize per parameterized phases.
@@ -220,6 +226,10 @@ Void taskAsdpFxn(
     //   - Common: Common Algorithm Initialization
     //   - AlgKey: Dec/Enc chain to Array Initialization
     //   - Unused: (available)
+    //   - Unused: (available)
+    //   - Unused: (available)
+    //   - Unused: (available)
+    //   - Unused: (available)
     //
     LINNO_RPRT(TaskAsdp, -2);
     for (i=0; i < lengthof(pP->fxns->initPhase); i++)
@@ -317,9 +327,9 @@ Void taskAsdpFxn(
         
         for (z=DECODE1; z < DECODEN; z++)
         {
-            alg[z] = pC->xDec[z].decAlg[PAF_SOURCE_PCM];
+            alg[z] = pAstCfg->xDec[z].decAlg[PAF_SOURCE_PCM];
         }
-        alg[zMD] = pC->xDec[zMD].decAlg[sourceSelect];
+        alg[zMD] = pAstCfg->xDec[zMD].decAlg[sourceSelect];
 
         // FL: debug, reset IB capture buffer
         //capIbReset();
@@ -437,7 +447,7 @@ Void taskAsdpFxn(
                     }
 
                     // Start writes to circular buffer
-                    pCb = &pC->xDecOpCb[z];
+                    pCb = &pAstCfg->xDecOpCb[z];
                     cbErrno = cbWriteStart(pCb);
                     if (cbErrno < 0)
                     {
@@ -475,7 +485,7 @@ Void taskAsdpFxn(
                     errno = 0;
                     if (dec->fxns->reset)
                     {
-                        errno = dec->fxns->reset(dec, NULL, &pC->xDec[z].decodeControl, &pC->xDec[z].decodeStatus);
+                        errno = dec->fxns->reset(dec, NULL, &pAstCfg->xDec[z].decodeControl, &pAstCfg->xDec[z].decodeStatus);
                     }
 
                     // write back Dec configuration
@@ -539,7 +549,7 @@ Void taskAsdpFxn(
                     errno = 0;
                     if (dec->fxns->info)
                     {
-                        errno = dec->fxns->info(dec, NULL, &pC->xDec[z].decodeControl, &pC->xDec[z].decodeStatus);
+                        errno = dec->fxns->info(dec, NULL, &pAstCfg->xDec[z].decodeControl, &pAstCfg->xDec[z].decodeStatus);
                     }
                     
                     // write back Dec configuration
@@ -548,7 +558,7 @@ Void taskAsdpFxn(
                     
                     // Re-initialize audio frame if decoder is disabled or 
                     // doesn't have a valid input 
-                    if (!pC->xDec[z].decodeStatus.mode || !pC->xInp[zI].hRxSio)
+                    if (!pAstCfg->xDec[z].decodeStatus.mode || !pAstCfg->xInp[zI].hRxSio)
                     {
                         pP->fxns->initFrame1(pP, pQ, pC, z, 0);
                     }
@@ -596,9 +606,9 @@ Void taskAsdpFxn(
                     if (dec->fxns->decode)
                     {
                         // FL: debug, capture input buffer
-                        //capIb(pC->xInp[z].pInpBuf);
+                        //capIb(pAstCfg->xInp[z].pInpBuf);
                     
-                        errno = dec->fxns->decode(dec, NULL, &pC->xDec[z].decodeInStruct, &pC->xDec[z].decodeOutStruct);
+                        errno = dec->fxns->decode(dec, NULL, &pAstCfg->xDec[z].decodeInStruct, &pAstCfg->xDec[z].decodeOutStruct);
                         if (errno < 0)
                         {
                             SW_BREAKPOINT;
@@ -606,10 +616,10 @@ Void taskAsdpFxn(
                         //TRACE_TERSE0("Dec:decode done");
                         
                         // copy decoder output to decoder output circular buffers
-                        pCb = &pC->xDecOpCb[z];
+                        pCb = &pAstCfg->xDecOpCb[z];
                         //TRACE_TERSE1("Dec:pCb=0x%04x", (IArg)pCb);
                         
-                        pAfWrt = pC->xDec[z].decodeOutStruct.pAudioFrame;
+                        pAfWrt = pAstCfg->xDec[z].decodeOutStruct.pAudioFrame;
                         //TRACE_TERSE1("Dec:pAfWrt=0x%04x", (IArg)pAfWrt);
                         //TRACE_TERSE1("nSamples=%d",pAfWrt->data.nSamples);
                         
@@ -636,7 +646,7 @@ Void taskAsdpFxn(
                     
                     // Re-initialize audio frame if decoder is disabled or 
                     // doesn't have a valid input 
-                    if (!pC->xDec[z].decodeStatus.mode || !pC->xInp[zI].hRxSio)
+                    if (!pAstCfg->xDec[z].decodeStatus.mode || !pAstCfg->xInp[zI].hRxSio)
                     {
                         pP->fxns->initFrame1(pP, pQ, pC, z, 0);
                     }
@@ -674,7 +684,7 @@ Void taskAsdpFxn(
                     }
                     
                     // Stop writes to circular buffer
-                    pCb = &pC->xDecOpCb[z];
+                    pCb = &pAstCfg->xDecOpCb[z];
                     cbErrno = cbWriteStop(pCb);
                     if (cbErrno < 0)
                     {
@@ -725,15 +735,20 @@ Void taskAsdpFxn(
 //
 Int
 PAF_ASDT_initPhaseMalloc(
-    const PAF_AST_Params *pP, 
-    const PAF_AST_Patchs *pQ, 
-    PAF_AST_Config *pC
+    const PAF_ASDT_Params *pP, 
+    const PAF_ASDT_Patchs *pQ, 
+    PAF_ASDT_Config *pC
 )
 {
-    Int as = pC->as;                    /* Audio Stream Number (1, 2, etc.) */
-    Int zMS = pC->masterStr;
-    Error_Block    eb;
-
+    PAF_AST_Config *pAstCfg;
+    Int as;                     /* Audio Stream Number (1, 2, etc.) */
+    Int zMS;
+    Error_Block eb;
+
+    pAstCfg = pC->pAstCfg; // get pointer to common (shared) configuration
+    as = pAstCfg->as;
+    zMS = pAstCfg->masterStr;
+    
     TRACE_TERSE1("PAF_ASDT_initPhaseMalloc: AS%d: initialization phase - memory allocation", as+zMS);
 
     // Initialize error block
@@ -772,22 +787,31 @@ PAF_ASDT_initPhaseMalloc(
 
 Int
 PAF_ASDT_initPhaseConfig(
-    const PAF_AST_Params *pP, 
-    const PAF_AST_Patchs *pQ, 
-    PAF_AST_Config *pC
+    const PAF_ASDT_Params *pP, 
+    const PAF_ASDT_Patchs *pQ, 
+    PAF_ASDT_Config *pC
 )
 {
+    PAF_AST_Config *pAstCfg;
+    Int as;                    /* Audio Stream Number (1, 2, etc.) */
+    Int zMS;
     Int z;
 
+    pAstCfg = pC->pAstCfg; // get pointer to common (shared) configuration
+    as = pAstCfg->as;
+    zMS = pAstCfg->masterStr;
+    
+    TRACE_TERSE1("PAF_ASDT_initPhaseConfig: AS%d: initialization phase - configuration", as+zMS);
+
     // overwrite pointer to audio frame in framework decode control
     for (z=DECODE1; z < DECODEN; z++) 
     {
         //Int zS = pP->streamsFromDecodes[z]; // FL: formerly on master
         //pC->xDec[z].decodeControl.pAudioFrame = pC->xStr[zS].pAudioFrame; FL: formerly on master
         //pC->xDec[z].decodeInStruct.pAudioFrame = pC->xStr[zS].pAudioFrame; FL: formerly on master
-        pC->xDec[z].decodeControl.pAudioFrame = &gpDecAudioFrame[z];
-        pC->xDec[z].decodeInStruct.pAudioFrame = &gpDecAudioFrame[z];
-        pC->xDec[z].decodeStatus = *pP->z_pDecodeStatus[z];
+        pAstCfg->xDec[z].decodeControl.pAudioFrame = &gpDecAudioFrame[z];
+        pAstCfg->xDec[z].decodeInStruct.pAudioFrame = &gpDecAudioFrame[z];
+        pAstCfg->xDec[z].decodeStatus = *pP->z_pDecodeStatus[z];
         pP->fxns->initFrame0(pP, pQ, pC, z);
     }
 
@@ -811,94 +835,46 @@ PAF_ASDT_initPhaseConfig(
 //
 Int
 PAF_ASDT_initPhaseAcpAlg(
-    const PAF_AST_Params *pP, 
-    const PAF_AST_Patchs *pQ, 
-    PAF_AST_Config *pC
+    const PAF_ASDT_Params *pP, 
+    const PAF_ASDT_Patchs *pQ, 
+    PAF_ASDT_Config *pC
 )
 {
-    Int as = pC->as;                    /* Audio Stream Number (1, 2, etc.) */
-    Int z;                              /* input/encode/stream/decode/output */
-                                        /* counter                           */
+    PAF_AST_Config *pAstCfg;
+    Int as;                    /* Audio Stream Number (1, 2, etc.) */
+    Int z;                     /* input/encode/stream/decode/output counter */
     Int betaPrimeOffset;
     ACP_Handle acp;
-    Int zMS = pC->masterStr;
+    Int zMS;
     Int zS; //, zX;
 
+    pAstCfg = pC->pAstCfg; // get pointer to common (shared) configuration
+    as = pAstCfg->as;
+    zMS = pAstCfg->masterStr;    
+
     TRACE_TERSE1("PAF_ASDT_initPhaseAcpAlg: AS%d: initialization phase - ACP Algorithm", as+zMS);
 
     ACP_MDS_init();
 
-    if (!(acp = (ACP_Handle )ACP_MDS_create (NULL))) 
+    if (!(acp = (ACP_Handle)ACP_MDS_create(NULL))) 
     {
         TRACE_TERSE1("PAF_ASDT_initPhaseAcpAlg: AS%d: ACP algorithm instance creation  failed", as+zMS);
         return __LINE__;
     }
-    pC->acpSlave = acp;
+    pC->acp = acp;
 
     ((ALG_Handle)acp)->fxns->algControl((ALG_Handle)acp,
         ACP_GETBETAPRIMEOFFSET, (IALG_Status *)&betaPrimeOffset);
 
-#if 0 // FL: master
-    for (z=INPUT1; z < INPUTN; z++) 
-    {
-        zS = z;
-        for (zX = DECODE1; zX < DECODEN; zX++) 
-        {
-            if (pP->inputsFromDecodes[zX] == z) 
-            {
-                zS = pP->streamsFromDecodes[zX];
-                break;
-            }
-        }
-        acp->fxns->attach(acp, ACP_SERIES_STD,
-            STD_BETA_IB + betaPrimeOffset * (as-1+zS),
-            (IALG_Status *)&pC->xInp[z].inpBufStatus);
-        /* Ignore errors, not reported. */
-    }
-#endif
-
     for (z=DECODE1; z < DECODEN; z++) 
     {
         zS = pP->streamsFromDecodes[z];
         acp->fxns->attach(acp, ACP_SERIES_STD,
             STD_BETA_DECODE + betaPrimeOffset * (as-1+zS),
-            (IALG_Status *)&pC->xDec[z].decodeStatus);
+            (IALG_Status *)&pAstCfg->xDec[z].decodeStatus);
         /* Ignore errors, not reported. */
     }
 
-#if 0 // FL: master
-    for (z=ENCODE1; z < ENCODEN; z++) 
-    {
-        zS = pP->streamsFromEncodes[z];
-        acp->fxns->attach(acp, ACP_SERIES_STD,
-            STD_BETA_ENCODE + betaPrimeOffset * (as-1+zS),
-            (IALG_Status *)&pC->xEnc[z].encodeStatus);
-        acp->fxns->attach(acp, ACP_SERIES_STD,
-            STD_BETA_VOLUME + betaPrimeOffset * (as-1+zS),
-            (IALG_Status *)&pC->xEnc[z].volumeStatus);
-        /* Ignore errors, not reported. */
-    }
-#endif
-    
-#if 0 // FL: master
-    for (z=OUTPUT1; z < OUTPUTN; z++) 
-    {
-        zS = z;
-        for (zX = ENCODE1; zX < ENCODEN; zX++) 
-        {
-            if (pP->outputsFromEncodes[zX] == z) 
-            {
-                zS = pP->streamsFromEncodes[zX];
-                break;
-            }
-        }
-        acp->fxns->attach(acp, ACP_SERIES_STD,
-            STD_BETA_OB + betaPrimeOffset * (as-1+zS),
-            (IALG_Status *)&pC->xOut[z].outBufStatus);
-        /* Ignore errors, not reported. */
-    }
-#endif
-    
     TRACE_TERSE1("PAF_ASDT_initPhaseAcpAlg: AS%d: initialization phase - ACP Algorithm complete.", as+zMS);
 
     return 0;
@@ -929,19 +905,24 @@ PAF_ASDT_initPhaseAcpAlg(
 
 Int
 PAF_ASDT_initPhaseCommon(
-    const PAF_AST_Params *pP, 
-    const PAF_AST_Patchs *pQ, 
-    PAF_AST_Config *pC
+    const PAF_ASDT_Params *pP, 
+    const PAF_ASDT_Patchs *pQ, 
+    PAF_ASDT_Config *pC
 )
 {
-    Int as = pC->as;                    /* Audio Stream Number (1, 2, etc.) */
-    Int z;                              /* stream counter */
-    //Int g;                              /* gear */
-    ACP_Handle acp = pC->acpSlave;
+    PAF_AST_Config *pAstCfg;
+    Int as;                         /* Audio Stream Number (1, 2, etc.) */
+    Int z;                          /* stream counter */
+    //Int g;                        /* gear */
+    ACP_Handle acp;
     PAF_IALG_Config pafAlgConfig;
     IALG_MemRec common[3][PAF_IALG_COMMON_MEMN+1];
    
-    TRACE_TERSE0("PAF_ASDT_initPhaseCommon: initialization phase - Common Algorithms");
+    acp = pC->acp; // get acp handle
+    pAstCfg = pC->pAstCfg; // get pointer to common (shared) configuration
+    as = pAstCfg->as;
+    
+    TRACE_TERSE0("PAF_ASDT_initPhaseCommon: initialization phase - Common Memory");
 
     //
     // Determine memory needs and instantiate algorithms across audio streams
@@ -980,18 +961,6 @@ PAF_ASDT_initPhaseCommon(
             }
         }
 
-#if 0 // FL: master
-        zE = -1;
-        for (zX = ENCODE1; zX < ENCODEN; zX++) 
-        {
-            if (pP->streamsFromEncodes[zX] == z) 
-            {
-                zE = zX;
-                break;
-            }
-        }
-#endif
-
         if (zD >= 0) 
         {
             TRACE_TERSE1("PAF_ASDT_initPhaseCommon: calling PAF_ALG_ALLOC for decoder common[%d].", z);
@@ -1023,63 +992,6 @@ PAF_ASDT_initPhaseCommon(
             pP->fxns->allocPrint((const PAF_ALG_AllocInit *)(aspLinkInit[z-STREAM1][0]), sizeof (*(aspLinkInit[z-STREAM1][0])), &pafAlgConfig);
 #endif
         
-#if 0 // FL: master
-        if (zE >= 0) 
-        {
-            TRACE_TERSE3("%s.%d: calling PAF_ALG_ALLOC/ for encoder common[%d].", (IArg)__FUNCTION__, __LINE__, z);
-            if (PAF_ALG_ALLOC (encLinkInit[zE-ENCODE1], common[z])) 
-            {
-                TRACE_TERSE3("AS%d: %s.%d: PAF_ALG_alloc failed",
-                             as+z, (IArg)__FUNCTION__, __LINE__);
-                SW_BREAKPOINT;
-                return __LINE__;
-            }
-            TRACE_TERSE3("alloced %d bytes from space %d at 0x%x", common[z]->size, common[z]->space, (IArg)common[z]->base);
-            if(pP->fxns->allocPrint)
-                pP->fxns->allocPrint((const PAF_ALG_AllocInit *)(encLinkInit[z-ENCODE1]), sizeof (*(encLinkInit[z-ENCODE1])), &pafAlgConfig);
-        }
-#endif
-
-        //
-        // Determine common memory needs of Logical IO drivers
-        //
-
-#if 0 // FL: master
-        // really need to loop over all inputs for this stream using the tables
-        // inputsFromDecodes and streamsFromDecodes. But these don't exist for this
-        // patch, and not needed for FS11, since there is only one input.
-        if (INPUT1 <= z && z < INPUTN) 
-        {
-            TRACE_TERSE3("AS%d: PAF_AST_initPhaseCommon.%d: alloc inpLinkInit common[%d]", as+z, __LINE__, z);
-            if (PAF_ALG_ALLOC (inpLinkInit[z-INPUT1], common[z])) 
-            {
-                TRACE_TERSE3("AS%d: %s.%d: PAF_ALG_alloc failed", as+z, (IArg)__FUNCTION__, __LINE__);
-                TRACE_TERSE2("failed to alloc %d bytes from space %d", common[z]->size, (IArg)common[z]->space);
-                SW_BREAKPOINT;
-                return __LINE__;
-            }
-            TRACE_TERSE3("alloced %d bytes from space %d at 0x%x", common[z]->size, common[z]->space, (IArg)common[z]->base);
-            if(pP->fxns->allocPrint)
-                pP->fxns->allocPrint((const PAF_ALG_AllocInit *)(inpLinkInit[z-INPUT1]), sizeof (*(inpLinkInit[z-INPUT1])), &pafAlgConfig);
-        }
-#endif        
-
-#if 0 // FL: master
-        if (OUTPUT1 <= z && z < OUTPUTN) 
-        {
-            TRACE_TERSE3("%s.%d: calling PAF_ALG_ALLOC outLinkInit common[%d].", (IArg)__FUNCTION__, __LINE__, z);
-            if (PAF_ALG_ALLOC (outLinkInit[z-OUTPUT1], common[z])) 
-            {
-                TRACE_TERSE3("AS%d: %s.%d: PAF_ALG_alloc failed", as+z, (IArg)__FUNCTION__, __LINE__);
-                TRACE_TERSE2("Failed to alloc %d bytes from space %d", common[z]->size, (IArg)common[z]->space);
-                SW_BREAKPOINT;
-                return __LINE__;
-            }
-            TRACE_TERSE3("alloced %d bytes from space %d at 0x%x", common[z]->size, common[z]->space, (IArg)common[z]->base);
-            if(pP->fxns->allocPrint)
-                pP->fxns->allocPrint((const PAF_ALG_AllocInit *)(outLinkInit[z-INPUT1]), sizeof (*(outLinkInit[z-INPUT1])), &pafAlgConfig);
-        }
-#endif        
     }
     {
         // Changes made to share scratch between zones
@@ -1113,18 +1025,6 @@ PAF_ASDT_initPhaseCommon(
            }
         }
 
-#if 0 // FL: master
-        zE = -1;
-        for (zX = ENCODE1; zX < ENCODEN; zX++) 
-        {
-           if (pP->streamsFromEncodes[zX] == z) 
-           {
-               zE = zX;
-               break;
-           }
-        }
-#endif
-
         TRACE_TERSE0("PAF_ASDT_initPhaseCommon: calling PAF_ALG_mallocMemory for common space.");
         if (PAF_ALG_mallocMemory (common[z], &pafAlgConfig)) 
         {
@@ -1147,7 +1047,7 @@ PAF_ASDT_initPhaseCommon(
             PAF_ASP_Chain *chain;
             TRACE_TERSE0("PAF_ASDT_initPhaseCommon: calling PAF_ASP_chainInit for decode.");
             chain =
-                PAF_ASP_chainInit (&pC->xDec[zD].decChainData, pP->pChainFxns,
+                PAF_ASP_chainInit (&pAstCfg->xDec[zD].decChainData, pP->pChainFxns,
                                    HEAP_INTERNAL, as+z, acp, &trace,
                                    decLinkInit[zD-DECODE1], NULL, common[z], &pafAlgConfig);
             if (!chain) 
@@ -1177,59 +1077,6 @@ PAF_ASDT_initPhaseCommon(
         }
 #endif
 
-#if 0 // FL: master
-        if (zE >= 0) 
-        {
-            PAF_ASP_Chain *chain;
-            TRACE_TERSE2("%s.%d: calling PAF_ASP_chainInit for encode.", (IArg)__FUNCTION__, __LINE__);
-            chain =
-                PAF_ASP_chainInit (&pC->xEnc[zE].encChainData, pP->pChainFxns,
-                                   HEAP_INTERNAL, as+z, acp, &trace,
-                                   encLinkInit[zE-ENCODE1], NULL, common[z], &pafAlgConfig);
-            if (!chain) 
-            {
-                TRACE_TERSE1("AS%d: Encode chain initialization failed", as+z);
-                return __LINE__;
-            }
-        }
-#endif
-
-#if 0 // FL: master
-        //
-        // Allocate non-common memories for Logical IO drivers
-        //    Since these structures are used at run-time we allocate from external memory
-        if (INPUT1 <= z && z < INPUTN) 
-        {
-            PAF_ASP_Chain *chain;
-            TRACE_TERSE3("AS%d: PAF_AST_initPhaseCommon.%d: non-common input chain init for %d",
-                           as+z, __LINE__, z);
-            chain = PAF_ASP_chainInit (&pC->xInp[z].inpChainData, pP->pChainFxns,
-                    HEAP_EXTERNAL, as+z, acp, &trace,
-                    inpLinkInit[z-INPUT1], NULL, common[z], &pafAlgConfig);
-            if (!chain) 
-            {
-                TRACE_TERSE1("AS%d: Input chain initialization failed", as+z);
-                return __LINE__;
-            }
-        }
-#endif        
-
-#if 0 // FL: master
-        if (OUTPUT1 <= z && z < OUTPUTN) 
-        {
-            PAF_ASP_Chain *chain;
-            TRACE_TERSE3("AS%d: PAF_AST_initPhaseCommon.%d: non-common output chain init for %d",
-                           as+z, __LINE__, z);
-            chain = PAF_ASP_chainInit (&pC->xOut[z].outChainData, pP->pChainFxns,
-                    HEAP_EXTERNAL, as+z, acp, &trace,
-                    outLinkInit[z-OUTPUT1], NULL, common[z], &pafAlgConfig);
-            if (!chain) 
-            {
-                TRACE_TERSE1("AS%d: Output chain initialization failed", as+z);
-                return __LINE__;
-            }
-        }
-#endif        
     }
     TRACE_TERSE1("PAF_ASDT_initPhaseCommon: AS%d: Returning complete.", as+z);
 
@@ -1252,18 +1099,22 @@ PAF_ASDT_initPhaseCommon(
 // .............................................................................
 Int
 PAF_ASDT_initPhaseAlgKey(
-    const PAF_AST_Params *pP, 
-    const PAF_AST_Patchs *pQ, 
-    PAF_AST_Config *pC
+    const PAF_ASDT_Params *pP, 
+    const PAF_ASDT_Patchs *pQ, 
+    PAF_ASDT_Config *pC
 )
 {
-    Int as = pC->as;                    /* Audio Stream Number (1, 2, etc.) */
-    Int z;                              /* decode/encode counter */
-    Int s;                              /* key number */
+    PAF_AST_Config *pAstCfg;
+    Int as;                     /* Audio Stream Number (1, 2, etc.) */
+    Int z;                      /* decode/encode counter */
+    Int s;                      /* key number */
     PAF_ASP_Link *that;
 
     (void)as;  // clear warning.
 
+    pAstCfg = pC->pAstCfg; // get pointer to common (shared) configuration
+    as = pAstCfg->as;
+    
     TRACE_VERBOSE1("PAF_ASDT_initPhaseAlgKey: AS%d: initialization phase - Algorithm Keys", as);
 
     for (z=DECODE1; z < DECODEN; z++) 
@@ -1271,43 +1122,29 @@ PAF_ASDT_initPhaseAlgKey(
         for (s=0; s < pP->pDecAlgKey->length; s++) 
         {
             if ((pP->pDecAlgKey->code[s].full != 0)
-                && (that = PAF_ASP_chainFind (&pC->xDec[z].decChainData, pP->pDecAlgKey->code[s])))
+                && (that = PAF_ASP_chainFind (&pAstCfg->xDec[z].decChainData, pP->pDecAlgKey->code[s])))
             {
-                pC->xDec[z].decAlg[s] = (ALG_Handle )that->alg;
+                pAstCfg->xDec[z].decAlg[s] = (ALG_Handle )that->alg;
                     /* Cast in interface, for now --Kurt */
             }
             else
-                pC->xDec[z].decAlg[s] = NULL;
+                pAstCfg->xDec[z].decAlg[s] = NULL;
         }
     }
 
-#if 0 // FL: master
-    for (z=ENCODE1; z < ENCODEN; z++) 
-    {
-        for (s=0; s < pP->pEncAlgKey->length; s++) 
-        {
-            if (pP->pEncAlgKey->code[s].full != 0
-                && (that = PAF_ASP_chainFind (&pC->xEnc[z].encChainData, pP->pEncAlgKey->code[s])))
-                pC->xEnc[z].encAlg[s] = (ALG_Handle )that->alg;
-            /* Cast in interface, for now --Kurt */
-            else
-                pC->xEnc[z].encAlg[s] = NULL;
-        }
-    }
-#endif    
-
     return 0;
 } //PAF_AST_initPhaseAlgKey
 
 Int
 PAF_ASDT_initFrame0(
-    const PAF_AST_Params *pP, 
-    const PAF_AST_Patchs *pQ, 
-    PAF_AST_Config *pC, 
+    const PAF_ASDT_Params *pP, 
+    const PAF_ASDT_Patchs *pQ, 
+    PAF_ASDT_Config *pC, 
     Int z
 )
 {
-    Int as = pC->as;                    /* Audio Stream Number (1, 2, etc.) */
+    PAF_AST_Config *pAstCfg;
+    Int as;                    /* Audio Stream Number (1, 2, etc.) */
     Int aLen;
     Int aSize = sizeof(PAF_AudioData);
     Int aAlign = aSize < sizeof (int) ? sizeof (int) : aSize;
@@ -1318,6 +1155,9 @@ PAF_ASDT_initFrame0(
     PAF_AudioFrame *pAudioFrame;
     Int i;
 
+    pAstCfg = pC->pAstCfg; // get pointer to common (shared) configuration
+    as = pAstCfg->as;
+
     pAudioFrame = &gpDecAudioFrame[z];
     if (pAudioFrame == NULL)
     {
@@ -1449,9 +1289,9 @@ PAF_ASDT_initFrame0(
 //
 Int
 PAF_ASDT_initFrame1(
-    const PAF_AST_Params *pP, 
-    const PAF_AST_Patchs *pQ, 
-    PAF_AST_Config *pC, 
+    const PAF_ASDT_Params *pP, 
+    const PAF_ASDT_Patchs *pQ, 
+    PAF_ASDT_Config *pC, 
     Int z, 
     Int apply
 )
@@ -1491,7 +1331,7 @@ PAF_ASDT_initFrame1(
 
 // Reset AF, invoked during decode ACTIVATE (during state=INIT on Master)
 Int resetAf(
-    const PAF_AST_Params *pP, 
+    const PAF_ASDT_Params *pP, 
     Int z, 
     Int sourceSelect
 )
index 243e16f4072524c35bc10b4c33afb2c6702111f8..2f3ccb48dce19dbc7ce42f77945b56d4ebd872d6 100644 (file)
@@ -46,34 +46,96 @@ All rights reserved.
 #include "audioStreamProc_patchs.h"
 #include "audioStreamProc_config.h"
 
-// Global debug counter */
-extern Uint32 gTaskAspSlaveCnt; // debug counter for ASP slave task
+struct PAF_ASDT_Params;
+struct PAF_ASDT_Patchs;
+struct PAF_ASDT_Config;
+
+// Audio Stream Decode Task (ASDT) parameters, functions
+typedef struct PAF_ASDT_Fxns {
+    Int (*initPhase[8]) (const struct PAF_ASDT_Params *, const struct PAF_ASDT_Patchs *, struct PAF_ASDT_Config *);
+    Int (*initFrame0) (const struct PAF_ASDT_Params *, const struct PAF_ASDT_Patchs *, struct PAF_ASDT_Config *, Int);
+    Int (*initFrame1) (const struct PAF_ASDT_Params *, const struct PAF_ASDT_Patchs *, struct PAF_ASDT_Config *, Int, Int);
+
+    // For RAM_report
+    Void (*headerPrint)();
+    Int  (*allocPrint)(const PAF_ALG_AllocInit *pInit, Int sizeofInit, PAF_IALG_Config *p);
+    Void (*commonPrint)(IALG_MemRec common[], PAF_IALG_Config *p);
+    Void (*bufMemPrint)(Int z, Int size, Int heapId, Int bufType);
+    Void (*memStatusPrint)(HeapMem_Handle hInternalHeap, HeapMem_Handle hInternal1Heap, HeapMem_Handle hExternalHeap, HeapMem_Handle hInternal1HeapShm);
+} PAF_ASDT_Fxns;
+
+// Audio Stream Decode Task (ASDT) parameters
+typedef struct PAF_ASDT_Params {
+    const PAF_ASDT_Fxns *fxns;
+    struct {
+        SmInt master;
+        SmInt decodes;
+        SmInt decode1;
+        SmInt decodeN;
+        SmInt streams;
+    } zone;
+    const SmInt *inputsFromDecodes;
+    struct {
+        int *pHeapIdIntern;   //int *pIntern;
+        int *pHeapIdExtern;   //int *pExtern;
+        int *pHeapIdFrmbuf;   //int *pFrmbuf;
+        int *pHeapIdIntern1;  //int *pIntern1;
+        int clear; 
+    } heap;
+    struct {
+        const IALG_MemSpace *space;
+    } common;
+    const SmInt *z_numchan;
+    MdInt framelength;
+    const PAF_AudioFunctions *pAudioFrameFunctions;
+    const struct PAF_ASP_ChainFxns *pChainFxns;
+    const PAF_DecodeStatus * const *z_pDecodeStatus;
+    const PAF_ASP_AlgKey *pDecAlgKey;
+    const SmInt *streamsFromDecodes;
+    const MdInt maxFramelength;
+    const PAF_MetadataBufStatus *pMetadataBufStatus;
+    const PAF_AudioFrameBufStatus *pAudioFrameBufStatus;
+} PAF_ASDT_Params;
+
+// Audio Stream Decode Task (ASDT) patchs
+typedef struct PAF_ASDT_Patchs {
+    const PAF_ASP_LinkInit * const (*i_decLinkInit);
+    const PAF_ASP_LinkInit * const (*i_aspLinkInit)[GEARS];
+} PAF_ASDT_Patchs;
+
+// Audio Stream Decode Task (ASDT) configuration
+typedef struct PAF_ASDT_Config 
+{
+    ACP_Handle     acp;
+    PAF_AST_Config *pAstCfg; // ASIT/ASOT/ASDT shared configuration
+} PAF_ASDT_Config;
+
 
 //   Purpose:   Audio Stream Decode Task Function for initialization of data pointers
 //              by allocation of memory.
 Int
 PAF_ASDT_initPhaseMalloc(
-    const PAF_AST_Params *pP, 
-    const PAF_AST_Patchs *pQ, 
-    PAF_AST_Config *pC
+    const PAF_ASDT_Params *pP, 
+    const PAF_ASDT_Patchs *pQ, 
+    PAF_ASDT_Config *pC
 );
 
 //   Purpose:   Audio Stream Decode Task Function for initialization of data values
 //              from parameters.
 Int
 PAF_ASDT_initPhaseConfig(
-    const PAF_AST_Params *pP, 
-    const PAF_AST_Patchs *pQ, 
-    PAF_AST_Config *pC
+    const PAF_ASDT_Params *pP, 
+    const PAF_ASDT_Patchs *pQ, 
+    PAF_ASDT_Config *pC
 );
 
 //   Purpose:   Audio Stream Decode Task Function for initialization of ACP by
 //              instantiation of the algorithm.
 Int
 PAF_ASDT_initPhaseAcpAlg(
-    const PAF_AST_Params *pP, 
-    const PAF_AST_Patchs *pQ, 
-    PAF_AST_Config *pC
+    const PAF_ASDT_Params *pP, 
+    const PAF_ASDT_Patchs *pQ, 
+    PAF_ASDT_Config *pC
 );
 
 //   Purpose:   Audio Stream Decode Task Function for initialization of data pointers
@@ -81,43 +143,43 @@ PAF_ASDT_initPhaseAcpAlg(
 //              algorithms.
 Int
 PAF_ASDT_initPhaseCommon(
-    const PAF_AST_Params *pP, 
-    const PAF_AST_Patchs *pQ, 
-    PAF_AST_Config *pC
+    const PAF_ASDT_Params *pP, 
+    const PAF_ASDT_Patchs *pQ, 
+    PAF_ASDT_Config *pC
 );
 
 //   Purpose:   Audio Stream Decode Task Function for initialization of data values
 //              from parameters for Algorithm Keys.
 Int 
 PAF_ASDT_initPhaseAlgKey(
-    const PAF_AST_Params *pP, 
-    const PAF_AST_Patchs *pQ, 
-    PAF_AST_Config *pC
+    const PAF_ASDT_Params *pP, 
+    const PAF_ASDT_Patchs *pQ, 
+    PAF_ASDT_Config *pC
 );
 
 Int
 PAF_ASDT_initFrame0(
-    const PAF_AST_Params *pP, 
-    const PAF_AST_Patchs *pQ, 
-    PAF_AST_Config *pC, 
+    const PAF_ASDT_Params *pP, 
+    const PAF_ASDT_Patchs *pQ, 
+    PAF_ASDT_Config *pC, 
     Int z
 );
 
-//   Purpose:   Audio Stream Task Function for initialization or reinitiali-
-//              zation of the Audio Frame(s) by loading of data values of a
+//   Purpose:   Audio Stream Task Function for initialization or reinitialization
+//              of the Audio Frame(s) by loading of data values of a
 //              time-varying nature.
 Int
 PAF_ASDT_initFrame1(
-    const PAF_AST_Params *pP, 
-    const PAF_AST_Patchs *pQ, 
-    PAF_AST_Config *pC, 
+    const PAF_ASDT_Params *pP, 
+    const PAF_ASDT_Patchs *pQ, 
+    PAF_ASDT_Config *pC, 
     Int z, 
     Int sourceSelect
 );
 
 // Reset AF, invoked during activate (INIT stage from Master)
 Int resetAf(
-    const PAF_AST_Params *pP, 
+    const PAF_ASDT_Params *pP, 
     Int z, 
     Int sourceSelect
 );
index 9b272fc69ab2ff299c5acb6c144bf127442475e1..ba46dc05d8f2be8598ac30bea4d77e1978dfba3c 100644 (file)
@@ -53,51 +53,23 @@ All rights reserved.
 //   Return:    N.A.
 //   Trace:     None.
 //
-const PAF_AST_Fxns PAF_ASDT_params_fxns =
+const PAF_ASDT_Fxns PAF_ASDT_params_fxns =
 {
     {   // initPhase[8]
-        PAF_ASDT_initPhaseMalloc,
-        PAF_ASDT_initPhaseConfig,
-        PAF_ASDT_initPhaseAcpAlg,
-        PAF_ASDT_initPhaseCommon,
-        PAF_ASDT_initPhaseAlgKey,
+        PAF_ASDT_initPhaseMalloc,           // initPhaseMalloc
+        PAF_ASDT_initPhaseConfig,           // initPhaseConfig
+        PAF_ASDT_initPhaseAcpAlg,           // initPhaseAcpAlg
+        PAF_ASDT_initPhaseCommon,           // initPhaseCommon
+        PAF_ASDT_initPhaseAlgKey,           // initPhaseAlgKey
         NULL,
         NULL,
         NULL
     },
     PAF_ASDT_initFrame0,                    // initFrame0
     PAF_ASDT_initFrame1,                    // initFrame1
-    NULL, //PAF_AST_passProcessing,         // passProcessing        
-    NULL, //PAF_AST_passProcessingCopy,     // passProcessingCopy    
-    NULL, //PAF_AST_autoProcessing,         // autoProcessing
-    NULL, //PAF_AST_decodeProcessing,       // decodeProcessing
-    NULL, //PAF_AST_decodeCommand,          // decodeCommand
-    NULL, //PAF_AST_encodeCommand,          // encodeCommand
-    NULL, //PAF_AST_decodeInit,             // decodeInit
-    NULL, //PAF_AST_decodeInfo,             // decodeInfo
-    NULL, //PAF_AST_decodeInfo1,            // decodeInfo1
-    NULL, //PAF_AST_decodeInfo2,            // decodeInfo2
-    NULL, //PAF_AST_decodeCont,             // decodeCont
-    NULL, //PAF_AST_decodeDecode,           // decodeDecode
-    NULL, //PAF_AST_decodeStream,           // decodeStream
-    NULL, //PAF_AST_decodeEncode,           // decodeEncode
-    NULL, //PAF_AST_decodeFinalTest,        // decodeFinalTest
-    NULL, //PAF_AST_decodeComplete,         // decodeComplete
-    NULL, //PAF_AST_selectDevices,          // selectDevices
-    NULL, //PAF_AST_sourceDecode,           // sourceDecode
-    NULL, //PAF_AST_startOutput,            // startOutput
-    NULL, //PAF_AST_stopOutput,             // stopOutput
-    NULL, //PAF_AST_setCheckRateX,          // setCheckRateX
-    NULL, //PAF_AST_streamChainFunction,    // streamChainFunction
-    NULL, //PAF_DEC_deviceAllocate,         // deviceAllocate
-    NULL, //PAF_DEC_deviceSelect,           // deviceSelect
-    NULL, //PAF_DEC_computeFrameLength,     // computeFrameLength
-    NULL, //PAF_DEC_updateInputStatus,      // updateInputStatus
-    NULL, // PAF_BUF_copy,                  // copy
-    NULL, /*headerPrint*/                   // headerPrint
-    NULL, /*allocPrint*/                    // allocPrint
-    NULL, /*commonPrint*/                   // commonPrint
-    NULL, /*bufMemPrint*/                   // bufMemPrint
-    NULL, /*memStatusPrint*/                // memStatusPrint
-    NULL, //PAF_ARC_controlRate,            // controlRate // For ARC                      
+    NULL,                                   // headerPrint
+    NULL,                                   // allocPrint
+    NULL,                                   // commonPrint
+    NULL,                                   // bufMemPrint
+    NULL                                    // memStatusPrint
 };
index 60cc09449c4c899e8d3c5ff75de7d98cea73ffee..2d37fb999d4bad142213b101c45082a79534b625 100644 (file)
@@ -11,8 +11,8 @@
                                        <stringMacro name="AIF2_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="CSL_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="MMCSD_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_1/packages"/>
                                        <stringMacro name="ICSS_EMAC_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_1/packages"/>
                                        <stringMacro name="USB_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="I2C_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="CPPI_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="IQN_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="PKTLIB_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="SRIO_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="PRUSS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="DFE_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="UART_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="SBL_BOOT_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="PRUSS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="FATFS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="BOARD_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="SBL_BOOT_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="UART_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="NWAL_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="BOARD_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="SPI_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                </macros>
                                <externalSettings/>
                                                                <option id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.DIAG_WRAP.844860326" name="Wrap diagnostic messages (--diag_wrap)" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.DIAG_WRAP.off" valueType="enumerated"/>
                                                                <option id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.INCLUDE_PATH.1905793105" 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;${CG_TOOL_ROOT}/include&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/oar/Source_Code/alpha&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/oar/Source_Code/alg&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/oar/Source_Code&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/bmda/Source_Code/alpha&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/bmda/Source_Code/alg&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/bmda/Source_Code&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/paf/pa/boards/d10/drivers&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PDK_INSTALL_PATH}/ti/drv/mcasp&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PDK_INSTALL_PATH}/ti/platform&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/test_dsp/mib&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/test_dsp/mob&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/test_dsp/sio_dev2&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/packages&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/paf/pa/dec/com&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/paf/pa/dec/dwr&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/paf/pa/dec/pcm1&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/shared&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/test_dsp/boards/k2g/drivers&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/ddp/Dolby_Digital_Plus_Decoder_Imp/Source_Code/alpha&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/oar/Source_Code/alpha&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/oar/Source_Code/alg&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/oar/Source_Code&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/bmda/Source_Code/alpha&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/bmda/Source_Code/alg&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${PROC_AUDIO_SDK_ROOT}/bmda/Source_Code&quot;"/>
                                                                </option>
                                                                <option id="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.ABI.1329388145" name="Application binary interface (coffabi not supported) [See 'General' page to edit] (--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.MEM_MODEL__DATA.1734581769" name="Data access model (--mem_model:data)" superClass="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.MEM_MODEL__DATA" value="com.ti.ccstudio.buildDefinitions.C6000_8.1.compilerID.MEM_MODEL__DATA.far_aggregates" valueType="enumerated"/>
                                        <stringMacro name="AIF2_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="CSL_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="MMCSD_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_1/packages"/>
                                        <stringMacro name="ICSS_EMAC_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_1/packages"/>
                                        <stringMacro name="USB_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="I2C_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="CPPI_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="IQN_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="PKTLIB_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="SRIO_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="PRUSS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="DFE_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="UART_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="SBL_BOOT_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="PRUSS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="FATFS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="BOARD_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="SBL_BOOT_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="UART_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="NWAL_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="BOARD_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="SPI_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                </macros>
                                <externalSettings/>
                                        <stringMacro name="AIF2_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="CSL_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="MMCSD_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="ICSS_EMAC_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_1/packages"/>
+                                       <stringMacro name="ICSS_EMAC_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="USB_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="I2C_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="IQN2_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="IQN_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="PKTLIB_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="SRIO_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="DFE_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="PRUSS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="FATFS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="SBL_BOOT_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="DFE_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="UART_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="NWAL_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="SBL_BOOT_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="FATFS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="BOARD_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="NWAL_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="SPI_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                </macros>
                                <externalSettings/>
                                        <stringMacro name="AIF2_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="CSL_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="MMCSD_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_1/packages"/>
                                        <stringMacro name="ICSS_EMAC_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_1/packages"/>
                                        <stringMacro name="USB_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="I2C_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="CPPI_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="IQN_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="PKTLIB_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="SRIO_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="PRUSS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="DFE_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="UART_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="SBL_BOOT_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="PRUSS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="FATFS_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
-                                       <stringMacro name="BOARD_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="SBL_BOOT_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="UART_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="NWAL_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
+                                       <stringMacro name="BOARD_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                        <stringMacro name="SPI_INSTALL_PATH" type="VALUE_PATH_DIR" value="C:/ti"/>
                                </macros>
                                <externalSettings/>
index 11943815e21ca93037fbf41c118dc7bfec9d35cc..127fcd6989a6f8cc0ceecf86356db99dbeaca128 100644 (file)
@@ -53,11 +53,11 @@ All rights reserved.
 SECTIONS
 {
     GROUP: {
-        .globalSectionPafAstConfig
-        .globalSectionAcpStdBetaTable
-        .globalSectionAcpCusBetaTable
-        .globalSectionAcpCusPhiTable
-        .globalSectionAcpCusSigmaTable
+        .commonSectionPafAstConfig
+        .commonSectionAcpStdBetaTable
+        .commonSectionAcpCusBetaTable
+        .commonSectionAcpCusPhiTable
+        .commonSectionAcpCusSigmaTable
     } > COMMON_DDR3
     
     .gCapIbPcmBuf   :> CORE0_DDR3
index 8bcf66445d86affa2397391df661422cfd8a5fc1..61f28f204ee742aeb757121fb4e68517545a739c 100644 (file)
@@ -3207,7 +3207,6 @@ PAF_ASIT_decodeComplete(
     Int argIdx;
     Int errno;                           /* error number */
     Int status;
-    PAF_AST_DecOpCircBuf *pCb;           /* decoder output circular buffer */
 
     (void)as;  // clear compiler warning in case not used with tracing disabled