Added CMSIS-DAP v2 support on Windows

ataradov · Jan 16, 2024 · c983cef · c983cef
1 parent a0687aa
commit c983cef
Show file tree

Hide file tree

Showing 5 changed files with 331 additions and 101 deletions.
diff --git a/Makefile b/Makefile
@@ -40,7 +40,7 @@ else
   else
     BIN = edbg.exe
     SRCS += dbg_win.c
-    LIBS += -lhid -lsetupapi
+    LIBS += -lhid -lwinusb -lsetupapi
   endif
 endif
 

diff --git a/dbg.h b/dbg.h
@@ -29,11 +29,13 @@ typedef struct
   int      versions;
   bool     use_v2;
 
+  char     *v1_path;
   int      v1_interface;
   int      v1_ep_size;
   int      v1_tx_ep;
   int      v1_rx_ep;
 
+  char     *v2_path;
   int      v2_interface;
   int      v2_ep_size;
   int      v2_tx_ep;

diff --git a/dbg_lin.c b/dbg_lin.c
@@ -131,6 +131,9 @@ static void parse_descriptors(debugger_t *debugger, int fd, uint8_t *desc, int s
 
     if (USB_CLASS_HID == interface->bInterfaceClass)
     {
+      if (!usb_endpoint_xfer_int(ep0) || !usb_endpoint_xfer_int(ep1))
+        continue;
+
       if (usb_endpoint_dir_in(ep0))
       {
         debugger->v1_tx_ep = ep1->bEndpointAddress;
@@ -150,6 +153,9 @@ static void parse_descriptors(debugger_t *debugger, int fd, uint8_t *desc, int s
 
     if (USB_CLASS_VENDOR_SPEC == interface->bInterfaceClass)
     {
+      if (!usb_endpoint_xfer_bulk(ep0) || !usb_endpoint_xfer_bulk(ep1))
+        continue;
+
       if (usb_endpoint_dir_in(ep0))
         continue;