From a5f64ff27d19ca53aeb4d02729745beaa736028f Mon Sep 17 00:00:00 2001 From: Matteo Concas Date: Tue, 8 Oct 2024 09:17:34 +0200 Subject: [PATCH] grlib/ascs: Fix evaluation order violations, CIDs 1399778, 1399782 --- bsps/shared/grlib/ascs/grascs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bsps/shared/grlib/ascs/grascs.c b/bsps/shared/grlib/ascs/grascs.c index 016fb207e4..212dddbe0b 100644 --- a/bsps/shared/grlib/ascs/grascs.c +++ b/bsps/shared/grlib/ascs/grascs.c @@ -329,7 +329,7 @@ int ASCS_input_select(int slave) { return -GRASCS_ERROR_TRANSACTIVE; } - cfg->regs->cmd = ((cfg->regs->cmd &= ~GRASCS_CMD_SLAVESEL) | + cfg->regs->cmd = ((cfg->regs->cmd & ~GRASCS_CMD_SLAVESEL) | (slave << GRASCS_CMD_SLAVESEL_BITS)); rtems_semaphore_release(cfg->tmsem1); @@ -364,7 +364,7 @@ int ASCS_etr_select(int etr, int freq) { } cfg->regs->clk = ASCS_calc_clkreg(cfg->caps->clkfreq,freq); - cfg->regs->cmd = ((cfg->regs->cmd &= ~GRASCS_CMD_ETRCTRL) | + cfg->regs->cmd = ((cfg->regs->cmd & ~GRASCS_CMD_ETRCTRL) | (etr << GRASCS_CMD_ETRCTRL_BITS)); return 0;