projects / fw / openocd / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Ensure Cortex-M reset wakes device from sleep (wfi/wfe)
[fw/openocd] / src / target / mips32_dmaacc.c
diff --git a/src/target/mips32_dmaacc.c b/src/target/mips32_dmaacc.c
index ae95dd08e038d6c557a7b109f7e4404ac3f3a422..42979d71cc6aabb539a291ae007ea8b63ad66b7a 100644 (file)
--- a/src/target/mips32_dmaacc.c
+++ b/src/target/mips32_dmaacc.c
@@ -22,15 +22,27 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <string.h>
-#include "log.h"
-#include "mips32.h"
 #include "mips32_dmaacc.h"
 
+static int mips32_dmaacc_read_mem8(struct mips_ejtag *ejtag_info,
+               uint32_t addr, int count, uint8_t *buf);
+static int mips32_dmaacc_read_mem16(struct mips_ejtag *ejtag_info,
+               uint32_t addr, int count, uint16_t *buf);
+static int mips32_dmaacc_read_mem32(struct mips_ejtag *ejtag_info,
+               uint32_t addr, int count, uint32_t *buf);
+
+static int mips32_dmaacc_write_mem8(struct mips_ejtag *ejtag_info,
+               uint32_t addr, int count, uint8_t *buf);
+static int mips32_dmaacc_write_mem16(struct mips_ejtag *ejtag_info,
+               uint32_t addr, int count, uint16_t *buf);
+static int mips32_dmaacc_write_mem32(struct mips_ejtag *ejtag_info,
+               uint32_t addr, int count, uint32_t *buf);
+
 /*
  * The following logic shamelessly cloned from HairyDairyMaid's wrt54g_debrick
  * to support the Broadcom BCM5352 SoC in the Linksys WRT54GL wireless router
@@ -41,21 +53,21 @@
  * displaying/modifying memory and memory mapped registers.
  */
 
-static int ejtag_dma_read(mips_ejtag_t *ejtag_info, u32 addr, u32 *data)
+static int ejtag_dma_read(struct mips_ejtag *ejtag_info, uint32_t addr, uint32_t *data)
 {
-       u32 v;
-       u32 ejtag_ctrl;
+       uint32_t v;
+       uint32_t ejtag_ctrl;
        int retries = RETRY_ATTEMPTS;
 
 begin_ejtag_dma_read:
 
        /* Setup Address */
        v = addr;
-       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_ADDRESS, NULL);
+       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_ADDRESS);
        mips_ejtag_drscan_32(ejtag_info, &v);
 
        /* Initiate DMA Read & set DSTRT */
-       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL, NULL);
+       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL);
        ejtag_ctrl = EJTAG_CTRL_DMAACC | EJTAG_CTRL_DRWN | EJTAG_CTRL_DMA_WORD | EJTAG_CTRL_DSTRT | ejtag_info->ejtag_ctrl;
        mips_ejtag_drscan_32(ejtag_info, &ejtag_ctrl);
 
@@ -63,70 +75,67 @@ begin_ejtag_dma_read:
        do {
                ejtag_ctrl = EJTAG_CTRL_DMAACC | ejtag_info->ejtag_ctrl;
                mips_ejtag_drscan_32(ejtag_info, &ejtag_ctrl);
-       } while(ejtag_ctrl & EJTAG_CTRL_DSTRT);
+       } while (ejtag_ctrl & EJTAG_CTRL_DSTRT);
 
        /* Read Data */
-       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_DATA, NULL);
+       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_DATA);
        mips_ejtag_drscan_32(ejtag_info, data);
 
        /* Clear DMA & Check DERR */
-       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL, NULL);
+       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL);
        ejtag_ctrl = ejtag_info->ejtag_ctrl;
        mips_ejtag_drscan_32(ejtag_info, &ejtag_ctrl);
-       if (ejtag_ctrl  & EJTAG_CTRL_DERR)
-       {
+       if (ejtag_ctrl  & EJTAG_CTRL_DERR) {
                if (retries--) {
-                       LOG_ERROR("DMA Read Addr = %08x  Data = ERROR ON READ (retrying)\n", addr);
+                       LOG_ERROR("DMA Read Addr = %08" PRIx32 "  Data = ERROR ON READ (retrying)", addr);
                        goto begin_ejtag_dma_read;
-               }
-               else
-                       LOG_ERROR("DMA Read Addr = %08x  Data = ERROR ON READ\n", addr);
+               } else
+                       LOG_ERROR("DMA Read Addr = %08" PRIx32 "  Data = ERROR ON READ", addr);
                return ERROR_JTAG_DEVICE_ERROR;
        }
 
        return ERROR_OK;
 }
 
