Updated version 20170806 from 'upstream/20170806'

with Debian dir f0cf7c41458dc667cd29168ceea48746c3abb8ef

14 files changed, 41 insertions, 11 deletions

diff --git a/40-usb_modeswitch.rules b/40-usb_modeswitch.rules
index 612cd0f..045d938 100644
--- a/40-usb_modeswitch.rules
+++ b/40-usb_modeswitch.rules
@@ -1,4 +1,4 @@
-# Part of usb-modeswitch-data, version 20170205
+# Part of usb-modeswitch-data, version 20170805
 #
 # Works with usb_modeswitch versions >= 2.4.0. Slash before %k parameter
 # is for compatibility only. Versions >= 2.5.0 don't need it.
@@ -12,7 +12,7 @@ KERNEL=="ttyUSB*", ATTRS{bNumConfigurations}=="*", PROGRAM="usb_modeswitch --sym
 SUBSYSTEM!="usb", ACTION!="add",, GOTO="modeswitch_rules_end"
 
 # Generic entry for most Huawei devices, excluding Android phones
-ATTRS{idVendor}=="12d1", ATTRS{manufacturer}!="Android", ATTR{bInterfaceNumber}=="00", ATTR{bInterfaceClass}=="08", RUN+="usb_modeswitch '/%k'"
+ATTRS{idVendor}=="12d1", ATTRS{manufacturer}!="Android", ATTR{bInterfaceNumber}=="00", ATTR{bInterfaceClass}=="08", RUN+="usb_modeswitch '%b/%k'"
 
 # HP LaserJet Professional P1102
 ATTR{idVendor}=="03f0", ATTR{idProduct}=="002a", RUN+="usb_modeswitch '/%k'"
@@ -149,7 +149,7 @@ ATTR{idVendor}=="0586", ATTR{idProduct}=="2030", RUN+="usb_modeswitch '/%k'"
 # Axesstel Modems (w/ initial idProduct 0x0010)
 ATTR{idVendor}=="05c6", ATTR{idProduct}=="0010", RUN+="usb_modeswitch '/%k'"
 
-# Option GlobeTrotter GX0201, Older Option devices, AnyDATA devices, Bless UC165, Celot K-300 a.o., TechFaith Venus VT-18, Celot CT-680, Quirky Option devices, Samsung SGH-Z810, Prolink P2000 CDMA, StrongRising device, Vertex Wireless 100 Series
+# Samsung SGH-Z810, Option GlobeTrotter GX0201, Celot K-300 a.o., Celot CT-680, Older Option devices, AnyDATA devices, Bless UC165, StrongRising device, Prolink P2000 CDMA, TechFaith Venus VT-18, Vertex Wireless 100 Series
 ATTR{idVendor}=="05c6", ATTR{idProduct}=="1000", RUN+="usb_modeswitch '/%k'"
 
 # Various USB modems
@@ -413,7 +413,7 @@ ATTR{idVendor}=="0d46", ATTR{idProduct}=="45a5", RUN+="usb_modeswitch '/%k'"
 # Mobile Action ("Smart Cable")
 ATTR{idVendor}=="0df7", ATTR{idProduct}=="0800", RUN+="usb_modeswitch '/%k'"
 
-# MediaTek MT6276M and others, MediaTek/Medion S4222 and probably others
+# MediaTek/Medion S4222 and probably others, MediaTek MT6276M and others
 ATTR{idVendor}=="0e8d", ATTR{idProduct}=="0002", RUN+="usb_modeswitch '/%k'"
 
 # MediaTek Wimax USB Card
diff --git a/ChangeLog b/ChangeLog
index bb1d6f1..ccb5e39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20170806:
+    Added devices: [03f0:371d] HP un2430, [03f0:4b1d] HP hs2434, [03f0:4e1d]
+    HP lt4111, [03f0:a31d] HP lt4132, [0846:0fff] Netgear AirCard 779S,
+    [12d1:15ec] Vodafone/Huawei K5150; Corrected/amended configs: [0922:1003]
+    Dymo LabelManager 420P, [0922:1007] Dymo LabelManager Wireless PnP,
+    [1199:0fff] Sierra devices; Removed configs: [1004:61aa] LG VL600
 20170205:
     Bugfix release: removed all catch-all fallback config files as they can
     affect unrelated devices - fixes
diff --git a/Makefile b/Makefile
index ab7ae0c..8854f27 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 PROG        = usb-modeswitch-data
-VERS        = 20170205
+VERS        = 20170806
 RM          = /bin/rm -f
 PREFIX      = $(DESTDIR)/usr
 ETCDIR      = $(DESTDIR)/etc
diff --git a/REFERENCE b/REFERENCE
index 2ff7226..99b4043 100644
--- a/REFERENCE
+++ b/REFERENCE
@@ -1,7 +1,7 @@
 Configuration File Reference for USB_ModeSwitch
 -----------------------------------------------
 
