epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

get rid of vxWorks specific symbols

Browse Source
This commit is contained in:
Marty Kraimer
1999-11-18 15:45:27 +00:00
parent 079441dbe8
commit ee56af725d
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/rec/gsubRecord.c
View File

@@ -98,12 +98,13 @@ static long fetch_values();
static void monitor();
#define ARG_MAX 6
typedef long (*SUBFUNCPTR)();
static long init_record(psub,pass)
struct gsubRecord *psub;
int pass;
{
FUNCPTR psubroutine;
SUBFUNCPTR psubroutine;
int status;
struct link *plink;
int i;
@@ -127,8 +128,8 @@ static long init_record(psub,pass)
}
/* invoke the initialization subroutine */
psubroutine = (FUNCPTR)(psub->sadr);
status = psubroutine(pcallbackdummy, pcallbackdummy,
psubroutine = (SUBFUNCPTR)(psub->sadr);
status = (*psubroutine)(pcallbackdummy, pcallbackdummy,
&(psub->a),&(psub->b),&(psub->c),&(psub->d),&(psub->e),
&(psub->f),&(psub->val));
@@ -367,16 +368,16 @@ static long do_gsub(psub)
struct gsubRecord *psub; /* pointer to subroutine record */
{
int status;
FUNCPTR psubroutine;
SUBFUNCPTR psubroutine;
int *pcallbackdummy = NULL; /* dummy callback arguments */
/* call the subroutine */
psubroutine = (FUNCPTR)(psub->sadr);
psubroutine = (SUBFUNCPTR)(psub->sadr);
if(psubroutine==NULL) {
recGblSetSevr(psub,BAD_SUB_ALARM,INVALID_ALARM);
return(0);
}
status = psubroutine(pcallbackdummy, pcallbackdummy,
status = (*psubroutine)(pcallbackdummy, pcallbackdummy,
&(psub->a),&(psub->b),&(psub->c),&(psub->d),&(psub->e),
&(psub->f), &(psub->val));
if(status < 0){

13
src/rec/subRecord.c
View File

@@ -112,12 +112,13 @@ static long fetch_values();
static void monitor();
#define ARG_MAX 12
typedef long (*SUBFUNCPTR)();
static long init_record(psub,pass)
struct subRecord *psub;
int pass;
{
FUNCPTR psubroutine;
SUBFUNCPTR psubroutine;
long status = 0;
struct link *plink;
int i;
@@ -142,8 +143,8 @@ static long init_record(psub,pass)
}
/* invoke the initialization subroutine */
psubroutine = (FUNCPTR)(psub->sadr);
status = psubroutine(psub,process);
psubroutine = (SUBFUNCPTR)(psub->sadr);
status = (*psubroutine)(psub,process);
}
if(strlen(psub->snam)==0) {
@@ -389,16 +390,16 @@ static long do_sub(psub)
struct subRecord *psub; /* pointer to subroutine record */
{
long status;
FUNCPTR psubroutine;
SUBFUNCPTR psubroutine;
/* call the subroutine */
psubroutine = (FUNCPTR)(psub->sadr);
psubroutine = (SUBFUNCPTR)(psub->sadr);
if(psubroutine==NULL) {
recGblSetSevr(psub,BAD_SUB_ALARM,INVALID_ALARM);
return(0);
}
status = psubroutine(psub);
status = (*psubroutine)(psub);
if(status < 0){
recGblSetSevr(psub,SOFT_ALARM,psub->brsv);
} else psub->udf = FALSE;