Skip to content

Commit 5b38f86

Browse files
UweBonnesntfreak
authored andcommitted
stm32f0x: Remove duplicate code for revision string.
As of RM0091, Rev. 7, all F0 have the same revisioning scheme. Change-Id: I0b344a1d3ca3f61f48fa151e83c549ca5333ae47 Signed-off-by: Uwe Bonnes <[email protected]> Reviewed-on: http://openocd.zylin.com/2457 Tested-by: jenkins Reviewed-by: Spencer Oliver <[email protected]>
1 parent 5420ff3 commit 5b38f86

File tree

1 file changed

+20
-50
lines changed

1 file changed

+20
-50
lines changed

src/flash/nor/stm32f1x.c

Lines changed: 20 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1040,6 +1040,21 @@ COMMAND_HANDLER(stm32x_handle_part_id_command)
10401040
}
10411041
#endif
10421042

1043+
static const char *get_stm32f0_revision(uint16_t rev_id)
1044+
{
1045+
const char *rev_str = NULL;
1046+
1047+
switch (rev_id) {
1048+
case 0x1000:
1049+
rev_str = "1.0";
1050+
break;
1051+
case 0x2000:
1052+
rev_str = "2.0";
1053+
break;
1054+
}
1055+
return rev_str;
1056+
}
1057+
10431058
static int get_stm32x_info(struct flash_bank *bank, char *buf, int buf_size)
10441059
{
10451060
uint32_t dbgmcu_idcode;
@@ -1219,72 +1234,27 @@ static int get_stm32x_info(struct flash_bank *bank, char *buf, int buf_size)
12191234

12201235
case 0x444:
12211236
device_str = "STM32F03x";
1222-
1223-
switch (rev_id) {
1224-
case 0x1000:
1225-
rev_str = "1.0";
1226-
break;
1227-
1228-
case 0x2000:
1229-
rev_str = "2.0";
1230-
break;
1231-
}
1237+
rev_str = get_stm32f0_revision(rev_id);
12321238
break;
12331239

12341240
case 0x440:
12351241
device_str = "STM32F05x";
1236-
1237-
switch (rev_id) {
1238-
case 0x1000:
1239-
rev_str = "1.0";
1240-
break;
1241-
1242-
case 0x2000:
1243-
rev_str = "2.0";
1244-
break;
1245-
}
1242+
rev_str = get_stm32f0_revision(rev_id);
12461243
break;
12471244

12481245
case 0x445:
12491246
device_str = "STM32F04x";
1250-
1251-
switch (rev_id) {
1252-
case 0x1000:
1253-
rev_str = "1.0";
1254-
break;
1255-
1256-
case 0x2000:
1257-
rev_str = "2.0";
1258-
break;
1259-
}
1247+
rev_str = get_stm32f0_revision(rev_id);
12601248
break;
12611249

12621250
case 0x448:
12631251
device_str = "STM32F07x";
1264-
1265-
switch (rev_id) {
1266-
case 0x1000:
1267-
rev_str = "1.0";
1268-
break;
1269-
1270-
case 0x2000:
1271-
rev_str = "2.0";
1272-
break;
1273-
}
1252+
rev_str = get_stm32f0_revision(rev_id);
12741253
break;
12751254

12761255
case 0x442:
12771256
device_str = "STM32F09x";
1278-
1279-
switch (rev_id) {
1280-
case 0x1000:
1281-
rev_str = "1.0";
1282-
break;
1283-
1284-
case 0x2000:
1285-
rev_str = "2.0";
1286-
break;
1287-
}
1257+
rev_str = get_stm32f0_revision(rev_id);
12881258
break;
12891259

12901260
default:

0 commit comments

Comments
 (0)