adi_v5: Remove unnecessary MEM-AP access functions

[openocd] / src / target / arm_adi_v5.c

diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c
index 0ca0ecc64f1798ff6e497c5caf202758aee04fb5..41bd26153ffb0df984e90eb1ef595222e074667d 100644 (file)
--- a/src/target/arm_adi_v5.c
+++ b/src/target/arm_adi_v5.c
@@ -368,22 +368,6 @@ int mem_ap_write(struct adiv5_dap *dap, const uint8_t *buffer, uint32_t size, ui
        return retval;
 }
 
-/* Compatibility wrappers around mem_ap_write(). Note that the count is in bytes for these. */
-int mem_ap_write_buf_u32(struct adiv5_dap *dap, const uint8_t *buffer, int count, uint32_t address, bool addr_incr)
-{
-       return mem_ap_write(dap, buffer, 4, count / 4, address, true);
-}
-
-int mem_ap_write_buf_u16(struct adiv5_dap *dap, const uint8_t *buffer, int count, uint32_t address)
-{
-       return mem_ap_write(dap, buffer, 2, count / 2, address, true);
-}
-
-int mem_ap_write_buf_u8(struct adiv5_dap *dap, const uint8_t *buffer, int count, uint32_t address)
-{
-       return mem_ap_write(dap, buffer, 1, count, address, true);
-}
-
 /**
  * Synchronous read of a block of memory, using a specific access size.
  *
@@ -510,26 +494,6 @@ int mem_ap_read(struct adiv5_dap *dap, uint8_t *buffer, uint32_t size, uint32_t
        return retval;
 }
 
-/* Compatibility wrappers around mem_ap_read(). Note that the count is in bytes for these (despite
- * what their doxygen documentation said). */
-int mem_ap_read_buf_u32(struct adiv5_dap *dap, uint8_t *buffer,
-               int count, uint32_t address, bool addr_incr)
-{
-       return mem_ap_read(dap, buffer, 4, count / 4, address, addr_incr);
-}
-
-int mem_ap_read_buf_u16(struct adiv5_dap *dap, uint8_t *buffer,
-               int count, uint32_t address)
-{
-       return mem_ap_read(dap, buffer, 2, count / 2, address, true);
-}
-
-int mem_ap_read_buf_u8(struct adiv5_dap *dap, uint8_t *buffer,
-               int count, uint32_t address)
-{
-       return mem_ap_read(dap, buffer, 1, count, address, true);
-}
-
 /*--------------------------------------------------------------------*/
 /*          Wrapping function with selection of AP                    */
 /*--------------------------------------------------------------------*/
@@ -561,60 +525,32 @@ int mem_ap_sel_write_atomic_u32(struct adiv5_dap *swjdp, uint8_t ap,
        return mem_ap_write_atomic_u32(swjdp, address, value);
 }
 
-int mem_ap_sel_read_buf_u8(struct adiv5_dap *swjdp, uint8_t ap,
-               uint8_t *buffer, int count, uint32_t address)
-{
-       dap_ap_select(swjdp, ap);
-       return mem_ap_read_buf_u8(swjdp, buffer, count, address);
-}
-
-int mem_ap_sel_read_buf_u16(struct adiv5_dap *swjdp, uint8_t ap,
-               uint8_t *buffer, int count, uint32_t address)
+int mem_ap_sel_read_buf(struct adiv5_dap *swjdp, uint8_t ap,
+               uint8_t *buffer, uint32_t size, uint32_t count, uint32_t address)
 {
        dap_ap_select(swjdp, ap);
-       return mem_ap_read_buf_u16(swjdp, buffer, count, address);
+       return mem_ap_read(swjdp, buffer, size, count, address, true);
 }
 
-int mem_ap_sel_read_buf_u32_noincr(struct adiv5_dap *swjdp, uint8_t ap,
-               uint8_t *buffer, int count, uint32_t address)
+int mem_ap_sel_write_buf(struct adiv5_dap *swjdp, uint8_t ap,
+               const uint8_t *buffer, uint32_t size, uint32_t count, uint32_t address)
 {
        dap_ap_select(swjdp, ap);
-       return mem_ap_read_buf_u32(swjdp, buffer, count, address, false);
+       return mem_ap_write(swjdp, buffer, size, count, address, true);
 }
 
-int mem_ap_sel_read_buf_u32(struct adiv5_dap *swjdp, uint8_t ap,
-               uint8_t *buffer, int count, uint32_t address)
+int mem_ap_sel_read_buf_noincr(struct adiv5_dap *swjdp, uint8_t ap,
+               uint8_t *buffer, uint32_t size, uint32_t count, uint32_t address)
 {
        dap_ap_select(swjdp, ap);
-       return mem_ap_read_buf_u32(swjdp, buffer, count, address, true);
+       return mem_ap_read(swjdp, buffer, size, count, address, false);
 }
 
