kopia lustrzana https://github.com/cariboulabs/cariboulite
integration of iir1 lib into the software tree
rodzic
f53a79b7e2
commit
122b2a002a
|
@ -25,6 +25,7 @@ add_subdirectory(src/cariboulite_config EXCLUDE_FROM_ALL)
|
|||
add_subdirectory(src/cariboulite_eeprom EXCLUDE_FROM_ALL)
|
||||
add_subdirectory(src/production_utils EXCLUDE_FROM_ALL)
|
||||
add_subdirectory(src/zf_log EXCLUDE_FROM_ALL)
|
||||
add_subdirectory(src/iir1 EXCLUDE_FROM_ALL)
|
||||
|
||||
# Create the library LibCaribouLite
|
||||
add_library(cariboulite STATIC ${SOURCES_LIB})
|
||||
|
@ -43,7 +44,8 @@ target_link_libraries(cariboulite datatypes
|
|||
rt
|
||||
m
|
||||
pthread
|
||||
iir_static)
|
||||
iir)
|
||||
|
||||
target_include_directories(cariboulite PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
add_compile_options(-Wall -Wextra -Wno-unused-variable -Wno-missing-braces)
|
||||
|
||||
|
@ -107,4 +109,4 @@ set_target_properties( fpgacomm PROPERTIES RUNTIME_OUTPUT_DIRECTORY test)
|
|||
# ------------
|
||||
# Set the location for library installation -- i.e., /usr/lib in this case
|
||||
# not really necessary in this example. Use "sudo make install" to apply
|
||||
#install(TARGETS cariboulite DESTINATION /usr/lib)
|
||||
#install(TARGETS cariboulite DESTINATION /usr/lib)
|
||||
|
|
|
@ -8,6 +8,8 @@
|
|||
|
||||
#include <signal.h>
|
||||
#include <stdio.h>
|
||||
#include <errno.h>
|
||||
|
||||
#include "cariboulite_setup.h"
|
||||
#include "cariboulite_events.h"
|
||||
#include "cariboulite_fpga_firmware.h"
|
||||
|
@ -118,7 +120,9 @@ void cariboulite_sigaction_basehandler (int signo,
|
|||
int run_first = 0;
|
||||
int run_last = 0;
|
||||
|
||||
//cariboulite_st* sys = (cariboulite_st*)ucontext;
|
||||
// store the errno
|
||||
int internal_errno = errno;
|
||||
|
||||
|
||||
if (sigsys->signal_cb)
|
||||
{
|
||||
|
@ -164,6 +168,7 @@ void cariboulite_sigaction_basehandler (int signo,
|
|||
sigsys->signal_cb(sigsys, sigsys->singal_cb_context, signo, si);
|
||||
}
|
||||
|
||||
errno = internal_errno;
|
||||
exit(0);
|
||||
}
|
||||
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
Subproject commit fc8634d15b470a00ba4859915fec0047bb486dd4
|
Ładowanie…
Reference in New Issue