From: hadeshyp Date: Tue, 14 Jul 2009 17:37:20 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: v6.0~411 X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=11095664cb19a7c59ecfbd0ce1770d8eabee3476;p=trbnettools.git *** empty log message *** --- diff --git a/libtrbnet/trbnet.c b/libtrbnet/trbnet.c index 5c02b31..7ea9b7b 100644 --- a/libtrbnet/trbnet.c +++ b/libtrbnet/trbnet.c @@ -117,7 +117,7 @@ #define SHORT_TRANSFER 0x0100 /* Other */ -#define MAX_TIME_OUT 500 +#define MAX_TIME_OUT 1500000 #define DATA_BUFFER_SIZE 8192 @@ -352,7 +352,7 @@ static int trb_fifo_read(uint8_t channel, unsigned int dataCtr = 0; int packageCtr = -1; unsigned int endPointCtr = 0; - + unsigned int timeout = 0; /* Determin FIFO-Address */ @@ -724,7 +724,7 @@ static int trb_fifo_read(uint8_t channel, do { read32_from_FPGA(fifoBuffer, tmp); } while (((*tmp & MASK_FIFO_VALID) == 0) && (++timeout < MAX_TIME_OUT)); - + if (timeout >= MAX_TIME_OUT) { trb_fifo_flush(channel); trb_errno = TRB_FIFO_TIMEOUT; @@ -733,7 +733,7 @@ static int trb_fifo_read(uint8_t channel, } } } - + /* Copy StatusBits and Sequenze of TerminationPackage */ trb_term.status_common = package.F2; trb_term.status_channel = package.F1;