diff --git a/media/webrtc/signaling/src/sipcc/core/gsm/fsmcac.c b/media/webrtc/signaling/src/sipcc/core/gsm/fsmcac.c index 21c32ef81c5..ba1e4435c37 100755 --- a/media/webrtc/signaling/src/sipcc/core/gsm/fsmcac.c +++ b/media/webrtc/signaling/src/sipcc/core/gsm/fsmcac.c @@ -198,7 +198,7 @@ fsm_init_cac_failure_timer(cac_data_t *cac_data, uint32_t timeout) cac_data->cac_fail_timer = cprCreateTimer("CAC failure timer", GSM_CAC_FAILURE_TIMER, TIMER_EXPIRATION, - gsm_msg_queue); + gsm_msgq); if (cac_data->cac_fail_timer == NULL) { CAC_ERROR(CAC_F_PREFIX"CAC Timer allocation failed.\n", diff --git a/media/webrtc/signaling/src/sipcc/core/gsm/fsmdef.c b/media/webrtc/signaling/src/sipcc/core/gsm/fsmdef.c index d867872f43e..a5127d57065 100755 --- a/media/webrtc/signaling/src/sipcc/core/gsm/fsmdef.c +++ b/media/webrtc/signaling/src/sipcc/core/gsm/fsmdef.c @@ -2154,7 +2154,7 @@ fsmdef_set_req_pending_timer (fsmdef_dcb_t *dcb) dcb->req_pending_tmr = cprCreateTimer("Request Pending", GSM_REQ_PENDING_TIMER, TIMER_EXPIRATION, - gsm_msg_queue); + gsm_msgq); if (dcb->req_pending_tmr == NULL) { FSM_DEBUG_SM(get_debug_string(FSMDEF_DBG_TMR_CREATE_FAILED), @@ -4179,7 +4179,7 @@ fsmdef_ev_collectinginfo_release (sm_event_t *event) dcb->err_onhook_tmr = cprCreateTimer("Error Onhook", GSM_ERROR_ONHOOK_TIMER, TIMER_EXPIRATION, - gsm_msg_queue); + gsm_msgq); if (dcb->err_onhook_tmr == NULL) { FSM_DEBUG_SM(get_debug_string(FSMDEF_DBG_TMR_CREATE_FAILED), dcb->call_id, dcb->line, "", "Error Onhook"); @@ -4517,7 +4517,7 @@ fsmdef_ev_callsent_release (sm_event_t *event) dcb->err_onhook_tmr = cprCreateTimer("Error Onhook", GSM_ERROR_ONHOOK_TIMER, TIMER_EXPIRATION, - gsm_msg_queue); + gsm_msgq); if (dcb->err_onhook_tmr == NULL) { FSM_DEBUG_SM(get_debug_string(FSMDEF_DBG_TMR_CREATE_FAILED), dcb->call_id, dcb->line, "", "Error Onhook"); @@ -8685,7 +8685,7 @@ fsmdef_init (void) dcb->ringback_delay_tmr = cprCreateTimer("Ringback Delay", GSM_RINGBACK_DELAY_TIMER, TIMER_EXPIRATION, - gsm_msg_queue); + gsm_msgq); if (dcb->ringback_delay_tmr == NULL) { FSM_DEBUG_SM(get_debug_string(FSMDEF_DBG_TMR_CREATE_FAILED), dcb->call_id, dcb->line, fname, "Ringback Delay"); @@ -8698,7 +8698,7 @@ fsmdef_init (void) dcb->autoAnswerTimer = cprCreateTimer("Auto Answer", GSM_AUTOANSWER_TIMER, TIMER_EXPIRATION, - gsm_msg_queue); + gsm_msgq); if (dcb->autoAnswerTimer == NULL) { FSM_DEBUG_SM(get_debug_string(FSMDEF_DBG_TMR_CREATE_FAILED), dcb->call_id, dcb->line, fname, "Auto Answer"); @@ -8709,7 +8709,7 @@ fsmdef_init (void) dcb->revertTimer = cprCreateTimer("Call Reversion", GSM_REVERSION_TIMER, TIMER_EXPIRATION, - gsm_msg_queue); + gsm_msgq); dcb->reversionInterval = -1; if (dcb->revertTimer == NULL) { FSM_DEBUG_SM(get_debug_string(FSMDEF_DBG_TMR_CREATE_FAILED), diff --git a/media/webrtc/signaling/src/sipcc/core/gsm/gsm.c b/media/webrtc/signaling/src/sipcc/core/gsm/gsm.c index 561aefb7967..b138455dc70 100755 --- a/media/webrtc/signaling/src/sipcc/core/gsm/gsm.c +++ b/media/webrtc/signaling/src/sipcc/core/gsm/gsm.c @@ -34,7 +34,7 @@ static void sub_process_feature_notify(ccsip_sub_not_data_t *msg, callid_t call_ static void sub_process_b2bcnf_msg(uint32_t cmd, void *msg); void fsmb2bcnf_get_sub_call_id_from_ccb(fsmcnf_ccb_t *ccb, callid_t *cnf_call_id, callid_t *cns_call_id); -cprMsgQueue_t gsm_msg_queue; +extern cprMsgQueue_t gsm_msgq; void destroy_gsm_thread(void); void dp_shutdown(); extern void dcsm_process_jobs(void); @@ -86,7 +86,7 @@ gsm_send_msg (uint32_t cmd, cprBuffer_t buf, uint16_t len) syshdr->Cmd = cmd; syshdr->Len = len; - if (cprSendMessage(gsm_msg_queue, buf, (void **) &syshdr) == CPR_FAILURE) { + if (cprSendMessage(gsm_msgq, buf, (void **) &syshdr) == CPR_FAILURE) { cprReleaseSysHeader(syshdr); return CPR_FAILURE; } @@ -264,13 +264,9 @@ GSMTask (void *arg) phn_syshdr_t *syshdr; boolean release_msg = TRUE; - /* - * Get the GSM message queue handle - * A hack until the tasks in irx are - * CPRized. - */ - gsm_msg_queue = (cprMsgQueue_t) arg; - if (!gsm_msg_queue) { + MOZ_ASSERT (gsm_msgq == (cprMsgQueue_t) arg); + + if (!gsm_msgq) { GSM_ERR_MSG(GSM_F_PREFIX"invalid input, exiting\n", fname); return; } @@ -312,7 +308,7 @@ GSMTask (void *arg) release_msg = TRUE; - msg = cprGetMessage(gsm_msg_queue, TRUE, (void **) &syshdr); + msg = cprGetMessage(gsm_msgq, TRUE, (void **) &syshdr); if (msg) { switch (syshdr->Cmd) { case TIMER_EXPIRATION: diff --git a/media/webrtc/signaling/src/sipcc/core/gsm/h/gsm.h b/media/webrtc/signaling/src/sipcc/core/gsm/h/gsm.h index ba6cafccfc8..514095c3254 100755 --- a/media/webrtc/signaling/src/sipcc/core/gsm/h/gsm.h +++ b/media/webrtc/signaling/src/sipcc/core/gsm/h/gsm.h @@ -45,11 +45,11 @@ typedef enum { /* * The common code creating the GSM timers needs to have - * access to the gsm_msg_queue variable since CPR + * access to the gsm_msgq variable since CPR * needs to know where to send the timer expiration * message. */ -extern cprMsgQueue_t gsm_msg_queue; +extern cprMsgQueue_t gsm_msgq; extern void kpml_process_msg(uint32_t cmd, void *msg); extern void dp_process_msg(uint32_t cmd, void *msg); diff --git a/media/webrtc/signaling/src/sipcc/core/gsm/lsm.c b/media/webrtc/signaling/src/sipcc/core/gsm/lsm.c index 73be89c68cc..70a10c098c9 100755 --- a/media/webrtc/signaling/src/sipcc/core/gsm/lsm.c +++ b/media/webrtc/signaling/src/sipcc/core/gsm/lsm.c @@ -5000,14 +5000,14 @@ lsm_init (void) */ lsm_tmr_tones = cprCreateTimer("lsm_tmr_tones", GSM_MULTIPART_TONES_TIMER, - TIMER_EXPIRATION, gsm_msg_queue); + TIMER_EXPIRATION, gsm_msgq); lsm_continuous_tmr_tones = cprCreateTimer("lsm_continuous_tmr_tones", GSM_CONTINUOUS_TONES_TIMER, TIMER_EXPIRATION, - gsm_msg_queue); + gsm_msgq); lsm_tone_duration_tmr = cprCreateTimer("lsm_tone_duration_tmr", GSM_TONE_DURATION_TIMER, - TIMER_EXPIRATION, gsm_msg_queue); + TIMER_EXPIRATION, gsm_msgq); lsm_init_config(); for (i=0 ; iinter_digit_timer = cprCreateTimer("Interdigit timer", GSM_KPML_INTER_DIGIT_TIMER, - TIMER_EXPIRATION, gsm_msg_queue); + TIMER_EXPIRATION, gsm_msgq); kpml_data->critical_timer = cprCreateTimer("Criticaldigit timer", GSM_KPML_CRITICAL_DIGIT_TIMER, - TIMER_EXPIRATION, gsm_msg_queue); + TIMER_EXPIRATION, gsm_msgq); kpml_data->extra_digit_timer = cprCreateTimer("Extradigit timer", GSM_KPML_EXTRA_DIGIT_TIMER, - TIMER_EXPIRATION, gsm_msg_queue); + TIMER_EXPIRATION, gsm_msgq); /* Check if any of the timer cannot be allocated */ if (kpml_data->inter_digit_timer == NULL || @@ -665,7 +665,7 @@ kpml_start_subscription_timer (kpml_data_t * kpml_data, unsigned long duration) kpml_data->sub_timer = cprCreateTimer("sub timer", GSM_KPML_SUBSCRIPTION_TIMER, - TIMER_EXPIRATION, gsm_msg_queue); + TIMER_EXPIRATION, gsm_msgq); kpml_data->sub_duration = duration;