diff options
author | Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de> | 2015-01-09 11:21:10 +0100 |
---|---|---|
committer | Spencer Oliver <spen@spen-soft.co.uk> | 2015-01-26 20:55:23 +0000 |
commit | 5b38f862f8be08cb7163bfe7fe101e4086752fbd (patch) | |
tree | c40a7adf9d9c355a634feb70cc8ef66cdfe8f91a | |
parent | 5420ff3638409fab4b5dc088da3e4a9fb1285ccf (diff) |
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 <bon@elektron.ikp.physik.tu-darmstadt.de>
Reviewed-on: http://openocd.zylin.com/2457
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
-rw-r--r-- | src/flash/nor/stm32f1x.c | 70 |
1 files changed, 20 insertions, 50 deletions
diff --git a/src/flash/nor/stm32f1x.c b/src/flash/nor/stm32f1x.c index 6b5aafc1..e4fcca07 100644 --- a/src/flash/nor/stm32f1x.c +++ b/src/flash/nor/stm32f1x.c @@ -1040,6 +1040,21 @@ COMMAND_HANDLER(stm32x_handle_part_id_command) } #endif +static const char *get_stm32f0_revision(uint16_t rev_id) +{ + const char *rev_str = NULL; + + switch (rev_id) { + case 0x1000: + rev_str = "1.0"; + break; + case 0x2000: + rev_str = "2.0"; + break; + } + return rev_str; +} + static int get_stm32x_info(struct flash_bank *bank, char *buf, int buf_size) { uint32_t dbgmcu_idcode; @@ -1219,72 +1234,27 @@ static int get_stm32x_info(struct flash_bank *bank, char *buf, int buf_size) case 0x444: device_str = "STM32F03x"; - - switch (rev_id) { - case 0x1000: - rev_str = "1.0"; - break; - - case 0x2000: - rev_str = "2.0"; - break; - } + rev_str = get_stm32f0_revision(rev_id); break; case 0x440: device_str = "STM32F05x"; - - switch (rev_id) { - case 0x1000: - rev_str = "1.0"; - break; - - case 0x2000: - rev_str = "2.0"; - break; - } + rev_str = get_stm32f0_revision(rev_id); break; case 0x445: device_str = "STM32F04x"; - - switch (rev_id) { - case 0x1000: - rev_str = "1.0"; - break; - - case 0x2000: - rev_str = "2.0"; - break; - } + rev_str = get_stm32f0_revision(rev_id); break; case 0x448: device_str = "STM32F07x"; - - switch (rev_id) { - case 0x1000: - rev_str = "1.0"; - break; - - case 0x2000: - rev_str = "2.0"; - break; - } + rev_str = get_stm32f0_revision(rev_id); break; case 0x442: device_str = "STM32F09x"; - - switch (rev_id) { - case 0x1000: - rev_str = "1.0"; - break; - - case 0x2000: - rev_str = "2.0"; - break; - } + rev_str = get_stm32f0_revision(rev_id); break; default: |