diff --git a/src/ix_stream/Makefile b/src/ix_stream/Makefile index 4272f9c041b6fe1cd5c0e67a13f2ffd5390222ae..ba6c1d375116031f4c2091642b1ae17357ad78f8 100644 --- a/src/ix_stream/Makefile +++ b/src/ix_stream/Makefile @@ -69,6 +69,13 @@ omx_recv: mx2ix.c $(CC) $(FLAGS) -o mx2ix mx2ix.o rfm.o simple_pv.o -L $(API_LIB_PATH) -L/opt/open-mx/lib -lsisci -lmyriexpress -lpthread sync +mx2rcv: mx2rcv.c + $(CC) $(CFLAGS) -I../zmq_stream -I/opt/open-mx/include mx2rcv.c -c -o mx2rcv.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 mx2rcv mx2rcv.o rfm.o simple_pv.o -L $(API_LIB_PATH) -L/opt/open-mx/lib -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 diff --git a/src/ix_stream/mx2ix.c b/src/ix_stream/mx2ix.c index 6406c74e2f9d452945f422c596ee9fe985b6e7d9..0f903eb2faeea192bb537fa1beed147b214fd586 100644 --- a/src/ix_stream/mx2ix.c +++ b/src/ix_stream/mx2ix.c @@ -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"); diff --git a/src/mx_stream/Makefile b/src/mx_stream/Makefile index 3abd6d8a2cc0092fb68777869d6f59dd71556564..cef4bc79b2a48b76604871679410f400e3f42dd5 100644 --- a/src/mx_stream/Makefile +++ b/src/mx_stream/Makefile @@ -24,6 +24,8 @@ TARGETS=mx_stream mx_multi_stream mx_mem_test #mx_mem_test: mx_mem_test.o rfm.o +mx2rcv: mx2rcv.o rfm.o + #mx_stream_single: mx_stream_single.o rfm.o omx_xmit: mx_fe.o rfm.o