This is an automated email from Gerrit.

Seth LaForge ([email protected]) just uploaded a new patch set to Gerrit, which 
you can find at http://openocd.zylin.com/5281

-- gerrit

commit af6bd872d36eec5be03e29da7589f8a438dd5f2e
Author: Seth LaForge <[email protected]>
Date:   Mon Aug 19 10:40:07 2019 -0700

    src/flash/nand: Fix some operator precedence bugs.
    
    Fix two expressions where precedence of operator | vs ?: was clearly 
confused.
    Untested - was clearly not expressing the intent of the author by 
inspection.
    Found by automated tooling and [email protected].
    
    Change-Id: I46f190154797f8affc761caf3a15a1a9db53d702
    Signed-off-by: Seth LaForge <[email protected]>

diff --git a/src/flash/nand/lpc3180.c b/src/flash/nand/lpc3180.c
index 436580e..389c18a 100644
--- a/src/flash/nand/lpc3180.c
+++ b/src/flash/nand/lpc3180.c
@@ -237,7 +237,7 @@ static int lpc3180_init(struct nand_device *nand)
 
                /* SLC_CFG = 0x (Force nCE assert, DMA ECC enabled, ECC 
enabled, DMA burst enabled,
                 *DMA read from SLC, WIDTH = bus_width) */
-               target_write_u32(target, 0x20020014, 0x3e | (bus_width == 16) ? 
1 : 0);
+               target_write_u32(target, 0x20020014, 0x3e | ((bus_width == 16) 
? 1 : 0));
 
                /* SLC_IEN = 3 (INT_RDY_EN = 1) ,(INT_TC_STAT = 1) */
                target_write_u32(target, 0x20020020, 0x03);
diff --git a/src/flash/nand/lpc32xx.c b/src/flash/nand/lpc32xx.c
index 6febe16..058d9a5 100644
--- a/src/flash/nand/lpc32xx.c
+++ b/src/flash/nand/lpc32xx.c
@@ -332,7 +332,7 @@ static int lpc32xx_init(struct nand_device *nand)
                        WIDTH = bus_width)
                */
                retval = target_write_u32(target, 0x20020014,
-                               0x3e | (bus_width == 16) ? 1 : 0);
+                               0x3e | ((bus_width == 16) ? 1 : 0));
                if (ERROR_OK != retval) {
                        LOG_ERROR("could not set SLC_CFG");
                        return ERROR_NAND_OPERATION_FAILED;

-- 


_______________________________________________
OpenOCD-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openocd-devel

Reply via email to