Merge pull request #991 from patrislav1/atmelice_sam4l

Fix Atmel-ICE compatibility issue

Author: flit

pyocd/probe/pydapaccess/interface/pyusb_backend.py

@@ -1,5 +1,6 @@
 # pyOCD debugger
 # Copyright (c) 2006-2020 Arm Limited
+# Copyright (c) 2020 Patrick Huesmann
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -271,14 +272,25 @@ def __call__(self, interface):
             # Must have either 1 or 2 endpoints.
             if interface.bNumEndpoints not in (1, 2):
                 return False
-        
-            # Endpoint 0 must be interrupt in.
-            if not check_ep(interface, 0, usb.util.ENDPOINT_IN, usb.util.ENDPOINT_TYPE_INTR):
-                return False
-        
-            # Endpoint 1 is optional. If present it must be interrupt out.
-            if (interface.bNumEndpoints == 2) \
-                and not check_ep(interface, 1, usb.util.ENDPOINT_OUT, usb.util.ENDPOINT_TYPE_INTR):
+
+            endpoint_attrs = [
+                (usb.util.endpoint_direction(ep.bEndpointAddress),
+                 usb.util.endpoint_type(ep.bmAttributes))
+                 for ep in interface
+            ]
+
+            # Possible combinations of endpoints
+            ENDPOINT_ATTRS_ALLOWED = [
+                # One interrupt endpoint IN
+                [(usb.util.ENDPOINT_IN, usb.util.ENDPOINT_TYPE_INTR)],
+                # Two interrupt endpoints, first one IN, second one OUT
+                [(usb.util.ENDPOINT_IN, usb.util.ENDPOINT_TYPE_INTR),
+                 (usb.util.ENDPOINT_OUT, usb.util.ENDPOINT_TYPE_INTR)],
+                # Two interrupt endpoints, first one OUT, second one IN
+                [(usb.util.ENDPOINT_OUT, usb.util.ENDPOINT_TYPE_INTR),
+                 (usb.util.ENDPOINT_IN, usb.util.ENDPOINT_TYPE_INTR)],
+            ]
+            if endpoint_attrs not in ENDPOINT_ATTRS_ALLOWED:
                 return False
 
             # All checks passed, this is a CMSIS-DAPv2 interface!

udev/50-cmsis-dap.rules

@@ -7,3 +7,5 @@ SUBSYSTEM=="usb", ATTR{idVendor}=="c251", ATTR{idProduct}=="2750", MODE:="666"
 # 1fc9:0090 NXP LPC-LinkII
 SUBSYSTEM=="usb", ATTR{idVendor}=="1fc9", ATTR{idProduct}=="0090", MODE:="666"
 
+# 03eb:2141 Atmel-ICE CMSIS-DAP
+SUBSYSTEM=="usb", ATTR{idVendor}=="03eb", ATTR{idProduct}=="2141", MODE:="666"