Merge remote-tracking branch 'origin/PASDK-136-new-i-o-integration-into-pasdk-1-x...

diff --git a/pasdk/test_dsp/framework/audioStreamInpDec.c b/pasdk/test_dsp/framework/audioStreamInpDec.c
index e6c962e1195183d913984f5fa0a549683ed9df10..0e65ea2673842506c11d1e74d60fd56a6d7b2d30 100644 (file)
--- a/pasdk/test_dsp/framework/audioStreamInpDec.c
+++ b/pasdk/test_dsp/framework/audioStreamInpDec.c
@@ -83,11 +83,6 @@ static Int decDecodeFinalTest(const PAF_ASIT_Params *pP, const PAF_ASIT_Patchs *
                               PAF_ASIT_Config *pAsitCfg);
 Int decCheckMajorAu(PAF_AST_Config *pAstCfg);
 
-#if 0
-Int AspMsgSnd(UInt32 sndCmd, char *sndMsgBuf);
-Int AspMsgAck(UInt32 ackCmd, char *ackMsgBuf);
-#endif
-
 extern UInt32 gCbWrtAfErrCnt;
 
 
@@ -1062,108 +1057,6 @@ static Int decDecodeAck(const PAF_ASIT_Params *pP, const PAF_ASIT_Patchs *pQ,
 } /* decDecodeAck */
 
 
-#if 0
-/************************************************************************************
- * ASP message sending function. Refer to aspMsg_master.h for detailed description.
-************************************************************************************/
-Int AspMsgSnd(UInt32 sndCmd, char *sndMsgBuf)
-{
-    ASP_Msg* pAspMsg;                   /* Messaging */
-    Int status;
-
-    // allocate message
-    pAspMsg = (ASP_Msg *)MessageQ_alloc(hAspMsgMaster->heapId, hAspMsgMaster->msgSize);
-    if (pAspMsg == NULL) {
-        TRACE_TERSE0("MessageQ_alloc() failure.");
-        return (ASP_MSG_ERR_QUEUE_ALLOC);
-    }
-
-    // set the return address in the message header and fill in message payload
-    MessageQ_setReplyQueue(hAspMsgMaster->masterQue, (MessageQ_Msg)pAspMsg);
-    pAspMsg->cmd = sndCmd;
-    pAspMsg->procId = hAspMsgMaster->masterProcId;
-    pAspMsg->messageId = hAspMsgMaster->messageId & ~(1<<31);
-    pAspMsg->expectResp = TRUE;
-
-    // copy the message provided by caller
-    if(sndMsgBuf != NULL) {
-        memcpy(pAspMsg->buf, sndMsgBuf, ASP_MSG_BUF_LEN*sizeof(char));
-    }
-
-    // send the message
-    TRACE_TERSE3("ASP message: procId=%d, cmd=%d, messageId=0x%04x", pAspMsg->procId, pAspMsg->cmd, pAspMsg->messageId);
-    status = MessageQ_put(hAspMsgMaster->slaveQue, (MessageQ_Msg)pAspMsg);
-    if (status != MessageQ_S_SUCCESS) {
-        TRACE_TERSE0("MessageQ_put() failure.");
-        MessageQ_free((MessageQ_Msg)pAspMsg);
-        return (ASP_MSG_ERR_QUEUE_PUT);
-    }
-
-    status = MessageQ_free((MessageQ_Msg)pAspMsg);
-    if (status != MessageQ_S_SUCCESS) {
-        TRACE_TERSE0("MessageQ_free() failure.");
-        return (ASP_MSG_ERR_QUEUE_FREE);
-    }
-
-    // No error in messaging operation, even though there
-    // may be error in returned (acknowledgement) message.
-    return (ASP_MSG_NO_ERR);
-} /* AspMsgSnd */
-
-/************************************************************************************
- * ASP message sending function. Refer to aspMsg_master.h for detailed description.
-************************************************************************************/
-Int AspMsgAck(UInt32 ackCmd, char *ackMsgBuf)
-{
-    ASP_Msg* pAspMsg;                   /* Messaging */
-    Int status;
-
-    // allocate message
-    pAspMsg = (ASP_Msg *)MessageQ_alloc(hAspMsgMaster->heapId, hAspMsgMaster->msgSize);
-    if (pAspMsg == NULL) {
-        TRACE_TERSE0("MessageQ_alloc() failure.");
-        return (ASP_MSG_ERR_QUEUE_ALLOC);
-    }
-
-    // wait for complete message from slave
-    status = MessageQ_get(hAspMsgMaster->masterQue, (MessageQ_Msg *)&pAspMsg, MessageQ_FOREVER);
-    if (status != MessageQ_S_SUCCESS) {
-        TRACE_TERSE0("MessageQ_get() failure.");
-        MessageQ_free((MessageQ_Msg)pAspMsg);
-        return (ASP_MSG_ERR_QUEUE_GET);
-    }
-
-    // check if returned message is valid
-    if ((pAspMsg->procId != hAspMsgMaster->slaveProcId) ||
-        (pAspMsg->cmd != ackCmd) ||
-        (pAspMsg->messageId != (hAspMsgMaster->messageId | ((UInt32)1<<31)))) {
-        TRACE_TERSE3("ERROR: ASP message: procId=%d, cmd=%d, messageId=0x%04x", pAspMsg->procId, pAspMsg->cmd, pAspMsg->messageId);
-        MessageQ_free((MessageQ_Msg)pAspMsg);
-        return(ASP_MSG_ERR_ACKNOWLEDGE);
-    }
-
-    hAspMsgMaster->messageId = (hAspMsgMaster->messageId + 1) & ~(1<<31);
-    TRACE_TERSE3("ASP message: procId=%d, cmd=%d, messageId=0x%04x", pAspMsg->procId, pAspMsg->cmd, pAspMsg->messageId);
-
-    // get the returned message
-    if(ackMsgBuf != NULL) {
-        memcpy(ackMsgBuf, pAspMsg->buf, ASP_MSG_BUF_LEN*sizeof(char));
-    }
-
-    // free the message
-    status = MessageQ_free((MessageQ_Msg)pAspMsg);
-    if (status != MessageQ_S_SUCCESS) {
-        TRACE_TERSE0("MessageQ_free() failure.");
-        return (ASP_MSG_ERR_QUEUE_FREE);
-    }
-
-    // No error in messaging operation, even though there
-    // may be error in returned (acknowledgement) message.
-    return (ASP_MSG_NO_ERR);
-} /* AspMsgAck */
-#endif
-
-
 #if 0
 Int asipDecodeProcessing(
         const PAF_ASIT_Params *pP,

diff --git a/pasdk/test_dsp/framework/audioStreamOutProc.c b/pasdk/test_dsp/framework/audioStreamOutProc.c
index d7d08ddc3538a480607f10847df90c4160cc981e..3515ac05cf05839ee40e2d62e2dd65c17db0daac 100644 (file)
--- a/pasdk/test_dsp/framework/audioStreamOutProc.c
+++ b/pasdk/test_dsp/framework/audioStreamOutProc.c
@@ -930,8 +930,8 @@ static Int PAF_ASOT_selectDevices(
         {
             // Select Output Devices
             //  FL, New IO: Placeholder function, this will be reorganized moving forward.
-            //  FL: New IO: API for single Output.
-            //  FL: New IO: Doesn't (re-)configure Output driver.
+            //  FL, New IO: API for single Output.
+            //  FL, New IO: Doesn't (re-)configure Output driver.
             status = asopSelectDevices(pQ->devout->x[device]->sio.pConfig, &pAsotCfg->pIoOut[zO]);
             if (status < 0)
             {