From ac2459510690893917bb99476c4c6ee9b8e280c50742ecc5c71d11d2c62ad55c Mon Sep 17 00:00:00 2001 From: andrea florio Date: Mon, 26 May 2014 12:02:10 +0000 Subject: [PATCH] Accepting request 235374 from home:tittiatcoke:KDE_Playground Update to version 2.1.1. I have not switched to systemd mode (nor installed the service file as that this does not work. OBS-URL: https://build.opensuse.org/request/show/235374 OBS-URL: https://build.opensuse.org/package/show/hardware/usb_modeswitch?expand=0&rev=39 --- device_reference.txt | 503 +++++++++++++++++++++++++-- huawei-timing.patch | 14 +- usb-modeswitch-1.2.5.tar.bz2 | 3 - usb-modeswitch-2.1.1.tar.bz2 | 3 + usb-modeswitch-data-20121109.tar.bz2 | 3 - usb-modeswitch-data-20140327.tar.bz2 | 3 + usb_modeswitch.changes | 9 + usb_modeswitch.spec | 6 +- 8 files changed, 498 insertions(+), 46 deletions(-) delete mode 100644 usb-modeswitch-1.2.5.tar.bz2 create mode 100644 usb-modeswitch-2.1.1.tar.bz2 delete mode 100644 usb-modeswitch-data-20121109.tar.bz2 create mode 100644 usb-modeswitch-data-20140327.tar.bz2 diff --git a/device_reference.txt b/device_reference.txt index b548f4c..abe862e 100644 --- a/device_reference.txt +++ b/device_reference.txt @@ -1,7 +1,7 @@ # # Device and Configuration Reference (UTF-8 encoding used) # -# Last modified: 2012-11-08 +# Last modified: 2013-11-13 # # Collection of configurations for usb_modeswitch, a mode switching # tool for controlling flip flop (multiple mode) USB devices @@ -115,7 +115,10 @@ # * SequansMode <0/1> -N # * MobileActionMode <0/1> -A # * QisdaMode <0/1> -B -# * CiscoMode <0/1> -B +# * QuantaMode <0/1> -E +# * PantechMode <0/1> -F +# * BlackberryMode <0/1> -Z +# * CiscoMode <0/1> -L # # # Flags to support devices that need special control messages. @@ -170,11 +173,17 @@ # Mostly useful for non-modem devices. # # -# * WaitBefore (no command line parameter) +# * 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 new MBIM standard devices, which is always done +# by default. +# +# # # -> All other entries in config files are just ignored <- @@ -2267,19 +2276,6 @@ TargetClass=0xff MessageContent="55534243123456780000000000000606f50402527000000000000000000000" -######################################################## -# Vodafone/ZTE K3806-Z - -DefaultVendor= 0x19d2 -DefaultProduct=0x0013 - -TargetVendor= 0x19d2 -TargetProduct= 0x0015 - -MessageContent="5553424312345678000000000000061b000000020000000000000000000000" - -NeedResponse=1 - ######################################################## # T-Mobile NL (Huawei E352) # @@ -3020,21 +3016,7 @@ NeedResponse=1 ######################################################## -# TW-3G HSPA+ -# -# Contributor: Nordic Nurse - -DefaultVendor= 0x1c9e -DefaultProduct=0x98ff - -TargetVendor= 0x1c9e -TargetProduct= 0x9801 - -MessageContent="55534243123456780000000080000606f50402527000000000000000000000" - - -######################################################## -# Samsung GT-B1110 +# Samsung GT-B1110 # # Contributor: Spelroth @@ -3571,5 +3553,464 @@ TargetProduct= 0x14ac MessageContent="55534243123456780000000000000011062000000100000000000000000000" +####################################################### +# Changhong CH690 + +DefaultVendor= 0x2077 +DefaultProduct=0x1000 + +TargetVendor= 0x2077 +TargetProduct= 0x7001 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + + +####################################################### +# Alcatel-Lucent T930S +# +# Contributor: areslee + +DefaultVendor= 0x04cc +DefaultProduct=0x225c + +Configuration=2 + + +####################################################### +# Axesstel MU130 +# +# Contributor: Jazb + +DefaultVendor= 0x1726 +DefaultProduct=0xf00e + +TargetVendor= 0x1726 +TargetProduct= 0xa000 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + + +####################################################### +# Explay Slim +# +# Contributor: vdsdmitry + +DefaultVendor= 0x1c9e +DefaultProduct=0x9e08 + +TargetVendor= 0x1c9e +TargetProduct= 0x9e18 + +SierraMode=1 +NoDriverLoading=1 + + +####################################################### +# Huawei GP02 (E587 Variant) +# +# Contributor: Genmei Mori + +DefaultVendor= 0x12d1 +DefaultProduct=0x1c1b + +TargetVendor= 0x12d1 +TargetProduct= 0x1506 + +MessageContent="55534243123456780000000000000011062000000100000000000000000000" +NoDriverLoading=1 + + +####################################################### +# Huawei U2800 Phone +# +# Contributor: Peter Fedorow + +DefaultVendor= 0x12d1 +DefaultProduct=0x1805 + +TargetClass=0xff + +MessageContent="55534243123456780600000080000601000000000000000000000000000000" + + +################################################### +# KDDI (Huawei) HWD12 LTE +# +# Contributor: nhe + +DefaultVendor= 0x12d1 +DefaultProduct=0x1f03 + +TargetVendor= 0x12d1 +TargetProduct= 0x14db + +#MessageContent="55534243123456780000000000000011062000000100000000000000000000" +MessageContent="55534243123456780000000000000a11062000000000000100000000000000" +NoDriverLoading=1 + + +######################################################## +# D-Link DWM-156 (Variant) +# +# Contributor: Bjørn Mork + +DefaultVendor= 0x2001 +DefaultProduct=0xa706 + +TargetVendor= 0x2001 +TargetProduct= 0x7d01 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + + +######################################################## +# D-Link DWM-156 (Variant) +# +# Contributor: Bjørn Mork + +DefaultVendor= 0x2001 +DefaultProduct=0xa707 + +TargetVendor= 0x2001 +TargetProduct= 0x7d02 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + + +######################################################## +# D-Link DWM-156 (Variant) +# +# Contributor: Bjørn Mork + +DefaultVendor= 0x2001 +DefaultProduct=0xa708 + +TargetVendor= 0x2001 +TargetProduct= 0x7d03 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + + +####################################################### +# Onda TM201 14.4 (TIM Italy) +# +# Contributor: Cristian Astorino + +DefaultVendor= 0x1ee8 +DefaultProduct=0x0063 + +TargetVendor= 0x1ee8 +TargetProduct= 0x0064 + +MessageContent="555342431234567800000000000008FF000000000000030000000000000000" + + +####################################################### +# Onda WM301 +# +# Contributor: Nicolas Carrier + +DefaultVendor= 0x1ee8 +DefaultProduct=0x0068 + +TargetVendor= 0x1ee8 +TargetProduct= 0x0069 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + + +####################################################### +# Nokia CS-12 +# +# Contributor: John Zouck + +DefaultVendor= 0x0421 +DefaultProduct=0x0618 + +TargetVendor= 0x0421 +TargetProduct= 0x0619 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + + +####################################################### +# Axesstel Modems (w/ initial idProduct 0x0010) +# +# Contributor: LOM + +DefaultVendor= 0x05c6 +DefaultProduct=0x0010 + +TargetVendor= 0x05c6 +TargetProduct= 0x00a0 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + + +####################################################### +# Onda MT8205 LTE +# +# Contributor: Vincenzo Ingrosso + +DefaultVendor= 0x19d2 +DefaultProduct=0x0266 + +TargetVendor= 0x19d2 +TargetProduct= 0x0265 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + + +####################################################### +# Pantech UML290 +# +# Contributor: Davis Ford + +DefaultVendor= 0x106c +DefaultProduct=0x3b11 + +TargetVendor= 0x106c +TargetProduct= 0x3718 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + + +####################################################### +# Novatel MC996D +# +# Contributor: David Caste + +DefaultVendor= 0x1410 +DefaultProduct=0x5023 + +TargetVendor= 0x1410 +TargetProduct= 0x7030 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + + +####################################################### +# D-Link DWR-510 +# +# Contributor: Nicolas Carrier + +DefaultVendor= 0x2001 +DefaultProduct=0xa805 + +TargetVendor= 0x2001 +TargetProduct= 0x7e12 + +MessageContent="5553424308407086000000000000061b000000020000000000000000000000" + + +####################################################### +# Mediatek MT6229 +# +# Contributor: Daniel Dongo + +DefaultVendor= 0x2020 +DefaultProduct=0x0002 + +TargetVendor= 0x2020 +TargetProduct= 0x2000 + +MessageContent="555342430820298900000000000003f0010100000000000000000000000000" + + +####################################################### +# ZTE MF196 +# +# Contributor: David Caste + +DefaultVendor= 0x19d2 +DefaultProduct=0x1528 + +TargetVendor= 0x19d2 +TargetProduct= 0x1527 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +NeedResponse=1 + + +####################################################### +# ZTE MF656A, MF668A, MF669 +# +# Contributor: David Caste + +DefaultVendor= 0x19d2 +DefaultProduct=0x0150 + +TargetVendor= 0x19d2 +TargetProduct= 0x0124 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +NeedResponse=1 + + +####################################################### +# ZTE MF680 +# +# Contributor: David Caste + +DefaultVendor= 0x19d2 +DefaultProduct=0x1227 + +TargetVendor= 0x19d2 +TargetProduct= 0x1252 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +NeedResponse=1 + + +####################################################### +# WeTelecom WM-D200 +# +# Contributor: Kirill Roskoliy + +DefaultVendor= 0x22de +DefaultProduct=0x6801 + +TargetClass=0xff + +MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" + + +####################################################### +# Quanta 1K3 LTE +# +# Contributor: Andrey Tikhomirov + +DefaultVendor= 0x0408 +DefaultProduct=0xea25 + +TargetVendor= 0x0408 +TargetProduct= 0xea26 + +QuantaMode=1 + + +####################################################### +# TP-Link MA260 +# +# Contributor: Bjørn Mork + +DefaultVendor= 0x2357 +DefaultProduct=0xf000 + +TargetVendor= 0x2357 +TargetProduct= 0x9000 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + + +####################################################### +# Teracom LW272 +# +# Contributor: Dheeraj Khanna + +DefaultVendor= 0x230d +DefaultProduct=0x0103 + +Configuration=2 + + +####################################################### +# Huawei E3276s-151 and E3251 +# +# Contributor: Nicholas Carrier + +DefaultVendor= 0x12d1 +DefaultProduct=0x156a + +TargetVendor= 0x12d1 +TargetProductList="156b,156c" + +MessageContent="55534243123456780000000000000011062000000100000000000000000000" + + +######################################################## +# Huawei K4305 +# +# Contributor: Dario + +DefaultVendor= 0x12d1 +DefaultProduct=0x1f15 + +TargetVendor= 0x12d1 +TargetProduct= 0x1400 + +MessageContent="55534243123456780000000000000011062000000000000100000000000000" + + +######################################################## +# BlackBerry Q10 and Z10 +# +# Contributor: Daniel Mende + +DefaultVendor= 0x0fca +DefaultProduct=0x8020 + +TargetVendor= 0x0fca +TargetProduct= 0x8012 + +BlackberryMode=1 + + +######################################################## +# Pantech LTE Modem +# +# Contributor: Adam Goode + +DefaultVendor= 0x10a9 +DefaultProduct=0x6080 + +TargetVendor= 0x10a9 +TargetProduct= 0x6085 + +PantechMode=1 + + +####################################################### +# Quanta MobileGenie 4G lte +# +# Contributor: Richard Wood + +DefaultVendor= 0x0408 +DefaultProduct=0xea43 + +TargetVendor= 0x0408 +TargetProduct= 0xea47 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + + +######################################################## +# AVM Fritz!Wlan USB Stick N v2 +# +# Contributor: merla + +DefaultVendor= 0x057c +DefaultProduct=0x62ff + +TargetVendor= 0x057c +TargetProduct= 0x8501 + +MessageContent="5553424312345678000000000000061b000000ff0000000000000000000000" + + +######################################################## +# Alcatel-sbell ASB TL131 TD-LTE +# +# Contributor: scateu + +DefaultVendor= 0x05c6 +DefaultProduct=0x9024 + +TargetVendor= 0x05c6 +TargetProduct= 0x9025 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + ####################################################### diff --git a/huawei-timing.patch b/huawei-timing.patch index 0431f5a..2325a70 100644 --- a/huawei-timing.patch +++ b/huawei-timing.patch @@ -1,21 +1,21 @@ diff -u -r usb-modeswitch-data-20120531.org/40-usb_modeswitch.rules usb-modeswitch-data-20120531/40-usb_modeswitch.rules --- usb-modeswitch-data-20121109.org/40-usb_modeswitch.rules 2012-12-03 14:15:48.751958694 +0200 +++ usb-modeswitch-data2-0121109/40-usb_modeswitch.rules 2012-12-03 14:16:49.063343878 +0200 -@@ -474,6 +474,9 @@ +@@ -525,6 +525,9 @@ # Huawei E173s ATTR{idVendor}=="12d1", ATTR{idProduct}=="1c0b", RUN+="usb_modeswitch '%b/%k'" +# Huawei E173s +ATTRS{idVendor}=="12d1", ATTRS{idProduct}=="1c00", RUN+="usb_modeswitch -w 3000 '%b/%k'" + - # Huawei E173 (Moviestar) - ATTR{idVendor}=="12d1", ATTR{idProduct}=="1c24", RUN+="usb_modeswitch '%b/%k'" + # Huawei GP02 (E587 Variant) + ATTR{idVendor}=="12d1", ATTR{idProduct}=="1c1b", RUN+="usb_modeswitch '%b/%k'" diff -u -r usb-modeswitch-data-20120531.org/usb_modeswitch.d/12d1:1c0b usb-modeswitch-data-20120531/usb_modeswitch.d/12d1:1c0b --- usb-modeswitch-data-20121109.org/usb_modeswitch.d/12d1:1c0b 2012-12-03 14:15:48.754958714 +0200 +++ usb-modeswitch-data-20121109/usb_modeswitch.d/12d1:1c0b 2012-12-03 14:17:35.495640324 +0200 -@@ -5,3 +5,4 @@ - - MessageContent="55534243123456780000000000000011062000000100000000000000000000" - +@@ -2,3 +2,4 @@ + TargetVendor=0x12d1 + TargetProductList="1c05,1c07,1c08,1c10" + MessageContent="55534243123456780000000000000011062000000101000100000000000000" +WaitBefore=3 diff --git a/usb-modeswitch-1.2.5.tar.bz2 b/usb-modeswitch-1.2.5.tar.bz2 deleted file mode 100644 index f8aa35a..0000000 --- a/usb-modeswitch-1.2.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ce47a3dec3e4c93e0a2fcea64278d0e289e6e78d8e1381c54f03986e443ab90f -size 259200 diff --git a/usb-modeswitch-2.1.1.tar.bz2 b/usb-modeswitch-2.1.1.tar.bz2 new file mode 100644 index 0000000..4c58d89 --- /dev/null +++ b/usb-modeswitch-2.1.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5ad1134e142502f52f034c1e3f148386d334ddb70e744be96a5174d303dc2542 +size 261358 diff --git a/usb-modeswitch-data-20121109.tar.bz2 b/usb-modeswitch-data-20121109.tar.bz2 deleted file mode 100644 index 7a2f127..0000000 --- a/usb-modeswitch-data-20121109.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a74346a471d540ba9da7d7b332ad35ea05ff7375297c0da87da5be675293d5a5 -size 21558 diff --git a/usb-modeswitch-data-20140327.tar.bz2 b/usb-modeswitch-data-20140327.tar.bz2 new file mode 100644 index 0000000..00be013 --- /dev/null +++ b/usb-modeswitch-data-20140327.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8f9f53c0871239b41d9cf377f528c9de8feddc31c391bd2ed903e17a28e983c7 +size 24273 diff --git a/usb_modeswitch.changes b/usb_modeswitch.changes index fd47953..4ca34f5 100644 --- a/usb_modeswitch.changes +++ b/usb_modeswitch.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon May 26 09:41:27 UTC 2014 - tittiatcoke@gmail.com + +- Update to 2.1.1 + * Code cleanup + * Better usage of libusb1 + * -I flag meaning reversed, default is to skip SCSI inquiry + * Experimental systemd and upstart integration + ------------------------------------------------------------------- Thu May 16 07:18:38 UTC 2013 - mvyskocil@suse.com diff --git a/usb_modeswitch.spec b/usb_modeswitch.spec index b2bac8a..0c4912d 100644 --- a/usb_modeswitch.spec +++ b/usb_modeswitch.spec @@ -23,14 +23,14 @@ %endif Name: usb_modeswitch -Version: 1.2.5 +Version: 2.1.1 Release: 0 Summary: A mode switching tool for controlling multiple-device USB gear License: GPL-2.0+ Group: Hardware/Mobile Url: http://www.draisberghof.de/usb_modeswitch %define source_name usb-modeswitch -%define date 20121109 +%define date 20140327 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 @@ -41,6 +41,7 @@ BuildRequires: fdupes BuildRequires: libusb-devel BuildRequires: tcl BuildRequires: udev +BuildRequires: pkg-config Requires: tcl >= 8.4 Requires: usb_modeswitch-data = %version @@ -84,6 +85,7 @@ cd %{source_name}-data-%{date} /var/lib/usb_modeswitch %config %{_sysconfdir}/usb_modeswitch.conf %{_mandir}/man1/usb_modeswitch.1.gz +%{_mandir}/man1/usb_modeswitch_dispatcher.1.gz %files data %defattr(-,root,root,-)