Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
- Fixes '[+]=' whitespace
[openocd.git] / src / target / target.c
diff --git a/src/target/target.c b/src/target/target.c
index a427c66af50d37ca41e929f01fe56277e2574e81..56bcdf05de2bf58b563d37fa7255bb47e3d1f268 100644 (file)
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -1088,7 +1088,7 @@ int target_arch_state(struct target_s *target)
        LOG_USER("target state: %s",
                 Jim_Nvp_value2name_simple(nvp_target_state,target->state)->name);
 
-       if (target->state!=TARGET_HALTED)
+       if (target->state != TARGET_HALTED)
                return ERROR_OK;
 
        retval=target->type->arch_state(target);
@@ -1584,7 +1584,7 @@ static int sense_handler(void)
        static int prevPowerdropout = 0;
 
        int retval;
-       if ((retval=jtag_power_dropout(&powerDropout))!=ERROR_OK)
+       if ((retval=jtag_power_dropout(&powerDropout)) != ERROR_OK)
                return retval;
 
        int powerRestored;
@@ -1603,7 +1603,7 @@ static int sense_handler(void)
                lastPower = current;
        }
 
-       if ((retval=jtag_srst_asserted(&srstAsserted))!=ERROR_OK)
+       if ((retval=jtag_srst_asserted(&srstAsserted)) != ERROR_OK)
                return retval;
 
        int srstDeasserted;
