From: hades Date: Sun, 10 Sep 2000 17:39:39 +0000 (+0000) Subject: *** empty log message *** X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=8b7a769bf67f843d81b286debcd7005c8294da22;p=daqdata.git *** empty log message *** --- diff --git a/allParam/ca/caParam.c b/allParam/ca/caParam.c index 38727cf..c512adf 100644 --- a/allParam/ca/caParam.c +++ b/allParam/ca/caParam.c @@ -107,7 +107,7 @@ int Param_getStringArray(const Param *my, const char *name, const char *idx, int status = ca_array_get_callback(ca_field_type(chan), ca_element_count(chan), chan, Param_copyToAllocMem, result); Param_strerror((Param *) my, ca_message(status)); - if((status = ca_pend_io(TIMEOUT)) == ECA_TIMEOUT) { + if((status = ca_pend_event(TIMEOUT)) == ECA_TIMEOUT) { Param_strerror((Param *) my, ca_message(status)); } else if (status != ECA_NORMAL) { Param_strerror((Param *) my, ca_message(status)); diff --git a/allParam/ca/caParam.h b/allParam/ca/caParam.h index 19f2ef6..9fdeb70 100644 --- a/allParam/ca/caParam.h +++ b/allParam/ca/caParam.h @@ -9,7 +9,7 @@ * Section containing struct Param (different in the different param.h's) * **************************************************************************/ -#define TIMEOUT 0.5 +#define TIMEOUT 0.2 typedef struct ParamS { char *strerror; diff --git a/allParam/test/param.tcl b/allParam/test/param.tcl index e22aa91..463ee69 100644 --- a/allParam/test/param.tcl +++ b/allParam/test/param.tcl @@ -1,4 +1,4 @@ -set tname(tstring) test0 +set tname(tstring) test100 set tname(tint) 100