From ee3af96a736139b71678a0e590865f9ffafc2f35 Mon Sep 17 00:00:00 2001 From: Gareth McMullin Date: Sun, 15 Mar 2015 14:31:57 -0700 Subject: Consolidate target_mem_read* and target_mem_write* methods. There are now only mem_read and mem_write, that must handle all alignments. These methods return void, errors must be checked with target_check_error.--- src/include/target.h | 39 ++++++++------------------------------- 1 file changed, 8 insertions(+), 31 deletions(-) (limited to 'src/include') diff --git a/src/include/target.h b/src/include/target.h index 5db79a7..b48e054 100644 --- a/src/include/target.h +++ b/src/include/target.h @@ -48,24 +48,11 @@ target *target_attach(target *t, target_destroy_callback destroy_cb); (target)->check_error(target) /* Memory access functions */ -#define target_mem_read_words(target, dest, src, len) \ - (target)->mem_read_words((target), (dest), (src), (len)) - -#define target_mem_write_words(target, dest, src, len) \ - (target)->mem_write_words((target), (dest), (src), (len)) - -#define target_mem_read_halfwords(target, dest, src, len) \ - (target)->mem_read_halfwords((target), (dest), (src), (len)) - -#define target_mem_write_halfwords(target, dest, src, len) \ - (target)->mem_write_halfwords((target), (dest), (src), (len)) - -#define target_mem_read_bytes(target, dest, src, len) \ - (target)->mem_read_bytes((target), (dest), (src), (len)) - -#define target_mem_write_bytes(target, dest, src, len) \ - (target)->mem_write_bytes((target), (dest), (src), (len)) +#define target_mem_read(target, dest, src, len) \ + (target)->mem_read((target), (dest), (src), (len)) +#define target_mem_write(target, dest, src, len) \ + (target)->mem_write((target), (dest), (src), (len)) /* Register access functions */ #define target_regs_read(target, data) \ @@ -135,20 +122,10 @@ struct target_s { int (*check_error)(struct target_s *target); /* Memory access functions */ - int (*mem_read_words)(struct target_s *target, uint32_t *dest, uint32_t src, - int len); - int (*mem_write_words)(struct target_s *target, uint32_t dest, - const uint32_t *src, int len); - - int (*mem_read_halfwords)(struct target_s *target, uint16_t *dest, uint32_t src, - int len); - int (*mem_write_halfwords)(struct target_s *target, uint32_t dest, - const uint16_t *src, int len); - - int (*mem_read_bytes)(struct target_s *target, uint8_t *dest, uint32_t src, - int len); - int (*mem_write_bytes)(struct target_s *target, uint32_t dest, - const uint8_t *src, int len); + void (*mem_read)(struct target_s *target, void *dest, uint32_t src, + size_t len); + void (*mem_write)(struct target_s *target, uint32_t dest, + const void *src, size_t len); /* Register access functions */ int regs_size; -- cgit v1.2.3