interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/5790
Tested-by: jenkins
Reviewed-by: Tarek BOCHKATI <tarek.bouchkati@gmail.com>
Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
This commit is contained in:
Antonio Borneo 2020-07-30 21:36:39 +02:00 committed by Tomas Vanek
parent e6770f1ab6
commit 9c31457875
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/jtag/drivers/cmsis_dap.c
View File

@ -43,15 +43,6 @@
#include "cmsis_dap.h" #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[] = { static const struct cmsis_dap_backend *const cmsis_dap_backends[] = {
#if BUILD_CMSIS_DAP_USB == 1 #if BUILD_CMSIS_DAP_USB == 1
&cmsis_dap_usb_backend, &cmsis_dap_usb_backend,

4
src/jtag/drivers/cmsis_dap.h
View File

@ -25,4 +25,8 @@ struct cmsis_dap_backend {
int (*write)(struct cmsis_dap *dap, int len, int timeout_ms); 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 #endif