-static int ejtag_dma_read_h(mips_ejtag_t *ejtag_info, u32 addr, u16 *data)
+static int ejtag_dma_read_h(struct mips_ejtag *ejtag_info, uint32_t addr, uint16_t *data)
 {
-       u32 v;
-       u32 ejtag_ctrl;
+       uint32_t v;
+       uint32_t ejtag_ctrl;
        int retries = RETRY_ATTEMPTS;
 
 begin_ejtag_dma_read_h:
 
        /* Setup Address */
        v = addr;
-       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_ADDRESS, NULL);
+       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_ADDRESS);
        mips_ejtag_drscan_32(ejtag_info, &v);
 
        /* Initiate DMA Read & set DSTRT */
-       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL, NULL);
-       ejtag_ctrl = EJTAG_CTRL_DMAACC | EJTAG_CTRL_DRWN | EJTAG_CTRL_DMA_HALFWORD | EJTAG_CTRL_DSTRT | ejtag_info->ejtag_ctrl;
+       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL);
+       ejtag_ctrl = EJTAG_CTRL_DMAACC | EJTAG_CTRL_DRWN | EJTAG_CTRL_DMA_HALFWORD |
+                       EJTAG_CTRL_DSTRT | ejtag_info->ejtag_ctrl;
        mips_ejtag_drscan_32(ejtag_info, &ejtag_ctrl);
 
        /* Wait for DSTRT to Clear */
        do {
                ejtag_ctrl = EJTAG_CTRL_DMAACC | ejtag_info->ejtag_ctrl;
                mips_ejtag_drscan_32(ejtag_info, &ejtag_ctrl);
-       } while(ejtag_ctrl & EJTAG_CTRL_DSTRT);
+       } while (ejtag_ctrl & EJTAG_CTRL_DSTRT);
 
        /* Read Data */
-       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_DATA, NULL);
+       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_DATA);
        mips_ejtag_drscan_32(ejtag_info, &v);
 
        /* Clear DMA & Check DERR */
-       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL, NULL);
+       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL);
        ejtag_ctrl = ejtag_info->ejtag_ctrl;
        mips_ejtag_drscan_32(ejtag_info, &ejtag_ctrl);
-       if (ejtag_ctrl  & EJTAG_CTRL_DERR)
-       {
+       if (ejtag_ctrl  & EJTAG_CTRL_DERR) {
                if (retries--) {
-                       LOG_ERROR("DMA Read Addr = %08x  Data = ERROR ON READ (retrying)\n", addr);
+                       LOG_ERROR("DMA Read Addr = %08" PRIx32 "  Data = ERROR ON READ (retrying)", addr);
                        goto begin_ejtag_dma_read_h;
-               }
-               else
-                       LOG_ERROR("DMA Read Addr = %08x  Data = ERROR ON READ\n", addr);
+               } else
+                       LOG_ERROR("DMA Read Addr = %08" PRIx32 "  Data = ERROR ON READ", addr);
                return ERROR_JTAG_DEVICE_ERROR;
        }
 
@@ -139,21 +148,21 @@ begin_ejtag_dma_read_h:
        return ERROR_OK;
 }
 
-static int ejtag_dma_read_b(mips_ejtag_t *ejtag_info, u32 addr, u8 *data)
+static int ejtag_dma_read_b(struct mips_ejtag *ejtag_info, uint32_t addr, uint8_t *data)
 {
-       u32 v;
-       u32 ejtag_ctrl;
+       uint32_t v;
+       uint32_t ejtag_ctrl;
        int retries = RETRY_ATTEMPTS;
 
 begin_ejtag_dma_read_b:
 
        /* Setup Address */
        v = addr;
-       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_ADDRESS, NULL);
+       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_ADDRESS);
        mips_ejtag_drscan_32(ejtag_info, &v);
 
        /* Initiate DMA Read & set DSTRT */
-       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL, NULL);
+       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL);
        ejtag_ctrl = EJTAG_CTRL_DMAACC | EJTAG_CTRL_DRWN | EJTAG_CTRL_DMA_BYTE | EJTAG_CTRL_DSTRT | ejtag_info->ejtag_ctrl;
        mips_ejtag_drscan_32(ejtag_info, &ejtag_ctrl);
 
