ubports-volte/ofono-binder-plugin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ofono-binder] Add IMS registration support for AIDL

Browse Source
This commit is contained in:
Matti Lehtimäki
2024-08-19 11:42:18 +03:00
parent 73c65171c6
commit eb9fcfd261
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/binder_ims_reg.c
View File

@@ -25,6 +25,8 @@
#include <radio_request.h>
#include <radio_request_group.h>
#include <radio_network_types.h>
#include <gbinder_reader.h>
#include <gutil_macros.h>
#include <gutil_misc.h>
@@ -82,10 +84,14 @@ binder_ims_reg_query_done(
BinderBase* base = &self->base;
BinderImsReg* ims = &self->pub;
gboolean registered = FALSE;
guint32 code =
radio_client_aidl_interface(self->g->client) == RADIO_NETWORK_INTERFACE ?
RADIO_NETWORK_RESP_GET_IMS_REGISTRATION_STATE :
RADIO_RESP_GET_IMS_REGISTRATION_STATE;
if (status != RADIO_TX_STATUS_OK) {
ofono_error("getImsRegistrationState failed");
} else if (resp != RADIO_RESP_GET_IMS_REGISTRATION_STATE) {
} else if (resp != code) {
ofono_error("Unexpected getImsRegistrationState response %d", resp);
} else if (error != RADIO_ERROR_NONE) {
DBG_(self, "%s", binder_radio_error_string(error));
@@ -120,8 +126,12 @@ void
binder_ims_reg_query(
BinderImsRegObject* self)
{
guint32 code =
radio_client_aidl_interface(self->g->client) == RADIO_NETWORK_INTERFACE ?
RADIO_NETWORK_REQ_GET_IMS_REGISTRATION_STATE :
RADIO_REQ_GET_IMS_REGISTRATION_STATE;
RadioRequest* req = radio_request_new2(self->g,
RADIO_REQ_GET_IMS_REGISTRATION_STATE, NULL,
code, NULL,
binder_ims_reg_query_done, NULL, self);
radio_request_submit(req);
@@ -200,13 +210,16 @@ binder_ims_reg_new(
binder_ext_ims_add_state_handler(self->ext,
binder_ims_ext_state_changed, self);
} else {
guint32 code =
radio_client_aidl_interface(client) == RADIO_NETWORK_INTERFACE ?
RADIO_NETWORK_IND_IMS_NETWORK_STATE_CHANGED :
RADIO_IND_IMS_NETWORK_STATE_CHANGED;
DBG_(self, "using ims radio api");
self->g = radio_request_group_new(client); /* Keeps ref to client */
/* Register event handler */
self->event_id[EVENT_IMS_NETWORK_STATE_CHANGED] =
radio_client_add_indication_handler(client,
RADIO_IND_IMS_NETWORK_STATE_CHANGED,
code,
binder_ims_reg_state_changed, self);
/* Query the initial state */

2
src/binder_modem.c
View File

@@ -599,7 +599,7 @@ binder_modem_create(
modem->network_client = radio_client_ref(network_client);
modem->sim_client = radio_client_ref(sim_client);
modem->voice_client = radio_client_ref(voice_client);
modem->ims = binder_ims_reg_new(client, ext, log_prefix);
modem->ims = binder_ims_reg_new(network_client, ext, log_prefix);
modem->ext = binder_ext_slot_ref(ext);
self->g = radio_request_group_new(client);
self->last_known_iccid = g_strdup(modem->watch->iccid);