[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.10.0-1508-g44cf202ef

[OpenOCD-Gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  44cf202ef585ea5e2dda78e65cc5d04e08129eff (commit)
       via  0e0283e582ddc06b34f3d7e3b09d1754dd501794 (commit)
       via  9c314578750324b8d46cdbe0801d3cdfc25c4a4c (commit)
      from  e6770f1ab6b9a34dbe90d3fa6ae4093914a0d707 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 44cf202ef585ea5e2dda78e65cc5d04e08129eff
Author: Tarek BOCHKATI <tar...@st...>
Date:   Fri Nov 6 12:33:14 2020 +0100

    60-openocd.rules: add ULINKplus CMSIS-DAP based adapter
    
    Change-Id: I5935e0a184b8995122d197046ef8fb4e7eefb884
    Signed-off-by: Tarek BOCHKATI <tar...@st...>
    Reviewed-on: http://openocd.zylin.com/5926
    Reviewed-by: Tarek BOCHKATI <tar...@gm...>
    Reviewed-by: Tomas Vanek <va...@fb...>
    Tested-by: jenkins

diff --git a/contrib/60-openocd.rules b/contrib/60-openocd.rules
index 53f97dd83..fe57364d7 100644
--- a/contrib/60-openocd.rules
+++ b/contrib/60-openocd.rules
@@ -167,6 +167,7 @@ ATTRS{idVendor}=="9e88", ATTRS{idProduct}=="9e8f", MODE="660", GROUP="plugdev",
 
 # Keil Software, Inc. ULink
 ATTRS{idVendor}=="c251", ATTRS{idProduct}=="2710", MODE="660", GROUP="plugdev", TAG+="uaccess"
+ATTRS{idVendor}=="c251", ATTRS{idProduct}=="2750", MODE="660", GROUP="plugdev", TAG+="uaccess"
 
 # CMSIS-DAP compatible adapters
 ATTRS{product}=="*CMSIS-DAP*", MODE="660", GROUP="plugdev", TAG+="uaccess"

commit 0e0283e582ddc06b34f3d7e3b09d1754dd501794
Author: Tomas Vanek <va...@fb...>
Date:   Sun Nov 8 22:34:26 2020 +0100

    doc: document CMSIS-DAP v2
    
    Change-Id: Ie54e855901c079b456c26a6239177c7678cdcac7
    Signed-off-by: Tomas Vanek <va...@fb...>
    Reviewed-on: http://openocd.zylin.com/5930
    Tested-by: jenkins
    Reviewed-by: Tarek BOCHKATI <tar...@gm...>
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/doc/openocd.texi b/doc/openocd.texi
index 84ed32060..292bbd77c 100644
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -2429,7 +2429,8 @@ and a specific set of GPIOs is used.
 @end deffn
 
 @deffn {Interface Driver} {cmsis-dap}
-ARM CMSIS-DAP compliant based adapter.
+ARM CMSIS-DAP compliant based adapter v1 (USB HID based)
+or v2 (USB bulk).
 
 @deffn {Config Command} {cmsis_dap_vid_pid} [vid pid]+
 The vendor ID and product ID of the CMSIS-DAP device. If not specified
@@ -2445,6 +2446,23 @@ Specifies the @var{serial} of the CMSIS-DAP device to use.
 If not specified, serial numbers are not considered.
 @end deffn
 
+@deffn {Config Command} {cmsis_dap_backend} [@option{auto}|@option{usb_bulk}|@option{hid}]
+Specifies how to communicate with the adapter:
+
+@itemize @minus
+@item @option{hid} Use HID generic reports - CMSIS-DAP v1
+@item @option{usb_bulk} Use USB bulk - CMSIS-DAP v2
+@item @option{auto} First try USB bulk CMSIS-DAP v2, if not found try HID CMSIS-DAP v1.
+This is the default if @command{cmsis_dap_backend} is not specified.
+@end itemize
+@end deffn
+
+@deffn {Config Command} {cmsis_dap_usb interface} [number]
+Specifies the @var{number} of the USB interface to use in v2 mode (USB bulk).
+In most cases need not to be specified and interfaces are searched by
+interface string or for user class interface.
+@end deffn
+
 @deffn {Command} {cmsis-dap info}
 Display various device information, like hardware version, firmware version, current bus status.
 @end deffn

commit 9c314578750324b8d46cdbe0801d3cdfc25c4a4c
Author: Antonio Borneo <bor...@gm...>
Date:   Thu Jul 30 21:36:39 2020 +0200

    jtag/drivers/cmsis_dap: fix build with gcc 10.1.0
    
    Avoid multiple definition of cmsis_dap_usb_backend and
    cmsis_dap_hid_backend using 'extern'.
    Move the prototypes in cmsis_dap.h.
    Remove the useless #if/#endif around the prototypes.
    
    Change-Id: I8d73fe148e2155620244bc887d4235e9af530e30
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: http://openocd.zylin.com/5790
    Tested-by: jenkins
    Reviewed-by: Tarek BOCHKATI <tar...@gm...>
    Reviewed-by: Tomas Vanek <va...@fb...>

diff --git a/src/jtag/drivers/cmsis_dap.c b/src/jtag/drivers/cmsis_dap.c
index 8ddb54179..16480ae1e 100644
--- a/src/jtag/drivers/cmsis_dap.c
+++ b/src/jtag/drivers/cmsis_dap.c
@@ -43,15 +43,6 @@
 
 #include "cmsis_dap.h"
 
-#if BUILD_CMSIS_DAP_USB == 1
-const struct cmsis_dap_backend cmsis_dap_usb_backend;
-extern const struct command_registration cmsis_dap_usb_subcommand_handlers[];
-#endif
-
-#if BUILD_CMSIS_DAP_HID == 1
-const struct cmsis_dap_backend cmsis_dap_hid_backend;
-#endif
-
 static const struct cmsis_dap_backend *const cmsis_dap_backends[] = {
 #if BUILD_CMSIS_DAP_USB == 1
 	&cmsis_dap_usb_backend,
diff --git a/src/jtag/drivers/cmsis_dap.h b/src/jtag/drivers/cmsis_dap.h
index 8cbb8dd07..054621cd5 100644
--- a/src/jtag/drivers/cmsis_dap.h
+++ b/src/jtag/drivers/cmsis_dap.h
@@ -25,4 +25,8 @@ struct cmsis_dap_backend {
 	int (*write)(struct cmsis_dap *dap, int len, int timeout_ms);
 };
 
+extern const struct cmsis_dap_backend cmsis_dap_hid_backend;
+extern const struct cmsis_dap_backend cmsis_dap_usb_backend;
+extern const struct command_registration cmsis_dap_usb_subcommand_handlers[];
+
 #endif

-----------------------------------------------------------------------

Summary of changes:
 contrib/60-openocd.rules     |  1 +
 doc/openocd.texi             | 20 +++++++++++++++++++-
 src/jtag/drivers/cmsis_dap.c |  9 ---------
 src/jtag/drivers/cmsis_dap.h |  4 ++++
 4 files changed, 24 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository