changed type of card (number) from epicsIndex to int
Warning, cannot access the index:
_darcs/index: opening of '_darcs/index' failed: permission denied (Permission denied)
diff -rN -u old-highland/hiddg85xApp/devHIDDG85x.c new-highland/hiddg85xApp/devHIDDG85x.c
--- old-highland/hiddg85xApp/devHIDDG85x.c 2022-09-28 11:12:45.889209545 +0200
+++ new-highland/hiddg85xApp/devHIDDG85x.c 2022-09-28 11:12:45.889209545 +0200
@@ -192,7 +192,7 @@
char feod_str[MAX_STRING_SIZE];
hiddg85x_chan *pchan;
hiddg85x_card *pcard;
- epicsIndex card;
+ int card;
prec->pact = TRUE;
@@ -205,7 +205,7 @@
return error("%s: signal number %d out of range [0..%d[\n",
prec->name, pvmeio->signal, NUM_CHANNELS);
- card = pvmeio->card;
+ card = pvmeio->card;
pcard = init_card(prec->name, pvmeio->card);
if (!pcard)
{
@@ -215,7 +215,7 @@
if ( HIDDG85X_ABSENT == phiddg85xDrv->getPresence(pvmeio->card) )
{
recGblSetSevr(prec,epicsAlarmDisable, epicsSevInvalid);
- return error("%s: no card %ld\n", prec->name, card);
+ return error("%s: no card %d\n", prec->name, card);
}
pchan = (hiddg85x_chan *)calloc(1,sizeof(hiddg85x_chan));
@@ -356,7 +356,7 @@
static int first_time = TRUE;
hiddg85x_chan *pchan;
hiddg85x_card *pcard;
- epicsIndex card;
+ int card;
prec->pact = TRUE;
@@ -383,7 +383,7 @@
if ( HIDDG85X_ABSENT == phiddg85xDrv->getPresence(pvmeio->card) )
{
recGblSetSevr(prec,epicsAlarmDisable, epicsSevInvalid);
- return error("%s: no card %ld\n", prec->name, card);
+ return error("%s: no card %d\n", prec->name, card);
}
pchan = (hiddg85x_chan *)calloc(1,sizeof(hiddg85x_chan));
@@ -469,7 +469,7 @@
static long init_record_bo(boRecord *prec)
{
struct vmeio *pvmeio = &(prec->out.value.vmeio);
- epicsIndex card = prec->out.value.vmeio.card;
+ int card = prec->out.value.vmeio.card;
char *parm = prec->out.value.vmeio.parm;
long status = 0;
hiddg85x_card *pcard = NULL;
@@ -484,12 +484,12 @@
if (!pcard)
{
recGblSetSevr(prec,epicsAlarmDisable, epicsSevInvalid);
- return error("%s: could not initialize card %ld\n", prec->name, card);
+ return error("%s: could not initialize card %d\n", prec->name, card);
}
if ( HIDDG85X_ABSENT == phiddg85xDrv->getPresence(pvmeio->card) )
{
recGblSetSevr(prec,epicsAlarmDisable, epicsSevInvalid);
- return error("%s: no card %ld\n", prec->name, card);
+ return error("%s: no card %d\n", prec->name, card);
}
prec->dpvt = (void*)pcard;
@@ -555,7 +555,7 @@
static long init_record_lo(longoutRecord* prec)
{
struct vmeio *pvmeio = &(prec->out.value.vmeio);
- epicsIndex card = prec->out.value.vmeio.card;
+ int card = prec->out.value.vmeio.card;
hiddg85x_card *pcard = NULL;
@@ -567,12 +567,12 @@
if (!pcard)
{
recGblSetSevr(prec, epicsAlarmDisable, epicsSevInvalid);
- return error("%s: could not initialize card %ld\n", prec->name, card);
+ return error("%s: could not initialize card %d\n", prec->name, card);
}
if ( HIDDG85X_ABSENT == phiddg85xDrv->getPresence(pvmeio->card) )
{
recGblSetSevr(prec, epicsAlarmDisable, epicsSevInvalid);
- return error("%s: no card %ld\n", prec->name, card);
+ return error("%s: no card %d\n", prec->name, card);
}
prec->dpvt = (void*)pcard;
diff -rN -u old-highland/hiddg85xApp/drvHIDDG85x.c new-highland/hiddg85xApp/drvHIDDG85x.c
--- old-highland/hiddg85xApp/drvHIDDG85x.c 2022-09-28 11:12:45.889209545 +0200
+++ new-highland/hiddg85xApp/drvHIDDG85x.c 2022-09-28 11:12:45.889209545 +0200
@@ -283,7 +283,7 @@
LOCAL epicsStatus setDelay(int card, int channel, double *delay,
epicsUInt32 * rdelay, int roffset);
LOCAL epicsStatus activate(int card, int force_eod);
-LOCAL hiddg85x_presence getPresence(epicsIndex card);
+LOCAL hiddg85x_presence getPresence(int card);
/* non-static routines (to be called from startup file) */
@@ -858,7 +858,7 @@
return 0;
}
-LOCAL hiddg85x_presence getPresence(epicsIndex card)
+LOCAL hiddg85x_presence getPresence(int card)
{
hiddg85x_info *pinfo;
diff -rN -u old-highland/hiddg85xApp/drvHIDDG85x.h new-highland/hiddg85xApp/drvHIDDG85x.h
--- old-highland/hiddg85xApp/drvHIDDG85x.h 2022-09-28 11:12:45.889209545 +0200
+++ new-highland/hiddg85xApp/drvHIDDG85x.h 2022-09-28 11:12:45.889209545 +0200
@@ -85,7 +85,7 @@
epicsStatus (*getControlValueFromParm)(const char* parm, epicsUInt16* cv);
epicsStatus (*setIntrateRegister) (int card, epicsUInt16 rate);
epicsStatus (*getIntrateRegister) (int card, epicsUInt16* rate);
- hiddg85x_presence (*getPresence) (epicsIndex card);
+ hiddg85x_presence (*getPresence) (int card);
}
hiddgv85xDrv;
extern hiddgv85xDrv *phiddg85xDrv;
patch e2e25170a3675bc0c29aa01b6879d164c768d00a
Author: benjamin.franksen@helmholtz-berlin.de
Date: Fri Aug 26 17:17:09 CEST 2011
* changed type of card (number) from epicsIndex to in