From patchwork Tue Mar 26 10:19:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Pigg X-Patchwork-Id: 13603842 Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) (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 31F8C4F1F8 for ; Tue, 26 Mar 2024 10:21:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711448466; cv=none; b=BIO8iLb+kF3sb9do3+hce5P2IUY0IQ/iHwZ7ECMmcfeKO+LelGw2d9skOHA8VZMXu9MMA6ckHt7fEOq46IeVlV8xot4+Yr1aNJeJbEOO2Mf/XfqjWS+xTlGvzEHbXF5jK1wGXia/u+MEUdwhr0lIZG18omRcimZaSc5FvWq74sE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711448466; c=relaxed/simple; bh=58vIO2w5Jog4hiVan5jvxZUXp0KCus75799cvHa96lM=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=btK4kUT11GCGSLAihHuKWzF/ZuxDyszeQ4oGlSx5I5/n+lgZSdhOIRwbhEK+hnc3UJ5r2xJ/X3tBL81KWH+ZPUrjROwiEdv4Ea+Fe8Vy3xZSNJI6REAz0JCFUNkkdiIDvCtDC2iNhdnGyNze1qClXOjzJrsy+iW8eYuEFyXxBSc= 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=PpeAlJxj; arc=none smtp.client-ip=209.85.221.43 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="PpeAlJxj" Received: by mail-wr1-f43.google.com with SMTP id ffacd0b85a97d-33ed4dd8659so3923227f8f.0 for ; Tue, 26 Mar 2024 03:21:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711448462; x=1712053262; 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=hxSCWzBSrwMJI0Z5mf7aIuBqSgtb1wxxveC+twb5O/k=; b=PpeAlJxjIMlg4/S6QtRqfP0JJni8q5o1kErj1gxKPuQTxllQ3nzLzMpzwZir4TiMRU 6QcubQbVZ4OXPeI42iMUBYigV3cpXDMJKfA+qKdGsyH/pTgwDYn4U88VDFHlglwgVAbY 5TUa8xu0RFX5rYgboQ3KZgNp+K+hkV8Bb0XOhddliiYIKmzFBmWOXlg91m19h+UXawIX uHqhBq9w6nqxPXn4PYEF/khEPHypveTRdknqI3EeCdC3GV8W55wAClrE8yW6UTPaCv1d aFdlHh6LANQTBC1zgmsHl0kqbx0vPS2c9Nsi6QQTasrsQEqU5bNHRRN1uL2YRVHIV4U2 bUMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711448462; x=1712053262; 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=hxSCWzBSrwMJI0Z5mf7aIuBqSgtb1wxxveC+twb5O/k=; b=rpSIgJ8CZ+3EPkhX3bxxJ83zx62Kfj9GCmPhApNXKBJK78JLK7Q6BteN3iKYKkXJLn o9H0hLwJ6NK9+2Ll0a5IU/BBQHYuhSDr0q9pThU38Ks+DH7A6Pq8FGz7jNlJp4aOdFPm sot2MLJroDC1wAJi3wdyXaNzw/CSZl3HKvdiVH6E2TTs+8P0esLsmLTMsg2RPGUSRRe3 hqLMBeAxCuab0pzoUkKSA1gcwYOyKrW9cPZnxpzW7alEhFBcXGeU5w9l8WVkqCvDl//J ZM6AP3WdRp84fzOAONWoLTY50R6EmumS7qIiZTlr3ujJ7QdB20QIkqepY6KRwc5pAu+5 qJGA== X-Gm-Message-State: AOJu0Yyjvc7FbZa/KexNsAKrNfxJneCP8AZP1sHnynF4asx62XBXWQcj ebnWCn9r3HYWvm9wewMoJqgdZ20PWM2RItU2H4/ss0tTFq6VjkxR+WnOcWBE3IE= X-Google-Smtp-Source: AGHT+IFrRFOai/uvgux3qpQIf0iKX4Xrm7jy2DITGc9MysW4p2CJed3gh4LEjgrT21O+3gflP2A+kA== X-Received: by 2002:a5d:50c9:0:b0:33e:ca1f:1401 with SMTP id f9-20020a5d50c9000000b0033eca1f1401mr991054wrt.4.1711448461748; Tue, 26 Mar 2024 03:21:01 -0700 (PDT) Received: from adam-laptop-hp.lan ([90.246.50.91]) by smtp.gmail.com with ESMTPSA id d8-20020a05600c34c800b00414903d20aesm676366wmq.11.2024.03.26.03.21.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Mar 2024 03:21:01 -0700 (PDT) Sender: Adam Pigg From: Adam Pigg To: ofono@lists.linux.dev Cc: Adam Pigg Subject: [PATCH v2 1/4] [qmimodem][voicecall] Implement call dialing Date: Tue, 26 Mar 2024 10:19:56 +0000 Message-ID: <20240326102054.30946-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 | 51 ++++ drivers/qmimodem/voicecall.c | 503 ++++++++++++++++++++++++++++++++++- 2 files changed, 553 insertions(+), 1 deletion(-) diff --git a/drivers/qmimodem/voice.h b/drivers/qmimodem/voice.h index 917e72f7..1a584f10 100644 --- a/drivers/qmimodem/voice.h +++ b/drivers/qmimodem/voice.h @@ -15,6 +15,8 @@ * */ +#include + #define QMI_VOICE_PARAM_USS_DATA 0x01 #define QMI_VOICE_PARAM_ASYNC_USSD_ERROR 0x10 @@ -25,6 +27,9 @@ #define QMI_VOICE_PARAM_USSD_IND_DATA 0x10 #define QMI_VOICE_PARAM_USSD_IND_UCS2 0x11 +#define QMI_VOICE_IND_ALL_STATUS 0x2e +#define QMI_VOICE_GET_ALL_STATUS 0x2f + /* according to GSM TS 23.038 section 5 * coding group 1111, No message class, 8 bit data */ @@ -48,6 +53,7 @@ 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_SUPS_NOTIFICATION_IND = 0x32, QMI_VOICE_SET_SUPS_SERVICE = 0x33, QMI_VOICE_GET_CALL_WAITING = 0x34, @@ -66,6 +72,50 @@ 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 +}; + +enum qmi_voice_call_dial_param { + QMI_VOICE_DIAL_CALL_NUMBER = 0x01, + QMI_VOICE_DIAL_CALL_TYPE = 0x10 +}; + +enum qmi_voice_call_dial_return { + QMI_VOICE_DIAL_RETURN_CALL_ID = 0x10 +}; + +enum qmi_voice_all_call_status_commands { + QMI_VOICE_ALL_CALL_STATUS_CALL_INFORMATION = 0x01, + QMI_VOICE_ALL_CALL_STATUS_REMOTE_NUMBER = 0x10 +}; + +enum qmi_voice_all_call_info_commands { + QMI_VOICE_ALL_CALL_INFO_CALL_INFORMATION = 0x10, + QMI_VOICE_ALL_CALL_INFO_REMOTE_NUMBER = 0x11 +}; + +enum qmi_voice_call_type { + QMI_VOICE_CALL_TYPE_VOICE = 0x0, + QMI_VOICE_CALL_TYPE_VOICE_FORCE, +}; + +enum parse_error { + NONE = 0, + MISSING_MANDATORY = 1, + INVALID_LENGTH = 2, +}; + struct qmi_ussd_data { uint8_t dcs; uint8_t length; @@ -98,3 +148,4 @@ enum qmi_ss_reason { QMI_VOICE_SS_RSN_CLIP = 0x10, QMI_VOICE_SS_RSN_CLIR = 0x11 }; + diff --git a/drivers/qmimodem/voicecall.c b/drivers/qmimodem/voicecall.c index aa34fc25..55c7009a 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,499 @@ struct voicecall_data { struct qmi_service *voice; uint16_t major; uint16_t minor; + struct l_queue *call_list; + struct voicecall_static *vs; + 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]; +}; + +enum parse_error +qmi_voice_call_status(struct qmi_result *qmi_result, + struct qmi_voice_all_call_status_ind *result); + +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__)); + +struct qmi_voice_dial_call_arg { + bool calling_number_set; + const char *calling_number; + bool call_type_set; + uint8_t call_type; +}; + +struct qmi_voice_dial_call_result { + bool call_id_set; + uint8_t call_id; }; +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; +} + +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; +} + +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); +} + +void ofono_call_list_dial_callback(struct ofono_voicecall *vc, + struct l_queue **call_list, + const struct ofono_phone_number *ph, + int call_id) +{ + struct ofono_call *call; + + /* 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); +} + +void ofono_call_list_notify(struct ofono_voicecall *vc, + struct l_queue **call_list, struct l_queue *calls) +{ + struct l_queue *old_calls = *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(*call_list, l_free); + *call_list = calls; +} + +#define _(X) \ + case X: \ + return #X + +const char *qmi_voice_call_state_name(enum qmi_voice_call_state value) +{ + switch (value) { + _(QMI_VOICE_CALL_STATE_IDLE); + _(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); + } + return "QMI_CALL_STATE_"; +} + +int qmi_to_ofono_status(uint8_t status, int *ret) +{ + int err = 0; + + 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 = 1; + } + return err; +} + +uint8_t ofono_to_qmi_direction(enum call_direction ofono_direction) +{ + return ofono_direction + 1; +} +enum call_direction qmi_to_ofono_direction(uint8_t qmi_direction) +{ + return qmi_direction - 1; +} + +enum parse_error +qmi_voice_call_status(struct qmi_result *qmi_result, + struct qmi_voice_all_call_status_ind *result) +{ + int err = NONE; + 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; + + /* mandatory */ + call_information = qmi_result_get( + qmi_result, QMI_VOICE_ALL_CALL_STATUS_CALL_INFORMATION, &len); + + /* This is so ugly! but TLV for indicator and response is different */ + 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 INVALID_LENGTH; + + if (len != call_information->size * + sizeof(struct qmi_voice_call_information_instance) + + sizeof(call_information->size)) { + return INVALID_LENGTH; + } + result->call_information_set = 1; + result->call_information = call_information; + } else + return MISSING_MANDATORY; + + /* 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 INVALID_LENGTH; + + 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 INVALID_LENGTH; + } + + 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 MISSING_MANDATORY; + + return err; +} + +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 = NULL; + int i; + int size = 0; + struct qmi_voice_all_call_status_ind status_ind; + + calls = l_queue_new(); + + DBG(""); + if (qmi_voice_call_status(result, &status_ind) != NONE) { + DBG("Parsing of all call status indication failed"); + return; + } + + if (!status_ind.remote_party_number_set || + !status_ind.call_information_set) { + DBG("Some required fields are not set"); + return; + } + + size = status_ind.call_information->size; + if (!size) { + DBG("No call informations received!"); + return; + } + + /* expect we have valid fields for every call */ + if (size != status_ind.remote_party_number_size) { + DBG("Not all fields have the same size"); + return; + } + + 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); + 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; + if (number_size > OFONO_MAX_PHONE_NUMBER_LENGTH) + number_size = OFONO_MAX_PHONE_NUMBER_LENGTH; + strncpy(call->phone_number.number, remote_party->number, + number_size); + /* FIXME: set phone_number_type */ + + 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, &vd->call_list, calls); +} + +enum parse_error +qmi_voice_dial_call_parse(struct qmi_result *qmi_result, + struct qmi_voice_dial_call_result *result) +{ + int err = NONE; + + /* mandatory */ + if (qmi_result_get_uint8(qmi_result, QMI_VOICE_DIAL_RETURN_CALL_ID, + &result->call_id)) + result->call_id_set = 1; + else + err = MISSING_MANDATORY; + + return err; +} + +static void dial_cb(struct qmi_result *result, void *user_data) +{ + struct cb_data *cbd = user_data; + struct ofono_voicecall *vc = cbd->user; + struct voicecall_data *vd = ofono_voicecall_get_data(vc); + ofono_voicecall_cb_t cb = cbd->cb; + uint16_t error; + struct qmi_voice_dial_call_result dial_result; + + DBG(""); + + if (qmi_result_set_error(result, &error)) { + DBG("QMI Error %d", error); + CALLBACK_WITH_FAILURE(cb, cbd->data); + return; + } + + if (qmi_voice_dial_call_parse(result, &dial_result) != NONE) { + DBG("Received invalid Result"); + CALLBACK_WITH_FAILURE(cb, cbd->data); + return; + } + + if (!dial_result.call_id_set) { + DBG("Didn't receive a call id"); + CALLBACK_WITH_FAILURE(cb, cbd->data); + return; + } + + DBG("New call QMI id %d", dial_result.call_id); + ofono_call_list_dial_callback(vc, &vd->call_list, &vd->dialed, + dial_result.call_id); + + /* FIXME: create a timeout on this 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_voice_dial_call_arg arg; + struct qmi_param *param = NULL; + + DBG(""); + + cbd->user = vc; + arg.calling_number_set = true; + arg.calling_number = phone_number_to_string(ph); + memcpy(&vd->dialed, ph, sizeof(*ph)); + + arg.call_type_set = true; + arg.call_type = QMI_VOICE_CALL_TYPE_VOICE; + + param = qmi_param_new(); + if (!param) + goto error; + + if (arg.calling_number_set) { + if (!qmi_param_append(param, QMI_VOICE_DIAL_CALL_NUMBER, + strlen(arg.calling_number), + arg.calling_number)) { + goto error; + } + } + + if (arg.call_type_set) + qmi_param_append_uint8(param, QMI_VOICE_DIAL_CALL_TYPE, + arg.call_type); + + 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 +554,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_IND_ALL_STATUS, + all_call_status_ind, vc, NULL); + ofono_voicecall_register(vc); } @@ -70,6 +569,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 +577,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) @@ -98,7 +597,9 @@ static void qmi_voicecall_remove(struct ofono_voicecall *vc) 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 Mar 26 10:19:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Pigg X-Patchwork-Id: 13603843 Received: from mail-lj1-f174.google.com (mail-lj1-f174.google.com [209.85.208.174]) (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 376A55C911 for ; Tue, 26 Mar 2024 10:21:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711448468; cv=none; b=J3YHErLKS3HPanCBD582uKkOUhhph2NxpgOgqCfHB9Q8JO6i/XcSFDq4wE8w2LE7g3wQoy8UcYn08U2ArZiZlUc5E7VgZ0ol7qMVcoWofxz07A8vnoa2b2m/idyK5kLS70Kattly3nKlQrXEfpoac09hd6kyeibF1a7TdflUdKs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711448468; c=relaxed/simple; bh=Kma3YkR0nFAtfbtCcM7tCSaN8X+E5lpmMXrCS0p9Zvk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OLr4jX8jPv12pgWN1YiquLN22A8bKwnNPVpbqyxF8wOhbUsizUHUfbfH6nHPvn6fq9Y7EDCTj2imM1fvWkB7Nwh1xLxyuqxdVzDrDifvEkKtdPOTv7K8GfLU+Dtxdc8GTrBtrNUlhQ5hOO0TqO9E5zR0ViTJ7MzC+Qb0/a/uADs= 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=XzYOhV0m; arc=none smtp.client-ip=209.85.208.174 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="XzYOhV0m" Received: by mail-lj1-f174.google.com with SMTP id 38308e7fff4ca-2d24a727f78so59930591fa.0 for ; Tue, 26 Mar 2024 03:21:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711448464; x=1712053264; 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=zYrRsY44ChALgOxh7gfaEXOX4VP63na72Fb8ig4xK4Q=; b=XzYOhV0m4R5w24yXtEgfDV+akwOKgbdpDsn9ZW8ghDPjF1FT9jsWMuPPy+T/MiE8HF n1vGq9NpPe3BqNoD01u+5GeqJ0QU37bFRShiq45YDPffq7kvowBFiM8RG4v/PxLUjB/X A9ic/E8WD2vq3cofC3yuWnUNK0gQXKgzg+6r1wLpRAYFVh+PkpVT3u+pqSjlblDoDtMM cgk1J8b2HJ2X0eloGLB21A3jcOBETBqJYC8OQqHEylz/cKovL1b9R5ymOSPU6oa5rzYB 6IT2LFoZDuxlTT+CvmG0/hqtKepyhvWc7kQ+8zCRZb6auQ4Qn/2jWmf9G8Iv1xVVnS4p JHGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711448464; x=1712053264; 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=zYrRsY44ChALgOxh7gfaEXOX4VP63na72Fb8ig4xK4Q=; b=NNLybobCGc3k4sL/vfvNy4vOR9lK8Gmju5TEt66rGAT2A9o47vzaocElTa2E+dPilr vZ7Y9Z5TJm5heMBGFcEqrFFSBfbnIbRdxlrTDmus+UiEAj+SIvu16FadrPtPieJfpdwu dEieD1/UyLqveoFZRq8ZSngJNauixzp5AwrISS3goW/tZfUwFLZgIyp1NpdqKqY2lNee asyKP11uk75Ua/mi2rUthXYoonXmPvWC6NxX3Qf66QljR83gXeYSXsQ3vQpPKk6obFsb a7gBMIQnIPdknSf0W2JZ2rW3dyXhqD5Z/eElCAhsoC0yUKp95i6hCwItNZkoVZKnW4qF iU9w== X-Gm-Message-State: AOJu0YzWQCbF+sJNvRMfLuaxg6Kiym6WtIyLL2N1MVxpUktrKxZZH9l/ ixx9t/zMLKvWCm21Cp7hU8gu3Y4zrO89R/pp3Qlty7EaoMG8XT+FoHsX87Gj0cM= X-Google-Smtp-Source: AGHT+IEX9bAICyVRjHBcqZrEXl/D48A35uqhZ1695G7BV0KkPyWdxdvggwNJKYrx1Tu7W9aI1q3FVQ== X-Received: by 2002:a2e:b8c2:0:b0:2d4:6a6a:22bf with SMTP id s2-20020a2eb8c2000000b002d46a6a22bfmr1899534ljp.23.1711448463664; Tue, 26 Mar 2024 03:21:03 -0700 (PDT) Received: from adam-laptop-hp.lan ([90.246.50.91]) by smtp.gmail.com with ESMTPSA id d8-20020a05600c34c800b00414903d20aesm676366wmq.11.2024.03.26.03.21.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Mar 2024 03:21:03 -0700 (PDT) Sender: Adam Pigg From: Adam Pigg To: ofono@lists.linux.dev Cc: Adam Pigg Subject: [PATCH v2 2/4] [qmimodem][voicecall] Implement call answer Date: Tue, 26 Mar 2024 10:19:57 +0000 Message-ID: <20240326102054.30946-2-adam@piggz.co.uk> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240326102054.30946-1-adam@piggz.co.uk> References: <20240326102054.30946-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 | 9 ++++ drivers/qmimodem/voicecall.c | 99 ++++++++++++++++++++++++++++++++++++ 2 files changed, 108 insertions(+) diff --git a/drivers/qmimodem/voice.h b/drivers/qmimodem/voice.h index 1a584f10..9c31297b 100644 --- a/drivers/qmimodem/voice.h +++ b/drivers/qmimodem/voice.h @@ -54,6 +54,7 @@ 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_ANSWER_CALL = 0x22, QMI_VOICE_SUPS_NOTIFICATION_IND = 0x32, QMI_VOICE_SET_SUPS_SERVICE = 0x33, QMI_VOICE_GET_CALL_WAITING = 0x34, @@ -110,6 +111,14 @@ enum qmi_voice_call_type { QMI_VOICE_CALL_TYPE_VOICE_FORCE, }; +enum qmi_voice_call_answer_param { + QMI_VOICE_ANSWER_CALL_ID = 0x01, +}; + +enum qmi_voice_call_answer_return { + QMI_VOICE_ANSWER_RETURN_CALL_ID = 0x10, +}; + enum parse_error { NONE = 0, MISSING_MANDATORY = 1, diff --git a/drivers/qmimodem/voicecall.c b/drivers/qmimodem/voicecall.c index 55c7009a..7c6bc113 100644 --- a/drivers/qmimodem/voicecall.c +++ b/drivers/qmimodem/voicecall.c @@ -97,6 +97,16 @@ struct qmi_voice_dial_call_result { uint8_t call_id; }; +struct qmi_voice_answer_call_arg { + bool call_id_set; + uint8_t call_id; +}; + +struct qmi_voice_answer_call_result { + bool call_id_set; + uint8_t call_id; +}; + int ofono_call_compare(const void *a, const void *b, void *data) { const struct ofono_call *ca = a; @@ -533,6 +543,94 @@ error: l_free(param); } +enum parse_error qmi_voice_answer_call_parse( + struct qmi_result *qmi_result, + struct qmi_voice_answer_call_result *result) +{ + int err = NONE; + + /* optional */ + if (qmi_result_get_uint8(qmi_result, QMI_VOICE_ANSWER_RETURN_CALL_ID, &result->call_id)) + result->call_id_set = 1; + + return err; +} + +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; + struct qmi_voice_answer_call_result answer_result; + + DBG(""); + + if (qmi_result_set_error(result, &error)) { + DBG("QMI Error %d", error); + CALLBACK_WITH_FAILURE(cb, cbd->data); + return; + } + + /* TODO: what happens when calling it with no active call or wrong caller id? */ + if (qmi_voice_answer_call_parse(result, &answer_result) != NONE) { + DBG("Received invalid Result"); + CALLBACK_WITH_FAILURE(cb, cbd->data); + return; + } + + 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 qmi_voice_answer_call_arg arg; + struct ofono_call *call; + struct qmi_param *param = NULL; + + 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 answer"); + goto error; + } + + arg.call_id_set = true; + arg.call_id = call->id; + + param = qmi_param_new(); + if (!param) + goto error; + + if (arg.call_id_set) { + if (!qmi_param_append_uint8( + param, + QMI_VOICE_ANSWER_CALL_ID, + arg.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; @@ -598,6 +696,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 Mar 26 10:19:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Pigg X-Patchwork-Id: 13603844 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) (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 7C6154C3DE for ; Tue, 26 Mar 2024 10:21:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711448469; cv=none; b=sZ/7mTmMtHnZrHWFdytpvp1vXjhb0BlDFpZ4d1ryIqAzs0cbpdTiCTnMHDYEjBBfNi6Cag1YGaQtNmZ9NoI+XvnsWLhPKTuAp7uZERo1MOrPDhfmuUStKt/ibp3lTC6DwkeD1vJ10ysjKdZJum03T31hFX130NUpvqaMFn3lSWc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711448469; c=relaxed/simple; bh=QTTzJHivmA+XhKzw8D0DtDwYt5eIxPJbTaCF19xUMr4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KhMP6J2X4AQRrsMrc/WstQEVJhHiyUXt+Y5BpjpVcxLo7agAxZrqEQs0hCziIGsxqZEbM9gdCwO0YJctxWBuWlwT21QuK0RFFhR8EObHblcpv5fYQo/nYWPsPsJcjC/74bT3IHz3My8Bdz5IczbNEX7W2lvuTXxDt4Dt2PmYySI= 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=UdBtSjIH; arc=none smtp.client-ip=209.85.128.42 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="UdBtSjIH" Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-4148ca200a7so5839885e9.0 for ; Tue, 26 Mar 2024 03:21:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711448465; x=1712053265; 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=sEZnFbgK2Kv4hBm+O1ve2kqwJAVtiuX2upswO+jYjIo=; b=UdBtSjIHTjirtQFdoY6H5yh4kOQlseOYiSsQzkjNiHXQB029/6dYLT4jidGXQfbiEU gVIUcItq1VWUPFeL6NR8j+e2qk7hUf6zN3/x6CRErSRq3azMia9GPgMLYbszSy0d0aUR JwCT8qp3EZJqwaN/tQpsOLRwP9RfEJIuLFaKkK9LpOu8RBw2X6wDORcknt+7zyxZIQTV KhhKjDuhyUPTKUMIhVUHMEAinxk6/zrubIRU3CkidZapppRSjW22YdPCeJNBQdPe08AG jWwQ/ltoH98om/F0wdIwtGajW6x591RdtiyJmCVYz7ih7TrMUb47q6geBBUohhACLEoP l6vw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711448465; x=1712053265; 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=sEZnFbgK2Kv4hBm+O1ve2kqwJAVtiuX2upswO+jYjIo=; b=m2reQCojNpUU8VfS+/7fc29iPnUyVQR9duZfAE1hhDAax0qHJVin76kGW+cvyb4MVN gQCM1g8Fg/uloRJtaOsOvpeCZz5S/zKOEfqZml115xUmwfxdjBOTFenitaibf8ZX/Y3U o0igVk1LOe/k46LFS4k1USyGBtxV2inWYxijGe48jmvthRCjO6WG/eoOqIic6kugGIIV XdnVH8tngFKvrfJpR+abGsaQrGWWJz5yRTP/ofzpd2DLXX7l6JS8E9JzK9H+G+KeYDlr 1GS7D65WUrstPUCV23nck9Wc65oWvWHx77sfRnBGe9yJGI57D82rhAXVbyjj+0Gx1S5U 4hgQ== X-Gm-Message-State: AOJu0YxCCPnoIZYuuvaSmdg4H2YmNAyAMmbFjwvJVVVRM5LlVLfbaqxq rBHG3lsrKtXSgzpiXzqtTvGW9uM8YczLalL1R6K1MeWXIu316dmPv1brOEQOKq8= X-Google-Smtp-Source: AGHT+IGFwqt2ySG4LIK9H+HwY5JSHLQFvFf+UXnlHpW//Rirt2i602yf7PAAJxzBiV2fqcPgc30+Vw== X-Received: by 2002:a05:600c:548a:b0:414:7384:1ec2 with SMTP id iv10-20020a05600c548a00b0041473841ec2mr638577wmb.9.1711448465460; Tue, 26 Mar 2024 03:21:05 -0700 (PDT) Received: from adam-laptop-hp.lan ([90.246.50.91]) by smtp.gmail.com with ESMTPSA id d8-20020a05600c34c800b00414903d20aesm676366wmq.11.2024.03.26.03.21.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Mar 2024 03:21:05 -0700 (PDT) Sender: Adam Pigg From: Adam Pigg To: ofono@lists.linux.dev Cc: Adam Pigg Subject: [PATCH v2 3/4] [qmimodem][voicecall] Implement active call hangup Date: Tue, 26 Mar 2024 10:19:58 +0000 Message-ID: <20240326102054.30946-3-adam@piggz.co.uk> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240326102054.30946-1-adam@piggz.co.uk> References: <20240326102054.30946-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 | 9 +++ drivers/qmimodem/voicecall.c | 113 +++++++++++++++++++++++++++++++++++ 2 files changed, 122 insertions(+) diff --git a/drivers/qmimodem/voice.h b/drivers/qmimodem/voice.h index 9c31297b..244a6f85 100644 --- a/drivers/qmimodem/voice.h +++ b/drivers/qmimodem/voice.h @@ -54,6 +54,7 @@ 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_END_CALL = 0x21, QMI_VOICE_ANSWER_CALL = 0x22, QMI_VOICE_SUPS_NOTIFICATION_IND = 0x32, QMI_VOICE_SET_SUPS_SERVICE = 0x33, @@ -119,6 +120,14 @@ enum qmi_voice_call_answer_return { QMI_VOICE_ANSWER_RETURN_CALL_ID = 0x10, }; +enum qmi_voice_call_end_param { + QMI_VOICE_END_CALL_ID = 0x01, +}; + +enum qmi_voice_call_end_return { + QMI_VOICE_END_RETURN_CALL_ID = 0x10, +}; + enum parse_error { NONE = 0, MISSING_MANDATORY = 1, diff --git a/drivers/qmimodem/voicecall.c b/drivers/qmimodem/voicecall.c index 7c6bc113..4ef8adc1 100644 --- a/drivers/qmimodem/voicecall.c +++ b/drivers/qmimodem/voicecall.c @@ -107,6 +107,16 @@ struct qmi_voice_answer_call_result { uint8_t call_id; }; +struct qmi_voice_end_call_arg { + bool call_id_set; + uint8_t call_id; +}; + +struct qmi_voice_end_call_result { + bool call_id_set; + uint8_t call_id; +}; + int ofono_call_compare(const void *a, const void *b, void *data) { const struct ofono_call *ca = a; @@ -631,6 +641,107 @@ error: l_free(param); } +enum parse_error +qmi_voice_end_call_parse(struct qmi_result *qmi_result, + struct qmi_voice_end_call_result *result) +{ + int err = NONE; + + /* optional */ + if (qmi_result_get_uint8(qmi_result, QMI_VOICE_END_RETURN_CALL_ID, &result->call_id)) + result->call_id_set = 1; + + return err; +} + +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; + struct qmi_voice_end_call_result end_result; + + if (qmi_result_set_error(result, &error)) { + DBG("QMI Error %d", error); + CALLBACK_WITH_FAILURE(cb, cbd->data); + return; + } + + if (qmi_voice_end_call_parse(result, &end_result) != NONE) { + DBG("Received invalid Result"); + CALLBACK_WITH_FAILURE(cb, cbd->data); + return; + } + + 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_voice_end_call_arg arg; + struct qmi_param *param = NULL; + + DBG(""); + cbd->user = vc; + + arg.call_id_set = true; + arg.call_id = id; + + param = qmi_param_new(); + if (!param) + goto error; + + if (arg.call_id_set) { + if (!qmi_param_append_uint8(param, QMI_VOICE_END_CALL_ID, arg.call_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, + }; + int i; + + DBG(""); + for (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; @@ -697,6 +808,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 Mar 26 10:19:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Pigg X-Patchwork-Id: 13603845 Received: from mail-lj1-f173.google.com (mail-lj1-f173.google.com [209.85.208.173]) (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 82D945C911 for ; Tue, 26 Mar 2024 10:21:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711448474; cv=none; b=tOXhD2sKggkUscIpVVj6GgzocynN7DviaIBRDw3MKXqZFm/14J9es4ayYfDGC/OFJs1CVoouLD2+HssmfGP9ogJdtU+NvDZ9EJPtjJYLL5yBKN2FyT4cUCPrtyfgSCkUEMcCH4d8dnF9D850H8zFavJROSnZ7ipWpoB+s8sZEmA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711448474; c=relaxed/simple; bh=+g4tZvvAAAL4kmeDR74bUCEV/OlAhvS6cP5ahOUGUDg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=F0dw27IdFGHQJlCm6IjCnOf3gWX4P+WWQNiO8lSCuxm+ZtH4WU1B7urznQKrnDpqjk5QixqYnRUYhLRNLfqS8aP7RUcCfixQzHSf8jjFSwX311DE5mgodQv3y61KJts147WIVtJiCeZPry834yoypKXnqYHJD6XnZLmQUWGpQ88= 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=capmv6eR; arc=none smtp.client-ip=209.85.208.173 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="capmv6eR" Received: by mail-lj1-f173.google.com with SMTP id 38308e7fff4ca-2d6ee81bc87so2899471fa.1 for ; Tue, 26 Mar 2024 03:21:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711448470; x=1712053270; 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=V7VXp38LaXSrk70hU1xw56MvwtvFlGNSK5bLHR7W3tM=; b=capmv6eR9QQMezm113BKopKQDS8Cpmb0LlLAUOoRkFeV55D2YjoAbRQnvy578IEUVk x217zfvmnuF8OcsYIZFCOLvYkQJZZcKP/XsppBOpX190SJ8TIZk+ZrsllPjtV7JoSRY+ bEt+PqGD7LPdk9t7WbOXEnv0lVtNrmoCHL9VvvGuaWrfoKAcubVnd5X4BL3OkfBmtFez Eb60Z27lMEb7zu80zyDABk+TJQrlS9GW6I8q10uH33GLWN8ztt/FWtWpzoATGMMzAR5W U051rS7dtUsTcxEj8MYKGqWaT3dANvGmgycxyz7hvSGHZz7cAfPn8mZVNbMziSnDss2t WeSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711448470; x=1712053270; 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=V7VXp38LaXSrk70hU1xw56MvwtvFlGNSK5bLHR7W3tM=; b=UvprpoegN++jNz/YSqoNpo8zqW31tOXS14ehqmwygItBRJzHIDs2ZdEg6HAAL98EtD T9Jbn+VSvTiK8kugkPHqnnMBQ+MlI/J25NZWlGLqwhSvIOqON8uchCR+9Jg1FTe/hP60 jqUZj74GOP8okV7Ur4j51HwFWNHtM2OYSqazXKvWZKxSAAXvR1fza65FuocHeCnP7ybl myoFhyU2n5Vc2uH2jrAmIJ56AbT3CZkyczOaHIXznu7FZfl2t0NxSWaAPW68F6av3XZg Fmxi/b3PTRucyh6qE7zbP38KNlHa1aZp3Zv1M3vSrlC3c46ALzu4mx0UJVwr/sLAKPff dIXA== X-Gm-Message-State: AOJu0YyVrBKVrlxET1fQn8IHPbHHX+RZUs8UjwLYukrveeS5io4EqFfy Ayd1bsy2o7Bb45eAk6U9DoSMdWQK/RlyI8P1TnSc4Ys/hphG8OOrqIb/cFaCde4= X-Google-Smtp-Source: AGHT+IE1+yOKZl70BnMvJwZkXtzQ1RSXhaTooaqu8pqRANXmwo7MUaTLxZ92LXrMF//3NfhfleROow== X-Received: by 2002:a2e:b0f8:0:b0:2d3:1dcc:3b25 with SMTP id h24-20020a2eb0f8000000b002d31dcc3b25mr6264449ljl.10.1711448467397; Tue, 26 Mar 2024 03:21:07 -0700 (PDT) Received: from adam-laptop-hp.lan ([90.246.50.91]) by smtp.gmail.com with ESMTPSA id d8-20020a05600c34c800b00414903d20aesm676366wmq.11.2024.03.26.03.21.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Mar 2024 03:21:06 -0700 (PDT) Sender: Adam Pigg From: Adam Pigg To: ofono@lists.linux.dev Cc: Adam Pigg Subject: [PATCH v2 4/4] [qmimodem][voicecall] Implement DTMF tones Date: Tue, 26 Mar 2024 10:19:59 +0000 Message-ID: <20240326102054.30946-4-adam@piggz.co.uk> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240326102054.30946-1-adam@piggz.co.uk> References: <20240326102054.30946-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 | 6 ++ drivers/qmimodem/voicecall.c | 154 +++++++++++++++++++++++++++++++++++ 2 files changed, 160 insertions(+) diff --git a/drivers/qmimodem/voice.h b/drivers/qmimodem/voice.h index 244a6f85..42b6b9b6 100644 --- a/drivers/qmimodem/voice.h +++ b/drivers/qmimodem/voice.h @@ -56,6 +56,8 @@ enum voice_commands { QMI_VOICE_DIAL_CALL = 0x20, 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, @@ -128,6 +130,10 @@ enum qmi_voice_call_end_return { QMI_VOICE_END_RETURN_CALL_ID = 0x10, }; +enum qmi_voice_call_dtmf_param { + QMI_VOICE_DTMF_DATA = 0x01, +}; + enum parse_error { NONE = 0, MISSING_MANDATORY = 1, diff --git a/drivers/qmimodem/voicecall.c b/drivers/qmimodem/voicecall.c index 4ef8adc1..ab4bd655 100644 --- a/drivers/qmimodem/voicecall.c +++ b/drivers/qmimodem/voicecall.c @@ -117,6 +117,21 @@ struct qmi_voice_end_call_result { uint8_t call_id; }; +struct send_one_dtmf_cb_data { + const char *full_dtmf; + const char *next_dtmf; + struct ofono_voicecall *vc; +}; + +struct qmi_voice_start_cont_dtmf_arg { + uint8_t call_id; + uint8_t dtmf_char; +}; + +struct qmi_voice_stop_cont_dtmf_arg { + uint8_t call_id; +}; + int ofono_call_compare(const void *a, const void *b, void *data) { const struct ofono_call *ca = a; @@ -742,6 +757,144 @@ 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); +} + +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); + struct qmi_voice_stop_cont_dtmf_arg arg; + 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; + } + + arg.call_id = 0xff; + + param = qmi_param_new(); + if (!param) { + goto error; + } + + if (!qmi_param_append_uint8(param, QMI_VOICE_DTMF_DATA, arg.call_id)) { + 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(param); +} + +static void send_one_dtmf(struct ofono_voicecall *vc, const char dtmf, + ofono_voicecall_cb_t cb, void *data) +{ + struct qmi_voice_start_cont_dtmf_arg arg; + 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(""); + + arg.call_id = 0xff; + arg.dtmf_char = (uint8_t)dtmf; + + cbd->user = vc; + + param = qmi_param_new(); + if (!param) + goto error; + + param_body[0] = arg.call_id; + param_body[1] = arg.dtmf_char; + + 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; + ofono_voicecall_cb_t cb = cbd->cb; + struct send_one_dtmf_cb_data *send_one_dtmf_cb_data = cbd->user; + + DBG(""); + + if (error->type != OFONO_ERROR_TYPE_NO_ERROR || + *send_one_dtmf_cb_data->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((void *)send_one_dtmf_cb_data->full_dtmf); + l_free(send_one_dtmf_cb_data); + l_free(cbd); + } else { + send_one_dtmf(send_one_dtmf_cb_data->vc, + *(send_one_dtmf_cb_data->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 cb_data *cbd = cb_data_new(cb, data); + struct send_one_dtmf_cb_data *send_one_dtmf_cb_data = + l_new(struct send_one_dtmf_cb_data, 1); + + DBG(""); + + send_one_dtmf_cb_data->full_dtmf = l_strdup(dtmf); + send_one_dtmf_cb_data->next_dtmf = &send_one_dtmf_cb_data->full_dtmf[1]; + send_one_dtmf_cb_data->vc = vc; + cbd->user = send_one_dtmf_cb_data; + + 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; @@ -810,6 +963,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)