hosted/cmsis_dap: Use the new option to retry HID interface

blackmagic-debug · Sep 29, 2024 · 5bf7d6e · 5bf7d6e
1 parent cece044
commit 5bf7d6e
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/platforms/hosted/cmsis_dap.c b/src/platforms/hosted/cmsis_dap.c
@@ -273,8 +273,15 @@ bool dap_init(bool allow_fallback)
 	/* Windows hosts may not have the winusb driver associated with v2, handle that by degrading to v1 */
 	if (type == CMSIS_TYPE_BULK) {
 		if (!dap_init_bulk()) {
-			DEBUG_WARN("Could not setup a CMSIS-DAP v2 device in Bulk mode (no drivers?), retrying HID mode\n");
-			type = CMSIS_TYPE_HID;
+			if (allow_fallback) {
+				DEBUG_WARN("Could not setup a CMSIS-DAP v2 device in Bulk mode (no drivers?), retrying HID mode\n");
+				type = CMSIS_TYPE_HID;
+			} else {
+				DEBUG_ERROR("Could not setup a CMSIS-DAP device over Bulk interface, failing. Hint: pass %s to retry "
+							"HID interface\n",
+					"--allow-fallback");
+				return false;
+			}
 		}
 	}
 	if (type == CMSIS_TYPE_HID) {