@@ -1909,7 +1909,7 @@ int target_wait_state(target_t *target, enum target_state state, int ms)
 
        for (;;)
        {
-               if ((retval=target_poll(target))!=ERROR_OK)
+               if ((retval=target_poll(target)) != ERROR_OK)
                        return retval;
                if (target->state == state)
                {
@@ -2285,13 +2285,13 @@ static int handle_load_image_command(struct command_context_s *cmd_ctx, char *cm
                        if (image.sections[i].base_address<min_address)
                        {
                                /* clip addresses below */
-                               offset+=min_address-image.sections[i].base_address;
-                               length-=offset;
+                               offset += min_address-image.sections[i].base_address;
+                               length -= offset;
                        }
 
                        if (image.sections[i].base_address+buf_cnt>max_address)
                        {
-                               length-=(image.sections[i].base_address+buf_cnt)-max_address;
+                               length -= (image.sections[i].base_address+buf_cnt)-max_address;
                        }
 
                        if ((retval = target_write_buffer(target, image.sections[i].base_address+offset, length, buffer+offset)) != ERROR_OK)
@@ -2872,7 +2872,7 @@ static void writeGmon(uint32_t *samples, uint32_t sampleNum, char *filename)
        /*append binary memory gmon.out profile_hist_data (profile_hist_data + profile_hist_hdr.hist_size) */
 
        char *data=malloc(2*length);
-       if (data!=NULL)
+       if (data != NULL)
        {
                for (i=0; i<length;i++)
                {
@@ -2903,7 +2903,7 @@ static int handle_profile_command(struct command_context_s *cmd_ctx, char *cmd,
        struct timeval timeout, now;
 
        gettimeofday(&timeout, NULL);
-       if (argc!=2)
+       if (argc != 2)
        {
                return ERROR_COMMAND_SYNTAX_ERROR;
        }
@@ -2949,7 +2949,7 @@ static int handle_profile_command(struct command_context_s *cmd_ctx, char *cmd,
                        retval=ERROR_OK;
                        break;
                }
-               if (retval!=ERROR_OK)
+               if (retval != ERROR_OK)
                {
                        break;
                }
@@ -3388,7 +3388,7 @@ void target_handle_event( target_t *target, enum target_event e )
                                           e,
                                           Jim_Nvp_value2name_simple( nvp_target_event, e )->name,
                                           Jim_GetString( teap->body, NULL ) );
-                       if (Jim_EvalObj( interp, teap->body )!=JIM_OK)
+                       if (Jim_EvalObj( interp, teap->body ) != JIM_OK)
                        {
                                Jim_PrintErrorMessage(interp);
                        }
@@ -3829,7 +3829,7 @@ static int tcl_target_func( Jim_Interp *interp, int argc, Jim_Obj *const *argv )
                        b = 1;
                        break;
                }
-               for( x = 0 ; x < c ; x++ ){
+               for ( x = 0 ; x < c ; x++ ){
                        e = target_write_memory( target, a, b, 1, target_buf );
                        if ( e != ERROR_OK ){
                                Jim_SetResult_sprintf( interp, "Error writing @ 0x%08x: %d\n", (int)(a), e );
@@ -3895,36 +3895,36 @@ static int tcl_target_func( Jim_Interp *interp, int argc, Jim_Obj *const *argv )
                        Jim_fprintf( interp, interp->cookie_stdout, "0x%08x ", (int)(a) );
                        switch ( b ){
                        case 4:
-                               for( x = 0 ; (x < 16) && (x < y) ; x += 4 ){
+                               for ( x = 0 ; (x < 16) && (x < y) ; x += 4 ){
                                        z = target_buffer_get_u32( target, &(target_buf[ x * 4 ]) );
                                        Jim_fprintf( interp, interp->cookie_stdout, "%08x ", (int)(z) );
                                }
-                               for( ; (x < 16) ; x += 4 ){
+                               for ( ; (x < 16) ; x += 4 ){
                                        Jim_fprintf( interp, interp->cookie_stdout, "         " );
                                }
                                break;
                        case 2:
-                               for( x = 0 ; (x < 16) && (x < y) ; x += 2 ){
+                               for ( x = 0 ; (x < 16) && (x < y) ; x += 2 ){
                                        z = target_buffer_get_u16( target, &(target_buf[ x * 2 ]) );
                                        Jim_fprintf( interp, interp->cookie_stdout, "%04x ", (int)(z) );
                                }
-                               for( ; (x < 16) ; x += 2 ){
+                               for ( ; (x < 16) ; x += 2 ){
                                        Jim_fprintf( interp, interp->cookie_stdout, "     " );
                                }
                                break;
                        case 1:
                        default:
-                               for( x = 0 ; (x < 16) && (x < y) ; x += 1 ){
+                               for ( x = 0 ; (x < 16) && (x < y) ; x += 1 ){
                                        z = target_buffer_get_u8( target, &(target_buf[ x * 4 ]) );
                                        Jim_fprintf( interp, interp->cookie_stdout, "%02x ", (int)(z) );
                                }
-                               for( ; (x < 16) ; x += 1 ){
+                               for ( ; (x < 16) ; x += 1 ){
                                        Jim_fprintf( interp, interp->cookie_stdout, "   " );
                                }
                                break;
                        }
                        /* ascii-ify the bytes */
-                       for( x = 0 ; x < y ; x++ ){
+                       for ( x = 0 ; x < y ; x++ ){
                                if ( (target_buf[x] >= 0x20) &&
                                        (target_buf[x] <= 0x7e) ){
                                        /* good */
@@ -4132,7 +4132,7 @@ static int target_create( Jim_GetOptInfo *goi )
        e = Jim_GetOpt_String( goi, &cp2, NULL );
        cp = cp2;
        /* now does target type exist */
-       for( x = 0 ; target_types[x] ; x++ ){
+       for ( x = 0 ; target_types[x] ; x++ ){
                if ( 0 == strcmp( cp, target_types[x]->name ) ){
                        /* found */
                        break;
@@ -4140,7 +4140,7 @@ static int target_create( Jim_GetOptInfo *goi )
        }
        if ( target_types[x] == NULL ){
                Jim_SetResult_sprintf( goi->interp, "Unknown target type %s, try one of ", cp );
-               for( x = 0 ; target_types[x] ; x++ ){
+               for ( x = 0 ; target_types[x] ; x++ ){
                        if ( target_types[x+1] ){
                                Jim_AppendStrings( goi->interp,
                                                                   Jim_GetResult(goi->interp),
@@ -4313,7 +4313,7 @@ static int jim_target( Jim_Interp *interp, int argc, Jim_Obj *const *argv )
                        return JIM_ERR;
                }
                Jim_SetResult( goi.interp, Jim_NewListObj( goi.interp, NULL, 0 ) );
-               for( x = 0 ; target_types[x] ; x++ ){
+               for ( x = 0 ; target_types[x] ; x++ ){
                        Jim_ListAppendElement( goi.interp,
                                                                   Jim_GetResult(goi.interp),
                                                                   Jim_NewStringObj( goi.interp, target_types[x]->name, -1 ) );
@@ -4386,7 +4386,7 @@ static struct FastLoad *fastload;
 
 static void free_fastload(void)
 {
-       if (fastload!=NULL)
+       if (fastload != NULL)
        {
                int i;
                for (i=0; i<fastload_num; i++)
@@ -4466,13 +4466,13 @@ static int handle_fast_load_image_command(struct command_context_s *cmd_ctx, cha
                        if (image.sections[i].base_address<min_address)
                        {
                                /* clip addresses below */
-                               offset+=min_address-image.sections[i].base_address;
-                               length-=offset;
+                               offset += min_address-image.sections[i].base_address;
+                               length -= offset;
                        }
 
                        if (image.sections[i].base_address+buf_cnt>max_address)
                        {
-                               length-=(image.sections[i].base_address+buf_cnt)-max_address;
+                               length -= (image.sections[i].base_address+buf_cnt)-max_address;
                        }
 
                        fastload[i].address=image.sections[i].base_address+offset;
@@ -4504,7 +4504,7 @@ static int handle_fast_load_image_command(struct command_context_s *cmd_ctx, cha
 
        image_close(&image);
 
-       if (retval!=ERROR_OK)
+       if (retval != ERROR_OK)
        {
                free_fastload();
        }
@@ -4535,7 +4535,7 @@ static int handle_fast_load_command(struct command_context_s *cmd_ctx, char *cmd
                {
                        retval = target_write_buffer(target, fastload[i].address, fastload[i].length, fastload[i].data);
                }
-               size+=fastload[i].length;
+               size += fastload[i].length;
        }
        int after=timeval_ms();
        command_print(cmd_ctx, "Loaded image %f kBytes/s", (float)(size/1024.0)/((float)(after-ms)/1000.0));
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)