From 7fc07031673cfbf609f35aa0f00a377c897245b5 Mon Sep 17 00:00:00 2001 From: Vegard Storheil Eriksen Date: Tue, 22 Jun 2021 23:52:54 +0200 Subject: [PATCH 1/2] cable: Add support for Orbtrace. --- README.md | 1 + src/cable.hpp | 1 + 2 files changed, 2 insertions(+) diff --git a/README.md b/README.md index 7654bf9..4927f12 100644 --- a/README.md +++ b/README.md @@ -73,6 +73,7 @@ __Supported cables:__ * anlogic JTAG adapter * [digilent_hs2](https://store.digilentinc.com/jtag-hs2-programming-cable/): jtag programmer cable from digilent * [cmsisdap](https://os.mbed.com/docs/mbed-os/v6.11/debug-test/daplink.html): ARM CMSIS DAP protocol interface (hid only) +* [Orbtrace](https://github.com/orbcode/orbtrace): Open source FPGA-based debug and trace interface * [DFU (Device Firmware Upgrade)](http://www.usb.org/developers/docs/devclass_docs/DFU_1.1.pdf): USB device compatible with DFU protocol * [DirtyJTAG](https://github.com/jeanthom/DirtyJTAG): JTAG probe firmware for STM32F1 (Best to use release (1.4 or newer) or limit the --freq to 600000 with older releases. New version https://github.com/jeanthom/DirtyJTAG/tree/dirtyjtag2 is also supported) diff --git a/src/cable.hpp b/src/cable.hpp index ce666c8..cae976c 100644 --- a/src/cable.hpp +++ b/src/cable.hpp @@ -45,6 +45,7 @@ static std::map cable_list = { {"ft232RL", {MODE_FTDI_BITBANG, {0x0403, 0x6001, INTERFACE_A, 0x08, 0x0B, 0x08, 0x0B}}}, {"ft4232", {MODE_FTDI_SERIAL, {0x0403, 0x6011, INTERFACE_A, 0x08, 0x0B, 0x08, 0x0B}}}, {"ecpix5-debug", {MODE_FTDI_SERIAL, {0x0403, 0x6010, INTERFACE_A, 0xF8, 0xFB, 0xFF, 0xFF}}}, + {"orbtrace", {MODE_CMSISDAP, {0x1209, 0x3443, 0, 0, 0, 0, 0 }}}, {"tigard", {MODE_FTDI_SERIAL, {0x0403, 0x6010, INTERFACE_B, 0x08, 0x3B, 0x00, 0x00}}}, {"usb-blaster", {MODE_USBBLASTER, {0x09Fb, 0x6001, 0, 0, 0, 0, 0 }}}, {"usb-blasterII",{MODE_USBBLASTER, {0x09Fb, 0x6810, 0, 0, 0, 0, 0 }}}, From 5e11b3cb6767fd2ba3f02ea6b617b06fe03e12ee Mon Sep 17 00:00:00 2001 From: Vegard Storheil Eriksen Date: Tue, 22 Jun 2021 23:53:30 +0200 Subject: [PATCH 2/2] cmsisDAP: Remove product string check. --- src/cmsisDAP.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/cmsisDAP.cpp b/src/cmsisDAP.cpp index 76d411f..7363240 100644 --- a/src/cmsisDAP.cpp +++ b/src/cmsisDAP.cpp @@ -110,14 +110,8 @@ CmsisDAP::CmsisDAP(int vid, int pid, bool verbose):_verbose(verbose), */ devs = hid_enumerate(vid, pid); - /* for all HID devices extracts only - * ones with a product_string containing the string "CMSIS-DAP" - */ for (cur_dev = devs; NULL != cur_dev; cur_dev = cur_dev->next) { - if (NULL != cur_dev->product_string && - wcsstr(cur_dev->product_string, L"CMSIS-DAP")) { - dev_found.push_back(cur_dev); - } + dev_found.push_back(cur_dev); } /* no devices: stop */