summaryrefslogtreecommitdiffstats
path: root/src/common/port/parallel.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
commitf7ceb2957839027e8027a9a4c0dfff730cb9b704 (patch)
treed1d583f11612d149bc0718c80779df4653699dbb /src/common/port/parallel.cpp
parentd98fea1f859d23e1b1220a65d7a8eda3b757fd08 (diff)
downloadpiklab-f7ceb2957839027e8027a9a4c0dfff730cb9b704.tar.gz
piklab-f7ceb2957839027e8027a9a4c0dfff730cb9b704.zip
rename the following methods:
tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/piklab@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/common/port/parallel.cpp')
-rw-r--r--src/common/port/parallel.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/common/port/parallel.cpp b/src/common/port/parallel.cpp
index d92bc82..daa0c6a 100644
--- a/src/common/port/parallel.cpp
+++ b/src/common/port/parallel.cpp
@@ -203,8 +203,8 @@ bool Port::Parallel::setPinOn(uint pin, bool on, LogicType type)
Q_ASSERT( PIN_DATA[pin].dir==Out );
RequestType rtype = PIN_DATA[pin].rType;
Q_ASSERT( rtype!=Nb_RequestTypes );
- uchar tqmask = PIN_DATA[pin].tqmask;
- uchar c = (XOR(type==NegativeLogic, on) ? _images[rtype] | tqmask : _images[rtype] & ~tqmask);
+ uchar mask = PIN_DATA[pin].mask;
+ uchar c = (XOR(type==NegativeLogic, on) ? _images[rtype] | mask : _images[rtype] & ~mask);
int request = REQUEST_DATA[rtype].write;
Q_ASSERT( request!=0 );
if ( ioctl(_fd, request, &c)<0 ) {
@@ -232,7 +232,7 @@ bool Port::Parallel::readPin(uint pin, LogicType type, bool &value)
return false;
}
_images[rtype] = c;
- value = (type==NegativeLogic ? ~c : c ) & PIN_DATA[pin].tqmask;
+ value = (type==NegativeLogic ? ~c : c ) & PIN_DATA[pin].mask;
#endif
return true;
}