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

Move erinfo notify to atmodem netreg driver

This commit is contained in:
Denis Kenzior 2010-03-28 23:30:32 -05:00
parent 6af6567004
commit 21dd4f040a
2 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/atmodem/network-registration.c
View File

@ -688,6 +688,23 @@ error:
CALLBACK_WITH_FAILURE(cb, -1, data);
}
static void mbm_erinfo_notify(GAtResult *result, gpointer user_data)
{
GAtResultIter iter;
int mode, gsm, umts;
g_at_result_iter_init(&iter, result);
if (g_at_result_iter_next(&iter, "*ERINFO:") == FALSE)
return;
g_at_result_iter_next_number(&iter, &mode);
g_at_result_iter_next_number(&iter, &gsm);
g_at_result_iter_next_number(&iter, &umts);
ofono_info("network capability: GSM %d UMTS %d", gsm, umts);
}
static void creg_notify(GAtResult *result, gpointer user_data)
{
struct ofono_netreg *netreg = user_data;
@ -837,6 +854,16 @@ static void at_creg_set_cb(gboolean ok, GAtResult *result, gpointer user_data)
ofono_netreg_register(netreg);
break;
case OFONO_VENDOR_MBM:
g_at_chat_send(nd->chat, "AT*ERINFO=1", none_prefix,
NULL, NULL, NULL);
g_at_chat_register(nd->chat, "*ERINFO:", mbm_erinfo_notify,
FALSE, netreg, NULL);
g_at_chat_send(nd->chat, "AT+CIND=?", cind_prefix,
cind_support_cb, netreg, NULL);
break;
default:
g_at_chat_send(nd->chat, "AT+CIND=?", cind_prefix,
cind_support_cb, netreg, NULL);

23
plugins/mbm.c
View File

@ -59,23 +59,6 @@ struct mbm_data {
GAtChat *chat;
};
static void erinfo_notifier(GAtResult *result, gpointer user_data)
{
GAtResultIter iter;
int mode, gsm, umts;
g_at_result_iter_init(&iter, result);
if (g_at_result_iter_next(&iter, "*ERINFO:") == FALSE)
return;
g_at_result_iter_next_number(&iter, &mode);
g_at_result_iter_next_number(&iter, &gsm);
g_at_result_iter_next_number(&iter, &umts);
ofono_info("network capability: GSM %d UMTS %d", gsm, umts);
}
static int mbm_probe(struct ofono_modem *modem)
{
struct mbm_data *data;
@ -111,7 +94,6 @@ static void mbm_debug(const char *str, void *user_data)
static void cfun_enable(gboolean ok, GAtResult *result, gpointer user_data)
{
struct ofono_modem *modem = user_data;
struct mbm_data *data = ofono_modem_get_data(modem);
DBG("");
@ -119,11 +101,6 @@ static void cfun_enable(gboolean ok, GAtResult *result, gpointer user_data)
ofono_modem_set_powered(modem, FALSE);
ofono_modem_set_powered(modem, TRUE);
g_at_chat_send(data->chat, "AT*ERINFO=1", none_prefix,
NULL, NULL, NULL);
g_at_chat_register(data->chat, "*ERINFO:", erinfo_notifier,
FALSE, modem, NULL);
}
static void cfun_query(gboolean ok, GAtResult *result, gpointer user_data)