[n900-v5 4/5] modemconf: use isigen and n900

From: Pekka Pessi <Pekka.Pessi(a)nokia.com&gt; Allow basic configuration of phonet links, too. --- plugins/modemconf.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/plugins/modemconf.c b/plugins/modemconf.c index d7b1354..3a823e3 100644 --- a/plugins/modemconf.c +++ b/plugins/modemconf.c @@ -116,14 +116,17 @@ static int set_device(struct ofono_modem *modem, static int set_interface(struct ofono_modem *modem, GKeyFile *keyfile, const char *group) { - char *iface; + char *value; - iface = g_key_file_get_string(keyfile, group, "Interface", NULL); - if (!iface) - return -EINVAL; + value = g_key_file_get_string(keyfile, group, "Interface", NULL); + if (value) + ofono_modem_set_string(modem, "Interface", value); + g_free(value); - ofono_modem_set_string(modem, "Interface", iface); - g_free(iface); + value = g_key_file_get_string(keyfile, group, "Address", NULL); + if (value) + ofono_modem_set_integer(modem, "Address", atoi(value)); + g_free(value); return 0; } @@ -141,8 +144,8 @@ static struct { { "ste", set_interface }, { "calypso", set_device }, { "palmpre", set_device }, - { "isimodem", set_interface }, - { "n900modem", set_interface }, + { "isigen", set_interface }, + { "n900", set_interface }, { NULL } }; -- 1.7.0.4