Skip to content
This repository was archived by the owner on Mar 7, 2026. It is now read-only.

Fix: BMDA CMSIS-DAP v2 selection#1552

Merged
esden merged 6 commits into
mainfrom
fix/bmda-cmsis-dap-v2-selection
Jul 21, 2023
Merged

Fix: BMDA CMSIS-DAP v2 selection#1552
esden merged 6 commits into
mainfrom
fix/bmda-cmsis-dap-v2-selection

Conversation

@dragonmux
Copy link
Copy Markdown
Member

Detailed description

This PR addresses a small regression introduced in #1502 which causes CMSIS-DAP probes to be assumed to be v1 even when they might be v2 or support both.

We fix this by re-checking the descriptors of the probe if it's a CMSIS-DAP probe, once it's been selected by the probe discovery code. We then check for the v2 descriptors and extract the correct endpoints to allow the backend to do the right thing.

The way this is done also ensures that we should always pick up the proper interfaces no matter what order they appear in.

Your checklist for this pull request

  • I've read the Code of Conduct
  • I've read the guidelines for contributing to this repository
  • It builds for hardware native (make PROBE_HOST=native)
  • It builds as BMDA (make PROBE_HOST=hosted)
  • I've tested it to the best of my ability
  • My commit messages provide a useful short description of what the commits do

Closing issues

Fixes #959

@dragonmux dragonmux added Bug Confirmed bug BMD App Black Magic Debug App (aka. PC hosted) (not firmware) Regression Bug caused by a regression labels Jul 20, 2023
@dragonmux dragonmux added this to the v1.10 milestone Jul 20, 2023
@dragonmux dragonmux requested a review from esden July 20, 2023 08:42
Copy link
Copy Markdown
Member

@esden esden left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@esden esden merged commit 7229c87 into main Jul 21, 2023
@dragonmux dragonmux deleted the fix/bmda-cmsis-dap-v2-selection branch July 21, 2023 18:43
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

BMD App Black Magic Debug App (aka. PC hosted) (not firmware) Bug Confirmed bug Regression Bug caused by a regression

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Hosted/CMSIS-DAP: CMSID-DAP Interface can come after a CDCACM interface

2 participants