]> jspc29.x-matter.uni-frankfurt.de Git - trbnettools.git/commitdiff
unknow address error know status bit
authorhadaq <hadaq>
Tue, 30 Mar 2010 16:39:54 +0000 (16:39 +0000)
committerhadaq <hadaq>
Tue, 30 Mar 2010 16:39:54 +0000 (16:39 +0000)
libtrbnet/trberror.c
libtrbnet/trbnet.c

index 47806f3226c96cb8d02ebeffe3825d375c8ee717..2e8bf6051ad36f4fced19b2e2cb796d675c84a44 100644 (file)
@@ -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 */
     "", "", "", "", "", "", "", "", "", "", "", "", ""
index 5739c1a457b7144b37bbabc94dc221defc6b7f48..a4a37dc2f56e5afe4b0872b5c59b483e7039d928 100644 (file)
@@ -1,4 +1,4 @@
-const char trbnet_version[] = "$Revision: 2.56 $";
+const char trbnet_version[] = "$Revision: 2.57 $";
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -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;
     }