changed stat,sevr,nsta,nsev to unsigned
This commit is contained in:
+1
-1
@@ -441,7 +441,7 @@ static void monitor(pai)
|
||||
{
|
||||
unsigned short monitor_mask;
|
||||
double delta;
|
||||
short stat,sevr,nsta,nsev;
|
||||
unsigned short stat,sevr,nsta,nsev;
|
||||
|
||||
/* get previous stat and sevr and new stat and sevr*/
|
||||
recGblResetSevr(pai,stat,sevr,nsta,nsev);
|
||||
|
||||
+1
-1
@@ -522,7 +522,7 @@ static void monitor(pao)
|
||||
{
|
||||
unsigned short monitor_mask;
|
||||
double delta;
|
||||
short stat,sevr,nsta,nsev;
|
||||
unsigned short stat,sevr,nsta,nsev;
|
||||
|
||||
/* get previous stat and sevr and new stat and sevr*/
|
||||
recGblResetSevr(pao,stat,sevr,nsta,nsev);
|
||||
|
||||
+1
-1
@@ -297,7 +297,7 @@ static void monitor(pbi)
|
||||
struct biRecord *pbi;
|
||||
{
|
||||
unsigned short monitor_mask;
|
||||
short stat,sevr,nsta,nsev;
|
||||
unsigned short stat,sevr,nsta,nsev;
|
||||
|
||||
/* get previous stat and sevr and new stat and sevr*/
|
||||
recGblResetSevr(pbi,stat,sevr,nsta,nsev);
|
||||
|
||||
+2
-2
@@ -301,7 +301,7 @@ static long process(pbo)
|
||||
pcallback = (struct callback *)(pbo->rpvt);
|
||||
if(pcallback->wd_id==NULL) pcallback->wd_id = wdCreate();
|
||||
callbackSetPriority(pbo->prio,pcallback);
|
||||
wdStart(pcallback->wd_id,wait_time,callbackRequest,(int)pcallback);
|
||||
wdStart(pcallback->wd_id,wait_time,(FUNCPTR)callbackRequest,(int)pcallback);
|
||||
}
|
||||
/* check event list */
|
||||
monitor(pbo);
|
||||
@@ -392,7 +392,7 @@ static void monitor(pbo)
|
||||
struct boRecord *pbo;
|
||||
{
|
||||
unsigned short monitor_mask;
|
||||
short stat,sevr,nsta,nsev;
|
||||
unsigned short stat,sevr,nsta,nsev;
|
||||
|
||||
/* get previous stat and sevr and new stat and sevr*/
|
||||
recGblResetSevr(pbo,stat,sevr,nsta,nsev);
|
||||
|
||||
+1
-1
@@ -365,7 +365,7 @@ static void monitor(pcalc)
|
||||
{
|
||||
unsigned short monitor_mask;
|
||||
double delta;
|
||||
short stat,sevr,nsta,nsev;
|
||||
unsigned short stat,sevr,nsta,nsev;
|
||||
double *pnew;
|
||||
double *pprev;
|
||||
int i;
|
||||
|
||||
@@ -324,7 +324,7 @@ static void monitor(pcompress)
|
||||
struct compressRecord *pcompress;
|
||||
{
|
||||
unsigned short monitor_mask;
|
||||
short stat,sevr,nsta,nsev;
|
||||
unsigned short stat,sevr,nsta,nsev;
|
||||
|
||||
/* get previous stat and sevr and new stat and sevr*/
|
||||
recGblResetSevr(pcompress,stat,sevr,nsta,nsev);
|
||||
|
||||
+1
-1
@@ -194,7 +194,7 @@ static void monitor(pevent)
|
||||
struct eventRecord *pevent;
|
||||
{
|
||||
unsigned short monitor_mask;
|
||||
short stat,sevr,nsta,nsev;
|
||||
unsigned short stat,sevr,nsta,nsev;
|
||||
|
||||
/* get previous stat and sevr and new stat and sevr*/
|
||||
recGblResetSevr(pevent,stat,sevr,nsta,nsev);
|
||||
|
||||
+1
-1
@@ -130,7 +130,7 @@ static long init_record(pfanout,pass)
|
||||
static long process(pfanout)
|
||||
struct fanoutRecord *pfanout;
|
||||
{
|
||||
short stat,sevr,nsta,nsev;
|
||||
unsigned short stat,sevr,nsta,nsev;
|
||||
|
||||
|
||||
struct link *plink;
|
||||
|
||||
@@ -317,7 +317,7 @@ static void monitor(phistogram)
|
||||
struct histogramRecord *phistogram;
|
||||
{
|
||||
unsigned short monitor_mask;
|
||||
short stat,sevr,nsta,nsev;
|
||||
unsigned short stat,sevr,nsta,nsev;
|
||||
|
||||
/* get previous stat and sevr and new stat and sevr*/
|
||||
stat=phistogram->stat;
|
||||
|
||||
+1
-1
@@ -321,7 +321,7 @@ static void monitor(plongin)
|
||||
{
|
||||
unsigned short monitor_mask;
|
||||
long delta;
|
||||
short stat,sevr,nsta,nsev;
|
||||
unsigned short stat,sevr,nsta,nsev;
|
||||
|
||||
/* get previous stat and sevr and new stat and sevr*/
|
||||
recGblResetSevr(plongin,stat,sevr,nsta,nsev);
|
||||
|
||||
@@ -354,7 +354,7 @@ static void monitor(plongout)
|
||||
unsigned short monitor_mask;
|
||||
|
||||
long delta;
|
||||
short stat,sevr,nsta,nsev;
|
||||
unsigned short stat,sevr,nsta,nsev;
|
||||
|
||||
/* get previous stat and sevr and new stat and sevr*/
|
||||
recGblResetSevr(plongout,stat,sevr,nsta,nsev);
|
||||
|
||||
+1
-1
@@ -383,7 +383,7 @@ static void monitor(pmbbi)
|
||||
struct mbbiRecord *pmbbi;
|
||||
{
|
||||
unsigned short monitor_mask;
|
||||
short stat,sevr,nsta,nsev;
|
||||
unsigned short stat,sevr,nsta,nsev;
|
||||
|
||||
/* get previous stat and sevr and new stat and sevr*/
|
||||
recGblResetSevr(pmbbi,stat,sevr,nsta,nsev);
|
||||
|
||||
+1
-1
@@ -428,7 +428,7 @@ static void monitor(pmbbo)
|
||||
struct mbboRecord *pmbbo;
|
||||
{
|
||||
unsigned short monitor_mask;
|
||||
short stat,sevr,nsta,nsev;
|
||||
unsigned short stat,sevr,nsta,nsev;
|
||||
|
||||
/* get previous stat and sevr and new stat and sevr*/
|
||||
recGblResetSevr(pmbbo,stat,sevr,nsta,nsev);
|
||||
|
||||
@@ -118,7 +118,7 @@ static void monitor(ppermissive)
|
||||
struct permissiveRecord *ppermissive;
|
||||
{
|
||||
unsigned short monitor_mask;
|
||||
short stat,sevr,nsta,nsev;
|
||||
unsigned short stat,sevr,nsta,nsev;
|
||||
unsigned short val,oval,wflg,oflg;
|
||||
|
||||
/* get previous stat and sevr and new stat and sevr*/
|
||||
|
||||
+1
-1
@@ -293,7 +293,7 @@ static void monitor(ppid)
|
||||
{
|
||||
unsigned short monitor_mask;
|
||||
float delta;
|
||||
short stat,sevr,nsta,nsev;
|
||||
unsigned short stat,sevr,nsta,nsev;
|
||||
|
||||
/* get previous stat and sevr and new stat and sevr*/
|
||||
recGblResetSevr(ppid,stat,sevr,nsta,nsev);
|
||||
|
||||
@@ -311,7 +311,7 @@ static long get_control_double(struct dbAddr *paddr, struct dbr_ctrlDouble *pcd)
|
||||
static void monitor(struct pulseCounterRecord *ppc)
|
||||
{
|
||||
unsigned short monitor_mask;
|
||||
short stat,sevr,nsta,nsev;
|
||||
unsigned short stat,sevr,nsta,nsev;
|
||||
|
||||
/* get previous stat and sevr and new stat and sevr*/
|
||||
recGblResetSevr(ppc,stat,sevr,nsta,nsev);
|
||||
|
||||
@@ -385,7 +385,7 @@ static void monitor(ppd)
|
||||
struct pulseDelayRecord *ppd;
|
||||
{
|
||||
unsigned short monitor_mask;
|
||||
short stat,sevr,nsta,nsev;
|
||||
unsigned short stat,sevr,nsta,nsev;
|
||||
|
||||
/* get previous stat and sevr and new stat and sevr*/
|
||||
recGblResetSevr(ppd,stat,sevr,nsta,nsev);
|
||||
|
||||
@@ -279,7 +279,7 @@ static void monitor(ppt)
|
||||
struct pulseTrainRecord *ppt;
|
||||
{
|
||||
unsigned short monitor_mask;
|
||||
short stat,sevr,nsta,nsev;
|
||||
unsigned short stat,sevr,nsta,nsev;
|
||||
|
||||
/* get previous stat and sevr and new stat and sevr*/
|
||||
recGblResetSevr(ppt,stat,sevr,nsta,nsev);
|
||||
|
||||
+1
-1
@@ -348,7 +348,7 @@ static void monitor(psel)
|
||||
{
|
||||
unsigned short monitor_mask;
|
||||
double delta;
|
||||
short stat,sevr,nsta,nsev;
|
||||
unsigned short stat,sevr,nsta,nsev;
|
||||
double *pnew;
|
||||
double *pprev;
|
||||
int i;
|
||||
|
||||
+4
-4
@@ -123,7 +123,7 @@ int pass;
|
||||
printf("init_record(%s) entered\n", pseq->name);
|
||||
|
||||
/* Allocate a callback structure for use in processing */
|
||||
pseq->dpvt = malloc(sizeof(struct callbackSeq));
|
||||
pseq->dpvt = (void *)malloc(sizeof(struct callbackSeq));
|
||||
|
||||
((struct callbackSeq *) (pseq->dpvt))->callBack.callback = processCallback;
|
||||
((struct callbackSeq *) (pseq->dpvt))->callBack.user = (void *) pseq;
|
||||
@@ -226,7 +226,7 @@ struct seqRecord *pseq;
|
||||
}
|
||||
if (pseq->selm == REC_SEQ_SELM_SPECIFIC)
|
||||
{
|
||||
if(pseq->seln<0 || pseq->seln>10)
|
||||
if(pseq->seln>10)
|
||||
{ /* Invalid selection number */
|
||||
recGblSetSevr(pseq,SOFT_ALARM,INVALID_ALARM);
|
||||
return(asyncFinish(pseq));
|
||||
@@ -310,7 +310,7 @@ struct seqRecord *pseq;
|
||||
{
|
||||
/* Use the watch-dog as a delay mechanism */
|
||||
wdDelay = pcb->plinks[pcb->index]->dly * sysClkRateGet();
|
||||
wdStart(pcb->wd_id, wdDelay, watchDog, (int)(&(pcb->callBack)));
|
||||
wdStart(pcb->wd_id, wdDelay, (FUNCPTR)watchDog, (int)(&(pcb->callBack)));
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -332,7 +332,7 @@ static long
|
||||
asyncFinish(pseq)
|
||||
struct seqRecord *pseq;
|
||||
{
|
||||
short stat, sevr, nsta, nsev;
|
||||
unsigned short stat, sevr, nsta, nsev;
|
||||
|
||||
if (seqRecDebug > 5)
|
||||
printf("asyncFinish(%s) completing processing\n", pseq->name);
|
||||
|
||||
+1
-1
@@ -121,7 +121,7 @@ static void monitor(pstate)
|
||||
struct stateRecord *pstate;
|
||||
{
|
||||
unsigned short monitor_mask;
|
||||
short stat,sevr,nsta,nsev;
|
||||
unsigned short stat,sevr,nsta,nsev;
|
||||
|
||||
/* get previous stat and sevr and new stat and sevr*/
|
||||
recGblResetSevr(pstate,stat,sevr,nsta,nsev);
|
||||
|
||||
@@ -395,7 +395,7 @@ static void monitor(psm)
|
||||
{
|
||||
unsigned short monitor_mask;
|
||||
float delta;
|
||||
short stat,sevr,nsta,nsev;
|
||||
unsigned short stat,sevr,nsta,nsev;
|
||||
|
||||
/* get previous stat and sevr and new stat and sevr*/
|
||||
recGblResetSevr(psm,stat,sevr,nsta,nsev);
|
||||
@@ -447,7 +447,7 @@ struct motor_data *psm_data;
|
||||
struct steppermotorRecord *psm;
|
||||
{
|
||||
struct smdset *pdset = (struct smdset *)(psm->dset);
|
||||
short stat,sevr,nsta,nsev;
|
||||
unsigned short stat,sevr,nsta,nsev;
|
||||
int intAccept=interruptAccept;
|
||||
short post_events;
|
||||
double temp;
|
||||
|
||||
@@ -210,7 +210,7 @@ static void monitor(pstringin)
|
||||
struct stringinRecord *pstringin;
|
||||
{
|
||||
unsigned short monitor_mask;
|
||||
short stat,sevr,nsta,nsev;
|
||||
unsigned short stat,sevr,nsta,nsev;
|
||||
|
||||
/* get previous stat and sevr and new stat and sevr*/
|
||||
recGblResetSevr(pstringin,stat,sevr,nsta,nsev);
|
||||
|
||||
@@ -249,7 +249,7 @@ static void monitor(pstringout)
|
||||
struct stringoutRecord *pstringout;
|
||||
{
|
||||
unsigned short monitor_mask;
|
||||
short stat,sevr,nsta,nsev;
|
||||
unsigned short stat,sevr,nsta,nsev;
|
||||
|
||||
/* get previous stat and sevr and new stat and sevr*/
|
||||
recGblResetSevr(pstringout,stat,sevr,nsta,nsev);
|
||||
|
||||
+1
-1
@@ -350,7 +350,7 @@ static void monitor(psub)
|
||||
{
|
||||
unsigned short monitor_mask;
|
||||
double delta;
|
||||
short stat,sevr,nsta,nsev;
|
||||
unsigned short stat,sevr,nsta,nsev;
|
||||
double *pnew;
|
||||
double *pprev;
|
||||
int i;
|
||||
|
||||
+5
-5
@@ -112,10 +112,10 @@ struct dset devTmAt5Vxi={4,NULL,NULL,NULL,NULL};
|
||||
|
||||
extern int post_event();
|
||||
|
||||
void monitor();
|
||||
void read_timer();
|
||||
void convert_timer();
|
||||
void write_timer();
|
||||
static void monitor();
|
||||
static void read_timer();
|
||||
static void convert_timer();
|
||||
static void write_timer();
|
||||
|
||||
static long init_record(ptimer,pass)
|
||||
struct timerRecord *ptimer;
|
||||
@@ -176,7 +176,7 @@ static void monitor(ptimer)
|
||||
struct timerRecord *ptimer;
|
||||
{
|
||||
unsigned short monitor_mask;
|
||||
short stat,sevr,nsta,nsev;
|
||||
unsigned short stat,sevr,nsta,nsev;
|
||||
|
||||
/* get previous stat and sevr and new stat and sevr*/
|
||||
recGblResetSevr(ptimer,stat,sevr,nsta,nsev);
|
||||
|
||||
@@ -147,7 +147,7 @@ static long init_record(pwf,pass)
|
||||
if(pwf->ftvl == 0) {
|
||||
pwf->bptr = (char *)calloc(pwf->nelm,MAX_STRING_SIZE);
|
||||
} else {
|
||||
if(pwf->ftvl<0|| pwf->ftvl>DBF_ENUM) pwf->ftvl=2;
|
||||
if(pwf->ftvl>DBF_ENUM) pwf->ftvl=2;
|
||||
pwf->bptr = (char *)calloc(pwf->nelm,sizeofTypes[pwf->ftvl]);
|
||||
}
|
||||
pwf->nord = 0;
|
||||
@@ -343,7 +343,7 @@ static void monitor(pwf)
|
||||
struct waveformRecord *pwf;
|
||||
{
|
||||
unsigned short monitor_mask;
|
||||
short stat,sevr,nsta,nsev;
|
||||
unsigned short stat,sevr,nsta,nsev;
|
||||
|
||||
/* get previous stat and sevr and new stat and sevr*/
|
||||
recGblResetSevr(pwf,stat,sevr,nsta,nsev);
|
||||
|
||||
Reference in New Issue
Block a user