Remove whitespace that occurs before ')'.
[fw/openocd] / src / target / mips32_pracc.c
index a5f36a93349ac3eb8fc8de7a105d411b7ae8778f..c498aff93e1f515654e638a900b8db4a8801223a 100644 (file)
@@ -74,26 +74,24 @@ Nico Coesel
 #include "config.h"
 #endif
 
-#include <string.h>
-#include "log.h"
 #include "mips32.h"
 #include "mips32_pracc.h"
 
 typedef struct {
-       u32 *local_iparam;
+       uint32_t *local_iparam;
        int num_iparam;
-       u32 *local_oparam;
+       uint32_t *local_oparam;
        int num_oparam;
-       u32 *code;
+       uint32_t *code;
        int code_len;
-       u32 stack[32];
+       uint32_t stack[32];
        int stack_offset;
        mips_ejtag_t *ejtag_info;
 } mips32_pracc_context;
 
-static int wait_for_pracc_rw(mips_ejtag_t *ejtag_info, u32 *ctrl)
+static int wait_for_pracc_rw(mips_ejtag_t *ejtag_info, uint32_t *ctrl)
 {
-       u32 ejtag_ctrl;
+       uint32_t ejtag_ctrl;
        
        while (1) 
        {
@@ -110,11 +108,11 @@ static int wait_for_pracc_rw(mips_ejtag_t *ejtag_info, u32 *ctrl)
        return ERROR_OK;
 }
 
-static int mips32_pracc_exec_read(mips32_pracc_context *ctx, u32 address)
+static int mips32_pracc_exec_read(mips32_pracc_context *ctx, uint32_t address)
 {
        mips_ejtag_t *ejtag_info = ctx->ejtag_info;
        int offset;
-       u32 ejtag_ctrl, data;
+       uint32_t ejtag_ctrl, data;
 
        if ((address >= MIPS32_PRACC_PARAM_IN)
                && (address <= MIPS32_PRACC_PARAM_IN + ctx->num_iparam * 4))
@@ -145,7 +143,7 @@ static int mips32_pracc_exec_read(mips32_pracc_context *ctx, u32 address)
                 * to start of debug vector */
                
                data = 0;
-               LOG_ERROR("Error reading unexpected address %8.8x", address);
+               LOG_ERROR("Error reading unexpected address %8.8" PRIx32 "", address);
                return ERROR_JTAG_DEVICE_ERROR;
        }
        
@@ -166,9 +164,9 @@ static int mips32_pracc_exec_read(mips32_pracc_context *ctx, u32 address)
        return ERROR_OK;
 }
 
-static int mips32_pracc_exec_write(mips32_pracc_context *ctx, u32 address)
+static int mips32_pracc_exec_write(mips32_pracc_context *ctx, uint32_t address)
 {
-       u32 ejtag_ctrl,data;
+       uint32_t ejtag_ctrl,data;
        int offset;
        mips_ejtag_t *ejtag_info = ctx->ejtag_info;
 
@@ -189,7 +187,7 @@ static int mips32_pracc_exec_write(mips32_pracc_context *ctx, u32 address)
                offset = (address - MIPS32_PRACC_PARAM_IN) / 4;
                ctx->local_iparam[offset] = data;
        }
-       else if ((address >= MIPS32_PRACC_PARAM_OUT )
+       else if ((address >= MIPS32_PRACC_PARAM_OUT)
                && (address <= MIPS32_PRACC_PARAM_OUT + ctx->num_oparam * 4))
        {
                offset = (address - MIPS32_PRACC_PARAM_OUT) / 4;
@@ -202,17 +200,17 @@ static int mips32_pracc_exec_write(mips32_pracc_context *ctx, u32 address)
        }
        else
        {
-               LOG_ERROR("Error writing unexpected address %8.8x", address);
+               LOG_ERROR("Error writing unexpected address %8.8" PRIx32 "", address);
                return ERROR_JTAG_DEVICE_ERROR;
        }
        
        return ERROR_OK;
 }
 
