diff options
| author | zwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-05-31 09:37:35 +0000 |
|---|---|---|
| committer | zwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-05-31 09:37:35 +0000 |
| commit | b6db182c0020051e0dc642ca0b1040ea7453dcd0 (patch) | |
| tree | 17a4074984d6f72033f252e2e3361fd90cc8b96e /src/flash/mflash.c | |
| parent | 678519311834fd7a1126f8d217c734d4f5ffbb3d (diff) | |
| download | openocd+libswd-b6db182c0020051e0dc642ca0b1040ea7453dcd0.tar.gz openocd+libswd-b6db182c0020051e0dc642ca0b1040ea7453dcd0.tar.bz2 openocd+libswd-b6db182c0020051e0dc642ca0b1040ea7453dcd0.tar.xz openocd+libswd-b6db182c0020051e0dc642ca0b1040ea7453dcd0.zip | |
Add target_read_memory wrapper:
- replaces all calls to target->type->read_memory.
- add documentation in target_s to warn not to invoke callback directly.
git-svn-id: svn://svn.berlios.de/openocd/trunk@1959 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/flash/mflash.c')
| -rw-r--r-- | src/flash/mflash.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/flash/mflash.c b/src/flash/mflash.c index 47c73382..cc1d1ee2 100644 --- a/src/flash/mflash.c +++ b/src/flash/mflash.c @@ -345,7 +345,7 @@ static int mg_dsk_drv_info(void) if (! mflash_bank->drv_info) mflash_bank->drv_info = malloc(sizeof(mg_drv_info_t)); - target->type->read_memory(target, mg_buff, 2, sizeof(mg_io_type_drv_info) >> 1, + target_read_memory(target, mg_buff, 2, sizeof(mg_io_type_drv_info) >> 1, (u8 *)&mflash_bank->drv_info->drv_id); mflash_bank->drv_info->tot_sects = (u32)(mflash_bank->drv_info->drv_id.total_user_addressable_sectors_hi << 16) @@ -428,7 +428,7 @@ static int mg_mflash_do_read_sects(void *buff, u32 sect_num, u32 sect_cnt) for (i = 0; i < sect_cnt; i++) { mg_dsk_wait(mg_io_wait_drq, MG_OEM_DISK_WAIT_TIME_NORMAL); - target->type->read_memory(target, address, 2, MG_MFLASH_SECTOR_SIZE / 2, buff_ptr); + target_read_memory(target, address, 2, MG_MFLASH_SECTOR_SIZE / 2, buff_ptr); buff_ptr += MG_MFLASH_SECTOR_SIZE; target_write_u8(target, mflash_bank->base + MG_REG_OFFSET + MG_REG_COMMAND, mg_io_cmd_confirm_read); @@ -932,7 +932,7 @@ static int mg_verify_interface(void) memset(buff, 0xff, MG_MFLASH_SECTOR_SIZE); - target->type->read_memory(target, address, 2, + target_read_memory(target, address, 2, MG_MFLASH_SECTOR_SIZE / 2, (u8 *)buff); for (i = 0; i < MG_MFLASH_SECTOR_SIZE >> 1; i++) { |