X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fstr9x.c;h=2904d565f3a82d6186b399281a5d2ad51732b741;hb=32310efe1a4b55920eab1d41ab473dc989c9b8ea;hp=30c4e980833e742cb0bb90c31735bc434f3c5243;hpb=80d20326a7fafc0f6ed865df2211bc9e609265fb;p=openocd.git

diff --git a/src/flash/str9x.c b/src/flash/str9x.c
index 30c4e98083..2904d565f3 100644
--- a/src/flash/str9x.c
+++ b/src/flash/str9x.c
@@ -216,6 +216,7 @@ int str9x_protect_check(struct flash_bank_s *bank)
 		target_read_u16(target, adr, (u16*)&status);
 	}
 	
+	/* read array command */
 	target_write_u16(target, adr, 0xFF);
 	
 	for (i = 0; i < bank->num_sectors; i++)
@@ -304,6 +305,12 @@ int str9x_protect(struct flash_bank_s *bank, int set, int first, int last)
 		
 		/* query status */
 		target_read_u8(target, adr, &status);
+		
+		/* clear status, also clear read array */
+		target_write_u16(target, adr, 0x50);
+		
+		/* read array command */
+		target_write_u16(target, adr, 0xFF);
 	}
 	
 	return ERROR_OK;
@@ -318,7 +325,7 @@ int str9x_write_block(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 cou
 	u32 address = bank->base + offset;
 	reg_param_t reg_params[4];
 	armv4_5_algorithm_t armv4_5_info;
-	int retval;
+	int retval = ERROR_OK;
 	
 	u32 str9x_flash_write_code[] = {
 					/* write:				*/
@@ -393,12 +400,13 @@ int str9x_write_block(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 cou
 			target_free_working_area(target, source);
 			target_free_working_area(target, str9x_info->write_algorithm);
 			LOG_ERROR("error executing str9x flash write algorithm");
-			return ERROR_FLASH_OPERATION_FAILED;
+			break;
 		}
 	
 		if (buf_get_u32(reg_params[3].value, 0, 32) != 0x80)
 		{
-			return ERROR_FLASH_OPERATION_FAILED;
+			retval = ERROR_FLASH_OPERATION_FAILED;
+                        break;
 		}
 		
 		buffer += thisrun_count * 2;
@@ -414,7 +422,7 @@ int str9x_write_block(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 cou
 	destroy_reg_param(&reg_params[2]);
 	destroy_reg_param(&reg_params[3]);
 	
-	return ERROR_OK;
+	return retval;
 }
 
 int str9x_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)