---
plugins/ofono.hwdb | 16 ++++++++++++++++
plugins/udevng.c | 31 +++----------------------------
2 files changed, 19 insertions(+), 28 deletions(-)
diff --git a/plugins/ofono.hwdb b/plugins/ofono.hwdb
index fc2d738..c0c050f 100644
--- a/plugins/ofono.hwdb
+++ b/plugins/ofono.hwdb
@@ -101,3 +101,19 @@ usb:v05C6p9000*icFFiscFFipFFin02
usb:v05C6p9000*icFFiscFFipFFin03
OFONO_LABEL=modem
+# UBlox
+usb:v1546p1102*
+usb:v1546p1146*
+ OFONO_DRIVER=ublox
+
+usb:v1546*ic02isc02ip01in00
+ OFONO_LABEL=modem
+
+usb:v1546*ic02isc02ip01in02
+ OFONO_LABEL=aux
+
+usb:v1546*ic02isc06ip00*
+usb:v1546*ic0Aisc00ip00*
+usb:v1546*icE0isc01ip03*
+ OFONO_LABEL=net
+
diff --git a/plugins/udevng.c b/plugins/udevng.c
index bdf36fa..4869833 100644
--- a/plugins/udevng.c
+++ b/plugins/udevng.c
@@ -915,34 +915,12 @@ static gboolean setup_ublox(struct modem_info *modem)
DBG("%s %s %s %s", info->devnode, info->interface,
info->number, info->label);
- if (g_strcmp0(info->label, "aux") == 0) {
+ if (g_strcmp0(info->label, "aux") == 0)
aux = info->devnode;
- if (mdm != NULL)
- break;
- } else if (g_strcmp0(info->label, "modem") == 0) {
+ else if (g_strcmp0(info->label, "modem") == 0)
mdm = info->devnode;
- if (aux != NULL)
- break;
- /*
- * "2/2/1"
- * - a common modem interface both for older models like LISA,
- * and for newer models like TOBY.
- * For TOBY-L2, NetworkInterface can be detected for each
- * profile:
- * - low-medium throughput profile : 2/6/0
- * - fairly backward-compatible profile : 10/0/0
- * - high throughput profile : 224/1/3
- */
- } else if (g_strcmp0(info->interface, "2/2/1") == 0) {
- if (g_strcmp0(info->number, "02") == 0)
- aux = info->devnode;
- else if (g_strcmp0(info->number, "00") == 0)
- mdm = info->devnode;
- } else if (g_strcmp0(info->interface, "2/6/0") == 0 ||
- g_strcmp0(info->interface, "10/0/0") == 0 ||
- g_strcmp0(info->interface, "224/1/3") == 0) {
+ else if (g_strcmp0(info->label, "net") == 0)
net = info->devnode;
- }
}
/* Abort only if both interfaces are NULL, as it's highly possible that
@@ -1387,9 +1365,6 @@ static struct {
{ "samsung", "option", "04e8", "6889" },
{ "samsung", "kalmia" },
{ "quectel", "option", "05c6", "9090" },
- { "ublox", "cdc_acm", "1546", "1102" },
- { "ublox", "rndis_host", "1546", "1146" },
- { "ublox", "cdc_acm", "1546", "1146" },
{ "gemalto", "option", "1e2d", "0053" },
{ "gemalto", "cdc_wdm", "1e2d", "0053" },
{ "gemalto", "qmi_wwan", "1e2d", "0053" },
--
2.9.3
_______________________________________________
ofono mailing list
[email protected]
https://lists.ofono.org/mailman/listinfo/ofono
