X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fnor%2Fstm32f1x.c;h=cfeac6c70eb7e6ab6c3ae0c4a2d6750ed53eb7d6;hp=9d093607fd1f315964732c39db44ca8f149f7365;hb=6d8a865eefa52107af029761df8b11f907d0031b;hpb=4da4e1cfb7d93dcedc333c11c787b83b8baf7dfa

diff --git a/src/flash/nor/stm32f1x.c b/src/flash/nor/stm32f1x.c
index 9d093607fd..cfeac6c70e 100644
--- a/src/flash/nor/stm32f1x.c
+++ b/src/flash/nor/stm32f1x.c
@@ -102,6 +102,11 @@
 #define KEY1			0x45670123
 #define KEY2			0xCDEF89AB
 
+/* timeout values */
+
+#define FLASH_WRITE_TIMEOUT 10
+#define FLASH_ERASE_TIMEOUT 100
+
 struct stm32x_options {
 	uint16_t RDP;
 	uint16_t user_options;
@@ -283,7 +288,7 @@ static int stm32x_erase_options(struct flash_bank *bank)
 	if (retval != ERROR_OK)
 		return retval;
 
-	retval = stm32x_wait_status_busy(bank, 10);
+	retval = stm32x_wait_status_busy(bank, FLASH_ERASE_TIMEOUT);
 	if (retval != ERROR_OK)
 		return retval;
 
@@ -327,7 +332,7 @@ static int stm32x_write_options(struct flash_bank *bank)
 	if (retval != ERROR_OK)
 		return retval;
 
-	retval = stm32x_wait_status_busy(bank, 10);
+	retval = stm32x_wait_status_busy(bank, FLASH_WRITE_TIMEOUT);
 	if (retval != ERROR_OK)
 		return retval;
 
@@ -336,7 +341,7 @@ static int stm32x_write_options(struct flash_bank *bank)
 	if (retval != ERROR_OK)
 		return retval;
 
-	retval = stm32x_wait_status_busy(bank, 10);
+	retval = stm32x_wait_status_busy(bank, FLASH_WRITE_TIMEOUT);
 	if (retval != ERROR_OK)
 		return retval;
 
@@ -345,7 +350,7 @@ static int stm32x_write_options(struct flash_bank *bank)
 	if (retval != ERROR_OK)
 		return retval;
 
-	retval = stm32x_wait_status_busy(bank, 10);
+	retval = stm32x_wait_status_busy(bank, FLASH_WRITE_TIMEOUT);
 	if (retval != ERROR_OK)
 		return retval;
 
@@ -354,7 +359,7 @@ static int stm32x_write_options(struct flash_bank *bank)
 	if (retval != ERROR_OK)
 		return retval;
 
-	retval = stm32x_wait_status_busy(bank, 10);
+	retval = stm32x_wait_status_busy(bank, FLASH_WRITE_TIMEOUT);
 	if (retval != ERROR_OK)
 		return retval;
 
@@ -363,7 +368,7 @@ static int stm32x_write_options(struct flash_bank *bank)
 	if (retval != ERROR_OK)
 		return retval;
 
-	retval = stm32x_wait_status_busy(bank, 10);
+	retval = stm32x_wait_status_busy(bank, FLASH_WRITE_TIMEOUT);
 	if (retval != ERROR_OK)
 		return retval;
 
@@ -372,7 +377,7 @@ static int stm32x_write_options(struct flash_bank *bank)
 	if (retval != ERROR_OK)
 		return retval;
 
-	retval = stm32x_wait_status_busy(bank, 10);
+	retval = stm32x_wait_status_busy(bank, FLASH_WRITE_TIMEOUT);
 	if (retval != ERROR_OK)
 		return retval;
 
@@ -487,7 +492,7 @@ static int stm32x_erase(struct flash_bank *bank, int first, int last)
 		if (retval != ERROR_OK)
 			return retval;
 
-		retval = stm32x_wait_status_busy(bank, 100);
+		retval = stm32x_wait_status_busy(bank, FLASH_ERASE_TIMEOUT);
 		if (retval != ERROR_OK)
 			return retval;
 
@@ -1137,11 +1142,15 @@ static int get_stm32x_info(struct flash_bank *bank, char *buf, int buf_size)
 
 		switch (device_id >> 16) {
 			case 0x1000:
-				snprintf(buf, buf_size, "1.0");
+				snprintf(buf, buf_size, "A");
+				break;
+
+			case 0x1001:
+				snprintf(buf, buf_size, "Z");
 				break;
 
 			case 0x2000:
-				snprintf(buf, buf_size, "2.0");
+				snprintf(buf, buf_size, "B");
 				break;
 
 			default:
@@ -1187,11 +1196,11 @@ static int get_stm32x_info(struct flash_bank *bank, char *buf, int buf_size)
 
 		switch (device_id >> 16) {
 			case 0x1000:
-				snprintf(buf, buf_size, "1.0");
+				snprintf(buf, buf_size, "A");
 				break;
 
 			case 0x2000:
-				snprintf(buf, buf_size, "2.0");
+				snprintf(buf, buf_size, "B");
 				break;
 
 			default:
@@ -1475,7 +1484,7 @@ static int stm32x_mass_erase(struct flash_bank *bank)
 	if (retval != ERROR_OK)
 		return retval;
 
-	retval = stm32x_wait_status_busy(bank, 100);
+	retval = stm32x_wait_status_busy(bank, FLASH_ERASE_TIMEOUT);
 	if (retval != ERROR_OK)
 		return retval;