---
plugins/ofono-speedup.rules | 27 ---------------------------
plugins/ofono.hwdb | 33 +++++++++++++++++++++++++++++++++
plugins/udevng.c | 3 ---
3 files changed, 33 insertions(+), 30 deletions(-)
delete mode 100644 plugins/ofono-speedup.rules
diff --git a/plugins/ofono-speedup.rules b/plugins/ofono-speedup.rules
deleted file mode 100644
index acf8857..0000000
--- a/plugins/ofono-speedup.rules
+++ /dev/null
@@ -1,27 +0,0 @@
-# do not edit this file, it will be overwritten on update
-
-ACTION!="add|change", GOTO="ofono_speedup_end"
-
-SUBSYSTEM!="tty", GOTO="ofono_speedup_end"
-KERNEL!="ttyUSB[0-9]*", GOTO="ofono_speedup_end"
-
-# SpeedUp 7300
-ATTRS{idVendor}=="1c9e", ATTRS{idProduct}=="9e00",
ENV{ID_USB_INTERFACE_NUM}=="00", ENV{OFONO_LABEL}="modem"
-ATTRS{idVendor}=="1c9e", ATTRS{idProduct}=="9e00",
ENV{ID_USB_INTERFACE_NUM}=="03", ENV{OFONO_LABEL}="aux"
-
-# SpeedUp
-ATTRS{idVendor}=="2020", ATTRS{idProduct}=="1005",
ENV{ID_USB_INTERFACE_NUM}=="03", ENV{OFONO_LABEL}="modem"
-ATTRS{idVendor}=="2020", ATTRS{idProduct}=="1005",
ENV{ID_USB_INTERFACE_NUM}=="01", ENV{OFONO_LABEL}="aux"
-
-ATTRS{idVendor}=="2020", ATTRS{idProduct}=="1008",
ENV{ID_USB_INTERFACE_NUM}=="03", ENV{OFONO_LABEL}="modem"
-ATTRS{idVendor}=="2020", ATTRS{idProduct}=="1008",
ENV{ID_USB_INTERFACE_NUM}=="01", ENV{OFONO_LABEL}="aux"
-
-# SpeedUp 9800
-ATTRS{idVendor}=="1c9e", ATTRS{idProduct}=="9800",
ENV{ID_USB_INTERFACE_NUM}=="01", ENV{OFONO_LABEL}="modem"
-ATTRS{idVendor}=="1c9e", ATTRS{idProduct}=="9800",
ENV{ID_USB_INTERFACE_NUM}=="02", ENV{OFONO_LABEL}="aux"
-
-# SpeedUp U3501
-ATTRS{idVendor}=="1c9e", ATTRS{idProduct}=="9605",
ENV{ID_USB_INTERFACE_NUM}=="03", ENV{OFONO_LABEL}="modem"
-ATTRS{idVendor}=="1c9e", ATTRS{idProduct}=="9605",
ENV{ID_USB_INTERFACE_NUM}=="01", ENV{OFONO_LABEL}="aux"
-
-LABEL="ofono_speedup_end"
diff --git a/plugins/ofono.hwdb b/plugins/ofono.hwdb
index d35d422..d6e7e9d 100644
--- a/plugins/ofono.hwdb
+++ b/plugins/ofono.hwdb
@@ -133,3 +133,36 @@ usb:v1E2Dp0053*icFFiscFFipFFin03
usb:v1E2Dp0053*icFFiscFFipFF*
OFONO_LABEL=maybeqmi
+# SpeedUp
+usb:v1C9E*
+usb:v2020*
+ OFONO_DRIVER=speedup
+
+usb:v2020p100[58]*in01
+ OFONO_LABEL=aux
+
+usb:v2020p100[58]*in03
+ OFONO_LABEL=modem
+
+usb:v1C9Ep9800*in01
+ OFONO_LABEL=modem
+
+usb:v1C9Ep9800*in02
+ OFONO_LABEL=aux
+
+usb:v1C9Ep9605*in01
+ OFONO_LABEL=aux
+
+usb:v1C9Ep9605*in03
+ OFONO_LABEL=modem
+
+# SpeedUp 7300
+usb:v1C9Ep9E00*
+ OFONO_DRIVER=speedupcmda
+
+usb:v1C9Ep9E00*in00
+ OFONO_LABEL=modem
+
+usb:v1C9Ep9E00*in03
+ OFONO_LABEL=aux
+
diff --git a/plugins/udevng.c b/plugins/udevng.c
index 0f54986..3be047d 100644
--- a/plugins/udevng.c
+++ b/plugins/udevng.c
@@ -1352,9 +1352,6 @@ static struct {
{ "sierra", "sierra" },
{ "sierra", "sierra_net" },
{ "option", "option", "0af0" },
- { "speedupcdma","option", "1c9e", "9e00" },
- { "speedup", "option", "1c9e" },
- { "speedup", "option", "2020" },
{ "telit", "usbserial", "1bc7" },
{ "telit", "option", "1bc7" },
{ "telit", "cdc_acm", "1bc7", "0021" },
--
2.9.3
_______________________________________________
ofono mailing list
[email protected]
https://lists.ofono.org/mailman/listinfo/ofono
