Changes - SailfishOS Open Build Service

Changes of Revision 99

[-] [+]	Changed	_service:tar_git:ofono.changes
@@ -1,3 +1,12 @@ +* Tue Mar 05 2019 Slava Monich <merproject@monich.com> - 1.21+git42 +- [ril] Add "modem" entry to RIL transport parameters. JB#44551 + +* Mon Mar 04 2019 Slava Monich <merproject@monich.com> - 1.21+git41 +- [ril] Make UMTS network mode configurable. JB#44551 + +* Wed Feb 27 2019 Slava Monich <merproject@monich.com> - 1.21+git40 +- [ofono] Delay sending SMS by 0.1s. Contributes to: JB#38580 + * Mon Feb 25 2019 Slava Monich <merproject@monich.com> - 1.21+git39 - [ofono] Interpret , and . as pause in tone string. Contributes to: JB#44709
[-] [+]	Changed	_service:tar_git:ofono.spec ^
@@ -1,6 +1,6 @@ Name: ofono Summary: Open Source Telephony -Version: 1.21+git39 +Version: 1.21+git42 Release: 1 Group: Communications/Connectivity Adaptation License: GPLv2
[-] [+]	Changed	_service ^
@@ -2,6 +2,6 @@ <service name="tar_git"> <param name="url">https://git.merproject.org/slava/ofono.git</param> <param name="branch">master</param> - <param name="revision">7cdf3db</param> + <param name="revision">6c5d2ab</param> </service> </services>
[-] [+]	Changed	_service:tar_git:ofono-1.21+git42.tar.bz2/ofono/drivers/ril/ril_network.c ^
@@ -1,7 +1,7 @@ /* * oFono - Open Source Telephony - RIL-based devices * - * Copyright (C) 2015-2018 Jolla Ltd. + * Copyright (C) 2015-2019 Jolla Ltd. * * 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 @@ -65,7 +65,8 @@ struct ril_radio radio; struct ril_sim_card simcard; int rat; - int lte_network_mode; + enum ril_pref_net_type lte_network_mode; + enum ril_pref_net_type umts_network_mode; int network_mode_timeout; char log_prefix; guint operator_poll_id; @@ -453,17 +454,20 @@ static int ril_network_mode_to_rat(struct ril_network self, enum ofono_radio_access_mode mode) { + struct ril_sim_settings settings = self->settings; + struct ril_network_priv priv = self->priv; + switch (mode) { case OFONO_RADIO_ACCESS_MODE_ANY: case OFONO_RADIO_ACCESS_MODE_LTE: - if (self->settings->techs & OFONO_RADIO_ACCESS_MODE_LTE) { - return self->priv->lte_network_mode; + if (settings->techs & OFONO_RADIO_ACCESS_MODE_LTE) { + return priv->lte_network_mode; } /* no break / default: case OFONO_RADIO_ACCESS_MODE_UMTS: - if (self->settings->techs & OFONO_RADIO_ACCESS_MODE_UMTS) { - return PREF_NET_TYPE_GSM_WCDMA_AUTO; + if (settings->techs & OFONO_RADIO_ACCESS_MODE_UMTS) { + return priv->umts_network_mode; } / no break / case OFONO_RADIO_ACCESS_MODE_GSM: @@ -868,6 +872,7 @@ / Copy relevant config values / priv->lte_network_mode = config->lte_network_mode; + priv->umts_network_mode = config->umts_network_mode; priv->network_mode_timeout = config->network_mode_timeout; / Register listeners */
[-] [+]	Changed	_service:tar_git:ofono-1.21+git42.tar.bz2/ofono/drivers/ril/ril_plugin.c ^
@@ -67,6 +67,7 @@ #define RILMODEM_DEFAULT_SUB "SUB1" #define RILMODEM_DEFAULT_TECHS OFONO_RADIO_ACCESS_MODE_ALL #define RILMODEM_DEFAULT_LTE_MODE PREF_NET_TYPE_LTE_GSM_WCDMA +#define RILMODEM_DEFAULT_UMTS_MODE PREF_NET_TYPE_GSM_WCDMA_AUTO #define RILMODEM_DEFAULT_NETWORK_MODE_TIMEOUT (201000) / ms / #define RILMODEM_DEFAULT_ENABLE_VOICECALL TRUE #define RILMODEM_DEFAULT_ENABLE_CBS TRUE @@ -87,6 +88,7 @@ #define RILMODEM_DEFAULT_SLOT_FLAGS SAILFISH_SLOT_NO_FLAGS / RIL socket transport name and parameters / +#define RIL_TRANSPORT_MODEM "modem" #define RIL_TRANSPORT_SOCKET "socket" #define RIL_TRANSPORT_SOCKET_PATH "path" #define RIL_TRANSPORT_SOCKET_SUB "sub" @@ -116,6 +118,7 @@ #define RILCONF_ENABLE_CBS "enableCellBroadcast" #define RILCONF_TECHNOLOGIES "technologies" #define RILCONF_LTE_MODE "lteNetworkMode" +#define RILCONF_UMTS_MODE "umtsNetworkMode" #define RILCONF_NETWORK_MODE_TIMEOUT "networkModeTimeout" #define RILCONF_UICC_WORKAROUND "uiccWorkaround" #define RILCONF_ECCLIST_FILE "ecclistFile" @@ -1199,6 +1202,7 @@ config->slot = slot_index; config->techs = RILMODEM_DEFAULT_TECHS; config->lte_network_mode = RILMODEM_DEFAULT_LTE_MODE; + config->umts_network_mode = RILMODEM_DEFAULT_UMTS_MODE; config->empty_pin_query = RILMODEM_DEFAULT_EMPTY_PIN_QUERY; config->radio_power_cycle = RILMODEM_DEFAULT_RADIO_POWER_CYCLE; config->confirm_radio_power_on = @@ -1361,6 +1365,7 @@ int ival; char sval; char *strv; + char modem; GHashTable transport_params = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free); char transport = NULL; @@ -1406,8 +1411,14 @@ return NULL; } - slot = ril_plugin_slot_new_take(transport, transport_params, - g_strconcat("/", group, NULL), + /* ril_plugin_slot_new_take() will take ownership of this memory / + modem = g_strconcat("/", group, NULL); + + / Add "modem" entry to point to the actual modem path / + g_hash_table_replace(transport_params, g_strdup(RIL_TRANSPORT_MODEM), + g_strdup(modem)); + + slot = ril_plugin_slot_new_take(transport, transport_params, modem, ril_config_get_string(file, group, RILCONF_NAME), RILMODEM_DEFAULT_SLOT); config = &slot->config; @@ -1502,10 +1513,15 @@ } / lteNetworkMode / - if (ril_config_get_integer(file, group, RILCONF_LTE_MODE, - &config->lte_network_mode)) { - DBG("%s: " RILCONF_LTE_MODE " %d", group, - config->lte_network_mode); + if (ril_config_get_integer(file, group, RILCONF_LTE_MODE, &ival)) { + DBG("%s: " RILCONF_LTE_MODE " %d", group, ival); + config->lte_network_mode = ival; + } + + / umtsNetworkMode / + if (ril_config_get_integer(file, group, RILCONF_UMTS_MODE, &ival)) { + DBG("%s: " RILCONF_UMTS_MODE " %d", group, ival); + config->umts_network_mode = ival; } / networkModeTimeout */
[-] [+]	Changed	_service:tar_git:ofono-1.21+git42.tar.bz2/ofono/drivers/ril/ril_types.h ^
@@ -1,7 +1,7 @@ /* * oFono - Open Source Telephony - RIL-based devices * - * Copyright (C) 2015-2018 Jolla Ltd. + * Copyright (C) 2015-2019 Jolla Ltd. * * 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 @@ -51,7 +51,8 @@ struct ril_slot_config { guint slot; enum ofono_radio_access_mode techs; - int lte_network_mode; + enum ril_pref_net_type lte_network_mode; + enum ril_pref_net_type umts_network_mode; int network_mode_timeout; gboolean query_available_band_mode; gboolean empty_pin_query;
[-] [+]	Changed	_service:tar_git:ofono-1.21+git42.tar.bz2/ofono/src/sms.c ^
@@ -2145,7 +2145,7 @@ g_queue_push_tail(sms->txq, entry); if (sms->registered && g_queue_get_length(sms->txq) == 1) - sms->tx_source = g_timeout_add(0, tx_next, sms); + sms->tx_source = g_timeout_add(100, tx_next, sms); if (uuid) memcpy(uuid, &entry->uuid, sizeof(*uuid));