From 0b0c2da0cd5794b22d6e0c0d02011ec553d2dccb Mon Sep 17 00:00:00 2001 From: Till Maas Date: Mon, 24 Nov 2014 20:51:41 +0100 Subject: [PATCH] Update device_reference.txt --- device_reference-utf8.patch | 74 ++++++++++++++ device_reference.txt | 187 +----------------------------------- usb_modeswitch.spec | 13 +-- 3 files changed, 86 insertions(+), 188 deletions(-) create mode 100644 device_reference-utf8.patch diff --git a/device_reference-utf8.patch b/device_reference-utf8.patch new file mode 100644 index 0000000..e6991a2 --- /dev/null +++ b/device_reference-utf8.patch @@ -0,0 +1,74 @@ +--- device_reference.txt 2014-05-29 22:18:46.000000000 +0200 ++++ device_reference_utf8.txt 2014-11-24 20:51:17.647221466 +0100 +@@ -60,7 +60,7 @@ + ######################################################## + # 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 +279,7 @@ + # + # Probably works with DetachStorageOnly too + # +-# Contributor: Flávio Moringa and others ++# Contributor: Flávio Moringa and others + + DefaultVendor= 0x19d2 + DefaultProduct= 0x2000 +@@ -777,7 +777,7 @@ + # + # Recommended init command: ATE0V1&D2&C1S0=0 + # +-# Contributor: Jérôme Oufella ++# Contributor: Jérôme Oufella + + DefaultVendor= 0x1004 + DefaultProduct= 0x1000 +@@ -1336,7 +1336,7 @@ + ######################################################## + # LG HDM-2100 (EVDO Rev.A USB modem) + # +-# Contributor: Jérôme Oufella ++# Contributor: Jérôme Oufella + + DefaultVendor= 0x1004 + DefaultProduct=0x607f +@@ -1641,7 +1641,7 @@ + ######################################################## + # Huawei U8110 / U8300 / Joy, Vodafone 845 (Android smartphone) + # +-# Contributor: David Erosa García ++# Contributor: David Erosa García + + DefaultVendor= 0x12d1 + DefaultProduct=0x1031 +@@ -1658,7 +1658,7 @@ + ######################################################## + # Nokia CS-10 + # +-# Contributor: WacÅ‚aw Sierek ++# Contributor: Wacław Sierek + + DefaultVendor= 0x0421 + DefaultProduct=0x060c +@@ -1700,7 +1700,7 @@ + ####################################################### + # Samsung GT-B3730 + # +-# Contributor: Per Øyvind Karlsen ++# Contributor: Per Øyvind Karlsen + + DefaultVendor= 0x04e8 + DefaultProduct=0x689a +@@ -1771,7 +1771,7 @@ + ####################################################### + # Huawei EC168C (from Zantel) + # +-# Contributor: Ã…smund Hjulstad ++# Contributor: Åsmund Hjulstad + + DefaultVendor= 0x12d1 + DefaultProduct=0x1446 diff --git a/device_reference.txt b/device_reference.txt index 16c638c..d34ec3e 100644 --- a/device_reference.txt +++ b/device_reference.txt @@ -1,7 +1,7 @@ # -# Device and Configuration Reference (UTF-8 encoding used) +# Device Reference (UTF-8 encoding used) # -# Last modified: 2013-11-13 +# Last modified: 2014-05-29 # # Collection of configurations for usb_modeswitch, a mode switching # tool for controlling flip flop (multiple mode) USB devices @@ -21,191 +21,14 @@ # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # -# For custom settings: -# Numbers can be decimal or hexadecimal, MessageStrings MUST be -# hexadecimal without prepended "0x". Digits 9-16 in the known -# MessageStrings are arbitrary; I set them to "12345678" - -# What it all means (short command line flags appended): -# -# -# * 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. -# -# -# * TargetVendor -V -# * TargetProduct -P -# -# These are the IDs of the USB device after successful mode switching. -# They are optional, but I recommend to provide them for better analysis. -# You definitely need them if you enable CheckSuccess (see below) -# -# -# * TargetProductList (file only) -# -# Like TargetProduct, but more than one possibility. Only used in automated -# config files (in /etc/usb_modeswitch.d). -# -# -# * TargetClass -C -# -# Some weird devices don't change IDs. They only switch the device class. -# If the device has the target class -> no action (and vice versa) -# -# -# * MessageEndpoint -m -# -# A kind of address inside the interface to which the "message" -# (the sequence that does the actual switching) is directed. -# Obsolete since version 0.9.7, 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 -# -# -# * ResponseEndpoint -r -# * 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. -# Starting from version 1.0.0 the ResponseEndpoint is autodetected -# if not given -# -# -# * DetachStorageOnly <0/1> -d -# -# Some early devices just needed to be detached from the usb-storage -# driver to initiate the mode switching. Now paractically obsolete for -# switching, but still comes handy sometimes -# -# -# * HuaweiMode <0/1> -H -# -# Some early Huawei devices can be switched by a special control -# message. Don't use with recent devices -# -# -# * 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 -# * PantechMode <0/1> -F -# * 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. -# -# -# * 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. -# Mind that if your device switched OK before, this may set it back to -# storage mode ... -# -# -# * Interface -i -# * Configuration -u -# * AltSetting -a -# -# More USB parameter to help with tricky devices and for doing lots -# of cruel experiments ... -# -## 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 (disables inquiry) -# -# The standard since 1.0.0 is to do a SCSI inquiry on the default device -# before other actions. This might be a future way to identify a device -# without ambiguities. If it causes trouble with your device, just disable. -# -# -# * CheckSuccess -s -# -# Check continuously if the switch succeeded for max seconds. -# First, an interface access test: most devices vanish after -# switching and can't be accessed anymore. -# Second, a recount of target devices: one more than at the initial -# count, at the same bus with a higher device number -> device -# switched fine. -# It's safe to give a higher value than needed; checking stops as -# soon as the target device is found -# -# -# * NoDriverLoading <0|1> (no command line parameter) -# -# 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. -# -# -# * 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 <- - -# Additional command line flags: -# -# Verbose output -W -# No output at all -q -# Use config file -c -# Use stdin for long config -t -# Give long config as string -f -# Give bus number for ID'ing -b -# Give dev number for ID'ing -g - - -# For filling in all this information for an unknown device, -# see instructions and links on the homepage: -# http://www.draisberghof.de/usb_modeswitch +# For a parameter reference see file REFERENCE in the data package # # If you find working codes and configurations, please contribute # them! + + ####################################################### # Option GlobeSurfer Icon (aka "Vodafone EasyBox") # diff --git a/usb_modeswitch.spec b/usb_modeswitch.spec index b7a49e7..01465fd 100644 --- a/usb_modeswitch.spec +++ b/usb_modeswitch.spec @@ -2,7 +2,7 @@ Name: usb_modeswitch Version: 2.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: USB Modeswitch gets mobile broadband cards in operational mode Summary(de): USB Modeswitch aktiviert UMTS-Karten Group: Applications/System @@ -13,6 +13,8 @@ Source0: http://www.draisberghof.de/%{name}/%{source_name}-%{version}.tar.bz2 Source1: http://www.draisberghof.de/usb_modeswitch/device_reference.txt Patch0: rhbz948451-fix-manual-pages.patch +# Submitted upstream (2014-11-24) +Patch1: device_reference-utf8.patch BuildRequires: libusbx-devel BuildRequires: jimtcl-devel @@ -39,12 +41,8 @@ Vodafone, Option, ZTE und Novatell werden unterstützt. #%patch0 -p1 -b .manpage cp -f %{SOURCE1} device_reference.txt +%patch1 -p0 -b .utf8 -# convert device_reference.txt encoding to UTF-8 -iconv --from=ISO-8859-1 --to=UTF-8 device_reference.txt > device_reference.txt.new && \ -touch -r device_reference.txt device_reference.txt.new && \ -chmod 644 device_reference.txt && \ -mv device_reference.txt.new device_reference.txt %build CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags} @@ -75,6 +73,9 @@ install -p -m 755 usb_modeswitch.sh $RPM_BUILD_ROOT%{_prefix}/lib/udev/usb_modes %changelog +* Mon Nov 24 2014 Till Maas - 2.2.0-2 +- Update device_reference.txt, make it proper UTF-8 + * Tue Aug 26 2014 Robert M. Albrecht - 2.2.0-1 - New upstream release - Fixed a typo in the description