Code Review / openocd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (from parent 1: 3a59ff8)
- slight mips32 cleanup/reformat
authorntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Wed, 12 Nov 2008 14:53:19 +0000 (14:53 +0000)
committerntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Wed, 12 Nov 2008 14:53:19 +0000 (14:53 +0000)
- add missing svn props

git-svn-id: svn://svn.berlios.de/openocd/trunk@1159 b42882b7-edfa-0310-969c-e2dbd0fdcd60

src/target/mips32_dmaacc.c patch | blob | history
src/target/mips32_pracc.c patch | blob | history
src/target/mips_ejtag.h patch | blob | history
src/target/mips_m4k.c patch | blob | history
testing/examples/PIC32/BlinkingLeds.c patch | blob | history
testing/examples/PIC32/readme.txt patch | blob | history

diff --git a/src/target/mips32_dmaacc.c b/src/target/mips32_dmaacc.c
index ddcfb97d781c3cf9f73f7d1c0bac6f3b256ce404..6440f948871d9d498468099b7824085453abdf17 100644 (file)
--- a/src/target/mips32_dmaacc.c
+++ b/src/target/mips32_dmaacc.c
@@ -45,40 +45,42 @@ static int ejtag_dma_read(mips_ejtag_t *ejtag_info, u32 addr, u32 *data)
 {
        u32 v;
        u32 ejtag_ctrl;
-       int   retries = RETRY_ATTEMPTS;
+       int retries = RETRY_ATTEMPTS;
 
 begin_ejtag_dma_read:
 
-       // Setup Address
+       /* Setup Address */
        v = addr;
        mips_ejtag_set_instr(ejtag_info, EJTAG_INST_ADDRESS, NULL);
        mips_ejtag_drscan_32(ejtag_info, &v);
 
-       // Initiate DMA Read & set DSTRT
+       /* 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_WORD | EJTAG_CTRL_DSTRT | ejtag_info->ejtag_ctrl;
        mips_ejtag_drscan_32(ejtag_info, &ejtag_ctrl);
 
-       // Wait for DSTRT to Clear
+       /* 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);
 
-       // Read Data
+       /* Read Data */
        mips_ejtag_set_instr(ejtag_info, EJTAG_INST_DATA, NULL);
        mips_ejtag_drscan_32(ejtag_info, data);
 
-       // Clear DMA & Check DERR
+       /* Clear DMA & Check DERR */
        mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL, NULL);
        ejtag_ctrl = ejtag_info->ejtag_ctrl;
        mips_ejtag_drscan_32(ejtag_info, &ejtag_ctrl);
        if (ejtag_ctrl  & EJTAG_CTRL_DERR)
        {
                if (retries--) {
-                       printf("DMA Read Addr = %08x  Data = ERROR ON READ (retrying)\n", addr);
+                       LOG_ERROR("DMA Read Addr = %08x  Data = ERROR ON READ (retrying)\n", addr);
                        goto begin_ejtag_dma_read;
-               } else  printf("DMA Read Addr = %08x  Data = ERROR ON READ\n", addr);
+               }
+               else
+                       LOG_ERROR("DMA Read Addr = %08x  Data = ERROR ON READ\n", addr);
                return ERROR_JTAG_DEVICE_ERROR;
        }
 
