hla: move memory read/write functionality to driver

[fw/openocd] / src / jtag / drivers / ti_icdi_usb.c

diff --git a/src/jtag/drivers/ti_icdi_usb.c b/src/jtag/drivers/ti_icdi_usb.c
index 672952237153e3aa6bc201888d0cd75b7094e73c..0d7d943bede0ed04734930860b4c3bb152d34b68 100644 (file)
--- a/src/jtag/drivers/ti_icdi_usb.c
+++ b/src/jtag/drivers/ti_icdi_usb.c
@@ -16,7 +16,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -33,7 +33,7 @@
 
 #include <target/cortex_m.h>
 
-#include <libusb-1.0/libusb.h>
+#include <libusb.h>
 
 #define ICDI_WRITE_ENDPOINT 0x02
 #define ICDI_READ_ENDPOINT 0x83
@@ -53,10 +53,13 @@ struct icdi_usb_handle_s {
        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)
 {
@@ -286,7 +289,7 @@ static int icdi_usb_idcode(void *handle, uint32_t *idcode)
 
 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)
@@ -297,7 +300,7 @@ 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;
 
@@ -346,6 +349,8 @@ static int icdi_usb_query(void *handle)
        h = (struct icdi_usb_handle_s *)handle;
 
        result = icdi_send_cmd(handle, "qSupported");
+       if (result != ERROR_OK)
+               return result;
 
        /* check result */
        result = icdi_get_cmd_result(handle);
@@ -383,6 +388,8 @@ static int icdi_usb_query(void *handle)
 
        /* set extended mode */
        result = icdi_send_cmd(handle, "!");
+       if (result != ERROR_OK)
+               return result;
 
        /* check result */
        result = icdi_get_cmd_result(handle);
@@ -412,6 +419,8 @@ static int icdi_usb_run(void *handle)
 
        /* resume target at current address */
        result = icdi_send_cmd(handle, "c");
+       if (result != ERROR_OK)
+               return result;
 
        /* check result */
        result = icdi_get_cmd_result(handle);
@@ -429,6 +438,8 @@ static int icdi_usb_halt(void *handle)
 
        /* this query halts the target ?? */
        result = icdi_send_cmd(handle, "?");
+       if (result != ERROR_OK)
+               return result;
 
        /* check result */
        result = icdi_get_cmd_result(handle);
@@ -446,6 +457,8 @@ static int icdi_usb_step(void *handle)
 
        /* step target at current address */
        result = icdi_send_cmd(handle, "s");
+       if (result != ERROR_OK)
+               return result;
 
        /* check result */
        result = icdi_get_cmd_result(handle);
@@ -514,7 +527,7 @@ static int icdi_usb_write_reg(void *handle, int num, uint32_t val)
        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;
@@ -544,7 +557,7 @@ static int icdi_usb_read_mem(void *handle, uint32_t addr, uint32_t len, uint8_t
        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;
@@ -577,24 +590,60 @@ static int icdi_usb_write_mem(void *handle, uint32_t addr, uint32_t len, const u
        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)
@@ -699,7 +748,7 @@ static int icdi_usb_open(struct hl_interface_param_s *param, void **fd)
         * 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;
 
@@ -722,9 +771,7 @@ struct hl_layout_api_s icdi_usb_layout_api = {
        .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
 };