arm_io: -Wshadow warning fix
authorØyvind Harboe <oyvind.harboe@zylin.com>
Wed, 16 Jun 2010 05:41:43 +0000 (07:41 +0200)
committerØyvind Harboe <oyvind.harboe@zylin.com>
Wed, 16 Jun 2010 05:41:43 +0000 (07:41 +0200)
Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
src/flash/nand/arm_io.c

index 7c7148e6be1ba317fb6298bc84fec77315e210c8..7a6ceb39916145b3f1ed8c78fd21ec60a6ebe798 100644 (file)
@@ -100,7 +100,7 @@ int arm_nandwrite(struct arm_nand_data *nand, uint8_t *data, int size)
        struct arm              *armv4_5 = target->arch_info;
        struct reg_param        reg_params[3];
        uint32_t                target_buf;
-       uint32_t                exit = 0;
+       uint32_t                exit_var = 0;
        int                     retval;
 
        /* Inputs:
@@ -153,11 +153,11 @@ int arm_nandwrite(struct arm_nand_data *nand, uint8_t *data, int size)
 
        /* armv4 must exit using a hardware breakpoint */
        if (armv4_5->is_armv4)
-               exit = nand->copy_area->address + sizeof(code) - 4;
+               exit_var = nand->copy_area->address + sizeof(code) - 4;
 
        /* use alg to write data from work area to NAND chip */
        retval = target_run_algorithm(target, 0, NULL, 3, reg_params,
-                       nand->copy_area->address, exit, 1000, &algo);
+                       nand->copy_area->address, exit_var, 1000, &algo);
        if (retval != ERROR_OK)
                LOG_ERROR("error executing hosted NAND write");
 
@@ -184,7 +184,7 @@ int arm_nandread(struct arm_nand_data *nand, uint8_t *data, uint32_t size)
        struct arm *armv4_5 = target->arch_info;
        struct reg_param reg_params[3];
        uint32_t target_buf;
-       uint32_t exit = 0;
+       uint32_t exit_var = 0;
        int retval;
 
        /* Inputs:
@@ -229,11 +229,11 @@ int arm_nandread(struct arm_nand_data *nand, uint8_t *data, uint32_t size)
 
        /* armv4 must exit using a hardware breakpoint */
        if (armv4_5->is_armv4)
-               exit = nand->copy_area->address + sizeof(code) - 4;
+               exit_var = nand->copy_area->address + sizeof(code) - 4;
 
        /* use alg to write data from NAND chip to work area */
        retval = target_run_algorithm(target, 0, NULL, 3, reg_params,
-                       nand->copy_area->address, exit, 1000, &algo);
+                       nand->copy_area->address, exit_var, 1000, &algo);
        if (retval != ERROR_OK)
                LOG_ERROR("error executing hosted NAND read");
 

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)