From patchwork Tue Apr 2 21:25:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Pigg X-Patchwork-Id: 13614642 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 28D1915AAA7 for ; Tue, 2 Apr 2024 21:26:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712093205; cv=none; b=s5d5lJdSprEJzxk28UFR1w93XKdP+jog4KYy+a810gjfXL0NHzxNrYbg6+8oRiEpZvJw1LBqv7eif9S4qPtlHeqIIzUtBZU9pbn6eWg8b5XWQEATZ0YUdz8XtthZllNqqCQTvTwk6qAk7ZpwnjH1bUxqDgd1dnRjHsnp6f0HBIk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712093205; c=relaxed/simple; bh=UQI+2NllCn88bUX4eRKC8q+Qy12ae8Xtf02YzeikGiw=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=uQ7R8Bl5tIvPVWUb7kpB4q9xYsvHy1fKEoVgjxNqV/+yxHHIWhYPA3QMI/5z7UBVxnAEhqdfJk7UlGmgLU5GKYHRd7Xh8zddwlIAAr4NblhzIOCgUODxpnoHGKhpVR/vsoKKvCV9775jIU7F0VISuLqCYxGVfimJer5/gFyYqf8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=piggz.co.uk; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=fMIgN4FX; arc=none smtp.client-ip=209.85.128.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=piggz.co.uk Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="fMIgN4FX" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-415584360c0so22980245e9.1 for ; Tue, 02 Apr 2024 14:26:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712093201; x=1712698001; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=D+xzboP0kXcpM1ZoWozBUHekwIVTMokikg9Q+nEsPQM=; b=fMIgN4FXbBNo/cqFaFZEaoVldFsQ768HReagxlZOmw6kfyNinL/kCBpq5rlbUFPTOT uIOMqtJ295UCSa+MmUOMdhddyl2TxAmkMuFAWCa3mjbg0LJ6gYHa5+RnDQBHGNfTnxpB ETUa8v3h8IbPmf4ePIMlZsya1EuY0bfTFsjSl7sxbkWCozzIX9rk61cLeXirZV7KG52K SkUeiOitMX3iBPpblJ95erK9IuL9QgfrGnnpwhkl0RXiD6ZIoswlNEGNFYgPkl7j0+1/ 6CXB1wjFRv72WsWGY9PnLkY67CupwEc71hBHgNTP1eJycmSpxfXBUEM0gj0gjyi2YqbN yj2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712093201; x=1712698001; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=D+xzboP0kXcpM1ZoWozBUHekwIVTMokikg9Q+nEsPQM=; b=Ul0gz1U4la/MH5OkitSC6Aqv6wa9+uUaSVaQn6Lw38zs5IKKZQTp4bHX9l1XXDeoLy tjDNFlWTzYggsw30Y0kPmJflKx7B9AymVvbFxLRWUcKC9Sud+4r/g27SN8XbpdraBk+l 8FuTblTyv4OKGFLXl+hokfnBBRL6DtOPNrZwvrfh+LDShgm0+5JLbxAMiztKHUd9iwSH RpRkBiyGCjT97vAehYL4hSkSDg8yDxfLd5W8ThWerXjybGzWZcGxZD6SLMJ+DaOIK1MM 8E3kLV+ar64ewSdlHFr3bpvrpq3/nhWCYIx+UkzabCEf/8WLf7lKWDVEalkdONUAAfZy Ig3g== X-Gm-Message-State: AOJu0YzhkfzNBV8Q6LvHxWqSPT2l+ETPyITdLiY8TDpJ4ckJG5vKadL2 QkhyeL1aYRZCTLU9fnUWdv68B6D+jadjuSYJteBRIUb8rNnIdwNGX4nJc/n+4Rw= X-Google-Smtp-Source: AGHT+IGGQyFKz95GeIw1Kazxq460XebJCmumCqQ929VB+xsRBU+SvablqJkiksI5DBswYOn8ijtGUQ== X-Received: by 2002:a5d:514e:0:b0:343:8fcd:6eaa with SMTP id u14-20020a5d514e000000b003438fcd6eaamr71020wrt.54.1712093200769; Tue, 02 Apr 2024 14:26:40 -0700 (PDT) Received: from adam-laptop-hp.turtle-stonecat.ts.net ([90.246.50.91]) by smtp.gmail.com with ESMTPSA id i4-20020adfefc4000000b0033b6e26f0f9sm15215643wrp.42.2024.04.02.14.26.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Apr 2024 14:26:39 -0700 (PDT) Sender: Adam Pigg From: Adam Pigg To: ofono@lists.linux.dev Cc: Adam Pigg Subject: [PATCH v3 1/4] qmimodem: voicecall: Implement call dialing Date: Tue, 2 Apr 2024 22:25:15 +0100 Message-ID: <20240402212625.5348-1-adam@piggz.co.uk> X-Mailer: git-send-email 2.44.0 Precedence: bulk X-Mailing-List: ofono@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Add voicecall dialling to the qmimodem driver Includes required infratructure and setup of the QMI services Call State Handling =================== On initialisation, register the all_call_status_ind callback to be called for QMI_VOICE_IND_ALL_STATUS. This will handle notificatiof of call status to the rest of the system Dial Handling ============= The dial function sets up the parameters for the QMI_VOICE_DIAL_CALL service. The parameters are the number to be called and the call type, which is currently hard coded to be QMI_VOICE_CALL_TYPE_VOICE. The dial_cb callback wi then be called and will receive the call-id. --- drivers/qmimodem/voice.h | 17 ++ drivers/qmimodem/voicecall.c | 479 ++++++++++++++++++++++++++++++++++- 2 files changed, 495 insertions(+), 1 deletion(-) diff --git a/drivers/qmimodem/voice.h b/drivers/qmimodem/voice.h index 917e72f7..2344fd50 100644 --- a/drivers/qmimodem/voice.h +++ b/drivers/qmimodem/voice.h @@ -48,6 +48,9 @@ enum qmi_ussd_user_required { /* QMI service voice. Using an enum to prevent doublicated entries */ enum voice_commands { + QMI_VOICE_DIAL_CALL = 0x20, + QMI_VOICE_ALL_CALL_STATUS_IND = 0x2e, + QMI_VOICE_GET_ALL_CALL_INFO = 0x2f, QMI_VOICE_SUPS_NOTIFICATION_IND = 0x32, QMI_VOICE_SET_SUPS_SERVICE = 0x33, QMI_VOICE_GET_CALL_WAITING = 0x34, @@ -66,6 +69,20 @@ enum voice_commands { QMI_VOICE_GET_CNAP = 0x4d }; +enum qmi_voice_call_state { + QMI_VOICE_CALL_STATE_IDLE = 0x0, + QMI_VOICE_CALL_STATE_ORIG, + QMI_VOICE_CALL_STATE_INCOMING, + QMI_VOICE_CALL_STATE_CONV, + QMI_VOICE_CALL_STATE_CC_IN_PROG, + QMI_VOICE_CALL_STATE_ALERTING, + QMI_VOICE_CALL_STATE_HOLD, + QMI_VOICE_CALL_STATE_WAITING, + QMI_VOICE_CALL_STATE_DISCONNECTING, + QMI_VOICE_CALL_STATE_END, + QMI_VOICE_CALL_STATE_SETUP +}; + struct qmi_ussd_data { uint8_t dcs; uint8_t length; diff --git a/drivers/qmimodem/voicecall.c b/drivers/qmimodem/voicecall.c index aa34fc25..cadb5adf 100644 --- a/drivers/qmimodem/voicecall.c +++ b/drivers/qmimodem/voicecall.c @@ -3,6 +3,7 @@ * oFono - Open Source Telephony * * Copyright (C) 2011-2012 Intel Corporation. All rights reserved. + * Copyright (C) 2024 Adam Pigg * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -26,6 +27,10 @@ #include #include #include +#include +#include + +#include "voice.h" #include "qmi.h" @@ -35,8 +40,474 @@ struct voicecall_data { struct qmi_service *voice; uint16_t major; uint16_t minor; + struct l_queue *call_list; + struct ofono_phone_number dialed; +}; + +struct qmi_voice_all_call_status_ind { + bool call_information_set; + const struct qmi_voice_call_information *call_information; + bool remote_party_number_set; + uint8_t remote_party_number_size; + const struct qmi_voice_remote_party_number_instance + *remote_party_number[16]; }; +struct qmi_voice_call_information_instance { + uint8_t id; + uint8_t state; + uint8_t type; + uint8_t direction; + uint8_t mode; + uint8_t multipart_indicator; + uint8_t als; +} __attribute__((__packed__)); + +struct qmi_voice_call_information { + uint8_t size; + struct qmi_voice_call_information_instance instance[0]; +} __attribute__((__packed__)); + +struct qmi_voice_remote_party_number_instance { + uint8_t call_id; + uint8_t presentation_indicator; + uint8_t number_size; + char number[0]; +} __attribute__((__packed__)); + +struct qmi_voice_remote_party_number { + uint8_t size; + struct qmi_voice_remote_party_number_instance instance[0]; +} __attribute__((__packed__)); + +static int ofono_call_compare(const void *a, const void *b, void *data) +{ + const struct ofono_call *ca = a; + const struct ofono_call *cb = b; + + if (ca->id < cb->id) + return -1; + + if (ca->id > cb->id) + return 1; + + return 0; +} + +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 bool ofono_call_compare_by_id(const void *a, const void *b) +{ + const struct ofono_call *call = a; + unsigned int id = L_PTR_TO_UINT(b); + + return (call->id == id); +} + +static void ofono_call_list_dial_callback(struct ofono_voicecall *vc, + int call_id) +{ + struct ofono_call *call; + struct voicecall_data *vd = ofono_voicecall_get_data(vc); + struct l_queue *call_list = vd->call_list; + const struct ofono_phone_number *ph = &vd->dialed; + + /* check if call_id already present */ + call = l_queue_find(call_list, ofono_call_compare_by_id, + L_UINT_TO_PTR(call_id)); + + if (call) + return; + + call = l_new(struct ofono_call, 1); + call->id = call_id; + + memcpy(&call->called_number, ph, sizeof(*ph)); + call->direction = CALL_DIRECTION_MOBILE_ORIGINATED; + call->status = CALL_STATUS_DIALING; + call->type = 0; /* voice */ + + l_queue_insert(call_list, call, ofono_call_compare, NULL); + + ofono_voicecall_notify(vc, call); +} + +static void ofono_call_list_notify(struct ofono_voicecall *vc, + struct l_queue *calls) +{ + struct voicecall_data *vd = ofono_voicecall_get_data(vc); + struct l_queue *old_calls = vd->call_list; + struct l_queue *new_calls = calls; + struct ofono_call *new_call, *old_call; + const struct l_queue_entry *old_entry, *new_entry; + + uint loop_length = + MAX(l_queue_length(old_calls), l_queue_length(new_calls)); + + old_entry = l_queue_get_entries(old_calls); + new_entry = l_queue_get_entries(new_calls); + + for (uint i = 0; i < loop_length; ++i) { + old_call = old_entry ? old_entry->data : NULL; + new_call = new_entry ? new_entry->data : NULL; + + if (new_call && new_call->status == CALL_STATUS_DISCONNECTED) { + ofono_voicecall_disconnected( + vc, new_call->id, + OFONO_DISCONNECT_REASON_REMOTE_HANGUP, NULL); + + l_queue_remove(calls, new_call); + l_free(new_call); + continue; + } + + if (old_call && + (new_call == NULL || (new_call->id > old_call->id))) + ofono_voicecall_disconnected( + vc, old_call->id, + OFONO_DISCONNECT_REASON_REMOTE_HANGUP, NULL); + else if (new_call && + (old_call == NULL || (new_call->id < old_call->id))) { + DBG("Notify new call %d", new_call->id); + /* new call, signal it */ + if (new_call->type == 0) + ofono_voicecall_notify(vc, new_call); + } else if (memcmp(new_call, old_call, sizeof(*new_call)) && + new_call->type == 0) + ofono_voicecall_notify(vc, new_call); + + if (old_entry) + old_entry = old_entry->next; + if (new_entry) + new_entry = new_entry->next; + } + + l_queue_destroy(old_calls, l_free); + vd->call_list = calls; +} + +static const char *qmi_voice_call_state_name(enum qmi_voice_call_state value) +{ + switch (value) { + case QMI_VOICE_CALL_STATE_IDLE: + return "QMI_VOICE_CALL_STATE_IDLE"; + case QMI_VOICE_CALL_STATE_ORIG: + return "QMI_VOICE_CALL_STATE_ORIG"; + case QMI_VOICE_CALL_STATE_INCOMING: + return "QMI_VOICE_CALL_STATE_INCOMING"; + case QMI_VOICE_CALL_STATE_CONV: + return "QMI_VOICE_CALL_STATE_CONV"; + case QMI_VOICE_CALL_STATE_CC_IN_PROG: + return "QMI_VOICE_CALL_STATE_CC_IN_PROG"; + case QMI_VOICE_CALL_STATE_ALERTING: + return "QMI_VOICE_CALL_STATE_ALERTING"; + case QMI_VOICE_CALL_STATE_HOLD: + return "QMI_VOICE_CALL_STATE_HOLD"; + case QMI_VOICE_CALL_STATE_WAITING: + return "QMI_VOICE_CALL_STATE_WAITING"; + case QMI_VOICE_CALL_STATE_DISCONNECTING: + return "QMI_VOICE_CALL_STATE_DISCONNECTING"; + case QMI_VOICE_CALL_STATE_END: + return "QMI_VOICE_CALL_STATE_END"; + case QMI_VOICE_CALL_STATE_SETUP: + return "QMI_VOICE_CALL_STATE_SETUP"; + } + return "QMI_CALL_STATE_"; +} + +static bool qmi_to_ofono_status(uint8_t status, int *ret) +{ + int err = false; + + switch (status) { + case QMI_VOICE_CALL_STATE_IDLE: + case QMI_VOICE_CALL_STATE_END: + case QMI_VOICE_CALL_STATE_DISCONNECTING: + *ret = CALL_STATUS_DISCONNECTED; + break; + case QMI_VOICE_CALL_STATE_HOLD: + *ret = CALL_STATUS_HELD; + break; + case QMI_VOICE_CALL_STATE_WAITING: + *ret = CALL_STATUS_WAITING; + break; + case QMI_VOICE_CALL_STATE_ORIG: + *ret = CALL_STATUS_DIALING; + break; + case QMI_VOICE_CALL_STATE_SETUP: + case QMI_VOICE_CALL_STATE_INCOMING: + *ret = CALL_STATUS_INCOMING; + break; + case QMI_VOICE_CALL_STATE_CONV: + *ret = CALL_STATUS_ACTIVE; + break; + case QMI_VOICE_CALL_STATE_CC_IN_PROG: + *ret = CALL_STATUS_DIALING; + break; + case QMI_VOICE_CALL_STATE_ALERTING: + *ret = CALL_STATUS_ALERTING; + break; + default: + err = true; + } + return err; +} + +static uint8_t ofono_to_qmi_direction(enum call_direction ofono_direction) +{ + return ofono_direction + 1; +} + +static enum call_direction qmi_to_ofono_direction(uint8_t qmi_direction) +{ + return qmi_direction - 1; +} + +static int qmi_voice_call_status(struct qmi_result *qmi_result, + struct qmi_voice_all_call_status_ind *result) +{ + int offset; + uint16_t len; + bool status = true; + const struct qmi_voice_remote_party_number *remote_party_number; + const struct qmi_voice_call_information *call_information; + + static const uint8_t QMI_VOICE_ALL_CALL_STATUS_CALL_INFORMATION = 0x01; + static const uint8_t QMI_VOICE_ALL_CALL_STATUS_REMOTE_NUMBER = 0x10; + static const uint8_t QMI_VOICE_ALL_CALL_INFO_CALL_INFORMATION = 0x10; + static const uint8_t QMI_VOICE_ALL_CALL_INFO_REMOTE_NUMBER = 0x11; + + /* mandatory */ + call_information = qmi_result_get( + qmi_result, QMI_VOICE_ALL_CALL_STATUS_CALL_INFORMATION, &len); + + if (!call_information) { + call_information = qmi_result_get( + qmi_result, QMI_VOICE_ALL_CALL_INFO_CALL_INFORMATION, + &len); + status = false; + } + + if (call_information) { + /* verify the length */ + if (len < sizeof(call_information->size)) + return -EMSGSIZE; + + if (len != + call_information->size * + sizeof(struct qmi_voice_call_information_instance) + + sizeof(call_information->size)) + return -EMSGSIZE; + + result->call_information_set = 1; + result->call_information = call_information; + } else + return -EBADMSG; + + /* mandatory */ + remote_party_number = qmi_result_get( + qmi_result, + status ? QMI_VOICE_ALL_CALL_STATUS_REMOTE_NUMBER : + QMI_VOICE_ALL_CALL_INFO_REMOTE_NUMBER, + &len); + + if (remote_party_number) { + const struct qmi_voice_remote_party_number_instance *instance; + int instance_size = + sizeof(struct qmi_voice_remote_party_number_instance); + int i; + + /* verify the length */ + if (len < sizeof(remote_party_number->size)) + return -EMSGSIZE; + + for (i = 0, offset = sizeof(remote_party_number->size); + offset <= len && i < 16 && i < remote_party_number->size; + i++) { + if (offset == len) + break; + else if (offset + instance_size > len) + return -EMSGSIZE; + + instance = (void *)remote_party_number + offset; + result->remote_party_number[i] = instance; + offset += + sizeof(struct qmi_voice_remote_party_number_instance) + + instance->number_size; + } + result->remote_party_number_set = 1; + result->remote_party_number_size = remote_party_number->size; + } else + return -EBADMSG; + + return 0; +} + +static void all_call_status_ind(struct qmi_result *result, void *user_data) +{ + struct ofono_voicecall *vc = user_data; + struct voicecall_data *vd = ofono_voicecall_get_data(vc); + struct l_queue *calls = l_queue_new(); + int i; + int size = 0; + struct qmi_voice_all_call_status_ind status_ind; + + DBG(""); + if (qmi_voice_call_status(result, &status_ind) != 0) { + DBG("Parsing of all call status indication failed"); + goto error; + } + + if (!status_ind.remote_party_number_set || + !status_ind.call_information_set) { + DBG("Some required fields are not set"); + goto error; + } + + size = status_ind.call_information->size; + if (!size) { + DBG("No call informations received!"); + goto error; + } + + /* expect we have valid fields for every call */ + if (size != status_ind.remote_party_number_size) { + DBG("Not all fields have the same size"); + goto error; + } + + for (i = 0; i < size; i++) { + struct qmi_voice_call_information_instance call_info; + struct ofono_call *call; + const struct qmi_voice_remote_party_number_instance + *remote_party = status_ind.remote_party_number[i]; + int number_size; + + call_info = status_ind.call_information->instance[i]; + call = l_new(struct ofono_call, 1); + call->id = call_info.id; + call->direction = qmi_to_ofono_direction(call_info.direction); + + if (qmi_to_ofono_status(call_info.state, &call->status)) { + DBG("Ignore call id %d, because can not convert QMI state 0x%x to ofono.", + call_info.id, call_info.state); + l_free(call); + continue; + } + DBG("Call %d in state %s(%d)", call_info.id, + qmi_voice_call_state_name(call_info.state), + call_info.state); + + call->type = 0; /* always voice */ + number_size = remote_party->number_size + 1; + if (number_size > OFONO_MAX_PHONE_NUMBER_LENGTH) + number_size = OFONO_MAX_PHONE_NUMBER_LENGTH; + l_strlcpy(call->phone_number.number, remote_party->number, + number_size); + + if (strlen(call->phone_number.number) > 0) + call->clip_validity = 0; + else + call->clip_validity = 2; + + l_queue_push_tail(calls, call); + DBG("%d", l_queue_length(calls)); + } + + ofono_call_list_notify(vc, calls); + + return; +error: + l_queue_destroy(calls, l_free); +} + +static void dial_cb(struct qmi_result *result, void *user_data) +{ + struct cb_data *cbd = user_data; + struct ofono_voicecall *vc = cbd->user; + ofono_voicecall_cb_t cb = cbd->cb; + uint16_t error; + uint8_t call_id; + bool call_id_set = false; + + static const uint8_t QMI_VOICE_DIAL_RESULT_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_DIAL_RESULT_CALL_ID, + &call_id)) + call_id_set = true; + else { + DBG("Received invalid Result"); + CALLBACK_WITH_FAILURE(cb, cbd->data); + return; + } + + if (!call_id_set) { + DBG("Didn't receive a call id"); + CALLBACK_WITH_FAILURE(cb, cbd->data); + return; + } + + DBG("New call QMI id %d", call_id); + ofono_call_list_dial_callback(vc, call_id); + + CALLBACK_WITH_SUCCESS(cb, cbd->data); +} + +static void dial(struct ofono_voicecall *vc, + const struct ofono_phone_number *ph, + enum ofono_clir_option clir, ofono_voicecall_cb_t cb, + void *data) +{ + struct voicecall_data *vd = ofono_voicecall_get_data(vc); + struct cb_data *cbd = cb_data_new(cb, data); + struct qmi_param *param; + const char *calling_number = phone_number_to_string(ph); + + static const uint8_t QMI_VOICE_DIAL_CALL_NUMBER = 0x01; + static const uint8_t QMI_VOICE_DIAL_CALL_TYPE = 0x10; + static const uint8_t QMI_VOICE_CALL_TYPE_VOICE = 0x00; + + DBG(""); + + cbd->user = vc; + memcpy(&vd->dialed, ph, sizeof(*ph)); + + param = qmi_param_new(); + if (!param) + goto error; + + if (!qmi_param_append(param, QMI_VOICE_DIAL_CALL_NUMBER, + strlen(calling_number), calling_number)) { + goto error; + } + + qmi_param_append_uint8(param, QMI_VOICE_DIAL_CALL_TYPE, + QMI_VOICE_CALL_TYPE_VOICE); + + if (qmi_service_send(vd->voice, QMI_VOICE_DIAL_CALL, param, dial_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; @@ -58,6 +529,9 @@ static void create_voice_cb(struct qmi_service *service, void *user_data) data->voice = qmi_service_ref(service); + qmi_service_register(data->voice, QMI_VOICE_ALL_CALL_STATUS_IND, + all_call_status_ind, vc, NULL); + ofono_voicecall_register(vc); } @@ -70,6 +544,7 @@ static int qmi_voicecall_probe(struct ofono_voicecall *vc, DBG(""); data = l_new(struct voicecall_data, 1); + data->call_list = l_queue_new(); ofono_voicecall_set_data(vc, data); @@ -77,7 +552,6 @@ static int qmi_voicecall_probe(struct ofono_voicecall *vc, create_voice_cb, vc, NULL); return 0; - } static void qmi_voicecall_remove(struct ofono_voicecall *vc) @@ -92,13 +566,16 @@ static void qmi_voicecall_remove(struct ofono_voicecall *vc) qmi_service_unref(data->voice); + l_queue_destroy(data->call_list, l_free); l_free(data); } static const struct ofono_voicecall_driver driver = { .probe = qmi_voicecall_probe, .remove = qmi_voicecall_remove, + .dial = dial, }; OFONO_ATOM_DRIVER_BUILTIN(voicecall, qmimodem, &driver) + From patchwork Tue Apr 2 21:25:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Pigg X-Patchwork-Id: 13614643 Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DD26E15E1F3 for ; Tue, 2 Apr 2024 21:26:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712093205; cv=none; b=LgrvImnZvAaiY0QNoZctwepp4FIBJW0KQrEnd17HH1okv07kdUCErCLgx7fXlw3keJXXddQ/5OBXj+WCepYtLyX8kXoTD91Nf7i4pUn8rtWuzHRHVArIqQ/6CSHk9J5wKzLscJPt88ADORCRst1S7q5Yz33f0XZ+COIuZbIrAFU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712093205; c=relaxed/simple; bh=7/1OUGNgTsBugKyMOvEtdmKQOn8LhoxU5RQrJWP0gLo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nJJnkyrbWmY5cis7etHtQn8e+7n0a8g+BhlUWMy0ZGjh/LeYnoDwhj1BZ3gWaVtBlasJ46EamyUiOX60fMBhokWmRkN2hQxd0XYDG9zcKOdx3YXPa0rtTEhxUCYcEfwGm0egmUQWRNYRVMm1OrW5CcOQ8P6Cgc5uQVlw4KkQm/M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=piggz.co.uk; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=NPiheEsz; arc=none smtp.client-ip=209.85.221.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=piggz.co.uk Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="NPiheEsz" Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-34356c24701so723612f8f.1 for ; Tue, 02 Apr 2024 14:26:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712093202; x=1712698002; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=FXnmq4zWsC0VWYqb8Lo6ZfP0xrXT14MD46tG9HaS8fY=; b=NPiheEszroqRM3lkYEYaoSrrrtkXKI7G+Q60bpktH3KoqkuPrP0LlScG3K/yCP7B/Y I4yBDnu+3UVj9JP+a6CNPpyqgY5hJtWNXug8/SUSGfl6FAv4hsHMnRG++waaOa5NxZ6I XZPKntDLxgciaM4L/uEY01ul5D+WPO77MLLUZnRiN5EEG9eJPMOktBltSr/TC74FuJ5T sBJXPnPu0jl4Y40ayv/R+KvILXASavrza2ngTIFEQA1Ii6WIzV143lkUSs8kejp3ltA7 m124mdJN3NaIL5dgq4PxWzHdsGZONnMtJnAMsrvfZKTpXetUtHXOWVHj1EdDdpDOmipV gbzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712093202; x=1712698002; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=FXnmq4zWsC0VWYqb8Lo6ZfP0xrXT14MD46tG9HaS8fY=; b=jtUr364v5co+7G8cEL0EfCHAi5HEgCq7Eavrw2WB1nDW7mbDJqWFzZNw+pbIIKd5eQ rYee4vnjWSAnYY/9dtRuwvlpQZ21A1Smy26TGNGJcm71DUFJz0p55frH4PqzHTq8yizj fapEACEGEC+zcT92PUKS3G0IEh9eIWRavdwh40QV3Q3zR0ou0sj9DdaKENJ8bwSTeL+P mBbl3jmURhl7tscIH5A0D3sJ6kaWO43RMUFRhNW3NyUu8Kvm9oo40BfNrupEf+OBjuaV 5af7BadUoBFXxLnsq1gOOYANVrxcL+nqJ8FydcZxwPjjDH1Oi12wNs0h8E/5xnfi7sB9 cpfA== X-Gm-Message-State: AOJu0YyVj97ktH9SJtwCXX1fqnRJwo5jaqYbvg9HXUJjtSistZ2HTBm1 PqKbttP6/EJwmTQdFkXyPeW6G/FZHg8XTydD0HnauFv2LEBGmKaIfzZ97QwzDvw= X-Google-Smtp-Source: AGHT+IEDku+LHRRSvJbta2ZSe6uij/Ru3vcDiI8q2uP9aBqsDEtTzLuMP/komDu4iPfhN1K0mInahQ== X-Received: by 2002:adf:9bcf:0:b0:343:796f:70c6 with SMTP id e15-20020adf9bcf000000b00343796f70c6mr1298599wrc.17.1712093202009; Tue, 02 Apr 2024 14:26:42 -0700 (PDT) Received: from adam-laptop-hp.turtle-stonecat.ts.net ([90.246.50.91]) by smtp.gmail.com with ESMTPSA id i4-20020adfefc4000000b0033b6e26f0f9sm15215643wrp.42.2024.04.02.14.26.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Apr 2024 14:26:41 -0700 (PDT) Sender: Adam Pigg From: Adam Pigg To: ofono@lists.linux.dev Cc: Adam Pigg Subject: [PATCH v3 2/4] qmimodem: voicecall: Implement call answer Date: Tue, 2 Apr 2024 22:25:16 +0100 Message-ID: <20240402212625.5348-2-adam@piggz.co.uk> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240402212625.5348-1-adam@piggz.co.uk> References: <20240402212625.5348-1-adam@piggz.co.uk> Precedence: bulk X-Mailing-List: ofono@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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. anser_cb will then be called which retrieves the call-id and checks the status of the result. --- drivers/qmimodem/voice.h | 1 + drivers/qmimodem/voicecall.c | 65 ++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) 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 cadb5adf..8ee49acf 100644 --- a/drivers/qmimodem/voicecall.c +++ b/drivers/qmimodem/voicecall.c @@ -508,6 +508,70 @@ 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 = cb_data_new(cb, data); + struct ofono_call *call; + struct qmi_param *param = NULL; + + static const uint8_t QMI_VOICE_ANSWER_CALL_ID = 0x01; + + DBG(""); + + cbd->user = vc; + + 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"); + goto error; + } + + param = qmi_param_new(); + if (!param) + goto error; + + 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; @@ -574,6 +638,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) From patchwork Tue Apr 2 21:25:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Pigg X-Patchwork-Id: 13614644 Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2796515E1F5 for ; Tue, 2 Apr 2024 21:26:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712093207; cv=none; b=RYPB286WnI0sWqbYeoye2BnolUU08i9MftU8xpBUqdVGZRvri3T7dpnPxlzJvMrv3e+LCxK4Qvmclfmwi6qsr+g7Sns6DXyf32i+R09UmkNeIWuyOfqlge75F14MjooqWeIYpp3ia1HcJA0uTxCelN8oJSMrExLsmRlTynVfVYs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712093207; c=relaxed/simple; bh=GSPIKFAjOL9z8fgWaqCI5B0Pjm9nSTp9KCd/1YfL2MI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JgEVIDmzucrw52XnA+2h8/y8s19XOXZ9NnDGY9DVWJt1nTq5uIDPdq8EGTNbxiNejLZxpK93bnaYud+jltyOHVo25eYZR4xYMnXhNjX+JQVWKC+Sfa5WpuIhgAAl8jV018+0/1fAhoD4jS1dVO9w0C1TrtDHXjJgcRHoNUQrqG0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=piggz.co.uk; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=ZJQMf9aP; arc=none smtp.client-ip=209.85.221.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=piggz.co.uk Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ZJQMf9aP" Received: by mail-wr1-f44.google.com with SMTP id ffacd0b85a97d-341ccef5058so4134565f8f.2 for ; Tue, 02 Apr 2024 14:26:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712093203; x=1712698003; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=QhkSB9lbJIfzvwq01KXiL5LedGTWyHyHaGkAPI9PSnM=; b=ZJQMf9aP1HGPgrvNFsSdAI/2LDtFezGVsDqEq5zcW35ypEM0ujVsHW5Z8oJ26iO1pA 8k5B0HTK/RrmHUayGFAFmZfGapJI44AJBJ56BE7XGD8eu5ByXXoQuFoalWEa/A3Qwj3t btHyuRc9D53MlcGGcsxgpQmWCg7OS6Xak3pdJ4eEGqzhhjY1MqdfNGiS9btGQLVW64Ot uxZZKJiHhI809A8zxvs4IqFmf2ovJCuBiXkD6PE6S6+mlR2qPbAHqcS385jSSyf7mV83 Uqe1pCO2Fshjg0kOnrqWUSGBkx2gDncv7etFzKEZVAOrHzpjEh8kjtP2tg2RDNyUyWU0 bdOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712093203; x=1712698003; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=QhkSB9lbJIfzvwq01KXiL5LedGTWyHyHaGkAPI9PSnM=; b=Lhiem7XIcmGjFAL2n+S4iOGHZPreWt6bJrno5nLwkFK/554aro62kvneVkIg5qqNi0 RpbbnT4H//fnbVbh34fNrZUjeNTviWS5DJ5Y1dxv+lg13q3EGVG/hc+CJpKjHkW/2tSD +ZFimIMq4WHfIXaFl5OBaHNGJ8Aag3w8TTz0yRjc5wRW/bL5Eb4AdnHlPgFWD8FNoRJ9 3AfHNreVet9zezN++58SpiSHGpdpO5D2pMj0ZV0fTSF7qVUN1Tm5UzDmy6TTflkiR5fl 2MSJu4BljreUxlRmF9B/Cc33nIU+tpZinNEINmdnxCeMt1GTkDmH+bhNRS9ARqtB79Ae FLcA== X-Gm-Message-State: AOJu0YzAxk1gNMbwFYcx8Iyq/osHD9RPoHTGSE6hoZUIT0riqTzlBEYt AC8R+fkfD1Yb56/V05pQE75NQfAhuAgPDWIg7RfSCNDHUay+MD/1druTRY+c4bU= X-Google-Smtp-Source: AGHT+IGRSpPBi9JjHResi8BywV0tfobhBgTHpFwDw/RDAKWoRAOgmE2t2nw61Wt7Bp4c9sd4VY1Elg== X-Received: by 2002:a05:6000:1d82:b0:33d:a70d:a9b2 with SMTP id bk2-20020a0560001d8200b0033da70da9b2mr10107123wrb.5.1712093202973; Tue, 02 Apr 2024 14:26:42 -0700 (PDT) Received: from adam-laptop-hp.turtle-stonecat.ts.net ([90.246.50.91]) by smtp.gmail.com with ESMTPSA id i4-20020adfefc4000000b0033b6e26f0f9sm15215643wrp.42.2024.04.02.14.26.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Apr 2024 14:26:42 -0700 (PDT) Sender: Adam Pigg From: Adam Pigg To: ofono@lists.linux.dev Cc: Adam Pigg Subject: [PATCH v3 3/4] qmimodem: voicecall: Implement active call hangup Date: Tue, 2 Apr 2024 22:25:17 +0100 Message-ID: <20240402212625.5348-3-adam@piggz.co.uk> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240402212625.5348-1-adam@piggz.co.uk> References: <20240402212625.5348-1-adam@piggz.co.uk> Precedence: bulk X-Mailing-List: ofono@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 hangup_active iterates the current list of calls, looking for the first active call and then calls release_specific. This then sets up the parameters for a call to QMI_VOICE_END_CALL, with the only paramters being the call-id. end_call_cb will then be called and will parse out the call-id and check for success. --- drivers/qmimodem/voice.h | 1 + drivers/qmimodem/voicecall.c | 84 +++++++++++++++++++++++++++++++++++- 2 files changed, 84 insertions(+), 1 deletion(-) diff --git a/drivers/qmimodem/voice.h b/drivers/qmimodem/voice.h index a524cf98..caedb079 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_END_CALL = 0x21, QMI_VOICE_ANSWER_CALL = 0x22, QMI_VOICE_SUPS_NOTIFICATION_IND = 0x32, QMI_VOICE_SET_SUPS_SERVICE = 0x33, diff --git a/drivers/qmimodem/voicecall.c b/drivers/qmimodem/voicecall.c index 8ee49acf..627719a8 100644 --- a/drivers/qmimodem/voicecall.c +++ b/drivers/qmimodem/voicecall.c @@ -572,6 +572,86 @@ error: l_free(param); } +static void end_call_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_END_RETURN_CALL_ID = 0x10; + + 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_END_RETURN_CALL_ID, &call_id)) + DBG("Received end call result with call id %d", call_id); + + CALLBACK_WITH_SUCCESS(cb, cbd->data); +} + +static void release_specific(struct ofono_voicecall *vc, int id, + ofono_voicecall_cb_t cb, void *data) +{ + struct voicecall_data *vd = ofono_voicecall_get_data(vc); + struct cb_data *cbd = cb_data_new(cb, data); + struct qmi_param *param = NULL; + + static const uint8_t QMI_VOICE_END_CALL_ID = 0x01; + + DBG(""); + cbd->user = vc; + + param = qmi_param_new(); + if (!param) + goto error; + + if (!qmi_param_append_uint8(param, QMI_VOICE_END_CALL_ID, id)) + goto error; + + if (qmi_service_send(vd->voice, QMI_VOICE_END_CALL, param, end_call_cb, + cbd, l_free) > 0) + return; + +error: + CALLBACK_WITH_FAILURE(cb, data); + l_free(cbd); + l_free(param); +} + +static void hangup_active(struct ofono_voicecall *vc, ofono_voicecall_cb_t cb, + void *data) +{ + struct voicecall_data *vd = ofono_voicecall_get_data(vc); + struct ofono_call *call; + enum call_status active[] = { + CALL_STATUS_ACTIVE, + CALL_STATUS_DIALING, + CALL_STATUS_ALERTING, + CALL_STATUS_INCOMING, + }; + + DBG(""); + for (uint32_t i = 0; i < L_ARRAY_SIZE(active); i++) { + call = l_queue_find(vd->call_list, ofono_call_compare_by_status, + L_INT_TO_PTR(active[i])); + + if (call) + break; + } + + if (call == NULL) { + DBG("Can not find a call to hang up"); + CALLBACK_WITH_FAILURE(cb, data); + return; + } + + release_specific(vc, call->id, cb, data); +} + static void create_voice_cb(struct qmi_service *service, void *user_data) { struct ofono_voicecall *vc = user_data; @@ -594,7 +674,7 @@ static void create_voice_cb(struct qmi_service *service, void *user_data) data->voice = qmi_service_ref(service); qmi_service_register(data->voice, QMI_VOICE_ALL_CALL_STATUS_IND, - all_call_status_ind, vc, NULL); + all_call_status_ind, vc, NULL); ofono_voicecall_register(vc); } @@ -639,6 +719,8 @@ static const struct ofono_voicecall_driver driver = { .remove = qmi_voicecall_remove, .dial = dial, .answer = answer, + .hangup_active = hangup_active, + .release_specific = release_specific, }; OFONO_ATOM_DRIVER_BUILTIN(voicecall, qmimodem, &driver) From patchwork Tue Apr 2 21:25:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Pigg X-Patchwork-Id: 13614645 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1F36415AAA7 for ; Tue, 2 Apr 2024 21:26:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712093207; cv=none; b=TVDqEwcp4gvkCEVHS3ijynlF1tON/Pj2MRUnlMJfjOQ9/5176Nv6gg31UN4N4ZD8qKLuumuqpoLj1Q4TZimbP+EfK/dkeKOQHKUC/dibjoFoE3VoznYivsvvSGLA0YSolgVd9XkN3+dRPlqYZAeWHBdpXyxHa0r7K4lA5gd975s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712093207; c=relaxed/simple; bh=WAOX32xmnVjpsxOAjhsEKxEtw8H1SAdpoOLu8WePGc4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mrUJPHztlrWWeh+Blv06B7lDBcmgvH05nVIrM50PRP/2eu+6PoK+mzTMhl8jr+R95ensqRjetmRkhceYauPPhzRm2+GPeHQq+wx9WXxlaYzamAPAg/Lj82woDdRYJDtgRtRYgpd4QOY0QTZYX2G1x1zAFfo3rB0f1X/6Y2CQmHE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=piggz.co.uk; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=aKfqk7Kt; arc=none smtp.client-ip=209.85.128.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=piggz.co.uk Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="aKfqk7Kt" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-415446af364so1722555e9.0 for ; Tue, 02 Apr 2024 14:26:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712093204; x=1712698004; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=TOFt0gjXeOf7nxE6RbtJOgCDN6R9zL6aBzXDEya3f1U=; b=aKfqk7KtOhcs14vf4KMLxZSrPkLW0LPDQJbP3F9s29DDN4U0IbiEuGX33PomIDQsBK vZyeca8DvxLpyGpy/XlEUbi+9w0+EXNOjozlfdTiFCsljNXi6QzNqmN3q9j4d1d3dhiq EXwWC2kqVp91conDbvkn2dgC6XmjVw4+O2J53cRdNOTSQXBD1CycSX00J0YJAvqA78Je zOfpFwU73XkG+SK/zdWvTS/P9I9yd7rnJC3lRw1t60b9+e0/M8/mW074TA/YGP1bKnkJ 8+Z+1N6L70OXvyPqmWx3DTqIOECSXEFUbCci7UaKwEG+hiRdm4LgaQyIWbZ315RdUZvo m1WA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712093204; x=1712698004; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=TOFt0gjXeOf7nxE6RbtJOgCDN6R9zL6aBzXDEya3f1U=; b=kq46/foFQEOVbHH23oPUR/V/a4H+XGOlz5zkLrPJHaNyfq7DIRLL+ck7MSxRJF5NfA JTnRpKMVb4ES5Obv8PC0vQNxpLeFtGe3yaik89kv4KYl99fYJ8gEeFziKbIa/mH5vAOY u5EUG0rQOJ52gjVy8m6+d5AJYY+5Cv/fK5sLRF7IiI0F4q1PxuJGPIZ6oqR+vfujV+83 lAxR3d2XTN6asvhLSUSH+mo4aWzswXZAW2aosWv9LOLvce1msWtVDxwfyiRtG/3XvVT3 LPAh6pdhM/9mhjBqThxau+fT/I6c18z0Bb3aXigBZpvG6HA49uIKGpAtl5igAoMyclgq ZCaQ== X-Gm-Message-State: AOJu0Yw1g9JxjacfcdNXVbndNCaV+N6E2mWcELQ3MqqyCvEMYM9miMwA saywxu0n1/UPEKNmQ9mjYBAB5LSRHaRE/e0sQDDSv5Zi4VyIZJfs6sGbUfAl9w4= X-Google-Smtp-Source: AGHT+IH91SLyVwdUB3DCU3wldV7bF9dbWDJOAcomjbb4Q8SCbFk4k5h18PKYjPtltVjOxztKm6B6GQ== X-Received: by 2002:a05:6000:1149:b0:341:c9bc:6340 with SMTP id d9-20020a056000114900b00341c9bc6340mr584938wrx.12.1712093204252; Tue, 02 Apr 2024 14:26:44 -0700 (PDT) Received: from adam-laptop-hp.turtle-stonecat.ts.net ([90.246.50.91]) by smtp.gmail.com with ESMTPSA id i4-20020adfefc4000000b0033b6e26f0f9sm15215643wrp.42.2024.04.02.14.26.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Apr 2024 14:26:43 -0700 (PDT) Sender: Adam Pigg From: Adam Pigg To: ofono@lists.linux.dev Cc: Adam Pigg Subject: [PATCH v3 4/4] qmimodem: voicecall: Implement DTMF tones Date: Tue, 2 Apr 2024 22:25:18 +0100 Message-ID: <20240402212625.5348-4-adam@piggz.co.uk> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240402212625.5348-1-adam@piggz.co.uk> References: <20240402212625.5348-1-adam@piggz.co.uk> Precedence: bulk X-Mailing-List: ofono@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The send_dtmf function sets up a call to send_one_dtmf, which will call the QMI_VOICE_START_CONTINUOUS_DTMF service function. The paramters to this call are a hard coded call-id and the DTMF character to send. start_cont_dtmf_cb will then be called which will set up a call to QMI_VOICE_STOP_CONTINUOUS_DTMF to stop the tone. Finally, stop_cont_dtmf_cb will check the final status. --- drivers/qmimodem/voice.h | 12 ++++ drivers/qmimodem/voicecall.c | 131 +++++++++++++++++++++++++++++++++++ 2 files changed, 143 insertions(+) diff --git a/drivers/qmimodem/voice.h b/drivers/qmimodem/voice.h index caedb079..5b777af8 100644 --- a/drivers/qmimodem/voice.h +++ b/drivers/qmimodem/voice.h @@ -53,6 +53,8 @@ enum voice_commands { QMI_VOICE_GET_ALL_CALL_INFO = 0x2f, QMI_VOICE_END_CALL = 0x21, QMI_VOICE_ANSWER_CALL = 0x22, + QMI_VOICE_START_CONTINUOUS_DTMF = 0x29, + QMI_VOICE_STOP_CONTINUOUS_DTMF = 0x2A, QMI_VOICE_SUPS_NOTIFICATION_IND = 0x32, QMI_VOICE_SET_SUPS_SERVICE = 0x33, QMI_VOICE_GET_CALL_WAITING = 0x34, @@ -85,6 +87,16 @@ enum qmi_voice_call_state { QMI_VOICE_CALL_STATE_SETUP }; +enum qmi_voice_call_dtmf_param { + QMI_VOICE_DTMF_DATA = 0x01, +}; + +enum parse_error { + NONE = 0, + MISSING_MANDATORY = 1, + INVALID_LENGTH = 2, +}; + struct qmi_ussd_data { uint8_t dcs; uint8_t length; diff --git a/drivers/qmimodem/voicecall.c b/drivers/qmimodem/voicecall.c index 627719a8..4bdb64b7 100644 --- a/drivers/qmimodem/voicecall.c +++ b/drivers/qmimodem/voicecall.c @@ -42,6 +42,8 @@ struct voicecall_data { uint16_t minor; struct l_queue *call_list; struct ofono_phone_number dialed; + char *full_dtmf; + char *next_dtmf; }; struct qmi_voice_all_call_status_ind { @@ -652,6 +654,134 @@ static void hangup_active(struct ofono_voicecall *vc, ofono_voicecall_cb_t cb, release_specific(vc, call->id, cb, data); } +static void stop_cont_dtmf_cb(struct qmi_result *result, void *user_data) +{ + struct cb_data *cbd = user_data; + ofono_voicecall_cb_t cb = cbd->cb; + + uint16_t error; + + DBG(""); + + if (qmi_result_set_error(result, &error)) { + DBG("QMI Error %d", error); + CALLBACK_WITH_FAILURE(cb, cbd->data); + return; + } + + CALLBACK_WITH_SUCCESS(cb, cbd->data); + l_free(cbd); +} + +static void start_cont_dtmf_cb(struct qmi_result *result, void *user_data) +{ + struct cb_data *cbd = user_data; + ofono_voicecall_cb_t cb = cbd->cb; + struct ofono_voicecall *vc = cbd->user; + struct voicecall_data *vd = ofono_voicecall_get_data(vc); + uint16_t error; + struct qmi_param *param = NULL; + + DBG(""); + + if (qmi_result_set_error(result, &error)) { + DBG("QMI Error %d", error); + CALLBACK_WITH_FAILURE(cb, cbd->data); + return; + } + + param = qmi_param_new(); + if (!param) + goto error; + + if (!qmi_param_append_uint8(param, QMI_VOICE_DTMF_DATA, 0xff)) + goto error; + + if (qmi_service_send(vd->voice, QMI_VOICE_STOP_CONTINUOUS_DTMF, param, + stop_cont_dtmf_cb, cbd, NULL) > 0) + return; + +error: + CALLBACK_WITH_FAILURE(cb, cbd->data); + l_free(cbd); + l_free(param); +} + +static void send_one_dtmf(struct ofono_voicecall *vc, const char dtmf, + ofono_voicecall_cb_t cb, void *data) +{ + struct voicecall_data *vd = ofono_voicecall_get_data(vc); + struct qmi_param *param = NULL; + uint8_t param_body[2]; + struct cb_data *cbd = cb_data_new(cb, data); + + DBG(""); + + cbd->user = vc; + + param = qmi_param_new(); + if (!param) + goto error; + + param_body[0] = 0xff; + param_body[1] = (uint8_t)dtmf; + + if (!qmi_param_append(param, QMI_VOICE_DTMF_DATA, sizeof(param_body), + param_body)) { + goto error; + } + + if (qmi_service_send(vd->voice, QMI_VOICE_START_CONTINUOUS_DTMF, param, + start_cont_dtmf_cb, cbd, NULL) > 0) { + return; + } + +error: + CALLBACK_WITH_FAILURE(cb, data); + l_free(cbd); + l_free(param); +} + +static void send_one_dtmf_cb(const struct ofono_error *error, void *data) +{ + struct cb_data *cbd = data; + struct voicecall_data *vd = ofono_voicecall_get_data(cbd->user); + ofono_voicecall_cb_t cb = cbd->cb; + + DBG(""); + + if (error->type != OFONO_ERROR_TYPE_NO_ERROR || + *vd->next_dtmf == 0) { + if (error->type == OFONO_ERROR_TYPE_NO_ERROR) + CALLBACK_WITH_SUCCESS(cb, cbd->data); + else + CALLBACK_WITH_FAILURE(cb, cbd->data); + + l_free(vd->full_dtmf); + l_free(cbd); + } else { + send_one_dtmf(cbd->user, + *(vd->next_dtmf++), + send_one_dtmf_cb, data); + } +} + +static void send_dtmf(struct ofono_voicecall *vc, const char *dtmf, + ofono_voicecall_cb_t cb, void *data) +{ + struct voicecall_data *vd = ofono_voicecall_get_data(vc); + struct cb_data *cbd = cb_data_new(cb, data); + + DBG(""); + + vd->full_dtmf = l_strdup(dtmf); + vd->next_dtmf = &vd->full_dtmf[1]; + + cbd->user = vc; + + send_one_dtmf(vc, *dtmf, send_one_dtmf_cb, cbd); +} + static void create_voice_cb(struct qmi_service *service, void *user_data) { struct ofono_voicecall *vc = user_data; @@ -721,6 +851,7 @@ static const struct ofono_voicecall_driver driver = { .answer = answer, .hangup_active = hangup_active, .release_specific = release_specific, + .send_tones = send_dtmf, }; OFONO_ATOM_DRIVER_BUILTIN(voicecall, qmimodem, &driver)