---
plugins/ofono.hwdb | 11 +++++++++++
plugins/ofono.rules | 6 ++++++
plugins/udevng.c | 6 ++----
3 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/plugins/ofono.hwdb b/plugins/ofono.hwdb
index 70842c7..02db1cd 100644
--- a/plugins/ofono.hwdb
+++ b/plugins/ofono.hwdb
@@ -127,6 +127,17 @@ usb:v0421p060E*ic0Aisc00ip00in04
usb:v0421p0623*ic0Aisc00ip00in04
OFONO_LABEL=aux
+# Samsung
+usb:v04E8p6889*ic0Aisc00ip00*
+usb:v04E8p6889*icFFisc00ip00*
+ OFONO_DRIVER=samsung
+
+usb:v04E8*ic0Aisc00ip00*
+ OFONO_LABEL=control
+
+usb:v04E8*icFFisc00ip00*
+ OFONO_LABEL=net
+
# UBlox
usb:v1546p1102*
usb:v1546p1146*
diff --git a/plugins/ofono.rules b/plugins/ofono.rules
index 4d70735..f783aab 100644
--- a/plugins/ofono.rules
+++ b/plugins/ofono.rules
@@ -60,4 +60,10 @@ ATTR{bInterfaceNumber}=="02",ENV{OFONO_LABEL}="modem"
ATTR{bInterfaceNumber}=="03",ENV{OFONO_LABEL}="gps"
LABEL="gobi_end"
+DRIVER=="kalmia",ENV{OFONO_DRIVER}="samsung"
+ENV{OFONO_DRIVER}!="samsung",GOTO="samsung_end"
+ENV{INTERFACE}=="10/0/0",ENV{OFONO_LABEL}="control"
+ENV{INTERFACE}=="255/0/0",ENV{OFONO_LABEL}="net"
+LABEL="samsung_end"
+
LABEL="ofono_end"
diff --git a/plugins/udevng.c b/plugins/udevng.c
index 095d1fc..b5c5c86 100644
--- a/plugins/udevng.c
+++ b/plugins/udevng.c
@@ -735,9 +735,9 @@ static gboolean setup_samsung(struct modem_info *modem)
DBG("%s %s %s %s", info->devnode, info->interface,
info->number, info->label);
- if (g_strcmp0(info->interface, "10/0/0") == 0)
+ if (g_strcmp0(info->label, "control") == 0)
control = info->devnode;
- else if (g_strcmp0(info->interface, "255/0/0") == 0)
+ else if (g_strcmp0(info->label, "net") == 0)
network = info->devnode;
}
@@ -1335,8 +1335,6 @@ static struct {
{ "telit", "cdc_acm", "1bc7", "0021" },
{ "telitqmi", "qmi_wwan", "1bc7", "1201" },
{ "telitqmi", "option", "1bc7", "1201" },
- { "samsung", "option", "04e8", "6889" },
- { "samsung", "kalmia" },
{ "quectel", "option", "05c6", "9090" },
{ "telit", "cdc_ncm", "1bc7", "0036" },
{ "telit", "cdc_acm", "1bc7", "0036" },
--
2.9.3
_______________________________________________
ofono mailing list
[email protected]
https://lists.ofono.org/mailman/listinfo/ofono
