Change version labels to work better with GIT

[fw/openocd] / src / target / mips32_dmaacc.c

diff --git a/src/target/mips32_dmaacc.c b/src/target/mips32_dmaacc.c
index 9194bf6176f6070c1e7520c3f63d0c86a48ad7ee..9a38084106ed1a53b5e8c4ad2940e67a0cd8c975 100644 (file)
--- a/src/target/mips32_dmaacc.c
+++ b/src/target/mips32_dmaacc.c
@@ -61,7 +61,7 @@ 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);
@@ -74,11 +74,11 @@ begin_ejtag_dma_read:
        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)\n", addr);
                        goto begin_ejtag_dma_read;
                }
                else
-                       LOG_ERROR("DMA Read Addr = %08x  Data = ERROR ON READ\n", addr);
+                       LOG_ERROR("DMA Read Addr = %08" PRIx32 "  Data = ERROR ON READ\n", addr);
                return ERROR_JTAG_DEVICE_ERROR;
        }
 
@@ -107,7 +107,7 @@ begin_ejtag_dma_read_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);
 
        /* Read Data */
        mips_ejtag_set_instr(ejtag_info, EJTAG_INST_DATA, NULL);
@@ -120,11 +120,11 @@ begin_ejtag_dma_read_h:
        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)\n", addr);
                        goto begin_ejtag_dma_read_h;
                }
                else
-                       LOG_ERROR("DMA Read Addr = %08x  Data = ERROR ON READ\n", addr);
+                       LOG_ERROR("DMA Read Addr = %08" PRIx32 "  Data = ERROR ON READ\n", addr);
                return ERROR_JTAG_DEVICE_ERROR;
        }
 
@@ -159,7 +159,7 @@ 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);
@@ -172,11 +172,11 @@ begin_ejtag_dma_read_b:
        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)\n", addr);
                        goto begin_ejtag_dma_read_b;
                }
                else
-                       LOG_ERROR("DMA Read Addr = %08x  Data = ERROR ON READ\n", addr);
+                       LOG_ERROR("DMA Read Addr = %08" PRIx32 "  Data = ERROR ON READ\n", addr);
                return ERROR_JTAG_DEVICE_ERROR;
        }
 
@@ -191,7 +191,7 @@ begin_ejtag_dma_read_b:
                case 2:
                        *data = (v >> 16) & 0xff;
                        break;
-               case 3: 
+               case 3:
                        *data = (v >> 24) & 0xff;
                        break;
        }
@@ -226,7 +226,7 @@ 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);
@@ -235,11 +235,11 @@ begin_ejtag_dma_write:
        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)\n", addr);
                        goto begin_ejtag_dma_write;
                }
                else
-                       LOG_ERROR("DMA Write Addr = %08x  Data = ERROR ON WRITE\n", addr);
+                       LOG_ERROR("DMA Write Addr = %08" PRIx32 "  Data = ERROR ON WRITE\n", addr);
                return ERROR_JTAG_DEVICE_ERROR;
        }
 
@@ -277,7 +277,7 @@ 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);
@@ -286,11 +286,11 @@ begin_ejtag_dma_write_h:
        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)\n", addr);
                        goto begin_ejtag_dma_write_h;
                }
                else
-                       LOG_ERROR("DMA Write Addr = %08x  Data = ERROR ON WRITE\n", addr);
+                       LOG_ERROR("DMA Write Addr = %08" PRIx32 "  Data = ERROR ON WRITE\n", addr);
                return ERROR_JTAG_DEVICE_ERROR;
        }
 
@@ -329,7 +329,7 @@ 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);
@@ -338,11 +338,11 @@ begin_ejtag_dma_write_b:
        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)\n", addr);
                        goto begin_ejtag_dma_write_b;
                }
                else
-                       LOG_ERROR("DMA Write Addr = %08x  Data = ERROR ON WRITE\n", addr);
+                       LOG_ERROR("DMA Write Addr = %08" PRIx32 "  Data = ERROR ON WRITE\n", addr);
                return ERROR_JTAG_DEVICE_ERROR;
        }
 
@@ -369,8 +369,8 @@ int mips32_dmaacc_read_mem32(mips_ejtag_t *ejtag_info, uint32_t addr, int count,
        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++) {
+               if ((retval = ejtag_dma_read(ejtag_info, addr + i*sizeof(*buf), &buf[i])) != ERROR_OK)
                        return retval;
        }
 
@@ -382,8 +382,8 @@ int mips32_dmaacc_read_mem16(mips_ejtag_t *ejtag_info, uint32_t addr, int count,
        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++) {
+               if ((retval = ejtag_dma_read_h(ejtag_info, addr + i*sizeof(*buf), &buf[i])) != ERROR_OK)
                        return retval;
        }
 
@@ -395,8 +395,8 @@ int mips32_dmaacc_read_mem8(mips_ejtag_t *ejtag_info, uint32_t addr, int count,
        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++) {
+               if ((retval = ejtag_dma_read_b(ejtag_info, addr + i*sizeof(*buf), &buf[i])) != ERROR_OK)
                        return retval;
        }
 
@@ -423,8 +423,8 @@ int mips32_dmaacc_write_mem32(mips_ejtag_t *ejtag_info, uint32_t addr, int count
        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++) {
+               if ((retval = ejtag_dma_write(ejtag_info, addr + i*sizeof(*buf), buf[i])) != ERROR_OK)
                        return retval;
        }
 
@@ -436,8 +436,8 @@ int mips32_dmaacc_write_mem16(mips_ejtag_t *ejtag_info, uint32_t addr, int count
        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++) {
+               if ((retval = ejtag_dma_write_h(ejtag_info, addr + i*sizeof(*buf), buf[i])) != ERROR_OK)
                        return retval;
        }
 
@@ -449,8 +449,8 @@ int mips32_dmaacc_write_mem8(mips_ejtag_t *ejtag_info, uint32_t addr, int count,
        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++) {
+               if ((retval = ejtag_dma_write_b(ejtag_info, addr + i*sizeof(*buf), buf[i])) != ERROR_OK)
                        return retval;
        }