Make update-device-filter generate valid usb-device tags

Fixes #932 in the correct fashion

diff --git a/Makefile.am b/Makefile.am
index 94209c5b8272de36df08433a45351572c3bfd18a..36786020ce08e4d6ae700c3463fc5cd850d0575e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -71,7 +71,7 @@ update-device-filter:
        @echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>"
        @echo "<!-- Generated via 'make update-device-filter', don't edit. -->"
        @echo "<resources>"
-       @echo -e -n `wget 'http://sigrok.org/gitweb/?p=libsigrok.git;a=blob_plain;f=contrib/z60_libsigrok.rules' -q -O - | grep idVendor | sed 's/ATTRS{idVendor}=="\(.*\)", ATTRS{idProduct}=="\(.*\)", MODE.*/<usb-device vendor-id="\1" product-id="\2" \/>\\\n/p' | sort | uniq`
+       @wget 'http://sigrok.org/gitweb/?p=libsigrok.git;a=blob_plain;f=contrib/z60_libsigrok.rules' -q -O - | perl -ne 'm/ATTRS\{idVendor\}=="([^"]*)", ATTRS\{idProduct\}=="([^"]*)"/ && print(" <usb-device vendor-id=\"".hex($$1)."\" product-id=\"".hex($$2)."\" />\n")' | sort | uniq
        @echo "</resources>"
 
 clean-local:

diff --git a/device_filter.xml b/device_filter.xml
index aeccd6f3cfc84bf12df8a09f63fe09c30aa36f0d..ba5675dd936fde1c9c802e325711effb221fd243 100644 (file)
--- a/device_filter.xml
+++ b/device_filter.xml
@@ -1,71 +1,71 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generated via 'make update-device-filter', don't edit. -->
 <resources>
