Merge branch 'dev_pasdk_frank_pasdk516AsotRefactoring' into dev_pasdk_pasdk29Integration
authorFrank Livingston <frank-livingston@ti.com>
Fri, 16 Feb 2018 23:02:23 +0000 (17:02 -0600)
committerFrank Livingston <frank-livingston@ti.com>
Fri, 16 Feb 2018 23:02:23 +0000 (17:02 -0600)
1  2 
pasdk/test_dsp/framework/audioStreamInpDec.c
pasdk/test_dsp/framework/audioStreamInpProc.h
pasdk/test_dsp/framework/audioStreamInpProcNewIO.c
pasdk/test_dsp/mib/mib.c

index 9dcad2802efaa57e7fcb0a262978240013cddc28,d2d2b4f2ba251fc2b230ddea2681e2d0fbf379ab..cc48d809c1e8f7b61042b22f8e5ee4d5da1a98e7
@@@ -693,30 -512,30 +692,29 @@@ Int decInfoSnd
          {
              TRACE_GEN2("PAF_ASIT_decodeInfo: AS%d: processing frame %d -- info", as+zS, pAsitCfg->inpDec.frame);
  
 -            if (errno = asipUpdateInputStatus(pInp[zI].pRxParams,
 +            if (errno = asitUpdateInputStatus(pInp[zI].pRxParams,
                                                &pAstCfg->xInp[zI].inpBufStatus,
                                                &pAstCfg->xInp[zI].inpBufConfig)) {
 -                TRACE_TERSE1("return error errno 0x%x.", errno);
 -                return errno;
 +                TRACE_TERSE1("asitUpdateInputStatus return error errno 0x%x.", errno);
 +                return DEC_ERR_INFO_SNDMSG;
              }
  
-             // debug, capture input buffer
-             //capIb(pAstCfg->xInp[zI].pInpBuf);
-             //gCapIb_cnt++;
+ #if 0 // debug
+             // capture input buffer
+             capIb(pAstCfg->xInp[zI].pInpBuf);
+             gCapIb_cnt++;
+ #endif
  
- #if 1
-             // (***) FL: revisit
              // write back Inp configuration
              Cache_wb(&pAstCfg->xInp[zI], sizeof(PAF_AST_InpBuf), Cache_Type_ALLD, 0);
              // write back Dec configuration
              Cache_wb(&pAstCfg->xDec[z], sizeof(PAF_AST_Decode), Cache_Type_ALLD, 0);
              Cache_wait();
- #endif
  
-             // FL: send info message to slave
+             // send info message to slave
              argIdx = 0; // set decIdx
              *(Int32 *)&decMsgBuf[argIdx] = z;
 -            if(AspMsgSend(ASP_SLAVE_DEC_INFO, ASP_MASTER_DEC_INFO_DONE,
 -                          decMsgBuf, decMsgBuf) != ASP_MSG_NO_ERR)
 +            if(AspMsgSnd(ASP_SLAVE_DEC_INFO, decMsgBuf) != ASP_MSG_NO_ERR)
              {
                  TRACE_TERSE0("decodeInfo: error in sending DEC_INFO message ");
                  SW_BREAKPOINT; // temporary
@@@ -800,13 -550,10 +798,10 @@@ Int decInfoAck
              // invalidate Dec configuration
              Cache_inv(&pAstCfg->xDec[z], sizeof(PAF_AST_Decode), Cache_Type_ALLD, 0);
              Cache_wait();
- #endif
  
              if (errno) {
 -                TRACE_TERSE1("return error errno 0x%x.", errno);
 -                return errno;
 +                TRACE_TERSE1("decInfoAck return error errno 0x%x.", errno);
 +                return DEC_ERR_INFO_ACKMSG;
              }
  
              // increment decoded frame count
index 9275da7d2bd0a2690ddceb1e3f8a60602a658614,3afb532b2621401c4e757f293791bfe528f29b3e..3db43196fd95135dd0c57e1df4c8330596d30a81
@@@ -182,11 -160,11 +182,14 @@@ enum 
  int asipLoopCount1, asipLoopCount2;
  Int asipErrno;
  Int inputReadyForProcessing;
+ // FL: debug
+ #include "evmc66x_gpio_dbg.h"
  #endif
  
 +Event_Handle asitEvent;
 +Int eventsOn;
 +
  /*
   *  ======== taskAsipFxn ========
   *  Audio Stream Input Processing task function
Simple merge