X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fflash%2Fstm32x.c;h=192ee260e25edd9a5692ecfe14b7d212c15d4e75;hb=e43979e7020ea9d05a3c0a2af444f292eacb6c53;hp=a022b74c303761cd87826b6f134503d17c87032b;hpb=8591335ba6556d788999ac29f1efbdbe0cb3554a;p=fw%2Fopenocd

diff --git a/src/flash/stm32x.c b/src/flash/stm32x.c
index a022b74c3..192ee260e 100644
--- a/src/flash/stm32x.c
+++ b/src/flash/stm32x.c
@@ -182,9 +182,9 @@ static int stm32x_erase_options(struct flash_bank_s *bank)
 
 	status = stm32x_wait_status_busy(bank, 10);
 
-	if( status & FLASH_WRPRTERR )
+	if ( status & FLASH_WRPRTERR )
 		return ERROR_FLASH_OPERATION_FAILED;
-	if( status & FLASH_PGERR )
+	if ( status & FLASH_PGERR )
 		return ERROR_FLASH_OPERATION_FAILED;
 
 	/* clear readout protection and complementary option bytes
@@ -218,9 +218,9 @@ static int stm32x_write_options(struct flash_bank_s *bank)
 
 	status = stm32x_wait_status_busy(bank, 10);
 
-	if( status & FLASH_WRPRTERR )
+	if ( status & FLASH_WRPRTERR )
 		return ERROR_FLASH_OPERATION_FAILED;
-	if( status & FLASH_PGERR )
+	if ( status & FLASH_PGERR )
 		return ERROR_FLASH_OPERATION_FAILED;
 
 	/* write protection byte 1 */
@@ -228,9 +228,9 @@ static int stm32x_write_options(struct flash_bank_s *bank)
 
 	status = stm32x_wait_status_busy(bank, 10);
 
-	if( status & FLASH_WRPRTERR )
+	if ( status & FLASH_WRPRTERR )
 		return ERROR_FLASH_OPERATION_FAILED;
-	if( status & FLASH_PGERR )
+	if ( status & FLASH_PGERR )
 		return ERROR_FLASH_OPERATION_FAILED;
 
 	/* write protection byte 2 */
@@ -238,9 +238,9 @@ static int stm32x_write_options(struct flash_bank_s *bank)
 
 	status = stm32x_wait_status_busy(bank, 10);
 
-	if( status & FLASH_WRPRTERR )
+	if ( status & FLASH_WRPRTERR )
 		return ERROR_FLASH_OPERATION_FAILED;
-	if( status & FLASH_PGERR )
+	if ( status & FLASH_PGERR )
 		return ERROR_FLASH_OPERATION_FAILED;
 
 	/* write protection byte 3 */
@@ -248,9 +248,9 @@ static int stm32x_write_options(struct flash_bank_s *bank)
 
 	status = stm32x_wait_status_busy(bank, 10);
 
-	if( status & FLASH_WRPRTERR )
+	if ( status & FLASH_WRPRTERR )
 		return ERROR_FLASH_OPERATION_FAILED;
-	if( status & FLASH_PGERR )
+	if ( status & FLASH_PGERR )
 		return ERROR_FLASH_OPERATION_FAILED;
 
 	/* write protection byte 4 */
@@ -258,9 +258,9 @@ static int stm32x_write_options(struct flash_bank_s *bank)
 
 	status = stm32x_wait_status_busy(bank, 10);
 
-	if( status & FLASH_WRPRTERR )
+	if ( status & FLASH_WRPRTERR )
 		return ERROR_FLASH_OPERATION_FAILED;
-	if( status & FLASH_PGERR )
+	if ( status & FLASH_PGERR )
 		return ERROR_FLASH_OPERATION_FAILED;
 
 	/* write readout protection bit */
@@ -268,9 +268,9 @@ static int stm32x_write_options(struct flash_bank_s *bank)
 
 	status = stm32x_wait_status_busy(bank, 10);
 
