aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeth LaForge <sethml@google.com>2019-08-19 10:40:07 -0700
committerTomas Vanek <vanekt@fbl.cz>2019-09-08 11:51:21 +0100
commit844c82934ed5f23b62326870f9d7818afce7c4f6 (patch)
treed8b64b451ef762b85f6173a734e790cae7c6dea1
parent081954136681b26ad30db9b4cc40cb360f47602c (diff)
downloadriscv-openocd-844c82934ed5f23b62326870f9d7818afce7c4f6.zip
riscv-openocd-844c82934ed5f23b62326870f9d7818afce7c4f6.tar.gz
riscv-openocd-844c82934ed5f23b62326870f9d7818afce7c4f6.tar.bz2
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 rtrieu@google.com. Change-Id: I46f190154797f8affc761caf3a15a1a9db53d702 Signed-off-by: Seth LaForge <sethml@google.com> Reviewed-on: http://openocd.zylin.com/5281 Tested-by: jenkins Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
-rw-r--r--src/flash/nand/lpc3180.c2
-rw-r--r--src/flash/nand/lpc32xx.c2
2 files changed, 2 insertions, 2 deletions
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;