Changed to work with vxWorks 5.1 and GCC 2.2.3.
This commit is contained in:
@@ -318,9 +318,9 @@ unsigned int addr;
|
||||
/* start up module */
|
||||
fp[i].fptr->csr |= CSR_IEN; /* enable interrupts */
|
||||
fp[i].mode = FP_RUN; /* normal run mode */
|
||||
ifndef EPICS_V2
|
||||
#ifndef EPICS_V2
|
||||
scanIoInit(&fp[i].ioscanpvt);
|
||||
endif
|
||||
#endif
|
||||
}
|
||||
fp_num = i - 1; /* record max card # */
|
||||
|
||||
@@ -372,18 +372,18 @@ void fp_reboot()
|
||||
*
|
||||
*/
|
||||
fp_en(card)
|
||||
short card;
|
||||
short card;
|
||||
{
|
||||
unsigned short temp;
|
||||
unsigned short temp;
|
||||
|
||||
if (card < 0 || (card > fp_num))
|
||||
return -1;
|
||||
fp[card].fptr->csr = fp[card].fptr->csr ^ CSR_IEN;
|
||||
if (fp[card].fptr->csr & CSR_IEN)
|
||||
printf("fast protect interrupts enabled\n");
|
||||
else
|
||||
printf("fast protect interrupts disabled\n");
|
||||
return 0;
|
||||
if (card < 0 || (card > fp_num))
|
||||
return -1;
|
||||
fp[card].fptr->csr = fp[card].fptr->csr ^ CSR_IEN;
|
||||
if (fp[card].fptr->csr & CSR_IEN)
|
||||
printf("fast protect interrupts enabled\n");
|
||||
else
|
||||
printf("fast protect interrupts disabled\n");
|
||||
return 0;
|
||||
}
|
||||
/*
|
||||
* fp_mode
|
||||
|
||||
@@ -378,17 +378,17 @@ fpm_srd(card)
|
||||
*
|
||||
*/
|
||||
fpm_driver(card,mask,prval)
|
||||
register unsigned short card;
|
||||
unsigned int mask;
|
||||
register unsigned int prval;
|
||||
register unsigned short card;
|
||||
unsigned int mask;
|
||||
register unsigned int prval;
|
||||
{
|
||||
register unsigned int temp;
|
||||
register unsigned int temp;
|
||||
|
||||
if (card < 0 || (card > fpm_num))
|
||||
return -1;
|
||||
temp = fpm[card].fmptr->cr;
|
||||
fpm[card].fmptr->cr = (temp & (~mask | 0xf0)) | ((prval & mask) & 0xf);
|
||||
return 0;
|
||||
if (card > fpm_num)
|
||||
return -1;
|
||||
temp = fpm[card].fmptr->cr;
|
||||
fpm[card].fmptr->cr = (temp & (~mask | 0xf0)) | ((prval & mask) & 0xf);
|
||||
return 0;
|
||||
}
|
||||
/*
|
||||
* fpm_write
|
||||
@@ -409,14 +409,14 @@ fpm_write(card,val)
|
||||
*
|
||||
*/
|
||||
fpm_read(card,mask,pval)
|
||||
register unsigned short card;
|
||||
unsigned int mask;
|
||||
register unsigned int *pval;
|
||||
register unsigned short card;
|
||||
unsigned int mask;
|
||||
register unsigned int *pval;
|
||||
{
|
||||
if (card < 0 || (card > fpm_num))
|
||||
return -1;
|
||||
*pval = fpm[card].fmptr->cr & 0x000f;
|
||||
return 0;
|
||||
if (card > fpm_num)
|
||||
return -1;
|
||||
*pval = fpm[card].fmptr->cr & 0x000f;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user