@@ -161,24 +170,22 @@ begin_ejtag_dma_read_b:
        do {
                ejtag_ctrl = EJTAG_CTRL_DMAACC | ejtag_info->ejtag_ctrl;
                mips_ejtag_drscan_32(ejtag_info, &ejtag_ctrl);
-       } while(ejtag_ctrl & EJTAG_CTRL_DSTRT);
+       } while (ejtag_ctrl & EJTAG_CTRL_DSTRT);
 
        /* Read Data */
-       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_DATA, NULL);
+       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_DATA);
        mips_ejtag_drscan_32(ejtag_info, &v);
 
        /* Clear DMA & Check DERR */
-       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL, NULL);
+       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL);
        ejtag_ctrl = ejtag_info->ejtag_ctrl;
        mips_ejtag_drscan_32(ejtag_info, &ejtag_ctrl);
-       if (ejtag_ctrl  & EJTAG_CTRL_DERR)
-       {
+       if (ejtag_ctrl  & EJTAG_CTRL_DERR) {
                if (retries--) {
-                       LOG_ERROR("DMA Read Addr = %08x  Data = ERROR ON READ (retrying)\n", addr);
+                       LOG_ERROR("DMA Read Addr = %08" PRIx32 "  Data = ERROR ON READ (retrying)", addr);
                        goto begin_ejtag_dma_read_b;
-               }
-               else
-                       LOG_ERROR("DMA Read Addr = %08x  Data = ERROR ON READ\n", addr);
+               } else
+                       LOG_ERROR("DMA Read Addr = %08" PRIx32 "  Data = ERROR ON READ", addr);
                return ERROR_JTAG_DEVICE_ERROR;
        }
 
@@ -193,7 +200,7 @@ begin_ejtag_dma_read_b:
                case 2:
                        *data = (v >> 16) & 0xff;
                        break;
-               case 3: 
+               case 3:
                        *data = (v >> 24) & 0xff;
                        break;
        }
@@ -201,26 +208,26 @@ begin_ejtag_dma_read_b:
        return ERROR_OK;
 }
 
-static int ejtag_dma_write(mips_ejtag_t *ejtag_info, u32 addr, u32 data)
+static int ejtag_dma_write(struct mips_ejtag *ejtag_info, uint32_t addr, uint32_t data)
 {
-       u32 v;
-       u32 ejtag_ctrl;
+       uint32_t v;
+       uint32_t ejtag_ctrl;
        int retries = RETRY_ATTEMPTS;
 
 begin_ejtag_dma_write:
 
        /* Setup Address */
        v = addr;
-       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_ADDRESS, NULL);
+       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_ADDRESS);
        mips_ejtag_drscan_32(ejtag_info, &v);
 
        /* Setup Data */
        v = data;
-       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_DATA, NULL);
+       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_DATA);
        mips_ejtag_drscan_32(ejtag_info, &v);
 
        /* Initiate DMA Write & set DSTRT */
-       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL, NULL);
+       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL);
        ejtag_ctrl = EJTAG_CTRL_DMAACC | EJTAG_CTRL_DMA_WORD | EJTAG_CTRL_DSTRT | ejtag_info->ejtag_ctrl;
        mips_ejtag_drscan_32(ejtag_info, &ejtag_ctrl);
 
@@ -228,30 +235,28 @@ begin_ejtag_dma_write:
        do {
                ejtag_ctrl = EJTAG_CTRL_DMAACC | ejtag_info->ejtag_ctrl;
                mips_ejtag_drscan_32(ejtag_info, &ejtag_ctrl);
-       } while(ejtag_ctrl & EJTAG_CTRL_DSTRT);
+       } while (ejtag_ctrl & EJTAG_CTRL_DSTRT);
 
        /* Clear DMA & Check DERR */
-       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL, NULL);
+       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL);
        ejtag_ctrl = ejtag_info->ejtag_ctrl;
        mips_ejtag_drscan_32(ejtag_info, &ejtag_ctrl);