@@ -89,46 +91,50 @@ static int ejtag_dma_read_h(mips_ejtag_t *ejtag_info, u32 addr, u16 *data)
 {
        u32 v;
        u32 ejtag_ctrl;
-       int   retries = RETRY_ATTEMPTS;
+       int retries = RETRY_ATTEMPTS;
 
 begin_ejtag_dma_read_h:
 
-       // Setup Address
+       /* Setup Address */
        v = addr;
        mips_ejtag_set_instr(ejtag_info, EJTAG_INST_ADDRESS, NULL);
        mips_ejtag_drscan_32(ejtag_info, &v);
 
-       // Initiate DMA Read & set DSTRT
+       /* 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_drscan_32(ejtag_info, &ejtag_ctrl);
 
-       // Wait for DSTRT to Clear
+       /* 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);
 
-       // Read Data
+       /* Read Data */
        mips_ejtag_set_instr(ejtag_info, EJTAG_INST_DATA, NULL);
        mips_ejtag_drscan_32(ejtag_info, &v);
 
-       // Clear DMA & Check DERR
+       /* Clear DMA & Check DERR */
        mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL, NULL);
        ejtag_ctrl = ejtag_info->ejtag_ctrl;
        mips_ejtag_drscan_32(ejtag_info, &ejtag_ctrl);
        if (ejtag_ctrl  & EJTAG_CTRL_DERR)
        {
                if (retries--) {
-                       printf("DMA Read Addr = %08x  Data = ERROR ON READ (retrying)\n", addr);
+                       LOG_ERROR("DMA Read Addr = %08x  Data = ERROR ON READ (retrying)\n", addr);
                        goto begin_ejtag_dma_read_h;
-               } else  printf("DMA Read Addr = %08x  Data = ERROR ON READ\n", addr);
+               }
+               else
+                       LOG_ERROR("DMA Read Addr = %08x  Data = ERROR ON READ\n", addr);
                return ERROR_JTAG_DEVICE_ERROR;
        }
 
-       // Handle the bigendian/littleendian
-       if ( addr & 0x2 )  *data = (v>>16)&0xffff ;
-       else               *data = (v&0x0000ffff) ;
+       /* Handle the bigendian/littleendian */
+       if (addr & 0x2)
+               *data = (v >> 16) & 0xffff;
+       else
+               *data = (v & 0x0000ffff);
 
        return ERROR_OK;
 }
@@ -137,49 +143,59 @@ static int ejtag_dma_read_b(mips_ejtag_t *ejtag_info, u32 addr, u8 *data)
 {
        u32 v;
        u32 ejtag_ctrl;
-       int   retries = RETRY_ATTEMPTS;
+       int retries = RETRY_ATTEMPTS;
 
 begin_ejtag_dma_read_b:
 
-       // Setup Address
+       /* Setup Address */
        v = addr;
        mips_ejtag_set_instr(ejtag_info, EJTAG_INST_ADDRESS, NULL);
        mips_ejtag_drscan_32(ejtag_info, &v);
 
-       // Initiate DMA Read & set DSTRT
+       /* 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_BYTE | EJTAG_CTRL_DSTRT | ejtag_info->ejtag_ctrl;
        mips_ejtag_drscan_32(ejtag_info, &ejtag_ctrl);
 
-       // Wait for DSTRT to Clear
+       /* 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);
 
-       // Read Data
+       /* Read Data */
        mips_ejtag_set_instr(ejtag_info, EJTAG_INST_DATA, NULL);
        mips_ejtag_drscan_32(ejtag_info, &v);
 
-       // Clear DMA & Check DERR
+       /* Clear DMA & Check DERR */
        mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL, NULL);
        ejtag_ctrl = ejtag_info->ejtag_ctrl;
        mips_ejtag_drscan_32(ejtag_info, &ejtag_ctrl);
        if (ejtag_ctrl  & EJTAG_CTRL_DERR)
        {
                if (retries--) {
-                       printf("DMA Read Addr = %08x  Data = ERROR ON READ (retrying)\n", addr);
+                       LOG_ERROR("DMA Read Addr = %08x  Data = ERROR ON READ (retrying)\n", addr);
                        goto begin_ejtag_dma_read_b;
-               } else  printf("DMA Read Addr = %08x  Data = ERROR ON READ\n", addr);
+               }
+               else
+                       LOG_ERROR("DMA Read Addr = %08x  Data = ERROR ON READ\n", addr);
                return ERROR_JTAG_DEVICE_ERROR;
        }
 
        // Handle the bigendian/littleendian