-<usb-device vendor-id="0403" product-id="6001" />
- <usb-device vendor-id="0403" product-id="6010" />
- <usb-device vendor-id="0403" product-id="6014" />
- <usb-device vendor-id="0403" product-id="8867" />
- <usb-device vendor-id="0403" product-id="ed72" />
- <usb-device vendor-id="0403" product-id="ed73" />
- <usb-device vendor-id="04b4" product-id="2090" />
- <usb-device vendor-id="04b4" product-id="2150" />
- <usb-device vendor-id="04b4" product-id="2250" />
- <usb-device vendor-id="04b4" product-id="5200" />
- <usb-device vendor-id="04b4" product-id="520a" />
- <usb-device vendor-id="04b4" product-id="6022" />
- <usb-device vendor-id="04b4" product-id="602a" />
- <usb-device vendor-id="04b4" product-id="8613" />
- <usb-device vendor-id="04b5" product-id="2090" />
- <usb-device vendor-id="04b5" product-id="2150" />
- <usb-device vendor-id="04b5" product-id="2250" />
- <usb-device vendor-id="04b5" product-id="5200" />
- <usb-device vendor-id="04b5" product-id="520a" />
- <usb-device vendor-id="04d8" product-id="000a" />
- <usb-device vendor-id="04d8" product-id="fa95" />
- <usb-device vendor-id="04d8" product-id="fb00" />
- <usb-device vendor-id="04fc" product-id="0201" />
- <usb-device vendor-id="05ff" product-id="a001" />
- <usb-device vendor-id="05ff" product-id="a002" />
- <usb-device vendor-id="067b" product-id="2303" />
- <usb-device vendor-id="08a9" product-id="0009" />
- <usb-device vendor-id="08a9" product-id="0014" />
- <usb-device vendor-id="08a9" product-id="0015" />
- <usb-device vendor-id="0925" product-id="3881" />
- <usb-device vendor-id="0957" product-id="0588" />
- <usb-device vendor-id="0957" product-id="0607" />
- <usb-device vendor-id="0957" product-id="0618" />
- <usb-device vendor-id="0aad" product-id="0118" />
- <usb-device vendor-id="0aad" product-id="0119" />
- <usb-device vendor-id="0c12" product-id="7002" />
- <usb-device vendor-id="0c12" product-id="7009" />
- <usb-device vendor-id="0c12" product-id="700a" />
- <usb-device vendor-id="0c12" product-id="700b" />
- <usb-device vendor-id="0c12" product-id="700c" />
- <usb-device vendor-id="0c12" product-id="700d" />
- <usb-device vendor-id="0c12" product-id="700e" />
- <usb-device vendor-id="0c12" product-id="7016" />
- <usb-device vendor-id="1041" product-id="8101" />
- <usb-device vendor-id="10c4" product-id="0002" />
- <usb-device vendor-id="10c4" product-id="ea60" />
- <usb-device vendor-id="1244" product-id="d237" />
- <usb-device vendor-id="128d" product-id="0003" />
- <usb-device vendor-id="16d0" product-id="0498" />
- <usb-device vendor-id="1a86" product-id="e008" />
- <usb-device vendor-id="1ab1" product-id="04b0" />
- <usb-device vendor-id="1ab1" product-id="04ce" />
- <usb-device vendor-id="1ab1" product-id="0588" />
- <usb-device vendor-id="1ab1" product-id="0641" />
- <usb-device vendor-id="1d50" product-id="608c" />
- <usb-device vendor-id="1d50" product-id="608d" />
- <usb-device vendor-id="1d50" product-id="608e" />
- <usb-device vendor-id="20a0" product-id="4123" />
- <usb-device vendor-id="21a9" product-id="1001" />
- <usb-device vendor-id="2961" product-id="6688" />
- <usb-device vendor-id="2961" product-id="6689" />
- <usb-device vendor-id="2a0e" product-id="0001" />
- <usb-device vendor-id="2a0e" product-id="0002" />
- <usb-device vendor-id="2a0e" product-id="0003" />
- <usb-device vendor-id="3195" product-id="f190" />
- <usb-device vendor-id="8102" product-id="8102" />
- <usb-device vendor-id="a600" product-id="a000" />
+ <usb-device vendor-id="1027" product-id="24577" />
+ <usb-device vendor-id="1027" product-id="24592" />
+ <usb-device vendor-id="1027" product-id="24596" />
+ <usb-device vendor-id="1027" product-id="34919" />
+ <usb-device vendor-id="1027" product-id="60786" />
+ <usb-device vendor-id="1027" product-id="60787" />
+ <usb-device vendor-id="10593" product-id="26248" />
+ <usb-device vendor-id="10593" product-id="26249" />
+ <usb-device vendor-id="10766" product-id="1" />
+ <usb-device vendor-id="10766" product-id="2" />
+ <usb-device vendor-id="10766" product-id="3" />
+ <usb-device vendor-id="1204" product-id="20992" />
+ <usb-device vendor-id="1204" product-id="21002" />
+ <usb-device vendor-id="1204" product-id="24610" />
+ <usb-device vendor-id="1204" product-id="24618" />
+ <usb-device vendor-id="1204" product-id="34323" />
+ <usb-device vendor-id="1204" product-id="8336" />
+ <usb-device vendor-id="1204" product-id="8528" />
+ <usb-device vendor-id="1204" product-id="8784" />
+ <usb-device vendor-id="1205" product-id="20992" />
+ <usb-device vendor-id="1205" product-id="21002" />
+ <usb-device vendor-id="1205" product-id="8336" />
+ <usb-device vendor-id="1205" product-id="8528" />
+ <usb-device vendor-id="1205" product-id="8784" />
+ <usb-device vendor-id="1240" product-id="10" />
+ <usb-device vendor-id="1240" product-id="64149" />
+ <usb-device vendor-id="1240" product-id="64256" />
+ <usb-device vendor-id="12693" product-id="61840" />
+ <usb-device vendor-id="1276" product-id="513" />
+ <usb-device vendor-id="1535" product-id="40961" />
+ <usb-device vendor-id="1535" product-id="40962" />
+ <usb-device vendor-id="1659" product-id="8963" />
+ <usb-device vendor-id="2217" product-id="20" />
+ <usb-device vendor-id="2217" product-id="21" />
+ <usb-device vendor-id="2217" product-id="9" />
+ <usb-device vendor-id="2341" product-id="14465" />
+ <usb-device vendor-id="2391" product-id="1416" />
+ <usb-device vendor-id="2391" product-id="1543" />
+ <usb-device vendor-id="2391" product-id="1560" />
+ <usb-device vendor-id="2733" product-id="280" />
+ <usb-device vendor-id="2733" product-id="281" />
+ <usb-device vendor-id="3090" product-id="28674" />
+ <usb-device vendor-id="3090" product-id="28681" />
+ <usb-device vendor-id="3090" product-id="28682" />
+ <usb-device vendor-id="3090" product-id="28683" />
+ <usb-device vendor-id="3090" product-id="28684" />
+ <usb-device vendor-id="3090" product-id="28685" />
+ <usb-device vendor-id="3090" product-id="28686" />
+ <usb-device vendor-id="3090" product-id="28694" />
+ <usb-device vendor-id="33026" product-id="33026" />
+ <usb-device vendor-id="4161" product-id="33025" />
+ <usb-device vendor-id="42496" product-id="40960" />
+ <usb-device vendor-id="4292" product-id="2" />
+ <usb-device vendor-id="4292" product-id="60000" />
+ <usb-device vendor-id="4676" product-id="53815" />
+ <usb-device vendor-id="4749" product-id="3" />
+ <usb-device vendor-id="5840" product-id="1176" />
+ <usb-device vendor-id="6790" product-id="57352" />
+ <usb-device vendor-id="6833" product-id="1200" />
+ <usb-device vendor-id="6833" product-id="1230" />
+ <usb-device vendor-id="6833" product-id="1416" />
+ <usb-device vendor-id="6833" product-id="1601" />
+ <usb-device vendor-id="7504" product-id="24716" />
+ <usb-device vendor-id="7504" product-id="24717" />
+ <usb-device vendor-id="7504" product-id="24718" />
+ <usb-device vendor-id="8352" product-id="16675" />
+ <usb-device vendor-id="8617" product-id="4097" />
 </resources>