-Last modified: 2016-08-03
+Last modified: 2017-08-06
 
 
 
@@ -114,6 +114,14 @@ but different target layouts may be reached with variants of that
 message; use MessageContent for these
 
 
+* HuaweiAltMode <0/1>      -X
+
+An alternative to the Huawei standard, recommended by the manufacturer for
+the Android OS. Sends a different bulk message which brings newer modems
+into NCM mode (well supported in Linux) and older ones into plain PPP mode.
+Also globally settable with HuaweiAltModeGlobal in /etc/usb_modeswitch.conf
+
+
 * OptionMode <0/1>         -U
 
 The standard for all devices by Option. Sends a specific bulk message
diff --git a/gen-rules.tcl b/gen-rules.tcl
index 773362c..64ecdc8 100755
--- a/gen-rules.tcl
+++ b/gen-rules.tcl
@@ -11,7 +11,7 @@
 
 
 # Default version string
-set version "20170205"
+set version "20170806"
 
 # Devices excluded from Huawei catch-all rule
 set x_huaweiList {12d1:1573 12d1:15c1}
diff --git a/usb_modeswitch.d/03f0:371d b/usb_modeswitch.d/03f0:371d
new file mode 100644
index 0000000..987ab40
--- /dev/null
+++ b/usb_modeswitch.d/03f0:371d
@@ -0,0 +1,2 @@
+# HP un2430
+Configuration=0
diff --git a/usb_modeswitch.d/03f0:4b1d b/usb_modeswitch.d/03f0:4b1d
new file mode 100644
index 0000000..58a9cd4
--- /dev/null
+++ b/usb_modeswitch.d/03f0:4b1d
@@ -0,0 +1,2 @@
+# HP hs2434
+Configuration=0
diff --git a/usb_modeswitch.d/03f0:4e1d b/usb_modeswitch.d/03f0:4e1d
new file mode 100644
index 0000000..ded629e
--- /dev/null
+++ b/usb_modeswitch.d/03f0:4e1d
@@ -0,0 +1,2 @@
+# HP lt4111
+Configuration=0
diff --git a/usb_modeswitch.d/03f0:a31d b/usb_modeswitch.d/03f0:a31d
new file mode 100644
index 0000000..e9b157d
--- /dev/null
+++ b/usb_modeswitch.d/03f0:a31d
@@ -0,0 +1,2 @@
+# HP lt4132
+Configuration=0
diff --git a/usb_modeswitch.d/0846:0fff b/usb_modeswitch.d/0846:0fff
new file mode 100644
index 0000000..480eaae
--- /dev/null
+++ b/usb_modeswitch.d/0846:0fff
@@ -0,0 +1,4 @@
+# Netgear AirCard 779S
+TargetVendor= 0x0846
+TargetProduct=0x68d3
+SierraMode=1
diff --git a/usb_modeswitch.d/0922:1003 b/usb_modeswitch.d/0922:1003
index 82f42e3..56825f8 100644
--- a/usb_modeswitch.d/0922:1003
+++ b/usb_modeswitch.d/0922:1003
@@ -1,6 +1,8 @@
 # Dymo LabelManager 420P
 TargetVendor= 0x0922
 TargetProduct= 0x1004
+MessageEndpoint=0x01
+ResponseEndpoint=0x01
 MessageContent="1b5a01"
 
 
diff --git a/usb_modeswitch.d/0922:1007 b/usb_modeswitch.d/0922:1007
index 2b48fb0..f6857e4 100644
--- a/usb_modeswitch.d/0922:1007
+++ b/usb_modeswitch.d/0922:1007
@@ -1,6 +1,8 @@
 # Dymo LabelManager Wireless PnP
 TargetVendor= 0x0922
 TargetProduct= 0x1008
+MessageEndpoint=0x01
+ResponseEndpoint=0x01
 MessageContent="1b5a01"
 
 
diff --git a/usb_modeswitch.d/1004:61aa b/usb_modeswitch.d/1004:61aa
deleted file mode 100644
index 0db0efb..0000000
--- a/usb_modeswitch.d/1004:61aa
+++ /dev/null
@@ -1,4 +0,0 @@
-# LG VL600
-TargetVendor=0x1004
-TargetProduct=0x61a7
-StandardEject=1
\ No newline at end of file
diff --git a/usb_modeswitch.d/12d1:15ec b/usb_modeswitch.d/12d1:15ec
new file mode 100644
index 0000000..760d204
--- /dev/null
+++ b/usb_modeswitch.d/12d1:15ec
@@ -0,0 +1,4 @@
+# Vodafone/Huawei K5150
+TargetVendor=0x12d1
+TargetProduct=0x1c26
+HuaweiNewMode=1