| Message ID | 20240413215318.12236-2-adam@piggz.co.uk (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | [v4,1/4] qmimodem: voicecall: Implement call dialing | expand |
Hi Adam, On 4/13/24 16:53, Adam Pigg wrote: > The answer function set up the parameters for a call to the service > function QMI_VOICE_ANSWER_CALL. The only parameter is the call-id. > answer_cb will then be called which retrieves the call-id and checks > the status of the result. > > --- > Changed in V4 > -Minor rework to the answer function > --- > --- > drivers/qmimodem/voice.h | 1 + > drivers/qmimodem/voicecall.c | 70 ++++++++++++++++++++++++++++++++++++ > 2 files changed, 71 insertions(+) > <snip> > diff --git a/drivers/qmimodem/voicecall.c b/drivers/qmimodem/voicecall.c > index 8c86eee7..4b87921e 100644 > --- a/drivers/qmimodem/voicecall.c > +++ b/drivers/qmimodem/voicecall.c > @@ -93,6 +93,14 @@ static bool ofono_call_compare_by_id(const void *a, const void *b) > return (call->id == id); > } > > +static bool ofono_call_compare_by_status(const void *a, const void *b) Nit, similarly to my comment in patch 1, lets use 'match' in the name. Perhaps ofono_call_match_by_status? > +{ > + const struct ofono_call *call = a; > + int status = L_PTR_TO_INT(b); > + > + return status == call->status; > +} > + > static void ofono_call_list_dial_callback(struct ofono_voicecall *vc, > int call_id) > { > @@ -465,6 +473,67 @@ error: > l_free(param); > } > > +static void answer_cb(struct qmi_result *result, void *user_data) > +{ > + struct cb_data *cbd = user_data; > + ofono_voicecall_cb_t cb = cbd->cb; > + uint16_t error; > + uint8_t call_id; > + > + static const uint8_t QMI_VOICE_ANSWER_RETURN_CALL_ID = 0x10; RESULT_CALL_ID > + > + DBG(""); > + > + if (qmi_result_set_error(result, &error)) { > + DBG("QMI Error %d", error); > + CALLBACK_WITH_FAILURE(cb, cbd->data); > + return; > + } > + > + if (qmi_result_get_uint8(result, QMI_VOICE_ANSWER_RETURN_CALL_ID, &call_id)) > + DBG("Received answer result with call id %d", call_id); > + > + CALLBACK_WITH_SUCCESS(cb, cbd->data); > +} > + > +static void answer(struct ofono_voicecall *vc, ofono_voicecall_cb_t cb, void *data) > +{ > + struct voicecall_data *vd = ofono_voicecall_get_data(vc); > + struct cb_data *cbd; > + struct ofono_call *call; > + struct qmi_param *param = NULL; > + > + static const uint8_t QMI_VOICE_ANSWER_CALL_ID = 0x01; PARAM_CALL_ID > + > + DBG(""); > + > + call = l_queue_find(vd->call_list, > + ofono_call_compare_by_status, > + L_UINT_TO_PTR(CALL_STATUS_INCOMING)); > + > + if (call == NULL) { > + DBG("Can not find a call to pick up"); > + return; Hmm, CALLBACK_WITH_FAILURE? And probably warrants an ofono_error() > + } > + > + param = qmi_param_new(); > + cbd = cb_data_new(cb, data); > + cbd->user = vc; > + > + if (!qmi_param_append_uint8(param, QMI_VOICE_ANSWER_CALL_ID, > + call->id)) > + goto error; > + > + if (qmi_service_send(vd->voice, QMI_VOICE_ANSWER_CALL, param, > + answer_cb, cbd, l_free) > 0) > + return; > + > +error: > + CALLBACK_WITH_FAILURE(cb, data); > + l_free(cbd); > + l_free(param); > +} > + > static void create_voice_cb(struct qmi_service *service, void *user_data) > { > struct ofono_voicecall *vc = user_data; Regards, -Denis
diff --git a/drivers/qmimodem/voice.h b/drivers/qmimodem/voice.h index 2344fd50..a524cf98 100644 --- a/drivers/qmimodem/voice.h +++ b/drivers/qmimodem/voice.h @@ -51,6 +51,7 @@ enum voice_commands { QMI_VOICE_DIAL_CALL = 0x20, QMI_VOICE_ALL_CALL_STATUS_IND = 0x2e, QMI_VOICE_GET_ALL_CALL_INFO = 0x2f, + QMI_VOICE_ANSWER_CALL = 0x22, QMI_VOICE_SUPS_NOTIFICATION_IND = 0x32, QMI_VOICE_SET_SUPS_SERVICE = 0x33, QMI_VOICE_GET_CALL_WAITING = 0x34, diff --git a/drivers/qmimodem/voicecall.c b/drivers/qmimodem/voicecall.c index 8c86eee7..4b87921e 100644 --- a/drivers/qmimodem/voicecall.c +++ b/drivers/qmimodem/voicecall.c @@ -93,6 +93,14 @@ static bool ofono_call_compare_by_id(const void *a, const void *b) return (call->id == id); } +static bool ofono_call_compare_by_status(const void *a, const void *b) +{ + const struct ofono_call *call = a; + int status = L_PTR_TO_INT(b); + + return status == call->status; +} + static void ofono_call_list_dial_callback(struct ofono_voicecall *vc, int call_id) { @@ -465,6 +473,67 @@ error: l_free(param); } +static void answer_cb(struct qmi_result *result, void *user_data) +{ + struct cb_data *cbd = user_data; + ofono_voicecall_cb_t cb = cbd->cb; + uint16_t error; + uint8_t call_id; + + static const uint8_t QMI_VOICE_ANSWER_RETURN_CALL_ID = 0x10; + + DBG(""); + + if (qmi_result_set_error(result, &error)) { + DBG("QMI Error %d", error); + CALLBACK_WITH_FAILURE(cb, cbd->data); + return; + } + + if (qmi_result_get_uint8(result, QMI_VOICE_ANSWER_RETURN_CALL_ID, &call_id)) + DBG("Received answer result with call id %d", call_id); + + CALLBACK_WITH_SUCCESS(cb, cbd->data); +} + +static void answer(struct ofono_voicecall *vc, ofono_voicecall_cb_t cb, void *data) +{ + struct voicecall_data *vd = ofono_voicecall_get_data(vc); + struct cb_data *cbd; + struct ofono_call *call; + struct qmi_param *param = NULL; + + static const uint8_t QMI_VOICE_ANSWER_CALL_ID = 0x01; + + DBG(""); + + call = l_queue_find(vd->call_list, + ofono_call_compare_by_status, + L_UINT_TO_PTR(CALL_STATUS_INCOMING)); + + if (call == NULL) { + DBG("Can not find a call to pick up"); + return; + } + + param = qmi_param_new(); + cbd = cb_data_new(cb, data); + cbd->user = vc; + + if (!qmi_param_append_uint8(param, QMI_VOICE_ANSWER_CALL_ID, + call->id)) + goto error; + + if (qmi_service_send(vd->voice, QMI_VOICE_ANSWER_CALL, param, + answer_cb, cbd, l_free) > 0) + return; + +error: + CALLBACK_WITH_FAILURE(cb, data); + l_free(cbd); + l_free(param); +} + static void create_voice_cb(struct qmi_service *service, void *user_data) { struct ofono_voicecall *vc = user_data; @@ -531,6 +600,7 @@ static const struct ofono_voicecall_driver driver = { .probe = qmi_voicecall_probe, .remove = qmi_voicecall_remove, .dial = dial, + .answer = answer, }; OFONO_ATOM_DRIVER_BUILTIN(voicecall, qmimodem, &driver)