X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fflash.c;h=60827594ca27d05c8483f6c2914f38125b9f201b;hp=6795f8d8ec710051d00d47a5f5418145c034c3a9;hb=0e2c2fe1d1eec5482078147d551215a58604cc3a;hpb=90d6c8f0a0e6ccc1d644e26da3831710b7cda1d4 diff --git a/src/flash/flash.c b/src/flash/flash.c index 6795f8d8ec..60827594ca 100644 --- a/src/flash/flash.c +++ b/src/flash/flash.c @@ -90,7 +90,7 @@ static int flash_driver_write(struct flash_bank_s *bank, uint8_t *buffer, uint32 int retval; retval=bank->driver->write(bank, buffer, offset, count); - if (retval!=ERROR_OK) + if (retval != ERROR_OK) { LOG_ERROR("error writing to flash at address 0x%08" PRIx32 " at offset 0x%8.8" PRIx32 " (%d)", bank->base, offset, retval); @@ -104,7 +104,7 @@ static int flash_driver_erase(struct flash_bank_s *bank, int first, int last) int retval; retval=bank->driver->erase(bank, first, last); - if (retval!=ERROR_OK) + if (retval != ERROR_OK) { LOG_ERROR("failed erasing sectors %d to %d (%d)", first, last, retval); } @@ -117,7 +117,7 @@ int flash_driver_protect(struct flash_bank_s *bank, int set, int first, int last int retval; retval=bank->driver->protect(bank, set, first, last); - if (retval!=ERROR_OK) + if (retval != ERROR_OK) { LOG_ERROR("failed setting protection for areas %d to %d (%d)", first, last, retval); } @@ -374,7 +374,7 @@ static int handle_flash_info_command(struct command_context_s *cmd_ctx, char *cm j, p->sectors[j].offset, p->sectors[j].size, - p->sectors[j].size>>10, + p->sectors[j].size >> 10, protect_state); } @@ -465,7 +465,7 @@ static int handle_flash_erase_check_command(struct command_context_s *cmd_ctx, c j, p->sectors[j].offset, p->sectors[j].size, - p->sectors[j].size>>10, + p->sectors[j].size >> 10, erase_state); } } @@ -748,10 +748,10 @@ static int handle_flash_fill_command(struct command_context_s *cmd_ctx, char *cm pattern = strtoul(args[1], NULL, 0); count = strtoul(args[2], NULL, 0); - if(count == 0) + if (count == 0) return ERROR_OK; - switch(cmd[4]) + switch (cmd[4]) { case 'w': wordsize=4; @@ -767,16 +767,16 @@ static int handle_flash_fill_command(struct command_context_s *cmd_ctx, char *cm } chunk_count = MIN(count, (1024 / wordsize)); - switch(wordsize) + switch (wordsize) { case 4: - for(i = 0; i < chunk_count; i++) + for (i = 0; i < chunk_count; i++) { target_buffer_set_u32(target, chunk + i * wordsize, pattern); } break; case 2: - for(i = 0; i < chunk_count; i++) + for (i = 0; i < chunk_count; i++) { target_buffer_set_u16(target, chunk + i * wordsize, pattern); } @@ -796,16 +796,16 @@ static int handle_flash_fill_command(struct command_context_s *cmd_ctx, char *cm cur_size = MIN( (count*wordsize - wrote), sizeof(chunk) ); flash_bank_t *bank; bank = get_flash_bank_by_addr(target, address); - if(bank == NULL) + if (bank == NULL) { return ERROR_FAIL; } err = flash_driver_write(bank, chunk, address - bank->base + wrote, cur_size); - if (err!=ERROR_OK) + if (err != ERROR_OK) return err; err = target_read_buffer(target, address + wrote, cur_size, readback); - if (err!=ERROR_OK) + if (err != ERROR_OK) return err; unsigned i; @@ -826,7 +826,7 @@ static int handle_flash_fill_command(struct command_context_s *cmd_ctx, char *cm return retval; } - if(err == ERROR_OK) + if (err == ERROR_OK) { float speed; speed=wrote / 1024.0; @@ -994,7 +994,7 @@ int flash_erase_address_range(target_t *target, uint32_t addr, uint32_t length) } } - if( first == -1 || last == -1 ) + if ( first == -1 || last == -1 ) return ERROR_OK; return flash_driver_erase(c, first, last);