From 4100675a6bb3f74a4dce067d4a71cad97f8762d0 Mon Sep 17 00:00:00 2001
From: Viktor P <viktorp@avesta.ru>
Date: Mon, 17 Apr 2023 19:15:04 +0300
Subject: [PATCH] Allow VID:PID override for JLink probe

---
 src/jlink.cpp | 8 ++++----
 src/jlink.hpp | 4 ++--
 src/jtag.cpp  | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/jlink.cpp b/src/jlink.cpp
index 0ba9a8e..af55a2b 100644
--- a/src/jlink.cpp
+++ b/src/jlink.cpp
@@ -39,7 +39,7 @@ using namespace std;
 // buffer capacity
 #define BUF_SIZE 2048
 
-Jlink::Jlink(uint32_t clkHz, int8_t verbose):_base_freq(0), _min_div(0),
+Jlink::Jlink(uint32_t clkHz, int8_t verbose, int vid = VID, int pid = PID):_base_freq(0), _min_div(0),
 	jlink_write_ep(-1), jlink_read_ep(-1), jlink_interface(-1),
 	_verbose(verbose > 0), _debug(verbose > 1), _quiet(verbose < 0),
 	_num_bits(0), _last_tms(0), _last_tdi(0),
@@ -50,7 +50,7 @@ Jlink::Jlink(uint32_t clkHz, int8_t verbose):_base_freq(0), _min_div(0),
 		throw std::runtime_error("libusb init failed\n");
 
 	// search for all compatible devices
-	if (!jlink_scan_usb())
+	if (!jlink_scan_usb(vid,pid))
 		throw std::runtime_error("can't find compatible device");
 
 	// get device capacity
@@ -659,7 +659,7 @@ bool Jlink::jlink_search_interface(libusb_device *dev,
 	return true;
 }
 
-bool Jlink::jlink_scan_usb()
+bool Jlink::jlink_scan_usb(int vid, int pid)
 {
 	libusb_device **dev_list;
 	libusb_device *usb_dev;
@@ -677,7 +677,7 @@ bool Jlink::jlink_scan_usb()
 			return EXIT_FAILURE;
 		}
 
-		if (desc.idProduct != PID || desc.idVendor != VID)
+		if (desc.idProduct != pid || desc.idVendor != vid)
 			continue;
 
 		if (_verbose)
diff --git a/src/jlink.hpp b/src/jlink.hpp
index 70c627f..73ac7c0 100644
--- a/src/jlink.hpp
+++ b/src/jlink.hpp
@@ -24,7 +24,7 @@ class Jlink: public JtagInterface {
 		 * \param[in] verbose: verbose level -1 quiet, 0 normal,
 		 * 								1 verbose, 2 debug
 		 */
-		Jlink(uint32_t clkHz, int8_t verbose);
+		Jlink(uint32_t clkHz, int8_t verbose, int vid, int pid);
 
 		~Jlink();
 
@@ -270,7 +270,7 @@ class Jlink: public JtagInterface {
 		 * \brief iterate on all USB peripheral to find one JLink
 		 * \return false when failure, unable to open or no device found
 		 */
-		bool jlink_scan_usb();
+		bool jlink_scan_usb(int vid, int pid);
 
 		typedef struct {
 			libusb_device *usb_dev;
diff --git a/src/jtag.cpp b/src/jtag.cpp
index e02f9e3..7847def 100644
--- a/src/jtag.cpp
+++ b/src/jtag.cpp
@@ -115,7 +115,7 @@ void Jtag::init_internal(const cable_t &cable, const string &dev, const string &
 		_jtag = new DirtyJtag(clkHZ, _verbose);
 		break;
 	case MODE_JLINK:
-		_jtag = new Jlink(clkHZ, _verbose);
+		_jtag = new Jlink(clkHZ, _verbose, cable.vid, cable.pid);
 		break;
 	case MODE_USBBLASTER:
 		_jtag = new UsbBlaster(cable, firmware_path, _verbose);