From: Philippe Nunes <philippe.nunes@linux.intel.com>
To: ofono@ofono.org
Subject: [PATCH v2 11/12] udevng: Add a default assignment for Huawei QCDM port
Date: Thu, 08 Dec 2011 15:50:02 +0100 [thread overview]
Message-ID: <1323355803-22096-12-git-send-email-philippe.nunes@linux.intel.com> (raw)
In-Reply-To: <1323355803-22096-1-git-send-email-philippe.nunes@linux.intel.com>
[-- Attachment #1: Type: text/plain, Size: 1992 bytes --]
---
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 = NULL, *pcui = NULL, *diag = NULL;
+ const char *default_pcui = NULL;
GSList *list;
DBG("%s", modem->syspath);
@@ -264,22 +265,33 @@ static gboolean setup_huawei(struct modem_info *modem)
if (mdm != NULL && pcui != NULL)
break;
} else if (g_strcmp0(info->interface, "255/255/255") == 0) {
- if (g_strcmp0(info->number, "00") == 0)
+ if (mdm == NULL && g_strcmp0(info->number, "00") == 0)
mdm = info->devnode;
- else if (g_strcmp0(info->number, "01") == 0)
- pcui = info->devnode;
- else if (g_strcmp0(info->number, "02") == 0)
- pcui = info->devnode;
- else if (g_strcmp0(info->number, "03") == 0)
- pcui = info->devnode;
- else if (g_strcmp0(info->number, "04") == 0)
- pcui = info->devnode;
+ else if (diag == NULL) {
+ if (g_strcmp0(info->number, "01") == 0)
+ diag = info->devnode;
+ } else if (pcui == NULL) {
+ if (g_strcmp0(info->number, "01") == 0)
+ default_pcui = info->devnode;
+ else if (g_strcmp0(info->number, "02") == 0)
+ default_pcui = info->devnode;
+ else if (g_strcmp0(info->number, "03") == 0)
+ default_pcui = info->devnode;
+ else if (g_strcmp0(info->number, "04") == 0)
+ default_pcui = info->devnode;
+ }
}
}
+ if (pcui == NULL && default_pcui != NULL)
+ pcui = default_pcui;
+
if (mdm == NULL || pcui == NULL)
return FALSE;
+ if (diag != NULL && g_strcmp0(diag, pcui) == 0)
+ diag = NULL;
+
DBG("modem=%s pcui=%s diag=%s", mdm, pcui, diag);
ofono_modem_set_string(modem->modem, "Modem", mdm);
--
1.7.1
next prev parent reply other threads:[~2011-12-08 14:50 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-08 14:49 [PATCH v2 00/12] Provider name and SID Philippe Nunes
2011-12-08 14:49 ` [PATCH v2 01/12] cdma-providers: add driver APIs header Philippe Nunes
2011-12-09 11:50 ` Denis Kenzior
2011-12-08 14:49 ` [PATCH v2 02/12] ofono.h: add cdma-providers Philippe Nunes
2011-12-09 11:52 ` Denis Kenzior
2011-12-08 14:49 ` [PATCH v2 03/12] cdma-providers: add driver APIs implementation Philippe Nunes
2011-12-08 14:49 ` [PATCH v2 04/12] providers: Add cdma provider name plugin Philippe Nunes
2011-12-08 14:49 ` [PATCH v2 05/12] cdma-netreg: Add provider name and SID support Philippe Nunes
2011-12-08 14:49 ` [PATCH v2 06/12] gatchat: Add possibility to associate a diagnostic monitor to the AT-capable port Philippe Nunes
2011-12-08 14:13 ` Marcel Holtmann
2011-12-08 16:07 ` Philippe Nunes
2011-12-08 15:17 ` Marcel Holtmann
2011-12-08 16:50 ` Philippe Nunes
2011-12-09 12:09 ` Denis Kenzior
2011-12-08 14:49 ` [PATCH v2 07/12] huaweicdma: Use pcui port for cdma_netreg Philippe Nunes
2011-12-09 12:11 ` Denis Kenzior
2011-12-08 14:49 ` [PATCH v2 08/12] huaweicdma: Open qcdm port to be used for signal quality or network status Philippe Nunes
2011-12-08 14:50 ` [PATCH v2 09/12] huaweicdmamodem: Probe the QCDM port with the version info request Philippe Nunes
2011-12-08 14:50 ` [PATCH v2 10/12] huaweicdmamodem: Add 'serving_system' entry point to get SID Philippe Nunes
2011-12-08 14:50 ` Philippe Nunes [this message]
2011-12-08 14:50 ` [PATCH v2 12/12] huaweicdmamodem: Fix sysinfo parsing Philippe Nunes
2011-12-09 12:14 ` Denis Kenzior
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1323355803-22096-12-git-send-email-philippe.nunes@linux.intel.com \
--to=philippe.nunes@linux.intel.com \
--cc=ofono@ofono.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox