stm32f0x: Remove duplicate code for revision string. 57/2457/2
authorUwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de>
Fri, 9 Jan 2015 10:21:10 +0000 (11:21 +0100)
committerSpencer Oliver <spen@spen-soft.co.uk>
Mon, 26 Jan 2015 20:55:23 +0000 (20:55 +0000)
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>
src/flash/nor/stm32f1x.c

index 6b5aafc1edebeb11d178451d32a03b9be4cdceac..e4fcca07fb1e0a5332bbea88a2e5050d10f97d75 100644 (file)
@@ -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:

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)