diff options
Diffstat (limited to 'src/devices/pic/base/pic_protection.cpp')
| -rw-r--r-- | src/devices/pic/base/pic_protection.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/devices/pic/base/pic_protection.cpp b/src/devices/pic/base/pic_protection.cpp index 7af925c..4c08c45 100644 --- a/src/devices/pic/base/pic_protection.cpp +++ b/src/devices/pic/base/pic_protection.cpp @@ -29,7 +29,7 @@ bool Pic::Protection::isAllProtectedValueName(const TQString &name) const Pic::Protection::Family Pic::Protection::family() const { if ( _config.findMask("WRTBS") ) return CodeGuard; - TQString tqmask = tqmaskName(ProgramProtected, MemoryRangeType::Code); + TQString tqmask = maskName(ProgramProtected, MemoryRangeType::Code); if ( _config.findMask(TQString("%1_%2").tqarg(tqmask).tqarg(0)) ) return BlockProtection; if ( _config.findMask(tqmask) ) return BasicProtection; return NoProtection; @@ -79,10 +79,10 @@ TQString Pic::Protection::blockMaskName(Type type, uint block) const if ( type==StandardSecurity || type==HighSecurity ) return (block==0 ? "SSSEC" : "GSSEC"); return TQString(); } - return TQString("%1_%2").tqarg(tqmaskName(type, MemoryRangeType::Code)).tqarg(block); + return TQString("%1_%2").tqarg(maskName(type, MemoryRangeType::Code)).tqarg(block); } -TQString Pic::Protection::tqmaskName(Type type, MemoryRangeType mtype) const +TQString Pic::Protection::maskName(Type type, MemoryRangeType mtype) const { Q_ASSERT( type!=Nb_Types ); switch (mtype.type()) { @@ -215,7 +215,7 @@ Pic::Protection::ProtectedRange Pic::Protection::extractRange(const TQString &tq for (MemoryRangeType type; type<=MemoryRangeType::Nb_Types; ++type) { // #### danger: <= isBootBlock = ( type==MemoryRangeType::Nb_Types ); for (uint k=0; k<Nb_Types; k++) { - TQString mname = (isBootBlock ? bootMaskName(Type(k)) : tqmaskName(Type(k), type)); + TQString mname = (isBootBlock ? bootMaskName(Type(k)) : maskName(Type(k), type)); if ( rexp.cap(1)!=mname ) continue; rtype = (isBootBlock ? MemoryRangeType(MemoryRangeType::Code) : type); ptype = Type(k); |