X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fflash.c;h=61dc4a6a65d6437b2c23ee717e2dd762dc55f15a;hp=d5bdf60ec00c0ace32ff27dfcecd9460b1591801;hb=84df52f9ea78e2d71bde648a16b69d80404c6421;hpb=53d605e12c3765aeedabf2bfe0c5cc338dc95d5a

diff --git a/src/flash/flash.c b/src/flash/flash.c
index d5bdf60ec0..61dc4a6a65 100644
--- a/src/flash/flash.c
+++ b/src/flash/flash.c
@@ -89,7 +89,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);
+	retval = bank->driver->write(bank, buffer, offset, count);
 	if (retval != ERROR_OK)
 	{
 		LOG_ERROR("error writing to flash at address 0x%08" PRIx32 " at offset 0x%8.8" PRIx32 " (%d)", 
@@ -103,7 +103,7 @@ static int flash_driver_erase(struct flash_bank_s *bank, int first, int last)
 {
 	int retval;
 
-	retval=bank->driver->erase(bank, first, last);
+	retval = bank->driver->erase(bank, first, last);
 	if (retval != ERROR_OK)
 	{
 		LOG_ERROR("failed erasing sectors %d to %d (%d)", first, last, retval);
@@ -116,7 +116,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);
+	retval = bank->driver->protect(bank, set, first, last);
 	if (retval != ERROR_OK)
 	{
 		LOG_ERROR("failed setting protection for areas %d to %d (%d)", first, last, retval);
@@ -142,10 +142,10 @@ static int jim_flash_banks(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 		return JIM_ERR;
 	}
 
-	Jim_Obj *list=Jim_NewListObj(interp, NULL, 0);
+	Jim_Obj *list = Jim_NewListObj(interp, NULL, 0);
 	for (p = flash_banks; p; p = p->next)
 	{
-		Jim_Obj *elem=Jim_NewListObj(interp, NULL, 0);
+		Jim_Obj *elem = Jim_NewListObj(interp, NULL, 0);
 
 		Jim_ListAppendElement(interp, elem, Jim_NewStringObj(interp, "name", -1));
 		Jim_ListAppendElement(interp, elem, Jim_NewStringObj(interp, p->driver->name, -1));
@@ -291,7 +291,7 @@ static int handle_flash_bank_command(struct command_context_s *cmd_ctx, char *cm
 			c->sectors = NULL;
 			c->next = NULL;
 
-			if ((retval=flash_drivers[i]->flash_bank_command(cmd_ctx, cmd, args, argc, c)) != ERROR_OK)
+			if ((retval = flash_drivers[i]->flash_bank_command(cmd_ctx, cmd, args, argc, c)) != ERROR_OK)
 			{
 				LOG_ERROR("'%s' driver rejected flash bank at 0x%8.8" PRIx32 , args[0], c->base);
 				free(c);
@@ -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);
 		}
 	}
@@ -654,7 +654,7 @@ static int handle_flash_write_image_command(struct command_context_s *cmd_ctx, c
 	/* flash auto-erase is disabled by default*/
 	int auto_erase = 0;
 
-	if (strcmp(args[0], "erase")==0)
+	if (strcmp(args[0], "erase") == 0)
 	{
 		auto_erase = 1;
 		args++;
@@ -754,13 +754,13 @@ static int handle_flash_fill_command(struct command_context_s *cmd_ctx, char *cm
 	switch (cmd[4])
 	{
 	case 'w':
-		wordsize=4;
+		wordsize = 4;
 		break;
 	case 'h':
-		wordsize=2;
+		wordsize = 2;
 		break;
 	case 'b':
-		wordsize=1;
+		wordsize = 1;
 		break;
 	default:
 		return ERROR_COMMAND_SYNTAX_ERROR;
@@ -791,7 +791,7 @@ static int handle_flash_fill_command(struct command_context_s *cmd_ctx, char *cm
 
 	duration_start_measure(&duration);
 
-	for (wrote=0; wrote<(count*wordsize); wrote += cur_size)
+	for (wrote = 0; wrote<(count*wordsize); wrote += cur_size)
 	{
 		cur_size = MIN( (count*wordsize - wrote), sizeof(chunk) );
 		flash_bank_t *bank;
@@ -809,7 +809,7 @@ static int handle_flash_fill_command(struct command_context_s *cmd_ctx, char *cm
 			return err;
 
 		unsigned i;
-		for (i=0; i<cur_size; i++)
+		for (i = 0; i<cur_size; i++)
 		{
 			if (readback[i]!=chunk[i])
 			{
@@ -829,7 +829,7 @@ static int handle_flash_fill_command(struct command_context_s *cmd_ctx, char *cm
 	if (err == ERROR_OK)
 	{
 		float speed;
-		speed=wrote / 1024.0;
+		speed = wrote / 1024.0;
 		speed/=((float)duration.duration.tv_sec + ((float)duration.duration.tv_usec / 1000000.0));
 		command_print(cmd_ctx, 
 					  "wrote %" PRId32 " bytes to 0x%8.8" PRIx32 " in %s (%f kb/s)",
@@ -894,7 +894,7 @@ static int handle_flash_write_bank_command(struct command_context_s *cmd_ctx, ch
 		fileio_close(&fileio);
 		return retvaltemp;
 	}
-	if (retval==ERROR_OK)
+	if (retval == ERROR_OK)
 	{
 	command_print(cmd_ctx, 
 				  "wrote  %lld byte from file %s to flash bank %li at offset 0x%8.8" PRIx32 " in %s (%f kb/s)",
@@ -1003,7 +1003,7 @@ int flash_erase_address_range(target_t *target, uint32_t addr, uint32_t length)
 /* write (optional verify) an image to flash memory of the given target */
 int flash_write(target_t *target, image_t *image, uint32_t *written, int erase)
 {
-	int retval=ERROR_OK;
+	int retval = ERROR_OK;
 
 	int section;
 	uint32_t section_offset;