[RFC hwdb v1 23/28] quectel: label interfaces via hwdb

[Jonas Bonn]

---
 plugins/ofono.hwdb | 10 ++++++++++
 plugins/udevng.c   | 10 ----------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/plugins/ofono.hwdb b/plugins/ofono.hwdb
index 145e985..a2ca4b8 100644
--- a/plugins/ofono.hwdb
+++ b/plugins/ofono.hwdb
@@ -249,6 +249,16 @@ usb:v230D*ic02isc02ip01in01
 usb:v230D*ic02isc02ip01in03
  OFONO_LABEL=modem
 
+# Quectel
+usb:v05C6p9090*icFFiscFFipFF*
+ OFONO_DRIVER=quectel
+
+usb:v05C6p9090*icFFiscFFipFFin02
+ OFONO_LABEL=aux
+
+usb:v05C6p9090*icFFiscFFipFFin03
+ OFONO_LABEL=modem
+
 # Telit
 usb:v1BC7*icFFiscFFipFF*
 usb:v1BC7p0021*icFFiscFFipFF*
diff --git a/plugins/udevng.c b/plugins/udevng.c
index 16c9328..1fe7d34 100644
--- a/plugins/udevng.c
+++ b/plugins/udevng.c
@@ -734,17 +734,8 @@ static gboolean setup_quectel(struct modem_info *modem)
 
                if (g_strcmp0(info->label, "aux") == 0) {
                        aux = info->devnode;
-                       if (mdm != NULL)
-                               break;
                } else if (g_strcmp0(info->label, "modem") == 0) {
                        mdm = info->devnode;
-                       if (aux != NULL)
-                               break;
-               } else if (g_strcmp0(info->interface, "255/255/255") == 0) {
-                       if (g_strcmp0(info->number, "02") == 0)
-                               aux = info->devnode;
-                       else if (g_strcmp0(info->number, "03") == 0)
-                               mdm = info->devnode;
                }
        }
 
@@ -1287,7 +1278,6 @@ static struct {
        { "mbm",        "cdc_acm",      "0930"          },
        { "mbm",        "cdc_ether",    "0930"          },
        { "mbm",        "cdc_ncm",      "0930"          },
-       { "quectel",    "option",       "05c6", "9090"  },
        { }
 };
 
-- 
2.9.3

_______________________________________________
ofono mailing list
ofono@ofono.org
https://lists.ofono.org/mailman/listinfo/ofono