-int mem_ap_sel_write_buf_u8(struct adiv5_dap *swjdp, uint8_t ap,
-               const uint8_t *buffer, int count, uint32_t address)
+int mem_ap_sel_write_buf_noincr(struct adiv5_dap *swjdp, uint8_t ap,
+               const uint8_t *buffer, uint32_t size, uint32_t count, uint32_t address)
 {
        dap_ap_select(swjdp, ap);
-       return mem_ap_write_buf_u8(swjdp, buffer, count, address);
-}
-
-int mem_ap_sel_write_buf_u16(struct adiv5_dap *swjdp, uint8_t ap,
-               const uint8_t *buffer, int count, uint32_t address)
-{
-       dap_ap_select(swjdp, ap);
-       return mem_ap_write_buf_u16(swjdp, buffer, count, address);
-}
-
-int mem_ap_sel_write_buf_u32(struct adiv5_dap *swjdp, uint8_t ap,
-               const uint8_t *buffer, int count, uint32_t address)
-{
-       dap_ap_select(swjdp, ap);
-       return mem_ap_write_buf_u32(swjdp, buffer, count, address, true);
-}
-
-int mem_ap_sel_write_buf_u32_noincr(struct adiv5_dap *swjdp, uint8_t ap,
-               const uint8_t *buffer, int count, uint32_t address)
-{
-       dap_ap_select(swjdp, ap);
-       return mem_ap_write_buf_u32(swjdp, buffer, count, address, false);
+       return mem_ap_write(swjdp, buffer, size, count, address, false);
 }
 
 #define MDM_REG_STAT           0x00
@@ -644,6 +580,8 @@ int mem_ap_sel_write_buf_u32_noincr(struct adiv5_dap *swjdp, uint8_t ap,
 #define MEM_CTRL_VLLSX_DBG_ACK (1<<6)
 #define MEM_CTRL_VLLSX_STAT_ACK        (1<<7)
 
+#define MDM_ACCESS_TIMEOUT     3000 /* ms */
+
 /**
  *
  */
@@ -651,6 +589,7 @@ int dap_syssec_kinetis_mdmap(struct adiv5_dap *dap)
 {
        uint32_t val;
        int retval;
+       int timeout = 0;
        enum reset_types jtag_reset_config = jtag_get_reset_config();
 
        dap_ap_select(dap, 1);
@@ -671,14 +610,21 @@ int dap_syssec_kinetis_mdmap(struct adiv5_dap *dap)
         * it's important that the device is out of
         * reset here
         */
-       do {
+       while (1) {
+               if (timeout++ > MDM_ACCESS_TIMEOUT) {
+                       LOG_DEBUG("MDMAP : flash ready timeout");
+                       return ERROR_FAIL;
+               }
                retval = dap_queue_ap_read(dap, MDM_REG_STAT, &val);
                if (retval != ERROR_OK)
                        return retval;
                dap_run(dap);
 
                LOG_DEBUG("MDM_REG_STAT %08" PRIX32, val);
-       } while (!(val & MDM_STAT_FREADY));
+               if (val & MDM_STAT_FREADY)
+                       break;
+               alive_sleep(1);
+       }
 
        if ((val & MDM_STAT_SYSSEC)) {
                LOG_DEBUG("MDMAP: system is secured, masserase needed");
@@ -695,8 +641,12 @@ int dap_syssec_kinetis_mdmap(struct adiv5_dap *dap)
                                dap_ap_select(dap, 0);
                                return ERROR_FAIL;
                        }
-
+                       timeout = 0;
                        while (1) {
+                               if (timeout++ > MDM_ACCESS_TIMEOUT) {
+                                       LOG_DEBUG("MDMAP : flash ready timeout");
+                                       return ERROR_FAIL;
+                               }
                                retval = dap_queue_ap_write(dap, MDM_REG_CTRL, MEM_CTRL_FMEIP);
                                if (retval != ERROR_OK)
                                        return retval;
@@ -710,9 +660,14 @@ int dap_syssec_kinetis_mdmap(struct adiv5_dap *dap)
 
                                if ((val & 1))
                                        break;
+                               alive_sleep(1);
                        }
-
+                       timeout = 0;
                        while (1) {
+                               if (timeout++ > MDM_ACCESS_TIMEOUT) {
+                                       LOG_DEBUG("MDMAP : flash ready timeout");
+                                       return ERROR_FAIL;
+                               }
                                retval = dap_queue_ap_write(dap, MDM_REG_CTRL, 0);
                                if (retval != ERROR_OK)
                                        return retval;
@@ -732,6 +687,7 @@ int dap_syssec_kinetis_mdmap(struct adiv5_dap *dap)
 
                                if (val == 0x00)
                                        break;
+                               alive_sleep(1);
                        }
                }
        }