diff options
| author | Antonio Borneo <borneo.antonio@gmail.com> | 2020-07-30 21:36:39 +0200 |
|---|---|---|
| committer | Tomas Vanek <vanekt@fbl.cz> | 2020-11-15 21:38:29 +0000 |
| commit | 9c314578750324b8d46cdbe0801d3cdfc25c4a4c (patch) | |
| tree | e5a9c5362618069225f2de2545245d79e886cdf5 /src | |
| parent | e6770f1ab6b9a34dbe90d3fa6ae4093914a0d707 (diff) | |
| download | riscv-openocd-9c314578750324b8d46cdbe0801d3cdfc25c4a4c.zip riscv-openocd-9c314578750324b8d46cdbe0801d3cdfc25c4a4c.tar.gz riscv-openocd-9c314578750324b8d46cdbe0801d3cdfc25c4a4c.tar.bz2 | |
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/jtag/drivers/cmsis_dap.c | 9 | ||||
| -rw-r--r-- | src/jtag/drivers/cmsis_dap.h | 4 |
2 files changed, 4 insertions, 9 deletions
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 |