Commit ff117d53 authored by Franksen, Benjamin's avatar Franksen, Benjamin
Browse files

cvtRecord: layout changes, renamed csm_alarm to checkAlarms

parent 008119fe
......@@ -129,7 +129,7 @@ typedef double cvt_subroutine(double,double,void**);
#define DRTY_X 0x10
#define DRTY_Y 0x20
static void csm_alarm(struct cvtRecord *pcvt);
static void checkAlarms(struct cvtRecord *pcvt);
static long readInputs(struct cvtRecord *pcvt);
static long convert(struct cvtRecord *pcvt);
static void monitor(struct cvtRecord *pcvt);
......@@ -222,7 +222,7 @@ static long process(struct cvtRecord *pcvt)
status = convert(pcvt);
error:
csm_alarm(pcvt);
checkAlarms(pcvt);
pcvt->pact = TRUE;
if (pcvt->nsev < INVALID_ALARM) {
......@@ -284,7 +284,7 @@ static long checkInit(struct cvtRecord *pcvt)
pcvt->pact = TRUE;
return -1;
}
csm_alarm(pcvt);
checkAlarms(pcvt);
monitor(pcvt);
return 0;
}
......@@ -392,7 +392,7 @@ static long get_alarm_double(struct dbAddr *paddr, struct dbr_alDouble *pad)
return 0;
}
static void csm_alarm(struct cvtRecord *pcvt)
static void checkAlarms(struct cvtRecord *pcvt)
{
double hyst, lalm, val;
double hihi, high, low, lolo;
......@@ -548,9 +548,6 @@ static long initConversion(
return -1;
}
*psub = csub;
#if 0
csm_pr_func(csub);
#endif
break;
}
case menuCvtMethod2DTable:
......@@ -571,9 +568,6 @@ static long initConversion(
return -1;
}
*psub = csub;
#if 0
csm_pr_func(csub);
#endif
break;
}
}
......@@ -721,7 +715,8 @@ static long reinitConversion(struct cvtRecord *pcvt)
strncpy(msg.spec, pcvt->nspe, MAX_STRING_SIZE);
strncpy(msg.tdir, pcvt->ntdi, MAX_STRING_SIZE);
}
qstatus = epicsMessageQueueSend(initConversionQ, (void*)&msg, REINIT_MSG_SIZE);
qstatus = epicsMessageQueueSend(
initConversionQ, (void*)&msg, REINIT_MSG_SIZE);
if (qstatus == -1) {
errmsg("internal error: msgQ overrun");
return -1;
......@@ -738,7 +733,8 @@ static void initConversionTask(void* parm)
long status;
while (TRUE) {
qstatus = epicsMessageQueueReceive(initConversionQ, (void*)&msg, REINIT_MSG_SIZE);
qstatus = epicsMessageQueueReceive(
initConversionQ, (void*)&msg, REINIT_MSG_SIZE);
if (qstatus == -1) {
nerrmsg("", "msgQReceive failed");
continue;
......@@ -805,7 +801,7 @@ static void initConversionTask(void* parm)
pcvt->pact = TRUE;
}
}
csm_alarm(pcvt);
checkAlarms(pcvt);
monitor(pcvt);
dbScanUnlock((struct dbCommon *)pcvt);
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment