imi415
/
openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Antonio Borneo 2021-11-17 22:15:20 +01:00
parent b5d1b719e5
commit b46cb18c91
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/flash/nor/stm32f1x.c
View File

@ -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,

8
src/flash/nor/stm32f2x.c
View File

@ -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,

8
src/flash/nor/stm32h7x.c
View File

@ -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,

6
src/target/arm_dap.c
View File

@ -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;

4
src/target/hla_target.c
View File

@ -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,