From ef3ea60913a272bb8ec06da1d5bc5f30466b4c38 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sat, 18 Feb 2012 13:18:53 +0100 Subject: [PATCH] udev: Add support for detecting Sierra network interfaces --- plugins/udevng.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/plugins/udevng.c b/plugins/udevng.c index 0cbe4877..e3e39a30 100644 --- a/plugins/udevng.c +++ b/plugins/udevng.c @@ -209,7 +209,7 @@ static gboolean setup_gobi(struct modem_info *modem) static gboolean setup_sierra(struct modem_info *modem) { - const char *mdm = NULL, *app1 = NULL, *app2 = NULL, *diag = NULL; + const char *mdm = NULL, *app = NULL, *net = NULL, *diag = NULL; GSList *list; DBG("%s", modem->syspath); @@ -226,21 +226,22 @@ static gboolean setup_sierra(struct modem_info *modem) if (g_strcmp0(info->number, "03") == 0) mdm = info->devnode; else if (g_strcmp0(info->number, "04") == 0) - app1 = info->devnode; - else if (g_strcmp0(info->number, "05") == 0) - app2 = info->devnode; + app = info->devnode; + else if (g_strcmp0(info->number, "07") == 0) + net = info->devnode; + } } - if (mdm == NULL || app1 == NULL) + if (mdm == NULL || app == NULL) return FALSE; - DBG("modem=%s app1=%s app2=%s diag=%s", mdm, app1, app2, diag); + DBG("modem=%s app=%s net=%s diag=%s", mdm, app, net, diag); ofono_modem_set_string(modem->modem, "Modem", mdm); - ofono_modem_set_string(modem->modem, "App1", app1); - ofono_modem_set_string(modem->modem, "App2", app2); + ofono_modem_set_string(modem->modem, "App", app); ofono_modem_set_string(modem->modem, "Diag", diag); + ofono_modem_set_string(modem->modem, "NetworkInterface", net); return TRUE; } @@ -899,6 +900,7 @@ static struct { { "hso", "hso" }, { "gobi", "qcserial" }, { "sierra", "sierra" }, + { "sierra", "sierra_net" }, { "option", "option", "0af0" }, { "huawei", "option", "201e" }, { "huawei", "cdc_ether", "12d1" },