Skip to content

Commit

Permalink
hosted: correct jlink naming
Browse files Browse the repository at this point in the history
  • Loading branch information
perigoso authored and rg-silva committed Oct 3, 2023
1 parent f3e94f6 commit 2000d5f
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ Black Magic Debug App can talk to
* Black Magic Probe firmware probes via the USB-serial port
* ST-LinkV2 and V3 with recent firmware
* CMSIS-DAP compatible probes
* JLINK probes
* FTDI MPSSE based probe.
* J-Link probes
* FTDI MPSSE based probes

When connected to a single BMP supported probe, starting "blackmagic" w/o any
arguments starts the server. When several BMP supported probes are connected,
Expand All @@ -99,10 +99,10 @@ In another terminal:

```console
> blackmagic
Black Magic Debug App v1.8.0
for Black Magic Probe, ST-Link v2 and v3, CMSIS-DAP, JLink and libftdi/MPSSE
Black Magic Debug App v1.9.2
for Black Magic Probe, ST-Link v2 and v3, CMSIS-DAP, J-Link and FTDI (MPSSE)
Using 1d50:6018 8BB20A03 Black Magic Debug
Black Magic Probe v1.8.0
Black Magic Probe v1.9.2
Listening on TCP: 2000
```

Expand Down
2 changes: 1 addition & 1 deletion src/platforms/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ used by (multiple) platforms.
* ST-Link v2, v2.1, and v3
* FTDI MPSSE probes
* CMSIS-DAP probes and
* JLink probes
* J-Link probes

## Support directories

Expand Down
4 changes: 2 additions & 2 deletions src/platforms/hosted/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# PC-Hosted BMP
Compile in src with "make PROBE_HOST=hosted". This needs minimal external
support. "make PROBE_HOST=hosted HOSTED_BMP_ONLY=0" will compile support for FTDI,
STLink, CMSIS-DAP and JLINK probes, but requires external libraries.
STLink, CMSIS-DAP and J-Link probes, but requires external libraries.

## Description
PC-hosted BMP run on the PC and compiles as "blackmagic". When started,
Expand Down Expand Up @@ -100,7 +100,7 @@ Probes below only when compiled with HOSTED_BMP_ONLY=0
| ST-Link V2/1 | +++ | Requires recent firmware, Cortex only!
| CMSIS-DAP | +++ | Speed varies with MCU implementing CMSIS-DAP
| FTDI MPSSE | ++ | Requires a device description
| JLINK | - | Useful to add BMP support for MCUs with built-in JLINK
| J-Link | - | Limited support for hardware prior to v8

## Device matching
As other USB dongles already connected to the host PC may use FTDI chips,
Expand Down
2 changes: 1 addition & 1 deletion src/platforms/hosted/bmp_libusb.c
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ static const debugger_device_s debugger_devices[] = {
{VENDOR_ID_STLINK, PRODUCT_ID_STLINKV3_NO_MSD, PROBE_TYPE_STLINK_V2, NULL, "ST-Link v2.1 No MSD"},
{VENDOR_ID_STLINK, PRODUCT_ID_STLINKV3, PROBE_TYPE_STLINK_V2, NULL, "ST-Link v3"},
{VENDOR_ID_STLINK, PRODUCT_ID_STLINKV3E, PROBE_TYPE_STLINK_V2, NULL, "ST-Link v3E"},
{VENDOR_ID_SEGGER, PRODUCT_ID_ANY, PROBE_TYPE_JLINK, NULL, "Segger JLink"},
{VENDOR_ID_SEGGER, PRODUCT_ID_ANY, PROBE_TYPE_JLINK, NULL, "Segger J-Link"},
{VENDOR_ID_FTDI, PRODUCT_ID_FTDI_FT2232, PROBE_TYPE_FTDI, NULL, "FTDI FT2232"},
{VENDOR_ID_FTDI, PRODUCT_ID_FTDI_FT4232, PROBE_TYPE_FTDI, NULL, "FTDI FT4232"},
{VENDOR_ID_FTDI, PRODUCT_ID_FTDI_FT232, PROBE_TYPE_FTDI, NULL, "FTDI FT232"},
Expand Down

0 comments on commit 2000d5f

Please sign in to comment.