X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fstr9x.c;h=2b92d0095c6e1db6a6f66889f86195d147332432;hp=0a75c95388e7188d9b0e47f291eb93141a6058c2;hb=aea6815462d3302f7f8b6576f59320d5f5985642;hpb=50c086ffb94f199c088f4cc52b7887b668dddf00

diff --git a/src/flash/str9x.c b/src/flash/str9x.c
index 0a75c95388..2b92d0095c 100644
--- a/src/flash/str9x.c
+++ b/src/flash/str9x.c
@@ -132,7 +132,7 @@ static int str9x_build_block_list(struct flash_bank_s *bank)
 		offset += bank->sectors[i].size;
 		bank->sectors[num_sectors].is_erased = -1;
 		bank->sectors[num_sectors].is_protected = 1;
-		str9x_info->sector_bits[num_sectors++] = (1<<i);
+		str9x_info->sector_bits[num_sectors++] = (1 << i);
 	}
 
 	for (i = 0; i < b1_sectors; i++)
@@ -143,9 +143,9 @@ static int str9x_build_block_list(struct flash_bank_s *bank)
 		bank->sectors[num_sectors].is_erased = -1;
 		bank->sectors[num_sectors].is_protected = 1;
 		if (str9x_info->variant)
-			str9x_info->sector_bits[num_sectors++] = (1<<i);
+			str9x_info->sector_bits[num_sectors++] = (1 << i);
 		else
-			str9x_info->sector_bits[num_sectors++] = (1<<(i+8));
+			str9x_info->sector_bits[num_sectors++] = (1 << (i+8));
 	}
 
 	return ERROR_OK;
@@ -198,11 +198,11 @@ static int str9x_protect_check(struct flash_bank_s *bank)
 		if (str9x_info->bank1)
 		{
 			adr = bank1start + 0x18;
-			if ((retval=target_write_u16(target, adr, 0x90))!=ERROR_OK)
+			if ((retval=target_write_u16(target, adr, 0x90)) != ERROR_OK)
 			{
 				return retval;
 			}
-			if ((retval=target_read_u16(target, adr, &hstatus))!=ERROR_OK)
+			if ((retval=target_read_u16(target, adr, &hstatus)) != ERROR_OK)
 			{
 				return retval;
 			}
@@ -211,11 +211,11 @@ static int str9x_protect_check(struct flash_bank_s *bank)
 		else
 		{
 			adr = bank1start + 0x14;
-			if ((retval=target_write_u16(target, adr, 0x90))!=ERROR_OK)
+			if ((retval=target_write_u16(target, adr, 0x90)) != ERROR_OK)
 			{
 				return retval;
 			}
-			if ((retval=target_read_u32(target, adr, &status))!=ERROR_OK)
+			if ((retval=target_read_u32(target, adr, &status)) != ERROR_OK)
 			{
 				return retval;
 			}
@@ -224,11 +224,11 @@ static int str9x_protect_check(struct flash_bank_s *bank)
 	else
 	{
 		adr = bank1start + 0x10;
-		if ((retval=target_write_u16(target, adr, 0x90))!=ERROR_OK)
+		if ((retval=target_write_u16(target, adr, 0x90)) != ERROR_OK)
 		{
 			return retval;
 		}
-		if ((retval=target_read_u16(target, adr, &hstatus))!=ERROR_OK)
+		if ((retval=target_read_u16(target, adr, &hstatus)) != ERROR_OK)
 		{
 			return retval;
 		}
@@ -236,7 +236,7 @@ static int str9x_protect_check(struct flash_bank_s *bank)
 	}
 
 	/* read array command */
-	if ((retval=target_write_u16(target, adr, 0xFF))!=ERROR_OK)
+	if ((retval=target_write_u16(target, adr, 0xFF)) != ERROR_OK)
 	{
 		return retval;
 	}
@@ -284,24 +284,24 @@ static int str9x_erase(struct flash_bank_s *bank, int first, int last)
 		adr = bank->base + bank->sectors[i].offset;
 
 		/* erase sectors */
-		if ((retval=target_write_u16(target, adr, erase_cmd))!=ERROR_OK)
+		if ((retval=target_write_u16(target, adr, erase_cmd)) != ERROR_OK)
 		{
 			return retval;
 		}
-		if ((retval=target_write_u16(target, adr, 0xD0))!=ERROR_OK)
+		if ((retval=target_write_u16(target, adr, 0xD0)) != ERROR_OK)
 		{
 			return retval;
 		}
 
 		/* get status */
-		if ((retval=target_write_u16(target, adr, 0x70))!=ERROR_OK)
+		if ((retval=target_write_u16(target, adr, 0x70)) != ERROR_OK)
 		{
 			return retval;
 		}
 
 		int timeout;
 		for (timeout=0; timeout<1000; timeout++) {
-			if ((retval=target_read_u8(target, adr, &status))!=ERROR_OK)
+			if ((retval=target_read_u8(target, adr, &status)) != ERROR_OK)
 			{
 				return retval;
 			}
@@ -316,13 +316,13 @@ static int str9x_erase(struct flash_bank_s *bank, int first, int last)
 		}
 
 		/* clear status, also clear read array */
-		if ((retval=target_write_u16(target, adr, 0x50))!=ERROR_OK)
+		if ((retval=target_write_u16(target, adr, 0x50)) != ERROR_OK)
 		{
 			return retval;
 		}
 
 		/* read array command */
-		if ((retval=target_write_u16(target, adr, 0xFF))!=ERROR_OK)
+		if ((retval=target_write_u16(target, adr, 0xFF)) != ERROR_OK)
 		{
 			return retval;
 		}