diff options
| author | Spencer Oliver <spen@spen-soft.co.uk> | 2013-09-11 21:31:50 +0100 |
|---|---|---|
| committer | Spencer Oliver <spen@spen-soft.co.uk> | 2013-09-25 13:53:19 +0000 |
| commit | 3a32dff0895b7f85d29d5f58a21f17851f0a220e (patch) | |
| tree | 81dd28ba5a870fedc729c686b39ea3aa2df178e9 /src/target/hla_target.c | |
| parent | 06fb3bf8cd3e14d8e1f32f6b6b5f586ef5d1857d (diff) | |
hla: cleanup read/write api
This is the first part in moving the adapter specific api back into the
driver.
The next task is to also move the hla read/write buffer size handling.
Change-Id: I86a19144b50b6de18659bfcd05b3729b2cafc051
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/1621
Tested-by: jenkins
Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Diffstat (limited to 'src/target/hla_target.c')
| -rw-r--r-- | src/target/hla_target.c | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/src/target/hla_target.c b/src/target/hla_target.c index 2db04f81..dc81ee89 100644 --- a/src/target/hla_target.c +++ b/src/target/hla_target.c @@ -259,8 +259,8 @@ static int adapter_examine_debug_reason(struct target *target) static int hl_dcc_read(struct hl_interface_s *hl_if, uint8_t *value, uint8_t *ctrl) { uint16_t dcrdr; - int retval = hl_if->layout->api->read_mem8(hl_if->fd, - DCB_DCRDR, sizeof(dcrdr), (uint8_t *)&dcrdr); + int retval = hl_if->layout->api->read_mem(hl_if->fd, + DCB_DCRDR, 1, sizeof(dcrdr), (uint8_t *)&dcrdr); if (retval == ERROR_OK) { *ctrl = (uint8_t)dcrdr; *value = (uint8_t)(dcrdr >> 8); @@ -272,8 +272,7 @@ static int hl_dcc_read(struct hl_interface_s *hl_if, uint8_t *value, uint8_t *ct * to signify we have read data */ /* atomically clear just the byte containing the busy bit */ static const uint8_t zero; - retval = hl_if->layout->api->write_mem8( - hl_if->fd, DCB_DCRDR, 1, &zero); + retval = hl_if->layout->api->write_mem(hl_if->fd, DCB_DCRDR, 1, 1, &zero); } } return retval; @@ -784,13 +783,7 @@ static int adapter_read_memory(struct target *target, uint32_t address, else c = count; - if (size != 4) - res = adapter->layout->api->read_mem8(adapter->fd, - address, c, buffer); - else - res = adapter->layout->api->read_mem32(adapter->fd, - address, c, buffer); - + res = adapter->layout->api->read_mem(adapter->fd, address, size, c, buffer); if (res != ERROR_OK) return res; @@ -832,13 +825,7 @@ static int adapter_write_memory(struct target *target, uint32_t address, else c = count; - if (size != 4) - res = adapter->layout->api->write_mem8(adapter->fd, - address, c, buffer); - else - res = adapter->layout->api->write_mem32(adapter->fd, - address, c, buffer); - + res = adapter->layout->api->write_mem(adapter->fd, address, size, c, buffer); if (res != ERROR_OK) return res; |