From bbeca601138ff51b817bb1ef84b53a70572d0c19 Mon Sep 17 00:00:00 2001
From: Aleksander Morgado <aleksander@aleksander.es>
Date: Tue, 2 Jun 2020 15:39:51 +0200
Subject: [PATCH] ublox: fully ignore GPS devices with plugin-installed rules

Instead of setting up the ID_MM_TTY_BLACKLIST tag used in 'legacy'
filter mode, tag all known u-blox GPS devices with the broader
ID_MM_DEVICE_IGNORE tag that applies under all filter modes.

Also, make this rules be installed by the plugin itself, because at
the end, it is the u-blox plugin the one attempting to probe all
devices with vid 0x1546.
---
 NEWS                                       | 1 +
 plugins/ublox/77-mm-ublox-port-types.rules | 5 +++++
 src/77-mm-usb-device-blacklist.rules       | 5 -----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/NEWS b/NEWS
index ba4b0e92..8545a277 100644
--- a/NEWS
+++ b/NEWS
@@ -118,6 +118,7 @@ The most important features and changes in this release are the following:
    ** fibocom: added support for QMI based devices like the FM150.
    ** ublox: ignore error when disconnecting last LTE bearer.
    ** ublox: implement support to enable and detect +UUDTMF URCs.
+   ** ublox: added blacklist rules for GPS modules in the plugin itself.
    ** sierra: implement manual and automatic CDMA activation.
    ** novatel: implement manual and automatic CDMA activation.
 
diff --git a/plugins/ublox/77-mm-ublox-port-types.rules b/plugins/ublox/77-mm-ublox-port-types.rules
index 9f8263ee..c07de334 100644
--- a/plugins/ublox/77-mm-ublox-port-types.rules
+++ b/plugins/ublox/77-mm-ublox-port-types.rules
@@ -7,6 +7,11 @@ LABEL="mm_ublox_port_types"
 
 SUBSYSTEMS=="usb", ATTRS{bInterfaceNumber}=="?*", ENV{.MM_USBIFNUM}="$attr{bInterfaceNumber}"
 
+# Fully ignore u-blox GPS devices
+ATTRS{idVendor}=="1546", ATTRS{idProduct}=="01a5", ENV{ID_MM_DEVICE_IGNORE}="1"
+ATTRS{idVendor}=="1546", ATTRS{idProduct}=="01a6", ENV{ID_MM_DEVICE_IGNORE}="1"
+ATTRS{idVendor}=="1546", ATTRS{idProduct}=="01a7", ENV{ID_MM_DEVICE_IGNORE}="1"
+
 # Toby-L4 port types
 #  ttyACM0 (if #2): secondary (ignore)
 #  ttyACM1 (if #4): debug port (ignore)
diff --git a/src/77-mm-usb-device-blacklist.rules b/src/77-mm-usb-device-blacklist.rules
index f7f277b2..4674816f 100644
--- a/src/77-mm-usb-device-blacklist.rules
+++ b/src/77-mm-usb-device-blacklist.rules
@@ -106,11 +106,6 @@ ATTRS{idVendor}=="0e8d", ATTRS{idProduct}=="2000", ENV{ID_MM_TTY_BLACKLIST}="1"
 # PS-360 OEM (GPS sold with MS Street and Trips 2005)
 ATTRS{idVendor}=="067b", ATTRS{idProduct}=="aaa0", ENV{ID_MM_TTY_BLACKLIST}="1"
 
-# u-blox AG, u-blox 5 GPS chips
-ATTRS{idVendor}=="1546", ATTRS{idProduct}=="01a5", ENV{ID_MM_TTY_BLACKLIST}="1"
-ATTRS{idVendor}=="1546", ATTRS{idProduct}=="01a6", ENV{ID_MM_TTY_BLACKLIST}="1"
-ATTRS{idVendor}=="1546", ATTRS{idProduct}=="01a7", ENV{ID_MM_TTY_BLACKLIST}="1"
-
 # Garmin GPS devices
 DRIVERS=="garmin_gps", ENV{ID_MM_TTY_BLACKLIST}="1"