Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ASYN_TRACE_STATE #67

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add ASYN_TRACE_STATE #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions asyn/asynDriver/asynDriver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@ typedef struct asynLockPortNotify {
#define ASYN_TRACEIO_DRIVER 0x0008
#define ASYN_TRACE_FLOW 0x0010
#define ASYN_TRACE_WARNING 0x0020
#define ASYN_TRACE_STATE 0x0040

/* traceIO mask definitions*/
#define ASYN_TRACEIO_NODATA 0x0000
Expand Down
8 changes: 7 additions & 1 deletion asyn/asynRecord/asynRecord.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ typedef struct oldValues { /* Used in monitor() and monitorStatus() */
epicsEnum16 tb3; /* Trace IO driver */
epicsEnum16 tb4; /* Trace flow */
epicsEnum16 tb5; /* Trace warning */
epicsEnum16 tb6; /* Trace state */
epicsInt32 tiom; /* Trace I/O mask */
epicsEnum16 tib0; /* Trace IO ASCII */
epicsEnum16 tib1; /* Trace IO escape */
Expand Down Expand Up @@ -412,12 +413,14 @@ static long special(struct dbAddr * paddr, int after)
case asynRecordTB3:
case asynRecordTB4:
case asynRecordTB5:
case asynRecordTB6:
traceMask = (pasynRec->tb0 ? ASYN_TRACE_ERROR : 0) |
(pasynRec->tb1 ? ASYN_TRACEIO_DEVICE : 0) |
(pasynRec->tb2 ? ASYN_TRACEIO_FILTER : 0) |
(pasynRec->tb3 ? ASYN_TRACEIO_DRIVER : 0) |
(pasynRec->tb4 ? ASYN_TRACE_FLOW : 0) |
(pasynRec->tb5 ? ASYN_TRACE_WARNING : 0);
(pasynRec->tb5 ? ASYN_TRACE_WARNING : 0) |
(pasynRec->tb6 ? ASYN_TRACE_STATE : 0);
pasynTrace->setTraceMask(pasynUser, traceMask);
return 0;
case asynRecordTIOM:
Expand Down Expand Up @@ -1044,6 +1047,7 @@ static void monitorStatus(asynRecord * pasynRec)
REMEMBER_STATE(tb3);
REMEMBER_STATE(tb4);
REMEMBER_STATE(tb5);
REMEMBER_STATE(tb6);
REMEMBER_STATE(tiom);
REMEMBER_STATE(tib0);
REMEMBER_STATE(tib1);
Expand All @@ -1066,6 +1070,7 @@ static void monitorStatus(asynRecord * pasynRec)
pasynRec->tb3 = (traceMask & ASYN_TRACEIO_DRIVER) ? 1 : 0;
pasynRec->tb4 = (traceMask & ASYN_TRACE_FLOW) ? 1 : 0;
pasynRec->tb5 = (traceMask & ASYN_TRACE_WARNING) ? 1 : 0;
pasynRec->tb6 = (traceMask & ASYN_TRACE_STATE) ? 1 : 0;
traceMask = pasynTrace->getTraceIOMask(pasynUser);
pasynRec->tiom = traceMask;
pasynRec->tib0 = (traceMask & ASYN_TRACEIO_ASCII) ? 1 : 0;
Expand Down Expand Up @@ -1101,6 +1106,7 @@ static void monitorStatus(asynRecord * pasynRec)
POST_IF_NEW(tb3);
POST_IF_NEW(tb4);
POST_IF_NEW(tb5);
POST_IF_NEW(tb6);
POST_IF_NEW(tiom);
POST_IF_NEW(tib0);
POST_IF_NEW(tib1);
Expand Down
7 changes: 7 additions & 0 deletions asyn/asynRecord/asynRecord.dbd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,6 +520,13 @@ recordtype(asyn) {
interest(1)
menu(asynTRACE)
}
field(TB6,DBF_MENU) {
prompt("Trace state")
promptgroup(GUI_DISPLAY)
special(SPC_MOD)
interest(1)
menu(asynTRACE)
}
field(TIOM,DBF_LONG) {
prompt("Trace I/O mask")
promptgroup(GUI_DISPLAY)
Expand Down
8 changes: 7 additions & 1 deletion documentation/asynRecord.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1413,6 +1413,12 @@ <h2 id="TraceControlFields" style="text-align: center">
R/W</td>
<td>
"Trace warning"</td>
<td>
TB6</td>
<td>
R/W</td>
<td>
"Trace state"</td>
<td>
DBF_MENU</td>
<td>
Expand Down Expand Up @@ -1557,7 +1563,7 @@ <h2 id="TraceControlFields" style="text-align: center">
The above fields are used to control the asynTrace facility. They allow one to turn
on and off debugging output printed at the shell or written to the trace file.</p>
<p>
The TMSK field allows one to read/write the entire asynTraceMask word. The TB0-TB5
The TMSK field allows one to read/write the entire asynTraceMask word. The TB0-TB6
fields allow one to read/write the individual bits in asynTraceMask. The TIOM field
allows one to read/write the entire asynTraceIOMask word, and the TIB0-TIB2 fields
allow one to read/write the individual bits in asynTraceIOMask. The TINM field allows
Expand Down