-       switch(addr & 0x3) {
-       case 0:  *data =  v      & 0xff; break;
-       case 1:  *data = (v>>8)  & 0xff; break;
-       case 2:  *data = (v>>16) & 0xff; break;
-       case 3:  *data = (v>>24) & 0xff; break;
+       switch (addr & 0x3) {
+               case 0:
+                       *data = v & 0xff;
+                       break;
+               case 1:
+                       *data = (v >> 8) & 0xff;
+                       break;
+               case 2:
+                       *data = (v >> 16) & 0xff;
+                       break;
+               case 3: 
+                       *data = (v >> 24) & 0xff;
+                       break;
        }
 
        return ERROR_OK;
@@ -189,41 +205,43 @@ static int ejtag_dma_write(mips_ejtag_t *ejtag_info, u32 addr, u32 data)
 {
        u32 v;
        u32 ejtag_ctrl;
-       int   retries = RETRY_ATTEMPTS;
+       int retries = RETRY_ATTEMPTS;
 
 begin_ejtag_dma_write:
 
-       // Setup Address
+       /* Setup Address */
        v = addr;
        mips_ejtag_set_instr(ejtag_info, EJTAG_INST_ADDRESS, NULL);
        mips_ejtag_drscan_32(ejtag_info, &v);
 
-       // Setup Data
+       /* Setup Data */
        v = data;
        mips_ejtag_set_instr(ejtag_info, EJTAG_INST_DATA, NULL);
        mips_ejtag_drscan_32(ejtag_info, &v);
 
-       // Initiate DMA Write & set DSTRT
+       /* Initiate DMA Write & set DSTRT */
        mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL, NULL);
        ejtag_ctrl = EJTAG_CTRL_DMAACC | EJTAG_CTRL_DMA_WORD | EJTAG_CTRL_DSTRT | ejtag_info->ejtag_ctrl;
        mips_ejtag_drscan_32(ejtag_info, &ejtag_ctrl);
 
-       // Wait for DSTRT to Clear
+       /* 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);
 
-       // Clear DMA & Check DERR
+       /* Clear DMA & Check DERR */
        mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL, NULL);
        ejtag_ctrl = ejtag_info->ejtag_ctrl;
        mips_ejtag_drscan_32(ejtag_info, &ejtag_ctrl);
        if (ejtag_ctrl  & EJTAG_CTRL_DERR)
        {
                if (retries--) {
-                       printf("DMA Write Addr = %08x  Data = ERROR ON WRITE (retrying)\n", addr);
+                       LOG_ERROR("DMA Write Addr = %08x  Data = ERROR ON WRITE (retrying)\n", addr);
                        goto begin_ejtag_dma_write;
-               } else  printf("DMA Write Addr = %08x  Data = ERROR ON WRITE\n", addr);
+               }
+               else
+                       LOG_ERROR("DMA Write Addr = %08x  Data = ERROR ON WRITE\n", addr);
                return ERROR_JTAG_DEVICE_ERROR;
        }
 
@@ -234,46 +252,47 @@ static int ejtag_dma_write_h(mips_ejtag_t *ejtag_info, u32 addr, u32 data)
 {
        u32 v;
        u32 ejtag_ctrl;
-       int   retries = RETRY_ATTEMPTS;
-
+       int retries = RETRY_ATTEMPTS;
 
-       // Handle the bigendian/littleendian
+       /* Handle the bigendian/littleendian */
        data &= 0xffff;
-       data |= data<<16;
+       data |= data << 16;
 
 begin_ejtag_dma_write_h:
 
-       // Setup Address
+       /* Setup Address */
        v = addr;
        mips_ejtag_set_instr(ejtag_info, EJTAG_INST_ADDRESS, NULL);
        mips_ejtag_drscan_32(ejtag_info, &v);
 
-       // Setup Data
+       /* Setup Data */
        v = data;
        mips_ejtag_set_instr(ejtag_info, EJTAG_INST_DATA, NULL);
        mips_ejtag_drscan_32(ejtag_info, &v);
 
-       // Initiate DMA Write & set DSTRT
+       /* Initiate DMA Write & set DSTRT */
        mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL, NULL);
        ejtag_ctrl = EJTAG_CTRL_DMAACC | EJTAG_CTRL_DMA_HALFWORD | EJTAG_CTRL_DSTRT | ejtag_info->ejtag_ctrl;
        mips_ejtag_drscan_32(ejtag_info, &ejtag_ctrl);
 
