]> git.sur5r.net Git - openocd/commitdiff
stlink: support expected-id 0
authorSpencer Oliver <spen@spen-soft.co.uk>
Tue, 21 Feb 2012 10:41:39 +0000 (10:41 +0000)
committerSpencer Oliver <spen@spen-soft.co.uk>
Wed, 22 Feb 2012 20:55:23 +0000 (20:55 +0000)
This brings the stlink driver inline with the rest of OpenOCD.

If the user configures the tap as -expected-id 0 then the IDCODE will be
treated as a wildcard and ignored.

Change-Id: I99160c69b2b40f5b1f608bb59ab6630894502fd8
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/476
Tested-by: jenkins
Reviewed-by: Mathias Küster <kesmtp@freenet.de>
src/jtag/stlink/stlink_interface.c

index 9c0215f02d96592ab13f2106bb20e029329ad416..389ab3fff5e0ecae0ec433d1e9a03447ce4ad6b3 100644 (file)
@@ -67,7 +67,8 @@ int stlink_interface_init_target(struct target *t)
        for (ii = 0; ii < limit; ii++) {
                uint32_t expected = t->tap->expected_ids[ii];
 
-               if (t->tap->idcode == expected) {
+               /* treat "-expected-id 0" as a "don't-warn" wildcard */
+               if (!expected || (t->tap->idcode == expected)) {
                        found = 1;
                        break;
                }