lin-epics-modules/pyDevSup
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

simplify dbdset iointr

Browse Source
This commit is contained in:
Michael Davidsaver
2013-03-31 17:44:36 -04:00
parent 171ed49832
commit 5a5fbddc27
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
devsupApp/src/dbdset.c
View File

@ -33,7 +33,6 @@ typedef struct {
PyObject *support; PyObject *support;
PyObject *scanobj; PyObject *scanobj;
int allowscan;
IOSCANPVT scan; IOSCANPVT scan;
PyObject *reason; PyObject *reason;
@ -293,12 +292,9 @@ static long get_iointr_info(int dir, dbCommon *prec, IOSCANPVT *scan)
pystate = PyGILState_Ensure(); pystate = PyGILState_Ensure();
if(dir==0) { if(dir==0) {
priv->allowscan = allow_ioscan(priv); if(!allow_ioscan(priv))
fprintf(stderr, "%s: allowscan %d\n", prec->name, priv->allowscan);
if(!priv->allowscan)
return S_db_Blocked; return S_db_Blocked;
} else { } else {
priv->allowscan = 0;
release_ioscan(priv); release_ioscan(priv);
} }
@ -388,7 +384,7 @@ int canIOScanRecord(dbCommon *prec)
pyDevice *priv=prec->dpvt; pyDevice *priv=prec->dpvt;
if(!isPyRecord(prec)) if(!isPyRecord(prec))
return 0; return 0;
return priv->allowscan; return !!priv->scanobj;
} }
/* Called with GIL locked */ /* Called with GIL locked */