diff options
Diffstat (limited to 'src/devices/pic/base/pic_config.cpp')
| -rw-r--r-- | src/devices/pic/base/pic_config.cpp | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/src/devices/pic/base/pic_config.cpp b/src/devices/pic/base/pic_config.cpp index ac472e9..39c865f 100644 --- a/src/devices/pic/base/pic_config.cpp +++ b/src/devices/pic/base/pic_config.cpp @@ -218,8 +218,8 @@ const Pic::Config::Data Pic::Config::DATA[] = { { "20BIT", I18N_NOOP("20-bit external bus") }, { 0, 0 } } }, { { "EASHFT", I18N_NOOP("External address bus shift") }, Toggle, { { 0, 0 } } }, { { "MSSPSEL", I18N_NOOP("MSSP address select bit") }, Fixed, { - { "7BIT", I18N_NOOP("7-bit address tqmask mode") }, - { "5BIT", I18N_NOOP("5-bit address tqmask mode") }, { 0, 0 } } }, + { "7BIT", I18N_NOOP("7-bit address mask mode") }, + { "5BIT", I18N_NOOP("5-bit address mask mode") }, { 0, 0 } } }, { { "PMPMX", I18N_NOOP("PMP pin select bit") }, Fixed, { { "Connected", I18N_NOOP("Connected to EMB") }, { "NotConnected", I18N_NOOP("Not connected to EMB") }, { 0, 0 } } }, @@ -285,35 +285,35 @@ TQMap<TQString, Pic::Config::MapData> &Pic::Config::masks() { if ( _masks==0 ) { _masks = new TQMap<TQString, MapData>; - for (uint i=0; DATA[i].tqmask.name; i++) { - (*_masks)[DATA[i].tqmask.name] = MapData(i, -1); + for (uint i=0; DATA[i].mask.name; i++) { + (*_masks)[DATA[i].mask.name] = MapData(i, -1); if ( DATA[i].type==MemoryRange ) { for (uint k=0; k<Protection::MAX_NB_BLOCKS; k++) - (*_masks)[TQString("%1_%2").tqarg(DATA[i].tqmask.name).tqarg(k)] = MapData(i, k); + (*_masks)[TQString("%1_%2").tqarg(DATA[i].mask.name).tqarg(k)] = MapData(i, k); } } } return *_masks; } -bool Pic::Config::hasMaskName(const TQString &tqmask) +bool Pic::Config::hasMaskName(const TQString &mask) { - return masks().contains(tqmask); + return masks().contains(mask); } -TQString Pic::Config::maskLabel(const TQString &tqmask) +TQString Pic::Config::maskLabel(const TQString &mask) { - const MapData &mp = masks()[tqmask]; - TQString s = i18n(DATA[mp.index].tqmask.label); + const MapData &mp = masks()[mask]; + TQString s = i18n(DATA[mp.index].mask.label); if ( mp.block>=0 ) return i18n("%1 for block %2").tqarg(s).tqarg(mp.block); return s; } -const Pic::Config::Mask *Pic::Config::findMask(const TQString &tqmask, uint *wordIndex) const +const Pic::Config::Mask *Pic::Config::findMask(const TQString &mask, uint *wordIndex) const { for (uint i=0; i<uint(_words.count()); i++) for (uint k=0; k<uint(_words[i].masks.count()); k++) { - if ( _words[i].masks[k].name==tqmask ) { + if ( _words[i].masks[k].name==mask ) { if (wordIndex) *wordIndex = i; return &_words[i].masks[k]; } @@ -321,18 +321,18 @@ const Pic::Config::Mask *Pic::Config::findMask(const TQString &tqmask, uint *wor return 0; } -const Pic::Config::Value *Pic::Config::findValue(const TQString &tqmask, const TQString &value) const +const Pic::Config::Value *Pic::Config::findValue(const TQString &mask, const TQString &value) const { - const Mask *ctqmask = findMask(tqmask); - if ( ctqmask==0 ) return 0; - for (uint i=0; i<uint(ctqmask->values.count()); i++) - if ( ctqmask->values[i].name==value ) return &ctqmask->values[i]; + const Mask *cmask = findMask(mask); + if ( cmask==0 ) return 0; + for (uint i=0; i<uint(cmask->values.count()); i++) + if ( cmask->values[i].name==value ) return &cmask->values[i]; return 0; } -bool Pic::Config::checkValueName(const TQString &tqmask, const TQString &name) const +bool Pic::Config::checkValueName(const TQString &mask, const TQString &name) const { - const Data &data = DATA[masks()[tqmask].index]; + const Data &data = DATA[masks()[mask].index]; TQString pinRegexp = "[A-Z]+\\d*(/[A-Z]+\\d*)?"; switch (data.type) { case Fixed: break; @@ -359,7 +359,7 @@ bool Pic::Config::checkValueName(const TQString &tqmask, const TQString &name) c break; } case MemoryRange: - return _protection.checkRange(tqmask, name); + return _protection.checkRange(mask, name); case Toggle: if ( name=="On" || name=="Off" ) return true; break; @@ -379,9 +379,9 @@ bool Pic::Config::checkValueName(const TQString &tqmask, const TQString &name) c return false; } -TQString Pic::Config::valueLabel(const TQString &tqmask, const TQString &name) +TQString Pic::Config::valueLabel(const TQString &mask, const TQString &name) { - const Data &data = DATA[masks()[tqmask].index]; + const Data &data = DATA[masks()[mask].index]; switch (data.type) { case Fixed: case ValueDouble: @@ -405,9 +405,9 @@ TQString Pic::Config::valueLabel(const TQString &tqmask, const TQString &name) BitValue Pic::Config::Word::usedMask() const { - BitValue tqmask = 0x0; - for (uint i=0; i<uint(masks.count()); i++) tqmask |= masks[i].value; - return tqmask; + BitValue mask = 0x0; + for (uint i=0; i<uint(masks.count()); i++) mask |= masks[i].value; + return mask; } //----------------------------------------------------------------------------- @@ -422,25 +422,25 @@ TQDataStream &Pic::operator >>(TQDataStream &s, Config::Value &value) return s; } -TQDataStream &Pic::operator <<(TQDataStream &s, const Config::Mask &tqmask) +TQDataStream &Pic::operator <<(TQDataStream &s, const Config::Mask &mask) { - s << tqmask.name << tqmask.value << tqmask.values; + s << mask.name << mask.value << mask.values; return s; } -TQDataStream &Pic::operator >>(TQDataStream &s, Config::Mask &tqmask) +TQDataStream &Pic::operator >>(TQDataStream &s, Config::Mask &mask) { - s >> tqmask.name >> tqmask.value >> tqmask.values; + s >> mask.name >> mask.value >> mask.values; return s; } TQDataStream &Pic::operator <<(TQDataStream &s, const Config::Word &word) { - s << word.name << word.ignoredCNames << word.wtqmask << word.ptqmask << word.ctqmask << word.bvalue << word.masks; + s << word.name << word.ignoredCNames << word.wmask << word.pmask << word.cmask << word.bvalue << word.masks; return s; } TQDataStream &Pic::operator >>(TQDataStream &s, Config::Word &word) { - s >> word.name >> word.ignoredCNames >> word.wtqmask >> word.ptqmask >> word.ctqmask >> word.bvalue >> word.masks; + s >> word.name >> word.ignoredCNames >> word.wmask >> word.pmask >> word.cmask >> word.bvalue >> word.masks; return s; } |