From 98b5e893b180217e8ddddb95275b84d3b28a0832 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Mon, 3 Dec 2018 14:33:32 +0100 Subject: [PATCH] rd strobe fifo for only analog fifos --- slsDetectorServers/ctbDetectorServer/RegisterDefs.h | 4 ++-- .../ctbDetectorServer/slsDetectorFunctionList.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/slsDetectorServers/ctbDetectorServer/RegisterDefs.h b/slsDetectorServers/ctbDetectorServer/RegisterDefs.h index c6cd37964..f60d63a3c 100644 --- a/slsDetectorServers/ctbDetectorServer/RegisterDefs.h +++ b/slsDetectorServers/ctbDetectorServer/RegisterDefs.h @@ -245,8 +245,8 @@ #define DUMMY_FIFO_CHNNL_SLCT_OFST (0) #define DUMMY_FIFO_CHNNL_SLCT_MSK (0x0000003F << DUMMY_FIFO_CHNNL_SLCT_OFST) -#define DUMMY_ALL_FIFO_RD_STRBE_OFST (8) -#define DUMMY_ALL_FIFO_RD_STRBE_MSK (0x00000001 << DUMMY_ALL_FIFO_RD_STRBE_OFST) +#define DUMMY_ANLG_FIFO_RD_STRBE_OFST (8) +#define DUMMY_ANLG_FIFO_RD_STRBE_MSK (0x00000001 << DUMMY_ANLG_FIFO_RD_STRBE_OFST) #define DUMMY_DGTL_FIFO_RD_STRBE_OFST (9) #define DUMMY_DGTL_FIFO_RD_STRBE_MSK (0x00000001 << DUMMY_DGTL_FIFO_RD_STRBE_OFST) diff --git a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c index a794942fd..c30c9e329 100644 --- a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c @@ -2224,7 +2224,7 @@ void readframe(int *ret, char *mess){ } void unsetFifoReadStrobes() { - bus_w(DUMMY_REG, bus_r(addr) & (~DUMMY_ALL_FIFO_RD_STRBE_MSK) & (~DUMMY_DGTL_FIFO_RD_STRBE_MSK)); + bus_w(DUMMY_REG, bus_r(addr) & (~DUMMY_ANLG_FIFO_RD_STRBE_MSK) & (~DUMMY_DGTL_FIFO_RD_STRBE_MSK)); } void readSample() { @@ -2234,9 +2234,9 @@ void readSample() { // read adcs if (analogEnable) { - // read strobe to all adc fifos - bus_w(addr, bus_r(addr) | DUMMY_ALL_FIFO_RD_STRBE_MSK); - bus_w(addr, bus_r(addr) & (~DUMMY_ALL_FIFO_RD_STRBE_MSK)); + // read strobe to all analog fifos + bus_w(addr, bus_r(addr) | DUMMY_ANLG_FIFO_RD_STRBE_MSK); + bus_w(addr, bus_r(addr) & (~DUMMY_ANLG_FIFO_RD_STRBE_MSK)); // loop through all channels int ich = 0;