interesting
/
riscv-openocd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

target: Add default implementation of bulk_write_memory 

Remove dummy implementations from all targets except arm7_9 and mips, which
are the only ones with real implementations. Replace with a single default
implementation simply calling target_write_memory().

Change-Id: I9228104240bc0b50661be20bc7909713ccda2164
Signed-off-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Reviewed-on: http://openocd.zylin.com/1213
Tested-by: jenkins
Reviewed-by: Øyvind Harboe <oyvindharboe@gmail.com>
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
This commit is contained in:
Andreas Fritiofson 2013-03-08 01:17:18 +01:00 committed by Spencer Oliver
parent 13288a44be
commit 4315142ea0
9 changed files with 9 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/target/arm11.c
View File

@ -1038,18 +1038,6 @@ static int arm11_write_memory(struct target *target,
count, buffer, count == 1); count, buffer, count == 1);
} }
/* write target memory in multiples of 4 byte, optimized for writing large quantities of data */
static int arm11_bulk_write_memory(struct target *target,
uint32_t address, uint32_t count, const uint8_t *buffer)
{
if (target->state != TARGET_HALTED) {
LOG_WARNING("target was not halted");
return ERROR_TARGET_NOT_HALTED;
}
return arm11_write_memory(target, address, 4, count, buffer);
}
/* target break-/watchpoint control /* target break-/watchpoint control
* rw: 0 = write, 1 = read, 2 = access * rw: 0 = write, 1 = read, 2 = access
*/ */
@ -1366,8 +1354,6 @@ struct target_type arm11_target = {
.read_memory = arm11_read_memory, .read_memory = arm11_read_memory,
.write_memory = arm11_write_memory, .write_memory = arm11_write_memory,
.bulk_write_memory = arm11_bulk_write_memory,
.checksum_memory = arm_checksum_memory, .checksum_memory = arm_checksum_memory,
.blank_check_memory = arm_blank_check_memory, .blank_check_memory = arm_blank_check_memory,

10
src/target/avr32_ap7k.c
View File

@ -566,15 +566,6 @@ static int avr32_ap7k_examine(struct target *target)
return ERROR_OK; return ERROR_OK;
} }
static int avr32_ap7k_bulk_write_memory(struct target *target, uint32_t address,
uint32_t count, const uint8_t *buffer)
{
LOG_ERROR("%s: implement me", __func__);
return ERROR_OK;
}
int avr32_ap7k_arch_state(struct target *target) int avr32_ap7k_arch_state(struct target *target)
{ {
struct avr32_ap7k_common *ap7k = target_to_ap7k(target); struct avr32_ap7k_common *ap7k = target_to_ap7k(target);
@ -630,7 +621,6 @@ struct target_type avr32_ap7k_target = {
.read_memory = avr32_ap7k_read_memory, .read_memory = avr32_ap7k_read_memory,
.write_memory = avr32_ap7k_write_memory, .write_memory = avr32_ap7k_write_memory,
.bulk_write_memory = avr32_ap7k_bulk_write_memory,
/* .checksum_memory = avr32_ap7k_checksum_memory, */ /* .checksum_memory = avr32_ap7k_checksum_memory, */
/* .blank_check_memory = avr32_ap7k_blank_check_memory, */ /* .blank_check_memory = avr32_ap7k_blank_check_memory, */

7
src/target/cortex_a.c
View File

@ -2340,12 +2340,6 @@ static int cortex_a8_write_memory(struct target *target, uint32_t address,
return retval; return retval;
} }
static int cortex_a8_bulk_write_memory(struct target *target, uint32_t address,
uint32_t count, const uint8_t *buffer)
{
return cortex_a8_write_memory(target, address, 4, count, buffer);
}
static int cortex_a8_handle_target_request(void *priv) static int cortex_a8_handle_target_request(void *priv)
{ {
struct target *target = priv; struct target *target = priv;
@ -2782,7 +2776,6 @@ struct target_type cortexa8_target = {
.read_memory = cortex_a8_read_memory, .read_memory = cortex_a8_read_memory,
.write_memory = cortex_a8_write_memory, .write_memory = cortex_a8_write_memory,
.bulk_write_memory = cortex_a8_bulk_write_memory,
.checksum_memory = arm_checksum_memory, .checksum_memory = arm_checksum_memory,
.blank_check_memory = arm_blank_check_memory, .blank_check_memory = arm_blank_check_memory,

7
src/target/cortex_m.c
View File

@ -1664,12 +1664,6 @@ static int cortex_m3_write_memory(struct target *target, uint32_t address,
return retval; return retval;
} }
static int cortex_m3_bulk_write_memory(struct target *target, uint32_t address,
uint32_t count, const uint8_t *buffer)
{
return cortex_m3_write_memory(target, address, 4, count, buffer);
}
static int cortex_m3_init_target(struct command_context *cmd_ctx, static int cortex_m3_init_target(struct command_context *cmd_ctx,
struct target *target) struct target *target)
{ {
@ -2285,7 +2279,6 @@ struct target_type cortexm3_target = {
.read_memory = cortex_m3_read_memory, .read_memory = cortex_m3_read_memory,
.write_memory = cortex_m3_write_memory, .write_memory = cortex_m3_write_memory,
.bulk_write_memory = cortex_m3_bulk_write_memory,
.checksum_memory = armv7m_checksum_memory, .checksum_memory = armv7m_checksum_memory,
.blank_check_memory = armv7m_blank_check_memory, .blank_check_memory = armv7m_blank_check_memory,

10
src/target/dsp563xx.c
View File

@ -1814,15 +1814,6 @@ static int dsp563xx_write_buffer_default(struct target *target,
buffer); buffer);
} }
static int dsp563xx_bulk_write_memory_default(struct target *target,
uint32_t address,
uint32_t count,
const uint8_t *buffer)
{
return dsp563xx_write_memory(target,
dsp563xx_get_default_memory(), address, 4, count, buffer);
}
static int dsp563xx_add_breakpoint(struct target *target, struct breakpoint *breakpoint) static int dsp563xx_add_breakpoint(struct target *target, struct breakpoint *breakpoint)
{ {
return ERROR_OK; return ERROR_OK;
@ -2055,7 +2046,6 @@ struct target_type dsp563xx_target = {
.read_memory = dsp563xx_read_memory_default, .read_memory = dsp563xx_read_memory_default,
.write_memory = dsp563xx_write_memory_default, .write_memory = dsp563xx_write_memory_default,
.bulk_write_memory = dsp563xx_bulk_write_memory_default,
.read_buffer = dsp563xx_read_buffer_default, .read_buffer = dsp563xx_read_buffer_default,
.write_buffer = dsp563xx_write_buffer_default, .write_buffer = dsp563xx_write_buffer_default,

8
src/target/dsp5680xx.c
View File

@ -1470,13 +1470,6 @@ static int dsp5680xx_write(struct target *t, uint32_t a, uint32_t s, uint32_t c,
return retval; return retval;
} }
static int dsp5680xx_bulk_write_memory(struct target *t, uint32_t a,
uint32_t al, const uint8_t *b)
{
LOG_ERROR("Not implemented yet.");
return ERROR_FAIL;
}
static int dsp5680xx_write_buffer(struct target *t, uint32_t a, uint32_t size, static int dsp5680xx_write_buffer(struct target *t, uint32_t a, uint32_t size,
const uint8_t *b) const uint8_t *b)
{ {
@ -2300,7 +2293,6 @@ struct target_type dsp5680xx_target = {
.read_memory = dsp5680xx_read, .read_memory = dsp5680xx_read,
.write_memory = dsp5680xx_write, .write_memory = dsp5680xx_write,
.bulk_write_memory = dsp5680xx_bulk_write_memory,
.checksum_memory = dsp5680xx_checksum_memory, .checksum_memory = dsp5680xx_checksum_memory,

8
src/target/hla_target.c
View File

@ -777,13 +777,6 @@ static int adapter_write_memory(struct target *target, uint32_t address,
return ERROR_OK; return ERROR_OK;
} }
static int adapter_bulk_write_memory(struct target *target,
uint32_t address, uint32_t count,
const uint8_t *buffer)
{
return adapter_write_memory(target, address, 4, count, buffer);
}
static const struct command_registration adapter_command_handlers[] = { static const struct command_registration adapter_command_handlers[] = {
{ {
.chain = arm_command_handlers, .chain = arm_command_handlers,
@ -815,7 +808,6 @@ struct target_type hla_target = {
.read_memory = adapter_read_memory, .read_memory = adapter_read_memory,
.write_memory = adapter_write_memory, .write_memory = adapter_write_memory,
.bulk_write_memory = adapter_bulk_write_memory,
.checksum_memory = armv7m_checksum_memory, .checksum_memory = armv7m_checksum_memory,
.blank_check_memory = armv7m_blank_check_memory, .blank_check_memory = armv7m_blank_check_memory,

9
src/target/target.c
View File

@ -976,6 +976,12 @@ int target_bulk_write_memory(struct target *target,
return target->type->bulk_write_memory(target, address, count, buffer); return target->type->bulk_write_memory(target, address, count, buffer);
} }
static int target_bulk_write_memory_default(struct target *target,
uint32_t address, uint32_t count, const uint8_t *buffer)
{
return target_write_memory(target, address, 4, count, buffer);
}
int target_add_breakpoint(struct target *target, int target_add_breakpoint(struct target *target,
struct breakpoint *breakpoint) struct breakpoint *breakpoint)
{ {
@ -1121,6 +1127,9 @@ static int target_init_one(struct command_context *cmd_ctx,
if (target->type->write_buffer == NULL) if (target->type->write_buffer == NULL)
target->type->write_buffer = target_write_buffer_default; target->type->write_buffer = target_write_buffer_default;
if (target->type->bulk_write_memory == NULL)
target->type->bulk_write_memory = target_bulk_write_memory_default;
return ERROR_OK; return ERROR_OK;
} }

7
src/target/xscale.c
View File

@ -1970,12 +1970,6 @@ static int xscale_write_phys_memory(struct target *target, uint32_t address,
return ERROR_FAIL; return ERROR_FAIL;
} }
static int xscale_bulk_write_memory(struct target *target, uint32_t address,
uint32_t count, const uint8_t *buffer)
{
return xscale_write_memory(target, address, 4, count, buffer);
}
static int xscale_get_ttb(struct target *target, uint32_t *result) static int xscale_get_ttb(struct target *target, uint32_t *result)
{ {
struct xscale_common *xscale = target_to_xscale(target); struct xscale_common *xscale = target_to_xscale(target);
@ -3697,7 +3691,6 @@ struct target_type xscale_target = {
.read_phys_memory = xscale_read_phys_memory, .read_phys_memory = xscale_read_phys_memory,
.write_memory = xscale_write_memory, .write_memory = xscale_write_memory,
.write_phys_memory = xscale_write_phys_memory, .write_phys_memory = xscale_write_phys_memory,
.bulk_write_memory = xscale_bulk_write_memory,
.checksum_memory = arm_checksum_memory, .checksum_memory = arm_checksum_memory,
.blank_check_memory = arm_blank_check_memory, .blank_check_memory = arm_blank_check_memory,