From: Philippe Nunes <philippe.nunes@linux.intel.com>
To: ofono@ofono.org
Subject: [PATCH 3/5] udevng.c: tty assignment according OFONO_LABEL should take precedence
Date: Tue, 29 Nov 2011 13:21:19 +0100 [thread overview]
Message-ID: <1322569281-10908-4-git-send-email-philippe.nunes@linux.intel.com> (raw)
In-Reply-To: <1322569281-10908-1-git-send-email-philippe.nunes@linux.intel.com>
[-- Attachment #1: Type: text/plain, Size: 4855 bytes --]
---
plugins/udevng.c | 61 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 38 insertions(+), 23 deletions(-)
diff --git a/plugins/udevng.c b/plugins/udevng.c
index be87320..6a3c970 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,19 +265,24 @@ 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 (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;
@@ -291,7 +297,7 @@ static gboolean setup_huawei(struct modem_info *modem)
static gboolean setup_speedup(struct modem_info *modem)
{
- const char *aux = NULL, *mdm = NULL;
+ const char *aux = NULL, *mdm = NULL, *default_mdm = NULL;
GSList *list;
DBG("%s", modem->syspath);
@@ -311,15 +317,20 @@ static gboolean setup_speedup(struct modem_info *modem)
if (aux != NULL)
break;
} else if (g_strcmp0(info->interface, "255/255/255") == 0) {
- if (g_strcmp0(info->number, "01") == 0)
+ if (aux == NULL && g_strcmp0(info->number, "01") == 0)
aux = info->devnode;
- else if (g_strcmp0(info->number, "02") == 0)
- mdm = info->devnode;
- else if (g_strcmp0(info->number, "03") == 0)
- mdm = info->devnode;
+ else if (mdm == NULL) {
+ if (g_strcmp0(info->number, "02") == 0)
+ default_mdm = info->devnode;
+ else if (g_strcmp0(info->number, "03") == 0)
+ default_mdm = info->devnode;
+ }
}
}
+ if (mdm == NULL && default_mdm != NULL)
+ mdm = default_mdm;
+
if (aux == NULL || mdm == NULL)
return FALSE;
@@ -385,9 +396,10 @@ static gboolean setup_alcatel(struct modem_info *modem)
if (aux != NULL)
break;
} else if (g_strcmp0(info->interface, "255/255/255") == 0) {
- if (g_strcmp0(info->number, "03") == 0)
+ if (aux == NULL && g_strcmp0(info->number, "03") == 0)
aux = info->devnode;
- else if (g_strcmp0(info->number, "05") == 0)
+ else if (mdm == NULL &&
+ g_strcmp0(info->number, "05") == 0)
mdm = info->devnode;
}
}
@@ -425,9 +437,10 @@ static gboolean setup_novatel(struct modem_info *modem)
if (aux != NULL)
break;
} else if (g_strcmp0(info->interface, "255/255/255") == 0) {
- if (g_strcmp0(info->number, "00") == 0)
+ if (aux == NULL && g_strcmp0(info->number, "00") == 0)
aux = info->devnode;
- else if (g_strcmp0(info->number, "01") == 0)
+ else if (mdm == NULL &&
+ g_strcmp0(info->number, "01") == 0)
mdm = info->devnode;
}
}
@@ -465,9 +478,10 @@ static gboolean setup_nokia(struct modem_info *modem)
if (aux != NULL)
break;
} else if (g_strcmp0(info->interface, "10/0/0") == 0) {
- if (g_strcmp0(info->number, "02") == 0)
+ if (mdm == NULL && g_strcmp0(info->number, "02") == 0)
mdm = info->devnode;
- else if (g_strcmp0(info->number, "04") == 0)
+ else if (aux == NULL &&
+ g_strcmp0(info->number, "04") == 0)
aux = info->devnode;
}
}
@@ -505,13 +519,14 @@ static gboolean setup_telit(struct modem_info *modem)
if (aux != 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)
diag = info->devnode;
else if (g_strcmp0(info->number, "02") == 0)
gps = info->devnode;
- else if (g_strcmp0(info->number, "03") == 0)
+ else if (aux == NULL
+ && g_strcmp0(info->number, "03") == 0)
aux = info->devnode;
}
}
--
1.7.1
next prev parent reply other threads:[~2011-11-29 12:21 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-29 12:21 [PATCH 0/5] udev rules update Philippe Nunes
2011-11-29 12:20 ` Marcel Holtmann
2011-11-29 14:51 ` Philippe Nunes
2011-11-29 12:21 ` [PATCH 1/5] udev: Add rules to support ZTE MF668 dongle Philippe Nunes
2011-12-19 5:49 ` Marcel Holtmann
2011-12-19 17:34 ` Philippe Nunes
2011-11-29 12:21 ` [PATCH 2/5] udev: Add rules to support ZTE MF190 dongle Philippe Nunes
2011-12-19 5:50 ` Marcel Holtmann
2011-12-19 17:45 ` Philippe Nunes
2011-11-29 12:21 ` Philippe Nunes [this message]
2011-12-19 5:48 ` [PATCH 3/5] udevng.c: tty assignment according OFONO_LABEL should take precedence Marcel Holtmann
2011-12-19 16:32 ` Philippe Nunes
2011-11-29 12:21 ` [PATCH 4/5] udev: Add rules to support Speedup 7300 dongle Philippe Nunes
2011-12-19 5:51 ` Marcel Holtmann
2011-11-29 12:21 ` [PATCH 5/5] udev: Add rules to support SpeedUp 9800 dongle Philippe Nunes
2011-12-19 5:52 ` Marcel Holtmann
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=1322569281-10908-4-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