This is an automated email from Gerrit. Antonio Borneo ([email protected]) just uploaded a new patch set to Gerrit, which you can find at http://openocd.zylin.com/5790
-- gerrit commit 5df8dd0fd08ef8dbd824141b5ecb02168695c0c1 Author: Antonio Borneo <[email protected]> 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 <[email protected]> diff --git a/src/jtag/drivers/cmsis_dap.c b/src/jtag/drivers/cmsis_dap.c index 8ddb541..16480ae 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 8cbb8dd..054621c 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 -- _______________________________________________ OpenOCD-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openocd-devel
