[RFC hwdb v1 10/28] linktop: label interfaces via hwdb

[Jonas Bonn]

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

diff --git a/plugins/ofono.hwdb b/plugins/ofono.hwdb
index d6e7e9d..5686163 100644
--- a/plugins/ofono.hwdb
+++ b/plugins/ofono.hwdb
@@ -166,3 +166,13 @@ usb:v1C9Ep9E00*in00
 usb:v1C9Ep9E00*in03
  OFONO_LABEL=aux
 
+# Linktop
+usb:v230D*ic02isc02ip01*
+ OFONO_DRIVER=linktop
+
+usb:v230D*ic02isc02ip01in01
+ OFONO_LABEL=aux
+
+usb:v230D*ic02isc02ip01in03
+ OFONO_LABEL=modem
+
diff --git a/plugins/udevng.c b/plugins/udevng.c
index 3be047d..5b858f2 100644
--- a/plugins/udevng.c
+++ b/plugins/udevng.c
@@ -416,12 +416,10 @@ static gboolean setup_linktop(struct modem_info *modem)
                DBG("%s %s %s %s", info->devnode, info->interface,
                                                info->number, info->label);
 
-               if (g_strcmp0(info->interface, "2/2/1") == 0) {
-                       if (g_strcmp0(info->number, "01") == 0)
-                               aux = info->devnode;
-                       else if (g_strcmp0(info->number, "03") == 0)
-                               mdm = info->devnode;
-               }
+               if (g_strcmp0(info->label, "aux") == 0)
+                       aux = info->devnode;
+               else if (g_strcmp0(info->label, "modem") == 0)
+                       mdm = info->devnode;
        }
 
        if (aux == NULL || mdm == NULL)
@@ -1322,7 +1320,6 @@ static struct {
        const char *pid;
 } vendor_list[] = {
        { "isiusb",     "cdc_phonet"                    },
-       { "linktop",    "cdc_acm",      "230d"          },
        { "icera",      "cdc_acm",      "19d2"          },
        { "icera",      "cdc_ether",    "19d2"          },
        { "icera",      "cdc_acm",      "04e8", "6872"  },
-- 
2.9.3

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