From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: multipart/mixed; boundary="===============2800893832580545165==" MIME-Version: 1.0 From: Philippe Nunes Subject: [PATCH v2 11/12] udevng: Add a default assignment for Huawei QCDM port Date: Thu, 08 Dec 2011 15:50:02 +0100 Message-ID: <1323355803-22096-12-git-send-email-philippe.nunes@linux.intel.com> In-Reply-To: <1323355803-22096-1-git-send-email-philippe.nunes@linux.intel.com> List-Id: To: ofono@ofono.org --===============2800893832580545165== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable --- plugins/udevng.c | 30 +++++++++++++++++++++--------- 1 files changed, 21 insertions(+), 9 deletions(-) diff --git a/plugins/udevng.c b/plugins/udevng.c index be87320..67660e3 100644 --- a/plugins/udevng.c +++ b/plugins/udevng.c @@ -235,6 +235,7 @@ static gboolean setup_sierra(struct modem_info *modem) static gboolean setup_huawei(struct modem_info *modem) { const char *mdm =3D NULL, *pcui =3D NULL, *diag =3D NULL; + const char *default_pcui =3D NULL; GSList *list; = DBG("%s", modem->syspath); @@ -264,22 +265,33 @@ static gboolean setup_huawei(struct modem_info *modem) if (mdm !=3D NULL && pcui !=3D NULL) break; } else if (g_strcmp0(info->interface, "255/255/255") =3D=3D 0) { - if (g_strcmp0(info->number, "00") =3D=3D 0) + if (mdm =3D=3D NULL && g_strcmp0(info->number, "00") =3D=3D 0) mdm =3D info->devnode; - else if (g_strcmp0(info->number, "01") =3D=3D 0) - pcui =3D info->devnode; - else if (g_strcmp0(info->number, "02") =3D=3D 0) - pcui =3D info->devnode; - else if (g_strcmp0(info->number, "03") =3D=3D 0) - pcui =3D info->devnode; - else if (g_strcmp0(info->number, "04") =3D=3D 0) - pcui =3D info->devnode; + else if (diag =3D=3D NULL) { + if (g_strcmp0(info->number, "01") =3D=3D 0) + diag =3D info->devnode; + } else if (pcui =3D=3D NULL) { + if (g_strcmp0(info->number, "01") =3D=3D 0) + default_pcui =3D info->devnode; + else if (g_strcmp0(info->number, "02") =3D=3D 0) + default_pcui =3D info->devnode; + else if (g_strcmp0(info->number, "03") =3D=3D 0) + default_pcui =3D info->devnode; + else if (g_strcmp0(info->number, "04") =3D=3D 0) + default_pcui =3D info->devnode; + } } } = + if (pcui =3D=3D NULL && default_pcui !=3D NULL) + pcui =3D default_pcui; + if (mdm =3D=3D NULL || pcui =3D=3D NULL) return FALSE; = + if (diag !=3D NULL && g_strcmp0(diag, pcui) =3D=3D 0) + diag =3D NULL; + DBG("modem=3D%s pcui=3D%s diag=3D%s", mdm, pcui, diag); = ofono_modem_set_string(modem->modem, "Modem", mdm); -- = 1.7.1 --===============2800893832580545165==--