...
 
Commits (5)
......@@ -33,14 +33,4 @@ install(TARGETS dix_recv DESTINATION bin)
#
#endif (${MX_FOUND})
if (${OPENMX_FOUND})
add_executable(omx_recv mx2ix.c)
target_link_libraries(omx_recv PUBLIC
driver::shmem
dolphin::sisci
zmq::simple_pv
openmx::openmx
${CMAKE_THREAD_LIBS_INIT}
)
install(TARGETS omx_recv DESTINATION bin)
endif (${OPENMX_FOUND})
......@@ -62,13 +62,6 @@ crc.o: ../drv/crc.c
# $(CC) $(FLAGS) -o ix_dc_xmit ix_dc_xmit.o rfm.o -L $(API_LIB_PATH) -lsisci
# sync
omx_recv: mx2ix.c
$(CC) $(CFLAGS) -I../zmq_stream -I/opt/open-mx/include mx2ix.c -c -o mx2ix.o
$(CC) $(CFLAGS) ../drv/rfm.c -c -o rfm.o
$(CC) $(CFLAGS) -I../zmq_stream ../zmq_stream/simple_pv.c -c -o simple_pv.o
$(CC) $(FLAGS) -o mx2ix mx2ix.o rfm.o simple_pv.o -L $(API_LIB_PATH) -L/opt/open-mx/lib -lsisci -lmyriexpress -lpthread
sync
zmq_recv: zmq_rcv_ix_xmit.c
$(CC) $(CFLAGS) -I../zmq_stream zmq_rcv_ix_xmit.c -c -o zmq_rcv_ix_xmit.o
$(CC) $(CFLAGS) ../drv/rfm.c -c -o rfm.o
......
......@@ -390,6 +390,7 @@ main(int argc, char **argv)
ifo_header->cycleDataSize = cycle_data_size;
ifo_header->maxCycle = DAQ_NUM_DATA_BLOCKS_PER_SECOND;
#if 0
if(xmitData) {
// Connect to Dolphin
error = dolphin_init();
......@@ -404,6 +405,7 @@ main(int argc, char **argv)
fprintf(stderr,"Dolphin at 0x%lx and 0x%lx",(long)xmitHeader[ii],(long)xmitDataOffset[ii]);
}
}
#endif
fprintf(stderr,"nsys = %d\n",nsys);
......@@ -760,6 +762,7 @@ main(int argc, char **argv)
} else {
missed_flag <<= 1;
}
#if 0
if(xmitData && !ix_xmit_stop) {
if (sendLength > IX_BLOCK_SIZE)
{
......@@ -789,6 +792,7 @@ main(int argc, char **argv)
// Have to flush the buffers to make data go onto Dolphin network
SCIFlush(sequence,SCI_FLAG_FLUSH_CPU_BUFFERS_ONLY);
}
#endif
if(ix_xmit_stop) {
ix_xmit_stop --;
if(ix_xmit_stop == 0) fprintf(stderr,"Restarting Dolphin Xmit\n");
......
......@@ -25,4 +25,13 @@ if (OPENMX_FOUND)
set_target_properties(omx_xmit PROPERTIES LINKER_LANGUAGE CXX)
install(TARGETS omx_xmit DESTINATION bin)
add_executable(omx_recv omc_recv.c)
target_link_libraries(omx_recv PUBLIC
driver::shmem
zmq::simple_pv
openmx::openmx
${CMAKE_THREAD_LIBS_INIT}
)
install(TARGETS omx_recv DESTINATION bin)
endif (OPENMX_FOUND)
......@@ -64,5 +64,12 @@ LDFLAGS = -L${prefix}/lib -lmyriexpress -lpthread -g
clean:
rm -f *.o mx_stream mx_multi_stream mx_stream_single mx_fe mx_rcv omx_xmit
omx_recv: omx_recv.c
$(CC) $(CFLAGS) -I../zmq_stream -I/opt/open-mx/include omx_recv.c -c -o omx_recv.o
$(CC) $(CFLAGS) ../drv/rfm.c -c -o rfm.o
$(CC) $(CFLAGS) -I../zmq_stream ../zmq_stream/simple_pv.c -c -o simple_pv.o
$(CC) $(FLAGS) -o omx_recv omx_recv.o rfm.o simple_pv.o -L $(API_LIB_PATH) -L/opt/open-mx/lib -lmyriexpress -lpthread
sync
.PHONY: distclean
distclean: clean
This diff is collapsed.