epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

change arrRecord cvt_dbaddr() to behave like waveformRecord et al.

Browse Source
This commit is contained in:
Michael Davidsaver
2020-03-30 09:48:51 -07:00
parent 1fec685eed
commit eeb198db15
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/database/test/ioc/db/arrRecord.c
View File

@@ -113,7 +113,6 @@ static long cvt_dbaddr(DBADDR *paddr)
{
arrRecord *prec = (arrRecord *) paddr->precord;
paddr->pfield = prec->bptr;
paddr->no_elements = prec->nelm;
paddr->field_type = prec->ftvl;
paddr->field_size = dbValueSize(prec->ftvl);
@@ -126,6 +125,7 @@ static long get_array_info(DBADDR *paddr, long *no_elements, long *offset)
{
arrRecord *prec = (arrRecord *) paddr->precord;
paddr->pfield = prec->bptr;
*no_elements = prec->nord;
*offset = prec->off;

4
modules/database/test/ioc/db/dbCaLinkTest.c
View File

@@ -416,7 +416,7 @@ static void testArrayLink(unsigned nsrc, unsigned ntarg)
dbScanLock((dbCommon*)ptarg);
fillArray(buftarg, ptarg->nelm, 1);
ptarg->nord = ptarg->nelm;
db_post_events(ptarg, ptarg->bptr, DBE_VALUE|DBE_ALARM|DBE_ARCHIVE);
db_post_events(ptarg, &ptarg->val, DBE_VALUE|DBE_ALARM|DBE_ARCHIVE);
dbScanUnlock((dbCommon*)ptarg);
waitForUpdateN(psrclnk, 2);
@@ -540,7 +540,7 @@ static void testreTargetTypeChange(void)
dbScanLock((dbCommon*)ptarg1);
fillArrayDouble(buftarg1, ptarg1->nelm, 1);
ptarg1->nord = ptarg1->nelm;
db_post_events(ptarg1, ptarg1->bptr, DBE_VALUE|DBE_ALARM|DBE_ARCHIVE);
db_post_events(ptarg1, &ptarg1->val, DBE_VALUE|DBE_ALARM|DBE_ARCHIVE);
dbScanUnlock((dbCommon*)ptarg1);
epicsEventMustWait(waitEvent); /* wait for update */