detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-21 00:58:01 +02:00
Code Issues Actions Packages Releases Activity

jungfrau virtual server compiles

Browse Source
This commit is contained in:
maliakal_d
2018-11-02 14:52:27 +01:00
parent 833f0c164c
commit d1c8d0b01c
7 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
slsDetectorServers/slsDetectorServer/blackfin.h
View File

@ -10,7 +10,6 @@
u_int64_t CSP0BASE = 0;
#define CSP0 0x20200000
#define MEM_SIZE 0x100000
#define MEM_MAP_SHIFT 1
@ -129,7 +128,7 @@ int mapCSP0(void) {
FILE_LOG(logERROR, ("Could not allocate virtual memory.\n"));
return FAIL;
}
FILE_LOG(logINFO, (("memory allocated\n"));
FILE_LOG(logINFO, ("memory allocated\n"));
#else
int fd;
fd = open("/dev/mem", O_RDWR | O_SYNC, 0);

1
slsDetectorServers/slsDetectorServer/programfpga.h
View File

@ -7,7 +7,6 @@
/* global variables */
#define CTRL_SRVR_INIT_TIME_US (300 * 1000)
#define MTDSIZE 10
int gpioDefined = 0;

4
slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c
View File

@ -2123,9 +2123,11 @@ int write_adc_register(int file_des) {
#ifndef JUNGFRAUD
functionNotImplemented();
#else
#ifndef VIRTUAL
// only set
if (Server_VerifyLock() == OK)
setAdc(addr, val);
#endif
#endif
return Server_SendResult(file_des, INT32, 1, NULL, 0);
}
@ -2385,6 +2387,7 @@ int program_fpga(int file_des) {
n = receiveData(file_des,mess,MAX_STR_LENGTH,OTHER);
functionNotImplemented();
#else
#ifndef VIRTUAL
// only set
if (Server_VerifyLock() == OK) {
@ -2489,6 +2492,7 @@ int program_fpga(int file_des) {
}
}
}
#endif
#endif
return Server_SendResult(file_des, INT32, 1, NULL, 0);
}