* [PATCH v2 0/5] udev rules update
@ 2011-08-29 16:41 Philippe Nunes
2011-08-29 16:41 ` [PATCH v2 1/5] udev: Add rules to support ZTE MF668 dongle Philippe Nunes
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Philippe Nunes @ 2011-08-29 16:41 UTC (permalink / raw)
To: ofono
[-- Attachment #1: Type: text/plain, Size: 905 bytes --]
For Speedup dongles, the aux channel is not necessarily on the last interface (as for Speedup 8000)
So, I kept the actual logic (modem is assigned on the last interface) and I added two rules for Speedup 7300 and Speedup 9800
I modified also udevng.c in order to avoid aux/modem channel assignment according OFONO_LABEL to be overridden by the default assignment.
Note that for ZTE dongles, this overriding can't occur.
Philippe Nunes (5):
udev: Add rules to support ZTE MF668 dongle
udev: Add rules to support ZTE MF190 dongle
udevng.c: tty assignment according OFONO_LABEL should take precedence
udev: Add rules to support Speedup 7300 dongle
udev: Add rules to support SpeedUp 9800 dongle
plugins/ofono.rules | 20 +++++++++++++++++++
plugins/udevng.c | 52 +++++++++++++++++++++++++++++---------------------
2 files changed, 50 insertions(+), 22 deletions(-)
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 1/5] udev: Add rules to support ZTE MF668 dongle
2011-08-29 16:41 [PATCH v2 0/5] udev rules update Philippe Nunes
@ 2011-08-29 16:41 ` Philippe Nunes
2011-08-29 16:41 ` [PATCH v2 2/5] udev: Add rules to support ZTE MF190 dongle Philippe Nunes
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Philippe Nunes @ 2011-08-29 16:41 UTC (permalink / raw)
To: ofono
[-- Attachment #1: Type: text/plain, Size: 781 bytes --]
---
plugins/ofono.rules | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/plugins/ofono.rules b/plugins/ofono.rules
index 30a1b7e..c7fac57 100644
--- a/plugins/ofono.rules
+++ b/plugins/ofono.rules
@@ -15,6 +15,15 @@ KERNEL=="shrm0", ENV{OFONO_DRIVER}="u8500"
LABEL="ofono_isi_end"
+SUBSYSTEM!="tty", GOTO="ofono_tty_end"
+KERNEL!="ttyUSB[0-9]*", GOTO="ofono_tty_end"
+
+# ZTE
+ATTRS{idVendor}=="19d2", ATTRS{idProduct}=="0017", ENV{ID_USB_INTERFACE_NUM}=="02", ENV{OFONO_LABEL}="modem"
+ATTRS{idVendor}=="19d2", ATTRS{idProduct}=="0017", ENV{ID_USB_INTERFACE_NUM}=="01", ENV{OFONO_LABEL}="aux"
+
+LABEL="ofono_tty_end"
+
SUBSYSTEM!="usb", GOTO="ofono_end"
ENV{DEVTYPE}!="usb_device", GOTO="ofono_end"
--
1.7.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 2/5] udev: Add rules to support ZTE MF190 dongle
2011-08-29 16:41 [PATCH v2 0/5] udev rules update Philippe Nunes
2011-08-29 16:41 ` [PATCH v2 1/5] udev: Add rules to support ZTE MF668 dongle Philippe Nunes
@ 2011-08-29 16:41 ` Philippe Nunes
2011-08-29 16:41 ` [PATCH v2 3/5] udevng.c: tty assignment according OFONO_LABEL should take precedence Philippe Nunes
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Philippe Nunes @ 2011-08-29 16:41 UTC (permalink / raw)
To: ofono
[-- Attachment #1: Type: text/plain, Size: 820 bytes --]
---
plugins/ofono.rules | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/plugins/ofono.rules b/plugins/ofono.rules
index c7fac57..079db07 100644
--- a/plugins/ofono.rules
+++ b/plugins/ofono.rules
@@ -22,6 +22,9 @@ KERNEL!="ttyUSB[0-9]*", GOTO="ofono_tty_end"
ATTRS{idVendor}=="19d2", ATTRS{idProduct}=="0017", ENV{ID_USB_INTERFACE_NUM}=="02", ENV{OFONO_LABEL}="modem"
ATTRS{idVendor}=="19d2", ATTRS{idProduct}=="0017", ENV{ID_USB_INTERFACE_NUM}=="01", ENV{OFONO_LABEL}="aux"
+ATTRS{idVendor}=="19d2", ATTRS{idProduct}=="0124", ENV{ID_USB_INTERFACE_NUM}=="04", ENV{OFONO_LABEL}="modem"
+ATTRS{idVendor}=="19d2", ATTRS{idProduct}=="0124", ENV{ID_USB_INTERFACE_NUM}=="01", ENV{OFONO_LABEL}="aux"
+
LABEL="ofono_tty_end"
SUBSYSTEM!="usb", GOTO="ofono_end"
--
1.7.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 3/5] udevng.c: tty assignment according OFONO_LABEL should take precedence
2011-08-29 16:41 [PATCH v2 0/5] udev rules update Philippe Nunes
2011-08-29 16:41 ` [PATCH v2 1/5] udev: Add rules to support ZTE MF668 dongle Philippe Nunes
2011-08-29 16:41 ` [PATCH v2 2/5] udev: Add rules to support ZTE MF190 dongle Philippe Nunes
@ 2011-08-29 16:41 ` Philippe Nunes
2011-08-29 16:41 ` [PATCH v2 4/5] udev: Add rules to support Speedup 7300 dongle Philippe Nunes
2011-08-29 16:41 ` [PATCH v2 5/5] udev: Add rules to support SpeedUp 9800 dongle Philippe Nunes
4 siblings, 0 replies; 6+ messages in thread
From: Philippe Nunes @ 2011-08-29 16:41 UTC (permalink / raw)
To: ofono
[-- Attachment #1: Type: text/plain, Size: 3982 bytes --]
---
plugins/udevng.c | 52 ++++++++++++++++++++++++++++++----------------------
1 files changed, 30 insertions(+), 22 deletions(-)
diff --git a/plugins/udevng.c b/plugins/udevng.c
index 1365bd1..40cc1ff 100644
--- a/plugins/udevng.c
+++ b/plugins/udevng.c
@@ -264,16 +264,18 @@ 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)
+ 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;
+ }
}
}
@@ -311,12 +313,14 @@ 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)
+ mdm = info->devnode;
+ else if (g_strcmp0(info->number, "03") == 0)
+ mdm = info->devnode;
+ }
}
}
@@ -385,9 +389,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 +430,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 +471,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 +512,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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 4/5] udev: Add rules to support Speedup 7300 dongle
2011-08-29 16:41 [PATCH v2 0/5] udev rules update Philippe Nunes
` (2 preceding siblings ...)
2011-08-29 16:41 ` [PATCH v2 3/5] udevng.c: tty assignment according OFONO_LABEL should take precedence Philippe Nunes
@ 2011-08-29 16:41 ` Philippe Nunes
2011-08-29 16:41 ` [PATCH v2 5/5] udev: Add rules to support SpeedUp 9800 dongle Philippe Nunes
4 siblings, 0 replies; 6+ messages in thread
From: Philippe Nunes @ 2011-08-29 16:41 UTC (permalink / raw)
To: ofono
[-- Attachment #1: Type: text/plain, Size: 875 bytes --]
---
plugins/ofono.rules | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/plugins/ofono.rules b/plugins/ofono.rules
index 079db07..7f284d4 100644
--- a/plugins/ofono.rules
+++ b/plugins/ofono.rules
@@ -25,6 +25,10 @@ ATTRS{idVendor}=="19d2", ATTRS{idProduct}=="0017", ENV{ID_USB_INTERFACE_NUM}=="0
ATTRS{idVendor}=="19d2", ATTRS{idProduct}=="0124", ENV{ID_USB_INTERFACE_NUM}=="04", ENV{OFONO_LABEL}="modem"
ATTRS{idVendor}=="19d2", ATTRS{idProduct}=="0124", ENV{ID_USB_INTERFACE_NUM}=="01", ENV{OFONO_LABEL}="aux"
+# SpeedUp 7300
+ATTRS{idVendor}=="1c9e", ATTRS{idProduct}=="9e00", ENV{ID_USB_INTERFACE_NUM}=="00", ENV{OFONO_LABEL}="modem"
+ATTRS{idVendor}=="1c9e", ATTRS{idProduct}=="9e00", ENV{ID_USB_INTERFACE_NUM}=="03", ENV{OFONO_LABEL}="aux"
+
LABEL="ofono_tty_end"
SUBSYSTEM!="usb", GOTO="ofono_end"
--
1.7.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 5/5] udev: Add rules to support SpeedUp 9800 dongle
2011-08-29 16:41 [PATCH v2 0/5] udev rules update Philippe Nunes
` (3 preceding siblings ...)
2011-08-29 16:41 ` [PATCH v2 4/5] udev: Add rules to support Speedup 7300 dongle Philippe Nunes
@ 2011-08-29 16:41 ` Philippe Nunes
4 siblings, 0 replies; 6+ messages in thread
From: Philippe Nunes @ 2011-08-29 16:41 UTC (permalink / raw)
To: ofono
[-- Attachment #1: Type: text/plain, Size: 875 bytes --]
---
plugins/ofono.rules | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/plugins/ofono.rules b/plugins/ofono.rules
index 7f284d4..9e7a651 100644
--- a/plugins/ofono.rules
+++ b/plugins/ofono.rules
@@ -29,6 +29,10 @@ ATTRS{idVendor}=="19d2", ATTRS{idProduct}=="0124", ENV{ID_USB_INTERFACE_NUM}=="0
ATTRS{idVendor}=="1c9e", ATTRS{idProduct}=="9e00", ENV{ID_USB_INTERFACE_NUM}=="00", ENV{OFONO_LABEL}="modem"
ATTRS{idVendor}=="1c9e", ATTRS{idProduct}=="9e00", ENV{ID_USB_INTERFACE_NUM}=="03", ENV{OFONO_LABEL}="aux"
+# SpeedUp 9800
+ATTRS{idVendor}=="1c9e", ATTRS{idProduct}=="9800", ENV{ID_USB_INTERFACE_NUM}=="01", ENV{OFONO_LABEL}="modem"
+ATTRS{idVendor}=="1c9e", ATTRS{idProduct}=="9800", ENV{ID_USB_INTERFACE_NUM}=="02", ENV{OFONO_LABEL}="aux"
+
LABEL="ofono_tty_end"
SUBSYSTEM!="usb", GOTO="ofono_end"
--
1.7.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-08-29 16:41 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-08-29 16:41 [PATCH v2 0/5] udev rules update Philippe Nunes
2011-08-29 16:41 ` [PATCH v2 1/5] udev: Add rules to support ZTE MF668 dongle Philippe Nunes
2011-08-29 16:41 ` [PATCH v2 2/5] udev: Add rules to support ZTE MF190 dongle Philippe Nunes
2011-08-29 16:41 ` [PATCH v2 3/5] udevng.c: tty assignment according OFONO_LABEL should take precedence Philippe Nunes
2011-08-29 16:41 ` [PATCH v2 4/5] udev: Add rules to support Speedup 7300 dongle Philippe Nunes
2011-08-29 16:41 ` [PATCH v2 5/5] udev: Add rules to support SpeedUp 9800 dongle Philippe Nunes
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.