[-]
[+]
|
Changed |
_service:tar_git:ofono.changes
|
|
[-]
[+]
|
Changed |
_service:tar_git:ofono.spec
^
|
|
[-]
[+]
|
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">137e504</param>
+ <param name="revision">771e8be</param>
</service>
</services>
|
[-]
[+]
|
Changed |
_service:tar_git:ofono-1.17+git24.tar.bz2/ofono/drivers/ril/ril_plugin.c
^
|
@@ -519,8 +519,9 @@
}
if (plugin->pub.ready != ready) {
- DBG("%sready", ready ? "" : "not ");
plugin->pub.ready = ready;
+ ril_plugin_dbus_block_imei_requests(plugin->dbus, !ready);
+ DBG("%sready", ready ? "" : "not ");
ril_plugin_dbus_signal(plugin->dbus, RIL_PLUGIN_SIGNAL_READY);
}
}
@@ -836,16 +837,13 @@
const void *data, guint len, void *user_data)
{
struct ril_slot *slot = user_data;
- struct ril_plugin_priv *plugin = slot->plugin;
- gboolean all_done = TRUE;
- GSList *link;
+ char *imei = NULL;
GASSERT(slot->imei_req_id);
slot->imei_req_id = 0;
if (status == RIL_E_SUCCESS) {
GRilIoParser rilp;
- char *imei;
grilio_parser_init(&rilp, data, len);
imei = grilio_parser_get_utf8(&rilp);
@@ -858,26 +856,16 @@
* IMEI (if rild crashed and we have reconnected)
*/
GASSERT(!slot->imei || !g_strcmp0(slot->imei, imei));
- g_free(slot->imei);
- slot->pub.imei = slot->imei = imei;
-
- ril_plugin_check_modem(slot);
- ril_plugin_update_ready(plugin);
} else {
ofono_error("Slot %u IMEI query error: %s", slot->config.slot,
ril_error_to_string(status));
}
- for (link = plugin->slots; link && all_done; link = link->next) {
- if (((struct ril_slot *)link->data)->imei_req_id) {
- all_done = FALSE;
- }
- }
+ g_free(slot->imei);
+ slot->pub.imei = slot->imei = (imei ? imei : g_strdup("ERROR"));
- if (all_done) {
- DBG("all done");
- ril_plugin_dbus_block_imei_requests(plugin->dbus, FALSE);
- }
+ ril_plugin_check_modem(slot);
+ ril_plugin_update_ready(slot->plugin);
}
/*
|
[-]
[+]
|
Changed |
_service:tar_git:ofono-1.17+git24.tar.bz2/ofono/src/modem.c
^
|
@@ -1326,7 +1326,7 @@
found = g_slist_find_custom(modem->interface_list, interface,
(GCompareFunc) strcmp);
if (found == NULL) {
- ofono_error("Interface %s not found on the interface_list",
+ DBG("Interface %s not found on the interface_list",
interface);
return;
}
|