detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-23 15:00:02 +02:00
Code Issues Actions Packages Releases Activity

fixed eiger server compiler errors

Browse Source
This commit is contained in:
maliakal_d 2018-11-08 17:22:59 +01:00
parent 7a99d4155a
commit a37be4b2e3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorServers/slsDetectorServer/slsDetectorFunctionList.h
View File

@ -64,10 +64,10 @@ int setDefaultDacs();
// advanced read/write reg // 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 writeRegister(u_int32_t offset, u_int32_t data); // blackfin.h
extern u_int32_t readRegister(u_int32_t offset); // 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 writeRegister(uint32_t offset, uint32_t data);
uint32_t readRegister(uint32_t offset); uint32_t readRegister(uint32_t offset);
#else #else

2
slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c
View File

@ -2115,7 +2115,7 @@ int write_adc_register(int file_des) {
uint32_t val = args[1]; uint32_t val = args[1];
FILE_LOG(logDEBUG1, ("Writing 0x%x to ADC Register 0x%x\n", val, addr)); FILE_LOG(logDEBUG1, ("Writing 0x%x to ADC Register 0x%x\n", val, addr));
#if defined(GOTTHARDD) || defined(JUNGFRAUD) #ifdef EIGERD
functionNotImplemented(); functionNotImplemented();
#else #else
#ifndef VIRTUAL #ifndef VIRTUAL