---
plugins/ofono.hwdb | 13 +++++++++++++
plugins/udevng.c | 16 ++--------------
2 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/plugins/ofono.hwdb b/plugins/ofono.hwdb
index 655a897..70842c7 100644
--- a/plugins/ofono.hwdb
+++ b/plugins/ofono.hwdb
@@ -114,6 +114,19 @@ usb:v05C6p9000*icFFiscFFipFFin02
usb:v05C6p9000*icFFiscFFipFFin03
OFONO_LABEL=modem
+# Nokia
+usb:v0421p060E*ic0Aisc00ip00*
+usb:v0421p0623*ic0Aisc00ip00*
+ OFONO_DRIVER=nokia
+
+usb:v0421p060E*ic0Aisc00ip00in02
+usb:v0421p0623*ic0Aisc00ip00in02
+ OFONO_LABEL=modem
+
+usb:v0421p060E*ic0Aisc00ip00in04
+usb:v0421p0623*ic0Aisc00ip00in04
+ OFONO_LABEL=aux
+
# UBlox
usb:v1546p1102*
usb:v1546p1146*
diff --git a/plugins/udevng.c b/plugins/udevng.c
index 2e0320b..095d1fc 100644
--- a/plugins/udevng.c
+++ b/plugins/udevng.c
@@ -547,20 +547,10 @@ static gboolean setup_nokia(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;
- } else if (g_strcmp0(info->interface, "10/0/0") == 0) {
- if (g_strcmp0(info->number, "02") == 0)
- mdm = info->devnode;
- else if (g_strcmp0(info->number, "04") == 0)
- aux = info->devnode;
- }
}
if (aux == NULL || mdm == NULL)
@@ -1345,8 +1335,6 @@ static struct {
{ "telit", "cdc_acm", "1bc7", "0021" },
{ "telitqmi", "qmi_wwan", "1bc7", "1201" },
{ "telitqmi", "option", "1bc7", "1201" },
- { "nokia", "option", "0421", "060e" },
- { "nokia", "option", "0421", "0623" },
{ "samsung", "option", "04e8", "6889" },
{ "samsung", "kalmia" },
{ "quectel", "option", "05c6", "9090" },
--
2.9.3
_______________________________________________
ofono mailing list
[email protected]
https://lists.ofono.org/mailman/listinfo/ofono
