plugins/ifx.c | 21 ++------------------- 1 files changed, 2 insertions(+), 19 deletions(-) diff --git a/plugins/ifx.c b/plugins/ifx.c index 411c012..ae53193 100644 --- a/plugins/ifx.c +++ b/plugins/ifx.c @@ -345,23 +345,6 @@ error: ofono_modem_set_powered(modem, FALSE); } -static void cfun_enable(gboolean ok, GAtResult *result, gpointer user_data) -{ - struct ofono_modem *modem = user_data; - struct ifx_data *data = ofono_modem_get_data(modem); - - DBG(""); - - if (!ok) { - shutdown_device(data); - ofono_modem_set_powered(modem, FALSE); - return; - } - - g_at_chat_send(data->dlcs[AUX_DLC], "AT+XGENDATA", NULL, - xgendata_query, modem, NULL); -} - static gboolean dlc_setup(gpointer user_data) { struct ofono_modem *modem = user_data; @@ -378,8 +361,8 @@ static gboolean dlc_setup(gpointer user_data) g_at_chat_set_slave(data->dlcs[GPRS2_DLC], data->dlcs[NETREG_DLC]); g_at_chat_set_slave(data->dlcs[GPRS3_DLC], data->dlcs[NETREG_DLC]); - g_at_chat_send(data->dlcs[AUX_DLC], "AT+CFUN=4", NULL, - cfun_enable, modem, NULL); + g_at_chat_send(data->dlcs[AUX_DLC], "AT+XGENDATA", NULL, + xgendata_query, modem, NULL);

> > plugins/ifx.c | 21 ++------------------- > > 1 files changed, 2 insertions(+), 19 deletions(-) > > > > diff --git a/plugins/ifx.c b/plugins/ifx.c > > index 411c012..ae53193 100644 > > --- a/plugins/ifx.c > > +++ b/plugins/ifx.c > > @@ -345,23 +345,6 @@ error: > > ofono_modem_set_powered(modem, FALSE); > > } > > > > -static void cfun_enable(gboolean ok, GAtResult *result, gpointer > user_data) > > -{ > > - struct ofono_modem *modem = user_data; > > - struct ifx_data *data = ofono_modem_get_data(modem); > > - > > - DBG(""); > > - > > - if (!ok) { > > - shutdown_device(data); > > - ofono_modem_set_powered(modem, FALSE); > > - return; > > - } > > - > > - g_at_chat_send(data->dlcs[AUX_DLC], "AT+XGENDATA", NULL, > > - xgendata_query, modem, NULL); > > -} > > - > > static gboolean dlc_setup(gpointer user_data) > > { > > struct ofono_modem *modem = user_data; > > @@ -378,8 +361,8 @@ static gboolean dlc_setup(gpointer user_data) > > g_at_chat_set_slave(data->dlcs[GPRS2_DLC], data- > >dlcs[NETREG_DLC]); > > g_at_chat_set_slave(data->dlcs[GPRS3_DLC], data- > >dlcs[NETREG_DLC]); > > > > - g_at_chat_send(data->dlcs[AUX_DLC], "AT+CFUN=4", NULL, > > - cfun_enable, modem, NULL); > > + g_at_chat_send(data->dlcs[AUX_DLC], "AT+XGENDATA", NULL, > > + xgendata_query, modem, NULL); > > I toughth we talked about CFUN=4 in ifx_disable on IRC. This one is > needed to bring the modem up in offline mode. I'd rather not remove > this > one. In a ideal world, the CFUN=4 in the dlc_setup will not be needed because the modem remembers is last state and will remain in offline mode because we have sent CFUN=4 in the ifx_disable function. But, we could have some error cases where we are not able to send this command anymore because of modem crash or SPI broken, etc.. so we might have to keep the forced CFUN=4 in the dlc_setup