From: hadaq Date: Tue, 30 Mar 2010 16:39:54 +0000 (+0000) Subject: unknow address error know status bit X-Git-Tag: v6.0~286 X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=6404f1acf6492c69f35f0e5c5a1f87861465ba3c;p=trbnettools.git unknow address error know status bit --- diff --git a/libtrbnet/trberror.c b/libtrbnet/trberror.c index 47806f3..2e8bf60 100644 --- a/libtrbnet/trberror.c +++ b/libtrbnet/trberror.c @@ -104,7 +104,7 @@ const char* trb_strterm(TRB_TERM term) }; static const char ch3StatusBits[16][64] = { - "Ch3_Address: unknown address", /* error */ + "Ch3_Address: unknown address", /* status */ "Ch3_Timeout: timeout error", /* error */ "Ch3_NoMoreData: no more data" /* status */ "", "", "", "", "", "", "", "", "", "", "", "", "" diff --git a/libtrbnet/trbnet.c b/libtrbnet/trbnet.c index 5739c1a..a4a37dc 100644 --- a/libtrbnet/trbnet.c +++ b/libtrbnet/trbnet.c @@ -1,4 +1,4 @@ -const char trbnet_version[] = "$Revision: 2.56 $"; +const char trbnet_version[] = "$Revision: 2.57 $"; #include #include @@ -907,7 +907,7 @@ static int trb_fifo_read(uint8_t channel, return -1; } - if ((channel == 3) && ((trb_term.status_channel & 0x0003) != 0)) { + if ((channel == 3) && ((trb_term.status_channel & 0x0002) != 0)) { trb_errno = TRB_STATUS_ERROR; return -1; }