diff options
| author | Denis Kenzior <denkenz@gmail.com> | 2015-11-12 14:15:17 -0600 |
|---|---|---|
| committer | Denis Kenzior <denkenz@gmail.com> | 2015-11-12 14:15:17 -0600 |
| commit | c5c6620aa2cb6f6d27fab7d802583be0c7a4de05 (patch) | |
| tree | 20022b82de3bcf2b7adefa8b62f54e46036bab8b /drivers | |
| parent | 3ba8e4a99ac4c92a5d10ddf2bc5c2a525da61e34 (diff) | |
| download | ofono-c5c6620aa2cb6f6d27fab7d802583be0c7a4de05.tar.bz2 | |
rilmodem: Implement ril_ss_notify inline
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/rilmodem/voicecall.c | 45 |
1 files changed, 30 insertions, 15 deletions
diff --git a/drivers/rilmodem/voicecall.c b/drivers/rilmodem/voicecall.c index 1c8cadee..85fc9585 100644 --- a/drivers/rilmodem/voicecall.c +++ b/drivers/rilmodem/voicecall.c @@ -522,26 +522,41 @@ static void ril_ss_notify(struct ril_msg *message, gpointer user_data) { struct ofono_voicecall *vc = user_data; struct ril_voicecall_data *vd = ofono_voicecall_get_data(vc); - struct unsol_supp_svc_notif *unsol; - - unsol = g_ril_unsol_parse_supp_svc_notif(vd->ril, message); - if (unsol == NULL) { - ofono_error("%s: Parsing error", __func__); - return; + struct parcel rilp; + int notif_type; + int code; + int index; + int ton; + char *tmp_number; + struct ofono_phone_number number; + + g_ril_init_parcel(message, &rilp); + + notif_type = parcel_r_int32(&rilp); + code = parcel_r_int32(&rilp); + index = parcel_r_int32(&rilp); + ton = parcel_r_int32(&rilp); + tmp_number = parcel_r_string(&rilp); + + g_ril_append_print_buf(vd->ril, "{%d,%d,%d,%d,%s}", + notif_type, code, index, + ton, tmp_number); + g_ril_print_unsol(vd->ril, message); + + if (tmp_number != NULL) { + strncpy(number.number, tmp_number, + OFONO_MAX_PHONE_NUMBER_LENGTH); + number.number[OFONO_MAX_PHONE_NUMBER_LENGTH] = '\0'; + number.type = ton; + g_free(tmp_number); } - DBG("RIL data: MT/MO: %i, code: %i, index: %i", - unsol->notif_type, unsol->code, unsol->index); - /* 0 stands for MO intermediate, 1 for MT unsolicited */ /* TODO How do we know the affected call? Refresh call list? */ - if (unsol->notif_type == 1) - ofono_voicecall_ssn_mt_notify( - vc, 0, unsol->code, unsol->index, &unsol->number); + if (notif_type == 1) + ofono_voicecall_ssn_mt_notify(vc, 0, code, index, &number); else - ofono_voicecall_ssn_mo_notify(vc, 0, unsol->code, unsol->index); - - g_ril_unsol_free_supp_svc_notif(unsol); + ofono_voicecall_ssn_mo_notify(vc, 0, code, index); } void ril_answer(struct ofono_voicecall *vc, ofono_voicecall_cb_t cb, void *data) |