sysfsgpio: do not try to initialise absent signals 75/1375/2
authorPaul Fertser <fercerpav@gmail.com>
Fri, 3 May 2013 08:49:07 +0000 (12:49 +0400)
committerFreddie Chopin <freddie.chopin@gmail.com>
Wed, 8 May 2013 14:53:36 +0000 (14:53 +0000)
When e.g. SRST is not specified, the current code results in assigning 0 to
srst_fd and subsequently a stray '1' is output on screen on reset.

Avoid this by not doing bogus initialisation.

Change-Id: Iadb847a384a927ae746124cf6e4e3c6cc8b11406
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Reviewed-on: http://openocd.zylin.com/1375
Tested-by: jenkins
Reviewed-by: Freddie Chopin <freddie.chopin@gmail.com>
src/jtag/drivers/sysfsgpio.c

index 283ec445a2c870b4d7938853063425ef056105e6..f77371c8d9839743c72e5bd3c3d20727667fae19 100644 (file)
@@ -475,14 +475,18 @@ static int sysfsgpio_init(void)
                goto out_error;
 
        /* assume active low*/
-       trst_fd = setup_sysfs_gpio(trst_gpio, 1, 1);
-       if (trst_gpio > 0 && trst_fd < 0)
-               goto out_error;
+       if (trst_gpio > 0) {
+               trst_fd = setup_sysfs_gpio(trst_gpio, 1, 1);
+               if (trst_fd < 0)
+                       goto out_error;
+       }
 
        /* assume active low*/
-       srst_fd = setup_sysfs_gpio(srst_gpio, 1, 1);
-       if (srst_gpio > 0 && srst_fd < 0)
-               goto out_error;
+       if (srst_gpio > 0) {
+               srst_fd = setup_sysfs_gpio(srst_gpio, 1, 1);
+               if (srst_fd < 0)
+                       goto out_error;
+       }
 
        return ERROR_OK;
 

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)