-       if (ejtag_ctrl  & EJTAG_CTRL_DERR)
-       {
+       if (ejtag_ctrl  & EJTAG_CTRL_DERR) {
                if (retries--) {
-                       LOG_ERROR("DMA Write Addr = %08x  Data = ERROR ON WRITE (retrying)\n", addr);
+                       LOG_ERROR("DMA Write Addr = %08" PRIx32 "  Data = ERROR ON WRITE (retrying)", addr);
                        goto begin_ejtag_dma_write;
-               }
-               else
-                       LOG_ERROR("DMA Write Addr = %08x  Data = ERROR ON WRITE\n", addr);
+               } else
+                       LOG_ERROR("DMA Write Addr = %08" PRIx32 "  Data = ERROR ON WRITE", addr);
                return ERROR_JTAG_DEVICE_ERROR;
        }
 
        return ERROR_OK;
 }
 
-static int ejtag_dma_write_h(mips_ejtag_t *ejtag_info, u32 addr, u32 data)
+static int ejtag_dma_write_h(struct mips_ejtag *ejtag_info, uint32_t addr, uint32_t data)
 {
-       u32 v;
-       u32 ejtag_ctrl;
+       uint32_t v;
+       uint32_t ejtag_ctrl;
        int retries = RETRY_ATTEMPTS;
 
        /* Handle the bigendian/littleendian */
@@ -262,16 +267,16 @@ begin_ejtag_dma_write_h:
 
        /* Setup Address */
        v = addr;
-       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_ADDRESS, NULL);
+       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_ADDRESS);
        mips_ejtag_drscan_32(ejtag_info, &v);
 
        /* Setup Data */
        v = data;
-       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_DATA, NULL);
+       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_DATA);
        mips_ejtag_drscan_32(ejtag_info, &v);
 
        /* Initiate DMA Write & set DSTRT */
-       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL, NULL);
+       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL);
        ejtag_ctrl = EJTAG_CTRL_DMAACC | EJTAG_CTRL_DMA_HALFWORD | EJTAG_CTRL_DSTRT | ejtag_info->ejtag_ctrl;
        mips_ejtag_drscan_32(ejtag_info, &ejtag_ctrl);
 
@@ -279,30 +284,28 @@ begin_ejtag_dma_write_h:
        do {
                ejtag_ctrl = EJTAG_CTRL_DMAACC | ejtag_info->ejtag_ctrl;
                mips_ejtag_drscan_32(ejtag_info, &ejtag_ctrl);
-       } while(ejtag_ctrl & EJTAG_CTRL_DSTRT);
+       } while (ejtag_ctrl & EJTAG_CTRL_DSTRT);
 
        /* Clear DMA & Check DERR */
-       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL, NULL);
+       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL);
        ejtag_ctrl = ejtag_info->ejtag_ctrl;
        mips_ejtag_drscan_32(ejtag_info, &ejtag_ctrl);
-       if (ejtag_ctrl  & EJTAG_CTRL_DERR)
-       {
+       if (ejtag_ctrl & EJTAG_CTRL_DERR) {
                if (retries--) {
-                       LOG_ERROR("DMA Write Addr = %08x  Data = ERROR ON WRITE (retrying)\n", addr);
+                       LOG_ERROR("DMA Write Addr = %08" PRIx32 "  Data = ERROR ON WRITE (retrying)", addr);
                        goto begin_ejtag_dma_write_h;
-               }
-               else
-                       LOG_ERROR("DMA Write Addr = %08x  Data = ERROR ON WRITE\n", addr);
+               } else
+                       LOG_ERROR("DMA Write Addr = %08" PRIx32 "  Data = ERROR ON WRITE", addr);
                return ERROR_JTAG_DEVICE_ERROR;
        }
 
        return ERROR_OK;
 }
 
-static int ejtag_dma_write_b(mips_ejtag_t *ejtag_info, u32 addr, u32 data)
+static int ejtag_dma_write_b(struct mips_ejtag *ejtag_info, uint32_t addr, uint32_t data)
 {
-       u32 v;
-       u32 ejtag_ctrl;
+       uint32_t v;
+       uint32_t ejtag_ctrl;
        int retries = RETRY_ATTEMPTS;
 
        /* Handle the bigendian/littleendian */
@@ -314,16 +317,16 @@ begin_ejtag_dma_write_b:
 
        /*  Setup Address*/
        v = addr;
-       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_ADDRESS, NULL);
+       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_ADDRESS);
        mips_ejtag_drscan_32(ejtag_info, &v);
 
        /* Setup Data */
        v = data;
-       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_DATA, NULL);
+       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_DATA);
        mips_ejtag_drscan_32(ejtag_info, &v);
 
        /* Initiate DMA Write & set DSTRT */
