Merge remote-tracking branch 'origin/dev_pasdk_frank_pasdk538UpdateIpcMessaging'...
authorJianzhong Xu <a0869574@ti.com>
Tue, 27 Feb 2018 21:07:25 +0000 (16:07 -0500)
committerJianzhong Xu <a0869574@ti.com>
Tue, 27 Feb 2018 21:07:25 +0000 (16:07 -0500)
1  2 
pasdk/test_dsp/.cproject
pasdk/test_dsp/framework/audioStreamInpDec.c
pasdk/test_dsp/framework/audioStreamInpProc.c
pasdk/test_dsp/framework/audioStreamInpProc.h
pasdk/test_dsp/framework/audioStreamInpProcNewIO.c
pasdk/test_dsp/framework/audioStreamOutInit.c
pasdk/test_dsp/framework/audioStreamOutProc.c

Simple merge
index 02b1cd2bb1ab181dba763e80c619044270f351e6,48af2d0ae107d09f9149c66ae34a3ab813df0458..680dd79bd303c102926d242b625954e930b7c1c0
@@@ -375,16 -381,14 +381,15 @@@ Void taskAsipFxnInit
      const PAF_ASIT_Patchs *pQ
  )
  {
-     PAF_ASIT_Config *pAsitCfg;      /* ASIT configuration pointer */
-     PAF_AST_Config *pAstCfg;        /* AST Common (shared) configuration pointer */
+     PAF_ASIT_Config *pAsitCfg;          // ASIT configuration pointer
+     PAF_AST_Config *pAstCfg;            // AST Common (shared) configuration pointer
 +    PAF_AST_IoInp *pInp;            /* Input I/O components */
-     Int as;                         /* Audio Stream Number (1, 2, etc.) */
-     Int z;                          /* input/encode/stream/decode/output counter */
-     Int i;                          /* phase */
+     AspMsgMaster_Handle hAspMsgMaster;  // ASIT message master handle    
+     Int as;                             // Audio Stream Number (1, 2, etc.)
+     Int z;                              // input/encode/stream/decode/output counter
+     Int i;                              // phase
      Int zMI, zMS, zX;
      Int size;
-     // Messaging
-     ASP_Msg *pAspMsg;
      Int status;
  
      Log_info0("Enter taskAsipFxnInit()");
index b613653c9934b3c5e9262f9082a9de13d479766b,65278a73dbc908b13ca3812f22da83c7ebea5c7b..7e4b482f81b7115a738d56b69dc9b0e69b5a2700
@@@ -156,18 -155,26 +156,19 @@@ extern PAF_ASIT_Config gPAF_ASIT_config
  extern const MdUns iecFrameLength[23];
  extern Ptr hMcaspRxChan;
  
- #define ASIT_EVTMSK_NONE        0x0
- #define ASIT_EVTMSK_INPDATA     0x1
- #define ASIT_EVTMSK_INFOACK     0x2
- #define ASIT_EVTMSK_DECACK      0x4
 -enum {
 -    ASIT_RESET,
 -    ASIT_SOURCE_DETECTION,
 -    ASIT_PCM_TRANSITION,
 -    ASIT_DECODE_PROCESSING
 -};
--
+ // temp for simulation
+ //#define ASIT_ALL_EVENTS (  ASIT_EVTMSK_INPDATA \
+ //                         + ASIT_EVTMSK_INFOACK \
+ //                         + ASIT_EVTMSK_DECACK )
  #define ASIT_ALL_EVENTS (  ASIT_EVTMSK_INPDATA \
-                          + ASIT_EVTMSK_INFOACK \
-                          + ASIT_EVTMSK_DECACK )
+                          + ASIT_EVTMSK_RXACK )
  
+ // temp for simulation
+ //#define ASIT_DEC_EVENTS (  ASIT_EVTMSK_INPDATA \
+ //                         + ASIT_EVTMSK_INFOACK \
+ //                         + ASIT_EVTMSK_DECACK )
  #define ASIT_DEC_EVENTS (  ASIT_EVTMSK_INPDATA \
-                          + ASIT_EVTMSK_INFOACK \
-                          + ASIT_EVTMSK_DECACK )
+                          + ASIT_EVTMSK_RXACK )
  
  #define ASIP_DEBUG
  
index 30380b2651897ec2a3884b1501fd09b5fbe36d19,008334b83c654a432d9ddeb78c39cd0daf17d1e1..9c7463b776211ce43612d71aa6397eac16779ed7
@@@ -245,11 -244,9 +245,12 @@@ Void taskAsopFxnInit
              HEAP_INTERNAL, HEAP_INTERNAL1, HEAP_EXTERNAL,
              HEAP_INTERNAL1_SHM, HEAP_EXTERNAL_SHM, HEAP_EXTERNAL_NONCACHED_SHM);
      }
 +
 +    pOut = &pAsotCfg->pIoOut[zMS];
 +    pOut->hMcaspChan = NULL;
  } /* taskAsopFxnInit */
  
+ #if 0
  // Create ASOT event object
  static Int asotCreateEvent(void)
  {