-	if( status & FLASH_WRPRTERR )
+	if ( status & FLASH_WRPRTERR )
 		return ERROR_FLASH_OPERATION_FAILED;
-	if( status & FLASH_PGERR )
+	if ( status & FLASH_PGERR )
 		return ERROR_FLASH_OPERATION_FAILED;
 
 	target_write_u32(target, STM32_FLASH_CR, FLASH_LOCK);
@@ -338,7 +338,7 @@ static int stm32x_protect_check(struct flash_bank_s *bank)
 		{
 			set = 1;
 
-			if( protection & (1 << i))
+			if ( protection & (1 << i))
 				set = 0;
 
 			for (s = 0; s < stm32x_info->ppage_size; s++)
@@ -378,9 +378,9 @@ static int stm32x_erase(struct flash_bank_s *bank, int first, int last)
 
 		status = stm32x_wait_status_busy(bank, 10);
 
-		if( status & FLASH_WRPRTERR )
+		if ( status & FLASH_WRPRTERR )
 			return ERROR_FLASH_OPERATION_FAILED;
-		if( status & FLASH_PGERR )
+		if ( status & FLASH_PGERR )
 			return ERROR_FLASH_OPERATION_FAILED;
 		bank->sectors[i].is_erased = 1;
 	}
@@ -445,7 +445,7 @@ static int stm32x_protect(struct flash_bank_s *bank, int set, int first, int las
 			reg = (i / stm32x_info->ppage_size) / 8;
 			bit = (i / stm32x_info->ppage_size) - (reg * 8);
 
-			if( set )
+			if ( set )
 				prot_reg[reg] &= ~(1 << bit);
 			else
 				prot_reg[reg] |= (1 << bit);
@@ -459,7 +459,7 @@ static int stm32x_protect(struct flash_bank_s *bank, int set, int first, int las
 			reg = (i / stm32x_info->ppage_size) / 8;
 			bit = (i / stm32x_info->ppage_size) - (reg * 8);
 
-			if( set )
+			if ( set )
 				prot_reg[reg] &= ~(1 << bit);
 			else
 				prot_reg[reg] |= (1 << bit);
@@ -658,12 +658,12 @@ static int stm32x_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t off
 
 		status = stm32x_wait_status_busy(bank, 5);
 
-		if( status & FLASH_WRPRTERR )
+		if ( status & FLASH_WRPRTERR )
 		{
 			LOG_ERROR("flash memory not erased before writing");
 			return ERROR_FLASH_OPERATION_FAILED;
 		}
-		if( status & FLASH_PGERR )
+		if ( status & FLASH_PGERR )
 		{
 			LOG_ERROR("flash memory write protected");
 			return ERROR_FLASH_OPERATION_FAILED;
@@ -684,12 +684,12 @@ static int stm32x_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t off
 
 		status = stm32x_wait_status_busy(bank, 5);
 
-		if( status & FLASH_WRPRTERR )
+		if ( status & FLASH_WRPRTERR )
 		{
 			LOG_ERROR("flash memory not erased before writing");
 			return ERROR_FLASH_OPERATION_FAILED;
 		}
-		if( status & FLASH_PGERR )
+		if ( status & FLASH_PGERR )
 		{
 			LOG_ERROR("flash memory write protected");
 			return ERROR_FLASH_OPERATION_FAILED;
@@ -1188,13 +1188,13 @@ static int stm32x_mass_erase(struct flash_bank_s *bank)
 
 	target_write_u32(target, STM32_FLASH_CR, FLASH_LOCK);
 
-	if( status & FLASH_WRPRTERR )
+	if ( status & FLASH_WRPRTERR )
 	{
 		LOG_ERROR("stm32x device protected");
 		return ERROR_OK;
 	}
 
-	if( status & FLASH_PGERR )
+	if ( status & FLASH_PGERR )
 	{
 		LOG_ERROR("stm32x device programming failed");
 		return ERROR_OK;