PASDK-218:Pull from DEV_PASDK_BUILD55
authorFrank Livingston <frank-livingston@ti.com>
Fri, 28 Jul 2017 00:46:09 +0000 (19:46 -0500)
committerFrank Livingston <frank-livingston@ti.com>
Fri, 28 Jul 2017 00:46:09 +0000 (19:46 -0500)
1  2 
pasdk/test_dsp/framework/audioStreamInpProc.c
pasdk/test_dsp/framework/audioStreamInpProc.h

index e5d4e40213a62d9ff969e8844631cd6e18c5d6da,a15feb73041832158099bf58b4169bbef0e49105..1d509a4bfdb19e6278b1dec80bd094ad3f8fa37f
@@@ -796,10 -725,10 +745,11 @@@ Void taskAsipFxn
          // If no decoder selected then do nothing. Need to reset the sourceProgram, since
          // when no decoder is selected there are no calls to IB
          //if (errno = pP->fxns->autoProcessing(pP, pQ, pC, pC->xDec[zMD].decodeStatus.sourceSelect, pC->xDec[zMD].decAlg[PAF_SOURCE_PCM]))
-         
+         tempVar8 = sharedMemReadInt8(&(pAstCfg->xDec[zMD].decodeStatus.sourceSelect), 
+                                      GATEMP_INDEX_DEC);
          pfpBegin(PFP_ID_ASIT_1, pAsitCfg->taskHandle);  // PFP begin
          gNumPfpAsit1++;
 +        // (***) FL: re-visit, hard-coded to use FRAMELENGTH (pP->frameLength) inside function
          errno = pP->fxns->autoProcessing(pP, pQ, pAsitCfg, tempVar8, NULL);
          pfpEnd(PFP_ID_ASIT_1, PFP_FINISH_MEAS);         // PFP end
          gNumPfpAsit1--;
          Task_setPri(pAsitCfg->taskHandle, Task_getPri(pAsitCfg->taskHandle)+1);
  
          // FL: send dec exit message to slave
-         pAspMsg = (ASP_Msg *)MessageQ_alloc(hAspMsgMaster->heapId, hAspMsgMaster->msgSize); /* allocate message */
-         MessageQ_setReplyQueue(hAspMsgMaster->masterQue, (MessageQ_Msg)pAspMsg);            /* set the return address in the message header */
-         pAspMsg->cmd = ASP_SLAVE_DEC_EXIT;                                                  /* fill in message payload */
-         pAspMsg->procId = hAspMsgMaster->masterProcId;
-         pAspMsg->messageId = hAspMsgMaster->messageId & ~(1<<31);
-         pAspMsg->expectResp = TRUE;
-         TRACE_MSG2("Tx ASP message: procId=%d, cmd=%d.", pAspMsg->procId, pAspMsg->cmd);
-         status = MessageQ_put(hAspMsgMaster->slaveQue, (MessageQ_Msg)pAspMsg);              /* send message */
-         if (status != MessageQ_S_SUCCESS)
-         {
-             SW_BREAKPOINT;
-         }
-         // wait for dec exit complete message from slave
-         //do {
-         //    status = MessageQ_get(hAspMsgMaster->masterQue, (MessageQ_Msg *)&pAspMsg, MessageQ_FOREVER);
-         //} while ((status < 0) || (pAspMsg->cmd != ASP_MASTER_DEC_EXIT_DONE));
-         status = MessageQ_get(hAspMsgMaster->masterQue, (MessageQ_Msg *)&pAspMsg, MessageQ_FOREVER);
-         if (status != MessageQ_S_SUCCESS)
+         if( AspMsgSend(ASP_SLAVE_DEC_EXIT, ASP_MASTER_DEC_EXIT_DONE, NULL, NULL)
+             != ASP_MSG_NO_ERR)
          {
-             TRACE_TERSE0("MessageQ_get() failure.");
-             SW_BREAKPOINT; // temporary
-         }
-         if ((pAspMsg->procId != hAspMsgMaster->slaveProcId) || 
-             (pAspMsg->cmd != ASP_MASTER_DEC_EXIT_DONE) ||
-             (pAspMsg->messageId != (hAspMsgMaster->messageId | ((UInt32)1<<31))))
-         {
-             TRACE_TERSE3("ERROR: Rx ASP message: procId=%d, cmd=%d, messageId=0x%04x", pAspMsg->procId, pAspMsg->cmd, pAspMsg->messageId);
-             SW_BREAKPOINT;
-         }
-         hAspMsgMaster->messageId = (hAspMsgMaster->messageId + 1) & ~(1<<31);
-         TRACE_MSG3("Rx ASP message: procId=%d, cmd=%d, messageId=0x%04x", pAspMsg->procId, pAspMsg->cmd, pAspMsg->messageId);
-         // free the message
-         status = MessageQ_free((MessageQ_Msg)pAspMsg); /* free the message */
-         if (status != MessageQ_S_SUCCESS)
-         {
-             SW_BREAKPOINT;
+             TRACE_VERBOSE0("TaskAsip: error in sending DEC_EXIT message");
+             SW_BREAKPOINT;                
          }
      } // End of main processing loop for (;;)
      
 -    Log_info0("Exit taskAsipFxn()");
 +    //Log_info0("Exit taskAsipFxn()");
  }
  
  // -----------------------------------------------------------------------------
@@@ -2655,9 -2333,8 +2437,8 @@@ PAF_ASIT_decodeInit
      zMI = pP->zone.master;
      (void)as;  // clear compiler warning in case not used with tracing disabled
      
 -    pCbCtl = &pAsitCfg->pAspmCfg->decOpCircBufCtl; // get pointer to circular buffer control
 +    //pCbCtl = &pAsitCfg->pAspmCfg->decOpCircBufCtl; // get pointer to circular buffer control
  
- #ifdef NON_CACHE_STATUS
      // reset frameCount
      for (z=DECODE1; z < DECODEN; z++)
      {