Merge commit '84311b38881ec4a0934686579fec1054feaf5394' into sam-update

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+github: [esden, dragonmux]
+patreon: 1bitsquared

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

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"

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

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

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,
+		0x1,
-		0 /* one idle cycle */
+		0x81, /* Read one bit */
+		0     /* one idle cycle */
 	};
 	dbg_dap_cmd(buf, sizeof(buf), 3);
 	return (buf[0] == DAP_OK);

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 <http://gnu.org/licenses/gpl.html>\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;
 		}
 	}