[RFC hwdb v1 02/28] zte: label interfaces via hwdb

[Jonas Bonn]

---
 plugins/ofono.hwdb | 16 ++++++++++++++++
 plugins/udevng.c   | 25 +++----------------------
 2 files changed, 19 insertions(+), 22 deletions(-)
 create mode 100644 plugins/ofono.hwdb

diff --git a/plugins/ofono.hwdb b/plugins/ofono.hwdb
new file mode 100644
index 0000000..75e553b
--- /dev/null
+++ b/plugins/ofono.hwdb
@@ -0,0 +1,16 @@
+# ZTE
+usb:v19D2*icFFiscFFipFF*
+ OFONO_DRIVER=zte
+
+usb:v19D2*icFFiscFFipFFin01
+ OFONO_LABEL=aux
+
+usb:v19D2*icFFiscFFipFFin03
+usb:v19D2p0016*icFFiscFFipFFin02
+usb:v19D2p0017*icFFiscFFipFFin02
+ OFONO_LABEL=modem
+
+usb:v19D2p0016*icFFiscFFipFFin03
+usb:v19D2p0017*icFFiscFFipFFin03
+ OFONO_LABEL=none
+
diff --git a/plugins/udevng.c b/plugins/udevng.c
index d9153b3..d95f71f 100644
--- a/plugins/udevng.c
+++ b/plugins/udevng.c
@@ -766,44 +766,26 @@ static gboolean setup_simcom(struct modem_info *modem)
 static gboolean setup_zte(struct modem_info *modem)
 {
        const char *aux = NULL, *mdm = NULL;
-       const char *modem_intf;
        GSList *list;
 
        DBG("%s", modem->syspath);
 
-       if (g_strcmp0(modem->model, "0016") == 0 ||
-                               g_strcmp0(modem->model, "0017") == 0 ||
-                               g_strcmp0(modem->model, "0117") == 0)
-               modem_intf = "02";
-       else
-               modem_intf = "03";
-
        for (list = modem->devices; list; list = list->next) {
                struct device_info *info = list->data;
 
                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;
-               } else if (g_strcmp0(info->interface, "255/255/255") == 0) {
-                       if (g_strcmp0(info->number, "01") == 0)
-                               aux = info->devnode;
-                       else if (g_strcmp0(info->number, modem_intf) == 0)
-                               mdm = info->devnode;
-               }
        }
 
        if (aux == NULL || mdm == NULL)
                return FALSE;
 
-       DBG("aux=%s modem=%s qcdm=%s", aux, mdm, qcdm);
+       DBG("aux=%s modem=%s", aux, mdm);
 
        ofono_modem_set_string(modem->modem, "Aux", aux);
        ofono_modem_set_string(modem->modem, "Modem", mdm);
@@ -1457,7 +1439,6 @@ static struct {
        { "speedup",    "option",       "2020"          },
        { "alcatel",    "option",       "1bbb", "0017"  },
        { "novatel",    "option",       "1410"          },
-       { "zte",        "option",       "19d2"          },
        { "simcom",     "option",       "05c6", "9000"  },
        { "telit",      "usbserial",    "1bc7"          },
        { "telit",      "option",       "1bc7"          },
-- 
2.9.3

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