-       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL, NULL);
+       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL);
        ejtag_ctrl = EJTAG_CTRL_DMAACC | EJTAG_CTRL_DMA_BYTE | EJTAG_CTRL_DSTRT | ejtag_info->ejtag_ctrl;
        mips_ejtag_drscan_32(ejtag_info, &ejtag_ctrl);
 
@@ -331,128 +334,130 @@ begin_ejtag_dma_write_b:
        do {
                ejtag_ctrl = EJTAG_CTRL_DMAACC | ejtag_info->ejtag_ctrl;
                mips_ejtag_drscan_32(ejtag_info, &ejtag_ctrl);
-       } while(ejtag_ctrl & EJTAG_CTRL_DSTRT);
+       } while (ejtag_ctrl & EJTAG_CTRL_DSTRT);
 
        /* Clear DMA & Check DERR */
-       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL, NULL);
+       mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL);
        ejtag_ctrl = ejtag_info->ejtag_ctrl;
        mips_ejtag_drscan_32(ejtag_info, &ejtag_ctrl);
-       if (ejtag_ctrl & EJTAG_CTRL_DERR)
-       {
+       if (ejtag_ctrl & EJTAG_CTRL_DERR) {
                if (retries--) {
-                       LOG_ERROR("DMA Write Addr = %08x  Data = ERROR ON WRITE (retrying)\n", addr);
+                       LOG_ERROR("DMA Write Addr = %08" PRIx32 "  Data = ERROR ON WRITE (retrying)", addr);
                        goto begin_ejtag_dma_write_b;
-               }
-               else
-                       LOG_ERROR("DMA Write Addr = %08x  Data = ERROR ON WRITE\n", addr);
+               } else
+                       LOG_ERROR("DMA Write Addr = %08" PRIx32 "  Data = ERROR ON WRITE", addr);
                return ERROR_JTAG_DEVICE_ERROR;
        }
 
        return ERROR_OK;
 }
 
