summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Morgado <aleksander@aleksander.es>2017-12-18 22:52:21 +0100
committerAleksander Morgado <aleksander@aleksander.es>2017-12-18 22:59:18 +0100
commitac80a12f07ecb99aeed424f42f4a462c8b819056 (patch)
treea51fab3514fcef79e00d6b139909190f7df5476b
parent16d2223fca0876ba853eb51a60b895b20d196d7b (diff)
blacklist: Pycom uses Microchip's vid, so blacklist also by pidmm-1-4
The Microchip VID is added to the USB serial adapters greylist instead, as it is very generic. https://bugs.freedesktop.org/show_bug.cgi?id=104320 (cherry picked from commit c2b956aefce495865cbdcb9971e2b3cd99cd0e99)
-rw-r--r--src/77-mm-usb-device-blacklist.rules14
-rw-r--r--src/77-mm-usb-serial-adapters-greylist.rules3
2 files changed, 10 insertions, 7 deletions
diff --git a/src/77-mm-usb-device-blacklist.rules b/src/77-mm-usb-device-blacklist.rules
index 8bd126b7..87f8d5a3 100644
--- a/src/77-mm-usb-device-blacklist.rules
+++ b/src/77-mm-usb-device-blacklist.rules
@@ -68,9 +68,6 @@ ATTRS{idVendor}=="9e88", ATTRS{idProduct}=="9e8f", ENV{ID_MM_DEVICE_IGNORE}="1"
# Atmel Corp at91sam SAMBA bootloader
ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="6124", ENV{ID_MM_DEVICE_IGNORE}="1"
-# Dangerous Prototypes Bus Pirate v4
-ATTRS{idVendor}=="04d8", ATTRS{idProduct}=="fb00", ENV{ID_MM_DEVICE_IGNORE}="1"
-
# All devices from the Swiss Federal Institute of Technology
ATTRS{idVendor}=="0617", ENV{ID_MM_DEVICE_IGNORE}="1"
@@ -198,9 +195,12 @@ ATTRS{idVendor}=="0525", ATTRS{idProduct}=="a4a7", ENV{ID_MM_DEVICE_IGNORE}="1"
# Silicon Labs Telegesis ETRX USB Zigbee dongle
ATTRS{idVendor}=="10c4", ATTRS{idProduct}=="000f", ENV{ID_MM_DEVICE_IGNORE}="1"
-# All devices from Pycom LTD
-# Since Pycom is not producing any modems, it is safe to blacklist all
-# Pycom LTD devices.
-ATTRS{idVendor}=="04d8", ENV{ID_MM_DEVICE_IGNORE}="1"
+# Devices using Microchip's VID
+# Dangerous Prototypes Bus Pirate v4
+ATTRS{idVendor}=="04d8", ATTRS{idProduct}=="fb00", ENV{ID_MM_DEVICE_IGNORE}="1"
+# Pycom Pysense
+ATTRS{idVendor}=="04d8", ATTRS{idProduct}=="f012", ENV{ID_MM_DEVICE_IGNORE}="1"
+# Pycom Pytrack
+ATTRS{idVendor}=="04d8", ATTRS{idProduct}=="f013", ENV{ID_MM_DEVICE_IGNORE}="1"
LABEL="mm_usb_device_blacklist_end"
diff --git a/src/77-mm-usb-serial-adapters-greylist.rules b/src/77-mm-usb-serial-adapters-greylist.rules
index d11df52d..04ca7bae 100644
--- a/src/77-mm-usb-serial-adapters-greylist.rules
+++ b/src/77-mm-usb-serial-adapters-greylist.rules
@@ -13,6 +13,9 @@ ATTRS{idVendor}=="050d", ATTRS{idProduct}=="0103", ENV{ID_MM_DEVICE_MANUAL_SCAN_
# on the vendor Id.
ATTRS{idVendor}=="0403", ENV{ID_MM_DEVICE_MANUAL_SCAN_ONLY}="1"
+# Devices using Microchip's VID
+ATTRS{idVendor}=="04d8", ENV{ID_MM_DEVICE_MANUAL_SCAN_ONLY}="1"
+
# ATEN Intl UC-232A (Prolific)
ATTRS{idVendor}=="0557", ATTRS{idProduct}=="2008", ENV{ID_MM_DEVICE_MANUAL_SCAN_ONLY}="1"