summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/flash/nor/lpc2900.c2
-rw-r--r--src/flash/nor/stmsmi.c2
-rw-r--r--src/helper/fileio.h2
-rw-r--r--src/openocd.c2
-rw-r--r--src/target/arm_dpm.h4
-rw-r--r--src/target/mips32_pracc.h2
-rw-r--r--src/target/mips_ejtag.h2
-rw-r--r--src/target/target.c2
8 files changed, 9 insertions, 9 deletions
diff --git a/src/flash/nor/lpc2900.c b/src/flash/nor/lpc2900.c
index 1c1c90fd..7bb9f141 100644
--- a/src/flash/nor/lpc2900.c
+++ b/src/flash/nor/lpc2900.c
@@ -184,7 +184,7 @@ static uint32_t lpc2900_run_bist128(struct flash_bank *bank,
uint32_t addr_from, uint32_t addr_to,
uint32_t (*signature)[4] );
static uint32_t lpc2900_address2sector(struct flash_bank *bank, uint32_t offset);
-static uint32_t lpc2900_calc_tr( uint32_t clock, uint32_t time );
+static uint32_t lpc2900_calc_tr(uint32_t clock_var, uint32_t time_var);
/*********************** Helper functions **************************/
diff --git a/src/flash/nor/stmsmi.c b/src/flash/nor/stmsmi.c
index c9a16726..d298b368 100644
--- a/src/flash/nor/stmsmi.c
+++ b/src/flash/nor/stmsmi.c
@@ -202,7 +202,7 @@ FLASH_BANK_COMMAND_HANDLER(stmsmi_flash_bank_command)
{
struct stmsmi_flash_bank *stmsmi_info;
- LOG_DEBUG(__FUNCTION__);
+ LOG_DEBUG("%s", __FUNCTION__);
if (CMD_ARGC < 6)
{
diff --git a/src/helper/fileio.h b/src/helper/fileio.h
index fa499ab7..f37dbd14 100644
--- a/src/helper/fileio.h
+++ b/src/helper/fileio.h
@@ -53,7 +53,7 @@ struct fileio
};
int fileio_open(struct fileio *fileio,
- const char *url, enum fileio_access access, enum fileio_type type);
+ const char *url, enum fileio_access access_type, enum fileio_type type);
int fileio_close(struct fileio *fileio);
int fileio_seek(struct fileio *fileio, size_t position);
diff --git a/src/openocd.c b/src/openocd.c
index 109f0e19..62b22389 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -267,7 +267,7 @@ struct command_context *setup_command_handler(Jim_Interp *interp)
struct command_context *cmd_ctx = command_init(startup, interp);
/* register subsystem commands */
- typedef int (*command_registrant_t)(struct command_context *cmd_ctx);
+ typedef int (*command_registrant_t)(struct command_context *cmd_ctx_value);
static const command_registrant_t command_registrants[] = {
&openocd_register_commands,
&server_register_commands,
diff --git a/src/target/arm_dpm.h b/src/target/arm_dpm.h
index 5d75ed41..e180807f 100644
--- a/src/target/arm_dpm.h
+++ b/src/target/arm_dpm.h
@@ -100,7 +100,7 @@ struct arm_dpm {
* must currently be disabled. Indices 0..15 are used for
* breakpoints; indices 16..31 are for watchpoints.
*/
- int (*bpwp_enable)(struct arm_dpm *, unsigned index,
+ int (*bpwp_enable)(struct arm_dpm *, unsigned index_value,
uint32_t addr, uint32_t control);
/**
@@ -108,7 +108,7 @@ struct arm_dpm {
* hardware control registers. Indices are the same ones
* accepted by bpwp_enable().
*/
- int (*bpwp_disable)(struct arm_dpm *, unsigned index);
+ int (*bpwp_disable)(struct arm_dpm *, unsigned index_value);
/* The breakpoint and watchpoint arrays are private to the
* DPM infrastructure. There are nbp indices in the dbp
diff --git a/src/target/mips32_pracc.h b/src/target/mips32_pracc.h
index f2c26800..b207a5be 100644
--- a/src/target/mips32_pracc.h
+++ b/src/target/mips32_pracc.h
@@ -45,7 +45,7 @@ int mips32_pracc_read_mem(struct mips_ejtag *ejtag_info,
int mips32_pracc_write_mem(struct mips_ejtag *ejtag_info,
uint32_t addr, int size, int count, void *buf);
int mips32_pracc_fastdata_xfer(struct mips_ejtag *ejtag_info, struct working_area *source,
- int write, uint32_t addr, int count, uint32_t *buf);
+ int write_t, uint32_t addr, int count, uint32_t *buf);
int mips32_pracc_read_regs(struct mips_ejtag *ejtag_info, uint32_t *regs);
int mips32_pracc_write_regs(struct mips_ejtag *ejtag_info, uint32_t *regs);
diff --git a/src/target/mips_ejtag.h b/src/target/mips_ejtag.h
index 694cb344..a4430b6e 100644
--- a/src/target/mips_ejtag.h
+++ b/src/target/mips_ejtag.h
@@ -137,7 +137,7 @@ int mips_ejtag_exit_debug(struct mips_ejtag *ejtag_info);
int mips_ejtag_get_idcode(struct mips_ejtag *ejtag_info, uint32_t *idcode);
int mips_ejtag_drscan_32(struct mips_ejtag *ejtag_info, uint32_t *data);
int mips_ejtag_drscan_8(struct mips_ejtag *ejtag_info, uint32_t *data);
-int mips_ejtag_fastdata_scan(struct mips_ejtag *ejtag_info, int write, uint32_t *data);
+int mips_ejtag_fastdata_scan(struct mips_ejtag *ejtag_info, int write_t, uint32_t *data);
int mips_ejtag_init(struct mips_ejtag *ejtag_info);
int mips_ejtag_config_step(struct mips_ejtag *ejtag_info, int enable_step);
diff --git a/src/target/target.c b/src/target/target.c
index ba7aa576..a9bb8e85 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -2314,7 +2314,7 @@ COMMAND_HANDLER(handle_md_command)
bool physical=strcmp(CMD_ARGV[0], "phys")==0;
int (*fn)(struct target *target,
- uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer);
+ uint32_t address, uint32_t size_value, uint32_t count, uint8_t *buffer);
if (physical)
{
CMD_ARGC--;