-int mips32_dmaacc_read_mem(mips_ejtag_t *ejtag_info, u32 addr, int size, int count, void *buf)
+int mips32_dmaacc_read_mem(struct mips_ejtag *ejtag_info, uint32_t addr, int size, int count, void *buf)
 {
-       switch (size)
-       {
+       switch (size) {
                case 1:
-                       return mips32_dmaacc_read_mem8(ejtag_info, addr, count, (u8*)buf);
+                       return mips32_dmaacc_read_mem8(ejtag_info, addr, count, (uint8_t *)buf);
                case 2:
-                       return mips32_dmaacc_read_mem16(ejtag_info, addr, count, (u16*)buf);
+                       return mips32_dmaacc_read_mem16(ejtag_info, addr, count, (uint16_t *)buf);
                case 4:
-                       return mips32_dmaacc_read_mem32(ejtag_info, addr, count, (u32*)buf);
+                       return mips32_dmaacc_read_mem32(ejtag_info, addr, count, (uint32_t *)buf);
        }
 
        return ERROR_OK;
 }
 
-int mips32_dmaacc_read_mem32(mips_ejtag_t *ejtag_info, u32 addr, int count, u32 *buf)
+static int mips32_dmaacc_read_mem32(struct mips_ejtag *ejtag_info, uint32_t addr, int count, uint32_t *buf)
 {
        int i;
        int     retval;
 
-       for (i=0; i<count; i++) {
-               if ((retval = ejtag_dma_read(ejtag_info, addr+i*sizeof(*buf), &buf[i])) != ERROR_OK)
+       for (i = 0; i < count; i++) {
+               retval = ejtag_dma_read(ejtag_info, addr + i * sizeof(*buf), &buf[i]);
+               if (retval != ERROR_OK)
                        return retval;
        }
 
        return ERROR_OK;
 }
 
-int mips32_dmaacc_read_mem16(mips_ejtag_t *ejtag_info, u32 addr, int count, u16 *buf)
+static int mips32_dmaacc_read_mem16(struct mips_ejtag *ejtag_info, uint32_t addr, int count, uint16_t *buf)
 {
        int i;
        int retval;
 
-       for (i=0; i<count; i++) {
-               if ((retval = ejtag_dma_read_h(ejtag_info, addr+i*sizeof(*buf), &buf[i])) != ERROR_OK)
+       for (i = 0; i < count; i++) {
+               retval = ejtag_dma_read_h(ejtag_info, addr + i * sizeof(*buf), &buf[i]);
+               if (retval != ERROR_OK)
                        return retval;
        }
 
        return ERROR_OK;
 }
 
-int mips32_dmaacc_read_mem8(mips_ejtag_t *ejtag_info, u32 addr, int count, u8 *buf)
+static int mips32_dmaacc_read_mem8(struct mips_ejtag *ejtag_info, uint32_t addr, int count, uint8_t *buf)
 {
        int i;
        int retval;
 
-       for (i=0; i<count; i++) {
-               if ((retval = ejtag_dma_read_b(ejtag_info, addr+i*sizeof(*buf), &buf[i])) != ERROR_OK)
+       for (i = 0; i < count; i++) {
+               retval = ejtag_dma_read_b(ejtag_info, addr + i * sizeof(*buf), &buf[i]);
+               if (retval != ERROR_OK)
                        return retval;
        }
 
        return ERROR_OK;
 }
 
-int mips32_dmaacc_write_mem(mips_ejtag_t *ejtag_info, u32 addr, int size, int count, void *buf)
+int mips32_dmaacc_write_mem(struct mips_ejtag *ejtag_info, uint32_t addr, int size, int count, void *buf)
 {
-       switch (size)
-       {
+       switch (size) {
                case 1:
-                       return mips32_dmaacc_write_mem8(ejtag_info, addr, count, (u8*)buf);
+                       return mips32_dmaacc_write_mem8(ejtag_info, addr, count, (uint8_t *)buf);
                case 2:
-                       return mips32_dmaacc_write_mem16(ejtag_info, addr, count,(u16*)buf);
+                       return mips32_dmaacc_write_mem16(ejtag_info, addr, count, (uint16_t *)buf);
                case 4:
-                       return mips32_dmaacc_write_mem32(ejtag_info, addr, count, (u32*)buf);
+                       return mips32_dmaacc_write_mem32(ejtag_info, addr, count, (uint32_t *)buf);
        }
 
        return ERROR_OK;
 }
 
-int mips32_dmaacc_write_mem32(mips_ejtag_t *ejtag_info, u32 addr, int count, u32 *buf)
+static int mips32_dmaacc_write_mem32(struct mips_ejtag *ejtag_info, uint32_t addr, int count, uint32_t *buf)
 {
        int i;
        int retval;
 
-       for (i=0; i<count; i++) {
-               if ((retval = ejtag_dma_write(ejtag_info, addr+i*sizeof(*buf), buf[i])) != ERROR_OK)
+       for (i = 0; i < count; i++) {
+               retval = ejtag_dma_write(ejtag_info, addr + i * sizeof(*buf), buf[i]);
+               if (retval != ERROR_OK)
                        return retval;
        }
 
        return ERROR_OK;
 }
 
-int mips32_dmaacc_write_mem16(mips_ejtag_t *ejtag_info, u32 addr, int count, u16 *buf)
+static int mips32_dmaacc_write_mem16(struct mips_ejtag *ejtag_info, uint32_t addr, int count, uint16_t *buf)
 {
        int i;
        int retval;
 
-       for (i=0; i<count; i++) {
-               if ((retval = ejtag_dma_write_h(ejtag_info, addr+i*sizeof(*buf), buf[i])) != ERROR_OK)
+       for (i = 0; i < count; i++) {
+               retval = ejtag_dma_write_h(ejtag_info, addr + i * sizeof(*buf), buf[i]);
+               if (retval != ERROR_OK)
                        return retval;
        }
 
        return ERROR_OK;
 }
 
-int mips32_dmaacc_write_mem8(mips_ejtag_t *ejtag_info, u32 addr, int count, u8 *buf)
+static int mips32_dmaacc_write_mem8(struct mips_ejtag *ejtag_info, uint32_t addr, int count, uint8_t *buf)
 {
        int i;
        int retval;
 
-       for (i=0; i<count; i++) {
-               if ((retval = ejtag_dma_write_b(ejtag_info, addr+i*sizeof(*buf), buf[i])) != ERROR_OK)
+       for (i = 0; i < count; i++) {
+               retval = ejtag_dma_write_b(ejtag_info, addr + i * sizeof(*buf), buf[i]);
+               if (retval != ERROR_OK)
                        return retval;
        }
 
openocd with support for Altus Metrum targets