-int mips32_pracc_exec( mips_ejtag_t *ejtag_info, int code_len, u32 *code, int num_param_in, u32 *param_in, int num_param_out, u32 *param_out, int cycle)
+int mips32_pracc_exec(mips_ejtag_t *ejtag_info, int code_len, uint32_t *code, int num_param_in, uint32_t *param_in, int num_param_out, uint32_t *param_out, int cycle)
 {
-       u32 ejtag_ctrl;
-       u32 address, data;
+       uint32_t ejtag_ctrl;
+       uint32_t address, data;
        mips32_pracc_context ctx;
        int retval;
        int pass = 0;
@@ -271,27 +269,27 @@ int mips32_pracc_exec( mips_ejtag_t *ejtag_info, int code_len, u32 *code, int nu
        return ERROR_OK;
 }
 
-int mips32_pracc_read_mem(mips_ejtag_t *ejtag_info, u32 addr, int size, int count, void *buf)
+int mips32_pracc_read_mem(mips_ejtag_t *ejtag_info, uint32_t addr, int size, int count, void *buf)
 {
        switch (size)
        {
                case 1:
-                       return mips32_pracc_read_mem8(ejtag_info, addr, count, (u8*)buf);
+                       return mips32_pracc_read_mem8(ejtag_info, addr, count, (uint8_t*)buf);
                case 2:
-                       return mips32_pracc_read_mem16(ejtag_info, addr, count, (u16*)buf);
+                       return mips32_pracc_read_mem16(ejtag_info, addr, count, (uint16_t*)buf);
                case 4:
-                       if(count==1)
-                               return mips32_pracc_read_u32(ejtag_info, addr, (u32*)buf);
+                       if (count == 1)
+                               return mips32_pracc_read_u32(ejtag_info, addr, (uint32_t*)buf);
                        else
-                               return mips32_pracc_read_mem32(ejtag_info, addr, count, (u32*)buf);
+                               return mips32_pracc_read_mem32(ejtag_info, addr, count, (uint32_t*)buf);
        }
        
        return ERROR_OK;
 }
 
-int mips32_pracc_read_mem32(mips_ejtag_t *ejtag_info, u32 addr, int count, u32 *buf)
+int mips32_pracc_read_mem32(mips_ejtag_t *ejtag_info, uint32_t addr, int count, uint32_t *buf)
 {      
-       u32 code[] = {
+       uint32_t code[] = {
                                                                                                                        /* start: */
                MIPS32_MTC0(15,31,0),                                                           /* move $15 to COP0 DeSave */
                MIPS32_LUI(15,UPPER16(MIPS32_PRACC_STACK)),             /* $15 = MIPS32_PRACC_STACK */
@@ -303,9 +301,9 @@ int mips32_pracc_read_mem32(mips_ejtag_t *ejtag_info, u32 addr, int count, u32 *
                        
                MIPS32_LUI(8,UPPER16(MIPS32_PRACC_PARAM_IN)),           /* $8 = MIPS32_PRACC_PARAM_IN */
                MIPS32_ORI(8,8,LOWER16(MIPS32_PRACC_PARAM_IN)),
-               MIPS32_LW(9,0,8),                                                                       /* $9=mem[$8]; read addr */
-               MIPS32_LW(10,4,8),                                                                      /* $10=mem[$8+4]; read count */
-               MIPS32_LUI(11,UPPER16(MIPS32_PRACC_PARAM_OUT)),         /* $11=MIPS32_PRACC_PARAM_OUT */
+               MIPS32_LW(9,0,8),                                                                       /* $9 = mem[$8]; read addr */
+               MIPS32_LW(10,4,8),                                                                      /* $10 = mem[$8 + 4]; read count */
+               MIPS32_LUI(11,UPPER16(MIPS32_PRACC_PARAM_OUT)),         /* $11 = MIPS32_PRACC_PARAM_OUT */
                MIPS32_ORI(11,11,LOWER16(MIPS32_PRACC_PARAM_OUT)),
                MIPS32_NOP,
                                                                                                                        /* loop: */
@@ -316,8 +314,8 @@ int mips32_pracc_read_mem32(mips_ejtag_t *ejtag_info, u32 addr, int count, u32 *
                MIPS32_SW(8,0,11),                                                                      /* sw $8,0($11) */
                
                MIPS32_ADDI(10,10,NEG16(1)),                                            /* $10-- */
-               MIPS32_ADDI(9,9,4),                                                             /* $1+=4 */
-               MIPS32_ADDI(11,11,4),                                                           /* $11+=4 */
+               MIPS32_ADDI(9,9,4),                                                             /* $1 += 4 */
+               MIPS32_ADDI(11,11,4),                                                           /* $11 += 4 */
                
                MIPS32_NOP,
                MIPS32_B(NEG16(9)),                                                                     /* b loop */
@@ -336,7 +334,7 @@ int mips32_pracc_read_mem32(mips_ejtag_t *ejtag_info, u32 addr, int count, u32 *
        int retval = ERROR_OK;
        int blocksize;
        int bytesread;
-       u32 param_in[2];
+       uint32_t param_in[2];
        
        bytesread = 0;
        
@@ -363,9 +361,9 @@ int mips32_pracc_read_mem32(mips_ejtag_t *ejtag_info, u32 addr, int count, u32 *
        return retval;
 }
 
-int mips32_pracc_read_u32(mips_ejtag_t *ejtag_info, u32 addr, u32 *buf)
+int mips32_pracc_read_u32(mips_ejtag_t *ejtag_info, uint32_t addr, uint32_t *buf)
 {
-       u32 code[] = {
+       uint32_t code[] = {
                                                                                                                        /* start: */
                MIPS32_MTC0(15,31,0),                                                           /* move $15 to COP0 DeSave */
                MIPS32_LUI(15,UPPER16(MIPS32_PRACC_STACK)),             /* $15 = MIPS32_PRACC_STACK */
@@ -384,12 +382,12 @@ int mips32_pracc_read_u32(mips_ejtag_t *ejtag_info, u32 addr, u32 *buf)
        };
 
        int retval = ERROR_OK;
-       u32 param_in[1];
+       uint32_t param_in[1];
 
        param_in[0] = addr;
 
        if ((retval = mips32_pracc_exec(ejtag_info, sizeof(code)/sizeof(code[0]), code, 
-               sizeof(param_in)/sizeof(param_in[0]), param_in, sizeof(u32), buf, 1)) != ERROR_OK)
+               sizeof(param_in)/sizeof(param_in[0]), param_in, sizeof(uint32_t), buf, 1)) != ERROR_OK)
        {
                return retval;
        }
@@ -397,9 +395,9 @@ int mips32_pracc_read_u32(mips_ejtag_t *ejtag_info, u32 addr, u32 *buf)
        return retval;
 }
 
-int mips32_pracc_read_mem16(mips_ejtag_t *ejtag_info, u32 addr, int count, u16 *buf)
+int mips32_pracc_read_mem16(mips_ejtag_t *ejtag_info, uint32_t addr, int count, uint16_t *buf)
 {
-       u32 code[] = {
+       uint32_t code[] = {
                                                                                                                        /* start: */
                MIPS32_MTC0(15,31,0),                                                           /* move $15 to COP0 DeSave */
                MIPS32_LUI(15,UPPER16(MIPS32_PRACC_STACK)),             /* $15 = MIPS32_PRACC_STACK */
@@ -411,9 +409,9 @@ int mips32_pracc_read_mem16(mips_ejtag_t *ejtag_info, u32 addr, int count, u16 *
                        
                MIPS32_LUI(8,UPPER16(MIPS32_PRACC_PARAM_IN)),           /* $8 = MIPS32_PRACC_PARAM_IN */
                MIPS32_ORI(8,8,LOWER16(MIPS32_PRACC_PARAM_IN)),
-               MIPS32_LW(9,0,8),                                                                       /* $9=mem[$8]; read addr */
-               MIPS32_LW(10,4,8),                                                                      /* $10=mem[$8+4]; read count */
-               MIPS32_LUI(11,UPPER16(MIPS32_PRACC_PARAM_OUT)),         /* $11=MIPS32_PRACC_PARAM_OUT */
+               MIPS32_LW(9,0,8),                                                                       /* $9 = mem[$8]; read addr */
+               MIPS32_LW(10,4,8),                                                                      /* $10 = mem[$8 + 4]; read count */
+               MIPS32_LUI(11,UPPER16(MIPS32_PRACC_PARAM_OUT)),         /* $11 = MIPS32_PRACC_PARAM_OUT */
                MIPS32_ORI(11,11,LOWER16(MIPS32_PRACC_PARAM_OUT)),
                MIPS32_NOP,
                                                                                                                        /* loop: */
@@ -424,8 +422,8 @@ int mips32_pracc_read_mem16(mips_ejtag_t *ejtag_info, u32 addr, int count, u16 *
                MIPS32_SW(8,0,11),                                                                      /* sw $8,0($11) */
                
                MIPS32_ADDI(10,10,NEG16(1)),                                            /* $10-- */
-               MIPS32_ADDI(9,9,2),                                                             /* $9+=2 */
-               MIPS32_ADDI(11,11,4),                                                           /* $11+=4 */
+               MIPS32_ADDI(9,9,2),                                                             /* $9 += 2 */
+               MIPS32_ADDI(11,11,4),                                                           /* $11 += 4 */
                MIPS32_NOP,
                MIPS32_B(NEG16(9)),                                                                     /* b loop */
                MIPS32_NOP,
@@ -441,13 +439,13 @@ int mips32_pracc_read_mem16(mips_ejtag_t *ejtag_info, u32 addr, int count, u16 *
        };
 
 //     /* TODO remove array */
-       u32 param_out[count];
+       uint32_t param_out[count];
        int i;
        
 //     int retval;
        int blocksize;
        int bytesread;
-       u32 param_in[2];
+       uint32_t param_in[2];
        
        bytesread = 0;
        
@@ -476,9 +474,9 @@ int mips32_pracc_read_mem16(mips_ejtag_t *ejtag_info, u32 addr, int count, u16 *
        return ERROR_OK;
 }
 
-int mips32_pracc_read_mem8(mips_ejtag_t *ejtag_info, u32 addr, int count, u8 *buf)
+int mips32_pracc_read_mem8(mips_ejtag_t *ejtag_info, uint32_t addr, int count, uint8_t *buf)
 {
-       u32 code[] = {
+       uint32_t code[] = {
                                                                                                                        /* start: */
                MIPS32_MTC0(15,31,0),                                                           /* move $15 to COP0 DeSave */
                MIPS32_LUI(15,UPPER16(MIPS32_PRACC_STACK)),             /* $15 = MIPS32_PRACC_STACK */
@@ -490,9 +488,9 @@ int mips32_pracc_read_mem8(mips_ejtag_t *ejtag_info, u32 addr, int count, u8 *bu
                        
                MIPS32_LUI(8,UPPER16(MIPS32_PRACC_PARAM_IN)),           /* $8 = MIPS32_PRACC_PARAM_IN */
                MIPS32_ORI(8,8,LOWER16(MIPS32_PRACC_PARAM_IN)),
-               MIPS32_LW(9,0,8),                                                                       /* $9=mem[$8]; read addr */
-               MIPS32_LW(10,4,8),                                                                      /* $10=mem[$8+4]; read count */
-               MIPS32_LUI(11,UPPER16(MIPS32_PRACC_PARAM_OUT)),         /* $11=MIPS32_PRACC_PARAM_OUT */
+               MIPS32_LW(9,0,8),                                                                       /* $9 = mem[$8]; read addr */
+               MIPS32_LW(10,4,8),                                                                      /* $10 = mem[$8 + 4]; read count */
+               MIPS32_LUI(11,UPPER16(MIPS32_PRACC_PARAM_OUT)),         /* $11 = MIPS32_PRACC_PARAM_OUT */
                MIPS32_ORI(11,11,LOWER16(MIPS32_PRACC_PARAM_OUT)),
                MIPS32_NOP,
                                                                                                                        /* loop: */
@@ -503,8 +501,8 @@ int mips32_pracc_read_mem8(mips_ejtag_t *ejtag_info, u32 addr, int count, u8 *bu
                MIPS32_SW(8,0,11),                                                                      /* sw $8,0($11) */
                
                MIPS32_ADDI(10,10,NEG16(1)),                                            /* $10-- */
-               MIPS32_ADDI(9,9,1),                                                             /* $9+=1 */
-               MIPS32_ADDI(11,11,4),                                                           /* $11+=4 */
+               MIPS32_ADDI(9,9,1),                                                             /* $9 += 1 */
+               MIPS32_ADDI(11,11,4),                                                           /* $11 += 4 */
                MIPS32_NOP,
                MIPS32_B(NEG16(9)),                                                                     /* b loop */
                MIPS32_NOP,
@@ -520,13 +518,13 @@ int mips32_pracc_read_mem8(mips_ejtag_t *ejtag_info, u32 addr, int count, u8 *bu
        };
        
 //     /* TODO remove array */
-       u32 param_out[count];
+       uint32_t param_out[count];
        int i;
        
 //     int retval;
        int blocksize;
        int bytesread;
-       u32 param_in[2];
+       uint32_t param_in[2];
        
        bytesread = 0;
        
@@ -555,29 +553,29 @@ int mips32_pracc_read_mem8(mips_ejtag_t *ejtag_info, u32 addr, int count, u8 *bu
        return ERROR_OK;
 }
 
-int mips32_pracc_write_mem(mips_ejtag_t *ejtag_info, u32 addr, int size, int count, void *buf)
+int mips32_pracc_write_mem(mips_ejtag_t *ejtag_info, uint32_t addr, int size, int count, void *buf)
 {
        switch (size)
        {
                case 1:
-                       return mips32_pracc_write_mem8(ejtag_info, addr, count, (u8*)buf);
+                       return mips32_pracc_write_mem8(ejtag_info, addr, count, (uint8_t*)buf);
                case 2:
-                       return mips32_pracc_write_mem16(ejtag_info, addr, count,(u16*)buf);
+                       return mips32_pracc_write_mem16(ejtag_info, addr, count,(uint16_t*)buf);
                case 4:
-                       if(count==1)
-                               return mips32_pracc_write_u32(ejtag_info, addr, (u32*)buf);
+                       if (count == 1)
+                               return mips32_pracc_write_u32(ejtag_info, addr, (uint32_t*)buf);
                        else
-                               return mips32_pracc_write_mem32(ejtag_info, addr, count, (u32*)buf);
+                               return mips32_pracc_write_mem32(ejtag_info, addr, count, (uint32_t*)buf);
        }
        
        return ERROR_OK;
 }
 
-int mips32_pracc_write_mem32(mips_ejtag_t *ejtag_info, u32 addr, int count, u32 *buf)
+int mips32_pracc_write_mem32(mips_ejtag_t *ejtag_info, uint32_t addr, int count, uint32_t *buf)
 {
 
 //NC: use destination pointer as loop counter (last address is in $10)
-       u32 code[] = {
+       uint32_t code[] = {
                                                                                                                        /* start: */
                MIPS32_MTC0(15,31,0),                                                           /* move $15 to COP0 DeSave */
                MIPS32_LUI(15,UPPER16(MIPS32_PRACC_STACK)),             /* $15 = MIPS32_PRACC_STACK */
@@ -590,15 +588,15 @@ int mips32_pracc_write_mem32(mips_ejtag_t *ejtag_info, u32 addr, int count, u32
                MIPS32_ADDI(8,15,NEG16(MIPS32_PRACC_STACK-MIPS32_PRACC_PARAM_IN)),  //$8= MIPS32_PRACC_PARAM_IN
                MIPS32_LW(9,0,8),                                                                       /* Load write addr to $9 */
                MIPS32_LW(10,4,8),      //last address                                                                  /* Load write count to $10 */
-               MIPS32_ADDI(8,8,8),     // $8+=8 beginning of data
+               MIPS32_ADDI(8,8,8),     // $8 += 8 beginning of data
 
 //loop:
                MIPS32_LW(11,0,8),                                                                      /* lw $11,0($8), Load $11 with the word @mem[$8] */
                MIPS32_SW(11,0,9),                                                                      /* sw $11,0($9) */
                
-               MIPS32_ADDI(9,9,4),                                                             /* $9+=4 */
+               MIPS32_ADDI(9,9,4),                                                             /* $9 += 4 */
                MIPS32_BNE(10,9,NEG16(4)),  //was 9 BNE $10, 9, loop                                                                    /* b loop */
-               MIPS32_ADDI(8,8,4),  //this instruction is part of the loop (one delay slot)!   /* $8+=4 */
+               MIPS32_ADDI(8,8,4),  //this instruction is part of the loop (one delay slot)!   /* $8 += 4 */
                                                                                                                        /* end: */
                MIPS32_LW(11,0,15),                                                             /* lw $11,($15) */
                MIPS32_LW(10,0,15),                                                             /* lw $10,($15) */
@@ -610,11 +608,11 @@ int mips32_pracc_write_mem32(mips_ejtag_t *ejtag_info, u32 addr, int count, u32
        };
        
        /* TODO remove array */
-       u32 param_in[count+2];
+       uint32_t param_in[count + 2];
        param_in[0] = addr;
-       param_in[1] = addr + count * sizeof(u32);       //last address
+       param_in[1] = addr + count * sizeof(uint32_t);  //last address
     
-       memcpy(&param_in[2], buf, count * sizeof(u32));
+       memcpy(&param_in[2], buf, count * sizeof(uint32_t));
        
        mips32_pracc_exec(ejtag_info, sizeof(code)/sizeof(code[0]), code, \
                sizeof(param_in)/sizeof(param_in[0]),param_in, 0, NULL, 1);
@@ -622,9 +620,9 @@ int mips32_pracc_write_mem32(mips_ejtag_t *ejtag_info, u32 addr, int count, u32
        return ERROR_OK;
 }
 
-int mips32_pracc_write_u32(mips_ejtag_t *ejtag_info, u32 addr, u32 *buf)
+int mips32_pracc_write_u32(mips_ejtag_t *ejtag_info, uint32_t addr, uint32_t *buf)
 {
-       u32 code[] = {
+       uint32_t code[] = {
                                                                                                                        /* start: */
                MIPS32_MTC0(15,31,0),                                                           /* move $15 to COP0 DeSave */
                MIPS32_LUI(15,UPPER16(MIPS32_PRACC_STACK)),             /* $15 = MIPS32_PRACC_STACK */
@@ -645,7 +643,7 @@ int mips32_pracc_write_u32(mips_ejtag_t *ejtag_info, u32 addr, u32 *buf)
        };
 
        /* TODO remove array */
-       u32 param_in[1+1];
+       uint32_t param_in[1 + 1];
        param_in[0] = addr;
        param_in[1] = *buf;
 
@@ -655,9 +653,9 @@ int mips32_pracc_write_u32(mips_ejtag_t *ejtag_info, u32 addr, u32 *buf)
        return ERROR_OK;
 }
 
-int mips32_pracc_write_mem16(mips_ejtag_t *ejtag_info, u32 addr, int count, u16 *buf)
+int mips32_pracc_write_mem16(mips_ejtag_t *ejtag_info, uint32_t addr, int count, uint16_t *buf)
 {
-       u32 code[] = {
+       uint32_t code[] = {
                                                                                                                        /* start: */
                MIPS32_MTC0(15,31,0),                                                           /* move $15 to COP0 DeSave */
                MIPS32_LUI(15,UPPER16(MIPS32_PRACC_STACK)),             /* $15 = MIPS32_PRACC_STACK */
@@ -671,7 +669,7 @@ int mips32_pracc_write_mem16(mips_ejtag_t *ejtag_info, u32 addr, int count, u16
                MIPS32_ORI(8,8,LOWER16(MIPS32_PRACC_PARAM_IN)),
                MIPS32_LW(9,0,8),                                                                       /* Load write addr to $9 */
                MIPS32_LW(10,4,8),                                                                      /* Load write count to $10 */
-               MIPS32_ADDI(8,8,8),                                                             /* $8+=8 */
+               MIPS32_ADDI(8,8,8),                                                             /* $8 += 8 */
                MIPS32_NOP,
                                                                                                                        /* loop: */
                MIPS32_BEQ(0,10,9),                                                                     /* beq $0, $10, end */
@@ -681,8 +679,8 @@ int mips32_pracc_write_mem16(mips_ejtag_t *ejtag_info, u32 addr, int count, u16
                MIPS32_SH(11,0,9),                                                                      /* sh $11,0($9) */
                
                MIPS32_ADDI(10,10,NEG16(1)),                                            /* $10-- */
-               MIPS32_ADDI(9,9,2),                                                             /* $9+=2 */
-               MIPS32_ADDI(8,8,4),                                                             /* $8+=4 */
+               MIPS32_ADDI(9,9,2),                                                             /* $9 += 2 */
+               MIPS32_ADDI(8,8,4),                                                             /* $8 += 4 */
                
                MIPS32_NOP,
                MIPS32_B(NEG16(9)),                                                                     /* b loop */
@@ -699,14 +697,14 @@ int mips32_pracc_write_mem16(mips_ejtag_t *ejtag_info, u32 addr, int count, u16
        };
        
        /* TODO remove array */
-       u32 param_in[count+2];
+       uint32_t param_in[count + 2];
        int i;
        param_in[0] = addr;
        param_in[1] = count;
        
        for (i = 0; i < count; i++)
        {
-               param_in[i+2] = buf[i];
+               param_in[i + 2] = buf[i];
        }
        
        mips32_pracc_exec(ejtag_info, sizeof(code)/sizeof(code[0]), code, \
@@ -715,9 +713,9 @@ int mips32_pracc_write_mem16(mips_ejtag_t *ejtag_info, u32 addr, int count, u16
        return ERROR_OK;
 }
 
-int mips32_pracc_write_mem8(mips_ejtag_t *ejtag_info, u32 addr, int count, u8 *buf)
+int mips32_pracc_write_mem8(mips_ejtag_t *ejtag_info, uint32_t addr, int count, uint8_t *buf)
 {
-       u32 code[] = {
+       uint32_t code[] = {
                                                                                                                        /* start: */
                MIPS32_MTC0(15,31,0),                                                           /* move $15 to COP0 DeSave */
                MIPS32_LUI(15,UPPER16(MIPS32_PRACC_STACK)),             /* $15 = MIPS32_PRACC_STACK */
@@ -731,7 +729,7 @@ int mips32_pracc_write_mem8(mips_ejtag_t *ejtag_info, u32 addr, int count, u8 *b
                MIPS32_ORI(8,8,LOWER16(MIPS32_PRACC_PARAM_IN)),
                MIPS32_LW(9,0,8),                                                                       /* Load write addr to $9 */
                MIPS32_LW(10,4,8),                                                                      /* Load write count to $10 */
-               MIPS32_ADDI(8,8,8),                                                             /* $8+=8 */
+               MIPS32_ADDI(8,8,8),                                                             /* $8 += 8 */
                MIPS32_NOP,
                                                                                                                        /* loop: */
                MIPS32_BEQ(0,10,9),                                                                     /* beq $0, $10, end */
@@ -741,8 +739,8 @@ int mips32_pracc_write_mem8(mips_ejtag_t *ejtag_info, u32 addr, int count, u8 *b
                MIPS32_SB(11,0,9),                                                                      /* sb $11,0($9) */
                
                MIPS32_ADDI(10,10,NEG16(1)),                                            /* $10-- */
-               MIPS32_ADDI(9,9,1),                                                             /* $9+=1 */
-               MIPS32_ADDI(8,8,4),                                                             /* $8+=4 */
+               MIPS32_ADDI(9,9,1),                                                             /* $9 += 1 */
+               MIPS32_ADDI(8,8,4),                                                             /* $8 += 4 */
                
                MIPS32_NOP,
                MIPS32_B(NEG16(9)),                                                                     /* b loop */
@@ -759,7 +757,7 @@ int mips32_pracc_write_mem8(mips_ejtag_t *ejtag_info, u32 addr, int count, u8 *b
        };
        
        /* TODO remove array */
-       u32 param_in[count+2];
+       uint32_t param_in[count + 2];
        int retval;
        int i;
        param_in[0] = addr;
@@ -767,7 +765,7 @@ int mips32_pracc_write_mem8(mips_ejtag_t *ejtag_info, u32 addr, int count, u8 *b
        
        for (i = 0; i < count; i++)
        {
-               param_in[i+2] = buf[i];
+               param_in[i + 2] = buf[i];
        }
        
        retval = mips32_pracc_exec(ejtag_info, sizeof(code)/sizeof(code[0]), code, \
@@ -776,9 +774,9 @@ int mips32_pracc_write_mem8(mips_ejtag_t *ejtag_info, u32 addr, int count, u8 *b
        return retval;
 }
 
-int mips32_pracc_write_regs(mips_ejtag_t *ejtag_info, u32 *regs)
+int mips32_pracc_write_regs(mips_ejtag_t *ejtag_info, uint32_t *regs)
 {
-       u32 code[] = {
+       uint32_t code[] = {
                                                                                                                /* start: */
                MIPS32_LUI(2,UPPER16(MIPS32_PRACC_PARAM_IN)),   /* $2 = MIPS32_PRACC_PARAM_IN */
                MIPS32_ORI(2,2,LOWER16(MIPS32_PRACC_PARAM_IN)),
@@ -848,9 +846,9 @@ int mips32_pracc_write_regs(mips_ejtag_t *ejtag_info, u32 *regs)
        return retval;
 }
 
-int mips32_pracc_read_regs(mips_ejtag_t *ejtag_info, u32 *regs)
+int mips32_pracc_read_regs(mips_ejtag_t *ejtag_info, uint32_t *regs)
 {
-       u32 code[] = {
+       uint32_t code[] = {
                                                                                                                /* start: */
                MIPS32_MTC0(2,31,0),                                                    /* move $2 to COP0 DeSave */
                MIPS32_LUI(2,UPPER16(MIPS32_PRACC_PARAM_OUT)),  /* $2 = MIPS32_PRACC_PARAM_OUT */