diff --git a/Makefile b/Makefile index 8e5438fbc5c317eb7d569df90d5170e96f61169d..d93b838fd9e1dde204a4fec3ce49fc0e06fd975b 100644 --- a/Makefile +++ b/Makefile @@ -117,8 +117,8 @@ all: tools $(OUTPUT).ram $(OUTPUT).vhd $(OUTPUT).mif .PHONY: all tools clean gitmodules $(PPSI)/ppsi.o $(PPSI)/ppsi.o: - $(MAKE) -C $(PPSI) ARCH=spec PROTO_EXT=whiterabbit HAS_FULL_DIAG=y \ - CROSS_COMPILE=$(CROSS_COMPILE) + $(MAKE) -C $(PPSI) ARCH=spec PROTO_EXT=whiterabbit \ + CROSS_COMPILE=$(CROSS_COMPILE) CONFIG_NO_PRINTF=y $(OUTPUT).elf: $(LDS) $(AUTOCONF) gitmodules $(OUTPUT).o $(CC) $(CFLAGS) -DGIT_REVISION=\"$(REVISION)\" -c revision.c diff --git a/ppsi b/ppsi index d3b860f2d0ca04cd041f08858d0fd1c5ad0f4835..7d2d9d92d7f739e61bdd3d149accccff16560f20 160000 --- a/ppsi +++ b/ppsi @@ -1 +1 @@ -Subproject commit d3b860f2d0ca04cd041f08858d0fd1c5ad0f4835 +Subproject commit 7d2d9d92d7f739e61bdd3d149accccff16560f20 diff --git a/tests/measure_t24p.c b/tests/measure_t24p.c index 3f39fd55c782ea5cf2bc12d04cc6efb89f300501..78a328a88131a6365c180da774b87135698c8495 100644 --- a/tests/measure_t24p.c +++ b/tests/measure_t24p.c @@ -85,7 +85,7 @@ static int meas_phase_range(wr_socket_t * sock, int phase_min, int phase_max, if (n > 0) { msg_unpack_header(ppi, buf); if (mhdr->messageType == 0) - assign_TimeInternal(&ts_sync, &ts_rx); + ts_sync = ts_rx; else if (mhdr->messageType == 8 && ts_sync.correct) { MsgFollowUp fup; msg_unpack_follow_up(buf, &fup);