sm_io/*/acq/sm_io_acq_exp.c: fix acq channel override

As we now have, in the same register, two fields, acha_chan and acq_dtrig_chan, we must modify only the bits associated with that field. Previously, when we set the acquisition channel, we were rewriting the whole register, effectively selection channel 0 for the acq_dtrig_chan field.

sm_io/*/acq/sm_io_acq_exp.c: fix acq channel override
As we now have, in the same register, two fields, acha_chan and acq_dtrig_chan, we must modify only the bits associated with that field. Previously, when we set the acquisition channel, we were rewriting the whole register, effectively selection channel 0 for the acq_dtrig_chan field.
be151bea · Lucas Russo · 2dcd5f9d · be151bea
Commit be151bea authored Nov 04, 2015 by Lucas Russo
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

sm_io_acq_exp.c src/sm_io/modules/acq/sm_io_acq_exp.c +4 -1

No files found.
--- a/src/sm_io/modules/acq/sm_io_acq_exp.c
+++ b/src/sm_io/modules/acq/sm_io_acq_exp.c
@@ -199,7 +199,10 @@ static int _acq_data_acquire (void *owner, void *args, void *ret)
    smio_thsafe_client_write_32 (self, ACQ_CORE_REG_DDR3_END_ADDR, &end_addr);

    /* Prepare acquisition channel control */
-    uint32_t acq_chan_ctl = ACQ_CORE_ACQ_CHAN_CTL_WHICH_W(chan);
+    uint32_t acq_chan_ctl = 0;
+    smio_thsafe_client_read_32 (self, ACQ_CORE_REG_ACQ_CHAN_CTL, &acq_chan_ctl);
+    acq_chan_ctl = (acq_chan_ctl & ~ACQ_CORE_ACQ_CHAN_CTL_WHICH_MASK) |
+         ACQ_CORE_ACQ_CHAN_CTL_WHICH_W(chan);
    DBE_DEBUG (DBG_SM_IO | DBG_LVL_TRACE, "[sm_io:acq] data_acquire: "
            "Channel control register is: 0x%08x\n",
            acq_chan_ctl);