Add target_bulk_write_memory wrapper:

- replaces all calls to target->type->bulk_write_memory.
- add documentation in target_s to warn not to invoke callback directly.


git-svn-id: svn://svn.berlios.de/openocd/trunk@1963 b42882b7-edfa-0310-969c-e2dbd0fdcd60
__archive__
zwelch 2009-05-31 09:39:04 +00:00
parent 9cb3af610a
commit 11edf22776
3 changed files with 22 additions and 3 deletions

View File

@ -140,8 +140,7 @@ static int orion_nand_fast_block_write(struct nand_device_s *device, u8 *data, i
/* copy data to target's memory */ /* copy data to target's memory */
target_buf = hw->copy_area->address + code_size; target_buf = hw->copy_area->address + code_size;
retval = target->type->bulk_write_memory(target, target_buf, retval = target_bulk_write_memory(target, target_buf, size/4, data);
size/4, data);
if (retval == ERROR_OK && size & 3) { if (retval == ERROR_OK && size & 3) {
retval = target_write_memory(target, retval = target_write_memory(target,
target_buf + (size & ~3), target_buf + (size & ~3),

View File

@ -536,6 +536,12 @@ int target_write_memory(struct target_s *target,
{ {
return target->type->write_memory(target, address, size, count, buffer); return target->type->write_memory(target, address, size, count, buffer);
} }
int target_bulk_write_memory(struct target_s *target,
u32 address, u32 count, u8 *buffer)
{
return target->type->bulk_write_memory(target, address, count, buffer);
}
int target_run_algorithm(struct target_s *target, int target_run_algorithm(struct target_s *target,
int num_mem_params, mem_param_t *mem_params, int num_mem_params, mem_param_t *mem_params,

View File

@ -179,7 +179,11 @@ typedef struct target_type_s
*/ */
int (*write_memory)(struct target_s *target, u32 address, u32 size, u32 count, u8 *buffer); int (*write_memory)(struct target_s *target, u32 address, u32 size, u32 count, u8 *buffer);
/* write target memory in multiples of 4 byte, optimized for writing large quantities of data */ /**
* Write target memory in multiples of 4 bytes, optimized for
* writing large quantities of data. Do @b not call this
* function directly, use target_bulk_write_memory() instead.
*/
int (*bulk_write_memory)(struct target_s *target, u32 address, u32 count, u8 *buffer); int (*bulk_write_memory)(struct target_s *target, u32 address, u32 count, u8 *buffer);
int (*checksum_memory)(struct target_s *target, u32 address, u32 count, u32* checksum); int (*checksum_memory)(struct target_s *target, u32 address, u32 count, u32* checksum);
@ -424,6 +428,16 @@ extern int target_read_memory(struct target_s *target,
extern int target_write_memory(struct target_s *target, extern int target_write_memory(struct target_s *target,
u32 address, u32 size, u32 count, u8 *buffer); u32 address, u32 size, u32 count, u8 *buffer);
/**
* Write @count items of 4 bytes to the memory of @a target at
* the @a address given. Because it operates only on whole words,
* this should be faster than target_write_memory().
*
* This routine is wrapper for target->type->bulk_write_memory.
*/
extern int target_bulk_write_memory(struct target_s *target,
u32 address, u32 count, u8 *buffer);
extern int target_write_buffer(struct target_s *target, u32 address, u32 size, u8 *buffer); extern int target_write_buffer(struct target_s *target, u32 address, u32 size, u8 *buffer);
extern int target_read_buffer(struct target_s *target, u32 address, u32 size, u8 *buffer); extern int target_read_buffer(struct target_s *target, u32 address, u32 size, u8 *buffer);
extern int target_checksum_memory(struct target_s *target, u32 address, u32 size, u32* crc); extern int target_checksum_memory(struct target_s *target, u32 address, u32 size, u32* crc);