From 29dc94c3d619c388b06e6b0e09d2e4cb07a0ae34 Mon Sep 17 00:00:00 2001 From: dragonmux Date: Tue, 17 May 2022 17:04:18 -0400 Subject: [PATCH 1/7] hosted: with mubes help, fixes some issues with how we talk CMSIS-DAP --- src/platforms/hosted/dap.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/platforms/hosted/dap.c b/src/platforms/hosted/dap.c index 3adc424b..d710bbf4 100644 --- a/src/platforms/hosted/dap.c +++ b/src/platforms/hosted/dap.c @@ -278,7 +278,10 @@ void dap_reset_pin(int state) buf[1] = state ? DAP_SWJ_nRESET : 0; // Value buf[2] = DAP_SWJ_nRESET; // Select buf[3] = 0; // Wait - dbg_dap_cmd(buf, sizeof(buf), 4); + buf[4] = 0; // Wait + buf[5] = 0; // Wait + buf[6] = 0; // Wait + dbg_dap_cmd(buf, sizeof(buf), 7); } void dap_trst_reset(void) @@ -797,8 +800,9 @@ bool dap_sequence_test(void) { uint8_t buf[4] = { ID_DAP_SWD_SEQUENCE, - 1, - 0 /* one idle cycle */ + 0x1, + 0x81, /* Read one bit */ + 0 /* one idle cycle */ }; dbg_dap_cmd(buf, sizeof(buf), 3); return (buf[0] == DAP_OK); From 754d65ad54620261566185fc3eea6f53e0e3b319 Mon Sep 17 00:00:00 2001 From: dragonmux Date: Wed, 25 May 2022 14:37:55 -0400 Subject: [PATCH 2/7] misc: Added GitHub funding configuration for the project --- .github/FUNDING.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 00000000..05ec3ef8 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1 @@ +github: [esden, dragonmux] From 0ee03080c3af0fd4b7a7b583b01d1424549d6223 Mon Sep 17 00:00:00 2001 From: dragonmux Date: Wed, 25 May 2022 16:31:33 -0400 Subject: [PATCH 3/7] misc: Added Esden's patreon to FUNDING.yml --- .github/FUNDING.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 05ec3ef8..863d00d8 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1 +1,2 @@ github: [esden, dragonmux] +patreon: esden From 434a23b478de2038689deebec9b14e9709eb95b4 Mon Sep 17 00:00:00 2001 From: dragonmux Date: Wed, 25 May 2022 18:57:38 -0400 Subject: [PATCH 4/7] misc: Corrected the patreon link in FUNDING.yml --- .github/FUNDING.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 863d00d8..8158731f 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,2 +1,2 @@ github: [esden, dragonmux] -patreon: esden +patreon: 1bitsquared From e4d692bf7aea7d695dad11f25871b6db1b4b7581 Mon Sep 17 00:00:00 2001 From: Piotr Esden-Tempski Date: Mon, 30 May 2022 14:00:24 -0700 Subject: [PATCH 5/7] driver: Updated vendor name to Black Magic Debug. Closes #1009 --- driver/blackmagic.inf | 10 +++++----- driver/blackmagic_upgrade.inf | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/driver/blackmagic.inf b/driver/blackmagic.inf index 91949371..b2345b37 100644 --- a/driver/blackmagic.inf +++ b/driver/blackmagic.inf @@ -13,17 +13,17 @@ Signature="$Windows NT$" Class=Ports ClassGuid={4D36E978-E325-11CE-BFC1-08002BE10318} -Provider=%BLACKSPHERE% +Provider=%BLACKMAGIC% DriverVer=28/12/2011,0.0.1.1 [Manufacturer] %VendorName%=DeviceList, NTamd64 [Strings] -VendorName = "Black Sphere Technologies" +VendorName = "Black Magic Debug" BLACKMAGICGDB = "Black Magic GDB Server" BLACKMAGICUART = "Black Magic UART Port" -BLACKSPHERE_DISPLAY_NAME = "Black Magic Probe Driver" +BLACKMAGIC_DISPLAY_NAME = "Black Magic Probe Driver" [DeviceList] %BLACKMAGICGDB%=DriverInstall, USB\VID_1d50&PID_6018&Rev_0100&MI_00 @@ -55,7 +55,7 @@ HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider" AddService = usbser,0x0002,DriverService.nt [DriverService.nt] -DisplayName = %BLACKSPHERE_DISPLAY_NAME% +DisplayName = %BLACKMAGIC_DISPLAY_NAME% ServiceType = 1 ; SERVICE_KERNEL_DRIVER StartType = 3 ; SERVICE_DEMAND_START ErrorControl = 1 ; SERVICE_ERROR_NORMAL @@ -80,7 +80,7 @@ HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider" AddService = usbser,0x0002,DriverService.NTamd64 [DriverService.NTamd64] -DisplayName = %BLACKSPHERE_DISPLAY_NAME% +DisplayName = %BLACKMAGIC_DISPLAY_NAME% ServiceType = 1 ; SERVICE_KERNEL_DRIVER StartType = 3 ; SERVICE_DEMAND_START ErrorControl = 1 ; SERVICE_ERROR_NORMAL diff --git a/driver/blackmagic_upgrade.inf b/driver/blackmagic_upgrade.inf index d37036f7..78bbbe6b 100644 --- a/driver/blackmagic_upgrade.inf +++ b/driver/blackmagic_upgrade.inf @@ -4,7 +4,7 @@ DeviceName = "Black Magic Firmware Upgrade" DeviceNameDFU = "Black Magic Probe (Upgrade)" DeviceNameTPA = "Black Magic Trace Capture" -VendorName = "Black Sphere Technologies" +VendorName = "Black Magic Debug" SourceName = "Black Magic Firmware Upgrade Install Disk" DeviceID = "VID_1d50&PID_6018&Rev_0100&MI_04" DeviceIDDFU= "VID_1d50&PID_6017&Rev_0100" From 9b5b6fab5b753ce2b7f8b4e0dcae99cdefb3520e Mon Sep 17 00:00:00 2001 From: Piotr Esden-Tempski Date: Mon, 30 May 2022 14:21:33 -0700 Subject: [PATCH 6/7] upgrade: Changed copyright to BMD and allowed more vendor strings. --- upgrade/main.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/upgrade/main.c b/upgrade/main.c index 3e10b9a3..912253a9 100644 --- a/upgrade/main.c +++ b/upgrade/main.c @@ -38,7 +38,7 @@ void banner(void) { puts("\nBlack Magic Probe -- Firmware Upgrade Utility -- Version " VERSION); - puts("Copyright (C) 2011 Black Sphere Technologies Ltd."); + puts("Copyright (C) 2022 Black Magic Debug Project"); puts("License GPLv3+: GNU GPL version 3 or later \n"); } @@ -74,12 +74,16 @@ struct usb_device * find_dev(void) if (((dev->descriptor.idProduct == 0x5740) || (dev->descriptor.idProduct == 0x6018)) && - !strcmp(man, "Black Sphere Technologies")) + (!strcmp(man, "Black Sphere Technologies") || + !strcmp(man, "Black Magic Debug") || + !strcmp(man, "1BitSquared"))) return dev; if (((dev->descriptor.idProduct == 0xDF11) || (dev->descriptor.idProduct == 0x6017)) && - !strcmp(man, "Black Sphere Technologies")) + (!strcmp(man, "Black Sphere Technologies") || + !strcmp(man, "Black Magic Debug") || + !strcmp(man, "1BitSquared"))) return dev; } } From 84311b38881ec4a0934686579fec1054feaf5394 Mon Sep 17 00:00:00 2001 From: Piotr Esden-Tempski Date: Mon, 30 May 2022 14:32:36 -0700 Subject: [PATCH 7/7] docs: Corrected org in links to blackmagic-debug --- src/platforms/f4discovery/Readme.md | 2 +- src/platforms/hosted/Readme.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/platforms/f4discovery/Readme.md b/src/platforms/f4discovery/Readme.md index 425e34cf..b7c15e43 100644 --- a/src/platforms/f4discovery/Readme.md +++ b/src/platforms/f4discovery/Readme.md @@ -60,6 +60,6 @@ To exit from dfu mode press a "key" and "reset", release reset. BMP firmware sho SWJ frequency setting ==================================== -https://github.com/blacksphere/blackmagic/pull/783#issue-529197718 +https://github.com/blackmagic-debug/blackmagic/pull/783#issue-529197718 `mon freq 900k` helps at most diff --git a/src/platforms/hosted/Readme.md b/src/platforms/hosted/Readme.md index aa0d45b7..1762e168 100644 --- a/src/platforms/hosted/Readme.md +++ b/src/platforms/hosted/Readme.md @@ -171,7 +171,7 @@ cables already listed and propose other cable. A link to the schematics is welcome. ## Feedback -### Issues and Pull request on https://github.com/blacksphere/blackmagic/ +### Issues and Pull request on https://github.com/blackmagic-debug/blackmagic/ ### Discussions on Discord. You can find the Discord link here: https://1bitsquared.com/pages/chat ### Blackmagic mailing list http://sourceforge.net/mail/?group_id=407419