From: hadaq <hadaq>
Date: Mon, 28 Jun 2010 12:44:19 +0000 (+0000)
Subject: no answer is now status
X-Git-Tag: v6.0~252
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=21f30a9d6b636502b6f6d6c2b6c6e861d0229c4d;p=trbnettools.git

no answer is now status
---

diff --git a/libtrbnet/trberror.c b/libtrbnet/trberror.c
index f86830f..1f90b99 100644
--- a/libtrbnet/trberror.c
+++ b/libtrbnet/trberror.c
@@ -65,13 +65,13 @@ const char* trb_strerror(int trberrno)
 const char* trb_strterm(TRB_TERM term)
 {
   static const char commonStatusBits[16][64] = { 
-    "COM_EndpointReached: no endpoint has been reached",         /* error */
+    "COM_EndpointReached: no endpoint has been reached",         /* status */
     "COM_Collision: collision has been detected",                /* error */
     "COM_WordMissing: mismatch of packet counters (EOB)",        /* error */
-    "COM_Checksum: checksum error",              /* status, at the moment */
+    "COM_Checksum: checksum error",                              /* error */
     "COM_DontUnderstand: endpoint doesn't understand data",      /* error */
     "COM_BufferMismatch: buffer numbers (EOB and ACK) mismatch", /* error */
-    "COM_AnswerMissing: One endpoint didn't react",              /* error */ 
+    "COM_AnswerMissing: One2 endpoint didn't react",             /* status */ 
     "", "", "", "", "", "", "", "", ""
   };
   
diff --git a/libtrbnet/trbnet.c b/libtrbnet/trbnet.c
index b51ebf5..1f98b4c 100644
--- a/libtrbnet/trbnet.c
+++ b/libtrbnet/trbnet.c
@@ -1,4 +1,4 @@
-const char trbnet_version[] = "$Revision: 2.66 $";
+const char trbnet_version[] = "$Revision: 2.67 $";
 
 #include <stdlib.h>
 #include <signal.h>
@@ -917,7 +917,7 @@ static int trb_fifo_read(uint8_t channel,
     return -1;
   }
   
-  if ((trb_term.status_common & 0x007e) != 0) {
+  if ((trb_term.status_common & 0x0003e) != 0) {
     trb_errno = TRB_STATUS_ERROR;
     return -1;
   }