From feec20f09696f6d58becdd15ca589eb4065a551f Mon Sep 17 00:00:00 2001 From: hadaq Date: Wed, 19 Oct 2011 15:33:29 +0000 Subject: [PATCH] update --- libtrbnet/Makefile.gbit | 4 ++-- libtrbnet/trbnet.c | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/libtrbnet/Makefile.gbit b/libtrbnet/Makefile.gbit index 6077656..702b554 100644 --- a/libtrbnet/Makefile.gbit +++ b/libtrbnet/Makefile.gbit @@ -1,9 +1,9 @@ # ------------ Compiler / Linker Options ------------------------------- ifeq ($(shell uname -m), x86_64) - CPPFLAGS = -DX86_64 -DGBIT + CPPFLAGS = -DX86_64 -DGBE else - CPPFLAGS = -DGBIT + CPPFLAGS = -DGBE endif CC = gcc diff --git a/libtrbnet/trbnet.c b/libtrbnet/trbnet.c index f35be10..64d72fa 100644 --- a/libtrbnet/trbnet.c +++ b/libtrbnet/trbnet.c @@ -1,4 +1,4 @@ -const char trbnet_version[] = "$Revision: 4.11 $ Local"; +const char trbnet_version[] = "$Revision: 4.12 $ Local"; #include #include @@ -528,13 +528,11 @@ static int trb_fifo_read(uint8_t channel, #ifdef PEXOR if (dataBufferSize == 0) { trb_errno = TRB_PEXOR_DMA_ERROR; - fprintf(stderr, "DMA: err 0\n"); return -1; } if (read(pexorFileHandle, (void*)dataBuffer, dataBufferSize * 4) != dataBufferSize * 4) { trb_errno = TRB_PEXOR_DMA_ERROR; - fprintf(stderr, "DMA: err 1\n"); return -1; } #else @@ -1086,7 +1084,6 @@ static int trb_fifo_read(uint8_t channel, #ifdef PEXOR if (tmp - dataBuffer >= dataBufferSize) { trb_errno = TRB_PEXOR_DMA_ERROR; - fprintf(stderr, "DMA: err 2\n"); return -1; } tmp++; -- 2.43.0