From a37be4b2e3a568e4b2a76e67e03de0dec1ee1c75 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Thu, 8 Nov 2018 17:22:59 +0100 Subject: [PATCH] fixed eiger server compiler errors --- .../slsDetectorServer/slsDetectorFunctionList.h | 4 ++-- .../slsDetectorServer/slsDetectorServer_funcs.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/slsDetectorServers/slsDetectorServer/slsDetectorFunctionList.h b/slsDetectorServers/slsDetectorServer/slsDetectorFunctionList.h index 34bce6973..6c3460a91 100644 --- a/slsDetectorServers/slsDetectorServer/slsDetectorFunctionList.h +++ b/slsDetectorServers/slsDetectorServer/slsDetectorFunctionList.h @@ -64,10 +64,10 @@ int setDefaultDacs(); // advanced read/write reg -#ifndef EIGERD +#ifdef JUNGFRAUD extern u_int32_t writeRegister(u_int32_t offset, u_int32_t data); // blackfin.h extern u_int32_t readRegister(u_int32_t offset); // blackfin.h -#elif JUNGFRAUD +#elif EIGERD uint32_t writeRegister(uint32_t offset, uint32_t data); uint32_t readRegister(uint32_t offset); #else diff --git a/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c b/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c index b68ebc967..eafa4ead3 100755 --- a/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c +++ b/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c @@ -2115,7 +2115,7 @@ int write_adc_register(int file_des) { uint32_t val = args[1]; FILE_LOG(logDEBUG1, ("Writing 0x%x to ADC Register 0x%x\n", val, addr)); -#if defined(GOTTHARDD) || defined(JUNGFRAUD) +#ifdef EIGERD functionNotImplemented(); #else #ifndef VIRTUAL