diff options
author | Antonio Borneo <borneo.antonio@gmail.com> | 2021-11-17 22:15:20 +0100 |
---|---|---|
committer | Antonio Borneo <borneo.antonio@gmail.com> | 2021-11-23 11:04:02 +0000 |
commit | b46cb18c91372bf32c0a946ce739884e4e42497c (patch) | |
tree | 5c8cd9fc31f8a0477de82d1823e96327157f84fb | |
parent | b5d1b719e5a4a248d99921ebfd1298dcb473d1c1 (diff) | |
download | riscv-openocd-b46cb18c91372bf32c0a946ce739884e4e42497c.zip riscv-openocd-b46cb18c91372bf32c0a946ce739884e4e42497c.tar.gz riscv-openocd-b46cb18c91372bf32c0a946ce739884e4e42497c.tar.bz2 |
openocd: use unique name for struct command_registration
Just to avoid name clash when comparing documentation with
registered commands through scripts.
Change-Id: I8832545d8d9236ea5dabe6e73732f51e5246caff
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: https://review.openocd.org/c/openocd/+/6717
Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
Tested-by: jenkins
-rw-r--r-- | src/flash/nor/stm32f1x.c | 8 | ||||
-rw-r--r-- | src/flash/nor/stm32f2x.c | 8 | ||||
-rw-r--r-- | src/flash/nor/stm32h7x.c | 8 | ||||
-rw-r--r-- | src/target/arm_dap.c | 6 | ||||
-rw-r--r-- | src/target/hla_target.c | 4 |
5 files changed, 17 insertions, 17 deletions
diff --git a/src/flash/nor/stm32f1x.c b/src/flash/nor/stm32f1x.c index 6744779..90cee64 100644 --- a/src/flash/nor/stm32f1x.c +++ b/src/flash/nor/stm32f1x.c @@ -1545,7 +1545,7 @@ COMMAND_HANDLER(stm32x_handle_mass_erase_command) return retval; } -static const struct command_registration stm32x_exec_command_handlers[] = { +static const struct command_registration stm32f1x_exec_command_handlers[] = { { .name = "lock", .handler = stm32x_handle_lock_command, @@ -1593,20 +1593,20 @@ static const struct command_registration stm32x_exec_command_handlers[] = { COMMAND_REGISTRATION_DONE }; -static const struct command_registration stm32x_command_handlers[] = { +static const struct command_registration stm32f1x_command_handlers[] = { { .name = "stm32f1x", .mode = COMMAND_ANY, .help = "stm32f1x flash command group", .usage = "", - .chain = stm32x_exec_command_handlers, + .chain = stm32f1x_exec_command_handlers, }, COMMAND_REGISTRATION_DONE }; const struct flash_driver stm32f1x_flash = { .name = "stm32f1x", - .commands = stm32x_command_handlers, + .commands = stm32f1x_command_handlers, .flash_bank_command = stm32x_flash_bank_command, .erase = stm32x_erase, .protect = stm32x_protect, diff --git a/src/flash/nor/stm32f2x.c b/src/flash/nor/stm32f2x.c index e80928d..d3e7d70 100644 --- a/src/flash/nor/stm32f2x.c +++ b/src/flash/nor/stm32f2x.c @@ -1747,7 +1747,7 @@ COMMAND_HANDLER(stm32x_handle_otp_command) return retval; } -static const struct command_registration stm32x_exec_command_handlers[] = { +static const struct command_registration stm32f2x_exec_command_handlers[] = { { .name = "lock", .handler = stm32x_handle_lock_command, @@ -1800,20 +1800,20 @@ static const struct command_registration stm32x_exec_command_handlers[] = { COMMAND_REGISTRATION_DONE }; -static const struct command_registration stm32x_command_handlers[] = { +static const struct command_registration stm32f2x_command_handlers[] = { { .name = "stm32f2x", .mode = COMMAND_ANY, .help = "stm32f2x flash command group", .usage = "", - .chain = stm32x_exec_command_handlers, + .chain = stm32f2x_exec_command_handlers, }, COMMAND_REGISTRATION_DONE }; const struct flash_driver stm32f2x_flash = { .name = "stm32f2x", - .commands = stm32x_command_handlers, + .commands = stm32f2x_command_handlers, .flash_bank_command = stm32x_flash_bank_command, .erase = stm32x_erase, .protect = stm32x_protect, diff --git a/src/flash/nor/stm32h7x.c b/src/flash/nor/stm32h7x.c index a3e3043..d3f17b2 100644 --- a/src/flash/nor/stm32h7x.c +++ b/src/flash/nor/stm32h7x.c @@ -1151,7 +1151,7 @@ COMMAND_HANDLER(stm32x_handle_option_write_command) return stm32x_modify_option(bank, reg_offset, value, mask); } -static const struct command_registration stm32x_exec_command_handlers[] = { +static const struct command_registration stm32h7x_exec_command_handlers[] = { { .name = "lock", .handler = stm32x_handle_lock_command, @@ -1190,20 +1190,20 @@ static const struct command_registration stm32x_exec_command_handlers[] = { COMMAND_REGISTRATION_DONE }; -static const struct command_registration stm32x_command_handlers[] = { +static const struct command_registration stm32h7x_command_handlers[] = { { .name = "stm32h7x", .mode = COMMAND_ANY, .help = "stm32h7x flash command group", .usage = "", - .chain = stm32x_exec_command_handlers, + .chain = stm32h7x_exec_command_handlers, }, COMMAND_REGISTRATION_DONE }; const struct flash_driver stm32h7x_flash = { .name = "stm32h7x", - .commands = stm32x_command_handlers, + .commands = stm32h7x_command_handlers, .flash_bank_command = stm32x_flash_bank_command, .erase = stm32x_erase, .protect = stm32x_protect, diff --git a/src/target/arm_dap.c b/src/target/arm_dap.c index 4728ce3..2dba45d 100644 --- a/src/target/arm_dap.c +++ b/src/target/arm_dap.c @@ -349,7 +349,7 @@ static int dap_create(struct jim_getopt_info *goi) goto err; } - struct command_registration dap_commands[] = { + struct command_registration dap_create_commands[] = { { .name = cp, .mode = COMMAND_ANY, @@ -362,9 +362,9 @@ static int dap_create(struct jim_getopt_info *goi) /* don't expose the instance commands when using hla */ if (transport_is_hla()) - dap_commands[0].chain = NULL; + dap_create_commands[0].chain = NULL; - e = register_commands_with_data(cmd_ctx, NULL, dap_commands, dap); + e = register_commands_with_data(cmd_ctx, NULL, dap_create_commands, dap); if (e != ERROR_OK) { e = JIM_ERR; goto err; diff --git a/src/target/hla_target.c b/src/target/hla_target.c index c67c9cc..a0f2d76 100644 --- a/src/target/hla_target.c +++ b/src/target/hla_target.c @@ -621,7 +621,7 @@ static int adapter_write_memory(struct target *target, target_addr_t address, return adapter->layout->api->write_mem(adapter->handle, address, size, count, buffer); } -static const struct command_registration adapter_command_handlers[] = { +static const struct command_registration hla_command_handlers[] = { { .chain = arm_command_handlers, }, @@ -647,7 +647,7 @@ struct target_type hla_target = { .target_create = adapter_target_create, .target_jim_configure = adiv5_jim_configure, .examine = cortex_m_examine, - .commands = adapter_command_handlers, + .commands = hla_command_handlers, .poll = adapter_poll, .arch_state = armv7m_arch_state, |