From e0e91aac427724ab350efaf6928d3c31dd84d4dce4ae99450b0f0838c32c31ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Wed, 23 Aug 2017 12:23:28 +0000 Subject: [PATCH] Accepting request 518243 from home:enzokiel:branches:hardware - Update to version 2.5.1 * New parameter "HuaweiAltMode", uses an alternative Huawei standard bulk message which will either provide NCM (newer modems) or plain PPP ports (older modems). * New option in the global configuration file "HuaweiAltModeGlobal", allowing easy override of "HuwaeiNewMode" with "HuaweiAltMode". * Reworked USB configuration switching, configuring a device reset first before setting the target configuration. * Improved driver detachment, now taking all configured interfaces into account. - Update usb-modeswitch-data package to version 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. - Updated file device_reference.txt. - Added file parameter_reference.txt OBS-URL: https://build.opensuse.org/request/show/518243 OBS-URL: https://build.opensuse.org/package/show/hardware/usb_modeswitch?expand=0&rev=76 --- device_reference.txt | 46 +++--- parameter_reference.txt | 236 +++++++++++++++++++++++++++ usb-modeswitch-2.5.0.tar.bz2 | 3 - usb-modeswitch-2.5.1.tar.bz2 | 3 + usb-modeswitch-data-20170205.tar.bz2 | 3 - usb-modeswitch-data-20170806.tar.bz2 | 3 + usb_modeswitch.changes | 26 +++ usb_modeswitch.spec | 8 +- 8 files changed, 297 insertions(+), 31 deletions(-) create mode 100644 parameter_reference.txt delete mode 100644 usb-modeswitch-2.5.0.tar.bz2 create mode 100644 usb-modeswitch-2.5.1.tar.bz2 delete mode 100644 usb-modeswitch-data-20170205.tar.bz2 create mode 100644 usb-modeswitch-data-20170806.tar.bz2 diff --git a/device_reference.txt b/device_reference.txt index eabe852..469721b 100644 --- a/device_reference.txt +++ b/device_reference.txt @@ -1,16 +1,16 @@ # # Device Reference (UTF-8 encoding used) # -# Last modified: 2014-05-29 +# Last modified: 2017-02-05 # # Collection of configurations for usb_modeswitch, a mode switching # tool for controlling flip flop (multiple mode) USB devices # # Detailed instructions and a friendly forum on the homepage: # http://www.draisberghof.de/usb_modeswitch -# -# You may want to check for a newer version of this file at: -# http://www.draisberghof.de/usb_modeswitch/device_reference.txt +# +# Note that new devices are no longer added to this file. See the +# config files included with the data package for these # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # @@ -21,9 +21,10 @@ # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # -# For a parameter reference see file REFERENCE in the data package +# For a parameter reference see file REFERENCE in the data package or +# http://www.draisberghof.de/usb_modeswitch/parameter_reference.txt # -# If you find working codes and configurations, please contribute +# If you find new working codes and configurations, please report # them! @@ -31,6 +32,7 @@ ####################################################### # Option GlobeSurfer Icon (aka "Vodafone EasyBox") +# This is the thing that started it all ... # # The MessageContent is identical for all Option devices @@ -60,7 +62,7 @@ MessageContent="55534243123456780000000000000601000000000000000000000000000000" ######################################################## # Option GlobeTrotter GT MAX 3.6 (aka "T-Mobile Web'n'walk Card Compact II") # -# Contributor: Bernd Holzmüller +# Contributor: Bernd Holzmüller DefaultVendor= 0x05c6 DefaultProduct= 0x1000 @@ -279,7 +281,7 @@ HuaweiMode=1 # # Probably works with DetachStorageOnly too # -# Contributor: Flávio Moringa and others +# Contributor: Flávio Moringa and others DefaultVendor= 0x19d2 DefaultProduct= 0x2000 @@ -777,7 +779,7 @@ Configuration=2 # # Recommended init command: ATE0V1&D2&C1S0=0 # -# Contributor: Jérôme Oufella +# Contributor: Jérôme Oufella DefaultVendor= 0x1004 DefaultProduct= 0x1000 @@ -1336,7 +1338,7 @@ MessageContent="555342431234567824000000800006bc626563240000000000000000000000" ######################################################## # LG HDM-2100 (EVDO Rev.A USB modem) # -# Contributor: Jérôme Oufella +# Contributor: Jérôme Oufella DefaultVendor= 0x1004 DefaultProduct=0x607f @@ -1641,7 +1643,7 @@ ResponseNeeded=1 ######################################################## # Huawei U8110 / U8300 / Joy, Vodafone 845 (Android smartphone) # -# Contributor: David Erosa García +# Contributor: David Erosa García DefaultVendor= 0x12d1 DefaultProduct=0x1031 @@ -1658,7 +1660,7 @@ NoDriverLoading=1 ######################################################## # Nokia CS-10 # -# Contributor: WacÅ‚aw Sierek +# Contributor: WacÅ‚aw Sierek DefaultVendor= 0x0421 DefaultProduct=0x060c @@ -1700,7 +1702,7 @@ MessageContent="55534243123456780000000000000606f50402527000000000000000000000" ####################################################### # Samsung GT-B3730 # -# Contributor: Per Øyvind Karlsen +# Contributor: Per Øyvind Karlsen DefaultVendor= 0x04e8 DefaultProduct=0x689a @@ -1771,7 +1773,7 @@ NeedResponse=1 ####################################################### # Huawei EC168C (from Zantel) # -# Contributor: Ã…smund Hjulstad +# Contributor: Ã…smund Hjulstad DefaultVendor= 0x12d1 DefaultProduct=0x1446 @@ -2754,7 +2756,7 @@ NeedResponse=1 ######################################################## # ZTE MF652 # -# Contributor: Björn Andreas Höfer +# Contributor: Björn Andreas Höfer DefaultVendor= 0x19d2 DefaultProduct=0x1520 @@ -3065,7 +3067,7 @@ MessageContent="5553424312345678000000000000061b000000020000000000000000000000" ######################################################## # ZTE MF821D # -# Contributor: Thomas Schäfer +# Contributor: Thomas Schäfer DefaultVendor= 0x19d2 DefaultProduct=0x0325 @@ -3111,7 +3113,7 @@ MessageContent="555342431234567800000000000010ff000000000000000000000000000000" ######################################################## # Vodafone K5006Z (MF821) # -# Contributor: Thomas Schäfer +# Contributor: Thomas Schäfer DefaultVendor= 0x19d2 DefaultProduct=0x1017 @@ -3295,7 +3297,7 @@ MessageContent="55534243123456780000000000000011062000000100000000000000000000" ####################################################### # Option Beemo / Pantech P4200 LTE # -# Contributor: Thomas Schäfer +# Contributor: Thomas Schäfer DefaultVendor= 0x106c DefaultProduct=0x3b14 @@ -3475,7 +3477,7 @@ NoDriverLoading=1 ######################################################## # D-Link DWM-156 (Variant) # -# Contributor: Bjørn Mork +# Contributor: Bjørn Mork DefaultVendor= 0x2001 DefaultProduct=0xa706 @@ -3489,7 +3491,7 @@ MessageContent="5553424312345678000000000000061b000000020000000000000000000000" ######################################################## # D-Link DWM-156 (Variant) # -# Contributor: Bjørn Mork +# Contributor: Bjørn Mork DefaultVendor= 0x2001 DefaultProduct=0xa707 @@ -3503,7 +3505,7 @@ MessageContent="5553424312345678000000000000061b000000020000000000000000000000" ######################################################## # D-Link DWM-156 (Variant) # -# Contributor: Bjørn Mork +# Contributor: Bjørn Mork DefaultVendor= 0x2001 DefaultProduct=0xa708 @@ -3716,7 +3718,7 @@ QuantaMode=1 ####################################################### # TP-Link MA260 # -# Contributor: Bjørn Mork +# Contributor: Bjørn Mork DefaultVendor= 0x2357 DefaultProduct=0xf000 diff --git a/parameter_reference.txt b/parameter_reference.txt new file mode 100644 index 0000000..7ed54de --- /dev/null +++ b/parameter_reference.txt @@ -0,0 +1,236 @@ +Configuration File Reference for USB_ModeSwitch +----------------------------------------------- + +Last modified: 2017-08-06 + + + +General Rules: + +Numbers can be decimal or hexadecimal, Bulk message strings must be +hexadecimal without prepended "0x". Digits 9-16 (message tag) in +mass storage messages (which start with "55534243") are random; I set +them to "12345678". Note that you must make them unique if more than +one MessageContent is used. + +-> ALL MISTYPED PARAMETERS AND OTHER ENTRIES ARE SILENTLY IGNORED <- + + + +Parameter Reference: + +Note: if there is a short command line flag for a parameter, then it +is appended to the line. For the full command line parameter reference +see the usb_modeswitch(1) man page. + + +* DefaultVendor -v +* DefaultProduct -p + +This is the ID the USB device shows after having been plugged in. +The program needs this, either on the command line or in the config +file; if not found -> no action. + +Note: newer config files do not contain these parameters because of +the redundancy with regard to the config file name. + + +* TargetVendor -V +* TargetProduct -P + +These are the IDs of the USB device after successful mode switching. +They are optional, but required for a proper success check + + +* TargetProductList + +Like TargetProduct, but multiple targets + + +* TargetClass -C + +Some devices don't change their ID, only their layout. To check for a +successfull mode switch, the class of the first interface is checked + + +* MessageEndpoint -m +* ResponseEndpoint -r + +A kind of address inside the interface to which the "message" +(the sequence that does the actual switching) is directed or +from which the reply is read if NeedResponse is active. +OBSOLETE since version 0.9.7 due to autodetection, only useful for +testing + + +* MessageContent -M + +A hex string containing the "message" sequence; it will be +sent as a USB bulk transfer + + +* MessageContent2, ...3 -2/-3 + +Additional "messages". Use with "NeedResponse"! + + +* ReleaseDelay -w + +Waiting time after message transfers. Helps with some sensitive devices +that don't want any traffic after the mode switch initialisation + + +* NeedResponse <0/1> -n + +Some devices were reported to require receiving the response of the +bulk transfer to do the switching properly. Usually not needed. + + +* DetachStorageOnly <0/1> -d + +Some early devices just needed to be detached from the usb-storage +driver to initiate the mode switching. Now practically obsolete for +switching, but still comes handy sometimes + + +* StandardEject <0/1> -K + +Sends a specific bulk message sequence representing the SCSI commands +"ALLOW MEDIUM REMOVAL" and "START STOP UNIT", basically an eject +action. Many modems are using this for mode switching. +Can be combined with one additional 'MessageContent' + + +* HuaweiMode <0/1> -H + +Some early Huawei devices can be switched by a special control +message. Don't use with recent devices + + +* HuaweiNewMode <0/1> -J + +The standard for many newer Huawei devices. Sends a specific bulk message, +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 + + +* SonyMode <0/1> -O + +Some Sony-Ericsson devices can be switched by a special control +message. May take a long time (20+ seconds). + + +* SierraMode <0/1> -S +* KobilMode <0/1> -T +* GCTMode <0/1> -G +* SequansMode <0/1> -N +* MobileActionMode <0/1> -A +* QisdaMode <0/1> -B +* QuantaMode <0/1> -E +* BlackberryMode <0/1> -Z +* CiscoMode <0/1> -L + + +Flags to support devices that need special control messages. +The names are referring to the respective manufacturers. + + +* PantechMode -F + +Extended flag for Pantech devices offering multiple target modes. Not +all models were confirmed to support all modes. Possible values are: + + 1 - Automatic choice, checks for MBIM driver availability (recomm.) + 2 - forced RNDIS mode + 3 - forced CDC Ether mode (internal switch, no usb_modeswitch action) + 4 - forced MBIM mode + +Note: the -F parameter value for usb_modeswitch is directly used as +wValue in the control message! + + +* ResetUSB <0/1> -R + +Few devices or systems need a rougher treatment. If the switching seems +to do something but your system does not reflect it, try this somewhat +brutal method to do a reset after switching. May also be useful for +all kinds of experiments + + +* Configuration -u + +Some devices are doing the "right" thing and provide different layouts +in the standard-compliant way. They don't "restart", so don't have to be +rediscovered by the system after the change. Strictly speaking, they are +not doing a mode switch + + +* Interface -i +* AltSetting -a + +More USB parameter to help with tricky devices and for doing lots +of cruel experiments; usually not needed ... + + +Note: +AltSetting/Configuration changes and ResetUSB are executed after all +other steps and can be combined or used on their own (e.g. a reset +might have the same effect as a manual replug) + + +* InquireDevice <0|1> -I (enables inquiry) + +Formerly printed out SCSI device attributes. Obsolete and ignored since +usb_modeswitch version 2.3.0. + + +* CheckSuccess -s + +Check continuously if the switch succeeded for max seconds. +If the target ID is given, the check waits for it to appear. +Otherwise, the check waits for the device to "go away"; most devices +vanish after switching and can't be accessed anymore. It also checks +the bus/device count, trying to determine if the device "came back" + +Note: this feature is not used in the full-featured Linux package of +usb_modeswitch where the success check is done by the wrapper script + + +* NoDriverLoading <0|1> (no command line parameter) + +(Obsolete, ignored since usb_modeswitch 2.4.0) +The binary tells the wrapper script NOT to check for and initiate +binding of the serial driver after switching. +Mostly useful for non-modem devices and newer modems which do not use +the serial driver. + + +* WaitBefore (no command line parameter) + +Waiting time before taking any action. Helps with some sensitive setups. + + +* NoMBIMCheck <0|1> (no command line parameter) + +Disable the check for devices providing the MBIM standard; this check +is otherwise done by default. See /etc/usb_modeswitch.conf from the +program package for a global setting regarding this. +The usb_modeswitch wrapper will test if a device has a configuration +according to the MBIM standard. If so, it will search for the matching +kernel driver. It it's available, the device will be configured for +MBIM usage which is preferable to other modes and configurations + +-- diff --git a/usb-modeswitch-2.5.0.tar.bz2 b/usb-modeswitch-2.5.0.tar.bz2 deleted file mode 100644 index 126a76f..0000000 --- a/usb-modeswitch-2.5.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:31c0be280d49a99ec3dc0be3325bef320d9c04b50714ef0ce1e36a614d687633 -size 260225 diff --git a/usb-modeswitch-2.5.1.tar.bz2 b/usb-modeswitch-2.5.1.tar.bz2 new file mode 100644 index 0000000..ce79ed7 --- /dev/null +++ b/usb-modeswitch-2.5.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f6e44bfc6e8d531ac6759791cf79ee9c618e7894fcf37170c8a5559718f9abd2 +size 259123 diff --git a/usb-modeswitch-data-20170205.tar.bz2 b/usb-modeswitch-data-20170205.tar.bz2 deleted file mode 100644 index 71e256d..0000000 --- a/usb-modeswitch-data-20170205.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e2dcfd9d28928d8d8f03381571a23442b3c50d48d343bc40a1a07d01662738d1 -size 32423 diff --git a/usb-modeswitch-data-20170806.tar.bz2 b/usb-modeswitch-data-20170806.tar.bz2 new file mode 100644 index 0000000..51f9a68 --- /dev/null +++ b/usb-modeswitch-data-20170806.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ce413ef2a50e648e9c81bc3ea6110e7324a8bf981034fc9ec4467d3562563c2c +size 32700 diff --git a/usb_modeswitch.changes b/usb_modeswitch.changes index 2cd0a2a..5fc609e 100644 --- a/usb_modeswitch.changes +++ b/usb_modeswitch.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Tue Aug 22 20:27:49 UTC 2017 - joerg.lorenzen@ki.tng.de + +- Update to version 2.5.1 + * New parameter "HuaweiAltMode", uses an alternative Huawei + standard bulk message which will either provide NCM + (newer modems) or plain PPP ports (older modems). + * New option in the global configuration file + "HuaweiAltModeGlobal", allowing easy override of + "HuwaeiNewMode" with "HuaweiAltMode". + * Reworked USB configuration switching, configuring a device + reset first before setting the target configuration. + * Improved driver detachment, now taking all configured + interfaces into account. +- Update usb-modeswitch-data package to version 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. +- Updated file device_reference.txt. +- Added file parameter_reference.txt + ------------------------------------------------------------------- Fri Feb 24 18:57:27 UTC 2017 - joerg.lorenzen@ki.tng.de diff --git a/usb_modeswitch.spec b/usb_modeswitch.spec index e27c475..1e8eeec 100644 --- a/usb_modeswitch.spec +++ b/usb_modeswitch.spec @@ -17,10 +17,10 @@ %define source_name usb-modeswitch -%define date 20170205 +%define date 20170806 %define _udevdir %(pkg-config --variable=udevdir udev) Name: usb_modeswitch -Version: 2.5.0 +Version: 2.5.1 Release: 0 Summary: A mode switching tool for controlling multiple-device USB gear License: GPL-2.0+ @@ -29,6 +29,7 @@ Url: http://www.draisberghof.de/usb_modeswitch Source0: http://www.draisberghof.de/usb_modeswitch/%{source_name}-%{version}.tar.bz2 Source1: http://www.draisberghof.de/usb_modeswitch/%{source_name}-data-%{date}.tar.bz2 Source2: http://www.draisberghof.de/usb_modeswitch/device_reference.txt +Source3: http://www.draisberghof.de/usb_modeswitch/parameter_reference.txt Patch1: usb_modeswitch-fix_fsf_address.patch BuildRequires: fdupes BuildRequires: pkg-config @@ -62,6 +63,7 @@ Data files for usb_modeswitch package. %patch1 cp %{SOURCE2} . +cp %{SOURCE3} . %build CFLAGS="%{optflags}" make @@ -91,7 +93,7 @@ make DESTDIR=%{buildroot} install %{?_smp_mflags} RULESDIR=%{buildroot}%{_udevdi %files %defattr(-,root,root,-) -%doc README COPYING device_reference.txt +%doc README COPYING device_reference.txt parameter_reference.txt %{_sbindir}/usb_modeswitch %{_sbindir}/usb_modeswitch_dispatcher %{_udevdir}/usb_modeswitch