FreeCalypso > hg > tcs211-l1-reconst
changeset 254:19debb9e9934
l1audio_async.c: passes compilation, but the link fails
| author | Mychaela Falconia <falcon@freecalypso.org> |
|---|---|
| date | Mon, 13 Mar 2017 01:29:34 +0000 |
| parents | 60c352cb652a |
| children | 515720b6adfe |
| files | chipsetsw/layer1/audio_cfile/l1audio_async.c |
| diffstat | 1 files changed, 40 insertions(+), 31 deletions(-) [+] |
line wrap: on
line diff
--- a/chipsetsw/layer1/audio_cfile/l1audio_async.c Mon Mar 13 00:18:25 2017 +0000 +++ b/chipsetsw/layer1/audio_cfile/l1audio_async.c Mon Mar 13 01:29:34 2017 +0000 @@ -1808,12 +1808,12 @@ WAIT_DYN_DWNLD = 2, WAIT_START_CON = 3, WAIT_STOP = 4, - VM_AMR_PLAY = 5, + VM_AMR_PLAY = 5 + #if 0 /* FreeCalypso TCS211 reconstruction */ VM_AMR_PAUSE = 6, VM_AMR_PAUSE_CON = 7, WAIT_RESUME_CON = 8 - - + #endif }; UWORD8 *state = &l1a.state[L1A_VM_AMR_PLAY_STATE]; @@ -1828,8 +1828,10 @@ // Reset the commands l1a_l1s_com.voicememo_amr_task.play.command.start = FALSE; l1a_l1s_com.voicememo_amr_task.play.command.stop = FALSE; + #if 0 /* FreeCalypso TCS211 reconstruction */ l1a_l1s_com.voicememo_amr_task.play.command.pause = FALSE; l1a_l1s_com.voicememo_amr_task.play.command.resume = FALSE; + #endif *state = WAIT_START_REQ; } break; @@ -1841,7 +1843,7 @@ // Download the parameters of the message to the l1a_l1s_com structure. l1a_l1s_com.voicememo_amr_task.play.parameters.session_id = ((T_MMI_VM_AMR_PLAY_REQ *)(msg->SigP))->session_id; - if (l1a.dyn_dwnld.semaphore_vect[VM_STATE_MACHINE]==GREEN) + if (l1a.dyn_dwnld.semaphore_vect[VOICE_PLAY_AMR_SM]==GREEN) { // WARNING: code below must be duplicated in WAIT_DYN_DWNLD state // Start the L1S voice memo playing task @@ -1872,7 +1874,7 @@ // omaps00090550 break; case WAIT_DYN_DWNLD: { - if((SignalCode==API_L1_DYN_DWNLD_FINISHED) && (l1a.dyn_dwnld.semaphore_vect[VM_STATE_MACHINE] == GREEN)) + if((SignalCode==API_L1_DYN_DWNLD_FINISHED) && (l1a.dyn_dwnld.semaphore_vect[VOICE_PLAY_AMR_SM] == GREEN)) { // Start the L1S voice memo playing task l1a_l1s_com.voicememo_amr_task.play.command.start = TRUE; @@ -1932,6 +1934,7 @@ { switch (SignalCode) { + #if 0 /* FreeCalypso TCS211 reconstruction */ case MMI_VM_AMR_PAUSE_REQ: { // Stop the L1S voice memo playing task @@ -1939,26 +1942,28 @@ *state = VM_AMR_PAUSE_CON; } - break; + break; + case MMI_VM_AMR_PLAY_STOP_REQ: - { - // Stop the L1S voice memo playing task - l1a_l1s_com.voicememo_amr_task.play.command.stop = TRUE; - *state=WAIT_STOP; - + { + // Stop the L1S voice memo playing task + l1a_l1s_com.voicememo_amr_task.play.command.stop = TRUE; + *state=WAIT_STOP; } break; + #endif + case L1_VM_AMR_PLAY_STOP_CON: - { - l1a_audio_send_confirmation(MMI_VM_AMR_PLAY_STOP_CON); - - *state = RESET; - } - break; - } - return; - } - + { + l1a_audio_send_confirmation(MMI_VM_AMR_PLAY_STOP_CON); + *state = RESET; + } + break; + } + return; + } + + #if 0 /* FreeCalypso TCS211 reconstruction */ case VM_AMR_PAUSE_CON: { if(SignalCode==L1_VM_AMR_PAUSE_CON) @@ -2036,6 +2041,7 @@ } return; } // case WAIT_RESUME_CON + #endif } // switch } // while(1) } @@ -2107,7 +2113,7 @@ // Download UL/DL audio gain to the NDB l1s_dsp_com.dsp_ndb_ptr->d_shiftul = ((T_MMI_VM_AMR_RECORD_REQ *)(msg->SigP))->record_coeff_ul; - if(l1a.dyn_dwnld.semaphore_vect[VM_STATE_MACHINE]==GREEN) + if(l1a.dyn_dwnld.semaphore_vect[VOICE_MEMO_AMR_SM]==GREEN) { // WARNING: code below must be duplicated in WAIT_DYN_DWNLD state // Start the L1S voice memo recording task @@ -2139,7 +2145,7 @@ // omaps00090550 break; case WAIT_DYN_DWNLD: { - if((SignalCode == API_L1_DYN_DWNLD_FINISHED) && (l1a.dyn_dwnld.semaphore_vect[VM_STATE_MACHINE] == GREEN)) + if((SignalCode == API_L1_DYN_DWNLD_FINISHED) && (l1a.dyn_dwnld.semaphore_vect[VOICE_MEMO_AMR_SM] == GREEN)) { // Start the L1S voice memo recording task l1a_l1s_com.voicememo_amr_task.record.command.start = TRUE; @@ -2639,7 +2645,7 @@ l1a_l1s_com.speechreco_task.parameters.speech = ((T_MMI_SR_ENROLL_REQ *)(msg->SigP))->speech; l1a_l1s_com.speechreco_task.parameters.speech_address = ((T_MMI_SR_ENROLL_REQ *)(msg->SigP))->speech_address; - if(l1a.dyn_dwnld.semaphore_vect[SR_STATE_MACHINE]==GREEN) + if(l1a.dyn_dwnld.semaphore_vect[SPEECH_RECO_SM]==GREEN) { // WARNING: code below must be duplicated in WAIT_DYN_DWNLD state @@ -2676,7 +2682,7 @@ break; case WAIT_DYN_DWNLD: { - if((SignalCode == API_L1_DYN_DWNLD_FINISHED) && (l1a.dyn_dwnld.semaphore_vect[SR_STATE_MACHINE] == GREEN)) + if((SignalCode == API_L1_DYN_DWNLD_FINISHED) && (l1a.dyn_dwnld.semaphore_vect[SPEECH_RECO_SM] == GREEN)) { // Set the start command of the speech recording task l1a_l1s_com.speechreco_task.command.speech_start = l1a_l1s_com.speechreco_task.parameters.speech; @@ -3034,7 +3040,7 @@ l1a_l1s_com.speechreco_task.parameters.CTO_algorithm = FALSE; - if(l1a.dyn_dwnld.semaphore_vect[SR_STATE_MACHINE] == GREEN) + if(l1a.dyn_dwnld.semaphore_vect[SPEECH_RECO_SM] == GREEN) { // WARNING: code below must be duplicated in WAIT_DYN_DWNLD state @@ -3071,7 +3077,7 @@ break; case WAIT_DYN_DWNLD: { - if((SignalCode == API_L1_DYN_DWNLD_FINISHED) && (l1a.dyn_dwnld.semaphore_vect[SR_STATE_MACHINE] == GREEN)) + if((SignalCode == API_L1_DYN_DWNLD_FINISHED) && (l1a.dyn_dwnld.semaphore_vect[SPEECH_RECO_SM] == GREEN)) { // Start to download the model to the API l1_send_sr_background_msg(L1_SRBACK_LOAD_MODEL_REQ); @@ -3473,7 +3479,7 @@ l1a_l1s_com.speechreco_task.parameters.CTO_algorithm = FALSE; } - if (l1a.dyn_dwnld.semaphore_vect[SR_STATE_MACHINE] == GREEN) + if (l1a.dyn_dwnld.semaphore_vect[SPEECH_RECO_SM] == GREEN) { // WARNING: code below must be duplicated in WAIT_DYN_DWNLD state @@ -3507,7 +3513,7 @@ case WAIT_DYN_DWNLD: { - if((SignalCode == API_L1_DYN_DWNLD_FINISHED) && (l1a.dyn_dwnld.semaphore_vect[SR_STATE_MACHINE] == GREEN)) + if((SignalCode == API_L1_DYN_DWNLD_FINISHED) && (l1a.dyn_dwnld.semaphore_vect[SPEECH_RECO_SM] == GREEN)) { // Start the speech recognition reco task l1a_l1s_com.speechreco_task.command.reco_start = TRUE; @@ -3971,7 +3977,7 @@ l1a_l1s_com.speechreco_task.parameters.CTO_algorithm = FALSE; - if (l1a.dyn_dwnld.semaphore_vect[SR_STATE_MACHINE] == GREEN) + if (l1a.dyn_dwnld.semaphore_vect[SPEECH_RECO_SM] == GREEN) { // WARNING: code below must be duplicated in WAIT_DYN_DWNLD state @@ -4008,7 +4014,7 @@ break; case WAIT_DYN_DWNLD: { - if((SignalCode == API_L1_DYN_DWNLD_FINISHED) && (l1a.dyn_dwnld.semaphore_vect[SR_STATE_MACHINE] == GREEN)) + if((SignalCode == API_L1_DYN_DWNLD_FINISHED) && (l1a.dyn_dwnld.semaphore_vect[SPEECH_RECO_SM] == GREEN)) { // Start to download the model to the API @@ -10625,6 +10631,8 @@ } #endif // L1_VOCODER_IF_CHANGE == 1 + +#if 0 /* FreeCalypso: LoCosto-ism removed */ void l1a_mmi_outen_cfg_process (xSignalHeaderRec *msg) { #if (OP_RIV_AUDIO == 1) @@ -10673,6 +10681,7 @@ } #endif /*OP_RIV_AUDIO*/ } /* end function l1a_mmi_outen_cfg_process */ +#endif #if(L1_BT_AUDIO ==1) void l1a_mmi_bt_process(xSignalHeaderRec *msg)