-       // Wait for DSTRT to Clear
+       /* 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);
 
-       // Clear DMA & Check DERR
+       /* Clear DMA & Check DERR */
        mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL, NULL);
        ejtag_ctrl = ejtag_info->ejtag_ctrl;
        mips_ejtag_drscan_32(ejtag_info, &ejtag_ctrl);
        if (ejtag_ctrl  & EJTAG_CTRL_DERR)
        {
                if (retries--) {
-                       printf("DMA Write Addr = %08x  Data = ERROR ON WRITE (retrying)\n", addr);
+                       LOG_ERROR("DMA Write Addr = %08x  Data = ERROR ON WRITE (retrying)\n", addr);
                        goto begin_ejtag_dma_write_h;
-               } else  printf("DMA Write Addr = %08x  Data = ERROR ON WRITE\n", addr);
+               }
+               else
+                       LOG_ERROR("DMA Write Addr = %08x  Data = ERROR ON WRITE\n", addr);
                return ERROR_JTAG_DEVICE_ERROR;
        }
 
@@ -284,47 +303,48 @@ static int ejtag_dma_write_b(mips_ejtag_t *ejtag_info, u32 addr, u32 data)
 {
        u32 v;
        u32 ejtag_ctrl;
-       int   retries = RETRY_ATTEMPTS;
-
+       int retries = RETRY_ATTEMPTS;
 
-       // Handle the bigendian/littleendian
+       /* Handle the bigendian/littleendian */
        data &= 0xff;
-       data |= data<<8;
-       data |= data<<16;
+       data |= data << 8;
+       data |= data << 16;
 
 begin_ejtag_dma_write_b:
 
-       // Setup Address
+       /*  Setup Address*/
        v = addr;
        mips_ejtag_set_instr(ejtag_info, EJTAG_INST_ADDRESS, NULL);
        mips_ejtag_drscan_32(ejtag_info, &v);
 
-       // Setup Data
+       /* Setup Data */
        v = data;
        mips_ejtag_set_instr(ejtag_info, EJTAG_INST_DATA, NULL);
        mips_ejtag_drscan_32(ejtag_info, &v);
 
-       // Initiate DMA Write & set DSTRT
+       /* Initiate DMA Write & set DSTRT */
        mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL, NULL);
        ejtag_ctrl = EJTAG_CTRL_DMAACC | EJTAG_CTRL_DMA_BYTE | EJTAG_CTRL_DSTRT | ejtag_info->ejtag_ctrl;
        mips_ejtag_drscan_32(ejtag_info, &ejtag_ctrl);
 
-       // Wait for DSTRT to Clear
+       /* 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);
 
-       // Clear DMA & Check DERR
+       /* Clear DMA & Check DERR */
        mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL, NULL);
        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--) {
-                       printf("DMA Write Addr = %08x  Data = ERROR ON WRITE (retrying)\n", addr);
+                       LOG_ERROR("DMA Write Addr = %08x  Data = ERROR ON WRITE (retrying)\n", addr);
                        goto begin_ejtag_dma_write_b;
-               } else  printf("DMA Write Addr = %08x  Data = ERROR ON WRITE\n", addr);
+               }
+               else
+                       LOG_ERROR("DMA Write Addr = %08x  Data = ERROR ON WRITE\n", addr);
                return ERROR_JTAG_DEVICE_ERROR;
        }
 
@@ -351,8 +371,8 @@ int mips32_dmaacc_read_mem32(mips_ejtag_t *ejtag_info, u32 addr, int count, u32
        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;
        }
 
@@ -364,8 +384,8 @@ int mips32_dmaacc_read_mem16(mips_ejtag_t *ejtag_info, u32 addr, int count, u16
        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;
        }
 
@@ -377,8 +397,8 @@ int mips32_dmaacc_read_mem8(mips_ejtag_t *ejtag_info, u32 addr, int count, u8 *b
        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;
        }
 
@@ -405,8 +425,8 @@ int mips32_dmaacc_write_mem32(mips_ejtag_t *ejtag_info, u32 addr, int count, u32
        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;
        }
 
@@ -418,8 +438,8 @@ int mips32_dmaacc_write_mem16(mips_ejtag_t *ejtag_info, u32 addr, int count, u16
        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;
        }
 
@@ -431,8 +451,8 @@ int mips32_dmaacc_write_mem8(mips_ejtag_t *ejtag_info, u32 addr, int count, u8 *
        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;
        }
 
