sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

ril: Implement radio state changed parsing inline

This commit is contained in:
Denis Kenzior 2015-11-17 12:10:59 -06:00
parent b8a9e0d5ec
commit a07f7b7cf4
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
plugins/ril.c
View File

@ -98,11 +98,24 @@ static void ril_radio_state_changed(struct ril_msg *message, gpointer user_data)
{
struct ofono_modem *modem = user_data;
struct ril_data *rd = ofono_modem_get_data(modem);
int radio_state = g_ril_unsol_parse_radio_state_changed(rd->ril,
message);
struct parcel rilp;
int radio_state;
g_ril_init_parcel(message, &rilp);
radio_state = parcel_r_int32(&rilp);
if (rilp.malformed) {
ofono_error("%s: malformed parcel received", __func__);
ofono_modem_set_powered(modem, FALSE);
return;
}
g_ril_append_print_buf(rd->ril, "(state: %s)",
ril_radio_state_to_string(radio_state));
g_ril_print_unsol(rd->ril, message);
if (radio_state != rd->radio_state) {
ofono_info("%s: state: %s rd->ofono_online: %d",
__func__,
ril_radio_state_to_string(radio_state),
@ -122,7 +135,6 @@ static void ril_radio_state_changed(struct ril_msg *message, gpointer user_data)
case RADIO_STATE_UNAVAILABLE:
case RADIO_STATE_OFF:
/*
* Unexpected radio state change, as we are supposed to
* be online. UNAVAILABLE has been seen occassionally
@ -137,9 +149,6 @@ static void ril_radio_state_changed(struct ril_msg *message, gpointer user_data)
exit(1);
}
break;
default:
/* Malformed parcel; no radio state == broken rild */
g_assert(FALSE);
}
}
}