char *write_buffer;
int max_packet;
int read_count;
+ uint32_t max_rw_packet; /* max X packet (read/write memory) transfers */
};
-static int icdi_usb_read_mem32(void *handle, uint32_t addr, uint16_t len, uint8_t *buffer);
-static int icdi_usb_write_mem32(void *handle, uint32_t addr, uint16_t len, const uint8_t *buffer);
+static int icdi_usb_read_mem(void *handle, uint32_t addr, uint32_t size,
+ uint32_t count, uint8_t *buffer);
+static int icdi_usb_write_mem(void *handle, uint32_t addr, uint32_t size,
+ uint32_t count, const uint8_t *buffer);
static int remote_escape_output(const char *buffer, int len, char *out_buf, int *out_len, int out_maxlen)
{
static int icdi_usb_idcode(void *handle, uint32_t *idcode)
{
+ *idcode = 0;
return ERROR_OK;
}
static int icdi_usb_write_debug_reg(void *handle, uint32_t addr, uint32_t val)
{
- return icdi_usb_write_mem32(handle, addr, 1, (uint8_t *)&val);
+ return icdi_usb_write_mem(handle, addr, 4, 1, (uint8_t *)&val);
}
static enum target_state icdi_usb_state(void *handle)
h = (struct icdi_usb_handle_s *)handle;
- result = icdi_usb_read_mem32(h, DCB_DHCSR, 1, (uint8_t *)&dhcsr);
+ result = icdi_usb_read_mem(h, DCB_DHCSR, 4, 1, (uint8_t *)&dhcsr);
if (result != ERROR_OK)
return TARGET_UNKNOWN;
return result;
}
-static int icdi_usb_read_mem(void *handle, uint32_t addr, uint32_t len, uint8_t *buffer)
+static int icdi_usb_read_mem_int(void *handle, uint32_t addr, uint32_t len, uint8_t *buffer)
{
int result;
struct icdi_usb_handle_s *h;
return ERROR_OK;
}
-static int icdi_usb_write_mem(void *handle, uint32_t addr, uint32_t len, const uint8_t *buffer)
+static int icdi_usb_write_mem_int(void *handle, uint32_t addr, uint32_t len, const uint8_t *buffer)
{
int result;
struct icdi_usb_handle_s *h;
return ERROR_OK;
}
-static int icdi_usb_read_mem8(void *handle, uint32_t addr, uint16_t len, uint8_t *buffer)
+static int icdi_usb_read_mem(void *handle, uint32_t addr, uint32_t size,
+ uint32_t count, uint8_t *buffer)
{
- return icdi_usb_read_mem(handle, addr, len, buffer);
-}
+ int retval = ERROR_OK;
+ struct icdi_usb_handle_s *h = (struct icdi_usb_handle_s *)handle;
+ uint32_t bytes_remaining;
-static int icdi_usb_write_mem8(void *handle, uint32_t addr, uint16_t len, const uint8_t *buffer)
-{
- return icdi_usb_write_mem(handle, addr, len, buffer);
-}
+ /* calculate byte count */
+ count *= size;
-static int icdi_usb_read_mem32(void *handle, uint32_t addr, uint16_t len, uint8_t *buffer)
-{
- return icdi_usb_read_mem(handle, addr, len * 4, buffer);
+ while (count) {
+
+ bytes_remaining = h->max_rw_packet;
+ if (count < bytes_remaining)
+ bytes_remaining = count;
+
+ retval = icdi_usb_read_mem_int(handle, addr, bytes_remaining, buffer);
+ if (retval != ERROR_OK)
+ return retval;
+
+ buffer += bytes_remaining;
+ addr += bytes_remaining;
+ count -= bytes_remaining;
+ }
+
+ return retval;
}
-static int icdi_usb_write_mem32(void *handle, uint32_t addr, uint16_t len, const uint8_t *buffer)
+static int icdi_usb_write_mem(void *handle, uint32_t addr, uint32_t size,
+ uint32_t count, const uint8_t *buffer)
{
- return icdi_usb_write_mem(handle, addr, len * 4, buffer);
+ int retval = ERROR_OK;
+ struct icdi_usb_handle_s *h = (struct icdi_usb_handle_s *)handle;
+ uint32_t bytes_remaining;
+
+ /* calculate byte count */
+ count *= size;
+
+ while (count) {
+
+ bytes_remaining = h->max_rw_packet;
+ if (count < bytes_remaining)
+ bytes_remaining = count;
+
+ retval = icdi_usb_write_mem_int(handle, addr, bytes_remaining, buffer);
+ if (retval != ERROR_OK)
+ return retval;
+
+ buffer += bytes_remaining;
+ addr += bytes_remaining;
+ count -= bytes_remaining;
+ }
+
+ return retval;
}
static int icdi_usb_close(void *handle)
* as we are using gdb binary packets to transfer memory we have to
* reserve half the buffer for any possible escape chars plus
* at least 64 bytes for the gdb packet header */
- param->max_buffer = (((h->max_packet - 64) / 4) * 4) / 2;
+ h->max_rw_packet = (((h->max_packet - 64) / 4) * 4) / 2;
return ERROR_OK;
.read_regs = icdi_usb_read_regs,
.read_reg = icdi_usb_read_reg,
.write_reg = icdi_usb_write_reg,
- .read_mem8 = icdi_usb_read_mem8,
- .write_mem8 = icdi_usb_write_mem8,
- .read_mem32 = icdi_usb_read_mem32,
- .write_mem32 = icdi_usb_write_mem32,
+ .read_mem = icdi_usb_read_mem,
+ .write_mem = icdi_usb_write_mem,
.write_debug_reg = icdi_usb_write_debug_reg
};