diff --git a/src/target/mips32_pracc.c b/src/target/mips32_pracc.c
index 8e17e05c71c71e157b2f9dc9e23b9cc9c348c90d..871b3f2119ec2039cc7eaba88c513592108cd41f 100644 (file)
--- a/src/target/mips32_pracc.c
+++ b/src/target/mips32_pracc.c
@@ -234,7 +234,7 @@ int mips32_pracc_read_mem32(mips_ejtag_t *ejtag_info, u32 addr, int count, u32 *
                MIPS32_SW(8,0,15),                                                                      /* sw $8,($15) */
                MIPS32_SW(9,0,15),                                                                      /* sw $9,($15) */
                MIPS32_SW(10,0,15),                                                             /* sw $10,($15) */
-               MIPS32_SW(11,0,15),                                                             /* sw $10,($15) */
+               MIPS32_SW(11,0,15),                                                             /* sw $11,($15) */
                        
                MIPS32_LUI(8,UPPER16(MIPS32_PRACC_PARAM_IN)),           /* $8 = MIPS32_PRACC_PARAM_IN */
                MIPS32_ORI(8,8,LOWER16(MIPS32_PRACC_PARAM_IN)),
@@ -308,7 +308,7 @@ int mips32_pracc_read_mem16(mips_ejtag_t *ejtag_info, u32 addr, int count, u16 *
                MIPS32_SW(8,0,15),                                                                      /* sw $8,($15) */
                MIPS32_SW(9,0,15),                                                                      /* sw $9,($15) */
                MIPS32_SW(10,0,15),                                                             /* sw $10,($15) */
-               MIPS32_SW(11,0,15),                                                             /* sw $10,($15) */
+               MIPS32_SW(11,0,15),                                                             /* sw $11,($15) */
                        
                MIPS32_LUI(8,UPPER16(MIPS32_PRACC_PARAM_IN)),           /* $8 = MIPS32_PRACC_PARAM_IN */
                MIPS32_ORI(8,8,LOWER16(MIPS32_PRACC_PARAM_IN)),
@@ -387,7 +387,7 @@ int mips32_pracc_read_mem8(mips_ejtag_t *ejtag_info, u32 addr, int count, u8 *bu
                MIPS32_SW(8,0,15),                                                                      /* sw $8,($15) */
                MIPS32_SW(9,0,15),                                                                      /* sw $9,($15) */
                MIPS32_SW(10,0,15),                                                             /* sw $10,($15) */
-               MIPS32_SW(11,0,15),                                                             /* sw $10,($15) */
+               MIPS32_SW(11,0,15),                                                             /* sw $11,($15) */
                        
                MIPS32_LUI(8,UPPER16(MIPS32_PRACC_PARAM_IN)),           /* $8 = MIPS32_PRACC_PARAM_IN */
                MIPS32_ORI(8,8,LOWER16(MIPS32_PRACC_PARAM_IN)),
@@ -481,7 +481,7 @@ int mips32_pracc_write_mem32(mips_ejtag_t *ejtag_info, u32 addr, int count, u32
                MIPS32_SW(8,0,15),                                                                      /* sw $8,($15) */
                MIPS32_SW(9,0,15),                                                                      /* sw $9,($15) */
                MIPS32_SW(10,0,15),                                                             /* sw $10,($15) */
-               MIPS32_SW(11,0,15),                                                             /* sw $10,($15) */
+               MIPS32_SW(11,0,15),                                                             /* sw $11,($15) */
                
                MIPS32_LUI(8,UPPER16(MIPS32_PRACC_PARAM_IN)),           /* $8 = MIPS32_PRACC_PARAM_IN */
                MIPS32_ORI(8,8,LOWER16(MIPS32_PRACC_PARAM_IN)),
@@ -536,7 +536,7 @@ int mips32_pracc_write_mem16(mips_ejtag_t *ejtag_info, u32 addr, int count, u16
                MIPS32_SW(8,0,15),                                                                      /* sw $8,($15) */
                MIPS32_SW(9,0,15),                                                                      /* sw $9,($15) */
                MIPS32_SW(10,0,15),                                                             /* sw $10,($15) */
-               MIPS32_SW(11,0,15),                                                             /* sw $10,($15) */
+               MIPS32_SW(11,0,15),                                                             /* sw $11,($15) */
                
                MIPS32_LUI(8,UPPER16(MIPS32_PRACC_PARAM_IN)),           /* $8 = MIPS32_PRACC_PARAM_IN */
                MIPS32_ORI(8,8,LOWER16(MIPS32_PRACC_PARAM_IN)),
@@ -596,7 +596,7 @@ int mips32_pracc_write_mem8(mips_ejtag_t *ejtag_info, u32 addr, int count, u8 *b
                MIPS32_SW(8,0,15),                                                                      /* sw $8,($15) */
                MIPS32_SW(9,0,15),                                                                      /* sw $9,($15) */
                MIPS32_SW(10,0,15),                                                             /* sw $10,($15) */
-               MIPS32_SW(11,0,15),                                                             /* sw $10,($15) */
+               MIPS32_SW(11,0,15),                                                             /* sw $11,($15) */
                
                MIPS32_LUI(8,UPPER16(MIPS32_PRACC_PARAM_IN)),           /* $8 = MIPS32_PRACC_PARAM_IN */
                MIPS32_ORI(8,8,LOWER16(MIPS32_PRACC_PARAM_IN)),
diff --git a/src/target/mips_ejtag.h b/src/target/mips_ejtag.h
index cd31d2334839cc3a45de7f735450065a92fe2d52..f5d62c10dc070eebe5e45cc722091f9a7773261e 100644 (file)
--- a/src/target/mips_ejtag.h
+++ b/src/target/mips_ejtag.h
@@ -26,6 +26,7 @@
 #include "types.h"
 #include "jtag.h"
 
+/* tap instructions */
 #define EJTAG_INST_IDCODE              0x01
 #define EJTAG_INST_IMPCODE             0x03
 #define EJTAG_INST_ADDRESS             0x08
@@ -40,6 +41,7 @@
 #define EJTAG_INST_TCBDATA             0x12
 #define EJTAG_INST_BYPASS              0xFF
 
+/* debug control register bits */
 #define EJTAG_CTRL_TOF                 (1 << 1)
 #define EJTAG_CTRL_TIF                 (1 << 2)
 #define EJTAG_CTRL_BRKST               (1 << 3)
@@ -85,11 +87,15 @@
 #define EJTAG_DEBUG_DM                 (1 << 30)
 #define EJTAG_DEBUG_DBD                        (1 << 31)
 
+/* implementaion register bits */
+#define EJTAG_IMP_NODMA                        (1 << 14)
+#define EJTAG_IMP_MIPS16               (1 << 16)
+
 typedef struct mips_ejtag_s
 {
        int chain_pos;
        u32 impcode;
-//     int use_dma;
+       /*int use_dma;*/
        u32 ejtag_ctrl;
 } mips_ejtag_t;
 
diff --git a/src/target/mips_m4k.c b/src/target/mips_m4k.c
index 0e544df7e00fbeac39cb5a4228b995a9340174ac..c99ca92f61dd7905cc307bd779d6ce51555fb8b7 100644 (file)
--- a/src/target/mips_m4k.c
+++ b/src/target/mips_m4k.c
@@ -256,12 +256,15 @@ int mips_m4k_assert_reset(target_t *target)
                mips_ejtag_set_instr(ejtag_info, EJTAG_INST_NORMALBOOT, NULL);
        }
        
-       if (strcmp(target->variant, "ejtag_srst") == 0) {
+       if (strcmp(target->variant, "ejtag_srst") == 0)
+       {
                u32 ejtag_ctrl = ejtag_info->ejtag_ctrl | EJTAG_CTRL_PRRST | EJTAG_CTRL_PERRST;
                LOG_DEBUG("Using EJTAG reset (PRRST) to reset processor...");
                mips_ejtag_set_instr(ejtag_info, EJTAG_INST_CONTROL, NULL);
                mips_ejtag_drscan_32(ejtag_info, &ejtag_ctrl);
-       } else {
+       }
+       else
+       {
                /* here we should issue a srst only, but we may have to assert trst as well */
                if (jtag_reset_config & RESET_SRST_PULLS_TRST)
                {
@@ -522,7 +525,7 @@ int mips_m4k_read_memory(struct target_s *target, u32 address, u32 size, u32 cou
                case 2:
                case 1:
                        /* if noDMA off, use DMAACC mode for memory read */
-                       if(ejtag_info->impcode & (1<<14))
+                       if(ejtag_info->impcode & EJTAG_IMP_NODMA)
                                return mips32_pracc_read_mem(ejtag_info, address, size, count, (void *)buffer);
                        else
                                return mips32_dmaacc_read_mem(ejtag_info, address, size, count, (void *)buffer);
@@ -561,7 +564,7 @@ int mips_m4k_write_memory(struct target_s *target, u32 address, u32 size, u32 co
                case 2:
                case 1:
                        /* if noDMA off, use DMAACC mode for memory write */
-                       if(ejtag_info->impcode & (1<<14))
+                       if(ejtag_info->impcode & EJTAG_IMP_NODMA)
                                mips32_pracc_write_mem(ejtag_info, address, size, count, (void *)buffer);
                        else
                                mips32_dmaacc_write_mem(ejtag_info, address, size, count, (void *)buffer);
diff --git a/testing/examples/PIC32/BlinkingLeds.c b/testing/examples/PIC32/BlinkingLeds.c
index d1647c4592479b218732c1213136faa56ec5b86f..027f59ac3072d8e3ddbc87ee281ede3540991fb4 100644 (file)
--- a/testing/examples/PIC32/BlinkingLeds.c
+++ b/testing/examples/PIC32/BlinkingLeds.c
@@ -1,23 +1,23 @@
-#include <plib.h>\r
-int main(void)\r
-{\r
-       int i;\r
-       mPORTDClearBits(BIT_0);\r
-       mPORTDSetPinsDigitalOut(BIT_0);\r
-       mPORTDClearBits(BIT_1);\r
-       mPORTDSetPinsDigitalOut(BIT_1);\r
-       mPORTDClearBits(BIT_2);\r
-       mPORTDSetPinsDigitalOut(BIT_2);\r
-       \r
-       while(1)\r
-       {\r
-               for(i = 0; i < 500000; i++)\r
-                       mPORTDToggleBits(BIT_0);\r
-               for(i = 0; i < 500000; i++)\r
-                       mPORTDToggleBits(BIT_1);\r
-               for(i = 0; i < 500000; i++)\r
-                       mPORTDToggleBits(BIT_2);\r
-       }\r
-\r
-       return 0;\r
-}\r
+#include <plib.h>
+int main(void)
+{
+       int i;
+       mPORTDClearBits(BIT_0);
+       mPORTDSetPinsDigitalOut(BIT_0);
+       mPORTDClearBits(BIT_1);
+       mPORTDSetPinsDigitalOut(BIT_1);
+       mPORTDClearBits(BIT_2);
+       mPORTDSetPinsDigitalOut(BIT_2);
+       
+       while(1)
+       {
+               for(i = 0; i < 500000; i++)
+                       mPORTDToggleBits(BIT_0);
+               for(i = 0; i < 500000; i++)
+                       mPORTDToggleBits(BIT_1);
+               for(i = 0; i < 500000; i++)
+                       mPORTDToggleBits(BIT_2);
+       }
+
+       return 0;
+}
diff --git a/testing/examples/PIC32/readme.txt b/testing/examples/PIC32/readme.txt
index ca9573a5ab7ec661a776b8347e33bdcbcfa37183..cb32ac2ee055f664a7aafc8b41555af8bb40dd8a 100644 (file)
--- a/testing/examples/PIC32/readme.txt
+++ b/testing/examples/PIC32/readme.txt
@@ -1,4 +1,4 @@
-Here you'll find a simple example tested with PIC32 Starter kit (source code and .elf file). It will blink repeatedly the LEDs on the board.\r
-The program was compiled and written on the target using MPLAB IDE v 8.0 that comes with the kit because openocd is missing currently the ability \r
-to program the flash for this specific target. It is possible in the future this limitation to be removed. \r
+Here you'll find a simple example tested with PIC32 Starter kit (source code and .elf file). It will blink repeatedly the LEDs on the board.
+The program was compiled and written on the target using MPLAB IDE v 8.0 that comes with the kit because openocd is missing currently the ability 
+to program the flash for this specific target. It is possible in the future this limitation to be removed. 
  
\ No newline at end of file
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)