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

binaries in

Browse Source
This commit is contained in:
maliakal_d
2021-09-16 16:46:31 +02:00
parent 74fde0a77c cc95df7233
commit a88d1ff1e4
36 changed files with 819 additions and 562 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
slsDetectorServers/CMakeLists.txt
View File

@ -1,17 +1,5 @@
add_library(slsProjectCSettings INTERFACE)
target_compile_features(slsProjectCSettings INTERFACE c_std_99)
target_compile_options(slsProjectCSettings INTERFACE
-Wall
-Wextra
-Wno-unused-parameter #Needs to be slowly mitigated
-Wdouble-promotion
-Wformat=2
-Wredundant-decls
# -Wconversion
-Wdouble-promotion
-Werror=return-type
)
# Install fake the library
install(TARGETS slsProjectCSettings

3
slsDetectorServers/ctbDetectorServer/CMakeLists.txt
View File

@ -18,14 +18,13 @@ add_executable(ctbDetectorServer_virtual
../slsDetectorServer/src/programFpgaBlackfin.c
../slsDetectorServer/src/sharedMemory.c
../slsDetectorServer/src/loadPattern.c
../../slsSupportLib/opensslMd5/md5.c
../../slsSupportLib/src/md5.c
)
include_directories(
../slsDetectorServer/include
../../slsSupportLib/include
../../slsDetectorSoftware/include/sls/
../../slsSupportLib/opensslMd5
)
target_include_directories(ctbDetectorServer_virtual

4
slsDetectorServers/ctbDetectorServer/Makefile
View File

@ -3,11 +3,11 @@ main_inc = ../slsDetectorServer/include/
main_src = ../slsDetectorServer/src/
support_lib = ../../slsSupportLib/include/
det_lib = ../../slsDetectorSoftware/include/sls/
md5_dir = ../../slsSupportLib/opensslMd5/
md5_dir = ../../slsSupportLib/src/
CROSS = bfin-uclinux-
CC = $(CROSS)gcc
CFLAGS += -Wall -std=gnu99 -DCHIPTESTBOARDD -DSTOP_SERVER -I$(main_inc) -I$(support_lib) -I$(det_lib) -I$(current_dir) -I$(md5_dir) #-DDEBUG1 #-DVERBOSEI #-DVERBOSE
CFLAGS += -Wall -std=gnu99 -DCHIPTESTBOARDD -DSTOP_SERVER -I$(main_inc) -I$(support_lib) -I$(det_lib) -I$(current_dir) #-DDEBUG1 #-DVERBOSEI #-DVERBOSE
LDLIBS += -lm -lrt -pthread
PROGS = ctbDetectorServer
DESTDIR ?= bin

BIN
slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer
View File

Binary file not shown.

3
slsDetectorServers/eigerDetectorServer/CMakeLists.txt
View File

@ -6,13 +6,12 @@ set(src
../slsDetectorServer/src/communication_funcs_UDP.c
../slsDetectorServer/src/common.c
../slsDetectorServer/src/sharedMemory.c
../../slsSupportLib/opensslMd5/md5.c
../../slsSupportLib/src/md5.c
)
include_directories(
../slsDetectorServer/include
../../slsSupportLib/include
../../slsSupportLib/opensslMd5
)
add_executable(eigerDetectorServerMaster_virtual

4
slsDetectorServers/eigerDetectorServer/Makefile
View File

@ -2,12 +2,12 @@ current_dir = $(shell pwd)
main_inc = ../slsDetectorServer/include/
main_src = ../slsDetectorServer/src/
support_lib = ../../slsSupportLib/include/
md5_dir = ../../slsSupportLib/opensslMd5/
md5_dir = ../../slsSupportLib/src/
BLACKFIN_CC = bfin-uclinux-gcc
CROSS = powerpc-4xx-softfloat-
CC = $(CROSS)gcc
CFLAGS += -Wall -std=gnu99 -DEIGERD -DSTOP_SERVER -I$(main_inc) -I$(support_lib) -I$(current_dir) -I$(md5_dir)#-DDEBUG1 #-DVERBOSEI #-DVERBOSE
CFLAGS += -Wall -std=gnu99 -DEIGERD -DSTOP_SERVER -I$(main_inc) -I$(support_lib) -I$(current_dir) #-DDEBUG1 #-DVERBOSEI #-DVERBOSE
LDLIBS += -lm -lrt -pthread
PROGS = eigerDetectorServer
DESTDIR = bin

BIN
slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer
View File

Binary file not shown.

3
slsDetectorServers/gotthard2DetectorServer/CMakeLists.txt
View File

@ -12,13 +12,12 @@ add_executable(gotthard2DetectorServer_virtual
../slsDetectorServer/src/ASIC_Driver.c
../slsDetectorServer/src/programFpgaNios.c
../slsDetectorServer/src/sharedMemory.c
../../slsSupportLib/opensslMd5/md5.c
../../slsSupportLib/src/md5.c
)
include_directories(
../slsDetectorServer/include
../../slsSupportLib/include
../../slsSupportLib/opensslMd5
)
target_include_directories(gotthard2DetectorServer_virtual

4
slsDetectorServers/gotthard2DetectorServer/Makefile
View File

@ -2,11 +2,11 @@ current_dir = $(shell pwd)
main_inc = ../slsDetectorServer/include/
main_src = ../slsDetectorServer/src/
support_lib = ../../slsSupportLib/include/
md5_dir = ../../slsSupportLib/opensslMd5/
md5_dir = ../../slsSupportLib/src/
CROSS = nios2-buildroot-linux-gnu-
CC = $(CROSS)gcc
CFLAGS += -Wall -std=gnu99 -DGOTTHARD2D -DSTOP_SERVER -I$(main_inc) -I$(support_lib) -I$(current_dir) -I$(md5_dir) #-DDEBUG1 #-DVERBOSEI #-DVERBOSE
CFLAGS += -Wall -std=gnu99 -DGOTTHARD2D -DSTOP_SERVER -I$(main_inc) -I$(support_lib) -I$(current_dir) #-DDEBUG1 #-DVERBOSEI #-DVERBOSE
LDLIBS += -lm -lrt -pthread
PROGS = gotthard2DetectorServer
DESTDIR ?= bin

BIN
slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer
View File

Binary file not shown.

3
slsDetectorServers/gotthardDetectorServer/CMakeLists.txt
View File

@ -11,13 +11,12 @@ add_executable(gotthardDetectorServer_virtual
../slsDetectorServer/src/commonServerFunctions.c
../slsDetectorServer/src/communication_funcs_UDP.c
../slsDetectorServer/src/sharedMemory.c
../../slsSupportLib/opensslMd5/md5.c
../../slsSupportLib/src/md5.c
)
include_directories(
../slsDetectorServer/include
../../slsSupportLib/include
../../slsSupportLib/opensslMd5
)
target_include_directories(gotthardDetectorServer_virtual

4
slsDetectorServers/gotthardDetectorServer/Makefile
View File

@ -2,11 +2,11 @@ current_dir = $(shell pwd)
main_inc = ../slsDetectorServer/include/
main_src = ../slsDetectorServer/src/
support_lib = ../../slsSupportLib/include/
md5_dir = ../../slsSupportLib/opensslMd5/
md5_dir = ../../slsSupportLib/src/
CROSS = bfin-uclinux-
CC = $(CROSS)gcc
CFLAGS += -Wall -std=gnu99 -DGOTTHARDD -DSTOP_SERVER -I$(main_inc) -I$(support_lib) -I$(current_dir) -I$(md5_dir) #-DVERBOSEI #-DVERBOSE
CFLAGS += -Wall -std=gnu99 -DGOTTHARDD -DSTOP_SERVER -I$(main_inc) -I$(support_lib) -I$(current_dir) #-DVERBOSEI #-DVERBOSE
LDLIBS += -lm -lrt -pthread
PROGS = gotthardDetectorServer
DESTDIR ?= bin

BIN
slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer
View File

Binary file not shown.

3
slsDetectorServers/jungfrauDetectorServer/CMakeLists.txt
View File

@ -13,14 +13,13 @@ add_executable(jungfrauDetectorServer_virtual
../slsDetectorServer/src/programFpgaBlackfin.c
../slsDetectorServer/src/communication_funcs_UDP.c
../slsDetectorServer/src/sharedMemory.c
../../slsSupportLib/opensslMd5/md5.c
../../slsSupportLib/src/md5.c
)
target_include_directories(jungfrauDetectorServer_virtual
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
../slsDetectorServer/include
../../slsSupportLib/include
../../slsSupportLib/opensslMd5
)
target_compile_definitions(jungfrauDetectorServer_virtual

4
slsDetectorServers/jungfrauDetectorServer/Makefile
View File

@ -2,11 +2,11 @@ current_dir = $(shell pwd)
main_inc = ../slsDetectorServer/include/
main_src = ../slsDetectorServer/src/
support_lib = ../../slsSupportLib/include/
md5_dir = ../../slsSupportLib/opensslMd5/
md5_dir = ../../slsSupportLib/src/
CROSS = bfin-uclinux-
CC = $(CROSS)gcc
CFLAGS += -Wall -std=gnu99 -DJUNGFRAUD -DSTOP_SERVER -I$(main_inc) -I$(support_lib) -I$(current_dir) -I$(md5_dir) #-DVERBOSEI #-DVERBOSE
CFLAGS += -Wall -std=gnu99 -DJUNGFRAUD -DSTOP_SERVER -I$(main_inc) -I$(support_lib) -I$(current_dir) #-DVERBOSEI #-DVERBOSE
LDLIBS += -lm -lrt -pthread
PROGS = jungfrauDetectorServer
DESTDIR ?= bin

BIN
slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer
View File

Binary file not shown.

3
slsDetectorServers/moenchDetectorServer/CMakeLists.txt
View File

@ -15,14 +15,13 @@ add_executable(moenchDetectorServer_virtual
../slsDetectorServer/src/programFpgaBlackfin.c
../slsDetectorServer/src/loadPattern.c
../slsDetectorServer/src/sharedMemory.c
../../slsSupportLib/opensslMd5/md5.c
../../slsSupportLib/src/md5.c
)
include_directories(
../slsDetectorServer/include
../../slsSupportLib/include
../../slsDetectorSoftware/include/sls/
../../slsSupportLib/opensslMd5
)
target_include_directories(moenchDetectorServer_virtual

4
slsDetectorServers/moenchDetectorServer/Makefile
View File

@ -3,11 +3,11 @@ main_inc = ../slsDetectorServer/include/
main_src = ../slsDetectorServer/src/
support_lib = ../../slsSupportLib/include/
det_lib = ../../slsDetectorSoftware/include/sls/
md5_dir = ../../slsSupportLib/opensslMd5/
md5_dir = ../../slsSupportLib/src/
CROSS = bfin-uclinux-
CC = $(CROSS)gcc
CFLAGS += -Wall -std=gnu99 -DMOENCHD -DSTOP_SERVER -I$(main_inc) -I$(support_lib) -I$(det_lib) -I$(current_dir) -I$(md5_dir) #-DVERBOSEI #-DVERBOSE
CFLAGS += -Wall -std=gnu99 -DMOENCHD -DSTOP_SERVER -I$(main_inc) -I$(support_lib) -I$(det_lib) -I$(current_dir) #-DVERBOSEI #-DVERBOSE
LDLIBS += -lm -lrt -pthread
PROGS = moenchDetectorServer
DESTDIR ?= bin

BIN
slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer
View File

Binary file not shown.

3
slsDetectorServers/mythen3DetectorServer/CMakeLists.txt
View File

@ -13,14 +13,13 @@ add_executable(mythen3DetectorServer_virtual
../slsDetectorServer/src/programFpgaNios.c
../slsDetectorServer/src/loadPattern.c
../slsDetectorServer/src/sharedMemory.c
../../slsSupportLib/opensslMd5/md5.c
../../slsSupportLib/src/md5.c
)
include_directories(
../slsDetectorServer/include
../../slsSupportLib/include
../../slsDetectorSoftware/include/sls/
../../slsSupportLib/opensslMd5
)
target_include_directories(mythen3DetectorServer_virtual

4
slsDetectorServers/mythen3DetectorServer/Makefile
View File

@ -3,11 +3,11 @@ main_inc = ../slsDetectorServer/include/
main_src = ../slsDetectorServer/src/
support_lib = ../../slsSupportLib/include/
det_lib = ../../slsDetectorSoftware/include/sls/
md5_dir = ../../slsSupportLib/opensslMd5/
md5_dir = ../../slsSupportLib/src/
CROSS = nios2-buildroot-linux-gnu-
CC = $(CROSS)gcc
CFLAGS += -Wall -std=gnu99 -DMYTHEN3D -DSTOP_SERVER -I$(main_inc) -I$(support_lib) -I$(det_lib) -I$(current_dir) -I$(md5_dir) #-DDEBUG1 #-DVERBOSEI #-DVERBOSE
CFLAGS += -Wall -std=gnu99 -DMYTHEN3D -DSTOP_SERVER -I$(main_inc) -I$(support_lib) -I$(det_lib) -I$(current_dir) #-DDEBUG1 #-DVERBOSEI #-DVERBOSE
LDLIBS += -lm -lrt -pthread
PROGS = mythen3DetectorServer
DESTDIR ?= bin

BIN
slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer
View File

Binary file not shown.

2
slsDetectorServers/slsDetectorServer/include/common.h
View File

@ -1,6 +1,6 @@
#pragma once
#include "md5.h"
#include "sls/md5.h"
#include <stdint.h> // int64_t
#include <stdio.h>
#include <sys/types.h>

28
slsDetectorServers/slsDetectorServer/src/common.c
View File

@ -184,13 +184,13 @@ int verifyChecksumFromBuffer(char *mess, char *clientChecksum, char *buffer,
ssize_t bytes) {
LOG(logINFO, ("\tVerifying Checksum...\n"));
MD5_CTX c;
if (!MD5_Init(&c)) {
strcpy(mess, "Unable to calculate checksum (MD5_Init)\n");
if (!MD5_Init_SLS(&c)) {
strcpy(mess, "Unable to calculate checksum (MD5_Init_SLS)\n");
LOG(logERROR, (mess));
return FAIL;
}
if (!MD5_Update(&c, buffer, bytes)) {
strcpy(mess, "Unable to calculate checksum (MD5_Update)\n");
if (!MD5_Update_SLS(&c, buffer, bytes)) {
strcpy(mess, "Unable to calculate checksum (MD5_Update_SLS)\n");
LOG(logERROR, (mess));
return FAIL;
}
@ -209,9 +209,9 @@ int verifyChecksumFromFile(char *mess, char *clientChecksum, char *fname) {
}
MD5_CTX c;
if (!MD5_Init(&c)) {
if (!MD5_Init_SLS(&c)) {
fclose(fp);
strcpy(mess, "Unable to calculate checksum (MD5_Init)\n");
strcpy(mess, "Unable to calculate checksum (MD5_Init_SLS)\n");
LOG(logERROR, (mess));
return FAIL;
}
@ -220,9 +220,9 @@ int verifyChecksumFromFile(char *mess, char *clientChecksum, char *fname) {
ssize_t bytes = fread(buf, 1, readUnitSize, fp);
ssize_t totalBytesRead = bytes;
while (bytes > 0) {
if (!MD5_Update(&c, buf, bytes)) {
if (!MD5_Update_SLS(&c, buf, bytes)) {
fclose(fp);
strcpy(mess, "Unable to calculate checksum (MD5_Update)\n");
strcpy(mess, "Unable to calculate checksum (MD5_Update_SLS)\n");
LOG(logERROR, (mess));
return FAIL;
}
@ -247,9 +247,9 @@ int verifyChecksumFromFlash(char *mess, char *clientChecksum, char *fname,
}
MD5_CTX c;
if (!MD5_Init(&c)) {
if (!MD5_Init_SLS(&c)) {
fclose(fp);
strcpy(mess, "Unable to calculate checksum (MD5_Init)\n");
strcpy(mess, "Unable to calculate checksum (MD5_Init_SLS)\n");
LOG(logERROR, (mess));
return FAIL;
}
@ -267,9 +267,9 @@ int verifyChecksumFromFlash(char *mess, char *clientChecksum, char *fname,
oldProgress = progress;
}
if (!MD5_Update(&c, buf, bytes)) {
if (!MD5_Update_SLS(&c, buf, bytes)) {
fclose(fp);
strcpy(mess, "Unable to calculate checksum (MD5_Update)\n");
strcpy(mess, "Unable to calculate checksum (MD5_Update_SLS)\n");
LOG(logERROR, (mess));
return FAIL;
}
@ -293,8 +293,8 @@ int verifyChecksumFromFlash(char *mess, char *clientChecksum, char *fname,
int verifyChecksum(char *mess, char *clientChecksum, MD5_CTX *c, char *msg) {
unsigned char out[MD5_DIGEST_LENGTH];
if (!MD5_Final(out, c)) {
strcpy(mess, "Unable to calculate checksum (MD5_Final)\n");
if (!MD5_Final_SLS(out, c)) {
strcpy(mess, "Unable to calculate checksum (MD5_Final_SLS)\n");
LOG(logERROR, (mess));
return FAIL;
}