diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
| commit | f7ceb2957839027e8027a9a4c0dfff730cb9b704 (patch) | |
| tree | d1d583f11612d149bc0718c80779df4653699dbb /src | |
| parent | d98fea1f859d23e1b1220a65d7a8eda3b757fd08 (diff) | |
| download | piklab-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')
598 files changed, 15947 insertions, 15947 deletions
diff --git a/src/coff/base/disassembler.cpp b/src/coff/base/disassembler.cpp index 9790843..7515b71 100644 --- a/src/coff/base/disassembler.cpp +++ b/src/coff/base/disassembler.cpp @@ -126,10 +126,10 @@ TQStringList SourceLine::configNames(Pic::ConfigNameType type, const Pic::Memory const Pic::Config::Word &cword = config._words[word]; TQStringList cnames; for (uint k=0; k<uint(cword.masks.count()); k++) { - const Pic::Config::Mask &ctqmask = cword.masks[k]; - if ( ctqmask.value.isInside(cword.ptqmask) ) continue; // protected bits - for (int l=ctqmask.values.count()-1; l>=0; l--) { - const Pic::Config::Value &cvalue = ctqmask.values[l]; + const Pic::Config::Mask &cmask = cword.masks[k]; + if ( cmask.value.isInside(cword.pmask) ) continue; // protected bits + for (int l=cmask.values.count()-1; l>=0; l--) { + const Pic::Config::Value &cvalue = cmask.values[l]; if ( !cvalue.value.isInside(v) ) continue; TQStringList vcnames = cvalue.configNames[type]; if ( vcnames.isEmpty() && type!=Pic::ConfigNameType::Default ) vcnames = cvalue.configNames[Pic::ConfigNameType::Default]; @@ -192,8 +192,8 @@ SourceLine::List GPUtils::disassemble(const Pic::Memory &memory) bool isDefault = true; for (uint k=0; k<data.nbWords(Pic::MemoryRangeType::Config); k++) { BitValue op = memory.normalizedWord(Pic::MemoryRangeType::Config, k); - BitValue tqmask = data.config()._words[k].usedMask(); - if ( !tqmask.isInside(op) ) isDefault = false; // this is not completely correct but otherwise empty config is written... + BitValue mask = data.config()._words[k].usedMask(); + if ( !mask.isInside(op) ) isDefault = false; // this is not completely correct but otherwise empty config is written... } if ( !isDefault ) { lines.appendEmpty(); @@ -206,8 +206,8 @@ SourceLine::List GPUtils::disassemble(const Pic::Memory &memory) TQString tmp; for (uint k=0; k<data.nbWords(Pic::MemoryRangeType::UserId); k++) { BitValue op = memory.normalizedWord(Pic::MemoryRangeType::UserId, k); - BitValue tqmask = data.userIdRecommendedMask(); - if ( tqmask.isInside(op) ) continue; + BitValue mask = data.userIdRecommendedMask(); + if ( mask.isInside(op) ) continue; if ( data.is18Family() ) { Address ad = data.range(Pic::MemoryRangeType::UserId).start + data.range(Pic::MemoryRangeType::UserId).hexFileOffset + k*data.addressIncrement(Pic::MemoryRangeType::UserId); lines.appendIndentedCode("__IDLOCS " + toHexLabel(ad, data.nbCharsAddress()) + ", " + toHexLabel(op, data.nbCharsWord(Pic::MemoryRangeType::UserId))); @@ -227,8 +227,8 @@ SourceLine::List GPUtils::disassemble(const Pic::Memory &memory) uint nb = data.nbWords(Pic::MemoryRangeType::Code); for (uint k=0; k<nb; k++) { BitValue op = memory.normalizedWord(Pic::MemoryRangeType::Code, k); - BitValue tqmask = data.tqmask(Pic::MemoryRangeType::Code); - if ( tqmask.isInside(op) ) newOrg = true; + BitValue mask = data.mask(Pic::MemoryRangeType::Code); + if ( mask.isInside(op) ) newOrg = true; else { if (newOrg) { if ( !first ) tmp += '\n'; @@ -254,8 +254,8 @@ SourceLine::List GPUtils::disassemble(const Pic::Memory &memory) nb = data.nbWords(Pic::MemoryRangeType::Eeprom); for (uint k=0; k<nb; k++) { BitValue op = memory.normalizedWord(Pic::MemoryRangeType::Eeprom, k); - BitValue tqmask = data.tqmask(Pic::MemoryRangeType::Eeprom); - if ( tqmask.isInside(op) ) newOrg = true; + BitValue mask = data.mask(Pic::MemoryRangeType::Eeprom); + if ( mask.isInside(op) ) newOrg = true; else { if (newOrg) { Address org = data.range(Pic::MemoryRangeType::Eeprom).start + data.range(Pic::MemoryRangeType::Eeprom).hexFileOffset + k*data.addressIncrement(Pic::MemoryRangeType::Eeprom); diff --git a/src/coff/base/gpdis.cpp b/src/coff/base/gpdis.cpp index abec54f..2df4f24 100644 --- a/src/coff/base/gpdis.cpp +++ b/src/coff/base/gpdis.cpp @@ -69,7 +69,7 @@ int Coff::disassemble(long int opcode, long int opcode2, return 0; case Pic::Architecture::P10X: for(i = 0; i < num_op_12c5xx; i++) { - if((op_12c5xx[i].tqmask & opcode) == op_12c5xx[i].opcode) { + if((op_12c5xx[i].mask & opcode) == op_12c5xx[i].opcode) { instruction = &op_12c5xx[i]; break; } @@ -77,7 +77,7 @@ int Coff::disassemble(long int opcode, long int opcode2, break; /* case PROC_CLASS_SX: for(i = 0; i < num_op_sx; i++) { - if((op_sx[i].tqmask & opcode) == op_sx[i].opcode) { + if((op_sx[i].mask & opcode) == op_sx[i].opcode) { instruction = &op_sx[i]; break; } @@ -86,7 +86,7 @@ int Coff::disassemble(long int opcode, long int opcode2, */ case Pic::Architecture::P16X: for(i = 0; i < num_op_16cxx; i++) { - if((op_16cxx[i].tqmask & opcode) == op_16cxx[i].opcode) { + if((op_16cxx[i].mask & opcode) == op_16cxx[i].opcode) { instruction = &op_16cxx[i]; break; } @@ -94,7 +94,7 @@ int Coff::disassemble(long int opcode, long int opcode2, break; case Pic::Architecture::P17C: for(i = 0; i < num_op_17cxx; i++) { - if((op_17cxx[i].tqmask & opcode) == op_17cxx[i].opcode) { + if((op_17cxx[i].mask & opcode) == op_17cxx[i].opcode) { instruction = &op_17cxx[i]; break; } @@ -105,7 +105,7 @@ int Coff::disassemble(long int opcode, long int opcode2, case Pic::Architecture::P18J: if (gp_decode_mnemonics) { for(i = 0; i < num_op_18cxx_sp; i++) { - if((op_18cxx_sp[i].tqmask & opcode) == op_18cxx_sp[i].opcode) { + if((op_18cxx_sp[i].mask & opcode) == op_18cxx_sp[i].opcode) { instruction = &op_18cxx_sp[i]; break; } @@ -113,7 +113,7 @@ int Coff::disassemble(long int opcode, long int opcode2, } if (instruction == NULL) { for(i = 0; i < num_op_18cxx; i++) { - if((op_18cxx[i].tqmask & opcode) == op_18cxx[i].opcode) { + if((op_18cxx[i].mask & opcode) == op_18cxx[i].opcode) { instruction = &op_18cxx[i]; break; } @@ -122,7 +122,7 @@ int Coff::disassemble(long int opcode, long int opcode2, if ((instruction == NULL) && (gp_decode_extended)) { /* might be from the extended instruction set */ for(i = 0; i < num_op_18cxx_ext; i++) { - if((op_18cxx_ext[i].tqmask & opcode) == op_18cxx_ext[i].opcode) { + if((op_18cxx_ext[i].mask & opcode) == op_18cxx_ext[i].opcode) { instruction = &op_18cxx_ext[i]; break; } diff --git a/src/coff/base/gpopcode.h b/src/coff/base/gpopcode.h index 91a4dea..aed25f9 100644 --- a/src/coff/base/gpopcode.h +++ b/src/coff/base/gpopcode.h @@ -75,7 +75,7 @@ enum insn_class { struct insn { const char *name; - long int tqmask; + long int mask; long int opcode; enum insn_class classType; //int attribs; diff --git a/src/common/common/bitvalue.cpp b/src/common/common/bitvalue.cpp index f4ae5ed..16d5ef0 100644 --- a/src/common/common/bitvalue.cpp +++ b/src/common/common/bitvalue.cpp @@ -13,11 +13,11 @@ const uint GenericValue::INVALID = 0xFFFFFFFFU; BitValue BitValue::XORn(uint n) const { uint nb = nbBits(_value); - uint tqmask = maxValue(NumberBase::Bin, n); + uint mask = maxValue(NumberBase::Bin, n); uint res = 0x0; for (uint i=0; i<nb; i +=n) { - res ^= (_value >> i) & tqmask; - //qDebug("%i %s %s", i, toHexLabel((value>>i) & tqmask, 4).latin1(), toHexLabel(res, 4).latin1()); + res ^= (_value >> i) & mask; + //qDebug("%i %s %s", i, toHexLabel((value>>i) & mask, 4).latin1(), toHexLabel(res, 4).latin1()); } return res; } @@ -25,6 +25,6 @@ BitValue BitValue::XORn(uint n) const BitValue BitValue::XNORn(uint n) const { BitValue res = XORn(n); - BitValue tqmask = maxValue(NumberBase::Bin, n); - return res.complementInMask(tqmask); + BitValue mask = maxValue(NumberBase::Bin, n); + return res.complementInMask(mask); } diff --git a/src/common/common/bitvalue.h b/src/common/common/bitvalue.h index 8bf61d2..172c6d8 100644 --- a/src/common/common/bitvalue.h +++ b/src/common/common/bitvalue.h @@ -96,11 +96,11 @@ public: BitValue XORn(uint n) const; // XOR between groups of n bits inside value BitValue XNORn(uint n) const; // XORn then NOT on n bits - BitValue maskWith(BitValue tqmask) const { return _value & tqmask._value; } + BitValue maskWith(BitValue mask) const { return _value & mask._value; } bool isInside(BitValue v) const { return ( (_value & v._value)==_value ); } - BitValue complementInMask(BitValue tqmask) const { return tqmask._value & ~_value; } + BitValue complementInMask(BitValue mask) const { return mask._value & ~_value; } BitValue twoComplement() const { return -_value; } - BitValue clearMaskBits(BitValue tqmask) const { return _value & ~tqmask._value; } + BitValue clearMaskBits(BitValue mask) const { return _value & ~mask._value; } bool isOverlapping(BitValue v) const { return ( _value & v._value ); } class const_iterator { diff --git a/src/common/common/qflags.h b/src/common/common/qflags.h index c7abfc2..6d7c2ff 100644 --- a/src/common/common/qflags.h +++ b/src/common/common/qflags.h @@ -48,8 +48,8 @@ public: inline TQFlags(TQFlag f) : i(f) {} inline TQFlags &operator=(const TQFlags &f) { i = f.i; return *this; } - inline TQFlags &operator&=(int tqmask) { i &= tqmask; return *this; } - inline TQFlags &operator&=(uint tqmask) { i &= tqmask; return *this; } + inline TQFlags &operator&=(int mask) { i &= mask; return *this; } + inline TQFlags &operator&=(uint mask) { i &= mask; return *this; } inline TQFlags &operator|=(TQFlags f) { i |= f.i; return *this; } inline TQFlags &operator|=(Enum f) { i |= f; return *this; } inline TQFlags &operator^=(TQFlags f) { i ^= f.i; return *this; } @@ -62,8 +62,8 @@ public: inline TQFlags operator|(Enum f) const { TQFlags g; g.i = i | f; return g; } inline TQFlags operator^(TQFlags f) const { TQFlags g; g.i = i ^ f.i; return g; } inline TQFlags operator^(Enum f) const { TQFlags g; g.i = i ^ f; return g; } - inline TQFlags operator&(int tqmask) const { TQFlags g; g.i = i & tqmask; return g; } - inline TQFlags operator&(uint tqmask) const { TQFlags g; g.i = i & tqmask; return g; } + inline TQFlags operator&(int mask) const { TQFlags g; g.i = i & mask; return g; } + inline TQFlags operator&(uint mask) const { TQFlags g; g.i = i & mask; return g; } inline TQFlags operator&(Enum f) const { TQFlags g; g.i = i & f; return g; } inline TQFlags operator~() const { TQFlags g; g.i = ~i; return g; } diff --git a/src/common/common/storage.h b/src/common/common/storage.h index f1c947d..b324ab5 100644 --- a/src/common/common/storage.h +++ b/src/common/common/storage.h @@ -37,7 +37,7 @@ class GenericStorage : public TQObject Q_OBJECT TQ_OBJECT public: - GenericStorage(TQObject *tqparent = 0, const char *name = 0) : TQObject(tqparent, name), _dirty(false) {} + GenericStorage(TQObject *parent = 0, const char *name = 0) : TQObject(parent, name), _dirty(false) {} signals: void changed(); diff --git a/src/common/global/log.cpp b/src/common/global/log.cpp index 1ab42d0..62955da 100644 --- a/src/common/global/log.cpp +++ b/src/common/global/log.cpp @@ -72,17 +72,17 @@ bool Log::StringView::askContinue(const TQString &message) } //----------------------------------------------------------------------------- -Log::Base::Base(Base *tqparent) +Log::Base::Base(Base *parent) : _parent(0), _data(0) { - setParent(tqparent); + setParent(parent); } -void Log::Base::setParent(Base *tqparent) +void Log::Base::setParent(Base *parent) { delete _data; - _parent = tqparent; - _data = (tqparent ? 0 : new LogData); + _parent = parent; + _data = (parent ? 0 : new LogData); } Log::Base::~Base() diff --git a/src/common/global/log.h b/src/common/global/log.h index eff0b88..f38543d 100644 --- a/src/common/global/log.h +++ b/src/common/global/log.h @@ -85,9 +85,9 @@ private: class Base : public Generic { public: - Base(Base *tqparent = 0); + Base(Base *parent = 0); virtual ~Base(); - void setParent(Base *tqparent); + void setParent(Base *parent); void setView(View *view); View *view() { return logData()->view; } diff --git a/src/common/global/process.cpp b/src/common/global/process.cpp index 1efe715..ed63f86 100644 --- a/src/common/global/process.cpp +++ b/src/common/global/process.cpp @@ -31,8 +31,8 @@ Process::State Process::runSynchronously(Base &process, RunActions actions, uint } //---------------------------------------------------------------------------- -Process::Base::Base(TQObject *tqparent, const char *name) - : TQObject(tqparent, name), _state(Stopped) +Process::Base::Base(TQObject *parent, const char *name) + : TQObject(parent, name), _state(Stopped) { _process = new KProcess(this); connect(_process, TQT_SIGNAL(processExited(KProcess *)), TQT_SLOT(exited())); diff --git a/src/common/global/process.h b/src/common/global/process.h index d4e7db0..daa8513 100644 --- a/src/common/global/process.h +++ b/src/common/global/process.h @@ -33,7 +33,7 @@ class Base : public TQObject Q_OBJECT TQ_OBJECT public: - Base(TQObject *tqparent, const char *name); + Base(TQObject *parent, const char *name); virtual ~Base(); void setup(const TQString &executable, const TQStringList &options, bool withWine); TQStringList arguments() const; @@ -77,7 +77,7 @@ class StringOutput : public Base Q_OBJECT TQ_OBJECT public: - StringOutput(TQObject *tqparent = 0, const char *name = 0) : Base(tqparent, name) {} + StringOutput(TQObject *parent = 0, const char *name = 0) : Base(parent, name) {} TQString sout() const { return _stdout; } TQString serr() const { return _stderr; } @@ -92,7 +92,7 @@ class LineBase : public Base Q_OBJECT TQ_OBJECT public: - LineBase(TQObject *tqparent = 0, const char *name = 0) : Base(tqparent, name) {} + LineBase(TQObject *parent = 0, const char *name = 0) : Base(parent, name) {} private slots: virtual void receivedStdout(KProcess *, char *buffer, int len); @@ -109,7 +109,7 @@ class LineOutput : public LineBase Q_OBJECT TQ_OBJECT public: - LineOutput(TQObject *tqparent = 0, const char *name = 0) : LineBase(tqparent, name) {} + LineOutput(TQObject *parent = 0, const char *name = 0) : LineBase(parent, name) {} virtual bool start(uint timeout); TQStringList sout() const { return _stdoutLines; } TQStringList serr() const { return _stderrLines; } @@ -127,7 +127,7 @@ class LineSignal : public LineBase Q_OBJECT TQ_OBJECT public: - LineSignal(TQObject *tqparent = 0, const char *name = 0) : LineBase(tqparent, name) {} + LineSignal(TQObject *parent = 0, const char *name = 0) : LineBase(parent, name) {} signals: void logStdoutLine(const TQString &line); diff --git a/src/common/global/progress_monitor.cpp b/src/common/global/progress_monitor.cpp index f86d236..0b3044d 100644 --- a/src/common/global/progress_monitor.cpp +++ b/src/common/global/progress_monitor.cpp @@ -8,8 +8,8 @@ ***************************************************************************/ #include "progress_monitor.h" -ProgressMonitor::ProgressMonitor(TQObject* tqparent) - : TQObject(tqparent, "progress_monitor") +ProgressMonitor::ProgressMonitor(TQObject* parent) + : TQObject(parent, "progress_monitor") { _current = _tasks.end(); } diff --git a/src/common/global/progress_monitor.h b/src/common/global/progress_monitor.h index 1cff202..03628f7 100644 --- a/src/common/global/progress_monitor.h +++ b/src/common/global/progress_monitor.h @@ -16,7 +16,7 @@ class ProgressMonitor : public TQObject Q_OBJECT TQ_OBJECT public: - ProgressMonitor(TQObject *tqparent = 0); + ProgressMonitor(TQObject *parent = 0); void clear(); void appendTask(const TQString &label, uint nbSteps); void insertTask(const TQString &label, uint nbSteps); diff --git a/src/common/global/xml_data_file.cpp b/src/common/global/xml_data_file.cpp index 30d42cd..528f8e7 100644 --- a/src/common/global/xml_data_file.cpp +++ b/src/common/global/xml_data_file.cpp @@ -52,28 +52,28 @@ bool XmlDataFile::save(TQString &error) const return ok; } -TQDomElement XmlDataFile::findChildElement(TQDomElement tqparent, const TQString &name) const +TQDomElement XmlDataFile::findChildElement(TQDomElement parent, const TQString &name) const { - TQDomNodeList list = tqparent.elementsByTagName(name); + TQDomNodeList list = parent.elementsByTagName(name); return list.item(0).toElement(); } -TQDomElement XmlDataFile::createChildElement(TQDomElement tqparent, const TQString &name) +TQDomElement XmlDataFile::createChildElement(TQDomElement parent, const TQString &name) { - TQDomNodeList list = tqparent.elementsByTagName(name); + TQDomNodeList list = parent.elementsByTagName(name); if ( list.count()==0 ) { TQDomElement element = _document.createElement(name); - tqparent.appendChild(element); + parent.appendChild(element); return element; } return list.item(0).toElement(); } -void XmlDataFile::removeChilds(TQDomNode tqparent) const +void XmlDataFile::removeChilds(TQDomNode parent) const { - TQDomNodeList list = tqparent.childNodes(); + TQDomNodeList list = parent.childNodes(); for (uint i=0; i<list.count(); i++) - tqparent.removeChild(list.item(i)); + parent.removeChild(list.item(i)); } TQString XmlDataFile::value(const TQString &group, const TQString &key, const TQString &defValue) const diff --git a/src/common/gui/config_widget.h b/src/common/gui/config_widget.h index 787780b..6d87705 100644 --- a/src/common/gui/config_widget.h +++ b/src/common/gui/config_widget.h @@ -23,7 +23,7 @@ class ConfigWidget : public Container Q_OBJECT TQ_OBJECT public: - ConfigWidget(TQWidget *tqparent = 0) : Container(tqparent) {} + ConfigWidget(TQWidget *parent = 0) : Container(parent) {} virtual TQString title() const { return TQString(); } virtual TQString header() const { return TQString(); } virtual TQPixmap pixmap() const { return TQPixmap(); } diff --git a/src/common/gui/container.cpp b/src/common/gui/container.cpp index 960acca..8a747d3 100644 --- a/src/common/gui/container.cpp +++ b/src/common/gui/container.cpp @@ -11,8 +11,8 @@ #include "misc_gui.h" //---------------------------------------------------------------------------- -Container::Container(TQWidget *tqparent, Type type) - : TQFrame(tqparent), _type(type) +Container::Container(TQWidget *parent, Type type) + : TQFrame(parent), _type(type) { initLayout(); } @@ -36,7 +36,7 @@ void Container::setFrame(Type type) _type = type; switch (type) { case Flat: - setMargin(tqparent() && tqparent()->inherits(TQTABWIDGET_OBJECT_NAME_STRING) ? 10 : 0); + setMargin(parent() && parent()->inherits(TQTABWIDGET_OBJECT_NAME_STRING) ? 10 : 0); setFrameStyle(TQFrame::NoFrame); break; case Sunken: @@ -71,8 +71,8 @@ void Container::addLayout(TQLayout *l, uint startRow, uint endRow, uint startCol } //---------------------------------------------------------------------------- -ButtonContainer::ButtonContainer(const TQString &title, TQWidget *tqparent) - : Container(tqparent, Sunken) +ButtonContainer::ButtonContainer(const TQString &title, TQWidget *parent) + : Container(parent, Sunken) { _button = new PopupButton(title, this); addWidget(_button, 0,0, 0,1); diff --git a/src/common/gui/container.h b/src/common/gui/container.h index e64d143..af3e5a6 100644 --- a/src/common/gui/container.h +++ b/src/common/gui/container.h @@ -23,7 +23,7 @@ Q_OBJECT TQ_OBJECT public: enum Type { Flat, Sunken }; - Container(TQWidget *tqparent = 0, Type type = Flat); + Container(TQWidget *parent = 0, Type type = Flat); Container(TQWidgetStack *stack, uint index, Type type = Flat); Container(TQTabWidget *tabw, const TQString &title, Type type = Flat); void addWidget(TQWidget *widget, uint startRow, uint endRow, uint startCol, uint endCol, int tqalignment = 0); @@ -50,7 +50,7 @@ class ButtonContainer : public Container Q_OBJECT TQ_OBJECT public: - ButtonContainer(const TQString &title, TQWidget *tqparent); + ButtonContainer(const TQString &title, TQWidget *parent); PopupButton &button() { return *_button; } private: diff --git a/src/common/gui/dialog.cpp b/src/common/gui/dialog.cpp index f8ee222..58b12ba 100644 --- a/src/common/gui/dialog.cpp +++ b/src/common/gui/dialog.cpp @@ -17,10 +17,10 @@ #include "misc_gui.h" //----------------------------------------------------------------------------- -Dialog::Dialog(TQWidget *tqparent, const char *name, bool modal, +Dialog::Dialog(TQWidget *parent, const char *name, bool modal, const TQString &caption, int buttonMask, ButtonCode defaultButton, bool separator, const TQSize &defaultSize) - : KDialogBase(tqparent, name, modal, caption, buttonMask, defaultButton, separator), + : KDialogBase(parent, name, modal, caption, buttonMask, defaultButton, separator), _defaultSize(defaultSize) { PBusyCursor::start(); @@ -32,8 +32,8 @@ Dialog::Dialog(TQWidget *tqparent, const char *name, bool modal, } Dialog::Dialog(DialogType type, const TQString &caption, int buttonMask, ButtonCode defaultButton, - TQWidget *tqparent, const char *name, bool modal, bool separator, const TQSize &defaultSize) - : KDialogBase(type, caption, buttonMask, defaultButton, tqparent, name, modal, separator), + TQWidget *parent, const char *name, bool modal, bool separator, const TQSize &defaultSize) + : KDialogBase(type, caption, buttonMask, defaultButton, parent, name, modal, separator), _defaultSize(defaultSize) { PBusyCursor::start(); @@ -62,10 +62,10 @@ TreeListDialog::Item::Item(const TQString &label, TQWidget *page, const TQString : KListViewItem(item, label), _page(page), _title(title) {} -TreeListDialog::TreeListDialog(TQWidget *tqparent, const char *name, bool modal, +TreeListDialog::TreeListDialog(TQWidget *parent, const char *name, bool modal, const TQString &caption, int buttonMask, ButtonCode defaultButton, bool separator) - : Dialog(tqparent, name, modal, caption, buttonMask, defaultButton, separator) + : Dialog(parent, name, modal, caption, buttonMask, defaultButton, separator) { TQVBoxLayout *top = new TQVBoxLayout(mainWidget(), 0, 10); @@ -119,9 +119,9 @@ TQWidget *TreeListDialog::addPage(const TQStringList &labels) item->setSelectable(last); } for (uint i=1; i<labels.count(); i++) { - TQListViewItem *tqparent = item; + TQListViewItem *parent = item; item = 0; - TQListViewItemIterator iti(tqparent); + TQListViewItemIterator iti(parent); for (; it.current(); ++it) { if ( it.current()->text(0)==labels[i] ) { item = it.current(); @@ -132,7 +132,7 @@ TQWidget *TreeListDialog::addPage(const TQStringList &labels) page = new TQWidget(_stack); connect(page, TQT_SIGNAL(destroyed(TQObject *)), TQT_SLOT(pageDestroyed(TQObject *))); _stack->addWidget(page); - item = new Item(labels[i], page, labels[i], tqparent); + item = new Item(labels[i], page, labels[i], parent); item->setOpen(true); bool last = ( labels.count()==i+1 ); item->setSelectable(last); @@ -189,8 +189,8 @@ void TreeListDialog::pageDestroyed(TQObject *object) //----------------------------------------------------------------------------- TextEditorDialog::TextEditorDialog(const TQString &text, const TQString &caption, - bool wrapAtWidgetWidth, TQWidget *tqparent) - : Dialog(tqparent, "text_editor_dialog", true, caption, Close, Close, false, TQSize(200, 100)) + bool wrapAtWidgetWidth, TQWidget *parent) + : Dialog(parent, "text_editor_dialog", true, caption, Close, Close, false, TQSize(200, 100)) { KTextEdit *w = new KTextEdit(text, TQString(), this); w->setReadOnly(true); diff --git a/src/common/gui/dialog.h b/src/common/gui/dialog.h index bc95d81..f506411 100644 --- a/src/common/gui/dialog.h +++ b/src/common/gui/dialog.h @@ -19,11 +19,11 @@ class Dialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - Dialog(TQWidget *tqparent, const char *name, bool modal, + Dialog(TQWidget *parent, const char *name, bool modal, const TQString &caption, int buttonMask, ButtonCode defaultButton, bool separator, const TQSize &defaultSize = TQSize()); Dialog(DialogType type, const TQString &caption, - int buttonMask, ButtonCode defaultButton, TQWidget *tqparent, const char *name, + int buttonMask, ButtonCode defaultButton, TQWidget *parent, const char *name, bool modal, bool separator, const TQSize &defaultSize = TQSize()); virtual ~Dialog(); @@ -40,7 +40,7 @@ class TreeListDialog : public Dialog Q_OBJECT TQ_OBJECT public: - TreeListDialog(TQWidget *tqparent, const char *name, bool modal, + TreeListDialog(TQWidget *parent, const char *name, bool modal, const TQString &caption, int buttonMask, ButtonCode defaultButton, bool separator); TQWidget *addPage(const TQStringList &labels); void showPage(TQWidget *page); @@ -74,7 +74,7 @@ Q_OBJECT TQ_OBJECT public: TextEditorDialog(const TQString &text, const TQString &caption, - bool wrapAtWidgetWidth, TQWidget *tqparent); + bool wrapAtWidgetWidth, TQWidget *parent); }; #endif diff --git a/src/common/gui/editlistbox.cpp b/src/common/gui/editlistbox.cpp index 62a1d98..1bf54cd 100644 --- a/src/common/gui/editlistbox.cpp +++ b/src/common/gui/editlistbox.cpp @@ -30,16 +30,16 @@ #include <kiconloader.h> #include <kstdguiitem.h> -EditListBox::EditListBox(uint nbColumns, TQWidget *tqparent, const char *name, Mode mode, Buttons buttons) - : TQFrame(tqparent, name), _mode(mode), _buttons(buttons) +EditListBox::EditListBox(uint nbColumns, TQWidget *parent, const char *name, Mode mode, Buttons buttons) + : TQFrame(parent, name), _mode(mode), _buttons(buttons) { m_lineEdit = new KLineEdit; init(nbColumns, m_lineEdit); } -EditListBox::EditListBox(uint nbColumns, TQWidget *view, KLineEdit *lineEdit, TQWidget *tqparent, const char *name, +EditListBox::EditListBox(uint nbColumns, TQWidget *view, KLineEdit *lineEdit, TQWidget *parent, const char *name, Mode mode, Buttons buttons) - : TQFrame(tqparent, name), _mode(mode), _buttons(buttons) + : TQFrame(parent, name), _mode(mode), _buttons(buttons) { m_lineEdit = lineEdit; init(nbColumns, view); diff --git a/src/common/gui/editlistbox.h b/src/common/gui/editlistbox.h index 3e7a26d..53b4294 100644 --- a/src/common/gui/editlistbox.h +++ b/src/common/gui/editlistbox.h @@ -41,9 +41,9 @@ Q_OBJECT enum Button { Add = 1, Remove = 2, UpDown = 4, RemoveAll = 8, Reset = 16 }; TQ_DECLARE_FLAGS(Buttons, Button) - EditListBox(uint nbColumns, TQWidget *tqparent = 0, const char *name = 0, Mode mode = DuplicatesDisallowed, + EditListBox(uint nbColumns, TQWidget *parent = 0, const char *name = 0, Mode mode = DuplicatesDisallowed, Buttons buttons = Buttons(Add|Remove|RemoveAll|UpDown) ); - EditListBox(uint nbColumns, TQWidget *view, KLineEdit *lineEdit, TQWidget *tqparent = 0, const char *name = 0, + EditListBox(uint nbColumns, TQWidget *view, KLineEdit *lineEdit, TQWidget *parent = 0, const char *name = 0, Mode mode = DuplicatesDisallowed, Buttons buttons = Buttons(Add|Remove|RemoveAll|UpDown) ); void setTexts(const TQStringList& items); TQStringList texts() const; diff --git a/src/common/gui/hexword_gui.cpp b/src/common/gui/hexword_gui.cpp index b85e829..bf1430c 100644 --- a/src/common/gui/hexword_gui.cpp +++ b/src/common/gui/hexword_gui.cpp @@ -15,8 +15,8 @@ #include "common/common/misc.h" //----------------------------------------------------------------------------- -HexValueValidator::HexValueValidator(uint nbChars, TQObject *tqparent) - : TQValidator(tqparent, "hex_value_validator"), _nbChars(nbChars) {} +HexValueValidator::HexValueValidator(uint nbChars, TQObject *parent) + : TQValidator(parent, "hex_value_validator"), _nbChars(nbChars) {} TQValidator::State HexValueValidator::validate(TQString &input, int &) const { @@ -28,8 +28,8 @@ TQValidator::State HexValueValidator::validate(TQString &input, int &) const } //----------------------------------------------------------------------------- -GenericHexWordEditor::GenericHexWordEditor(uint nbChars, bool hasBlankValue, TQWidget *tqparent) - : KLineEdit(tqparent, "hex_word_editor"), _nbChars(nbChars), _hasBlankValue(hasBlankValue) +GenericHexWordEditor::GenericHexWordEditor(uint nbChars, bool hasBlankValue, TQWidget *parent) + : KLineEdit(parent, "hex_word_editor"), _nbChars(nbChars), _hasBlankValue(hasBlankValue) { setFocusPolicy(TQ_ClickFocus); setValidator(new HexValueValidator(nbChars, TQT_TQOBJECT(this))); diff --git a/src/common/gui/hexword_gui.h b/src/common/gui/hexword_gui.h index 19b8404..a973291 100644 --- a/src/common/gui/hexword_gui.h +++ b/src/common/gui/hexword_gui.h @@ -21,7 +21,7 @@ class HexValueValidator : public TQValidator Q_OBJECT TQ_OBJECT public: - HexValueValidator(uint nbChars, TQObject *tqparent); + HexValueValidator(uint nbChars, TQObject *parent); virtual State validate(TQString &input, int &pos) const; private: @@ -34,7 +34,7 @@ class GenericHexWordEditor : public KLineEdit Q_OBJECT TQ_OBJECT public: - GenericHexWordEditor(uint nbChars, bool hasBlankValue, TQWidget *tqparent); + GenericHexWordEditor(uint nbChars, bool hasBlankValue, TQWidget *parent); virtual TQSize tqsizeHint() const; virtual TQSize tqminimumSizeHint() const; @@ -58,7 +58,7 @@ protected: bool _hasBlankValue; virtual bool isValid() const = 0; - virtual BitValue tqmask() const = 0; + virtual BitValue mask() const = 0; virtual BitValue normalizeWord(BitValue value) const = 0; virtual bool event(TQEvent *e); virtual void set(); @@ -73,7 +73,7 @@ class HexWordEditor : public GenericHexWordEditor Q_OBJECT TQ_OBJECT public: - HexWordEditor(uint nbChars, TQWidget *tqparent) : GenericHexWordEditor(nbChars, false, tqparent) {} + HexWordEditor(uint nbChars, TQWidget *parent) : GenericHexWordEditor(nbChars, false, parent) {} void setValue(BitValue word) { _word = word; set(); } BitValue value() const { return _word; } @@ -81,8 +81,8 @@ protected: BitValue _word; virtual bool isValid() const { return true; } - virtual BitValue tqmask() const { return maxValue(NumberBase::Hex, _nbChars); } - virtual BitValue normalizeWord(BitValue value) const { return value.maskWith(tqmask()); } + virtual BitValue mask() const { return maxValue(NumberBase::Hex, _nbChars); } + virtual BitValue normalizeWord(BitValue value) const { return value.maskWith(mask()); } virtual BitValue word() const { return _word; } virtual void setWord(BitValue value) { _word = value; } virtual BitValue blankValue() const { return 0; } diff --git a/src/common/gui/key_gui.h b/src/common/gui/key_gui.h index 054a513..5afce35 100644 --- a/src/common/gui/key_gui.h +++ b/src/common/gui/key_gui.h @@ -24,7 +24,7 @@ public: typedef TQMapConstIterator<KeyType, int> ConstIterator; public: - KeyWidget(TQWidget *tqparent) { _widget = new WidgetType(tqparent); } + KeyWidget(TQWidget *parent) { _widget = new WidgetType(parent); } virtual ~KeyWidget() { delete _widget; } virtual WidgetType *widget() { return _widget; } virtual void clear() { _ids.clear(); } @@ -71,7 +71,7 @@ class KeyComboBox : public KeyWidget<KeyType, TQString, TQComboBox> { public: typedef KeyWidget<KeyType, TQString, TQComboBox> ParentType; - KeyComboBox(TQWidget *tqparent = 0) : ParentType(tqparent) {} + KeyComboBox(TQWidget *parent = 0) : ParentType(parent) {} virtual void clear() { ParentType::clear(); ParentType::_widget->clear(); @@ -93,7 +93,7 @@ class KeyWidgetStack : public KeyWidget<KeyType, TQWidget *, TQWidgetStack> { public: typedef KeyWidget<KeyType, TQWidget *, TQWidgetStack> ParentType; - KeyWidgetStack(TQWidget *tqparent = 0) : ParentType(tqparent) {} + KeyWidgetStack(TQWidget *parent = 0) : ParentType(parent) {} protected: virtual int append(TQWidget *widget) { return ParentType::_widget->addWidget(widget); } @@ -108,7 +108,7 @@ class KeyPopupButton : public KeyWidget<KeyType, TQString, PopupButton> { public: typedef KeyWidget<KeyType, TQString, PopupButton> ParentType; - KeyPopupButton(TQWidget *tqparent = 0) : ParentType(tqparent) {} + KeyPopupButton(TQWidget *parent = 0) : ParentType(parent) {} protected: virtual int append(TQString label) { return ParentType::_widget->appendItem(label, TQPixmap()); } diff --git a/src/common/gui/list_container.cpp b/src/common/gui/list_container.cpp index cbdec17..234cdf2 100644 --- a/src/common/gui/list_container.cpp +++ b/src/common/gui/list_container.cpp @@ -9,8 +9,8 @@ #include "list_container.h" //---------------------------------------------------------------------------- -PopupContainer::PopupContainer(const TQString &title, TQWidget *tqparent, const char *name) - : KPopupMenu(tqparent, name) +PopupContainer::PopupContainer(const TQString &title, TQWidget *parent, const char *name) + : KPopupMenu(parent, name) { if ( !title.isEmpty() ) insertTitle(title); } @@ -41,16 +41,16 @@ void PopupContainer::appendItem(const TQPixmap &icon, const TQString &label, uin } //---------------------------------------------------------------------------- -ListViewItemContainer::ListViewItemContainer(const TQString &title, KListView *tqparent) - : KListViewItem(tqparent, title), _parent(0), _column(0) +ListViewItemContainer::ListViewItemContainer(const TQString &title, KListView *parent) + : KListViewItem(parent, title), _parent(0), _column(0) { _ids = new TQMap<const TQListViewItem *, uint>; } -ListViewItemContainer::ListViewItemContainer(const TQString &title, ListViewItemContainer *tqparent) - : KListViewItem(tqparent, title), _parent(tqparent), _column(0) +ListViewItemContainer::ListViewItemContainer(const TQString &title, ListViewItemContainer *parent) + : KListViewItem(parent, title), _parent(parent), _column(0) { - _ids = tqparent->_ids; + _ids = parent->_ids; } ListViewItemContainer::~ListViewItemContainer() diff --git a/src/common/gui/list_container.h b/src/common/gui/list_container.h index 138b9ea..75abeb0 100644 --- a/src/common/gui/list_container.h +++ b/src/common/gui/list_container.h @@ -29,7 +29,7 @@ class PopupContainer : public KPopupMenu, public ListContainer Q_OBJECT TQ_OBJECT public: - PopupContainer(const TQString &title, TQWidget *tqparent = 0, const char *name = 0); + PopupContainer(const TQString &title, TQWidget *parent = 0, const char *name = 0); virtual ListContainer *appendBranch(const TQString &title); virtual ListContainer *appendBranch(const TQPixmap &icon, const TQString &title); virtual void appendItem(const TQPixmap &icon, const TQString &label, uint id, ItemState state); @@ -39,8 +39,8 @@ public: class ListViewItemContainer : public KListViewItem, public ListContainer { public: - ListViewItemContainer(const TQString &title, KListView *tqparent); - ListViewItemContainer(const TQString &title, ListViewItemContainer *tqparent); + ListViewItemContainer(const TQString &title, KListView *parent); + ListViewItemContainer(const TQString &title, ListViewItemContainer *parent); virtual ~ListViewItemContainer(); void setColumn(uint column) { _column = column; } virtual ListContainer *appendBranch(const TQString &title); diff --git a/src/common/gui/list_view.cpp b/src/common/gui/list_view.cpp index 218241d..52bd32b 100644 --- a/src/common/gui/list_view.cpp +++ b/src/common/gui/list_view.cpp @@ -17,8 +17,8 @@ #include <tqvariant.h> //---------------------------------------------------------------------------- -ListView::ListView(TQWidget *tqparent, const char *name) - : KListView(tqparent, name) +ListView::ListView(TQWidget *parent, const char *name) + : KListView(parent, name) { TQToolTip::remove(this); _tooltip = new ListViewToolTip(this); diff --git a/src/common/gui/list_view.h b/src/common/gui/list_view.h index c76ef46..54c7a05 100644 --- a/src/common/gui/list_view.h +++ b/src/common/gui/list_view.h @@ -26,7 +26,7 @@ class ListView : public KListView Q_OBJECT TQ_OBJECT public: - ListView(TQWidget *tqparent = 0, const char *name = 0); + ListView(TQWidget *parent = 0, const char *name = 0); virtual ~ListView(); virtual void clear(); void stopRenaming(bool force); @@ -50,8 +50,8 @@ private: class ListViewToolTip : public TQToolTip { public: - ListViewToolTip(ListView *tqparent) - : TQToolTip(tqparent->viewport()), _listView(tqparent) {} + ListViewToolTip(ListView *parent) + : TQToolTip(parent->viewport()), _listView(parent) {} protected: virtual void maybeTip(const TQPoint &p); diff --git a/src/common/gui/misc_gui.cpp b/src/common/gui/misc_gui.cpp index fadf7a9..2c4eb3b 100644 --- a/src/common/gui/misc_gui.cpp +++ b/src/common/gui/misc_gui.cpp @@ -109,14 +109,14 @@ void MessageBox::text(const TQString &text, Log::ShowMode show) } //---------------------------------------------------------------------------- -PopupButton::PopupButton(TQWidget *tqparent, const char *name) - : KPushButton(tqparent, name) +PopupButton::PopupButton(TQWidget *parent, const char *name) + : KPushButton(parent, name) { init(); } -PopupButton::PopupButton(const TQString &text, TQWidget *tqparent, const char *name) - : KPushButton(text, tqparent, name) +PopupButton::PopupButton(const TQString &text, TQWidget *parent, const char *name) + : KPushButton(text, parent, name) { init(); } @@ -158,8 +158,8 @@ int PopupButton::appendItem(const TQString &label, const TQPixmap &icon, int id) } //----------------------------------------------------------------------------- -Splitter::Splitter(const TQValueList<int> &defaultSizes, Qt::Orientation o, TQWidget *tqparent, const char *name) - : TQSplitter(o, tqparent, name), _defaultSizes(defaultSizes) +Splitter::Splitter(const TQValueList<int> &defaultSizes, Qt::Orientation o, TQWidget *parent, const char *name) + : TQSplitter(o, parent, name), _defaultSizes(defaultSizes) { Q_ASSERT(name); setOpaqueResize(true); @@ -181,18 +181,18 @@ void Splitter::updateSizes() } //----------------------------------------------------------------------------- -TabBar::TabBar(TQWidget *tqparent, const char *name) - : KTabBar(tqparent, name), _ignoreWheelEvent(false) +TabBar::TabBar(TQWidget *parent, const char *name) + : KTabBar(parent, name), _ignoreWheelEvent(false) {} void TabBar::wheelEvent(TQWheelEvent *e) { - if (_ignoreWheelEvent) TQApplication::sendEvent(tqparent(), e); // #### not sure why ignoring is not enough... + if (_ignoreWheelEvent) TQApplication::sendEvent(parent(), e); // #### not sure why ignoring is not enough... else KTabBar::wheelEvent(e); } -TabWidget::TabWidget(TQWidget *tqparent, const char *name) - : KTabWidget(tqparent, name) +TabWidget::TabWidget(TQWidget *parent, const char *name) + : KTabWidget(parent, name) { setTabBar(new TabBar(this)); } @@ -223,12 +223,12 @@ void TabWidget::setTabBar(TabBar *tabbar) } //----------------------------------------------------------------------------- -ComboBox::ComboBox(TQWidget *tqparent, const char *name) - : TQComboBox(tqparent, name), _ignoreWheelEvent(false) +ComboBox::ComboBox(TQWidget *parent, const char *name) + : TQComboBox(parent, name), _ignoreWheelEvent(false) {} void ComboBox::wheelEvent(TQWheelEvent *e) { - if (_ignoreWheelEvent) TQApplication::sendEvent(tqparent(), e); // #### not sure why ignoring is not enough... + if (_ignoreWheelEvent) TQApplication::sendEvent(parent(), e); // #### not sure why ignoring is not enough... else TQComboBox::wheelEvent(e); } diff --git a/src/common/gui/misc_gui.h b/src/common/gui/misc_gui.h index 7003f91..8c6a2ee 100644 --- a/src/common/gui/misc_gui.h +++ b/src/common/gui/misc_gui.h @@ -65,8 +65,8 @@ class PopupButton : public KPushButton Q_OBJECT TQ_OBJECT public: - PopupButton(TQWidget *tqparent = 0, const char *name = 0); - PopupButton(const TQString &text, TQWidget *tqparent = 0, const char *name = 0); + PopupButton(TQWidget *parent = 0, const char *name = 0); + PopupButton(const TQString &text, TQWidget *parent = 0, const char *name = 0); void appendAction(KAction *action); void appendAction(const TQString &label, const TQString &icon = TQString(), TQObject *receiver = 0, const char *slot = 0); @@ -91,7 +91,7 @@ Q_OBJECT TQ_OBJECT public: Splitter(const TQValueList<int> &defaultSizes, Qt::Orientation orientation, - TQWidget *tqparent, const char *name); + TQWidget *parent, const char *name); virtual ~Splitter(); private slots: @@ -114,7 +114,7 @@ class SeparatorWidget : public TQFrame Q_OBJECT TQ_OBJECT public: - SeparatorWidget(TQWidget *tqparent) : TQFrame(tqparent, "separator") { + SeparatorWidget(TQWidget *parent) : TQFrame(parent, "separator") { setFrameStyle(TQFrame::Panel | TQFrame::Sunken); setMargin(2); setFixedHeight(2*2); @@ -127,7 +127,7 @@ class TabBar : public KTabBar Q_OBJECT TQ_OBJECT public: - TabBar(TQWidget *tqparent = 0, const char *name = 0); + TabBar(TQWidget *parent = 0, const char *name = 0); protected: virtual void wheelEvent(TQWheelEvent *e); @@ -143,7 +143,7 @@ class TabWidget : public KTabWidget Q_OBJECT TQ_OBJECT public: - TabWidget(TQWidget *tqparent = 0, const char *name = 0); + TabWidget(TQWidget *parent = 0, const char *name = 0); void setIgnoreWheelEvent(bool ignore); protected: @@ -157,7 +157,7 @@ class ComboBox : public TQComboBox Q_OBJECT TQ_OBJECT public: - ComboBox(TQWidget *tqparent = 0, const char *name = 0); + ComboBox(TQWidget *parent = 0, const char *name = 0); void setIgnoreWheelEvent(bool ignore) { _ignoreWheelEvent = ignore; } protected: diff --git a/src/common/gui/number_gui.cpp b/src/common/gui/number_gui.cpp index 1a84a36..cb58d4c 100644 --- a/src/common/gui/number_gui.cpp +++ b/src/common/gui/number_gui.cpp @@ -36,14 +36,14 @@ uint maxLabelWidth(NumberBase base, uint nbChars, const TQFont &font) } //----------------------------------------------------------------------------- -NumberLineEdit::NumberLineEdit(TQWidget *tqparent, const char *name) - : KLineEdit(tqparent, name) +NumberLineEdit::NumberLineEdit(TQWidget *parent, const char *name) + : KLineEdit(parent, name) { connect(this, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(textChangedSlot())); } -NumberLineEdit::NumberLineEdit(const TQString &text, TQWidget *tqparent, const char *name) - : KLineEdit(text, tqparent, name) +NumberLineEdit::NumberLineEdit(const TQString &text, TQWidget *parent, const char *name) + : KLineEdit(text, parent, name) { connect(this, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(textChangedSlot())); } diff --git a/src/common/gui/number_gui.h b/src/common/gui/number_gui.h index 2b23d2b..659e443 100644 --- a/src/common/gui/number_gui.h +++ b/src/common/gui/number_gui.h @@ -28,8 +28,8 @@ class NumberLineEdit : public KLineEdit Q_OBJECT TQ_OBJECT public: - NumberLineEdit(TQWidget *tqparent = 0, const char *name = 0); - NumberLineEdit(const TQString &text, TQWidget *tqparent = 0, const char *name = 0); + NumberLineEdit(TQWidget *parent = 0, const char *name = 0); + NumberLineEdit(const TQString &text, TQWidget *parent = 0, const char *name = 0); uint value(bool *ok = 0) const { return fromAnyLabel(text(), ok); } void setColor(const TQColor &color) { setPaletteForegroundColor(color); } void unsetColor() { unsetPalette(); } diff --git a/src/common/gui/purl_gui.cpp b/src/common/gui/purl_gui.cpp index f93e11c..0284682 100644 --- a/src/common/gui/purl_gui.cpp +++ b/src/common/gui/purl_gui.cpp @@ -74,8 +74,8 @@ bool PURL::hasMimetype(FileType type) //----------------------------------------------------------------------------- PURL::Label::Label(const TQString &url, const TQString &text, - TQWidget *tqparent, const char *name) - : KURLLabel(url, text, tqparent, name) + TQWidget *parent, const char *name) + : KURLLabel(url, text, parent, name) { connect(this, TQT_SIGNAL(leftClickedURL()), TQT_SLOT(urlClickedSlot())); } @@ -86,14 +86,14 @@ void PURL::Label::urlClickedSlot() } //----------------------------------------------------------------------------- -PURL::BaseWidget::BaseWidget(TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name) +PURL::BaseWidget::BaseWidget(TQWidget *parent, const char *name) + : TQWidget(parent, name) { init(); } -PURL::BaseWidget::BaseWidget(const TQString &defaultDir, TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name), _defaultDir(defaultDir) +PURL::BaseWidget::BaseWidget(const TQString &defaultDir, TQWidget *parent, const char *name) + : TQWidget(parent, name), _defaultDir(defaultDir) { init(); } @@ -122,14 +122,14 @@ void PURL::DirectoryWidget::buttonClicked() } //---------------------------------------------------------------------------- -PURL::DirectoriesWidget::DirectoriesWidget(const TQString &title, TQWidget *tqparent, const char *name) - : TQVGroupBox(title, tqparent, name) +PURL::DirectoriesWidget::DirectoriesWidget(const TQString &title, TQWidget *parent, const char *name) + : TQVGroupBox(title, parent, name) { init(TQString()); } -PURL::DirectoriesWidget::DirectoriesWidget(const TQString &title, const TQString &defaultDir, TQWidget *tqparent, const char *name) - : TQVGroupBox(title, tqparent, name) +PURL::DirectoriesWidget::DirectoriesWidget(const TQString &title, const TQString &defaultDir, TQWidget *parent, const char *name) + : TQVGroupBox(title, parent, name) { init(defaultDir); } diff --git a/src/common/gui/purl_gui.h b/src/common/gui/purl_gui.h index d554636..3d29319 100644 --- a/src/common/gui/purl_gui.h +++ b/src/common/gui/purl_gui.h @@ -37,7 +37,7 @@ class Label : public KURLLabel Q_OBJECT TQ_OBJECT public: - Label(const TQString &url, const TQString &text, TQWidget *tqparent = 0, const char *name = 0); + Label(const TQString &url, const TQString &text, TQWidget *parent = 0, const char *name = 0); private slots: void urlClickedSlot(); @@ -49,8 +49,8 @@ class BaseWidget : public TQWidget Q_OBJECT TQ_OBJECT public: - BaseWidget(TQWidget *tqparent = 0, const char *name = 0); - BaseWidget(const TQString &defaultDir, TQWidget *tqparent = 0, const char *name = 0); + BaseWidget(TQWidget *parent = 0, const char *name = 0); + BaseWidget(const TQString &defaultDir, TQWidget *parent = 0, const char *name = 0); KLineEdit *lineEdit() { return _edit; } signals: @@ -72,8 +72,8 @@ class DirectoryWidget : public BaseWidget Q_OBJECT TQ_OBJECT public: - DirectoryWidget(TQWidget *tqparent = 0, const char *name = 0) : BaseWidget(tqparent, name) {} - DirectoryWidget(const TQString &defaultDir, TQWidget *tqparent = 0, const char *name = 0) : BaseWidget(defaultDir, tqparent, name) {} + DirectoryWidget(TQWidget *parent = 0, const char *name = 0) : BaseWidget(parent, name) {} + DirectoryWidget(const TQString &defaultDir, TQWidget *parent = 0, const char *name = 0) : BaseWidget(defaultDir, parent, name) {} void setDirectory(const Directory &dir) { _edit->setText(dir.path()); } Directory directory() const { return _edit->text(); } @@ -87,8 +87,8 @@ class DirectoriesWidget : public TQVGroupBox Q_OBJECT TQ_OBJECT public: - DirectoriesWidget(const TQString &title, TQWidget *tqparent = 0, const char *name = 0); - DirectoriesWidget(const TQString &title, const TQString &defaultDir, TQWidget *tqparent = 0, const char *name = 0); + DirectoriesWidget(const TQString &title, TQWidget *parent = 0, const char *name = 0); + DirectoriesWidget(const TQString &title, const TQString &defaultDir, TQWidget *parent = 0, const char *name = 0); void setDirectories(const TQStringList &dirs) { _editListBox->setTexts(dirs); } TQStringList directories() const { return _editListBox->texts(); } @@ -106,10 +106,10 @@ class UrlWidget : public BaseWidget Q_OBJECT TQ_OBJECT public: - UrlWidget(const TQString &filter, TQWidget *tqparent = 0, const char *name = 0) - : BaseWidget(tqparent, name), _filter(filter) {} - UrlWidget(const TQString &defaultDir, const TQString &filter, TQWidget *tqparent = 0, const char *name = 0) - : BaseWidget(defaultDir, tqparent, name), _filter(filter) {} + UrlWidget(const TQString &filter, TQWidget *parent = 0, const char *name = 0) + : BaseWidget(parent, name), _filter(filter) {} + UrlWidget(const TQString &defaultDir, const TQString &filter, TQWidget *parent = 0, const char *name = 0) + : BaseWidget(defaultDir, parent, name), _filter(filter) {} Url url() const { return PURL::Url::fromPathOrUrl(_edit->text()); } void setUrl(const Url &url) { _edit->setText(url.filepath()); } diff --git a/src/common/nokde/nokde_kprocess.cpp b/src/common/nokde/nokde_kprocess.cpp index 2886f20..8bbb711 100644 --- a/src/common/nokde/nokde_kprocess.cpp +++ b/src/common/nokde/nokde_kprocess.cpp @@ -11,8 +11,8 @@ # include <signal.h> #endif -KProcess::KProcess(TQObject *tqparent, const char *name) - : TQObject(tqparent, name) +KProcess::KProcess(TQObject *parent, const char *name) + : TQObject(parent, name) { _process = new Q3Process(this); connect(_process, TQT_SIGNAL(processExited()), TQT_SLOT(processExitedSlot())); diff --git a/src/common/nokde/nokde_kprocess.h b/src/common/nokde/nokde_kprocess.h index 5c7effd..a18d5c5 100644 --- a/src/common/nokde/nokde_kprocess.h +++ b/src/common/nokde/nokde_kprocess.h @@ -15,7 +15,7 @@ class KProcess : public TQObject Q_OBJECT TQ_OBJECT public: - KProcess(TQObject *tqparent = 0, const char *name = 0); + KProcess(TQObject *parent = 0, const char *name = 0); void clearArguments() { _arguments.clear(); } KProcess &operator<< (const TQString &arg) { _arguments += arg; return *this; } KProcess &operator<< (const TQStringList &args) { _arguments += args; return *this; } 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; } diff --git a/src/common/port/parallel.h b/src/common/port/parallel.h index 2dbfc71..08741e1 100644 --- a/src/common/port/parallel.h +++ b/src/common/port/parallel.h @@ -36,7 +36,7 @@ public: enum RequestType { Control = 0, tqStatus, Data, Nb_RequestTypes }; struct PPinData { RequestType rType; - uchar tqmask; + uchar mask; IODir dir; const char *label; }; diff --git a/src/common/port/serial.cpp b/src/common/port/serial.cpp index 5942561..2db84b9 100644 --- a/src/common/port/serial.cpp +++ b/src/common/port/serial.cpp @@ -375,15 +375,15 @@ bool Port::Serial::internalReadPin(Pin pin, LogicType type, bool &value) #if defined(Q_OS_UNIX) int bits; if ( ioctl(_fd, TIOCMGET, &bits)<0 ) return false; - int tqmask = 0; + int mask = 0; switch (pin) { - case DCD: tqmask = TIOCM_CD; break; - case RX : tqmask = TIOCM_SR; break; - case DSR: tqmask = TIOCM_DSR; break; - case CTS: tqmask = TIOCM_CTS; break; + case DCD: mask = TIOCM_CD; break; + case RX : mask = TIOCM_SR; break; + case DSR: mask = TIOCM_DSR; break; + case CTS: mask = TIOCM_CTS; break; default: Q_ASSERT(false); return false; } - value = ((type==NegativeLogic ? ~bits : bits) & tqmask); + value = ((type==NegativeLogic ? ~bits : bits) & mask); return true; #elif defined(Q_OS_WIN) DWORD status; diff --git a/src/devices/gui/device_group_ui.h b/src/devices/gui/device_group_ui.h index d123d7d..7b76186 100644 --- a/src/devices/gui/device_group_ui.h +++ b/src/devices/gui/device_group_ui.h @@ -31,11 +31,11 @@ class MemoryEditor; class GroupUI : public ::Group::BaseGui { public: - virtual HexView *createHexView(const HexEditor &editor, TQWidget *tqparent) const = 0; - virtual Register::View *createRegisterView(TQWidget *tqparent) const = 0; - virtual MemoryEditor *createConfigEditor(Device::Memory &memory, TQWidget *tqparent) const = 0; + virtual HexView *createHexView(const HexEditor &editor, TQWidget *parent) const = 0; + virtual Register::View *createRegisterView(TQWidget *parent) const = 0; + virtual MemoryEditor *createConfigEditor(Device::Memory &memory, TQWidget *parent) const = 0; virtual void fillWatchListContainer(ListContainer *container, TQValueVector<Register::TypeData> &ids) const = 0; - virtual Register::ListViewItem *createWatchItem(const Register::TypeData &data, KListViewItem *tqparent) const = 0; + virtual Register::ListViewItem *createWatchItem(const Register::TypeData &data, KListViewItem *parent) const = 0; }; inline const Device::GroupUI &groupui(const Device::Data &data) { return static_cast<const Device::GroupUI &>(*data.group().gui()); } diff --git a/src/devices/gui/hex_view.cpp b/src/devices/gui/hex_view.cpp index ac82ddf..4a6319f 100644 --- a/src/devices/gui/hex_view.cpp +++ b/src/devices/gui/hex_view.cpp @@ -9,8 +9,8 @@ ***************************************************************************/ #include "hex_view.h" -Device::HexView::HexView(const HexEditor &editor, TQWidget *tqparent, const char *name) - : MemoryEditorGroup(0, tqparent, name), _editor(editor) +Device::HexView::HexView(const HexEditor &editor, TQWidget *parent, const char *name) + : MemoryEditorGroup(0, parent, name), _editor(editor) {} void Device::HexView::display(Memory *memory) diff --git a/src/devices/gui/hex_view.h b/src/devices/gui/hex_view.h index f1b953b..4aadc90 100644 --- a/src/devices/gui/hex_view.h +++ b/src/devices/gui/hex_view.h @@ -21,7 +21,7 @@ class HexView : public MemoryEditorGroup Q_OBJECT TQ_OBJECT public: - HexView(const HexEditor &editor, TQWidget *tqparent, const char *name); + HexView(const HexEditor &editor, TQWidget *parent, const char *name); virtual void display(Memory *memory); virtual uint nbChecksumChars() const = 0; virtual BitValue checksum() const = 0; diff --git a/src/devices/gui/hex_word_editor.cpp b/src/devices/gui/hex_word_editor.cpp index 5e8ab7a..163217c 100644 --- a/src/devices/gui/hex_word_editor.cpp +++ b/src/devices/gui/hex_word_editor.cpp @@ -16,8 +16,8 @@ #include <tqtimer.h> //----------------------------------------------------------------------------- -Device::HexWordEditor::HexWordEditor(Memory &memory, uint nbChars, TQWidget *tqparent) - : GenericHexWordEditor(nbChars, true, tqparent), _memory(memory) +Device::HexWordEditor::HexWordEditor(Memory &memory, uint nbChars, TQWidget *parent) + : GenericHexWordEditor(nbChars, true, parent), _memory(memory) { setOffset(-1); } @@ -29,8 +29,8 @@ void Device::HexWordEditor::setOffset(int offset) } //----------------------------------------------------------------------------- -Device::RegisterHexWordEditor::RegisterHexWordEditor(TQWidget *tqparent, uint nbChars, BitValue tqmask) - : GenericHexWordEditor(nbChars, true, tqparent), _tqmask(tqmask) +Device::RegisterHexWordEditor::RegisterHexWordEditor(TQWidget *parent, uint nbChars, BitValue mask) + : GenericHexWordEditor(nbChars, true, parent), _mask(mask) { clear(); } diff --git a/src/devices/gui/hex_word_editor.h b/src/devices/gui/hex_word_editor.h index 8744d03..94b520c 100644 --- a/src/devices/gui/hex_word_editor.h +++ b/src/devices/gui/hex_word_editor.h @@ -21,7 +21,7 @@ class HexWordEditor : public GenericHexWordEditor Q_OBJECT TQ_OBJECT public: - HexWordEditor(Memory &memory, uint nbChars, TQWidget *tqparent); + HexWordEditor(Memory &memory, uint nbChars, TQWidget *parent); void setOffset(int offset); int offset() const { return _offset; } @@ -30,7 +30,7 @@ protected: int _offset; virtual bool isValid() const { return _offset!=-1; } - virtual BitValue tqmask() const = 0; + virtual BitValue mask() const = 0; virtual BitValue normalizeWord(BitValue value) const = 0; virtual BitValue word() const = 0; virtual void setWord(BitValue value) = 0; @@ -43,7 +43,7 @@ class RegisterHexWordEditor : public GenericHexWordEditor Q_OBJECT TQ_OBJECT public: - RegisterHexWordEditor(TQWidget *tqparent, uint nbChars, BitValue tqmask); + RegisterHexWordEditor(TQWidget *parent, uint nbChars, BitValue mask); void clear() { setValue(BitValue()); } void setValue(BitValue word); BitValue value() const { return _word; } @@ -51,11 +51,11 @@ public: void unsetColor() { unsetPalette(); } private: - BitValue _tqmask, _word; + BitValue _mask, _word; virtual bool isValid() const { return true; } - virtual BitValue tqmask() const { return _tqmask; } - virtual BitValue normalizeWord(BitValue value) const { return value.maskWith(_tqmask); } + virtual BitValue mask() const { return _mask; } + virtual BitValue normalizeWord(BitValue value) const { return value.maskWith(_mask); } virtual BitValue word() const { return _word; } virtual void setWord(BitValue value) { _word = value; } virtual BitValue blankValue() const { return BitValue(); } diff --git a/src/devices/gui/memory_editor.cpp b/src/devices/gui/memory_editor.cpp index 6679a57..bee291e 100644 --- a/src/devices/gui/memory_editor.cpp +++ b/src/devices/gui/memory_editor.cpp @@ -28,8 +28,8 @@ #include "libgui/gui_prog_manager.h" //----------------------------------------------------------------------------- -Device::MemoryEditor::MemoryEditor(Device::Memory *memory, TQWidget *tqparent, const char *name) - : TQFrame(tqparent, name), _memory(memory) +Device::MemoryEditor::MemoryEditor(Device::Memory *memory, TQWidget *parent, const char *name) + : TQFrame(parent, name), _memory(memory) { _top = new TQVBoxLayout(this, 5, 10); } @@ -37,8 +37,8 @@ Device::MemoryEditor::MemoryEditor(Device::Memory *memory, TQWidget *tqparent, c //----------------------------------------------------------------------------- Device::MemoryRangeEditor::MemoryRangeEditor(Device::Memory &memory, uint nbLines, uint nbCols, uint offset, int nb, - TQWidget *tqparent, const char *name) - : MemoryEditor(&memory, tqparent, name), + TQWidget *parent, const char *name) + : MemoryEditor(&memory, parent, name), _nbLines(nbLines), _nbCols(nbCols), _offset(offset), _nb(nb) {} @@ -248,8 +248,8 @@ void Device::MemoryRangeEditor::movePrevPage() } //----------------------------------------------------------------------------- -Device::MemoryEditorGroup::MemoryEditorGroup(Device::Memory *memory, TQWidget *tqparent, const char *name) - : MemoryEditor(memory, tqparent, name) +Device::MemoryEditorGroup::MemoryEditorGroup(Device::Memory *memory, TQWidget *parent, const char *name) + : MemoryEditor(memory, parent, name) {} void Device::MemoryEditorGroup::addEditor(MemoryEditor *editor) @@ -284,8 +284,8 @@ const Device::ActionData Device::ACTION_DATA[Nb_Actions] = { }; Device::MemoryTypeEditor::MemoryTypeEditor(const HexView *hexview, Device::Memory &memory, - TQWidget *tqparent, const char *name) - : MemoryEditorGroup(&memory, tqparent, name), + TQWidget *parent, const char *name) + : MemoryEditorGroup(&memory, parent, name), _title(0), _comment(0), _hexview(hexview) { for (uint i=0; i<Nb_Actions; i++) _actions[i] = 0; diff --git a/src/devices/gui/memory_editor.h b/src/devices/gui/memory_editor.h index 2ef60d8..ac8bfdc 100644 --- a/src/devices/gui/memory_editor.h +++ b/src/devices/gui/memory_editor.h @@ -44,7 +44,7 @@ class MemoryEditor : public TQFrame Q_OBJECT TQ_OBJECT public: - MemoryEditor(Device::Memory *memory, TQWidget *tqparent, const char *name); + MemoryEditor(Device::Memory *memory, TQWidget *parent, const char *name); virtual void setReadOnly(bool readOnly) = 0; public slots: @@ -65,7 +65,7 @@ Q_OBJECT TQ_OBJECT public: MemoryRangeEditor(Device::Memory &memory, uint nbLines, uint nbCols, - uint offset, int nb, TQWidget *tqparent, const char *name); + uint offset, int nb, TQWidget *parent, const char *name); virtual void init(); virtual void setReadOnly(bool readOnly); void setComment(const TQString &text); @@ -101,7 +101,7 @@ protected: virtual uint nbWords() const = 0; virtual uint addressIncrement() const = 0; virtual Address startAddress() const = 0; - virtual HexWordEditor *createHexWordEditor(TQWidget *tqparent) = 0; + virtual HexWordEditor *createHexWordEditor(TQWidget *parent) = 0; virtual bool isRangeReadOnly() const = 0; virtual void updateAddressColor(uint i, Address address) { Q_UNUSED(i); Q_UNUSED(address); } virtual void addLegend(TQVBoxLayout *vbox) { Q_UNUSED(vbox); } @@ -113,7 +113,7 @@ class MemoryEditorGroup : public MemoryEditor Q_OBJECT TQ_OBJECT public: - MemoryEditorGroup(Device::Memory *memory, TQWidget *tqparent, const char *name); + MemoryEditorGroup(Device::Memory *memory, TQWidget *parent, const char *name); void addEditor(MemoryEditor *editor); virtual void setReadOnly(bool readOnly); @@ -131,7 +131,7 @@ class MemoryTypeEditor : public MemoryEditorGroup Q_OBJECT TQ_OBJECT public: - MemoryTypeEditor(const HexView *hexview, Device::Memory &memory, TQWidget *tqparent, const char *name); + MemoryTypeEditor(const HexView *hexview, Device::Memory &memory, TQWidget *parent, const char *name); virtual void init(bool first); virtual void setReadOnly(bool readOnly); diff --git a/src/devices/gui/register_view.cpp b/src/devices/gui/register_view.cpp index c1fa3a6..264a04b 100644 --- a/src/devices/gui/register_view.cpp +++ b/src/devices/gui/register_view.cpp @@ -12,8 +12,8 @@ #include "libgui/gui_debug_manager.h" //---------------------------------------------------------------------------- -Register::PortBitListViewItem::PortBitListViewItem(uint index, uint bit, KListViewItem *tqparent) - : KListViewItem(tqparent), _index(index), _bit(bit) +Register::PortBitListViewItem::PortBitListViewItem(uint index, uint bit, KListViewItem *parent) + : KListViewItem(parent), _index(index), _bit(bit) { const Device::RegistersData *rdata = Main::deviceData()->registersData(); setText(1, rdata->portBitName(_index, _bit)); @@ -75,8 +75,8 @@ TQString Register::PortBitListViewItem::tooltip(int col) const } //----------------------------------------------------------------------------- -Register::ListViewItem::ListViewItem(const TypeData &data, KListViewItem *tqparent) - : EditListViewItem(tqparent), _data(data), _base(NumberBase::Hex) +Register::ListViewItem::ListViewItem(const TypeData &data, KListViewItem *parent) + : EditListViewItem(parent), _data(data), _base(NumberBase::Hex) { setSelectable(false); const Device::RegistersData *rdata = Main::deviceData()->registersData(); @@ -164,8 +164,8 @@ void Register::ListViewItem::editDone(int col, const TQWidget *edit) } //---------------------------------------------------------------------------- -Register::LineEdit::LineEdit(TQWidget *tqparent, const char *name) - : NumberLineEdit(tqparent, name), _base(NumberBase::Nb_Types) +Register::LineEdit::LineEdit(TQWidget *parent, const char *name) + : NumberLineEdit(parent, name), _base(NumberBase::Nb_Types) { connect(this, TQT_SIGNAL(lostFocus()), TQT_SLOT(updateText())); connect(this, TQT_SIGNAL(returnPressed()), TQT_SLOT(returnPressedSlot())); @@ -203,6 +203,6 @@ void Register::LineEdit::keyPressEvent(TQKeyEvent *e) } //---------------------------------------------------------------------------- -Register::View::View(TQWidget *tqparent, const char *name) - : TQFrame(tqparent, name), GenericView(list()) +Register::View::View(TQWidget *parent, const char *name) + : TQFrame(parent, name), GenericView(list()) {} diff --git a/src/devices/gui/register_view.h b/src/devices/gui/register_view.h index 60c8194..9459a8d 100644 --- a/src/devices/gui/register_view.h +++ b/src/devices/gui/register_view.h @@ -23,7 +23,7 @@ enum { PortBitRtti = 1000, RegisterRtti = 1001 }; class PortBitListViewItem : public KListViewItem { public: - PortBitListViewItem(uint address, uint bit, KListViewItem *tqparent); + PortBitListViewItem(uint address, uint bit, KListViewItem *parent); virtual int rtti() const { return PortBitRtti; } void updateView(); TQString tooltip(int column) const; @@ -68,7 +68,7 @@ class LineEdit : public NumberLineEdit Q_OBJECT TQ_OBJECT public: - LineEdit(TQWidget *tqparent, const char *name = 0); + LineEdit(TQWidget *parent, const char *name = 0); void setValue(NumberBase base, BitValue value, uint nbChars); BitValue value() const { return _value; } @@ -94,7 +94,7 @@ class View : public TQFrame, public GenericView Q_OBJECT TQ_OBJECT public: - View(TQWidget *tqparent, const char *name); + View(TQWidget *parent, const char *name); signals: void readSignal(uint address); diff --git a/src/devices/mem24/gui/mem24_group_ui.cpp b/src/devices/mem24/gui/mem24_group_ui.cpp index 8a8bb5a..3cdf9e0 100644 --- a/src/devices/mem24/gui/mem24_group_ui.cpp +++ b/src/devices/mem24/gui/mem24_group_ui.cpp @@ -10,7 +10,7 @@ #include "mem24_hex_view.h" -Device::HexView *Mem24::GroupUI::createHexView(const HexEditor &editor, TQWidget *tqparent) const +Device::HexView *Mem24::GroupUI::createHexView(const HexEditor &editor, TQWidget *parent) const { - return new HexView(editor, tqparent); + return new HexView(editor, parent); } diff --git a/src/devices/mem24/gui/mem24_group_ui.h b/src/devices/mem24/gui/mem24_group_ui.h index c2b3360..7f1f4c8 100644 --- a/src/devices/mem24/gui/mem24_group_ui.h +++ b/src/devices/mem24/gui/mem24_group_ui.h @@ -16,7 +16,7 @@ namespace Mem24 class GroupUI : public Device::GroupUI { public: - virtual Device::HexView *createHexView(const HexEditor &editor, TQWidget *tqparent) const; + virtual Device::HexView *createHexView(const HexEditor &editor, TQWidget *parent) const; virtual Register::View *createRegisterView(TQWidget *) const { return 0; } virtual Device::MemoryEditor *createConfigEditor(Device::Memory &, TQWidget *) const { return 0; } virtual void fillWatchListContainer(ListContainer *, TQValueVector<Register::TypeData> &) const {} diff --git a/src/devices/mem24/gui/mem24_hex_view.cpp b/src/devices/mem24/gui/mem24_hex_view.cpp index 7c30e9f..349e2fc 100644 --- a/src/devices/mem24/gui/mem24_hex_view.cpp +++ b/src/devices/mem24/gui/mem24_hex_view.cpp @@ -14,8 +14,8 @@ #include "mem24_memory_editor.h" -Mem24::HexView::HexView(const HexEditor &editor, TQWidget *tqparent) - : Device::HexView(editor, tqparent, "mem24_hex_view") +Mem24::HexView::HexView(const HexEditor &editor, TQWidget *parent) + : Device::HexView(editor, parent, "mem24_hex_view") {} void Mem24::HexView::display() diff --git a/src/devices/mem24/gui/mem24_hex_view.h b/src/devices/mem24/gui/mem24_hex_view.h index 199865a..6de6ca0 100644 --- a/src/devices/mem24/gui/mem24_hex_view.h +++ b/src/devices/mem24/gui/mem24_hex_view.h @@ -21,7 +21,7 @@ class HexView : public Device::HexView Q_OBJECT TQ_OBJECT public: - HexView(const HexEditor &editor, TQWidget *tqparent); + HexView(const HexEditor &editor, TQWidget *parent); virtual uint nbChecksumChars() const { return 4; } virtual BitValue checksum() const; diff --git a/src/devices/mem24/gui/mem24_memory_editor.cpp b/src/devices/mem24/gui/mem24_memory_editor.cpp index a5203b9..c395b17 100644 --- a/src/devices/mem24/gui/mem24_memory_editor.cpp +++ b/src/devices/mem24/gui/mem24_memory_editor.cpp @@ -19,19 +19,19 @@ #include "devices/base/device_group.h" //----------------------------------------------------------------------------- -Mem24::MemoryRangeEditor::MemoryRangeEditor(Memory &memory, TQWidget *tqparent) - : Device::MemoryRangeEditor(memory, 16, 16, 0, -1, tqparent, "mem24_memory_range_editor"), +Mem24::MemoryRangeEditor::MemoryRangeEditor(Memory &memory, TQWidget *parent) + : Device::MemoryRangeEditor(memory, 16, 16, 0, -1, parent, "mem24_memory_range_editor"), MemoryCaster(memory) {} -Device::HexWordEditor *Mem24::MemoryRangeEditor::createHexWordEditor(TQWidget *tqparent) +Device::HexWordEditor *Mem24::MemoryRangeEditor::createHexWordEditor(TQWidget *parent) { - return new HexWordEditor(memory(), tqparent); + return new HexWordEditor(memory(), parent); } //----------------------------------------------------------------------------- -Mem24::MemoryTypeEditor::MemoryTypeEditor(const HexView *hexview, Memory &memory, TQWidget *tqparent) - : Device::MemoryTypeEditor(hexview, memory, tqparent, "mem24_memory_type_editor"), +Mem24::MemoryTypeEditor::MemoryTypeEditor(const HexView *hexview, Memory &memory, TQWidget *parent) + : Device::MemoryTypeEditor(hexview, memory, parent, "mem24_memory_type_editor"), MemoryCaster(memory) {} diff --git a/src/devices/mem24/gui/mem24_memory_editor.h b/src/devices/mem24/gui/mem24_memory_editor.h index 657810a..47916a4 100644 --- a/src/devices/mem24/gui/mem24_memory_editor.h +++ b/src/devices/mem24/gui/mem24_memory_editor.h @@ -36,11 +36,11 @@ class HexWordEditor : public Device::HexWordEditor, public MemoryCaster Q_OBJECT TQ_OBJECT public: - HexWordEditor(Memory &memory, TQWidget *tqparent) - : Device::HexWordEditor(memory, 2, tqparent), MemoryCaster(memory) {} + HexWordEditor(Memory &memory, TQWidget *parent) + : Device::HexWordEditor(memory, 2, parent), MemoryCaster(memory) {} private: - virtual BitValue tqmask() const { return 0xFF; } + virtual BitValue mask() const { return 0xFF; } virtual BitValue normalizeWord(BitValue value) const { return value; } virtual BitValue word() const { return memory().byte(_offset); } virtual void setWord(BitValue value) { memory().setByte(_offset, value); } @@ -52,13 +52,13 @@ class MemoryRangeEditor : public Device::MemoryRangeEditor, public MemoryCaster Q_OBJECT TQ_OBJECT public: - MemoryRangeEditor(Memory &memory, TQWidget *tqparent); + MemoryRangeEditor(Memory &memory, TQWidget *parent); private: virtual uint nbWords() const { return device().nbBytes(); } virtual uint addressIncrement() const { return 1; } virtual Address startAddress() const { return 0x0; } - virtual Device::HexWordEditor *createHexWordEditor(TQWidget *tqparent); + virtual Device::HexWordEditor *createHexWordEditor(TQWidget *parent); virtual bool isRangeReadOnly() const { return false; } }; @@ -68,7 +68,7 @@ class MemoryTypeEditor : public Device::MemoryTypeEditor, public MemoryCaster Q_OBJECT TQ_OBJECT public: - MemoryTypeEditor(const HexView *hexview, Memory &memory, TQWidget *tqparent); + MemoryTypeEditor(const HexView *hexview, Memory &memory, TQWidget *parent); virtual void init(bool first); private: diff --git a/src/devices/mem24/mem24/mem24_memory.cpp b/src/devices/mem24/mem24/mem24_memory.cpp index a29cee7..f3ce758 100644 --- a/src/devices/mem24/mem24/mem24_memory.cpp +++ b/src/devices/mem24/mem24/mem24_memory.cpp @@ -76,17 +76,17 @@ HexBuffer Mem24::Memory::toHexBuffer() const void Mem24::Memory::fromHexBuffer(const HexBuffer &hb, WarningTypes &result, TQStringList &warnings, TQMap<uint, bool> &inRange) { - BitValue tqmask = 0xFF; + BitValue mask = 0xFF; for (uint k=0; k<device().nbBytes(); k++) { _data[k] = hb[k]; if ( _data[k].isInitialized() ) { inRange[k] = true; - if ( !(result & ValueTooLarge) && !_data[k].isInside(tqmask) ) { + if ( !(result & ValueTooLarge) && !_data[k].isInside(mask) ) { result |= ValueTooLarge; - warnings += i18n("At least one word (at offset %1) is larger (%2) than the corresponding tqmask (%3).") - .tqarg(toHexLabel(k, 8)).tqarg(toHexLabel(_data[k], 8)).tqarg(toHexLabel(tqmask, 8)); + warnings += i18n("At least one word (at offset %1) is larger (%2) than the corresponding mask (%3).") + .tqarg(toHexLabel(k, 8)).tqarg(toHexLabel(_data[k], 8)).tqarg(toHexLabel(mask, 8)); } - _data[k] = _data[k].maskWith(tqmask); + _data[k] = _data[k].maskWith(mask); } } } diff --git a/src/devices/pic/base/pic.cpp b/src/devices/pic/base/pic.cpp index e9df77e..94267e2 100644 --- a/src/devices/pic/base/pic.cpp +++ b/src/devices/pic/base/pic.cpp @@ -235,7 +235,7 @@ bool Pic::Data::checkCalibration(const Device::Array &data, TQString *message) c Q_ASSERT( nbWords(MemoryRangeType::Cal)==data.count() ); for (uint i=0; i<data.count(); i++) { TQString address = toHexLabel(range(MemoryRangeType::Cal).start + i*addressIncrement(MemoryRangeType::Cal), nbCharsAddress()); - if ( data[i]==tqmask(MemoryRangeType::Cal) ) { + if ( data[i]==mask(MemoryRangeType::Cal) ) { if (message) *message = i18n("Calibration word at address %1 is blank.").tqarg(address); return false; } diff --git a/src/devices/pic/base/pic.h b/src/devices/pic/base/pic.h index 17fb96a..4005bae 100644 --- a/src/devices/pic/base/pic.h +++ b/src/devices/pic/base/pic.h @@ -121,7 +121,7 @@ public: uint nbBitsWord(MemoryRangeType type) const { return _architecture.data().nbBits[type.type()]; } uint nbBytesWord(MemoryRangeType type) const { return nbBitsToNbBytes(nbBitsWord(type)); } uint nbCharsWord(MemoryRangeType type) const { return nbBitsToNbChars(nbBitsWord(type)); } - BitValue tqmask(MemoryRangeType type) const { return uint(1 << nbBitsWord(type))-1; } + BitValue mask(MemoryRangeType type) const { return uint(1 << nbBitsWord(type))-1; } BitValue userIdRecommendedMask() const { return _userIdRecommendedMask; } const Config &config() const { return *_config; } Architecture architecture() const { return _architecture; } 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; } diff --git a/src/devices/pic/base/pic_config.h b/src/devices/pic/base/pic_config.h index 6e13210..77a5be8 100644 --- a/src/devices/pic/base/pic_config.h +++ b/src/devices/pic/base/pic_config.h @@ -48,7 +48,7 @@ public: public: TQString name; TQStringList ignoredCNames; - BitValue wtqmask, ptqmask, ctqmask; // write, protected, and checksum bits masks + BitValue wmask, pmask, cmask; // write, protected, and checksum bits masks BitValue bvalue; // blank value TQValueVector<Mask> masks; // ordered from lower to higher BitValue usedMask() const; @@ -59,12 +59,12 @@ public: TQValueVector<Word> _words; const Protection &protection() const { return _protection; } - const Value *findValue(const TQString &tqmask, const TQString &value) const; - const Mask *findMask(const TQString &tqmask, uint *wordIndex = 0) const; - static bool hasMaskName(const TQString &tqmask); - static TQString maskLabel(const TQString &tqmask); - bool checkValueName(const TQString &tqmask, const TQString &name) const; - static TQString valueLabel(const TQString &tqmask, const TQString &name); + const Value *findValue(const TQString &mask, const TQString &value) const; + const Mask *findMask(const TQString &mask, uint *wordIndex = 0) const; + static bool hasMaskName(const TQString &mask); + static TQString maskLabel(const TQString &mask); + bool checkValueName(const TQString &mask, const TQString &name) const; + static TQString valueLabel(const TQString &mask, const TQString &name); private: class MapData { @@ -74,7 +74,7 @@ private: int index, block; }; static TQMap<TQString, MapData> &masks(); - static TQMap<TQString, MapData> *_masks; // tqmask name -> index in DATA + static TQMap<TQString, MapData> *_masks; // mask name -> index in DATA struct NameData { const char *name, *label; @@ -82,7 +82,7 @@ private: enum Type { Fixed, ValueDouble, ValueUInt, Ratio, MemoryRange, Toggle, Pin, Pins }; class Data { public: - const NameData tqmask; + const NameData mask; Type type; const NameData values[50]; }; @@ -95,8 +95,8 @@ private: TQDataStream &operator <<(TQDataStream &s, const Config::Value &value); TQDataStream &operator >>(TQDataStream &s, Config::Value &value); -TQDataStream &operator <<(TQDataStream &s, const Config::Mask &tqmask); -TQDataStream &operator >>(TQDataStream &s, Config::Mask &tqmask); +TQDataStream &operator <<(TQDataStream &s, const Config::Mask &mask); +TQDataStream &operator >>(TQDataStream &s, Config::Mask &mask); TQDataStream &operator <<(TQDataStream &s, const Config::Word &word); TQDataStream &operator >>(TQDataStream &s, Config::Word &word); TQDataStream &operator <<(TQDataStream &s, const Config &config); diff --git a/src/devices/pic/base/pic_protection.cpp b/src/devices/pic/base/pic_protection.cpp index 4c08c45..d91f1f7 100644 --- a/src/devices/pic/base/pic_protection.cpp +++ b/src/devices/pic/base/pic_protection.cpp @@ -29,9 +29,9 @@ bool Pic::Protection::isAllProtectedValueName(const TQString &name) const Pic::Protection::Family Pic::Protection::family() const { if ( _config.findMask("WRTBS") ) return CodeGuard; - TQString tqmask = maskName(ProgramProtected, MemoryRangeType::Code); - if ( _config.findMask(TQString("%1_%2").tqarg(tqmask).tqarg(0)) ) return BlockProtection; - if ( _config.findMask(tqmask) ) return BasicProtection; + TQString mask = maskName(ProgramProtected, MemoryRangeType::Code); + if ( _config.findMask(TQString("%1_%2").tqarg(mask).tqarg(0)) ) return BlockProtection; + if ( _config.findMask(mask) ) return BasicProtection; return NoProtection; } @@ -165,11 +165,11 @@ AddressRangeVector Pic::Protection::extractRanges(const TQString &name, MemoryRa return rv; } -bool Pic::Protection::checkRange(const TQString &tqmask, const TQString &name) const +bool Pic::Protection::checkRange(const TQString &mask, const TQString &name) const { if ( family()!=CodeGuard ) { bool ok; - (void)extractRange(tqmask, name, ok); + (void)extractRange(mask, name, ok); return ok; } @@ -181,7 +181,7 @@ bool Pic::Protection::checkRange(const TQString &tqmask, const TQString &name) c block = i - 1; for (uint k=0; k<Nb_Types; k++) { TQString mname = (isBootBlock ? bootMaskName(Type(k)) : blockMaskName(Type(k), block)); - if ( tqmask!=mname ) continue; + if ( mask!=mname ) continue; ptype = Type(k); break; } @@ -195,15 +195,15 @@ bool Pic::Protection::checkRange(const TQString &tqmask, const TQString &name) c return true; } -Pic::Protection::ProtectedRange Pic::Protection::extractRange(const TQString &tqmask, const TQString &name, bool &ok) const +Pic::Protection::ProtectedRange Pic::Protection::extractRange(const TQString &mask, const TQString &name, bool &ok) const { Q_ASSERT( family()!=CodeGuard ); - //qDebug("extract range %s %s", tqmask.latin1(), name.latin1()); + //qDebug("extract range %s %s", mask.latin1(), name.latin1()); ProtectedRange pr; ok = false; TQRegExp rexp("([A-Z]+)(?:_([0-9])|)"); - if ( !rexp.exactMatch(tqmask) ) { + if ( !rexp.exactMatch(mask) ) { qDebug("Malformed block range"); return pr; } @@ -239,24 +239,24 @@ Pic::Protection::ProtectedRange Pic::Protection::extractRange(const TQString &tq return pr; } - const Config::Mask *btqmask = _config.findMask(bootMaskName(ptype)); - const Config::Mask *bstqmask = _config.findMask(bootSizeMaskName()); + const Config::Mask *bmask = _config.findMask(bootMaskName(ptype)); + const Config::Mask *bsmask = _config.findMask(bootSizeMaskName()); const MemoryRangeData &rdata = _data.range(rtype); if ( isAllProtectedValueName(name) ) { - if ( rtype==MemoryRangeType::Code && !isBootBlock && btqmask ) { + if ( rtype==MemoryRangeType::Code && !isBootBlock && bmask ) { qDebug("Protected range should be explicit with boot block"); return pr; } if (isBootBlock) { - if ( bstqmask==0 ) { + if ( bsmask==0 ) { qDebug("Protected range should be explicit when boot size not present"); return pr; } Address start = _data.range(MemoryRangeType::Code).start; pr.starts.append(start); - for (uint k=0; k<uint(bstqmask->values.count()); k++) { + for (uint k=0; k<uint(bsmask->values.count()); k++) { bool ok1; - uint size = bstqmask->values[k].name.toUInt(&ok1); + uint size = bsmask->values[k].name.toUInt(&ok1); if ( !ok1 ) { qDebug("Could not recognize boot size value"); return pr; @@ -277,7 +277,7 @@ Pic::Protection::ProtectedRange Pic::Protection::extractRange(const TQString &tq ok = true; return pr; } - if ( isBootBlock && bstqmask ) { + if ( isBootBlock && bsmask ) { qDebug("Protected range should not be explicit when boot size is present"); return pr; } @@ -294,7 +294,7 @@ Pic::Protection::ProtectedRange Pic::Protection::extractRange(const TQString &tq qDebug("End is beyond memory range"); return pr; } - if ( (rtype!=MemoryRangeType::Code || isBootBlock) && (pr.starts.count()>1 || !rexp.cap(2).isEmpty() || btqmask==0) ) { + if ( (rtype!=MemoryRangeType::Code || isBootBlock) && (pr.starts.count()>1 || !rexp.cap(2).isEmpty() || bmask==0) ) { qDebug("Only code with blocks and boot can have multiple protected ranges"); return pr; } @@ -306,14 +306,14 @@ Pic::Protection::ProtectedRange Pic::Protection::extractRange(const TQString &tq // check with boot block if ( pr.starts.count()>1 ) { - if ( btqmask==0 ) { - qDebug("No boot tqmask"); + if ( bmask==0 ) { + qDebug("No boot mask"); return pr; } - for (uint i=0; i<uint(btqmask->values.count()); i++) { - if ( btqmask->values[i].name=="Off" ) continue; + for (uint i=0; i<uint(bmask->values.count()); i++) { + if ( bmask->values[i].name=="Off" ) continue; bool ok1; - ProtectedRange bpr = extractRange(btqmask->name, btqmask->values[i].name, ok1); + ProtectedRange bpr = extractRange(bmask->name, bmask->values[i].name, ok1); if ( !ok1 ) return pr; if ( bpr.ends.count()!=pr.starts.count() ) { qDebug("Boot number of ends (%i) should be the same as code number of starts (%i)", int(bpr.ends.count()), int(pr.starts.count())); diff --git a/src/devices/pic/base/pic_protection.h b/src/devices/pic/base/pic_protection.h index 86712f9..75d0032 100644 --- a/src/devices/pic/base/pic_protection.h +++ b/src/devices/pic/base/pic_protection.h @@ -37,7 +37,7 @@ public: TQString blockMaskName(Type ptype, uint i) const; TQString blockLabel(uint i) const; AddressRangeVector extractRanges(const TQString &name, MemoryRangeType type) const; - bool checkRange(const TQString &tqmask, const TQString &name) const; + bool checkRange(const TQString &mask, const TQString &name) const; TQString maskName(Type type, MemoryRangeType mtype) const; bool isAllProtectedValueName(const TQString &valueName) const; bool isNoneProtectedValueName(const TQString &valueName) const; @@ -52,7 +52,7 @@ private: public: TQValueVector<Address> starts, ends; }; - ProtectedRange extractRange(const TQString &tqmask, const TQString &name, bool &ok) const; + ProtectedRange extractRange(const TQString &mask, const TQString &name, bool &ok) const; }; } //namespace diff --git a/src/devices/pic/gui/pic_config_editor.cpp b/src/devices/pic/gui/pic_config_editor.cpp index 37917c7..4b70c3d 100644 --- a/src/devices/pic/gui/pic_config_editor.cpp +++ b/src/devices/pic/gui/pic_config_editor.cpp @@ -17,8 +17,8 @@ #include "common/gui/misc_gui.h" //---------------------------------------------------------------------------- -Pic::MemoryConfigEditorWidget::MemoryConfigEditorWidget(Memory &memory, bool withWordEditor, TQWidget *tqparent) - : Device::MemoryEditorGroup(&memory, tqparent, "pic_config_editor_widget"), +Pic::MemoryConfigEditorWidget::MemoryConfigEditorWidget(Memory &memory, bool withWordEditor, TQWidget *parent) + : Device::MemoryEditorGroup(&memory, parent, "pic_config_editor_widget"), MemoryCaster(MemoryRangeType::Config, memory) { TQHBoxLayout *hb = new TQHBoxLayout(_top); @@ -55,8 +55,8 @@ Pic::MemoryConfigEditorWidget::MemoryConfigEditorWidget(Memory &memory, bool wit } //---------------------------------------------------------------------------- -Pic::MemoryConfigEditor::MemoryConfigEditor(const HexView *hexview, Memory &memory, TQWidget *tqparent) - : MemoryTypeEditor(hexview, MemoryRangeType::Config, memory, tqparent, "pic_config_editor") +Pic::MemoryConfigEditor::MemoryConfigEditor(const HexView *hexview, Memory &memory, TQWidget *parent) + : MemoryTypeEditor(hexview, MemoryRangeType::Config, memory, parent, "pic_config_editor") {} void Pic::MemoryConfigEditor::init(bool first) diff --git a/src/devices/pic/gui/pic_config_editor.h b/src/devices/pic/gui/pic_config_editor.h index d8072ca..045ca4d 100644 --- a/src/devices/pic/gui/pic_config_editor.h +++ b/src/devices/pic/gui/pic_config_editor.h @@ -21,7 +21,7 @@ class MemoryConfigEditorWidget : public Device::MemoryEditorGroup, public Memory Q_OBJECT TQ_OBJECT public: - MemoryConfigEditorWidget(Memory &memory, bool withWordEditor, TQWidget *tqparent); + MemoryConfigEditorWidget(Memory &memory, bool withWordEditor, TQWidget *parent); }; //---------------------------------------------------------------------------- @@ -30,7 +30,7 @@ class MemoryConfigEditor : public MemoryTypeEditor Q_OBJECT TQ_OBJECT public: - MemoryConfigEditor(const HexView *hexview, Memory &memory, TQWidget *tqparent); + MemoryConfigEditor(const HexView *hexview, Memory &memory, TQWidget *parent); virtual void init(bool first); }; diff --git a/src/devices/pic/gui/pic_config_word_editor.cpp b/src/devices/pic/gui/pic_config_word_editor.cpp index 82b24b7..67c5cc9 100644 --- a/src/devices/pic/gui/pic_config_word_editor.cpp +++ b/src/devices/pic/gui/pic_config_word_editor.cpp @@ -18,8 +18,8 @@ #include "common/gui/misc_gui.h" //---------------------------------------------------------------------------- -Pic::ConfigWordComboBox::ConfigWordComboBox(TQWidget *tqparent) - : ComboBox(tqparent) +Pic::ConfigWordComboBox::ConfigWordComboBox(TQWidget *parent) + : ComboBox(parent) { setIgnoreWheelEvent(true); } @@ -47,8 +47,8 @@ void Pic::ConfigWordComboBox::setInvalidItem(uint i, const TQString &label) } //---------------------------------------------------------------------------- -Pic::ConfigWordDialog::ConfigWordDialog(const Memory &memory, uint ci, TQWidget *tqparent) - : Dialog(tqparent, "config_word_dialog", true, i18n("Config Word Details"), Close, Close, false) +Pic::ConfigWordDialog::ConfigWordDialog(const Memory &memory, uint ci, TQWidget *parent) + : Dialog(parent, "config_word_dialog", true, i18n("Config Word Details"), Close, Close, false) { uint nbChars = memory.device().nbCharsWord(MemoryRangeType::Config); const Config::Word &cword = memory.device().config()._words[ci]; @@ -87,24 +87,24 @@ Pic::ConfigWordDialog::ConfigWordDialog(const Memory &memory, uint ci, TQWidget row++; label = new TQLabel(i18n("Write Mask:"), mainWidget()); grid->addWidget(label, row, 0); - label = new TQLabel(toHexLabel(cword.wtqmask, nbChars), mainWidget()); + label = new TQLabel(toHexLabel(cword.wmask, nbChars), mainWidget()); grid->addWidget(label, row, 1); row++; label = new TQLabel(i18n("Protected Mask:"), mainWidget()); grid->addWidget(label, row, 0); - label = new TQLabel(toHexLabel(cword.ptqmask, nbChars), mainWidget()); + label = new TQLabel(toHexLabel(cword.pmask, nbChars), mainWidget()); grid->addWidget(label, row, 1); row++; label = new TQLabel(i18n("Checksum Mask:"), mainWidget()); grid->addWidget(label, row, 0); - label = new TQLabel(toHexLabel(cword.ctqmask, nbChars), mainWidget()); + label = new TQLabel(toHexLabel(cword.cmask, nbChars), mainWidget()); grid->addWidget(label, row, 1); row++; } //---------------------------------------------------------------------------- -Pic::ConfigWordEditor::ConfigWordEditor(Memory &memory, uint ci, bool withWordEditor, TQWidget *tqparent) - : MemoryEditor(MemoryRangeType::Config, memory, tqparent, "pic_config_word_editor"), _configIndex(ci) +Pic::ConfigWordEditor::ConfigWordEditor(Memory &memory, uint ci, bool withWordEditor, TQWidget *parent) + : MemoryEditor(MemoryRangeType::Config, memory, parent, "pic_config_word_editor"), _configIndex(ci) { if (withWordEditor) { TQHBoxLayout *hbox = new TQHBoxLayout(_top); @@ -126,16 +126,16 @@ Pic::ConfigWordEditor::ConfigWordEditor(Memory &memory, uint ci, bool withWordEd _combos.resize(cword.masks.count()); uint nbChars = device().nbCharsWord(MemoryRangeType::Config); for (uint k=0; k<_combos.count(); k++) { - const Config::Mask &ctqmask = cword.masks[k]; - TQLabel *label = new TQLabel(Config::maskLabel(ctqmask.name) + ":", this); + const Config::Mask &cmask = cword.masks[k]; + TQLabel *label = new TQLabel(Config::maskLabel(cmask.name) + ":", this); grid->addWidget(label, k, 0); - label = new TQLabel(ctqmask.name, this); + label = new TQLabel(cmask.name, this); grid->addWidget(label, k, 1); _combos[k] = new ConfigWordComboBox(this); - for (uint i=0; i<ctqmask.values.count(); i++) { - if ( !ctqmask.values[i].isValid() ) continue; - TQString label = Config::valueLabel(ctqmask.name, ctqmask.values[i].name); - label += " (" + toHexLabel(ctqmask.values[i].value, nbChars) + ")"; + for (uint i=0; i<cmask.values.count(); i++) { + if ( !cmask.values[i].isValid() ) continue; + TQString label = Config::valueLabel(cmask.name, cmask.values[i].name); + label += " (" + toHexLabel(cmask.values[i].value, nbChars) + ")"; _combos[k]->appendItem(label, i); } connect(_combos[k], TQT_SIGNAL(activated(int)), TQT_SLOT(slotModified())); @@ -148,8 +148,8 @@ void Pic::ConfigWordEditor::setReadOnly(bool readOnly) if (_mdb) _mdb->setReadOnly(readOnly); const Config::Word &cword = device().config()._words[_configIndex]; for (uint k=0; k<_combos.count(); k++) { - const Config::Mask &ctqmask = cword.masks[k]; - _combos[k]->setEnabled(!readOnly && !ctqmask.value.isOverlapping(cword.ptqmask) && ctqmask.values.count()!=1); + const Config::Mask &cmask = cword.masks[k]; + _combos[k]->setEnabled(!readOnly && !cmask.value.isOverlapping(cword.pmask) && cmask.values.count()!=1); } } @@ -158,9 +158,9 @@ void Pic::ConfigWordEditor::slotModified() BitValue v = memory().word(MemoryRangeType::Config, _configIndex); //qDebug("BinWordEditor::slotModified %i: %s", _configIndex, toHex(v, 4).data()); for (uint k=0; k<_combos.count(); k++) { - const Config::Mask &ctqmask = device().config()._words[_configIndex].masks[k]; - v = v.clearMaskBits(ctqmask.value); - v |= ctqmask.values[_combos[k]->index()].value; // set value + const Config::Mask &cmask = device().config()._words[_configIndex].masks[k]; + v = v.clearMaskBits(cmask.value); + v |= cmask.values[_combos[k]->index()].value; // set value } memory().setWord(MemoryRangeType::Config, _configIndex, v); //qDebug(" now: %s", toHex(v, 4).data()); @@ -174,12 +174,12 @@ void Pic::ConfigWordEditor::updateDisplay() uint nbChars = device().nbCharsWord(MemoryRangeType::Config); //qDebug("BinWordEditor::updateDisplay %i: %s", _configIndex, toHex(v, 4).data()); for (uint k=0; k<_combos.count(); k++) { - const Config::Mask &ctqmask = device().config()._words[_configIndex].masks[k]; - for (int i=ctqmask.values.count()-1; i>=0; i--) { - if ( ctqmask.values[i].value.isInside(v) ) { - if ( ctqmask.values[i].isValid() ) _combos[k]->setItem(i); + const Config::Mask &cmask = device().config()._words[_configIndex].masks[k]; + for (int i=cmask.values.count()-1; i>=0; i--) { + if ( cmask.values[i].value.isInside(v) ) { + if ( cmask.values[i].isValid() ) _combos[k]->setItem(i); else { - TQString label = i18n("<invalid>") + " (" + toHexLabel(ctqmask.values[i].value, nbChars) + ")"; + TQString label = i18n("<invalid>") + " (" + toHexLabel(cmask.values[i].value, nbChars) + ")"; _combos[k]->setInvalidItem(i, label); } break; diff --git a/src/devices/pic/gui/pic_config_word_editor.h b/src/devices/pic/gui/pic_config_word_editor.h index 1b4077b..38f9573 100644 --- a/src/devices/pic/gui/pic_config_word_editor.h +++ b/src/devices/pic/gui/pic_config_word_editor.h @@ -24,7 +24,7 @@ class ConfigWordDialog : public Dialog Q_OBJECT TQ_OBJECT public: - ConfigWordDialog(const Memory &memory, uint index, TQWidget *tqparent); + ConfigWordDialog(const Memory &memory, uint index, TQWidget *parent); }; //---------------------------------------------------------------------------- @@ -33,7 +33,7 @@ class ConfigWordComboBox : public ComboBox Q_OBJECT TQ_OBJECT public: - ConfigWordComboBox(TQWidget *tqparent); + ConfigWordComboBox(TQWidget *parent); void appendItem(const TQString &text, uint index) { insertItem(text); _map.append(index); } uint index() const; void setItem(uint index); @@ -52,7 +52,7 @@ class ConfigWordEditor : public MemoryEditor Q_OBJECT TQ_OBJECT public: - ConfigWordEditor(Memory &memory, uint index, bool withWordEditor, TQWidget *tqparent); + ConfigWordEditor(Memory &memory, uint index, bool withWordEditor, TQWidget *parent); virtual void setReadOnly(bool readOnly); public slots: diff --git a/src/devices/pic/gui/pic_group_ui.cpp b/src/devices/pic/gui/pic_group_ui.cpp index 5483ee4..fa4aa56 100644 --- a/src/devices/pic/gui/pic_group_ui.cpp +++ b/src/devices/pic/gui/pic_group_ui.cpp @@ -18,19 +18,19 @@ #include "libgui/gui_debug_manager.h" #include "common/gui/list_container.h" -Device::HexView *Pic::GroupUI::createHexView(const HexEditor &editor, TQWidget *tqparent) const +Device::HexView *Pic::GroupUI::createHexView(const HexEditor &editor, TQWidget *parent) const { - return new HexView(editor, tqparent); + return new HexView(editor, parent); } -Register::View *Pic::GroupUI::createRegisterView(TQWidget *tqparent) const +Register::View *Pic::GroupUI::createRegisterView(TQWidget *parent) const { - return new RegisterView(tqparent); + return new RegisterView(parent); } -Device::MemoryEditor *Pic::GroupUI::createConfigEditor(Device::Memory &memory, TQWidget *tqparent) const +Device::MemoryEditor *Pic::GroupUI::createConfigEditor(Device::Memory &memory, TQWidget *parent) const { - return new MemoryConfigEditorWidget(static_cast<Memory &>(memory), false, tqparent); + return new MemoryConfigEditorWidget(static_cast<Memory &>(memory), false, parent); } void Pic::GroupUI::fillWatchListContainer(ListContainer *container, TQValueVector<Register::TypeData> &ids) const @@ -81,7 +81,7 @@ void Pic::GroupUI::fillWatchListContainer(ListContainer *container, TQValueVecto } } -Register::ListViewItem *Pic::GroupUI::createWatchItem(const Register::TypeData &data, KListViewItem *tqparent) const +Register::ListViewItem *Pic::GroupUI::createWatchItem(const Register::TypeData &data, KListViewItem *parent) const { - return new Pic::RegisterListViewItem(data, tqparent); + return new Pic::RegisterListViewItem(data, parent); } diff --git a/src/devices/pic/gui/pic_group_ui.h b/src/devices/pic/gui/pic_group_ui.h index ac97f22..d5dba86 100644 --- a/src/devices/pic/gui/pic_group_ui.h +++ b/src/devices/pic/gui/pic_group_ui.h @@ -17,11 +17,11 @@ namespace Pic class GroupUI : public Device::GroupUI { public: - virtual Device::HexView *createHexView(const HexEditor &editor, TQWidget *tqparent) const; - virtual Register::View *createRegisterView(TQWidget *tqparent) const; - virtual Device::MemoryEditor *createConfigEditor(Device::Memory &memory, TQWidget *tqparent) const; + virtual Device::HexView *createHexView(const HexEditor &editor, TQWidget *parent) const; + virtual Register::View *createRegisterView(TQWidget *parent) const; + virtual Device::MemoryEditor *createConfigEditor(Device::Memory &memory, TQWidget *parent) const; virtual void fillWatchListContainer(ListContainer *container, TQValueVector<Register::TypeData> &ids) const; - virtual Register::ListViewItem *createWatchItem(const Register::TypeData &data, KListViewItem *tqparent) const; + virtual Register::ListViewItem *createWatchItem(const Register::TypeData &data, KListViewItem *parent) const; }; } // namespace diff --git a/src/devices/pic/gui/pic_hex_view.cpp b/src/devices/pic/gui/pic_hex_view.cpp index 760b1ed..bbcc161 100644 --- a/src/devices/pic/gui/pic_hex_view.cpp +++ b/src/devices/pic/gui/pic_hex_view.cpp @@ -17,8 +17,8 @@ #include "pic_memory_editor.h" #include "pic_config_editor.h" -Pic::HexView::HexView(const HexEditor &editor, TQWidget *tqparent) - : Device::HexView(editor, tqparent, "pic_hex_view") +Pic::HexView::HexView(const HexEditor &editor, TQWidget *parent) + : Device::HexView(editor, parent, "pic_hex_view") {} const Pic::MemoryRangeType::Type Pic::HexView::MEMORY_DATA[] = { diff --git a/src/devices/pic/gui/pic_hex_view.h b/src/devices/pic/gui/pic_hex_view.h index 54b679d..c3a53f8 100644 --- a/src/devices/pic/gui/pic_hex_view.h +++ b/src/devices/pic/gui/pic_hex_view.h @@ -23,7 +23,7 @@ class HexView : public Device::HexView Q_OBJECT TQ_OBJECT public: - HexView(const HexEditor &editor, TQWidget *tqparent); + HexView(const HexEditor &editor, TQWidget *parent); Memory *memory() { return static_cast<Memory *>(_memory); } const Memory *memory() const { return static_cast<Memory *>(_memory); } virtual uint nbChecksumChars() const { return 4; } diff --git a/src/devices/pic/gui/pic_memory_editor.cpp b/src/devices/pic/gui/pic_memory_editor.cpp index bb06f3d..a964988 100644 --- a/src/devices/pic/gui/pic_memory_editor.cpp +++ b/src/devices/pic/gui/pic_memory_editor.cpp @@ -34,17 +34,17 @@ #include "pic_hex_view.h" //----------------------------------------------------------------------------- -Pic::MemoryEditorLegend::Data::Data(const TQString &text, TQWidget *tqparent) +Pic::MemoryEditorLegend::Data::Data(const TQString &text, TQWidget *parent) { - button = new PopupButton(text, tqparent); + button = new PopupButton(text, parent); KActionCollection *ac = 0; - KAction *a = new KAction(i18n("Go to start"), "top", 0, TQT_TQOBJECT(tqparent), TQT_SLOT(gotoStart()), ac); + KAction *a = new KAction(i18n("Go to start"), "top", 0, TQT_TQOBJECT(parent), TQT_SLOT(gotoStart()), ac); actions.append(a); button->appendAction(a); - a = new KAction(i18n("Go to end"), "bottom", 0, TQT_TQOBJECT(tqparent), TQT_SLOT(gotoEnd()), ac); + a = new KAction(i18n("Go to end"), "bottom", 0, TQT_TQOBJECT(parent), TQT_SLOT(gotoEnd()), ac); actions.append(a); button->appendAction(a); - label = new TQLabel(tqparent); + label = new TQLabel(parent); } void Pic::MemoryEditorLegend::Data::setProtected(bool on) @@ -64,8 +64,8 @@ const char * const Pic::MemoryEditorLegend::BLOCK_COLORS[Protection::MAX_NB_BLOC "#88FF88", "#88FFFF", "#FFFF88", "#FF88FF", "#0088FF", "#88FF00", "#00FF88", "#FF8800" }; -Pic::MemoryEditorLegend::MemoryEditorLegend(MemoryRangeType type, Memory &memory, TQWidget *tqparent) - : MemoryEditor(type, memory, tqparent, "memory_displayer_legend") +Pic::MemoryEditorLegend::MemoryEditorLegend(MemoryRangeType type, Memory &memory, TQWidget *parent) + : MemoryEditor(type, memory, parent, "memory_displayer_legend") { TQGridLayout *grid = new TQGridLayout(_top); @@ -165,8 +165,8 @@ void Pic::MemoryEditorLegend::gotoEnd() //----------------------------------------------------------------------------- -Pic::HexWordEditor::HexWordEditor(MemoryRangeType type, Memory &memory, TQWidget *tqparent) - : Device::HexWordEditor(memory, memory.device().nbCharsWord(type), tqparent), +Pic::HexWordEditor::HexWordEditor(MemoryRangeType type, Memory &memory, TQWidget *parent) + : Device::HexWordEditor(memory, memory.device().nbCharsWord(type), parent), MemoryCaster(type, memory) {} @@ -174,7 +174,7 @@ void Pic::HexWordEditor::setWord(BitValue value) { if ( type()==MemoryRangeType::Config ) { const Config::Word &cword = device().config()._words[_offset]; - value |= cword.usedMask().complementInMask(device().tqmask(MemoryRangeType::Config)); + value |= cword.usedMask().complementInMask(device().mask(MemoryRangeType::Config)); } memory().setWord(type(), _offset, value); } @@ -182,8 +182,8 @@ void Pic::HexWordEditor::setWord(BitValue value) //----------------------------------------------------------------------------- Pic::MemoryRangeEditor::MemoryRangeEditor(MemoryRangeType type, Memory &memory, uint nbLines, uint nbCols, - uint wordOffset, int nbWords, TQWidget *tqparent) - : Device::MemoryRangeEditor(memory, nbLines, nbCols, wordOffset, nbWords, tqparent, "pic_memory_range_editor"), + uint wordOffset, int nbWords, TQWidget *parent) + : Device::MemoryRangeEditor(memory, nbLines, nbCols, wordOffset, nbWords, parent, "pic_memory_range_editor"), MemoryCaster(type, memory), _legend(0) { if ( type==MemoryRangeType::Code ) _blockRanges.resize(memory.device().config().protection().nbBlocks()); @@ -234,14 +234,14 @@ void Pic::MemoryRangeEditor::updateAddressColor(uint i, Address address) } } -Device::HexWordEditor *Pic::MemoryRangeEditor::createHexWordEditor(TQWidget *tqparent) +Device::HexWordEditor *Pic::MemoryRangeEditor::createHexWordEditor(TQWidget *parent) { - return new HexWordEditor(type(), memory(), tqparent); + return new HexWordEditor(type(), memory(), parent); } //----------------------------------------------------------------------------- -Pic::MemoryTypeEditor::MemoryTypeEditor(const HexView *hexview, MemoryRangeType type, Memory &memory, TQWidget *tqparent, const char *name) - : Device::MemoryTypeEditor(hexview, memory, tqparent, name), MemoryCaster(type, memory) +Pic::MemoryTypeEditor::MemoryTypeEditor(const HexView *hexview, MemoryRangeType type, Memory &memory, TQWidget *parent, const char *name) + : Device::MemoryTypeEditor(hexview, memory, parent, name), MemoryCaster(type, memory) {} void Pic::MemoryTypeEditor::init(bool first) @@ -251,10 +251,10 @@ void Pic::MemoryTypeEditor::init(bool first) uint nbChars = device().nbCharsWord(type()); TQString add; - if ( type()==MemoryRangeType::UserId ) add = i18n(" - recommended tqmask: %1").tqarg(toHexLabel(device().userIdRecommendedMask(), nbChars)); + if ( type()==MemoryRangeType::UserId ) add = i18n(" - recommended mask: %1").tqarg(toHexLabel(device().userIdRecommendedMask(), nbChars)); if ( type()==MemoryRangeType::Cal && _hexview ) add = i18n(" - not programmed by default"); - TQString comment = i18n("%1-bit words - tqmask: %2") - .tqarg(device().nbBitsWord(type())).tqarg(toHexLabel(device().tqmask(type()), nbChars)); + TQString comment = i18n("%1-bit words - mask: %2") + .tqarg(device().nbBitsWord(type())).tqarg(toHexLabel(device().mask(type()), nbChars)); _comment->setText(comment + add); } @@ -291,8 +291,8 @@ bool Pic::MemoryTypeEditor::internalDoAction(Device::Action action) } //----------------------------------------------------------------------------- -Pic::MemoryTypeRangeEditor::MemoryTypeRangeEditor(const HexView *hexview, MemoryRangeType type, Memory &memory, TQWidget *tqparent) - : MemoryTypeEditor(hexview, type, memory, tqparent, "pic_memory_type_range_editor"), _mre(0) +Pic::MemoryTypeRangeEditor::MemoryTypeRangeEditor(const HexView *hexview, MemoryRangeType type, Memory &memory, TQWidget *parent) + : MemoryTypeEditor(hexview, type, memory, parent, "pic_memory_type_range_editor"), _mre(0) {} void Pic::MemoryTypeRangeEditor::init(bool first) @@ -309,8 +309,8 @@ void Pic::MemoryTypeRangeEditor::init(bool first) } //----------------------------------------------------------------------------- -Pic::MemoryUserIdEditor::MemoryUserIdEditor(const HexView *hexview, Memory &memory, TQWidget *tqparent) - : MemoryTypeRangeEditor(hexview, MemoryRangeType::UserId, memory, tqparent), _saveReadOnly(false) +Pic::MemoryUserIdEditor::MemoryUserIdEditor(const HexView *hexview, Memory &memory, TQWidget *parent) + : MemoryTypeRangeEditor(hexview, MemoryRangeType::UserId, memory, parent), _saveReadOnly(false) {} void Pic::MemoryUserIdEditor::init(bool first) @@ -347,8 +347,8 @@ void Pic::MemoryUserIdEditor::setReadOnly(bool readOnly) } //----------------------------------------------------------------------------- -Pic::MemoryCalibrationEditor::MemoryCalibrationEditor(const HexView *hexview, Memory &memory, TQWidget *tqparent) - : MemoryTypeEditor(hexview, MemoryRangeType::Cal, memory, tqparent, "pic_memory_calibration_editor") +Pic::MemoryCalibrationEditor::MemoryCalibrationEditor(const HexView *hexview, Memory &memory, TQWidget *parent) + : MemoryTypeEditor(hexview, MemoryRangeType::Cal, memory, parent, "pic_memory_calibration_editor") {} void Pic::MemoryCalibrationEditor::init(bool first) diff --git a/src/devices/pic/gui/pic_memory_editor.h b/src/devices/pic/gui/pic_memory_editor.h index 2a6f72f..e641ec4 100644 --- a/src/devices/pic/gui/pic_memory_editor.h +++ b/src/devices/pic/gui/pic_memory_editor.h @@ -44,8 +44,8 @@ class MemoryEditor : public Device::MemoryEditor, public MemoryCaster Q_OBJECT TQ_OBJECT public: - MemoryEditor(MemoryRangeType type, Memory &memory, TQWidget *tqparent, const char *name) - : Device::MemoryEditor(&memory, tqparent, name), MemoryCaster(type, memory) {} + MemoryEditor(MemoryRangeType type, Memory &memory, TQWidget *parent, const char *name) + : Device::MemoryEditor(&memory, parent, name), MemoryCaster(type, memory) {} }; //----------------------------------------------------------------------------- @@ -54,7 +54,7 @@ class MemoryEditorLegend : public MemoryEditor Q_OBJECT TQ_OBJECT public: - MemoryEditorLegend(MemoryRangeType type, Memory &memory, TQWidget *tqparent); + MemoryEditorLegend(MemoryRangeType type, Memory &memory, TQWidget *parent); virtual void setReadOnly(bool) {} static TQColor protectedColor() { return TQColor("#FF8888"); } @@ -76,7 +76,7 @@ private: class Data { public: Data() : button(0), label(0) {} - Data(const TQString &text, TQWidget *tqparent); + Data(const TQString &text, TQWidget *parent); void setProtected(bool on); bool hasAction(const KAction *action) const; PopupButton *button; @@ -95,10 +95,10 @@ class HexWordEditor : public Device::HexWordEditor, public MemoryCaster Q_OBJECT TQ_OBJECT public: - HexWordEditor(MemoryRangeType type, Memory &memory, TQWidget *tqparent); + HexWordEditor(MemoryRangeType type, Memory &memory, TQWidget *parent); private: - virtual BitValue tqmask() const { return memory().device().tqmask(type()); } + virtual BitValue mask() const { return memory().device().mask(type()); } virtual BitValue normalizeWord(BitValue value) const { return memory().normalizeWord(type(), _offset, value); } virtual BitValue word() const { return memory().word(type(), _offset); } virtual void setWord(BitValue value); @@ -111,7 +111,7 @@ class MemoryRangeEditor : public Device::MemoryRangeEditor, public MemoryCaster TQ_OBJECT public: MemoryRangeEditor(MemoryRangeType type, Memory &memory, - uint nbLines, uint nbCols, uint wordOffset, int nbWords, TQWidget *tqparent); + uint nbLines, uint nbCols, uint wordOffset, int nbWords, TQWidget *parent); public slots: virtual void updateDisplay(); @@ -125,7 +125,7 @@ private: virtual uint nbWords() const { return device().nbWords(type()); } virtual uint addressIncrement() const { return device().addressIncrement(type()); } virtual Address startAddress() const { return device().range(type()).start; } - virtual Device::HexWordEditor *createHexWordEditor(TQWidget *tqparent); + virtual Device::HexWordEditor *createHexWordEditor(TQWidget *parent); virtual void updateAddressColor(uint i, Address address); virtual bool isRangeReadOnly() const; virtual void addLegend(TQVBoxLayout *vbox); @@ -137,7 +137,7 @@ class MemoryTypeEditor : public Device::MemoryTypeEditor, public MemoryCaster Q_OBJECT TQ_OBJECT public: - MemoryTypeEditor(const HexView *hexview, MemoryRangeType type, Memory &memory, TQWidget *tqparent, const char *name); + MemoryTypeEditor(const HexView *hexview, MemoryRangeType type, Memory &memory, TQWidget *parent, const char *name); virtual void init(bool first); private: @@ -150,7 +150,7 @@ class MemoryTypeRangeEditor : public MemoryTypeEditor Q_OBJECT TQ_OBJECT public: - MemoryTypeRangeEditor(const HexView *hexview, MemoryRangeType type, Memory &memory, TQWidget *tqparent); + MemoryTypeRangeEditor(const HexView *hexview, MemoryRangeType type, Memory &memory, TQWidget *parent); virtual void init(bool first); protected: @@ -163,7 +163,7 @@ class MemoryUserIdEditor : public MemoryTypeRangeEditor Q_OBJECT TQ_OBJECT public: - MemoryUserIdEditor(const HexView *hexview, Memory &memory, TQWidget *tqparent); + MemoryUserIdEditor(const HexView *hexview, Memory &memory, TQWidget *parent); virtual void init(bool first); virtual void setReadOnly(bool readOnly); @@ -184,7 +184,7 @@ class MemoryCalibrationEditor : public MemoryTypeEditor Q_OBJECT TQ_OBJECT public: - MemoryCalibrationEditor(const HexView *hexview, Memory &memory, TQWidget *tqparent); + MemoryCalibrationEditor(const HexView *hexview, Memory &memory, TQWidget *parent); virtual void init(bool first); private: diff --git a/src/devices/pic/gui/pic_prog_group_ui.cpp b/src/devices/pic/gui/pic_prog_group_ui.cpp index 8f2f225..6e350ed 100644 --- a/src/devices/pic/gui/pic_prog_group_ui.cpp +++ b/src/devices/pic/gui/pic_prog_group_ui.cpp @@ -11,8 +11,8 @@ #include "progs/gui/prog_config_widget.h" #include "progs/base/prog_group.h" -Programmer::PicAdvancedDialog::PicAdvancedDialog(PicBase &base, TQWidget *tqparent, const char *name) - : AdvancedDialog(base, tqparent, name) +Programmer::PicAdvancedDialog::PicAdvancedDialog(PicBase &base, TQWidget *parent, const char *name) + : AdvancedDialog(base, parent, name) { if (_voltagesContainer) { uint k = _voltagesContainer->numRows(); diff --git a/src/devices/pic/gui/pic_prog_group_ui.h b/src/devices/pic/gui/pic_prog_group_ui.h index 1a8540e..c203da3 100644 --- a/src/devices/pic/gui/pic_prog_group_ui.h +++ b/src/devices/pic/gui/pic_prog_group_ui.h @@ -19,7 +19,7 @@ class PicAdvancedDialog : public ::Programmer::AdvancedDialog Q_OBJECT TQ_OBJECT public: - PicAdvancedDialog(PicBase &base, TQWidget *tqparent, const char *name); + PicAdvancedDialog(PicBase &base, TQWidget *parent, const char *name); virtual void updateDisplay(); private: diff --git a/src/devices/pic/gui/pic_register_view.cpp b/src/devices/pic/gui/pic_register_view.cpp index ced5085..b640036 100644 --- a/src/devices/pic/gui/pic_register_view.cpp +++ b/src/devices/pic/gui/pic_register_view.cpp @@ -29,8 +29,8 @@ #include "coff/base/text_coff.h" //----------------------------------------------------------------------------- -Pic::BankWidget::BankWidget(uint i, TQWidget *tqparent) - : TQFrame(tqparent, "bank_widget"), _bindex(i), _bankCombo(0) +Pic::BankWidget::BankWidget(uint i, TQWidget *parent) + : TQFrame(parent, "bank_widget"), _bindex(i), _bankCombo(0) { setFrameStyle(WinPanel | Sunken); TQGridLayout *top = new TQGridLayout(this, 1, 1, 5, 0); @@ -245,8 +245,8 @@ void Pic::BankWidget::updateView() } //----------------------------------------------------------------------------- -Pic::RegisterView::RegisterView(TQWidget *tqparent) - : Register::View(tqparent, "pic_register_view"), +Pic::RegisterView::RegisterView(TQWidget *parent) + : Register::View(parent, "pic_register_view"), _readAllButton(0), _clearAllButton(0) { TQVBoxLayout *vbox = new TQVBoxLayout(this, 10, 10); @@ -306,8 +306,8 @@ void Pic::RegisterView::stopWatchAllRegisters() } //---------------------------------------------------------------------------- -Pic::RegisterListViewItem::RegisterListViewItem(const Register::TypeData &data, KListViewItem *tqparent) - : Register::ListViewItem(data, tqparent) +Pic::RegisterListViewItem::RegisterListViewItem(const Register::TypeData &data, KListViewItem *parent) + : Register::ListViewItem(data, parent) {} uint Pic::RegisterListViewItem::nbCharsAddress() const diff --git a/src/devices/pic/gui/pic_register_view.h b/src/devices/pic/gui/pic_register_view.h index 0f347e4..f7a07ac 100644 --- a/src/devices/pic/gui/pic_register_view.h +++ b/src/devices/pic/gui/pic_register_view.h @@ -29,7 +29,7 @@ class BankWidget : public TQFrame Q_OBJECT TQ_OBJECT public: - BankWidget(uint bank, TQWidget *tqparent); + BankWidget(uint bank, TQWidget *parent); void updateView(); private slots: @@ -63,7 +63,7 @@ class RegisterView : public Register::View Q_OBJECT TQ_OBJECT public: - RegisterView(TQWidget *tqparent); + RegisterView(TQWidget *parent); virtual void updateView(); private slots: @@ -78,7 +78,7 @@ private: class RegisterListViewItem : public Register::ListViewItem { public: - RegisterListViewItem(const Register::TypeData &data, KListViewItem *tqparent); + RegisterListViewItem(const Register::TypeData &data, KListViewItem *parent); private: virtual uint nbCharsAddress() const; diff --git a/src/devices/pic/pic/pic_memory.cpp b/src/devices/pic/pic/pic_memory.cpp index 1a90efe..5f86517 100644 --- a/src/devices/pic/pic/pic_memory.cpp +++ b/src/devices/pic/pic/pic_memory.cpp @@ -58,7 +58,7 @@ Device::Array Pic::Memory::arrayForWriting(MemoryRangeType type) const { Device::Array data = _ranges[type]; for (uint i=0; i<data.count(); i++) - data[i] = data[i].maskWith(type==MemoryRangeType::Config ? device().config()._words[i].wtqmask : device().tqmask(type)); + data[i] = data[i].maskWith(type==MemoryRangeType::Config ? device().config()._words[i].wmask : device().mask(type)); return data; } @@ -75,7 +75,7 @@ BitValue Pic::Memory::normalizeWord(MemoryRangeType type, uint offset, BitValue return value.maskWith(cword.usedMask()); } if ( type==MemoryRangeType::UserId ) return value.maskWith(device().userIdRecommendedMask()); - return value.maskWith(device().tqmask(type)); + return value.maskWith(device().mask(type)); } BitValue Pic::Memory::normalizedWord(MemoryRangeType type, uint offset) const @@ -100,11 +100,11 @@ TQString Pic::Memory::findValue(const TQString &maskName) const { if ( maskName.isEmpty() ) return TQString(); uint i; - const Config::Mask *tqmask = device().config().findMask(maskName, &i); - if ( tqmask==0 ) return TQString(); - BitValue v = word(MemoryRangeType::Config, i).maskWith(tqmask->value); - for (uint k=0; k<uint(tqmask->values.count()); k++) - if ( v.isInside(tqmask->values[k].value) ) return tqmask->values[k].name; + const Config::Mask *mask = device().config().findMask(maskName, &i); + if ( mask==0 ) return TQString(); + BitValue v = word(MemoryRangeType::Config, i).maskWith(mask->value); + for (uint k=0; k<uint(mask->values.count()); k++) + if ( v.isInside(mask->values[k].value) ) return mask->values[k].name; Q_ASSERT(false); return TQString(); } @@ -123,9 +123,9 @@ AddressRange Pic::Memory::bootRange() const } // only CPB TQString maskName = protection.bootMaskName(Protection::ProgramProtected); - const Config::Mask *tqmask = device().config().findMask(maskName); - for (uint k=0; k<uint(tqmask->values.count()); k++) { - AddressRangeVector rv = protection.extractRanges(tqmask->values[k].name, MemoryRangeType::Code); + const Config::Mask *mask = device().config().findMask(maskName); + for (uint k=0; k<uint(mask->values.count()); k++) { + AddressRangeVector rv = protection.extractRanges(mask->values[k].name, MemoryRangeType::Code); if ( !rv.isEmpty() ) return rv[0]; } Q_ASSERT(false); @@ -153,9 +153,9 @@ AddressRange Pic::Memory::blockRange(uint i) const return AddressRange(start, 2 * size - 1); } AddressRange previous = (i==0 ? bootRange() : blockRange(i-1)); - const Config::Mask *tqmask = device().config().findMask(maskName); - for (uint k=0; k<uint(tqmask->values.count()); k++) { - AddressRangeVector rv = protection.extractRanges(tqmask->values[k].name, MemoryRangeType::Code); + const Config::Mask *mask = device().config().findMask(maskName); + for (uint k=0; k<uint(mask->values.count()); k++) { + AddressRangeVector rv = protection.extractRanges(mask->values[k].name, MemoryRangeType::Code); if ( !rv.isEmpty() ) return AddressRange(previous.end + 1, rv[0].end); } Q_ASSERT(false); @@ -242,13 +242,13 @@ void Pic::Memory::setProtection(bool on, Protection::Type ptype, MemoryRangeType void Pic::Memory::setConfigValue(const TQString &maskName, const TQString &valueName) { uint i; - const Config::Mask *tqmask = device().config().findMask(maskName, &i); - Q_ASSERT(tqmask); + const Config::Mask *mask = device().config().findMask(maskName, &i); + Q_ASSERT(mask); BitValue v = word(MemoryRangeType::Config, i); - v = v.clearMaskBits(tqmask->value); - for (int k=tqmask->values.count()-1; k>=0; k--) { // important to get the highest value in case of identical values - if ( tqmask->values[k].name!=valueName ) continue; - setWord(MemoryRangeType::Config, i, v | tqmask->values[k].value); + v = v.clearMaskBits(mask->value); + for (int k=mask->values.count()-1; k>=0; k--) { // important to get the highest value in case of identical values + if ( mask->values[k].name!=valueName ) continue; + setWord(MemoryRangeType::Config, i, v | mask->values[k].value); return; } Q_ASSERT(false); @@ -256,16 +256,16 @@ void Pic::Memory::setConfigValue(const TQString &maskName, const TQString &value void Pic::Memory::setProtection(bool on, const TQString &maskName, Protection::Type ptype) { - const Config::Mask *tqmask = device().config().findMask(maskName, 0); - if( tqmask==0 ) return; + const Config::Mask *mask = device().config().findMask(maskName, 0); + if( mask==0 ) return; const Protection &protection = device().config().protection(); TQString valueName; if ( ptype==Protection::StandardSecurity || ptype==Protection::HighSecurity ) valueName = protection.securityValueName(ptype); else { - for (int k=tqmask->values.count()-1; k>=0; k--) { - if ( (on && protection.isAllProtectedValueName(tqmask->values[k].name)) - || (!on && protection.isNoneProtectedValueName(tqmask->values[k].name)) ) valueName = tqmask->values[k].name; + for (int k=mask->values.count()-1; k>=0; k--) { + if ( (on && protection.isAllProtectedValueName(mask->values[k].name)) + || (!on && protection.isNoneProtectedValueName(mask->values[k].name)) ) valueName = mask->values[k].name; } } setConfigValue(maskName, valueName); @@ -273,19 +273,19 @@ void Pic::Memory::setProtection(bool on, const TQString &maskName, Protection::T bool Pic::Memory::hasFlagOn(const TQString &maskName, bool valueIfNotPresent) const { - const Config::Mask *tqmask = device().config().findMask(maskName, 0); - if ( tqmask==0 ) return valueIfNotPresent; - Q_ASSERT(tqmask); - Q_ASSERT( tqmask->values.count()==2 ); + const Config::Mask *mask = device().config().findMask(maskName, 0); + if ( mask==0 ) return valueIfNotPresent; + Q_ASSERT(mask); + Q_ASSERT( mask->values.count()==2 ); return ( findValue(maskName)=="On" ); } void Pic::Memory::setFlagOn(const TQString &maskName, bool on) { - const Config::Mask *tqmask = device().config().findMask(maskName, 0); - Q_UNUSED(tqmask); - Q_ASSERT(tqmask); - Q_ASSERT( tqmask->values.count()==2 ); + const Config::Mask *mask = device().config().findMask(maskName, 0); + Q_UNUSED(mask); + Q_ASSERT(mask); + Q_ASSERT( mask->values.count()==2 ); setConfigValue(maskName, on ? "On" : "Off"); } @@ -331,12 +331,12 @@ void Pic::Memory::checksumCheckFill() BitValue Pic::Memory::checksum() const { // code - BitValue tqmask = device().tqmask(MemoryRangeType::Code); + BitValue mask = device().mask(MemoryRangeType::Code); AddressRangeVector rv = protectedRanges(Protection::ProgramProtected, MemoryRangeType::Code); bool isProtected = !rv.isEmpty(); uint inc = device().addressIncrement(MemoryRangeType::Code); //uint nbChars = device().nbCharsWord(MemoryRangeType::Code); - //qDebug("protected: %i nb: %s (%s)", isProtected, toHexLabelAbs(inc*device().nbWords(MemoryRangeType::Code)).latin1(), toHexLabel(tqmask, nbChars).latin1()); + //qDebug("protected: %i nb: %s (%s)", isProtected, toHexLabelAbs(inc*device().nbWords(MemoryRangeType::Code)).latin1(), toHexLabel(mask, nbChars).latin1()); //for (uint i=0; i<rv.count(); i++) // qDebug("protected: %s:%s", toHex(rv[i].start, nbChars).latin1(), toHex(rv[i].end, nbChars).latin1()); if ( isProtected && (device().architecture()==Pic::Architecture::P18J || device().architecture()==Pic::Architecture::P24F) ) @@ -357,7 +357,7 @@ BitValue Pic::Memory::checksum() const //qDebug("algo: %s", Checksum::ALGORITHM_DATA[algorithm].name); for (uint i=0; i<device().nbWords(MemoryRangeType::Code); i++) { if ( algorithm==Checksum::Algorithm::Normal && rv.contains(inc*i) ) continue; - BitValue v = word(MemoryRangeType::Code, i).maskWith(tqmask); + BitValue v = word(MemoryRangeType::Code, i).maskWith(mask); //if ( i==0 || i==device().nbWords(MemoryRangeType::Code)-1 ) qDebug("%s %s", toHexLabel(i, 4).latin1(), toHexLabel(v, 4).latin1()); switch (device().architecture().type()) { case Architecture::P10X: @@ -392,9 +392,9 @@ BitValue Pic::Memory::checksum() const const Config &config = device().config(); for (uint i=0; i<uint(config._words.count()); i++) { const Config::Word &cword = config._words[i]; - BitValue v = word(MemoryRangeType::Config, i).maskWith(cword.ctqmask); + BitValue v = word(MemoryRangeType::Config, i).maskWith(cword.cmask); //uint nbChars = device().nbCharsWord(MemoryRangeType::Config); - // qDebug("%i: %s %s", i, toHex(word(MemoryRangeType::Config, i), nbChars).latin1(), toHex(cword.ctqmask, nbChars).latin1()); + // qDebug("%i: %s %s", i, toHex(word(MemoryRangeType::Config, i), nbChars).latin1(), toHex(cword.cmask, nbChars).latin1()); if ( ( device().name()=="16C61" || device().name()=="16C71" ) && isProtected ) cs += v | 0x0060; else if ( device().is16bitFamily() ) cs += v.byte(0) + v.byte(1); else cs += v; @@ -462,7 +462,7 @@ void Pic::Memory::toHexBuffer(MemoryRangeType type, HexBuffer &hb) const bool packed = device().architecture().data().packed; uint offset = device().range(type).hexFileOffset; if ( offset==0 ) offset = device().range(type).start.toUInt(); - BitValue tqmask = device().tqmask(type); + BitValue mask = device().mask(type); uint wNbBytes = nbBytes; if ( packed && type!=Pic::MemoryRangeType::Code ) { offset /= 2; @@ -474,7 +474,7 @@ void Pic::Memory::toHexBuffer(MemoryRangeType type, HexBuffer &hb) const //qDebug("%s wnb=%i snb=%i div=%i", MEMORY_RANGE_TYPE_DATA[type].label, wNbBytes, sNbBytes, div); for (uint k=0; k<wNbBytes*device().nbWords(type); k++) { // set byte - BitValue s = _ranges[type][wOffset].maskWith(tqmask); + BitValue s = _ranges[type][wOffset].maskWith(mask); //if ( k<4 ) qDebug("s=%s so=%s sb=%i wo=%i wb=%i", toHex(s, 8).data(), toHex(sOffset, 8).data(), sByte, wOffset, wByte); s = s.byte(wByte); if ( (byte%2)==0 ) hb.insert(offset, s); @@ -508,7 +508,7 @@ void Pic::Memory::fromHexBuffer(MemoryRangeType type, const HexBuffer &hb, Warni bool packed = device().architecture().data().packed; uint offset = device().range(type).hexFileOffset; if ( offset==0 ) offset = device().range(type).start.toUInt(); - BitValue tqmask = device().tqmask(type); + BitValue mask = device().mask(type); uint wNbBytes = nbBytes; if ( packed && type!=Pic::MemoryRangeType::Code ) { offset /= 2; @@ -523,7 +523,7 @@ void Pic::Memory::fromHexBuffer(MemoryRangeType type, const HexBuffer &hb, Warni BitValue s = hb[offset]; //if ( k<4 ) qDebug("s=%s so=%s sb=%i wo=%i wb=%i", toHex(s, 8).data(), toHex(offset, 8).data(), byte, wOffset, wByte); if ( !s.isInitialized() ) { - if ( type==MemoryRangeType::Config ) _ranges[type][wOffset] = tqmask; + if ( type==MemoryRangeType::Config ) _ranges[type][wOffset] = mask; else _ranges[type][wOffset] = BitValue(); } else { inRange[offset] = true; @@ -540,12 +540,12 @@ void Pic::Memory::fromHexBuffer(MemoryRangeType type, const HexBuffer &hb, Warni wByte++; if ( (wByte%wNbBytes)==0 ) { if ( _ranges[type][wOffset].isInitialized() ) { - if ( !(result & ValueTooLarge) && _ranges[type][wOffset].maskWith(tqmask)!=_ranges[type][wOffset] ) { + if ( !(result & ValueTooLarge) && _ranges[type][wOffset].maskWith(mask)!=_ranges[type][wOffset] ) { result |= ValueTooLarge; - warnings += i18n("At least one word (at offset %1) is larger (%2) than the corresponding tqmask (%3).") - .tqarg(toHexLabel(offset, 8)).tqarg(toHexLabel(_ranges[type][wOffset], 8)).tqarg(toHexLabel(tqmask, 8)); + warnings += i18n("At least one word (at offset %1) is larger (%2) than the corresponding mask (%3).") + .tqarg(toHexLabel(offset, 8)).tqarg(toHexLabel(_ranges[type][wOffset], 8)).tqarg(toHexLabel(mask, 8)); } - _ranges[type][wOffset] = _ranges[type][wOffset].maskWith(tqmask); + _ranges[type][wOffset] = _ranges[type][wOffset].maskWith(mask); } wByte = 0; wOffset++; diff --git a/src/devices/pic/prog/pic_prog.cpp b/src/devices/pic/prog/pic_prog.cpp index 42eeafb..f0c917d 100644 --- a/src/devices/pic/prog/pic_prog.cpp +++ b/src/devices/pic/prog/pic_prog.cpp @@ -256,7 +256,7 @@ bool Programmer::PicBase::verifyDeviceId() BitValue rawId = readDeviceId(); if ( hasError() ) return false; uint nbChars = device()->nbWords(Pic::MemoryRangeType::DeviceId) * device()->nbCharsWord(Pic::MemoryRangeType::DeviceId); - if ( rawId==0x0 || rawId==device()->tqmask(Pic::MemoryRangeType::DeviceId) ) { + if ( rawId==0x0 || rawId==device()->mask(Pic::MemoryRangeType::DeviceId) ) { log(Log::LineType::Error, i18n("Missing or incorrect device (Read id is %1).").tqarg(toHexLabel(rawId, nbChars))); return false; } @@ -366,16 +366,16 @@ bool Programmer::PicBase::restoreBandGapBits() if ( !specific()->canReadRange(Pic::MemoryRangeType::Config) ) return true; bool hasProtectedBits = false; for (uint i=0; i<device()->nbWords(Pic::MemoryRangeType::Config); i++) - if ( device()->config()._words[i].ptqmask!=0 ) hasProtectedBits = true; + if ( device()->config()._words[i].pmask!=0 ) hasProtectedBits = true; if ( !hasProtectedBits ) return true; Device::Array cdata; if ( !specific()->read(Pic::MemoryRangeType::Config, cdata, 0) ) return false; Device::Array data = _deviceMemory->arrayForWriting(Pic::MemoryRangeType::Config); for (uint i=0; i<cdata.count(); i++) { - BitValue ptqmask = device()->config()._words[i].ptqmask; - if ( ptqmask==0 ) continue; - cdata[i] = cdata[i].clearMaskBits(ptqmask); - cdata[i] |= data[i].maskWith(ptqmask); + BitValue pmask = device()->config()._words[i].pmask; + if ( pmask==0 ) continue; + cdata[i] = cdata[i].clearMaskBits(pmask); + cdata[i] |= data[i].maskWith(pmask); } if ( !specific()->canWriteRange(Pic::MemoryRangeType::Config) ) { log(Log::LineType::Warning, i18n("Could not restore band gap bits because programmer does not support writing config bits.")); diff --git a/src/devices/pic/prog/pic_prog_specific.cpp b/src/devices/pic/prog/pic_prog_specific.cpp index ed13adf..c8d958b 100644 --- a/src/devices/pic/prog/pic_prog_specific.cpp +++ b/src/devices/pic/prog/pic_prog_specific.cpp @@ -28,7 +28,7 @@ uint Programmer::PicDeviceSpecific::findNonMaskStart(Pic::MemoryRangeType type, { uint start = 0; for (; start<data.count(); start++) - if ( data[start]!=device().tqmask(type) ) break; + if ( data[start]!=device().mask(type) ) break; const_cast<PicDeviceSpecific *>(this)->log(Log::DebugLevel::Normal, TQString("start before align: %1").tqarg(start)); uint align = device().nbWordsWriteAlignment(type); start -= start % align; @@ -40,7 +40,7 @@ uint Programmer::PicDeviceSpecific::findNonMaskEnd(Pic::MemoryRangeType type, co { uint end = data.count()-1; for (; end>0; end--) - if ( data[end]!=device().tqmask(type) ) break; + if ( data[end]!=device().mask(type) ) break; const_cast<PicDeviceSpecific *>(this)->log(Log::DebugLevel::Normal, TQString("end before align: %1").tqarg(end)); uint align = device().nbWordsWriteAlignment(type); if ( (end+1) % align ) end += align - (end+1) % align; @@ -113,9 +113,9 @@ bool Programmer::PicHardware::verifyWord(uint i, BitValue word, Pic::MemoryRange BitValue v = static_cast<const Pic::Memory &>(vdata.memory).normalizedWord(type, i); BitValue d = static_cast<const Pic::Memory &>(vdata.memory).normalizeWord(type, i, word); if ( type==Pic::MemoryRangeType::Config ) { - BitValue ptqmask = device().config()._words[i].ptqmask; - v = v.clearMaskBits(ptqmask); - d = d.clearMaskBits(ptqmask); + BitValue pmask = device().config()._words[i].pmask; + v = v.clearMaskBits(pmask); + d = d.clearMaskBits(pmask); } return compareWords(type, i, v, d, vdata.actions); } diff --git a/src/devices/pic/xml/pic_xml_to_data.cpp b/src/devices/pic/xml/pic_xml_to_data.cpp index 18a5409..85eed73 100644 --- a/src/devices/pic/xml/pic_xml_to_data.cpp +++ b/src/devices/pic/xml/pic_xml_to_data.cpp @@ -52,9 +52,9 @@ bool getMemoryRange(MemoryRangeType type, TQDomElement element) uint nbCharsWord = data()->nbCharsWord(type); if ( data()->nbBitsWord(type)==0 ) qFatal(TQString("Architecture doesn't contain memory range %1").tqarg(type.key())); if ( type==MemoryRangeType::UserId ) { - data()->_userIdRecommendedMask = fromHexLabel(range.attribute("rtqmask"), nbCharsWord, &ok); - if ( !ok ) qFatal("Cannot extract rtqmask value for user id"); - if ( !data()->_userIdRecommendedMask.isInside(data()->tqmask(type)) ) qFatal(TQString("rtqmask is not inside tqmask %1 (%2)").tqarg(toHexLabel(data()->_userIdRecommendedMask, 8)).tqarg(toHexLabel(data()->tqmask(type), 8))); + data()->_userIdRecommendedMask = fromHexLabel(range.attribute("rmask"), nbCharsWord, &ok); + if ( !ok ) qFatal("Cannot extract rmask value for user id"); + if ( !data()->_userIdRecommendedMask.isInside(data()->mask(type)) ) qFatal(TQString("rmask is not inside mask %1 (%2)").tqarg(toHexLabel(data()->_userIdRecommendedMask, 8)).tqarg(toHexLabel(data()->mask(type), 8))); } if ( range.attribute("hexfile_offset")!="?" ) { data()->_ranges[type].properties |= Programmable; @@ -64,12 +64,12 @@ bool getMemoryRange(MemoryRangeType type, TQDomElement element) } } if ( type==MemoryRangeType::Cal && !data()->is18Family() ) { - data()->_calibration.opcodeMask = fromHexLabel(range.attribute("cal_optqmask"), nbCharsWord, &ok); - if ( !ok ) qFatal("Cannot extract calibration opcode tqmask"); + data()->_calibration.opcodeMask = fromHexLabel(range.attribute("cal_opmask"), nbCharsWord, &ok); + if ( !ok ) qFatal("Cannot extract calibration opcode mask"); data()->_calibration.opcode = fromHexLabel(range.attribute("cal_opcode"), nbCharsWord, &ok); if ( !ok ) qFatal("Cannot extract calibration opcode"); - if ( !data()->_calibration.opcode.isInside(data()->_calibration.opcodeMask) ) qFatal("Calibration opcode should be inside opcode tqmask"); - if ( !data()->_calibration.opcodeMask.isInside(data()->tqmask(type)) ) qFatal("Calibration tqmask should be inside opcode tqmask"); + if ( !data()->_calibration.opcode.isInside(data()->_calibration.opcodeMask) ) qFatal("Calibration opcode should be inside opcode mask"); + if ( !data()->_calibration.opcodeMask.isInside(data()->mask(type)) ) qFatal("Calibration mask should be inside opcode mask"); } TQString wwa = range.attribute("word_write_align"); TQString wea = range.attribute("word_erase_align"); @@ -88,31 +88,31 @@ bool getMemoryRange(MemoryRangeType type, TQDomElement element) return true; } -bool hasValue(const Pic::Config::Mask &tqmask, BitValue value) +bool hasValue(const Pic::Config::Mask &mask, BitValue value) { - for (uint i=0; i<uint(tqmask.values.count()); i++) - if ( tqmask.values[i].value==value ) return true; + for (uint i=0; i<uint(mask.values.count()); i++) + if ( mask.values[i].value==value ) return true; return false; } -void processName(const Pic::Config::Mask &ctqmask, BitValue ptqmask, Pic::Config::Value &cvalue) +void processName(const Pic::Config::Mask &cmask, BitValue pmask, Pic::Config::Value &cvalue) { TQStringList &cnames = cvalue.configNames[Pic::ConfigNameType::Default]; if ( cvalue.name=="invalid" ) { cvalue.name = TQString(); - if ( !cnames.isEmpty() ) qFatal(TQString("No cname should be defined for invalid value in tqmask %1").tqarg(ctqmask.name)); + if ( !cnames.isEmpty() ) qFatal(TQString("No cname should be defined for invalid value in mask %1").tqarg(cmask.name)); return; } - if ( cvalue.name.isEmpty() ) qFatal(TQString("Empty value name in tqmask %1").tqarg(ctqmask.name)); - if ( ctqmask.value.isInside(ptqmask) ) { // protected bits - if ( !cnames.isEmpty() ) qFatal(TQString("Config name should be null for protected config tqmask \"%1\"").tqarg(ctqmask.name)); + if ( cvalue.name.isEmpty() ) qFatal(TQString("Empty value name in mask %1").tqarg(cmask.name)); + if ( cmask.value.isInside(pmask) ) { // protected bits + if ( !cnames.isEmpty() ) qFatal(TQString("Config name should be null for protected config mask \"%1\"").tqarg(cmask.name)); } else { - if ( cnames.isEmpty() && ctqmask.name!="BSSEC" && ctqmask.name!="BSSIZ" && ctqmask.name!="SSSEC" && ctqmask.name!="SSSIZ" ) { + if ( cnames.isEmpty() && cmask.name!="BSSEC" && cmask.name!="BSSIZ" && cmask.name!="SSSEC" && cmask.name!="SSSIZ" ) { // ### FIXME: 18J 24H 30F1010/202X if ( data()->architecture()!=Pic::Architecture::P18J && data()->architecture()!=Pic::Architecture::P24H && data()->architecture()!=Pic::Architecture::P24F && data()->architecture()!=Pic::Architecture::P33F && data()->name()!="30F1010" && data()->name()!="30F2020" && data()->name()!="30F2023" ) - qFatal(TQString("cname not defined for \"%1\" (%2)").tqarg(cvalue.name).tqarg(ctqmask.name)); + qFatal(TQString("cname not defined for \"%1\" (%2)").tqarg(cvalue.name).tqarg(cmask.name)); } if ( cnames.count()==1 && cnames[0]=="_" ) cnames.clear(); for (uint i=0; i<uint(cnames.count()); i++) { @@ -121,10 +121,10 @@ void processName(const Pic::Config::Mask &ctqmask, BitValue ptqmask, Pic::Config bool ok; BitValue v = fromHexLabel(cnames[i], &ok); uint nbChars = data()->nbCharsWord(MemoryRangeType::Config); - BitValue tqmask = ctqmask.value.complementInMask(maxValue(NumberBase::Hex, nbChars)); - if ( ok && v==(tqmask | cvalue.value) ) continue; + BitValue mask = cmask.value.complementInMask(maxValue(NumberBase::Hex, nbChars)); + if ( ok && v==(mask | cvalue.value) ) continue; } else if ( XOR(cnames[i].startsWith("_"), data()->architecture()==Pic::Architecture::P30F) ) continue; - qFatal(TQString("Invalid config name for \"%1\"/\"%2\"").tqarg(ctqmask.name).tqarg(cvalue.name)); + qFatal(TQString("Invalid config name for \"%1\"/\"%2\"").tqarg(cmask.name).tqarg(cvalue.name)); } TQStringList &ecnames = cvalue.configNames[Pic::ConfigNameType::Extra]; for (uint i=0; i<uint(ecnames.count()); i++) @@ -132,61 +132,61 @@ void processName(const Pic::Config::Mask &ctqmask, BitValue ptqmask, Pic::Config } } -Pic::Config::Mask toConfigMask(TQDomElement tqmask, BitValue ptqmask) +Pic::Config::Mask toConfigMask(TQDomElement mask, BitValue pmask) { uint nbChars = data()->nbCharsWord(MemoryRangeType::Config); bool ok; TQString defName; TQMap<Pic::ConfigNameType, TQStringList> defConfigNames; - Config::Mask ctqmask; - ctqmask.name = tqmask.attribute("name"); - if ( !Config::hasMaskName(ctqmask.name) ) qFatal(TQString("Unknown tqmask name %1").tqarg(ctqmask.name)); - ctqmask.value = fromHexLabel(tqmask.attribute("value"), nbChars, &ok); - if ( !ok || ctqmask.value==0 || ctqmask.value>data()->tqmask(MemoryRangeType::Config) ) - qFatal(TQString("Malformed tqmask value in tqmask %1").tqarg(tqmask.attribute("name"))); + Config::Mask cmask; + cmask.name = mask.attribute("name"); + if ( !Config::hasMaskName(cmask.name) ) qFatal(TQString("Unknown mask name %1").tqarg(cmask.name)); + cmask.value = fromHexLabel(mask.attribute("value"), nbChars, &ok); + if ( !ok || cmask.value==0 || cmask.value>data()->mask(MemoryRangeType::Config) ) + qFatal(TQString("Malformed mask value in mask %1").tqarg(mask.attribute("name"))); //TQStringList names; - TQDomNode child = tqmask.firstChild(); + TQDomNode child = mask.firstChild(); while ( !child.isNull() ) { TQDomElement value = child.toElement(); child = child.nextSibling(); if ( value.isNull() ) continue; - if ( value.nodeName()!="value" ) qFatal(TQString("Non value child in tqmask %1").tqarg(ctqmask.name)); + if ( value.nodeName()!="value" ) qFatal(TQString("Non value child in mask %1").tqarg(cmask.name)); if ( value.attribute("value")=="default" ) { - if ( !defName.isEmpty() ) qFatal(TQString("Default value already defined for tqmask %1").tqarg(ctqmask.name)); + if ( !defName.isEmpty() ) qFatal(TQString("Default value already defined for mask %1").tqarg(cmask.name)); defName = value.attribute("name"); - //if ( names.contains(defName) ) qFatal(TQString("Value name duplicated in tqmask %1").tqarg(ctqmask.name)); + //if ( names.contains(defName) ) qFatal(TQString("Value name duplicated in mask %1").tqarg(cmask.name)); //names.append(defName); FOR_EACH(Pic::ConfigNameType, type) defConfigNames[type] = TQStringList::split(' ', value.attribute(type.data().key)); continue; } Config::Value cvalue; cvalue.value = fromHexLabel(value.attribute("value"), nbChars, &ok); - if ( !ok || !cvalue.value.isInside(ctqmask.value) ) qFatal(TQString("Malformed value in tqmask %1").tqarg(ctqmask.name)); + if ( !ok || !cvalue.value.isInside(cmask.value) ) qFatal(TQString("Malformed value in mask %1").tqarg(cmask.name)); cvalue.name = value.attribute("name"); - //if ( names.contains(cvalue.name) ) qFatal(TQString("Value name duplicated in tqmask %1").tqarg(ctqmask.name)); + //if ( names.contains(cvalue.name) ) qFatal(TQString("Value name duplicated in mask %1").tqarg(cmask.name)); //names.append(cvalue.name); FOR_EACH(Pic::ConfigNameType, type) cvalue.configNames[type] = TQStringList::split(' ', value.attribute(type.data().key)); - processName(ctqmask, ptqmask, cvalue); - ctqmask.values.append(cvalue); + processName(cmask, pmask, cvalue); + cmask.values.append(cvalue); } // add default values if ( !defName.isEmpty() ) { uint nb = 0; BitValue::const_iterator it; - for (it=ctqmask.value.begin(); it!=ctqmask.value.end(); ++it) { - if ( hasValue(ctqmask, *it) ) continue; // already set + for (it=cmask.value.begin(); it!=cmask.value.end(); ++it) { + if ( hasValue(cmask, *it) ) continue; // already set nb++; Config::Value cvalue; cvalue.value = *it; cvalue.name = defName; cvalue.configNames = defConfigNames; - processName(ctqmask, ptqmask, cvalue); - ctqmask.values.append(cvalue); + processName(cmask, pmask, cvalue); + cmask.values.append(cvalue); } - if ( nb<=1 ) qFatal(TQString("Default value used less than twice in tqmask %1").tqarg(ctqmask.name)); + if ( nb<=1 ) qFatal(TQString("Default value used less than twice in mask %1").tqarg(cmask.name)); } - qHeapSort(ctqmask.values); - return ctqmask; + qHeapSort(cmask.values); + return cmask; } Pic::Config::Word toConfigWord(TQDomElement config) @@ -196,48 +196,48 @@ Pic::Config::Word toConfigWord(TQDomElement config) cword.name = config.attribute("name"); if ( cword.name.isNull() ) qFatal("Config word name not specified."); bool ok; - cword.wtqmask = fromHexLabel(config.attribute("wtqmask"), nbChars, &ok); - BitValue gtqmask = data()->tqmask(MemoryRangeType::Config); - if ( !ok || cword.wtqmask>gtqmask ) qFatal(TQString("Missing or malformed config wtqmask \"%1\"").tqarg(config.attribute("wtqmask"))); + cword.wmask = fromHexLabel(config.attribute("wmask"), nbChars, &ok); + BitValue gmask = data()->mask(MemoryRangeType::Config); + if ( !ok || cword.wmask>gmask ) qFatal(TQString("Missing or malformed config wmask \"%1\"").tqarg(config.attribute("wmask"))); cword.bvalue = fromHexLabel(config.attribute("bvalue"), nbChars, &ok); if ( !ok ) qFatal(TQString("Missing or malformed config bvalue \"%1\"").tqarg(config.attribute("bvalue"))); - if ( config.attribute("ptqmask").isEmpty() ) cword.ptqmask = 0; + if ( config.attribute("pmask").isEmpty() ) cword.pmask = 0; else { bool ok; - cword.ptqmask = fromHexLabel(config.attribute("ptqmask"), nbChars, &ok); - if ( !ok || cword.ptqmask>gtqmask ) qFatal("Missing or malformed config ptqmask"); + cword.pmask = fromHexLabel(config.attribute("pmask"), nbChars, &ok); + if ( !ok || cword.pmask>gmask ) qFatal("Missing or malformed config pmask"); } cword.ignoredCNames = TQStringList::split(' ', config.attribute("icnames")); for (uint i=0; i<uint(cword.ignoredCNames.count()); i++) if ( cword.ignoredCNames[i][0]!='_' ) qFatal(TQString("Invalid ignored config name for %1").tqarg(cword.name)); TQDomNode child = config.firstChild(); while ( !child.isNull() ) { - TQDomElement tqmask = child.toElement(); + TQDomElement mask = child.toElement(); child = child.nextSibling(); - if ( tqmask.isNull() ) continue; - if ( tqmask.nodeName()!="tqmask" ) qFatal(TQString("Non tqmask child in config %1").tqarg(cword.name)); - if ( tqmask.attribute("name").isEmpty() ) qFatal(TQString("Empty tqmask name in config %1").tqarg(cword.name)); - Config::Mask ctqmask = toConfigMask(tqmask, cword.ptqmask); - if ( !ctqmask.value.isInside(gtqmask) ) qFatal(TQString("Mask value not inside tqmask in config %1").tqarg(cword.name)); + if ( mask.isNull() ) continue; + if ( mask.nodeName()!="mask" ) qFatal(TQString("Non mask child in config %1").tqarg(cword.name)); + if ( mask.attribute("name").isEmpty() ) qFatal(TQString("Empty mask name in config %1").tqarg(cword.name)); + Config::Mask cmask = toConfigMask(mask, cword.pmask); + if ( !cmask.value.isInside(gmask) ) qFatal(TQString("Mask value not inside mask in config %1").tqarg(cword.name)); for (uint i=0; i<uint(cword.masks.count()); i++) { - if ( cword.masks[i].name==ctqmask.name ) qFatal(TQString("Duplicated tqmask name %1 in config %2").tqarg(ctqmask.name).tqarg(cword.name)); - if ( ctqmask.value.isOverlapping(cword.masks[i].value) ) qFatal(TQString("Overlapping masks in config %1").tqarg(cword.name)); + if ( cword.masks[i].name==cmask.name ) qFatal(TQString("Duplicated mask name %1 in config %2").tqarg(cmask.name).tqarg(cword.name)); + if ( cmask.value.isOverlapping(cword.masks[i].value) ) qFatal(TQString("Overlapping masks in config %1").tqarg(cword.name)); } - cword.masks.append(ctqmask); + cword.masks.append(cmask); } qHeapSort(cword.masks); - BitValue tqmask = (cword.usedMask() | cword.bvalue).clearMaskBits(cword.ptqmask); - if ( config.attribute("ctqmask").isEmpty() ) { - if ( data()->_architecture==Pic::Architecture::P30F ) cword.ctqmask = cword.wtqmask; - else cword.ctqmask = tqmask; + BitValue mask = (cword.usedMask() | cword.bvalue).clearMaskBits(cword.pmask); + if ( config.attribute("cmask").isEmpty() ) { + if ( data()->_architecture==Pic::Architecture::P30F ) cword.cmask = cword.wmask; + else cword.cmask = mask; } else { bool ok; - cword.ctqmask = fromHexLabel(config.attribute("ctqmask"), nbChars, &ok); - if ( !ok || cword.ctqmask>gtqmask ) qFatal("Missing or malformed config ctqmask"); - //if ( data()->_architecture==Pic::Architecture::P30X &&cword.ctqmask==cword.wtqmask ) qFatal(TQString("Redundant ctqmask in %1").tqarg(cword.name)); - if ( cword.ctqmask==tqmask ) qFatal(TQString("Redundant ctqmask in %1").tqarg(cword.name)); + cword.cmask = fromHexLabel(config.attribute("cmask"), nbChars, &ok); + if ( !ok || cword.cmask>gmask ) qFatal("Missing or malformed config cmask"); + //if ( data()->_architecture==Pic::Architecture::P30X &&cword.cmask==cword.wmask ) qFatal(TQString("Redundant cmask in %1").tqarg(cword.name)); + if ( cword.cmask==mask ) qFatal(TQString("Redundant cmask in %1").tqarg(cword.name)); } - if ( !cword.ptqmask.isInside(cword.usedMask()) ) qFatal("ptqmask should be inside or'ed tqmask values."); + if ( !cword.pmask.isInside(cword.usedMask()) ) qFatal("pmask should be inside or'ed mask values."); return cword; } @@ -283,8 +283,8 @@ TQString getChecksumData(TQDomElement checksum) if ( nb>0 ) cdata.protectedMaskNames += "CPB"; for (uint i=1; i<nb; i++) cdata.protectedMaskNames += "CP_" + TQString::number(i-1); cdata.bbsize = checksum.attribute("bbsize"); - const Config::Mask *tqmask = data()->_config->findMask(protection.bootSizeMaskName()); - if ( tqmask==0 ) { + const Config::Mask *mask = data()->_config->findMask(protection.bootSizeMaskName()); + if ( mask==0 ) { if ( !cdata.bbsize.isEmpty() ) qFatal("Device does not have a variable boot size (no \"bbsize\" allowed in checksum)"); } else if ( cdata.bbsize.isEmpty() ) { if ( nb==1 ) qFatal("\"bbsize\" should be define in checksum for \"protected_blocks\"==1"); @@ -319,14 +319,14 @@ TQString getChecksumData(TQDomElement checksum) if ( !s.isEmpty() ) { TQStringList list = TQStringList::split(" ", s); for (uint i=0; i<uint(list.count()); i++) { - const Config::Mask *tqmask = data()->config().findMask(list[i]); - if ( tqmask==0 ) qFatal(TQString("Not valid tqmask name for \"protected\" tag in checksum: %1").tqarg(list[i])); - if ( tqmask->values.count()==2 ) continue; - for (uint k=0; k<uint(tqmask->values.count()); k++) { - TQString valueName = tqmask->values[k].name; + const Config::Mask *mask = data()->config().findMask(list[i]); + if ( mask==0 ) qFatal(TQString("Not valid mask name for \"protected\" tag in checksum: %1").tqarg(list[i])); + if ( mask->values.count()==2 ) continue; + for (uint k=0; k<uint(mask->values.count()); k++) { + TQString valueName = mask->values[k].name; if ( valueName.isEmpty() ) continue; if ( !protection.isNoneProtectedValueName(valueName) && !protection.isAllProtectedValueName(valueName) ) - qFatal(TQString("Not switch protection from tqmask name for \"protected\" tag in checksum: %1").tqarg(list[i])); + qFatal(TQString("Not switch protection from mask name for \"protected\" tag in checksum: %1").tqarg(list[i])); } } cdata.protectedMaskNames = list; @@ -438,19 +438,19 @@ virtual void processDevice(TQDomElement device) uint nbWords = data()->nbWords(MemoryRangeType::Config); data()->_config->_words.resize(nbWords); FOR_EACH(Pic::ConfigNameType, type) { - TQMap<TQString, TQString> cnames; // cname -> tqmask name + TQMap<TQString, TQString> cnames; // cname -> mask name for (uint i=0; i<nbWords; i++) { if ( cwords[i].name.isNull() ) qFatal(TQString("Config word #%1 not defined").tqarg(i)); data()->_config->_words[i] = cwords[i]; const Config::Word &word = data()->_config->_words[i]; for (uint j=0; j<uint(word.masks.count()); j++) { - const Config::Mask &tqmask = word.masks[j]; - for (uint k=0; k<uint(tqmask.values.count()); k++) { - const TQStringList &vcnames = tqmask.values[k].configNames[type]; + const Config::Mask &mask = word.masks[j]; + for (uint k=0; k<uint(mask.values.count()); k++) { + const TQStringList &vcnames = mask.values[k].configNames[type]; for (uint l=0; l<uint(vcnames.count()); l++) { if ( vcnames[l].startsWith("0x") ) continue; - if ( cnames.contains(vcnames[l]) && cnames[vcnames[l]]!=tqmask.name ) - qFatal(TQString("Duplicated config name for %1/%2").tqarg(tqmask.name).tqarg(tqmask.values[k].name)); + if ( cnames.contains(vcnames[l]) && cnames[vcnames[l]]!=mask.name ) + qFatal(TQString("Duplicated config name for %1/%2").tqarg(mask.name).tqarg(mask.values[k].name)); cnames[vcnames[l]] = word.masks[j].name; } } @@ -461,12 +461,12 @@ virtual void processDevice(TQDomElement device) for (uint i=0; i<nbWords; i++) { const Config::Word &word = data()->_config->_words[i]; for (uint j=0; j<uint(word.masks.count()); j++) { - const Config::Mask &tqmask = word.masks[j]; - for (uint k=0; k<uint(tqmask.values.count()); k++) { - const Config::Value &value = tqmask.values[k]; + const Config::Mask &mask = word.masks[j]; + for (uint k=0; k<uint(mask.values.count()); k++) { + const Config::Value &value = mask.values[k]; if ( !value.isValid() ) continue; - if ( !data()->_config->checkValueName(tqmask.name, value.name) ) - qFatal(TQString("Malformed value name \"%1\" in tqmask %2").tqarg(value.name).tqarg(tqmask.name)); + if ( !data()->_config->checkValueName(mask.name, value.name) ) + qFatal(TQString("Malformed value name \"%1\" in mask %2").tqarg(value.name).tqarg(mask.name)); } } } @@ -474,10 +474,10 @@ virtual void processDevice(TQDomElement device) for (uint i=0; i<nbWords; i++) { const Config::Word &word = data()->_config->_words[i]; for (uint j=0; j<uint(word.masks.count()); j++) { - const Config::Mask &tqmask = word.masks[j]; + const Config::Mask &mask = word.masks[j]; BitValue::const_iterator it; - for (it=tqmask.value.begin(); it!=tqmask.value.end(); ++it) - if ( !hasValue(tqmask, *it) ) qFatal(TQString("Value %1 not defined in tqmask %2").tqarg(toHexLabel(*it, data()->nbCharsWord(MemoryRangeType::Config))).tqarg(tqmask.name)); + for (it=mask.value.begin(); it!=mask.value.end(); ++it) + if ( !hasValue(mask, *it) ) qFatal(TQString("Value %1 not defined in mask %2").tqarg(toHexLabel(*it, data()->nbCharsWord(MemoryRangeType::Config))).tqarg(mask.name)); } } @@ -490,9 +490,9 @@ virtual void processDevice(TQDomElement device) const Pic::Protection &protection = data()->_config->protection(); if ( protection.family()==Protection::BasicProtection ) { TQString maskName = protection.maskName(Protection::ProgramProtected, MemoryRangeType::Code); - const Pic::Config::Mask *tqmask = data()->_config->findMask(maskName); - Q_ASSERT(tqmask); - for (uint i=0; i<uint(tqmask->values.count()); i++) valueNames[tqmask->values[i].name] = false; + const Pic::Config::Mask *mask = data()->_config->findMask(maskName); + Q_ASSERT(mask); + for (uint i=0; i<uint(mask->values.count()); i++) valueNames[mask->values[i].name] = false; } TQDomNode child = checksums.firstChild(); while ( !child.isNull() ) { @@ -614,8 +614,8 @@ void processDeviceRegisters(TQDomElement element) if ( data()->is18Family() ) { rdata.accessBankSplit = fromHexLabel(element.attribute("access_bank_split_offset"), &ok); if ( !ok || rdata.accessBankSplit==0 || rdata.accessBankSplit>=0xFF ) qFatal("Malformed access bank split offset"); - rdata.unusedBankMask = fromHexLabel(element.attribute("unused_bank_tqmask"), &ok); - if ( !ok || rdata.unusedBankMask>=maxValue(NumberBase::Hex, rdata.nbBanks) ) qFatal("Malformed access unused bank tqmask"); + rdata.unusedBankMask = fromHexLabel(element.attribute("unused_bank_mask"), &ok); + if ( !ok || rdata.unusedBankMask>=maxValue(NumberBase::Hex, rdata.nbBanks) ) qFatal("Malformed access unused bank mask"); } else { rdata.accessBankSplit = 0; rdata.unusedBankMask = 0; diff --git a/src/devices/pic/xml_data/10F200.xml b/src/devices/pic/xml_data/10F200.xml index eb3c1f1..11ce1ff 100644 --- a/src/devices/pic/xml_data/10F200.xml +++ b/src/devices/pic/xml_data/10F200.xml @@ -27,29 +27,29 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000" end="0x0FE" /> - <memory name="calibration" start="0x0FF" end="0x0FF" cal_optqmask="0xF00" cal_opcode="0xC00" /> - <memory name="user_ids" start="0x100" end="0x103" rtqmask="0x00F" /> + <memory name="calibration" start="0x0FF" end="0x0FF" cal_opmask="0xF00" cal_opcode="0xC00" /> + <memory name="user_ids" start="0x100" end="0x103" rmask="0x00F" /> <memory name="config" start="0x1FF" end="0x1FF" hexfile_offset="0xFFF" /> <memory name="calibration_backup" start="0x104" end="0x104" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0xFFF" bvalue="0x01F" ctqmask="0x01C" > - <tqmask name="FOSC" value="0x003" > + <config offset="0x0" name="" wmask="0xFFF" bvalue="0x01F" cmask="0x01C" > + <mask name="FOSC" value="0x003" > <value value="default" name="invalid" /> <value value="0x003" name="INTRC" cname="_IntRC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x004" > + </mask> + <mask name="WDT" value="0x004" > <value value="0x000" name="Off" cname="_WDT_OFF" /> <value value="0x004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="CP" value="0x008" > + </mask> + <mask name="CP" value="0x008" > <value value="0x000" name="040:0FE" cname="_CP_ON" /> <value value="0x008" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x010" > + </mask> + <mask name="MCLRE" value="0x010" > <value value="0x000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x010" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/10F202.xml b/src/devices/pic/xml_data/10F202.xml index f7c420e..25ce72a 100644 --- a/src/devices/pic/xml_data/10F202.xml +++ b/src/devices/pic/xml_data/10F202.xml @@ -27,29 +27,29 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000" end="0x1FE" /> - <memory name="calibration" start="0x1FF" end="0x1FF" cal_optqmask="0xF00" cal_opcode="0xC00" /> - <memory name="user_ids" start="0x200" end="0x203" rtqmask="0x00F" /> + <memory name="calibration" start="0x1FF" end="0x1FF" cal_opmask="0xF00" cal_opcode="0xC00" /> + <memory name="user_ids" start="0x200" end="0x203" rmask="0x00F" /> <memory name="config" start="0x3FF" end="0x3FF" hexfile_offset="0xFFF" /> <memory name="calibration_backup" start="0x204" end="0x204" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0xFFF" bvalue="0x01F" ctqmask="0x01C" > - <tqmask name="FOSC" value="0x003" > + <config offset="0x0" name="" wmask="0xFFF" bvalue="0x01F" cmask="0x01C" > + <mask name="FOSC" value="0x003" > <value value="default" name="invalid" /> <value value="0x003" name="INTRC" cname="_IntRC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x004" > + </mask> + <mask name="WDT" value="0x004" > <value value="0x000" name="Off" cname="_WDT_OFF" /> <value value="0x004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="CP" value="0x008" > + </mask> + <mask name="CP" value="0x008" > <value value="0x000" name="040:1FE" cname="_CP_ON" /> <value value="0x008" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x010" > + </mask> + <mask name="MCLRE" value="0x010" > <value value="0x000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x010" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/10F204.xml b/src/devices/pic/xml_data/10F204.xml index 40631ef..e2d2e6d 100644 --- a/src/devices/pic/xml_data/10F204.xml +++ b/src/devices/pic/xml_data/10F204.xml @@ -27,29 +27,29 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000" end="0x0FE" /> - <memory name="calibration" start="0x0FF" end="0x0FF" cal_optqmask="0xF00" cal_opcode="0xC00" /> - <memory name="user_ids" start="0x100" end="0x103" rtqmask="0x00F" /> + <memory name="calibration" start="0x0FF" end="0x0FF" cal_opmask="0xF00" cal_opcode="0xC00" /> + <memory name="user_ids" start="0x100" end="0x103" rmask="0x00F" /> <memory name="config" start="0x1FF" end="0x1FF" hexfile_offset="0xFFF" /> <memory name="calibration_backup" start="0x104" end="0x104" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0xFFF" bvalue="0x01F" ctqmask="0x01C" > - <tqmask name="FOSC" value="0x003" > + <config offset="0x0" name="" wmask="0xFFF" bvalue="0x01F" cmask="0x01C" > + <mask name="FOSC" value="0x003" > <value value="default" name="invalid" /> <value value="0x003" name="INTRC" cname="_IntRC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x004" > + </mask> + <mask name="WDT" value="0x004" > <value value="0x000" name="Off" cname="_WDT_OFF" /> <value value="0x004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="CP" value="0x008" > + </mask> + <mask name="CP" value="0x008" > <value value="0x000" name="040:0FE" cname="_CP_ON" /> <value value="0x008" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x010" > + </mask> + <mask name="MCLRE" value="0x010" > <value value="0x000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x010" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/10F206.xml b/src/devices/pic/xml_data/10F206.xml index c5030eb..4e66268 100644 --- a/src/devices/pic/xml_data/10F206.xml +++ b/src/devices/pic/xml_data/10F206.xml @@ -27,29 +27,29 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000" end="0x1FE" /> - <memory name="calibration" start="0x1FF" end="0x1FF" cal_optqmask="0xF00" cal_opcode="0xC00" /> - <memory name="user_ids" start="0x200" end="0x203" rtqmask="0x00F" /> + <memory name="calibration" start="0x1FF" end="0x1FF" cal_opmask="0xF00" cal_opcode="0xC00" /> + <memory name="user_ids" start="0x200" end="0x203" rmask="0x00F" /> <memory name="config" start="0x3FF" end="0x3FF" hexfile_offset="0xFFF" /> <memory name="calibration_backup" start="0x204" end="0x204" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0xFFF" bvalue="0x01F" ctqmask="0x01C" > - <tqmask name="FOSC" value="0x003" > + <config offset="0x0" name="" wmask="0xFFF" bvalue="0x01F" cmask="0x01C" > + <mask name="FOSC" value="0x003" > <value value="default" name="invalid" /> <value value="0x003" name="INTRC" cname="_IntRC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x004" > + </mask> + <mask name="WDT" value="0x004" > <value value="0x000" name="Off" cname="_WDT_OFF" /> <value value="0x004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="CP" value="0x008" > + </mask> + <mask name="CP" value="0x008" > <value value="0x000" name="040:1FE" cname="_CP_ON" /> <value value="0x008" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x010" > + </mask> + <mask name="MCLRE" value="0x010" > <value value="0x000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x010" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/10F220.xml b/src/devices/pic/xml_data/10F220.xml index 99e7019..694d161 100644 --- a/src/devices/pic/xml_data/10F220.xml +++ b/src/devices/pic/xml_data/10F220.xml @@ -28,33 +28,33 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000" end="0x0FE" /> - <memory name="calibration" start="0x0FF" end="0x0FF" cal_optqmask="0xF00" cal_opcode="0xC00" /> - <memory name="user_ids" start="0x100" end="0x103" rtqmask="0x00F" /> + <memory name="calibration" start="0x0FF" end="0x0FF" cal_opmask="0xF00" cal_opcode="0xC00" /> + <memory name="user_ids" start="0x100" end="0x103" rmask="0x00F" /> <memory name="config" start="0x1FF" end="0x1FF" hexfile_offset="0xFFF" /> <memory name="calibration_backup" start="0x104" end="0x104" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0xFFF" bvalue="0x01F" > - <tqmask name="IOSCFS" value="0x001" > + <config offset="0x0" name="" wmask="0xFFF" bvalue="0x01F" > + <mask name="IOSCFS" value="0x001" > <value value="0x000" name="4MHZ" cname="_IOFSCS_4MHZ" ecnames="_IOSCFS_4MHZ" /> <value value="0x001" name="8MHZ" cname="_IOFSCS_8MHZ" ecnames="_IOSCFS_8MHZ" /> - </tqmask> - <tqmask name="MCPU" value="0x002" > + </mask> + <mask name="MCPU" value="0x002" > <value value="0x000" name="On" cname="_MCPU_ON" /> <value value="0x002" name="Off" cname="_MCPU_OFF" /> - </tqmask> - <tqmask name="WDT" value="0x004" > + </mask> + <mask name="WDT" value="0x004" > <value value="0x000" name="Off" cname="_WDT_OFF" /> <value value="0x004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="CP" value="0x008" > + </mask> + <mask name="CP" value="0x008" > <value value="0x000" name="040:0FE" cname="_CP_ON" /> <value value="0x008" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x010" > + </mask> + <mask name="MCLRE" value="0x010" > <value value="0x000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x010" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/10F222.xml b/src/devices/pic/xml_data/10F222.xml index 3597849..4cba906 100644 --- a/src/devices/pic/xml_data/10F222.xml +++ b/src/devices/pic/xml_data/10F222.xml @@ -28,33 +28,33 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000" end="0x1FE" /> - <memory name="calibration" start="0x1FF" end="0x1FF" cal_optqmask="0xF00" cal_opcode="0xC00" /> - <memory name="user_ids" start="0x200" end="0x203" rtqmask="0x00F" /> + <memory name="calibration" start="0x1FF" end="0x1FF" cal_opmask="0xF00" cal_opcode="0xC00" /> + <memory name="user_ids" start="0x200" end="0x203" rmask="0x00F" /> <memory name="config" start="0x3FF" end="0x3FF" hexfile_offset="0xFFF" /> <memory name="calibration_backup" start="0x204" end="0x204" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0xFFF" bvalue="0x01F" > - <tqmask name="IOSCFS" value="0x001" > + <config offset="0x0" name="" wmask="0xFFF" bvalue="0x01F" > + <mask name="IOSCFS" value="0x001" > <value value="0x000" name="4MHZ" cname="_IOFSCS_4MHZ" ecnames="_IOSCFS_4MHZ" /> <value value="0x001" name="8MHZ" cname="_IOFSCS_8MHZ" ecnames="_IOSCFS_8MHZ" /> - </tqmask> - <tqmask name="MCPU" value="0x002" > + </mask> + <mask name="MCPU" value="0x002" > <value value="0x000" name="On" cname="_MCPU_ON" /> <value value="0x002" name="Off" cname="_MCPU_OFF" /> - </tqmask> - <tqmask name="WDT" value="0x004" > + </mask> + <mask name="WDT" value="0x004" > <value value="0x000" name="Off" cname="_WDT_OFF" /> <value value="0x004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="CP" value="0x008" > + </mask> + <mask name="CP" value="0x008" > <value value="0x000" name="040:1FE" cname="_CP_ON" /> <value value="0x008" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x010" > + </mask> + <mask name="MCLRE" value="0x010" > <value value="0x000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x010" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/12C508.xml b/src/devices/pic/xml_data/12C508.xml index 2639704..cb39eae 100644 --- a/src/devices/pic/xml_data/12C508.xml +++ b/src/devices/pic/xml_data/12C508.xml @@ -30,30 +30,30 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000" end="0x1FE" /> - <memory name="calibration" start="0x1FF" end="0x1FF" cal_optqmask="0xF00" cal_opcode="0xC00" /> - <memory name="user_ids" start="0x200" end="0x203" rtqmask="0x00F" /> + <memory name="calibration" start="0x1FF" end="0x1FF" cal_opmask="0xF00" cal_opcode="0xC00" /> + <memory name="user_ids" start="0x200" end="0x203" rmask="0x00F" /> <memory name="config" start="0xFFF" end="0xFFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x01F" bvalue="0x01F" > - <tqmask name="FOSC" value="0x003" > + <config offset="0x0" name="" wmask="0x01F" bvalue="0x01F" > + <mask name="FOSC" value="0x003" > <value value="0x000" name="LP" cname="_LP_OSC" /> <value value="0x001" name="XT" cname="_XT_OSC" /> <value value="0x002" name="INTRC" cname="_IntRC_OSC" /> <value value="0x003" name="EXTRC" cname="_ExtRC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x004" > + </mask> + <mask name="WDT" value="0x004" > <value value="0x000" name="Off" cname="_WDT_OFF" /> <value value="0x004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="CP" value="0x008" > + </mask> + <mask name="CP" value="0x008" > <value value="0x000" name="040:1FE" cname="_CP_ON" /> <value value="0x008" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x010" > + </mask> + <mask name="MCLRE" value="0x010" > <value value="0x000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x010" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/12C508A.xml b/src/devices/pic/xml_data/12C508A.xml index a5c9497..f1ffb3f 100644 --- a/src/devices/pic/xml_data/12C508A.xml +++ b/src/devices/pic/xml_data/12C508A.xml @@ -27,30 +27,30 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000" end="0x1FE" /> - <memory name="calibration" start="0x1FF" end="0x1FF" cal_optqmask="0xF00" cal_opcode="0xC00" /> - <memory name="user_ids" start="0x200" end="0x203" rtqmask="0x00F" /> + <memory name="calibration" start="0x1FF" end="0x1FF" cal_opmask="0xF00" cal_opcode="0xC00" /> + <memory name="user_ids" start="0x200" end="0x203" rmask="0x00F" /> <memory name="config" start="0xFFF" end="0xFFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x01F" bvalue="0x01F" > - <tqmask name="FOSC" value="0x003" > + <config offset="0x0" name="" wmask="0x01F" bvalue="0x01F" > + <mask name="FOSC" value="0x003" > <value value="0x000" name="LP" cname="_LP_OSC" /> <value value="0x001" name="XT" cname="_XT_OSC" /> <value value="0x002" name="INTRC" cname="_IntRC_OSC" /> <value value="0x003" name="EXTRC" cname="_ExtRC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x004" > + </mask> + <mask name="WDT" value="0x004" > <value value="0x000" name="Off" cname="_WDT_OFF" /> <value value="0x004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="CP" value="0x008" > + </mask> + <mask name="CP" value="0x008" > <value value="0x000" name="040:1FE" cname="_CP_ON" /> <value value="0x008" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x010" > + </mask> + <mask name="MCLRE" value="0x010" > <value value="0x000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x010" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/12C509.xml b/src/devices/pic/xml_data/12C509.xml index 7b10e99..dbe885b 100644 --- a/src/devices/pic/xml_data/12C509.xml +++ b/src/devices/pic/xml_data/12C509.xml @@ -30,30 +30,30 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000" end="0x3FE" /> - <memory name="calibration" start="0x3FF" end="0x3FF" cal_optqmask="0xF00" cal_opcode="0xC00" /> - <memory name="user_ids" start="0x400" end="0x403" rtqmask="0x00F" /> + <memory name="calibration" start="0x3FF" end="0x3FF" cal_opmask="0xF00" cal_opcode="0xC00" /> + <memory name="user_ids" start="0x400" end="0x403" rmask="0x00F" /> <memory name="config" start="0xFFF" end="0xFFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x01F" bvalue="0x01F" > - <tqmask name="FOSC" value="0x003" > + <config offset="0x0" name="" wmask="0x01F" bvalue="0x01F" > + <mask name="FOSC" value="0x003" > <value value="0x000" name="LP" cname="_LP_OSC" /> <value value="0x001" name="XT" cname="_XT_OSC" /> <value value="0x002" name="INTRC" cname="_IntRC_OSC" /> <value value="0x003" name="EXTRC" cname="_ExtRC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x004" > + </mask> + <mask name="WDT" value="0x004" > <value value="0x000" name="Off" cname="_WDT_OFF" /> <value value="0x004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="CP" value="0x008" > + </mask> + <mask name="CP" value="0x008" > <value value="0x000" name="040:3FE" cname="_CP_ON" /> <value value="0x008" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x010" > + </mask> + <mask name="MCLRE" value="0x010" > <value value="0x000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x010" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/12C509A.xml b/src/devices/pic/xml_data/12C509A.xml index 0c41121..240783f 100644 --- a/src/devices/pic/xml_data/12C509A.xml +++ b/src/devices/pic/xml_data/12C509A.xml @@ -27,30 +27,30 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000" end="0x3FE" /> - <memory name="calibration" start="0x3FF" end="0x3FF" cal_optqmask="0xF00" cal_opcode="0xC00" /> - <memory name="user_ids" start="0x400" end="0x403" rtqmask="0x00F" /> + <memory name="calibration" start="0x3FF" end="0x3FF" cal_opmask="0xF00" cal_opcode="0xC00" /> + <memory name="user_ids" start="0x400" end="0x403" rmask="0x00F" /> <memory name="config" start="0xFFF" end="0xFFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x01F" bvalue="0x01F" > - <tqmask name="FOSC" value="0x003" > + <config offset="0x0" name="" wmask="0x01F" bvalue="0x01F" > + <mask name="FOSC" value="0x003" > <value value="0x000" name="LP" cname="_LP_OSC" /> <value value="0x001" name="XT" cname="_XT_OSC" /> <value value="0x002" name="INTRC" cname="_IntRC_OSC" /> <value value="0x003" name="EXTRC" cname="_ExtRC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x004" > + </mask> + <mask name="WDT" value="0x004" > <value value="0x000" name="Off" cname="_WDT_OFF" /> <value value="0x004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="CP" value="0x008" > + </mask> + <mask name="CP" value="0x008" > <value value="0x000" name="040:3FE" cname="_CP_ON" /> <value value="0x008" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x010" > + </mask> + <mask name="MCLRE" value="0x010" > <value value="0x000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x010" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/12C671.xml b/src/devices/pic/xml_data/12C671.xml index bcb6217..f675723 100644 --- a/src/devices/pic/xml_data/12C671.xml +++ b/src/devices/pic/xml_data/12C671.xml @@ -35,13 +35,13 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x03FE" /> - <memory name="calibration" start="0x03FF" end="0x03FF" cal_optqmask="0x3C00" cal_opcode="0x3400" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x000F" /> + <memory name="calibration" start="0x03FF" end="0x03FF" cal_opmask="0x3C00" cal_opcode="0x3400" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x000F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" icnames="_CP_50" > - <tqmask name="FOSC" value="0x0007" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" icnames="_CP_50" > + <mask name="FOSC" value="0x0007" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -50,24 +50,24 @@ <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" /> <value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRC_OSC" /> <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" /> - </tqmask> - <tqmask name="WDT" value="0x0008" > + </mask> + <mask name="WDT" value="0x0008" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0008" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0010" > + </mask> + <mask name="PWRTE" value="0x0010" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0010" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x0080" > + </mask> + <mask name="MCLRE" value="0x0080" > <value value="0x0000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x0080" name="External" cname="_MCLRE_ON" /> - </tqmask> - <tqmask name="CP" value="0x3F60" > + </mask> + <mask name="CP" value="0x3F60" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1520" name="200:3FE" cname="_CP_75" /> <value value="default" name="Off" cname="_CP_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/12C672.xml b/src/devices/pic/xml_data/12C672.xml index 17e100c..80511f1 100644 --- a/src/devices/pic/xml_data/12C672.xml +++ b/src/devices/pic/xml_data/12C672.xml @@ -36,13 +36,13 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x07FE" /> - <memory name="calibration" start="0x07FF" end="0x07FF" cal_optqmask="0x3C00" cal_opcode="0x3400" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x000F" /> + <memory name="calibration" start="0x07FF" end="0x07FF" cal_opmask="0x3C00" cal_opcode="0x3400" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x000F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" > - <tqmask name="FOSC" value="0x0007" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" > + <mask name="FOSC" value="0x0007" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -51,25 +51,25 @@ <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" /> <value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRC_OSC" /> <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" /> - </tqmask> - <tqmask name="WDT" value="0x0008" > + </mask> + <mask name="WDT" value="0x0008" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0008" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0010" > + </mask> + <mask name="PWRTE" value="0x0010" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0010" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x0080" > + </mask> + <mask name="MCLRE" value="0x0080" > <value value="0x0000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x0080" name="External" cname="_MCLRE_ON" /> - </tqmask> - <tqmask name="CP" value="0x3F60" > + </mask> + <mask name="CP" value="0x3F60" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1520" name="200:7FE" cname="_CP_75" /> <value value="0x2A40" name="400:7FE" cname="_CP_50" /> <value value="default" name="Off" cname="_CP_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/12CE518.xml b/src/devices/pic/xml_data/12CE518.xml index 619dadc..e27cbb3 100644 --- a/src/devices/pic/xml_data/12CE518.xml +++ b/src/devices/pic/xml_data/12CE518.xml @@ -27,31 +27,31 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000" end="0x1FE" /> - <memory name="calibration" start="0x1FF" end="0x1FF" cal_optqmask="0xF00" cal_opcode="0xC00" /> - <memory name="user_ids" start="0x200" end="0x203" rtqmask="0x00F" /> + <memory name="calibration" start="0x1FF" end="0x1FF" cal_opmask="0xF00" cal_opcode="0xC00" /> + <memory name="user_ids" start="0x200" end="0x203" rmask="0x00F" /> <memory name="config" start="0xFFF" end="0xFFF" /> - <memory name="eeprom" start="0x000" end="0x00F" rtqmask="0xFF" hexfile_offset="?" /> + <memory name="eeprom" start="0x000" end="0x00F" rmask="0xFF" hexfile_offset="?" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x01F" bvalue="0x01F" > - <tqmask name="FOSC" value="0x003" > + <config offset="0x0" name="" wmask="0x01F" bvalue="0x01F" > + <mask name="FOSC" value="0x003" > <value value="0x000" name="LP" cname="_LP_OSC" /> <value value="0x001" name="XT" cname="_XT_OSC" /> <value value="0x002" name="INTRC" cname="_IntRC_OSC" /> <value value="0x003" name="EXTRC" cname="_ExtRC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x004" > + </mask> + <mask name="WDT" value="0x004" > <value value="0x000" name="Off" cname="_WDT_OFF" /> <value value="0x004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="CP" value="0x008" > + </mask> + <mask name="CP" value="0x008" > <value value="0x000" name="040:1FE" cname="_CP_ON" /> <value value="0x008" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x010" > + </mask> + <mask name="MCLRE" value="0x010" > <value value="0x000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x010" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/12CE519.xml b/src/devices/pic/xml_data/12CE519.xml index 483a926..210e186 100644 --- a/src/devices/pic/xml_data/12CE519.xml +++ b/src/devices/pic/xml_data/12CE519.xml @@ -27,31 +27,31 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000" end="0x3FE" /> - <memory name="calibration" start="0x3FF" end="0x3FF" cal_optqmask="0xF00" cal_opcode="0xC00" /> - <memory name="user_ids" start="0x400" end="0x403" rtqmask="0x00F" /> + <memory name="calibration" start="0x3FF" end="0x3FF" cal_opmask="0xF00" cal_opcode="0xC00" /> + <memory name="user_ids" start="0x400" end="0x403" rmask="0x00F" /> <memory name="config" start="0xFFF" end="0xFFF" /> - <memory name="eeprom" start="0x000" end="0x00F" rtqmask="0xFF" hexfile_offset="?" /> + <memory name="eeprom" start="0x000" end="0x00F" rmask="0xFF" hexfile_offset="?" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x01F" bvalue="0x01F" > - <tqmask name="FOSC" value="0x003" > + <config offset="0x0" name="" wmask="0x01F" bvalue="0x01F" > + <mask name="FOSC" value="0x003" > <value value="0x000" name="LP" cname="_LP_OSC" /> <value value="0x001" name="XT" cname="_XT_OSC" /> <value value="0x002" name="INTRC" cname="_IntRC_OSC" /> <value value="0x003" name="EXTRC" cname="_ExtRC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x004" > + </mask> + <mask name="WDT" value="0x004" > <value value="0x000" name="Off" cname="_WDT_OFF" /> <value value="0x004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="CP" value="0x008" > + </mask> + <mask name="CP" value="0x008" > <value value="0x000" name="040:3FE" cname="_CP_ON" /> <value value="0x008" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x010" > + </mask> + <mask name="MCLRE" value="0x010" > <value value="0x000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x010" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/12CE673.xml b/src/devices/pic/xml_data/12CE673.xml index 4d8ea34..3007c29 100644 --- a/src/devices/pic/xml_data/12CE673.xml +++ b/src/devices/pic/xml_data/12CE673.xml @@ -35,14 +35,14 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x03FE" /> - <memory name="calibration" start="0x03FF" end="0x03FF" cal_optqmask="0x3C00" cal_opcode="0x3400" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x000F" /> + <memory name="calibration" start="0x03FF" end="0x03FF" cal_opmask="0x3C00" cal_opcode="0x3400" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x000F" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="eeprom" start="0x0000" end="0x000F" hexfile_offset="?" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" icnames="_CP_50" > - <tqmask name="FOSC" value="0x0007" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" icnames="_CP_50" > + <mask name="FOSC" value="0x0007" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -51,24 +51,24 @@ <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" /> <value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRC_OSC" /> <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" /> - </tqmask> - <tqmask name="WDT" value="0x0008" > + </mask> + <mask name="WDT" value="0x0008" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0008" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0010" > + </mask> + <mask name="PWRTE" value="0x0010" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0010" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x0080" > + </mask> + <mask name="MCLRE" value="0x0080" > <value value="0x0000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x0080" name="External" cname="_MCLRE_ON" /> - </tqmask> - <tqmask name="CP" value="0x3F60" > + </mask> + <mask name="CP" value="0x3F60" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1520" name="200:3FE" cname="_CP_75" /> <value value="default" name="Off" cname="_CP_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/12CE674.xml b/src/devices/pic/xml_data/12CE674.xml index 2f9198a..7670f3f 100644 --- a/src/devices/pic/xml_data/12CE674.xml +++ b/src/devices/pic/xml_data/12CE674.xml @@ -36,14 +36,14 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x07FE" /> - <memory name="calibration" start="0x07FF" end="0x07FF" cal_optqmask="0x3C00" cal_opcode="0x3400" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x000F" /> + <memory name="calibration" start="0x07FF" end="0x07FF" cal_opmask="0x3C00" cal_opcode="0x3400" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x000F" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="eeprom" start="0x0000" end="0x000F" hexfile_offset="?" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" > - <tqmask name="FOSC" value="0x0007" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" > + <mask name="FOSC" value="0x0007" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -52,25 +52,25 @@ <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" /> <value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRC_OSC" /> <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" /> - </tqmask> - <tqmask name="WDT" value="0x0008" > + </mask> + <mask name="WDT" value="0x0008" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0008" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0010" > + </mask> + <mask name="PWRTE" value="0x0010" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0010" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x0080" > + </mask> + <mask name="MCLRE" value="0x0080" > <value value="0x0000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x0080" name="External" cname="_MCLRE_ON" /> - </tqmask> - <tqmask name="CP" value="0x3F60" > + </mask> + <mask name="CP" value="0x3F60" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1520" name="200:7FE" cname="_CP_75" /> <value value="0x2A40" name="400:7FE" cname="_CP_50" /> <value value="default" name="Off" cname="_CP_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/12CR509A.xml b/src/devices/pic/xml_data/12CR509A.xml index 80d4d36..9a795da 100644 --- a/src/devices/pic/xml_data/12CR509A.xml +++ b/src/devices/pic/xml_data/12CR509A.xml @@ -27,30 +27,30 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000" end="0x3FE" /> - <memory name="calibration" start="0x3FF" end="0x3FF" cal_optqmask="0xF00" cal_opcode="0xC00" /> - <memory name="user_ids" start="0x400" end="0x403" rtqmask="0x00F" /> + <memory name="calibration" start="0x3FF" end="0x3FF" cal_opmask="0xF00" cal_opcode="0xC00" /> + <memory name="user_ids" start="0x400" end="0x403" rmask="0x00F" /> <memory name="config" start="0xFFF" end="0xFFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x01F" bvalue="0x01F" > - <tqmask name="FOSC" value="0x003" > + <config offset="0x0" name="" wmask="0x01F" bvalue="0x01F" > + <mask name="FOSC" value="0x003" > <value value="0x000" name="LP" cname="_LP_OSC" /> <value value="0x001" name="XT" cname="_XT_OSC" /> <value value="0x002" name="INTRC" cname="_IntRC_OSC" /> <value value="0x003" name="EXTRC" cname="_ExtRC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x004" > + </mask> + <mask name="WDT" value="0x004" > <value value="0x000" name="Off" cname="_WDT_OFF" /> <value value="0x004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="CP" value="0x008" > + </mask> + <mask name="CP" value="0x008" > <value value="0x000" name="040:3FE" cname="_CP_ON" /> <value value="0x008" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x010" > + </mask> + <mask name="MCLRE" value="0x010" > <value value="0x000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x010" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/12F508.xml b/src/devices/pic/xml_data/12F508.xml index 4bd60df..19fd956 100644 --- a/src/devices/pic/xml_data/12F508.xml +++ b/src/devices/pic/xml_data/12F508.xml @@ -29,31 +29,31 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000" end="0x1FE" /> - <memory name="calibration" start="0x1FF" end="0x1FF" cal_optqmask="0xF00" cal_opcode="0xC00" /> - <memory name="user_ids" start="0x200" end="0x203" rtqmask="0x00F" /> + <memory name="calibration" start="0x1FF" end="0x1FF" cal_opmask="0xF00" cal_opcode="0xC00" /> + <memory name="user_ids" start="0x200" end="0x203" rmask="0x00F" /> <memory name="config" start="0x3FF" end="0x3FF" hexfile_offset="0xFFF" /> <memory name="calibration_backup" start="0x204" end="0x204" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x01F" bvalue="0x01F" > - <tqmask name="FOSC" value="0x003" > + <config offset="0x0" name="" wmask="0x01F" bvalue="0x01F" > + <mask name="FOSC" value="0x003" > <value value="0x000" name="LP" cname="_LP_OSC" /> <value value="0x001" name="XT" cname="_XT_OSC" /> <value value="0x002" name="INTRC" cname="_IntRC_OSC" /> <value value="0x003" name="EXTRC" cname="_ExtRC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x004" > + </mask> + <mask name="WDT" value="0x004" > <value value="0x000" name="Off" cname="_WDT_OFF" /> <value value="0x004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="CP" value="0x008" > + </mask> + <mask name="CP" value="0x008" > <value value="0x000" name="040:1FE" cname="_CP_ON" /> <value value="0x008" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x010" > + </mask> + <mask name="MCLRE" value="0x010" > <value value="0x000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x010" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/12F509.xml b/src/devices/pic/xml_data/12F509.xml index 449e009..8f3ae12 100644 --- a/src/devices/pic/xml_data/12F509.xml +++ b/src/devices/pic/xml_data/12F509.xml @@ -29,31 +29,31 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000" end="0x3FE" /> - <memory name="calibration" start="0x3FF" end="0x3FF" cal_optqmask="0xF00" cal_opcode="0xC00" /> - <memory name="user_ids" start="0x400" end="0x403" rtqmask="0x00F" /> + <memory name="calibration" start="0x3FF" end="0x3FF" cal_opmask="0xF00" cal_opcode="0xC00" /> + <memory name="user_ids" start="0x400" end="0x403" rmask="0x00F" /> <memory name="config" start="0x7FF" end="0x7FF" hexfile_offset="0xFFF" /> <memory name="calibration_backup" start="0x404" end="0x404" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x01F" bvalue="0x01F" > - <tqmask name="FOSC" value="0x003" > + <config offset="0x0" name="" wmask="0x01F" bvalue="0x01F" > + <mask name="FOSC" value="0x003" > <value value="0x000" name="LP" cname="_LP_OSC" /> <value value="0x001" name="XT" cname="_XT_OSC" /> <value value="0x002" name="INTRC" cname="_IntRC_OSC" /> <value value="0x003" name="EXTRC" cname="_ExtRC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x004" > + </mask> + <mask name="WDT" value="0x004" > <value value="0x000" name="Off" cname="_WDT_OFF" /> <value value="0x004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="CP" value="0x008" > + </mask> + <mask name="CP" value="0x008" > <value value="0x000" name="040:3FE" cname="_CP_ON" /> <value value="0x008" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x010" > + </mask> + <mask name="MCLRE" value="0x010" > <value value="0x000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x010" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/12F510.xml b/src/devices/pic/xml_data/12F510.xml index ce2ab4a..15a2d81 100644 --- a/src/devices/pic/xml_data/12F510.xml +++ b/src/devices/pic/xml_data/12F510.xml @@ -28,35 +28,35 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000" end="0x3FE" /> - <memory name="calibration" start="0x3FF" end="0x3FF" cal_optqmask="0xF00" cal_opcode="0xC00" /> - <memory name="user_ids" start="0x400" end="0x403" rtqmask="0x00F" /> + <memory name="calibration" start="0x3FF" end="0x3FF" cal_opmask="0xF00" cal_opcode="0xC00" /> + <memory name="user_ids" start="0x400" end="0x403" rmask="0x00F" /> <memory name="config" start="0x7FF" end="0x7FF" hexfile_offset="0xFFF" /> <memory name="calibration_backup" start="0x404" end="0x404" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0xFFF" bvalue="0x03F" > - <tqmask name="FOSC" value="0x003" > + <config offset="0x0" name="" wmask="0xFFF" bvalue="0x03F" > + <mask name="FOSC" value="0x003" > <value value="0x000" name="LP" cname="_LP_OSC" /> <value value="0x001" name="XT" cname="_XT_OSC" /> <value value="0x002" name="INTRC" cname="_IntRC_OSC" /> <value value="0x003" name="EXTRC" cname="_ExtRC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x004" > + </mask> + <mask name="WDT" value="0x004" > <value value="0x000" name="Off" cname="_WDT_OFF" /> <value value="0x004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="CP" value="0x008" > + </mask> + <mask name="CP" value="0x008" > <value value="0x000" name="040:3FE" cname="_CP_ON" /> <value value="0x008" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x010" > + </mask> + <mask name="MCLRE" value="0x010" > <value value="0x000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x010" name="External" cname="_MCLRE_ON" /> - </tqmask> - <tqmask name="IOSCFS" value="0x020" > + </mask> + <mask name="IOSCFS" value="0x020" > <value value="0x000" name="4MHZ" cname="_IOSCFS_OFF" /> <value value="0x020" name="8MHZ" cname="_IOSCFS_ON" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/12F519.xml b/src/devices/pic/xml_data/12F519.xml index 02dd3d1..600618c 100644 --- a/src/devices/pic/xml_data/12F519.xml +++ b/src/devices/pic/xml_data/12F519.xml @@ -31,40 +31,40 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000" end="0x3FE" /> - <memory name="calibration" start="0x3FF" end="0x3FF" cal_optqmask="0xF00" cal_opcode="0xC00" /> + <memory name="calibration" start="0x3FF" end="0x3FF" cal_opmask="0xF00" cal_opcode="0xC00" /> <memory name="eeprom" start="0x400" end="0x43F" /> - <memory name="user_ids" start="0x440" end="0x443" rtqmask="0x00F" /> + <memory name="user_ids" start="0x440" end="0x443" rmask="0x00F" /> <memory name="config" start="0x7FF" end="0x7FF" hexfile_offset="0xFFF" /> <memory name="calibration_backup" start="0x444" end="0x444" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0xFFF" bvalue="0x07F" > - <tqmask name="FOSC" value="0x003" > + <config offset="0x0" name="" wmask="0xFFF" bvalue="0x07F" > + <mask name="FOSC" value="0x003" > <value value="0x000" name="LP" cname="_LP_OSC" /> <value value="0x001" name="XT" cname="_XT_OSC" /> <value value="0x002" name="INTRC" cname="_IntRC_OSC" /> <value value="0x003" name="EXTRC" cname="_ExtRC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x004" > + </mask> + <mask name="WDT" value="0x004" > <value value="0x000" name="Off" cname="_WDT_OFF" /> <value value="0x004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="CP" value="0x008" > + </mask> + <mask name="CP" value="0x008" > <value value="0x000" name="040:3FE" cname="_CP_ON" /> <value value="0x008" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x010" > + </mask> + <mask name="MCLRE" value="0x010" > <value value="0x000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x010" name="External" cname="_MCLRE_ON" /> - </tqmask> - <tqmask name="IOSCFS" value="0x020" > + </mask> + <mask name="IOSCFS" value="0x020" > <value value="0x000" name="4MHZ" cname="_IOSCFS_OFF" /> <value value="0x020" name="8MHZ" cname="_IOSCFS_ON" /> - </tqmask> - <tqmask name="CPD" value="0x040" > + </mask> + <mask name="CPD" value="0x040" > <value value="0x000" name="All" cname="_CPDF_ON" /> <value value="0x040" name="Off" cname="_CPDF_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/12F609.xml b/src/devices/pic/xml_data/12F609.xml index 07f4b1f..d3409ee 100644 --- a/src/devices/pic/xml_data/12F609.xml +++ b/src/devices/pic/xml_data/12F609.xml @@ -39,15 +39,15 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x03FF" /> - <memory name="calibration" start="0x2008" end="0x2008" cal_optqmask="0x0000" cal_opcode="0x0000" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="calibration" start="0x2008" end="0x2008" cal_opmask="0x0000" cal_opcode="0x0000" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x03FF" > - <tqmask name="FOSC" value="0x0007" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x03FF" > + <mask name="FOSC" value="0x0007" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -56,32 +56,32 @@ <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" /> <value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" /> <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" /> - </tqmask> - <tqmask name="WDT" value="0x0008" > + </mask> + <mask name="WDT" value="0x0008" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0008" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0010" > + </mask> + <mask name="PWRTE" value="0x0010" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0010" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x0020" > + </mask> + <mask name="MCLRE" value="0x0020" > <value value="0x0000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x0020" name="External" cname="_MCLRE_ON" /> - </tqmask> - <tqmask name="CP" value="0x0040" > + </mask> + <mask name="CP" value="0x0040" > <value value="0x0000" name="All" cname="_CP_ON" /> <value value="0x0040" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="IOSCFS" value="0x0080" > + </mask> + <mask name="IOSCFS" value="0x0080" > <value value="0x0000" name="4MHZ" cname="_IOSCFS_4MHZ" /> <value value="0x0080" name="8MHZ" cname="_IOSCFS_8MHZ" /> - </tqmask> - <tqmask name="BODEN" value="0x0300" > + </mask> + <mask name="BODEN" value="0x0300" > <value value="default" name="Off" cname="_BOR_OFF" /> <value value="0x0200" name="On_run" cname="_BOR_NSLEEP" /> <value value="0x0300" name="On" cname="_BOR_ON" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/12F615.xml b/src/devices/pic/xml_data/12F615.xml index e90d419..d59445e 100644 --- a/src/devices/pic/xml_data/12F615.xml +++ b/src/devices/pic/xml_data/12F615.xml @@ -39,15 +39,15 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x03FF" /> - <memory name="calibration" start="0x2008" end="0x2008" cal_optqmask="0x0000" cal_opcode="0x0000" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="calibration" start="0x2008" end="0x2008" cal_opmask="0x0000" cal_opcode="0x0000" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x03FF" > - <tqmask name="FOSC" value="0x0007" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x03FF" > + <mask name="FOSC" value="0x0007" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -56,32 +56,32 @@ <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" /> <value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" /> <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" /> - </tqmask> - <tqmask name="WDT" value="0x0008" > + </mask> + <mask name="WDT" value="0x0008" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0008" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0010" > + </mask> + <mask name="PWRTE" value="0x0010" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0010" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x0020" > + </mask> + <mask name="MCLRE" value="0x0020" > <value value="0x0000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x0020" name="External" cname="_MCLRE_ON" /> - </tqmask> - <tqmask name="CP" value="0x0040" > + </mask> + <mask name="CP" value="0x0040" > <value value="0x0000" name="All" cname="_CP_ON" /> <value value="0x0040" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="IOSCFS" value="0x0080" > + </mask> + <mask name="IOSCFS" value="0x0080" > <value value="0x0000" name="4MHZ" cname="_IOSCFS_4MHZ" /> <value value="0x0080" name="8MHZ" cname="_IOSCFS_8MHZ" /> - </tqmask> - <tqmask name="BODEN" value="0x0300" > + </mask> + <mask name="BODEN" value="0x0300" > <value value="default" name="Off" cname="_BOR_OFF" /> <value value="0x0200" name="On_run" cname="_BOR_NSLEEP" /> <value value="0x0300" name="On" cname="_BOR_ON" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/12F629.xml b/src/devices/pic/xml_data/12F629.xml index 9c4553a..53c0cf4 100644 --- a/src/devices/pic/xml_data/12F629.xml +++ b/src/devices/pic/xml_data/12F629.xml @@ -36,16 +36,16 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x03FE" /> - <memory name="calibration" start="0x03FF" end="0x03FF" cal_optqmask="0x3C00" cal_opcode="0x3400" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="calibration" start="0x03FF" end="0x03FF" cal_opmask="0x3C00" cal_opcode="0x3400" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="eeprom" start="0x0000" end="0x007F" hexfile_offset="0x2100" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x31FF" bvalue="0x31FF" ptqmask="0x3000" > - <tqmask name="FOSC" value="0x0007" > + <config offset="0x0" name="" wmask="0x31FF" bvalue="0x31FF" pmask="0x3000" > + <mask name="FOSC" value="0x0007" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -54,37 +54,37 @@ <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" /> <value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" /> <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" /> - </tqmask> - <tqmask name="WDT" value="0x0008" > + </mask> + <mask name="WDT" value="0x0008" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0008" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0010" > + </mask> + <mask name="PWRTE" value="0x0010" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0010" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x0020" > + </mask> + <mask name="MCLRE" value="0x0020" > <value value="0x0000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x0020" name="External" cname="_MCLRE_ON" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="CP" value="0x0080" > + </mask> + <mask name="CP" value="0x0080" > <value value="0x0000" name="All" cname="_CP_ON" /> <value value="0x0080" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x0100" > + </mask> + <mask name="CPD" value="0x0100" > <value value="0x0000" name="All" cname="_CPD_ON" /> <value value="0x0100" name="Off" cname="_CPD_OFF" /> - </tqmask> - <tqmask name="BG" value="0x3000"> + </mask> + <mask name="BG" value="0x3000"> <value value="0x0000" name="Lowest" /> <value value="0x1000" name="Mid/Low" /> <value value="0x2000" name="Mid/High" /> <value value="0x3000" name="Highest" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/12F635.xml b/src/devices/pic/xml_data/12F635.xml index 3bf332d..f06c3b6 100644 --- a/src/devices/pic/xml_data/12F635.xml +++ b/src/devices/pic/xml_data/12F635.xml @@ -30,16 +30,16 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x03FF" /> - <memory name="calibration" start="0x2008" end="0x2009" cal_optqmask="0x0000" cal_opcode="0x0000" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="calibration" start="0x2008" end="0x2009" cal_opmask="0x0000" cal_opcode="0x0000" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="eeprom" start="0x0000" end="0x007F" hexfile_offset="0x2100" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x1FFF" > - <tqmask name="FOSC" value="0x0007" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x1FFF" > + <mask name="FOSC" value="0x0007" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -48,45 +48,45 @@ <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" /> <value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" /> <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" /> - </tqmask> - <tqmask name="WDT" value="0x0008" > + </mask> + <mask name="WDT" value="0x0008" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0008" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0010" > + </mask> + <mask name="PWRTE" value="0x0010" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0010" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x0020" > + </mask> + <mask name="MCLRE" value="0x0020" > <value value="0x0000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x0020" name="External" cname="_MCLRE_ON" /> - </tqmask> - <tqmask name="CP" value="0x0040" > + </mask> + <mask name="CP" value="0x0040" > <value value="0x0000" name="All" cname="_CP_ON" /> <value value="0x0040" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x0080" > + </mask> + <mask name="CPD" value="0x0080" > <value value="0x0000" name="All" cname="_CPD_ON" /> <value value="0x0080" name="Off" cname="_CPD_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0300" > + </mask> + <mask name="BODEN" value="0x0300" > <value value="0x0000" name="Off" cname="_BOD_OFF" /> <value value="0x0100" name="Software" cname="_BOD_SBODEN" /> <value value="0x0200" name="On_run" cname="_BOD_NSLEEP" /> <value value="0x0300" name="On" cname="_BOD_ON" /> - </tqmask> - <tqmask name="IESO" value="0x0400" > + </mask> + <mask name="IESO" value="0x0400" > <value value="0x0000" name="Off" cname="_IESO_OFF" /> <value value="0x0400" name="On" cname="_IESO_ON" /> - </tqmask> - <tqmask name="FCMEN" value="0x0800" > + </mask> + <mask name="FCMEN" value="0x0800" > <value value="0x0000" name="Off" cname="_FCMEN_OFF" /> <value value="0x0800" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="WUREN" value="0x1000" > + </mask> + <mask name="WUREN" value="0x1000" > <value value="0x0000" name="On" cname="_WUREN_ON" /> <value value="0x1000" name="Off" cname="_WUREN_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/12F675.xml b/src/devices/pic/xml_data/12F675.xml index e226b4f..6e0f054 100644 --- a/src/devices/pic/xml_data/12F675.xml +++ b/src/devices/pic/xml_data/12F675.xml @@ -36,16 +36,16 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x03FE" /> - <memory name="calibration" start="0x03FF" end="0x03FF" cal_optqmask="0x3C00" cal_opcode="0x3400" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="calibration" start="0x03FF" end="0x03FF" cal_opmask="0x3C00" cal_opcode="0x3400" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="eeprom" start="0x0000" end="0x007F" hexfile_offset="0x2100" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x31FF" bvalue="0x31FF" ptqmask="0x3000" > - <tqmask name="FOSC" value="0x0007" > + <config offset="0x0" name="" wmask="0x31FF" bvalue="0x31FF" pmask="0x3000" > + <mask name="FOSC" value="0x0007" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -54,37 +54,37 @@ <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" /> <value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" /> <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" /> - </tqmask> - <tqmask name="WDT" value="0x0008" > + </mask> + <mask name="WDT" value="0x0008" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0008" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0010" > + </mask> + <mask name="PWRTE" value="0x0010" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0010" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x0020" > + </mask> + <mask name="MCLRE" value="0x0020" > <value value="0x0000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x0020" name="External" cname="_MCLRE_ON" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="CP" value="0x0080" > + </mask> + <mask name="CP" value="0x0080" > <value value="0x0000" name="All" cname="_CP_ON" /> <value value="0x0080" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x0100" > + </mask> + <mask name="CPD" value="0x0100" > <value value="0x0000" name="All" cname="_CPD_ON" /> <value value="0x0100" name="Off" cname="_CPD_OFF" /> - </tqmask> - <tqmask name="BG" value="0x3000"> + </mask> + <mask name="BG" value="0x3000"> <value value="0x0000" name="Lowest" /> <value value="0x1000" name="Mid/Low" /> <value value="0x2000" name="Mid/High" /> <value value="0x3000" name="Highest" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/12F683.xml b/src/devices/pic/xml_data/12F683.xml index d80b5c1..1c23260 100644 --- a/src/devices/pic/xml_data/12F683.xml +++ b/src/devices/pic/xml_data/12F683.xml @@ -30,16 +30,16 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x07FF" /> - <memory name="calibration" start="0x2008" end="0x2008" cal_optqmask="0x0000" cal_opcode="0x0000" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="calibration" start="0x2008" end="0x2008" cal_opmask="0x0000" cal_opcode="0x0000" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x0FFF" > - <tqmask name="FOSC" value="0x0007" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x0FFF" > + <mask name="FOSC" value="0x0007" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -48,41 +48,41 @@ <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" /> <value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" /> <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" /> - </tqmask> - <tqmask name="WDT" value="0x0008" > + </mask> + <mask name="WDT" value="0x0008" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0008" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0010" > + </mask> + <mask name="PWRTE" value="0x0010" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0010" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x0020" > + </mask> + <mask name="MCLRE" value="0x0020" > <value value="0x0000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x0020" name="External" cname="_MCLRE_ON" /> - </tqmask> - <tqmask name="CP" value="0x0040" > + </mask> + <mask name="CP" value="0x0040" > <value value="0x0000" name="All" cname="_CP_ON" /> <value value="0x0040" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x0080" > + </mask> + <mask name="CPD" value="0x0080" > <value value="0x0000" name="All" cname="_CPD_ON" /> <value value="0x0080" name="Off" cname="_CPD_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0300" > + </mask> + <mask name="BODEN" value="0x0300" > <value value="0x0000" name="Off" cname="_BOD_OFF" /> <value value="0x0100" name="Software" cname="_BOD_SBODEN" /> <value value="0x0200" name="On_run" cname="_BOD_NSLEEP" /> <value value="0x0300" name="On" cname="_BOD_ON" /> - </tqmask> - <tqmask name="IESO" value="0x0400" > + </mask> + <mask name="IESO" value="0x0400" > <value value="0x0000" name="Off" cname="_IESO_OFF" /> <value value="0x0400" name="On" cname="_IESO_ON" /> - </tqmask> - <tqmask name="FCMEN" value="0x0800" > + </mask> + <mask name="FCMEN" value="0x0800" > <value value="0x0000" name="Off" cname="_FCMEN_OFF" /> <value value="0x0800" name="On" cname="_FCMEN_ON" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/14000.xml b/src/devices/pic/xml_data/14000.xml index 9ee23ed..8cf2db6 100644 --- a/src/devices/pic/xml_data/14000.xml +++ b/src/devices/pic/xml_data/14000.xml @@ -28,40 +28,40 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x0FBF" /> - <memory name="calibration" start="0x0FC0" end="0x0FFF" cal_optqmask="0x0000" cal_opcode="0x0000" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="calibration" start="0x0FC0" end="0x0FFF" cal_opmask="0x0000" cal_opcode="0x0000" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FBD" ptqmask="0x0042" > - <tqmask name="FOSC" value="0x0001" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FBD" pmask="0x0042" > + <mask name="FOSC" value="0x0001" > <value value="0x0000" name="HS" cname="_FOSC_HS" /> <value value="0x0001" name="INTRC" cname="_FOSC_RC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="TRIM" value="0x0042" > + </mask> + <mask name="TRIM" value="0x0042" > <value value="0x0000" name="00" /> <value value="0x0002" name="01" /> <value value="0x0040" name="10" /> <value value="0x0042" name="11" /> - </tqmask> - <tqmask name="CP" value="0x1E30" > + </mask> + <mask name="CP" value="0x1E30" > <value value="0x0000" name="All" cname="_CPP_ON _CPU_ON" /> <value value="0x1E30" name="Off" cname="_CPP_OFF _CPU_OFF" /> <value value="default" name="invalid" /> - </tqmask> - <tqmask name="CPC" value="0x2180" > + </mask> + <mask name="CPC" value="0x2180" > <value value="0x0000" name="All" cname="_CPC_ON" /> <value value="0x2180" name="Off" cname="_CPC_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C432.xml b/src/devices/pic/xml_data/16C432.xml index bed76d2..e112d5c 100644 --- a/src/devices/pic/xml_data/16C432.xml +++ b/src/devices/pic/xml_data/16C432.xml @@ -29,36 +29,36 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x07FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="CP" value="0x3F30" > + </mask> + <mask name="CP" value="0x3F30" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1510" name="200:7FF" cname="_CP_75" /> <value value="0x2A20" name="400:7FF" cname="_CP_50" /> <value value="0x3F30" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C433.xml b/src/devices/pic/xml_data/16C433.xml index 6dad096..cf07aaa 100644 --- a/src/devices/pic/xml_data/16C433.xml +++ b/src/devices/pic/xml_data/16C433.xml @@ -29,13 +29,13 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x07FE" /> - <memory name="calibration" start="0x07FF" end="0x07FF" cal_optqmask="0x3C00" cal_opcode="0x3400" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="calibration" start="0x07FF" end="0x07FF" cal_opmask="0x3C00" cal_opcode="0x3400" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" > - <tqmask name="FOSC" value="0x0007" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" > + <mask name="FOSC" value="0x0007" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -44,26 +44,26 @@ <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" /> <value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRC_OSC" /> <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" /> - </tqmask> - <tqmask name="WDT" value="0x0008" > + </mask> + <mask name="WDT" value="0x0008" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0008" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0010" > + </mask> + <mask name="PWRTE" value="0x0010" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0010" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x0080" > + </mask> + <mask name="MCLRE" value="0x0080" > <value value="0x0000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x0080" name="External" cname="_MCLRE_ON" /> - </tqmask> - <tqmask name="CP" value="0x3F60" > + </mask> + <mask name="CP" value="0x3F60" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1520" name="200:7FE" cname="_CP_75" /> <value value="0x2A40" name="400:7FE" cname="_CP_50" /> <value value="0x3F60" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C505.xml b/src/devices/pic/xml_data/16C505.xml index 6fa7f11..2cbe2c9 100644 --- a/src/devices/pic/xml_data/16C505.xml +++ b/src/devices/pic/xml_data/16C505.xml @@ -35,13 +35,13 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000" end="0x3FE" /> - <memory name="calibration" start="0x3FF" end="0x3FF" cal_optqmask="0xF00" cal_opcode="0xC00" /> - <memory name="user_ids" start="0x400" end="0x403" rtqmask="0x00F" /> + <memory name="calibration" start="0x3FF" end="0x3FF" cal_opmask="0xF00" cal_opcode="0xC00" /> + <memory name="user_ids" start="0x400" end="0x403" rmask="0x00F" /> <memory name="config" start="0xFFF" end="0xFFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0xFFF" bvalue="0xFFF" > - <tqmask name="FOSC" value="0x007" > + <config offset="0x0" name="" wmask="0xFFF" bvalue="0xFFF" > + <mask name="FOSC" value="0x007" > <value value="0x000" name="LP" cname="_LP_OSC" /> <value value="0x001" name="XT" cname="_XT_OSC" /> <value value="0x002" name="HS" cname="_HS_OSC" /> @@ -50,20 +50,20 @@ <value value="0x005" name="INTRC_CLKOUT" cname="_IntRC_OSC_CLKOUTEN" /> <value value="0x006" name="EXTRC_IO" cname="_ExtRC_OSC_RB4EN" /> <value value="0x007" name="EXTRC_CLKOUT" cname="_ExtRC_OSC_CLKOUTEN" /> - </tqmask> - <tqmask name="WDT" value="0x008" > + </mask> + <mask name="WDT" value="0x008" > <value value="0x000" name="Off" cname="_WDT_OFF" /> <value value="0x008" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x020" > + </mask> + <mask name="MCLRE" value="0x020" > <value value="0x000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x020" name="External" cname="_MCLRE_ON" /> - </tqmask> - <tqmask name="CP" value="0xFD0" > + </mask> + <mask name="CP" value="0xFD0" > <value value="0x000" name="040:3FE" cname="_CP_ON" /> <value value="0xFD0" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C52.xml b/src/devices/pic/xml_data/16C52.xml index f9c1a59..6ef7753 100644 --- a/src/devices/pic/xml_data/16C52.xml +++ b/src/devices/pic/xml_data/16C52.xml @@ -30,16 +30,16 @@ <memory name="config" start="0xFFF" end="0xFFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x008" bvalue="0x00B" > - <tqmask name="FOSC" value="0x003" > + <config offset="0x0" name="" wmask="0x008" bvalue="0x00B" > + <mask name="FOSC" value="0x003" > <value value="default" name="invalid" /> <value value="0x001" name="XT" cname="_XT_OSC" /> <value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="CP" value="0x008" > + </mask> + <mask name="CP" value="0x008" > <value value="0x000" name="All" cname="_CP_ON" /> <value value="0x008" name="Off" cname="_CP_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C54.xml b/src/devices/pic/xml_data/16C54.xml index 2620238..06455ee 100644 --- a/src/devices/pic/xml_data/16C54.xml +++ b/src/devices/pic/xml_data/16C54.xml @@ -36,25 +36,25 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000" end="0x1FF" /> - <memory name="user_ids" start="0x200" end="0x203" rtqmask="0x00F" /> + <memory name="user_ids" start="0x200" end="0x203" rmask="0x00F" /> <memory name="config" start="0xFFF" end="0xFFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x00C" bvalue="0x00F" > - <tqmask name="FOSC" value="0x003" > + <config offset="0x0" name="" wmask="0x00C" bvalue="0x00F" > + <mask name="FOSC" value="0x003" > <value value="0x000" name="LP" cname="_LP_OSC" /> <value value="0x001" name="XT" cname="_XT_OSC" /> <value value="0x002" name="HS" cname="_HS_OSC" /> <value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x004" > + </mask> + <mask name="WDT" value="0x004" > <value value="0x000" name="Off" cname="_WDT_OFF" /> <value value="0x004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="CP" value="0x008" > + </mask> + <mask name="CP" value="0x008" > <value value="0x000" name="All" cname="_CP_ON" /> <value value="0x008" name="Off" cname="_CP_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C54A.xml b/src/devices/pic/xml_data/16C54A.xml index ae365d8..c264f10 100644 --- a/src/devices/pic/xml_data/16C54A.xml +++ b/src/devices/pic/xml_data/16C54A.xml @@ -45,26 +45,26 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000" end="0x1FF" /> - <memory name="user_ids" start="0x200" end="0x203" rtqmask="0x00F" /> + <memory name="user_ids" start="0x200" end="0x203" rmask="0x00F" /> <memory name="config" start="0xFFF" end="0xFFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0xFFC" bvalue="0xFFF" > - <tqmask name="FOSC" value="0x003" > + <config offset="0x0" name="" wmask="0xFFC" bvalue="0xFFF" > + <mask name="FOSC" value="0x003" > <value value="0x000" name="LP" cname="_LP_OSC" /> <value value="0x001" name="XT" cname="_XT_OSC" /> <value value="0x002" name="HS" cname="_HS_OSC" /> <value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x004" > + </mask> + <mask name="WDT" value="0x004" > <value value="0x000" name="Off" cname="_WDT_OFF" /> <value value="0x004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="CP" value="0xFF8" > + </mask> + <mask name="CP" value="0xFF8" > <value value="0x000" name="All" cname="_CP_ON" /> <value value="0xFF8" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C54B.xml b/src/devices/pic/xml_data/16C54B.xml index da0ae9a..d20ae0e 100644 --- a/src/devices/pic/xml_data/16C54B.xml +++ b/src/devices/pic/xml_data/16C54B.xml @@ -40,26 +40,26 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000" end="0x1FF" /> - <memory name="user_ids" start="0x200" end="0x203" rtqmask="0x00F" /> + <memory name="user_ids" start="0x200" end="0x203" rmask="0x00F" /> <memory name="config" start="0xFFF" end="0xFFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0xFFC" bvalue="0xFFF" > - <tqmask name="FOSC" value="0x003" > + <config offset="0x0" name="" wmask="0xFFC" bvalue="0xFFF" > + <mask name="FOSC" value="0x003" > <value value="0x000" name="LP" cname="_LP_OSC" /> <value value="0x001" name="XT" cname="_XT_OSC" /> <value value="0x002" name="HS" cname="_HS_OSC" /> <value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x004" > + </mask> + <mask name="WDT" value="0x004" > <value value="0x000" name="Off" cname="_WDT_OFF" /> <value value="0x004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="CP" value="0xFF8" > + </mask> + <mask name="CP" value="0xFF8" > <value value="0x000" name="040:1FF" cname="_CP_ON" /> <value value="0xFF8" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C54C.xml b/src/devices/pic/xml_data/16C54C.xml index 629d54e..0d1907b 100644 --- a/src/devices/pic/xml_data/16C54C.xml +++ b/src/devices/pic/xml_data/16C54C.xml @@ -40,26 +40,26 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000" end="0x1FF" /> - <memory name="user_ids" start="0x200" end="0x203" rtqmask="0x00F" /> + <memory name="user_ids" start="0x200" end="0x203" rmask="0x00F" /> <memory name="config" start="0xFFF" end="0xFFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0xFFC" bvalue="0xFFF" > - <tqmask name="FOSC" value="0x003" > + <config offset="0x0" name="" wmask="0xFFC" bvalue="0xFFF" > + <mask name="FOSC" value="0x003" > <value value="0x000" name="LP" cname="_LP_OSC" /> <value value="0x001" name="XT" cname="_XT_OSC" /> <value value="0x002" name="HS" cname="_HS_OSC" /> <value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x004" > + </mask> + <mask name="WDT" value="0x004" > <value value="0x000" name="Off" cname="_WDT_OFF" /> <value value="0x004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="CP" value="0xFF8" > + </mask> + <mask name="CP" value="0xFF8" > <value value="0x000" name="040:1FF" cname="_CP_ON" /> <value value="0xFF8" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C55.xml b/src/devices/pic/xml_data/16C55.xml index 30d2d4e..0d93443 100644 --- a/src/devices/pic/xml_data/16C55.xml +++ b/src/devices/pic/xml_data/16C55.xml @@ -36,25 +36,25 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000" end="0x1FF" /> - <memory name="user_ids" start="0x200" end="0x203" rtqmask="0x00F" /> + <memory name="user_ids" start="0x200" end="0x203" rmask="0x00F" /> <memory name="config" start="0xFFF" end="0xFFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x00C" bvalue="0x00F" > - <tqmask name="FOSC" value="0x003" > + <config offset="0x0" name="" wmask="0x00C" bvalue="0x00F" > + <mask name="FOSC" value="0x003" > <value value="0x000" name="LP" cname="_LP_OSC" /> <value value="0x001" name="XT" cname="_XT_OSC" /> <value value="0x002" name="HS" cname="_HS_OSC" /> <value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x004" > + </mask> + <mask name="WDT" value="0x004" > <value value="0x000" name="Off" cname="_WDT_OFF" /> <value value="0x004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="CP" value="0x008" > + </mask> + <mask name="CP" value="0x008" > <value value="0x000" name="All" cname="_CP_ON" /> <value value="0x008" name="Off" cname="_CP_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C554.xml b/src/devices/pic/xml_data/16C554.xml index 42bb60f..1723220 100644 --- a/src/devices/pic/xml_data/16C554.xml +++ b/src/devices/pic/xml_data/16C554.xml @@ -38,30 +38,30 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x01FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FBC" bvalue="0x3F3F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FBC" bvalue="0x3F3F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="CP" value="0x3F30" > + </mask> + <mask name="CP" value="0x3F30" > <value value="0x0000" name="All" cname="_CP_ON" /> <value value="0x3F30" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C557.xml b/src/devices/pic/xml_data/16C557.xml index 0d37913..3a9ddab 100644 --- a/src/devices/pic/xml_data/16C557.xml +++ b/src/devices/pic/xml_data/16C557.xml @@ -43,32 +43,32 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x07FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FBC" bvalue="0x3F3F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FBC" bvalue="0x3F3F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="CP" value="0x3F30" > + </mask> + <mask name="CP" value="0x3F30" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1510" name="200:7FF" cname="_CP_75" /> <value value="0x2A20" name="400:7FF" cname="_CP_50" /> <value value="0x3F30" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C558.xml b/src/devices/pic/xml_data/16C558.xml index 36cd4e8..484efee 100644 --- a/src/devices/pic/xml_data/16C558.xml +++ b/src/devices/pic/xml_data/16C558.xml @@ -40,32 +40,32 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x07FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FBC" bvalue="0x3F3F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FBC" bvalue="0x3F3F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="CP" value="0x3F30" > + </mask> + <mask name="CP" value="0x3F30" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1510" name="200:7FF" cname="_CP_75" /> <value value="0x2A20" name="400:7FF" cname="_CP_50" /> <value value="0x3F30" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C55A.xml b/src/devices/pic/xml_data/16C55A.xml index 6bcc1be..27b9eac 100644 --- a/src/devices/pic/xml_data/16C55A.xml +++ b/src/devices/pic/xml_data/16C55A.xml @@ -40,26 +40,26 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000" end="0x1FF" /> - <memory name="user_ids" start="0x200" end="0x203" rtqmask="0x00F" /> + <memory name="user_ids" start="0x200" end="0x203" rmask="0x00F" /> <memory name="config" start="0xFFF" end="0xFFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0xFFC" bvalue="0xFFF" > - <tqmask name="FOSC" value="0x003" > + <config offset="0x0" name="" wmask="0xFFC" bvalue="0xFFF" > + <mask name="FOSC" value="0x003" > <value value="0x000" name="LP" cname="_LP_OSC" /> <value value="0x001" name="XT" cname="_XT_OSC" /> <value value="0x002" name="HS" cname="_HS_OSC" /> <value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x004" > + </mask> + <mask name="WDT" value="0x004" > <value value="0x000" name="Off" cname="_WDT_OFF" /> <value value="0x004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="CP" value="0xFF8" > + </mask> + <mask name="CP" value="0xFF8" > <value value="0x000" name="040:1FF" cname="_CP_ON" /> <value value="0xFF8" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C56.xml b/src/devices/pic/xml_data/16C56.xml index cddfd3e..a8ec195 100644 --- a/src/devices/pic/xml_data/16C56.xml +++ b/src/devices/pic/xml_data/16C56.xml @@ -36,25 +36,25 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000" end="0x3FF" /> - <memory name="user_ids" start="0x400" end="0x403" rtqmask="0x00F" /> + <memory name="user_ids" start="0x400" end="0x403" rmask="0x00F" /> <memory name="config" start="0xFFF" end="0xFFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x00C" bvalue="0x00F" > - <tqmask name="FOSC" value="0x003" > + <config offset="0x0" name="" wmask="0x00C" bvalue="0x00F" > + <mask name="FOSC" value="0x003" > <value value="0x000" name="LP" cname="_LP_OSC" /> <value value="0x001" name="XT" cname="_XT_OSC" /> <value value="0x002" name="HS" cname="_HS_OSC" /> <value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x004" > + </mask> + <mask name="WDT" value="0x004" > <value value="0x000" name="Off" cname="_WDT_OFF" /> <value value="0x004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="CP" value="0x008" > + </mask> + <mask name="CP" value="0x008" > <value value="0x000" name="All" cname="_CP_ON" /> <value value="0x008" name="Off" cname="_CP_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C56A.xml b/src/devices/pic/xml_data/16C56A.xml index 6e29f70..0543765 100644 --- a/src/devices/pic/xml_data/16C56A.xml +++ b/src/devices/pic/xml_data/16C56A.xml @@ -40,26 +40,26 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000" end="0x3FF" /> - <memory name="user_ids" start="0x400" end="0x403" rtqmask="0x00F" /> + <memory name="user_ids" start="0x400" end="0x403" rmask="0x00F" /> <memory name="config" start="0xFFF" end="0xFFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0xFFC" bvalue="0xFFF" > - <tqmask name="FOSC" value="0x003" > + <config offset="0x0" name="" wmask="0xFFC" bvalue="0xFFF" > + <mask name="FOSC" value="0x003" > <value value="0x000" name="LP" cname="_LP_OSC" /> <value value="0x001" name="XT" cname="_XT_OSC" /> <value value="0x002" name="HS" cname="_HS_OSC" /> <value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x004" > + </mask> + <mask name="WDT" value="0x004" > <value value="0x000" name="Off" cname="_WDT_OFF" /> <value value="0x004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="CP" value="0xFF8" > + </mask> + <mask name="CP" value="0xFF8" > <value value="0x000" name="040:3FF" cname="_CP_ON" /> <value value="0xFF8" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C57.xml b/src/devices/pic/xml_data/16C57.xml index 4791ee9..4aef05a 100644 --- a/src/devices/pic/xml_data/16C57.xml +++ b/src/devices/pic/xml_data/16C57.xml @@ -36,25 +36,25 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000" end="0x7FF" /> - <memory name="user_ids" start="0x800" end="0x803" rtqmask="0x00F" /> + <memory name="user_ids" start="0x800" end="0x803" rmask="0x00F" /> <memory name="config" start="0xFFF" end="0xFFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x00C" bvalue="0x00F" > - <tqmask name="FOSC" value="0x003" > + <config offset="0x0" name="" wmask="0x00C" bvalue="0x00F" > + <mask name="FOSC" value="0x003" > <value value="0x000" name="LP" cname="_LP_OSC" /> <value value="0x001" name="XT" cname="_XT_OSC" /> <value value="0x002" name="HS" cname="_HS_OSC" /> <value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x004" > + </mask> + <mask name="WDT" value="0x004" > <value value="0x000" name="Off" cname="_WDT_OFF" /> <value value="0x004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="CP" value="0x008" > + </mask> + <mask name="CP" value="0x008" > <value value="0x000" name="All" cname="_CP_ON" /> <value value="0x008" name="Off" cname="_CP_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C57C.xml b/src/devices/pic/xml_data/16C57C.xml index 4477c00..4d5f180 100644 --- a/src/devices/pic/xml_data/16C57C.xml +++ b/src/devices/pic/xml_data/16C57C.xml @@ -40,26 +40,26 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000" end="0x7FF" /> - <memory name="user_ids" start="0x800" end="0x803" rtqmask="0x00F" /> + <memory name="user_ids" start="0x800" end="0x803" rmask="0x00F" /> <memory name="config" start="0xFFF" end="0xFFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0xFFC" bvalue="0xFFF" > - <tqmask name="FOSC" value="0x003" > + <config offset="0x0" name="" wmask="0xFFC" bvalue="0xFFF" > + <mask name="FOSC" value="0x003" > <value value="0x000" name="LP" cname="_LP_OSC" /> <value value="0x001" name="XT" cname="_XT_OSC" /> <value value="0x002" name="HS" cname="_HS_OSC" /> <value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x004" > + </mask> + <mask name="WDT" value="0x004" > <value value="0x000" name="Off" cname="_WDT_OFF" /> <value value="0x004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="CP" value="0xFF8" > + </mask> + <mask name="CP" value="0xFF8" > <value value="0x000" name="040:7FF" cname="_CP_ON" /> <value value="0xFF8" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C58A.xml b/src/devices/pic/xml_data/16C58A.xml index e4798ce..a12abb6 100644 --- a/src/devices/pic/xml_data/16C58A.xml +++ b/src/devices/pic/xml_data/16C58A.xml @@ -45,25 +45,25 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000" end="0x7FF" /> - <memory name="user_ids" start="0x800" end="0x803" rtqmask="0x00F" /> + <memory name="user_ids" start="0x800" end="0x803" rmask="0x00F" /> <memory name="config" start="0xFFF" end="0xFFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x00C" bvalue="0x00F" > - <tqmask name="FOSC" value="0x003" > + <config offset="0x0" name="" wmask="0x00C" bvalue="0x00F" > + <mask name="FOSC" value="0x003" > <value value="0x000" name="LP" cname="_LP_OSC" /> <value value="0x001" name="XT" cname="_XT_OSC" /> <value value="0x002" name="HS" cname="_HS_OSC" /> <value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x004" > + </mask> + <mask name="WDT" value="0x004" > <value value="0x000" name="Off" cname="_WDT_OFF" /> <value value="0x004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="CP" value="0x008" > + </mask> + <mask name="CP" value="0x008" > <value value="0x000" name="All" cname="_CP_ON" /> <value value="0x008" name="Off" cname="_CP_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C58B.xml b/src/devices/pic/xml_data/16C58B.xml index 48e910e..04f56ce 100644 --- a/src/devices/pic/xml_data/16C58B.xml +++ b/src/devices/pic/xml_data/16C58B.xml @@ -40,26 +40,26 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000" end="0x7FF" /> - <memory name="user_ids" start="0x800" end="0x803" rtqmask="0x00F" /> + <memory name="user_ids" start="0x800" end="0x803" rmask="0x00F" /> <memory name="config" start="0xFFF" end="0xFFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0xFFC" bvalue="0xFFF" > - <tqmask name="FOSC" value="0x003" > + <config offset="0x0" name="" wmask="0xFFC" bvalue="0xFFF" > + <mask name="FOSC" value="0x003" > <value value="0x000" name="LP" cname="_LP_OSC" /> <value value="0x001" name="XT" cname="_XT_OSC" /> <value value="0x002" name="HS" cname="_HS_OSC" /> <value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x004" > + </mask> + <mask name="WDT" value="0x004" > <value value="0x000" name="Off" cname="_WDT_OFF" /> <value value="0x004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="CP" value="0xFF8" > + </mask> + <mask name="CP" value="0xFF8" > <value value="0x000" name="040:7FF" cname="_CP_ON" /> <value value="0xFF8" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C61.xml b/src/devices/pic/xml_data/16C61.xml index 6812ee7..0b62c88 100644 --- a/src/devices/pic/xml_data/16C61.xml +++ b/src/devices/pic/xml_data/16C61.xml @@ -34,29 +34,29 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x03FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x001F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x001F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="Off" cname="_PWRTE_OFF" /> <value value="0x0008" name="On" cname="_PWRTE_ON" /> - </tqmask> - <tqmask name="CP" value="0x0010" > + </mask> + <mask name="CP" value="0x0010" > <value value="0x0000" name="All" cname="_CP_ON" /> <value value="0x0010" name="Off" cname="_CP_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C62.xml b/src/devices/pic/xml_data/16C62.xml index e1a3764..8eebe47 100644 --- a/src/devices/pic/xml_data/16C62.xml +++ b/src/devices/pic/xml_data/16C62.xml @@ -33,31 +33,31 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x07FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x003F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x003F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="Off" cname="_PWRTE_OFF" /> <value value="0x0008" name="On" cname="_PWRTE_ON" /> - </tqmask> - <tqmask name="CP" value="0x0030" > + </mask> + <mask name="CP" value="0x0030" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x0010" name="200:7FF" cname="_CP_75" /> <value value="0x0020" name="400:7FF" cname="_CP_50" /> <value value="0x0030" name="Off" cname="_CP_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C620.xml b/src/devices/pic/xml_data/16C620.xml index 522beaa..8a676af 100644 --- a/src/devices/pic/xml_data/16C620.xml +++ b/src/devices/pic/xml_data/16C620.xml @@ -35,34 +35,34 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x01FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="CP" value="0x3F30" > + </mask> + <mask name="CP" value="0x3F30" > <value value="0x0000" name="All" cname="_CP_ON" /> <value value="0x3F30" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C620A.xml b/src/devices/pic/xml_data/16C620A.xml index a36b1c6..9770da4 100644 --- a/src/devices/pic/xml_data/16C620A.xml +++ b/src/devices/pic/xml_data/16C620A.xml @@ -39,34 +39,34 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x01FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="CP" value="0x3F30" > + </mask> + <mask name="CP" value="0x3F30" > <value value="0x0000" name="All" cname="_CP_ON" /> <value value="0x3F30" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C621.xml b/src/devices/pic/xml_data/16C621.xml index 745ba82..401ee06 100644 --- a/src/devices/pic/xml_data/16C621.xml +++ b/src/devices/pic/xml_data/16C621.xml @@ -36,35 +36,35 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x03FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="CP" value="0x3F30" > + </mask> + <mask name="CP" value="0x3F30" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1510" name="200:3FF" cname="_CP_50" /> <value value="0x3F30" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C621A.xml b/src/devices/pic/xml_data/16C621A.xml index 3e48bd4..97e136e 100644 --- a/src/devices/pic/xml_data/16C621A.xml +++ b/src/devices/pic/xml_data/16C621A.xml @@ -40,35 +40,35 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x03FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="CP" value="0x3F30" > + </mask> + <mask name="CP" value="0x3F30" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1510" name="200:3FF" cname="_CP_50" /> <value value="0x3F30" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C622.xml b/src/devices/pic/xml_data/16C622.xml index 9617071..f1675bc 100644 --- a/src/devices/pic/xml_data/16C622.xml +++ b/src/devices/pic/xml_data/16C622.xml @@ -37,36 +37,36 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x07FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="CP" value="0x3F30" > + </mask> + <mask name="CP" value="0x3F30" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1510" name="200:7FF" cname="_CP_75" /> <value value="0x2A20" name="400:7FF" cname="_CP_50" /> <value value="0x3F30" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C622A.xml b/src/devices/pic/xml_data/16C622A.xml index 26b691e..04e0d9b 100644 --- a/src/devices/pic/xml_data/16C622A.xml +++ b/src/devices/pic/xml_data/16C622A.xml @@ -41,36 +41,36 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x07FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="CP" value="0x3F30" > + </mask> + <mask name="CP" value="0x3F30" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1510" name="200:7FF" cname="_CP_75" /> <value value="0x2A20" name="400:7FF" cname="_CP_50" /> <value value="0x3F30" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C62A.xml b/src/devices/pic/xml_data/16C62A.xml index 00c16ea..71bf13f 100644 --- a/src/devices/pic/xml_data/16C62A.xml +++ b/src/devices/pic/xml_data/16C62A.xml @@ -33,36 +33,36 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x07FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="CP" value="0x3F30" > + </mask> + <mask name="CP" value="0x3F30" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1510" name="200:7FF" cname="_CP_75" /> <value value="0x2A20" name="400:7FF" cname="_CP_50" /> <value value="0x3F30" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C62B.xml b/src/devices/pic/xml_data/16C62B.xml index 749c9c8..6550cbb 100644 --- a/src/devices/pic/xml_data/16C62B.xml +++ b/src/devices/pic/xml_data/16C62B.xml @@ -33,36 +33,36 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x07FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="CP" value="0x3F30" > + </mask> + <mask name="CP" value="0x3F30" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1510" name="200:7FF" cname="_CP_75" /> <value value="0x2A20" name="400:7FF" cname="_CP_50" /> <value value="0x3F30" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C63.xml b/src/devices/pic/xml_data/16C63.xml index 16432ee..7d21001 100644 --- a/src/devices/pic/xml_data/16C63.xml +++ b/src/devices/pic/xml_data/16C63.xml @@ -33,36 +33,36 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x0FFF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="CP" value="0x3F30" > + </mask> + <mask name="CP" value="0x3F30" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1510" name="400:FFF" cname="_CP_75" /> <value value="0x2A20" name="800:FFF" cname="_CP_50" /> <value value="0x3F30" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C63A.xml b/src/devices/pic/xml_data/16C63A.xml index 6499148..2a3eac3 100644 --- a/src/devices/pic/xml_data/16C63A.xml +++ b/src/devices/pic/xml_data/16C63A.xml @@ -34,36 +34,36 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x0FFF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="CP" value="0x3F30" > + </mask> + <mask name="CP" value="0x3F30" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1510" name="400:FFF" cname="_CP_75" /> <value value="0x2A20" name="800:FFF" cname="_CP_50" /> <value value="0x3F30" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C64.xml b/src/devices/pic/xml_data/16C64.xml index fa3998d..2bd6f77 100644 --- a/src/devices/pic/xml_data/16C64.xml +++ b/src/devices/pic/xml_data/16C64.xml @@ -33,31 +33,31 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x07FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x003F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x003F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="Off" cname="_PWRTE_OFF" /> <value value="0x0008" name="On" cname="_PWRTE_ON" /> - </tqmask> - <tqmask name="CP" value="0x0030" > + </mask> + <mask name="CP" value="0x0030" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x0010" name="200:7FF" cname="_CP_75" /> <value value="0x0020" name="400:7FF" cname="_CP_50" /> <value value="0x0030" name="Off" cname="_CP_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C641.xml b/src/devices/pic/xml_data/16C641.xml index 74e5fd5..2a819ff 100644 --- a/src/devices/pic/xml_data/16C641.xml +++ b/src/devices/pic/xml_data/16C641.xml @@ -28,40 +28,40 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x07FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="MPEEN" value="0x0080" > + </mask> + <mask name="MPEEN" value="0x0080" > <value value="0x0000" name="Off" cname="_MPEEN_OFF" /> <value value="0x0080" name="On" cname="_MPEEN_ON" /> - </tqmask> - <tqmask name="CP" value="0x3F30" > + </mask> + <mask name="CP" value="0x3F30" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1510" name="400:7FF" cname="_CP_50" /> <value value="0x2A20" name="200:7FF" cname="_CP_75" /> <value value="0x3F30" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C642.xml b/src/devices/pic/xml_data/16C642.xml index e9bc07a..c5847a9 100644 --- a/src/devices/pic/xml_data/16C642.xml +++ b/src/devices/pic/xml_data/16C642.xml @@ -33,40 +33,40 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x0FFF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="MPEEN" value="0x0080" > + </mask> + <mask name="MPEEN" value="0x0080" > <value value="0x0000" name="Off" cname="_MPEEN_OFF" /> <value value="0x0080" name="On" cname="_MPEEN_ON" /> - </tqmask> - <tqmask name="CP" value="0x3F30" > + </mask> + <mask name="CP" value="0x3F30" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1510" name="400:FFF" cname="_CP_75" /> <value value="0x2A20" name="800:FFF" cname="_CP_50" /> <value value="0x3F30" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C64A.xml b/src/devices/pic/xml_data/16C64A.xml index 274da63..c5331e6 100644 --- a/src/devices/pic/xml_data/16C64A.xml +++ b/src/devices/pic/xml_data/16C64A.xml @@ -33,36 +33,36 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x07FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="CP" value="0x3F30" > + </mask> + <mask name="CP" value="0x3F30" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1510" name="200:7FF" cname="_CP_75" /> <value value="0x2A20" name="400:7FF" cname="_CP_50" /> <value value="0x3F30" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C65.xml b/src/devices/pic/xml_data/16C65.xml index 13ff265..1d5de06 100644 --- a/src/devices/pic/xml_data/16C65.xml +++ b/src/devices/pic/xml_data/16C65.xml @@ -33,31 +33,31 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x0FFF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x003F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x003F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="Off" cname="_PWRTE_OFF" /> <value value="0x0008" name="On" cname="_PWRTE_ON" /> - </tqmask> - <tqmask name="CP" value="0x0030" > + </mask> + <mask name="CP" value="0x0030" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x0010" name="400:FFF" cname="_CP_75" /> <value value="0x0020" name="800:FFF" cname="_CP_50" /> <value value="0x0030" name="Off" cname="_CP_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C65A.xml b/src/devices/pic/xml_data/16C65A.xml index 32d4280..4220f2d 100644 --- a/src/devices/pic/xml_data/16C65A.xml +++ b/src/devices/pic/xml_data/16C65A.xml @@ -33,36 +33,36 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x0FFF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="CP" value="0x3F30" > + </mask> + <mask name="CP" value="0x3F30" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1510" name="400:FFF" cname="_CP_75" /> <value value="0x2A20" name="800:FFF" cname="_CP_50" /> <value value="0x3F30" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C65B.xml b/src/devices/pic/xml_data/16C65B.xml index 6463d62..c5eae8a 100644 --- a/src/devices/pic/xml_data/16C65B.xml +++ b/src/devices/pic/xml_data/16C65B.xml @@ -34,36 +34,36 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x0FFF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="CP" value="0x3F30" > + </mask> + <mask name="CP" value="0x3F30" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1510" name="400:FFF" cname="_CP_75" /> <value value="0x2A20" name="800:FFF" cname="_CP_50" /> <value value="0x3F30" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C66.xml b/src/devices/pic/xml_data/16C66.xml index 08f25d5..bfa3307 100644 --- a/src/devices/pic/xml_data/16C66.xml +++ b/src/devices/pic/xml_data/16C66.xml @@ -33,36 +33,36 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x1FFF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="CP" value="0x3F30" > + </mask> + <mask name="CP" value="0x3F30" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1510" name="0800:1FFF" cname="_CP_75" /> <value value="0x2A20" name="1000:1FFF" cname="_CP_50" /> <value value="0x3F30" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C661.xml b/src/devices/pic/xml_data/16C661.xml index 36f2bd0..612f636 100644 --- a/src/devices/pic/xml_data/16C661.xml +++ b/src/devices/pic/xml_data/16C661.xml @@ -28,40 +28,40 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x07FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="MPEEN" value="0x0080" > + </mask> + <mask name="MPEEN" value="0x0080" > <value value="0x0000" name="Off" cname="_MPEEN_OFF" /> <value value="0x0080" name="On" cname="_MPEEN_ON" /> - </tqmask> - <tqmask name="CP" value="0x3F30" > + </mask> + <mask name="CP" value="0x3F30" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1510" name="200:7FF" cname="_CP_75" /> <value value="0x2A20" name="400:7FF" cname="_CP_50" /> <value value="0x3F30" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C662.xml b/src/devices/pic/xml_data/16C662.xml index ffd6fdc..a09c5c5 100644 --- a/src/devices/pic/xml_data/16C662.xml +++ b/src/devices/pic/xml_data/16C662.xml @@ -33,40 +33,40 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x0FFF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="MPEEN" value="0x0080" > + </mask> + <mask name="MPEEN" value="0x0080" > <value value="0x0000" name="Off" cname="_MPEEN_OFF" /> <value value="0x0080" name="On" cname="_MPEEN_ON" /> - </tqmask> - <tqmask name="CP" value="0x3F30" > + </mask> + <mask name="CP" value="0x3F30" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1510" name="400:FFF" cname="_CP_75" /> <value value="0x2A20" name="800:FFF" cname="_CP_50" /> <value value="0x3F30" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C67.xml b/src/devices/pic/xml_data/16C67.xml index 26cbb43..43c1aa1 100644 --- a/src/devices/pic/xml_data/16C67.xml +++ b/src/devices/pic/xml_data/16C67.xml @@ -33,36 +33,36 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x1FFF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="CP" value="0x3F30" > + </mask> + <mask name="CP" value="0x3F30" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1510" name="0800:1FFF" cname="_CP_75" /> <value value="0x2A20" name="1000:1FFF" cname="_CP_50" /> <value value="0x3F30" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C71.xml b/src/devices/pic/xml_data/16C71.xml index e453bfa..d23acc3 100644 --- a/src/devices/pic/xml_data/16C71.xml +++ b/src/devices/pic/xml_data/16C71.xml @@ -31,29 +31,29 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x03FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x001F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x001F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="Off" cname="_PWRTE_OFF" /> <value value="0x0008" name="On" cname="_PWRTE_ON" /> - </tqmask> - <tqmask name="CP" value="0x0010" > + </mask> + <mask name="CP" value="0x0010" > <value value="0x0000" name="All" cname="_CP_ON" /> <value value="0x0010" name="Off" cname="_CP_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C710.xml b/src/devices/pic/xml_data/16C710.xml index 62b36a3..d6a90c2 100644 --- a/src/devices/pic/xml_data/16C710.xml +++ b/src/devices/pic/xml_data/16C710.xml @@ -34,34 +34,34 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x01FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="CP" value="0x3FB0" > + </mask> + <mask name="CP" value="0x3FB0" > <value value="0x0000" name="040:1FF" cname="_CP_ON" /> <value value="0x3FB0" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C711.xml b/src/devices/pic/xml_data/16C711.xml index b57c9f5..29518e3 100644 --- a/src/devices/pic/xml_data/16C711.xml +++ b/src/devices/pic/xml_data/16C711.xml @@ -34,34 +34,34 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x03FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="CP" value="0x3FB0" > + </mask> + <mask name="CP" value="0x3FB0" > <value value="0x0000" name="040:3FF" cname="_CP_ON" /> <value value="0x3FB0" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C712.xml b/src/devices/pic/xml_data/16C712.xml index 400aa43..6979deb 100644 --- a/src/devices/pic/xml_data/16C712.xml +++ b/src/devices/pic/xml_data/16C712.xml @@ -29,35 +29,35 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x03FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="CP" value="0x3F30" > + </mask> + <mask name="CP" value="0x3F30" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x2A20" name="200:3FF" cname="_CP_50" /> <value value="0x3F30" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C715.xml b/src/devices/pic/xml_data/16C715.xml index 8df94d0..501018f 100644 --- a/src/devices/pic/xml_data/16C715.xml +++ b/src/devices/pic/xml_data/16C715.xml @@ -33,40 +33,40 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x07FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="MPEEN" value="0x0080" > + </mask> + <mask name="MPEEN" value="0x0080" > <value value="0x0000" name="Off" cname="_MPEEN_OFF" /> <value value="0x0080" name="On" cname="_MPEEN_ON" /> - </tqmask> - <tqmask name="CP" value="0x3F30" > + </mask> + <mask name="CP" value="0x3F30" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1510" name="200:7FF" cname="_CP_75" /> <value value="0x2A20" name="400:7FF" cname="_CP_50" /> <value value="0x3F30" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C716.xml b/src/devices/pic/xml_data/16C716.xml index 6885b77..f34e760 100644 --- a/src/devices/pic/xml_data/16C716.xml +++ b/src/devices/pic/xml_data/16C716.xml @@ -32,36 +32,36 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x07FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="CP" value="0x3F30" > + </mask> + <mask name="CP" value="0x3F30" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1510" name="200:7FF" cname="_CP_75" /> <value value="0x2A20" name="400:7FF" cname="_CP_50" /> <value value="0x3F30" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C717.xml b/src/devices/pic/xml_data/16C717.xml index 9045ec7..19c6f6a 100644 --- a/src/devices/pic/xml_data/16C717.xml +++ b/src/devices/pic/xml_data/16C717.xml @@ -36,13 +36,13 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x07FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" > - <tqmask name="FOSC" value="0x0007" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" > + <mask name="FOSC" value="0x0007" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -51,34 +51,34 @@ <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" /> <value value="0x0006" name="ER_IO" cname="_ER_OSC_NOCLKOUT" /> <value value="0x0007" name="ER_CLKOUT" cname="_ER_OSC_CLKOUT" /> - </tqmask> - <tqmask name="WDT" value="0x0008" > + </mask> + <mask name="WDT" value="0x0008" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0008" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0010" > + </mask> + <mask name="PWRTE" value="0x0010" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0010" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x0020" > + </mask> + <mask name="MCLRE" value="0x0020" > <value value="0x0000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x0020" name="External" cname="_MCLRE_ON" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="BORV" value="0x0C00" > + </mask> + <mask name="BORV" value="0x0C00" > <value value="0x0000" name="4.5" cname="_VBOR_45" /> <value value="0x0400" name="4.2" cname="_VBOR_42" /> <value value="0x0800" name="2.7" cname="_VBOR_27" /> <value value="0x0C00" name="2.5" cname="_VBOR_25" /> - </tqmask> - <tqmask name="CP" value="0x3300" > + </mask> + <mask name="CP" value="0x3300" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x3300" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C72.xml b/src/devices/pic/xml_data/16C72.xml index ac7d9b7..e6b88a2 100644 --- a/src/devices/pic/xml_data/16C72.xml +++ b/src/devices/pic/xml_data/16C72.xml @@ -33,36 +33,36 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x07FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="CP" value="0x3F30" > + </mask> + <mask name="CP" value="0x3F30" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1510" name="200:7FF" cname="_CP_75" /> <value value="0x2A20" name="400:7FF" cname="_CP_50" /> <value value="0x3F30" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C72A.xml b/src/devices/pic/xml_data/16C72A.xml index 7eb3705..cabb079 100644 --- a/src/devices/pic/xml_data/16C72A.xml +++ b/src/devices/pic/xml_data/16C72A.xml @@ -33,36 +33,36 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x07FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="CP" value="0x3F30" > + </mask> + <mask name="CP" value="0x3F30" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1510" name="200:7FF" cname="_CP_75" /> <value value="0x2A20" name="400:7FF" cname="_CP_50" /> <value value="0x3F30" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C73.xml b/src/devices/pic/xml_data/16C73.xml index 37f92de..78b69fa 100644 --- a/src/devices/pic/xml_data/16C73.xml +++ b/src/devices/pic/xml_data/16C73.xml @@ -33,31 +33,31 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x0FFF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x003F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x003F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="Off" cname="_PWRTE_OFF" /> <value value="0x0008" name="On" cname="_PWRTE_ON" /> - </tqmask> - <tqmask name="CP" value="0x0030" > + </mask> + <mask name="CP" value="0x0030" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x0010" name="400:FFF" cname="_CP_75" /> <value value="0x0020" name="800:FFF" cname="_CP_50" /> <value value="0x0030" name="Off" cname="_CP_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C73A.xml b/src/devices/pic/xml_data/16C73A.xml index ee67734..df9a672 100644 --- a/src/devices/pic/xml_data/16C73A.xml +++ b/src/devices/pic/xml_data/16C73A.xml @@ -33,36 +33,36 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x0FFF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="CP" value="0x3F30" > + </mask> + <mask name="CP" value="0x3F30" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1510" name="400:FFF" cname="_CP_75" /> <value value="0x2A20" name="800:FFF" cname="_CP_50" /> <value value="0x3F30" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C73B.xml b/src/devices/pic/xml_data/16C73B.xml index 35694d2..b2418f1 100644 --- a/src/devices/pic/xml_data/16C73B.xml +++ b/src/devices/pic/xml_data/16C73B.xml @@ -34,36 +34,36 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x0FFF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="CP" value="0x3F30" > + </mask> + <mask name="CP" value="0x3F30" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1510" name="400:FFF" cname="_CP_75" /> <value value="0x2A20" name="800:FFF" cname="_CP_50" /> <value value="0x3F30" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C74.xml b/src/devices/pic/xml_data/16C74.xml index 9f5747e..091501d 100644 --- a/src/devices/pic/xml_data/16C74.xml +++ b/src/devices/pic/xml_data/16C74.xml @@ -33,31 +33,31 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x0FFF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x003F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x003F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="Off" cname="_PWRTE_OFF" /> <value value="0x0008" name="On" cname="_PWRTE_ON" /> - </tqmask> - <tqmask name="CP" value="0x0030" > + </mask> + <mask name="CP" value="0x0030" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x0010" name="400:FFF" cname="_CP_75" /> <value value="0x0020" name="800:FFF" cname="_CP_50" /> <value value="0x0030" name="Off" cname="_CP_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C745.xml b/src/devices/pic/xml_data/16C745.xml index daf0552..1a4ab42 100644 --- a/src/devices/pic/xml_data/16C745.xml +++ b/src/devices/pic/xml_data/16C745.xml @@ -29,32 +29,32 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x1FFF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F3F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F3F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="HS" cname="_HS_OSC" /> <value value="0x0001" name="EC_CLKOUT" cname="_EC_OSC" /> <value value="0x0002" name="H4" cname="_H4_OSC" /> <value value="0x0003" name="E4_CLKOUT" cname="_E4_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="CP" value="0x3F30" > + </mask> + <mask name="CP" value="0x3F30" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1510" name="0800:1FFF" cname="_CP_75" /> <value value="0x2A20" name="1000:1FFF" cname="_CP_50" /> <value value="0x3F30" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C74A.xml b/src/devices/pic/xml_data/16C74A.xml index d859fc2..0d784c9 100644 --- a/src/devices/pic/xml_data/16C74A.xml +++ b/src/devices/pic/xml_data/16C74A.xml @@ -33,36 +33,36 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x0FFF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="CP" value="0x3F30" > + </mask> + <mask name="CP" value="0x3F30" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1510" name="400:FFF" cname="_CP_75" /> <value value="0x2A20" name="800:FFF" cname="_CP_50" /> <value value="0x3F30" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C74B.xml b/src/devices/pic/xml_data/16C74B.xml index 325fda9..ce7274f 100644 --- a/src/devices/pic/xml_data/16C74B.xml +++ b/src/devices/pic/xml_data/16C74B.xml @@ -34,36 +34,36 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x0FFF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="CP" value="0x3F30" > + </mask> + <mask name="CP" value="0x3F30" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1510" name="400:FFF" cname="_CP_75" /> <value value="0x2A20" name="800:FFF" cname="_CP_50" /> <value value="0x3F30" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C76.xml b/src/devices/pic/xml_data/16C76.xml index 7c6ed42..c5819a2 100644 --- a/src/devices/pic/xml_data/16C76.xml +++ b/src/devices/pic/xml_data/16C76.xml @@ -33,36 +33,36 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x1FFF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="CP" value="0x3F30" > + </mask> + <mask name="CP" value="0x3F30" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1510" name="0800:1FFF" cname="_CP_75" /> <value value="0x2A20" name="1000:1FFF" cname="_CP_50" /> <value value="0x3F30" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C765.xml b/src/devices/pic/xml_data/16C765.xml index 360985e..c441e17 100644 --- a/src/devices/pic/xml_data/16C765.xml +++ b/src/devices/pic/xml_data/16C765.xml @@ -29,32 +29,32 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x1FFF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F3F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F3F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="HS" cname="_HS_OSC" /> <value value="0x0001" name="EC_CLKOUT" cname="_EC_OSC" /> <value value="0x0002" name="H4" cname="_H4_OSC" /> <value value="0x0003" name="E4_CLKOUT" cname="_E4_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="CP" value="0x3F30" > + </mask> + <mask name="CP" value="0x3F30" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1510" name="0800:1FFF" cname="_CP_75" /> <value value="0x2A20" name="1000:1FFF" cname="_CP_50" /> <value value="0x3F30" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C77.xml b/src/devices/pic/xml_data/16C77.xml index 60d0a72..f863d24 100644 --- a/src/devices/pic/xml_data/16C77.xml +++ b/src/devices/pic/xml_data/16C77.xml @@ -33,36 +33,36 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x1FFF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="CP" value="0x3F30" > + </mask> + <mask name="CP" value="0x3F30" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1510" name="0800:1FFF" cname="_CP_75" /> <value value="0x2A20" name="1000:1FFF" cname="_CP_50" /> <value value="0x3F30" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C770.xml b/src/devices/pic/xml_data/16C770.xml index cb00a24..de1d9e9 100644 --- a/src/devices/pic/xml_data/16C770.xml +++ b/src/devices/pic/xml_data/16C770.xml @@ -36,13 +36,13 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x07FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" > - <tqmask name="FOSC" value="0x0007" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" > + <mask name="FOSC" value="0x0007" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -51,34 +51,34 @@ <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" /> <value value="0x0006" name="ER_IO" cname="_ER_OSC_NOCLKOUT" /> <value value="0x0007" name="ER_CLKOUT" cname="_ER_OSC_CLKOUT" /> - </tqmask> - <tqmask name="WDT" value="0x0008" > + </mask> + <mask name="WDT" value="0x0008" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0008" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0010" > + </mask> + <mask name="PWRTE" value="0x0010" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0010" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x0020" > + </mask> + <mask name="MCLRE" value="0x0020" > <value value="0x0000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x0020" name="External" cname="_MCLRE_ON" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="BORV" value="0x0C00" > + </mask> + <mask name="BORV" value="0x0C00" > <value value="0x0000" name="4.5" cname="_VBOR_45" /> <value value="0x0400" name="4.2" cname="_VBOR_42" /> <value value="0x0800" name="2.7" cname="_VBOR_27" /> <value value="0x0C00" name="2.5" cname="_VBOR_25" /> - </tqmask> - <tqmask name="CP" value="0x3300" > + </mask> + <mask name="CP" value="0x3300" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x3300" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C771.xml b/src/devices/pic/xml_data/16C771.xml index 6f59244..4bf7fcd 100644 --- a/src/devices/pic/xml_data/16C771.xml +++ b/src/devices/pic/xml_data/16C771.xml @@ -36,13 +36,13 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x0FFF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" > - <tqmask name="FOSC" value="0x0007" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" > + <mask name="FOSC" value="0x0007" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -51,34 +51,34 @@ <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" /> <value value="0x0006" name="ER_IO" cname="_ER_OSC_NOCLKOUT" /> <value value="0x0007" name="ER_CLKOUT" cname="_ER_OSC_CLKOUT" /> - </tqmask> - <tqmask name="WDT" value="0x0008" > + </mask> + <mask name="WDT" value="0x0008" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0008" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0010" > + </mask> + <mask name="PWRTE" value="0x0010" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0010" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x0020" > + </mask> + <mask name="MCLRE" value="0x0020" > <value value="0x0000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x0020" name="External" cname="_MCLRE_ON" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="BORV" value="0x0C00" > + </mask> + <mask name="BORV" value="0x0C00" > <value value="0x0000" name="4.5" cname="_VBOR_45" /> <value value="0x0400" name="4.2" cname="_VBOR_42" /> <value value="0x0800" name="2.7" cname="_VBOR_27" /> <value value="0x0C00" name="2.5" cname="_VBOR_25" /> - </tqmask> - <tqmask name="CP" value="0x3300" > + </mask> + <mask name="CP" value="0x3300" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x3300" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C773.xml b/src/devices/pic/xml_data/16C773.xml index d5d4e06..1b74ed5 100644 --- a/src/devices/pic/xml_data/16C773.xml +++ b/src/devices/pic/xml_data/16C773.xml @@ -33,42 +33,42 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x0FFF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="BORV" value="0x0C00" > + </mask> + <mask name="BORV" value="0x0C00" > <value value="0x0000" name="4.5" cname="_VBOR_45" /> <value value="0x0400" name="4.2" cname="_VBOR_42" /> <value value="0x0800" name="2.7" cname="_VBOR_27" /> <value value="0x0C00" name="2.5" cname="_VBOR_25" /> - </tqmask> - <tqmask name="CP" value="0x3330" > + </mask> + <mask name="CP" value="0x3330" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1110" name="400:FFF" cname="_CP_75" /> <value value="0x2220" name="800:FFF" cname="_CP_50" /> <value value="0x3330" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C774.xml b/src/devices/pic/xml_data/16C774.xml index 7915805..1d577ee 100644 --- a/src/devices/pic/xml_data/16C774.xml +++ b/src/devices/pic/xml_data/16C774.xml @@ -33,42 +33,42 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x0FFF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="BORV" value="0x0C00" > + </mask> + <mask name="BORV" value="0x0C00" > <value value="0x0000" name="4.5" cname="_VBOR_45" /> <value value="0x0400" name="4.2" cname="_VBOR_42" /> <value value="0x0800" name="2.7" cname="_VBOR_27" /> <value value="0x0C00" name="2.5" cname="_VBOR_25" /> - </tqmask> - <tqmask name="CP" value="0x3330" > + </mask> + <mask name="CP" value="0x3330" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1110" name="400:FFF" cname="_CP_75" /> <value value="0x2220" name="800:FFF" cname="_CP_50" /> <value value="0x3330" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C781.xml b/src/devices/pic/xml_data/16C781.xml index 7533b24..2861a67 100644 --- a/src/devices/pic/xml_data/16C781.xml +++ b/src/devices/pic/xml_data/16C781.xml @@ -32,13 +32,13 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x03FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" > - <tqmask name="FOSC" value="0x0007" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" > + <mask name="FOSC" value="0x0007" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -47,34 +47,34 @@ <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" /> <value value="0x0006" name="ER_IO" cname="_ER_OSC_NOCLKOUT" /> <value value="0x0007" name="ER_CLKOUT" cname="_ER_OSC_CLKOUT" /> - </tqmask> - <tqmask name="WDT" value="0x0008" > + </mask> + <mask name="WDT" value="0x0008" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0008" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0010" > + </mask> + <mask name="PWRTE" value="0x0010" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0010" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x0020" > + </mask> + <mask name="MCLRE" value="0x0020" > <value value="0x0000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x0020" name="External" cname="_MCLRE_ON" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="BORV" value="0x0C00" > + </mask> + <mask name="BORV" value="0x0C00" > <value value="0x0000" name="4.5" cname="_VBOR_45" /> <value value="0x0400" name="4.2" cname="_VBOR_42" /> <value value="0x0800" name="2.7" cname="_VBOR_27" /> <value value="0x0C00" name="2.5" cname="_VBOR_25" /> - </tqmask> - <tqmask name="CP" value="0x3300" > + </mask> + <mask name="CP" value="0x3300" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x3300" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C782.xml b/src/devices/pic/xml_data/16C782.xml index 2b863ed..6192a30 100644 --- a/src/devices/pic/xml_data/16C782.xml +++ b/src/devices/pic/xml_data/16C782.xml @@ -32,13 +32,13 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x07FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" > - <tqmask name="FOSC" value="0x0007" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" > + <mask name="FOSC" value="0x0007" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -47,34 +47,34 @@ <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" /> <value value="0x0006" name="ER_IO" cname="_ER_OSC_NOCLKOUT" /> <value value="0x0007" name="ER_CLKOUT" cname="_ER_OSC_CLKOUT" /> - </tqmask> - <tqmask name="WDT" value="0x0008" > + </mask> + <mask name="WDT" value="0x0008" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0008" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0010" > + </mask> + <mask name="PWRTE" value="0x0010" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0010" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x0020" > + </mask> + <mask name="MCLRE" value="0x0020" > <value value="0x0000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x0020" name="External" cname="_MCLRE_ON" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="BORV" value="0x0C00" > + </mask> + <mask name="BORV" value="0x0C00" > <value value="0x0000" name="4.5" cname="_VBOR_45" /> <value value="0x0400" name="4.2" cname="_VBOR_42" /> <value value="0x0800" name="2.7" cname="_VBOR_27" /> <value value="0x0C00" name="2.5" cname="_VBOR_25" /> - </tqmask> - <tqmask name="CP" value="0x3300" > + </mask> + <mask name="CP" value="0x3300" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x3300" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C84.xml b/src/devices/pic/xml_data/16C84.xml index 708ba95..595bcd9 100644 --- a/src/devices/pic/xml_data/16C84.xml +++ b/src/devices/pic/xml_data/16C84.xml @@ -25,30 +25,30 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x03FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="eeprom" start="0x0000" end="0x003F" hexfile_offset="0x2100" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x001F" ctqmask="0x0018" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x001F" cmask="0x0018" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="Off" cname="_PWRTE_OFF" /> <value value="0x0008" name="On" cname="_PWRTE_ON" /> - </tqmask> - <tqmask name="CP" value="0x0010" > + </mask> + <mask name="CP" value="0x0010" > <value value="0x0000" name="All" cname="_CP_ON" /> <value value="0x0010" name="Off" cname="_CP_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C923.xml b/src/devices/pic/xml_data/16C923.xml index 3e438d2..a670a59 100644 --- a/src/devices/pic/xml_data/16C923.xml +++ b/src/devices/pic/xml_data/16C923.xml @@ -33,32 +33,32 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x0FFF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F3F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F3F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="CP" value="0x3F30" > + </mask> + <mask name="CP" value="0x3F30" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1510" name="400:FFF" cname="_CP_75" /> <value value="0x2A20" name="800:FFF" cname="_CP_50" /> <value value="0x3F30" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C924.xml b/src/devices/pic/xml_data/16C924.xml index a9096d1..614ff48 100644 --- a/src/devices/pic/xml_data/16C924.xml +++ b/src/devices/pic/xml_data/16C924.xml @@ -33,32 +33,32 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x0FFF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F3F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F3F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="CP" value="0x3F30" > + </mask> + <mask name="CP" value="0x3F30" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1510" name="400:FFF" cname="_CP_75" /> <value value="0x2A20" name="800:FFF" cname="_CP_50" /> <value value="0x3F30" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C925.xml b/src/devices/pic/xml_data/16C925.xml index c7a494f..b9c703d 100644 --- a/src/devices/pic/xml_data/16C925.xml +++ b/src/devices/pic/xml_data/16C925.xml @@ -25,36 +25,36 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x0FFF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="CP" value="0x0030" > + </mask> + <mask name="CP" value="0x0030" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x0010" name="000:EFF" cname="_CP_75" /> <value value="0x0020" name="000:7FF" cname="_CP_50" /> <value value="0x0030" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16C926.xml b/src/devices/pic/xml_data/16C926.xml index 8a71ca5..4120d43 100644 --- a/src/devices/pic/xml_data/16C926.xml +++ b/src/devices/pic/xml_data/16C926.xml @@ -25,36 +25,36 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x1FFF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x007F" ctqmask="0x3F3F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x007F" cmask="0x3F3F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="CP" value="0x0030" > + </mask> + <mask name="CP" value="0x0030" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x0010" name="0000:1EFF" cname="_CP_75" /> <value value="0x0020" name="0000:0FFF" cname="_CP_50" /> <value value="0x0030" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16CE623.xml b/src/devices/pic/xml_data/16CE623.xml index 00dbeee..18e6848 100644 --- a/src/devices/pic/xml_data/16CE623.xml +++ b/src/devices/pic/xml_data/16CE623.xml @@ -35,35 +35,35 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x01FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="eeprom" start="0x0000" end="0x007F" hexfile_offset="?" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="CP" value="0x3F30" > + </mask> + <mask name="CP" value="0x3F30" > <value value="0x0000" name="All" cname="_CP_ON" /> <value value="0x3F30" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16CE624.xml b/src/devices/pic/xml_data/16CE624.xml index f480f85..4f205a7 100644 --- a/src/devices/pic/xml_data/16CE624.xml +++ b/src/devices/pic/xml_data/16CE624.xml @@ -36,36 +36,36 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x03FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="eeprom" start="0x0000" end="0x007F" hexfile_offset="?" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="CP" value="0x3F30" > + </mask> + <mask name="CP" value="0x3F30" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1510" name="200:3FF" cname="_CP_50" /> <value value="0x3F30" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16CE625.xml b/src/devices/pic/xml_data/16CE625.xml index 9d156e9..d7aa576 100644 --- a/src/devices/pic/xml_data/16CE625.xml +++ b/src/devices/pic/xml_data/16CE625.xml @@ -37,36 +37,36 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x07FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="CP" value="0x3F30" > + </mask> + <mask name="CP" value="0x3F30" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1510" name="200:7FF" cname="_CP_75" /> <value value="0x2A20" name="400:7FF" cname="_CP_50" /> <value value="0x3F30" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16CR54.xml_broken b/src/devices/pic/xml_data/16CR54.xml_broken index e78487e..cef44cb 100644 --- a/src/devices/pic/xml_data/16CR54.xml_broken +++ b/src/devices/pic/xml_data/16CR54.xml_broken @@ -18,25 +18,25 @@ <!--* Memory ***************************************************************--> <memory name="program" start="0x000" end="0x1FF" /> - <memory name="user_ids" start="0x200" end="0x203" rtqmask="0x00F" /> + <memory name="user_ids" start="0x200" end="0x203" rmask="0x00F" /> <memory name="config" start="0xFFF" end="0xFFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0xFFC" bvalue="0x00C" ctqmask="0x008" > - <tqmask name="FOSC" value="0x003" > + <config offset="0x0" name="" wmask="0xFFC" bvalue="0x00C" cmask="0x008" > + <mask name="FOSC" value="0x003" > <value value="0x000" name="LP" cname="_LP_OSC" /> <value value="0x001" name="XT" cname="_XT_OSC" /> <value value="0x002" name="HS" cname="_HS_OSC" /> <value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x004" > + </mask> + <mask name="WDT" value="0x004" > <value value="0x000" name="Off" cname="_WDT_OFF" /> <value value="0x004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="CP" value="0x008" > + </mask> + <mask name="CP" value="0x008" > <value value="0x000" name="All" cname="_CP_ON" /> <value value="0x008" name="Off" cname="_CP_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16CR54A.xml b/src/devices/pic/xml_data/16CR54A.xml index cbe7ef1..c3a5d2a 100644 --- a/src/devices/pic/xml_data/16CR54A.xml +++ b/src/devices/pic/xml_data/16CR54A.xml @@ -37,26 +37,26 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000" end="0x1FF" /> - <memory name="user_ids" start="0x200" end="0x203" rtqmask="0x00F" /> + <memory name="user_ids" start="0x200" end="0x203" rmask="0x00F" /> <memory name="config" start="0xFFF" end="0xFFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0xFFC" bvalue="0xFFF" > - <tqmask name="FOSC" value="0x003" > + <config offset="0x0" name="" wmask="0xFFC" bvalue="0xFFF" > + <mask name="FOSC" value="0x003" > <value value="0x000" name="LP" cname="_LP_OSC" /> <value value="0x001" name="XT" cname="_XT_OSC" /> <value value="0x002" name="HS" cname="_HS_OSC" /> <value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x004" > + </mask> + <mask name="WDT" value="0x004" > <value value="0x000" name="Off" cname="_WDT_OFF" /> <value value="0x004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="CP" value="0xFF8" > + </mask> + <mask name="CP" value="0xFF8" > <value value="0x000" name="All" cname="_CP_ON" /> <value value="0xFF8" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16CR54B.xml b/src/devices/pic/xml_data/16CR54B.xml index d561ca9..43456d8 100644 --- a/src/devices/pic/xml_data/16CR54B.xml +++ b/src/devices/pic/xml_data/16CR54B.xml @@ -40,26 +40,26 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000" end="0x1FF" /> - <memory name="user_ids" start="0x200" end="0x203" rtqmask="0x00F" /> + <memory name="user_ids" start="0x200" end="0x203" rmask="0x00F" /> <memory name="config" start="0xFFF" end="0xFFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0xFFC" bvalue="0xFFF" > - <tqmask name="FOSC" value="0x003" > + <config offset="0x0" name="" wmask="0xFFC" bvalue="0xFFF" > + <mask name="FOSC" value="0x003" > <value value="0x000" name="LP" cname="_LP_OSC" /> <value value="0x001" name="XT" cname="_XT_OSC" /> <value value="0x002" name="HS" cname="_HS_OSC" /> <value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x004" > + </mask> + <mask name="WDT" value="0x004" > <value value="0x000" name="Off" cname="_WDT_OFF" /> <value value="0x004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="CP" value="0xFF8" > + </mask> + <mask name="CP" value="0xFF8" > <value value="0x000" name="040:1FF" cname="_CP_ON" /> <value value="0xFF8" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16CR54C.xml b/src/devices/pic/xml_data/16CR54C.xml index c5d9876..3667ce3 100644 --- a/src/devices/pic/xml_data/16CR54C.xml +++ b/src/devices/pic/xml_data/16CR54C.xml @@ -40,26 +40,26 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000" end="0x1FF" /> - <memory name="user_ids" start="0x200" end="0x203" rtqmask="0x00F" /> + <memory name="user_ids" start="0x200" end="0x203" rmask="0x00F" /> <memory name="config" start="0xFFF" end="0xFFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0xFFC" bvalue="0xFFF" > - <tqmask name="FOSC" value="0x003" > + <config offset="0x0" name="" wmask="0xFFC" bvalue="0xFFF" > + <mask name="FOSC" value="0x003" > <value value="0x000" name="LP" cname="_LP_OSC" /> <value value="0x001" name="XT" cname="_XT_OSC" /> <value value="0x002" name="HS" cname="_HS_OSC" /> <value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x004" > + </mask> + <mask name="WDT" value="0x004" > <value value="0x000" name="Off" cname="_WDT_OFF" /> <value value="0x004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="CP" value="0xFF8" > + </mask> + <mask name="CP" value="0xFF8" > <value value="0x000" name="040:1FF" cname="_CP_ON" /> <value value="0xFF8" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16CR56A.xml b/src/devices/pic/xml_data/16CR56A.xml index 92ed41d..0b28931 100644 --- a/src/devices/pic/xml_data/16CR56A.xml +++ b/src/devices/pic/xml_data/16CR56A.xml @@ -40,26 +40,26 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000" end="0x3FF" /> - <memory name="user_ids" start="0x400" end="0x403" rtqmask="0x00F" /> + <memory name="user_ids" start="0x400" end="0x403" rmask="0x00F" /> <memory name="config" start="0xFFF" end="0xFFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0xFFC" bvalue="0xFFF" > - <tqmask name="FOSC" value="0x003" > + <config offset="0x0" name="" wmask="0xFFC" bvalue="0xFFF" > + <mask name="FOSC" value="0x003" > <value value="0x000" name="LP" cname="_LP_OSC" /> <value value="0x001" name="XT" cname="_XT_OSC" /> <value value="0x002" name="HS" cname="_HS_OSC" /> <value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x004" > + </mask> + <mask name="WDT" value="0x004" > <value value="0x000" name="Off" cname="_WDT_OFF" /> <value value="0x004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="CP" value="0xFF8" > + </mask> + <mask name="CP" value="0xFF8" > <value value="0x000" name="040:3FF" cname="_CP_ON" /> <value value="0xFF8" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16CR57B.xml b/src/devices/pic/xml_data/16CR57B.xml index d4f218a..caba4c3 100644 --- a/src/devices/pic/xml_data/16CR57B.xml +++ b/src/devices/pic/xml_data/16CR57B.xml @@ -37,26 +37,26 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000" end="0x7FF" /> - <memory name="user_ids" start="0x800" end="0x803" rtqmask="0x00F" /> + <memory name="user_ids" start="0x800" end="0x803" rmask="0x00F" /> <memory name="config" start="0xFFF" end="0xFFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0xFFC" bvalue="0xFFF" > - <tqmask name="FOSC" value="0x003" > + <config offset="0x0" name="" wmask="0xFFC" bvalue="0xFFF" > + <mask name="FOSC" value="0x003" > <value value="0x000" name="LP" cname="_LP_OSC" /> <value value="0x001" name="XT" cname="_XT_OSC" /> <value value="0x002" name="HS" cname="_HS_OSC" /> <value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x004" > + </mask> + <mask name="WDT" value="0x004" > <value value="0x000" name="Off" cname="_WDT_OFF" /> <value value="0x004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="CP" value="0xFF8" > + </mask> + <mask name="CP" value="0xFF8" > <value value="0x000" name="040:7FF" cname="_CP_ON" /> <value value="0xFF8" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16CR57C.xml b/src/devices/pic/xml_data/16CR57C.xml index 1bee66c..379f1bc 100644 --- a/src/devices/pic/xml_data/16CR57C.xml +++ b/src/devices/pic/xml_data/16CR57C.xml @@ -40,26 +40,26 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000" end="0x7FF" /> - <memory name="user_ids" start="0x800" end="0x803" rtqmask="0x00F" /> + <memory name="user_ids" start="0x800" end="0x803" rmask="0x00F" /> <memory name="config" start="0xFFF" end="0xFFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0xFFC" bvalue="0xFFF" > - <tqmask name="FOSC" value="0x003" > + <config offset="0x0" name="" wmask="0xFFC" bvalue="0xFFF" > + <mask name="FOSC" value="0x003" > <value value="0x000" name="LP" cname="_LP_OSC" /> <value value="0x001" name="XT" cname="_XT_OSC" /> <value value="0x002" name="HS" cname="_HS_OSC" /> <value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x004" > + </mask> + <mask name="WDT" value="0x004" > <value value="0x000" name="Off" cname="_WDT_OFF" /> <value value="0x004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="CP" value="0xFF8" > + </mask> + <mask name="CP" value="0xFF8" > <value value="0x000" name="040:7FF" cname="_CP_ON" /> <value value="0xFF8" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16CR58A.xml b/src/devices/pic/xml_data/16CR58A.xml index 8834988..3841400 100644 --- a/src/devices/pic/xml_data/16CR58A.xml +++ b/src/devices/pic/xml_data/16CR58A.xml @@ -37,26 +37,26 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000" end="0x7FF" /> - <memory name="user_ids" start="0x800" end="0x803" rtqmask="0x00F" /> + <memory name="user_ids" start="0x800" end="0x803" rmask="0x00F" /> <memory name="config" start="0xFFF" end="0xFFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0xFFC" bvalue="0xFFF" > - <tqmask name="FOSC" value="0x003" > + <config offset="0x0" name="" wmask="0xFFC" bvalue="0xFFF" > + <mask name="FOSC" value="0x003" > <value value="0x000" name="LP" cname="_LP_OSC" /> <value value="0x001" name="XT" cname="_XT_OSC" /> <value value="0x002" name="HS" cname="_HS_OSC" /> <value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x004" > + </mask> + <mask name="WDT" value="0x004" > <value value="0x000" name="Off" cname="_WDT_OFF" /> <value value="0x004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="CP" value="0xFF8" > + </mask> + <mask name="CP" value="0xFF8" > <value value="0x000" name="040:7FF" cname="_CP_ON" /> <value value="0xFF8" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16CR58B.xml b/src/devices/pic/xml_data/16CR58B.xml index 17b9c83..b450e31 100644 --- a/src/devices/pic/xml_data/16CR58B.xml +++ b/src/devices/pic/xml_data/16CR58B.xml @@ -40,26 +40,26 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000" end="0x7FF" /> - <memory name="user_ids" start="0x800" end="0x803" rtqmask="0x00F" /> + <memory name="user_ids" start="0x800" end="0x803" rmask="0x00F" /> <memory name="config" start="0xFFF" end="0xFFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0xFFC" bvalue="0xFFF" > - <tqmask name="FOSC" value="0x003" > + <config offset="0x0" name="" wmask="0xFFC" bvalue="0xFFF" > + <mask name="FOSC" value="0x003" > <value value="0x000" name="LP" cname="_LP_OSC" /> <value value="0x001" name="XT" cname="_XT_OSC" /> <value value="0x002" name="HS" cname="_HS_OSC" /> <value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x004" > + </mask> + <mask name="WDT" value="0x004" > <value value="0x000" name="Off" cname="_WDT_OFF" /> <value value="0x004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="CP" value="0xFF8" > + </mask> + <mask name="CP" value="0xFF8" > <value value="0x000" name="040:7FF" cname="_CP_ON" /> <value value="0xFF8" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16CR62.xml b/src/devices/pic/xml_data/16CR62.xml index 5e18732..0b27a3c 100644 --- a/src/devices/pic/xml_data/16CR62.xml +++ b/src/devices/pic/xml_data/16CR62.xml @@ -33,36 +33,36 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x07FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="CP" value="0x3F30" > + </mask> + <mask name="CP" value="0x3F30" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1510" name="200:7FF" cname="_CP_75" /> <value value="0x2A20" name="400:7FF" cname="_CP_50" /> <value value="0x3F30" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16CR620A.xml b/src/devices/pic/xml_data/16CR620A.xml index 891e699..a2e6db3 100644 --- a/src/devices/pic/xml_data/16CR620A.xml +++ b/src/devices/pic/xml_data/16CR620A.xml @@ -35,34 +35,34 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x01FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="CP" value="0x3F30" > + </mask> + <mask name="CP" value="0x3F30" > <value value="0x0000" name="All" cname="_CP_ON" /> <value value="0x3F30" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16CR63.xml b/src/devices/pic/xml_data/16CR63.xml index 0279f84..08d6f3f 100644 --- a/src/devices/pic/xml_data/16CR63.xml +++ b/src/devices/pic/xml_data/16CR63.xml @@ -33,36 +33,36 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x0FFF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="CP" value="0x3F30" > + </mask> + <mask name="CP" value="0x3F30" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1510" name="400:FFF" cname="_CP_75" /> <value value="0x2A20" name="800:FFF" cname="_CP_50" /> <value value="0x3F30" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16CR64.xml b/src/devices/pic/xml_data/16CR64.xml index 4ade4a5..e155a97 100644 --- a/src/devices/pic/xml_data/16CR64.xml +++ b/src/devices/pic/xml_data/16CR64.xml @@ -33,36 +33,36 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x07FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="CP" value="0x3F30" > + </mask> + <mask name="CP" value="0x3F30" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1510" name="200:7FF" cname="_CP_75" /> <value value="0x2A20" name="400:7FF" cname="_CP_50" /> <value value="0x3F30" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16CR65.xml b/src/devices/pic/xml_data/16CR65.xml index b83c4e2..df4d3f4 100644 --- a/src/devices/pic/xml_data/16CR65.xml +++ b/src/devices/pic/xml_data/16CR65.xml @@ -33,36 +33,36 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x0FFF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="CP" value="0x3F30" > + </mask> + <mask name="CP" value="0x3F30" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1510" name="400:FFF" cname="_CP_75" /> <value value="0x2A20" name="800:FFF" cname="_CP_50" /> <value value="0x3F30" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16CR72.xml b/src/devices/pic/xml_data/16CR72.xml index 18ba26f..efaa9f8 100644 --- a/src/devices/pic/xml_data/16CR72.xml +++ b/src/devices/pic/xml_data/16CR72.xml @@ -33,36 +33,36 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x07FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="CP" value="0x3F30" > + </mask> + <mask name="CP" value="0x3F30" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1510" name="200:7FF" cname="_CP_75" /> <value value="0x2A20" name="400:7FF" cname="_CP_50" /> <value value="0x3F30" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16CR73.xml b/src/devices/pic/xml_data/16CR73.xml index c368a1b..6513255 100644 --- a/src/devices/pic/xml_data/16CR73.xml +++ b/src/devices/pic/xml_data/16CR73.xml @@ -31,34 +31,34 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x0FFF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x000F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x000F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x005F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x005F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" ecnames="_WDTEN_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" ecnames="_WDTEN_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" ecnames="_PWRTEN_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" ecnames="_PWRTEN_OFF" /> - </tqmask> - <tqmask name="CP" value="0x0010" > + </mask> + <mask name="CP" value="0x0010" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x0010" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" ecnames="_BOREN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" ecnames="_BOREN_ON" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16CR74.xml b/src/devices/pic/xml_data/16CR74.xml index c724d90..6fec92e 100644 --- a/src/devices/pic/xml_data/16CR74.xml +++ b/src/devices/pic/xml_data/16CR74.xml @@ -31,34 +31,34 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x0FFF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x000F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x000F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x005F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x005F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" ecnames="_WDTEN_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" ecnames="_WDTEN_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" ecnames="_PWRTEN_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" ecnames="_PWRTEN_OFF" /> - </tqmask> - <tqmask name="CP" value="0x0010" > + </mask> + <mask name="CP" value="0x0010" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x0010" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" ecnames="_BOREN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" ecnames="_BOREN_ON" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16CR76.xml b/src/devices/pic/xml_data/16CR76.xml index 00576fb..dd9916a 100644 --- a/src/devices/pic/xml_data/16CR76.xml +++ b/src/devices/pic/xml_data/16CR76.xml @@ -31,34 +31,34 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x1FFF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x000F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x000F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x005F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x005F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" ecnames="_WDTEN_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" ecnames="_WDTEN_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" ecnames="_PWRTEN_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" ecnames="_PWRTEN_OFF" /> - </tqmask> - <tqmask name="CP" value="0x0010" > + </mask> + <mask name="CP" value="0x0010" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x0010" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" ecnames="_BOREN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" ecnames="_BOREN_ON" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16CR77.xml b/src/devices/pic/xml_data/16CR77.xml index 04c6f68..661ebf0 100644 --- a/src/devices/pic/xml_data/16CR77.xml +++ b/src/devices/pic/xml_data/16CR77.xml @@ -31,34 +31,34 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x1FFF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x000F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x000F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x005F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x005F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" ecnames="_WDTEN_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" ecnames="_WDTEN_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" ecnames="_PWRTEN_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" ecnames="_PWRTEN_OFF" /> - </tqmask> - <tqmask name="CP" value="0x0010" > + </mask> + <mask name="CP" value="0x0010" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x0010" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" ecnames="_BOREN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" ecnames="_BOREN_ON" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16CR83.xml b/src/devices/pic/xml_data/16CR83.xml index 24f9ed0..01c4166 100644 --- a/src/devices/pic/xml_data/16CR83.xml +++ b/src/devices/pic/xml_data/16CR83.xml @@ -31,35 +31,35 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x01FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="eeprom" start="0x0000" end="0x003F" hexfile_offset="0x2100" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x0080" > + </mask> + <mask name="CPD" value="0x0080" > <value value="0x0000" name="All" cname="_DP_ON" /> <value value="0x0080" name="Off" cname="_DP_OFF" /> - </tqmask> - <tqmask name="CP" value="0x3F70" > + </mask> + <mask name="CP" value="0x3F70" > <value value="0x0000" name="All" cname="_CP_ON" /> <value value="0x3F70" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16CR84.xml b/src/devices/pic/xml_data/16CR84.xml index a22db42..5d93205 100644 --- a/src/devices/pic/xml_data/16CR84.xml +++ b/src/devices/pic/xml_data/16CR84.xml @@ -31,35 +31,35 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x03FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="eeprom" start="0x0000" end="0x003F" hexfile_offset="0x2100" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x0080" > + </mask> + <mask name="CPD" value="0x0080" > <value value="0x0000" name="All" cname="_DP_ON" /> <value value="0x0080" name="Off" cname="_DP_OFF" /> - </tqmask> - <tqmask name="CP" value="0x3F70" > + </mask> + <mask name="CP" value="0x3F70" > <value value="0x0000" name="All" cname="_CP_ON" /> <value value="0x3F70" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F505.xml b/src/devices/pic/xml_data/16F505.xml index 250adf4..bbc2607 100644 --- a/src/devices/pic/xml_data/16F505.xml +++ b/src/devices/pic/xml_data/16F505.xml @@ -29,14 +29,14 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000" end="0x3FE" /> - <memory name="calibration" start="0x3FF" end="0x3FF" cal_optqmask="0xF00" cal_opcode="0xC00" /> - <memory name="user_ids" start="0x400" end="0x403" rtqmask="0x00F" /> + <memory name="calibration" start="0x3FF" end="0x3FF" cal_opmask="0xF00" cal_opcode="0xC00" /> + <memory name="user_ids" start="0x400" end="0x403" rmask="0x00F" /> <memory name="config" start="0x7FF" end="0x7FF" hexfile_offset="0xFFF" /> <memory name="calibration_backup" start="0x404" end="0x404" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0xFFF" bvalue="0x03F" > - <tqmask name="FOSC" value="0x007" > + <config offset="0x0" name="" wmask="0xFFF" bvalue="0x03F" > + <mask name="FOSC" value="0x007" > <value value="0x000" name="LP" cname="_LP_OSC" /> <value value="0x001" name="XT" cname="_XT_OSC" /> <value value="0x002" name="HS" cname="_HS_OSC" /> @@ -45,19 +45,19 @@ <value value="0x005" name="INTRC_CLKOUT" cname="_IntRC_OSC_CLKOUTEN" /> <value value="0x006" name="EXTRC_IO" cname="_ExtRC_OSC_RB4EN" /> <value value="0x007" name="EXTRC_CLKOUT" cname="_ExtRC_OSC_CLKOUTEN" /> - </tqmask> - <tqmask name="WDT" value="0x008" > + </mask> + <mask name="WDT" value="0x008" > <value value="0x000" name="Off" cname="_WDT_OFF" /> <value value="0x008" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="CP" value="0x010" > + </mask> + <mask name="CP" value="0x010" > <value value="0x000" name="040:3FE" cname="_CP_ON" /> <value value="0x010" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x020" > + </mask> + <mask name="MCLRE" value="0x020" > <value value="0x000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x020" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F506.xml b/src/devices/pic/xml_data/16F506.xml index a472914..4fa7a47 100644 --- a/src/devices/pic/xml_data/16F506.xml +++ b/src/devices/pic/xml_data/16F506.xml @@ -30,14 +30,14 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000" end="0x3FE" /> - <memory name="calibration" start="0x3FF" end="0x3FF" cal_optqmask="0xF00" cal_opcode="0xC00" /> - <memory name="user_ids" start="0x400" end="0x403" rtqmask="0x00F" /> + <memory name="calibration" start="0x3FF" end="0x3FF" cal_opmask="0xF00" cal_opcode="0xC00" /> + <memory name="user_ids" start="0x400" end="0x403" rmask="0x00F" /> <memory name="config" start="0x7FF" end="0x7FF" hexfile_offset="0xFFF" /> <memory name="calibration_backup" start="0x404" end="0x404" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0xFFF" bvalue="0x07F" > - <tqmask name="FOSC" value="0x007" > + <config offset="0x0" name="" wmask="0xFFF" bvalue="0x07F" > + <mask name="FOSC" value="0x007" > <value value="0x000" name="LP" cname="_LP_OSC" /> <value value="0x001" name="XT" cname="_XT_OSC" /> <value value="0x002" name="HS" cname="_HS_OSC" /> @@ -46,23 +46,23 @@ <value value="0x005" name="INTRC_CLKOUT" cname="_IntRC_OSC_CLKOUTEN" /> <value value="0x006" name="EXTRC_IO" cname="_ExtRC_OSC_RB4EN" /> <value value="0x007" name="EXTRC_CLKOUT" cname="_ExtRC_OSC_CLKOUTEN" /> - </tqmask> - <tqmask name="WDT" value="0x008" > + </mask> + <mask name="WDT" value="0x008" > <value value="0x000" name="Off" cname="_WDT_OFF" /> <value value="0x008" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="CP" value="0x010" > + </mask> + <mask name="CP" value="0x010" > <value value="0x000" name="040:3FE" cname="_CP_ON" /> <value value="0x010" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x020" > + </mask> + <mask name="MCLRE" value="0x020" > <value value="0x000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x020" name="External" cname="_MCLRE_ON" /> - </tqmask> - <tqmask name="IOSCFS" value="0x040" > + </mask> + <mask name="IOSCFS" value="0x040" > <value value="0x000" name="4MHZ" cname="_IOSCFS_OFF" /> <value value="0x040" name="8MHZ" cname="_IOSCFS_ON" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F54.xml b/src/devices/pic/xml_data/16F54.xml index c5abd78..4b55624 100644 --- a/src/devices/pic/xml_data/16F54.xml +++ b/src/devices/pic/xml_data/16F54.xml @@ -29,25 +29,25 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000" end="0x1FF" /> - <memory name="user_ids" start="0x200" end="0x203" rtqmask="0x00F" /> + <memory name="user_ids" start="0x200" end="0x203" rmask="0x00F" /> <memory name="config" start="0xFFF" end="0xFFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0xFFF" bvalue="0x00F" > - <tqmask name="FOSC" value="0x003" > + <config offset="0x0" name="" wmask="0xFFF" bvalue="0x00F" > + <mask name="FOSC" value="0x003" > <value value="0x000" name="LP" cname="_LP_OSC" /> <value value="0x001" name="XT" cname="_XT_OSC" /> <value value="0x002" name="HS" cname="_HS_OSC" /> <value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x004" > + </mask> + <mask name="WDT" value="0x004" > <value value="0x000" name="Off" cname="_WDT_OFF" /> <value value="0x004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="CP" value="0x008" > + </mask> + <mask name="CP" value="0x008" > <value value="0x000" name="040:1FF" cname="_CP_ON" /> <value value="0x008" name="Off" cname="_CP_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F57.xml b/src/devices/pic/xml_data/16F57.xml index 26afb61..e84e053 100644 --- a/src/devices/pic/xml_data/16F57.xml +++ b/src/devices/pic/xml_data/16F57.xml @@ -29,25 +29,25 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000" end="0x7FF" /> - <memory name="user_ids" start="0x800" end="0x803" rtqmask="0x00F" /> + <memory name="user_ids" start="0x800" end="0x803" rmask="0x00F" /> <memory name="config" start="0xFFF" end="0xFFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0xFFF" bvalue="0x00F" > - <tqmask name="FOSC" value="0x003" > + <config offset="0x0" name="" wmask="0xFFF" bvalue="0x00F" > + <mask name="FOSC" value="0x003" > <value value="0x000" name="LP" cname="_LP_OSC" /> <value value="0x001" name="XT" cname="_XT_OSC" /> <value value="0x002" name="HS" cname="_HS_OSC" /> <value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x004" > + </mask> + <mask name="WDT" value="0x004" > <value value="0x000" name="Off" cname="_WDT_OFF" /> <value value="0x004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="CP" value="0x008" > + </mask> + <mask name="CP" value="0x008" > <value value="0x000" name="040:7FF" cname="_CP_ON" /> <value value="0x008" name="Off" cname="_CP_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F59.xml b/src/devices/pic/xml_data/16F59.xml index 4ecfae8..b29659a 100644 --- a/src/devices/pic/xml_data/16F59.xml +++ b/src/devices/pic/xml_data/16F59.xml @@ -29,25 +29,25 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000" end="0x7FF" /> - <memory name="user_ids" start="0x800" end="0x803" rtqmask="0x00F" /> + <memory name="user_ids" start="0x800" end="0x803" rmask="0x00F" /> <memory name="config" start="0xFFF" end="0xFFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0xFFF" bvalue="0x00F" > - <tqmask name="FOSC" value="0x003" > + <config offset="0x0" name="" wmask="0xFFF" bvalue="0x00F" > + <mask name="FOSC" value="0x003" > <value value="0x000" name="LP" cname="_LP_OSC" /> <value value="0x001" name="XT" cname="_XT_OSC" /> <value value="0x002" name="HS" cname="_HS_OSC" /> <value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x004" > + </mask> + <mask name="WDT" value="0x004" > <value value="0x000" name="Off" cname="_WDT_OFF" /> <value value="0x004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="CP" value="0x008" > + </mask> + <mask name="CP" value="0x008" > <value value="0x000" name="040:7FF" cname="_CP_ON" /> <value value="0x008" name="Off" cname="_CP_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F610.xml b/src/devices/pic/xml_data/16F610.xml index acf84ca..46795b1 100644 --- a/src/devices/pic/xml_data/16F610.xml +++ b/src/devices/pic/xml_data/16F610.xml @@ -38,15 +38,15 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x03FF" /> - <memory name="calibration" start="0x2008" end="0x2008" cal_optqmask="0x0000" cal_opcode="0x0000" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="calibration" start="0x2008" end="0x2008" cal_opmask="0x0000" cal_opcode="0x0000" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x03FF" > - <tqmask name="FOSC" value="0x0007" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x03FF" > + <mask name="FOSC" value="0x0007" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -55,32 +55,32 @@ <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" /> <value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" /> <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" /> - </tqmask> - <tqmask name="WDT" value="0x0008" > + </mask> + <mask name="WDT" value="0x0008" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0008" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0010" > + </mask> + <mask name="PWRTE" value="0x0010" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0010" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x0020" > + </mask> + <mask name="MCLRE" value="0x0020" > <value value="0x0000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x0020" name="External" cname="_MCLRE_ON" /> - </tqmask> - <tqmask name="CP" value="0x0040" > + </mask> + <mask name="CP" value="0x0040" > <value value="0x0000" name="All" cname="_CP_ON" /> <value value="0x0040" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="IOSCFS" value="0x0080" > + </mask> + <mask name="IOSCFS" value="0x0080" > <value value="0x0000" name="4MHZ" cname="_IOSCFS_4MHZ" /> <value value="0x0080" name="8MHZ" cname="_IOSCFS_8MHZ" /> - </tqmask> - <tqmask name="BODEN" value="0x0300" > + </mask> + <mask name="BODEN" value="0x0300" > <value value="default" name="Off" cname="_BOR_OFF" /> <value value="0x0200" name="On_run" cname="_BOR_NSLEEP" /> <value value="0x0300" name="On" cname="_BOR_ON" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F616.xml b/src/devices/pic/xml_data/16F616.xml index 890aac4..9f8ca55 100644 --- a/src/devices/pic/xml_data/16F616.xml +++ b/src/devices/pic/xml_data/16F616.xml @@ -39,15 +39,15 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x07FF" /> - <memory name="calibration" start="0x2008" end="0x2008" cal_optqmask="0x0000" cal_opcode="0x0000" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="calibration" start="0x2008" end="0x2008" cal_opmask="0x0000" cal_opcode="0x0000" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x03FF" > - <tqmask name="FOSC" value="0x0007" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x03FF" > + <mask name="FOSC" value="0x0007" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -56,32 +56,32 @@ <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" /> <value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" /> <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" /> - </tqmask> - <tqmask name="WDT" value="0x0008" > + </mask> + <mask name="WDT" value="0x0008" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0008" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0010" > + </mask> + <mask name="PWRTE" value="0x0010" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0010" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x0020" > + </mask> + <mask name="MCLRE" value="0x0020" > <value value="0x0000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x0020" name="External" cname="_MCLRE_ON" /> - </tqmask> - <tqmask name="CP" value="0x0040" > + </mask> + <mask name="CP" value="0x0040" > <value value="0x0000" name="All" cname="_CP_ON" /> <value value="0x0040" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="IOSCFS" value="0x0080" > + </mask> + <mask name="IOSCFS" value="0x0080" > <value value="0x0000" name="4MHZ" cname="_IOSCFS_4MHZ" /> <value value="0x0080" name="8MHZ" cname="_IOSCFS_8MHZ" /> - </tqmask> - <tqmask name="BODEN" value="0x0300" > + </mask> + <mask name="BODEN" value="0x0300" > <value value="default" name="Off" cname="_BOR_OFF" /> <value value="0x0200" name="On_run" cname="_BOR_NSLEEP" /> <value value="0x0300" name="On" cname="_BOR_ON" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F627.xml b/src/devices/pic/xml_data/16F627.xml index 2656e1a..7ce03a5 100644 --- a/src/devices/pic/xml_data/16F627.xml +++ b/src/devices/pic/xml_data/16F627.xml @@ -46,22 +46,22 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x03FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="eeprom" start="0x0000" end="0x007F" hexfile_offset="0x2100" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3DFF" icnames="_CP_50" > - <tqmask name="WDT" value="0x0004" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3DFF" icnames="_CP_50" > + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="FOSC" value="0x0013" > + </mask> + <mask name="FOSC" value="0x0013" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -70,29 +70,29 @@ <value value="0x0011" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" /> <value value="0x0012" name="ER_IO" cname="_ER_OSC_NOCLKOUT" /> <value value="0x0013" name="ER_CLKOUT" cname="_ER_OSC_CLKOUT" /> - </tqmask> - <tqmask name="MCLRE" value="0x0020" > + </mask> + <mask name="MCLRE" value="0x0020" > <value value="0x0000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x0020" name="External" cname="_MCLRE_ON" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x0080" > + </mask> + <mask name="LVP" value="0x0080" > <value value="0x0000" name="Off" cname="_LVP_OFF" /> <value value="0x0080" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="CPD" value="0x0100" > + </mask> + <mask name="CPD" value="0x0100" > <value value="0x0000" name="All" cname="_DATA_CP_ON" /> <value value="0x0100" name="Off" cname="_DATA_CP_OFF" /> - </tqmask> - <tqmask name="CP" value="0x3C00" > + </mask> + <mask name="CP" value="0x3C00" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1400" name="200:3FF" cname="_CP_75" /> <value value="0x3C00" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F627A.xml b/src/devices/pic/xml_data/16F627A.xml index 3992f2a..de43d7a 100644 --- a/src/devices/pic/xml_data/16F627A.xml +++ b/src/devices/pic/xml_data/16F627A.xml @@ -37,23 +37,23 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x03FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="eeprom" start="0x0000" end="0x007F" hexfile_offset="0x2100" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x21FF" > - <tqmask name="WDT" value="0x0004" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x21FF" > + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="FOSC" value="0x0013" > + </mask> + <mask name="FOSC" value="0x0013" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -62,27 +62,27 @@ <value value="0x0011" name="INTRC_CLKOUT" cname="_INTOSC_OSC_CLKOUT" ecnames="_INTRC_OSC_CLKOUT" /> <value value="0x0012" name="ER_IO" cname="_RC_OSC_NOCLKOUT" ecnames="_ER_OSC_NOCLKOUT" /> <value value="0x0013" name="ER_CLKOUT" cname="_RC_OSC_CLKOUT" ecnames="_ER_OSC_CLKOUT" /> - </tqmask> - <tqmask name="MCLRE" value="0x0020" > + </mask> + <mask name="MCLRE" value="0x0020" > <value value="0x0000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x0020" name="External" cname="_MCLRE_ON" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BOREN_OFF" ecnames="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BOREN_ON" ecnames="_BODEN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x0080" > + </mask> + <mask name="LVP" value="0x0080" > <value value="0x0000" name="Off" cname="_LVP_OFF" /> <value value="0x0080" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="CPD" value="0x0100" > + </mask> + <mask name="CPD" value="0x0100" > <value value="0x0000" name="All" cname="_DATA_CP_ON" /> <value value="0x0100" name="Off" cname="_DATA_CP_OFF" /> - </tqmask> - <tqmask name="CP" value="0x2000" > + </mask> + <mask name="CP" value="0x2000" > <value value="0x0000" name="All" cname="_CP_ON" /> <value value="0x2000" name="Off" cname="_CP_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F628.xml b/src/devices/pic/xml_data/16F628.xml index 1261707..fed16fa 100644 --- a/src/devices/pic/xml_data/16F628.xml +++ b/src/devices/pic/xml_data/16F628.xml @@ -47,22 +47,22 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x07FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="eeprom" start="0x0000" end="0x007F" hexfile_offset="0x2100" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3DFF" > - <tqmask name="WDT" value="0x0004" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3DFF" > + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="FOSC" value="0x0013" > + </mask> + <mask name="FOSC" value="0x0013" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -71,30 +71,30 @@ <value value="0x0011" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" /> <value value="0x0012" name="ER_IO" cname="_ER_OSC_NOCLKOUT" /> <value value="0x0013" name="ER_CLKOUT" cname="_ER_OSC_CLKOUT" /> - </tqmask> - <tqmask name="MCLRE" value="0x0020" > + </mask> + <mask name="MCLRE" value="0x0020" > <value value="0x0000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x0020" name="External" cname="_MCLRE_ON" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x0080" > + </mask> + <mask name="LVP" value="0x0080" > <value value="0x0000" name="Off" cname="_LVP_OFF" /> <value value="0x0080" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="CPD" value="0x0100" > + </mask> + <mask name="CPD" value="0x0100" > <value value="0x0000" name="All" cname="_DATA_CP_ON" /> <value value="0x0100" name="Off" cname="_DATA_CP_OFF" /> - </tqmask> - <tqmask name="CP" value="0x3C00" > + </mask> + <mask name="CP" value="0x3C00" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1400" name="200:7FF" cname="_CP_75" /> <value value="0x2800" name="400:7FF" cname="_CP_50" /> <value value="0x3C00" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F628A.xml b/src/devices/pic/xml_data/16F628A.xml index 8a194f9..8c5a4cc 100644 --- a/src/devices/pic/xml_data/16F628A.xml +++ b/src/devices/pic/xml_data/16F628A.xml @@ -37,23 +37,23 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x07FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="eeprom" start="0x0000" end="0x007F" hexfile_offset="0x2100" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x21FF" > - <tqmask name="WDT" value="0x0004" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x21FF" > + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="FOSC" value="0x0013" > + </mask> + <mask name="FOSC" value="0x0013" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -62,27 +62,27 @@ <value value="0x0011" name="INTRC_CLKOUT" cname="_INTOSC_OSC_CLKOUT" ecnames="_INTRC_OSC_CLKOUT" /> <value value="0x0012" name="ER_IO" cname="_RC_OSC_NOCLKOUT" ecnames="_ER_OSC_NOCLKOUT" /> <value value="0x0013" name="ER_CLKOUT" cname="_RC_OSC_CLKOUT" ecnames="_ER_OSC_CLKOUT" /> - </tqmask> - <tqmask name="MCLRE" value="0x0020" > + </mask> + <mask name="MCLRE" value="0x0020" > <value value="0x0000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x0020" name="External" cname="_MCLRE_ON" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BOREN_OFF" ecnames="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BOREN_ON" ecnames="_BODEN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x0080" > + </mask> + <mask name="LVP" value="0x0080" > <value value="0x0000" name="Off" cname="_LVP_OFF" /> <value value="0x0080" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="CPD" value="0x0100" > + </mask> + <mask name="CPD" value="0x0100" > <value value="0x0000" name="All" cname="_DATA_CP_ON" /> <value value="0x0100" name="Off" cname="_DATA_CP_OFF" /> - </tqmask> - <tqmask name="CP" value="0x2000" > + </mask> + <mask name="CP" value="0x2000" > <value value="0x0000" name="All" cname="_CP_ON" /> <value value="0x2000" name="Off" cname="_CP_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F630.xml b/src/devices/pic/xml_data/16F630.xml index 2096457..a82ffdb 100644 --- a/src/devices/pic/xml_data/16F630.xml +++ b/src/devices/pic/xml_data/16F630.xml @@ -36,16 +36,16 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x03FE" /> - <memory name="calibration" start="0x03FF" end="0x03FF" cal_optqmask="0x3C00" cal_opcode="0x3400" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="calibration" start="0x03FF" end="0x03FF" cal_opmask="0x3C00" cal_opcode="0x3400" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="eeprom" start="0x0000" end="0x007F" hexfile_offset="0x2100" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x31FF" bvalue="0x31FF" ptqmask="0x3000" > - <tqmask name="FOSC" value="0x0007" > + <config offset="0x0" name="" wmask="0x31FF" bvalue="0x31FF" pmask="0x3000" > + <mask name="FOSC" value="0x0007" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -54,37 +54,37 @@ <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" /> <value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" /> <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" /> - </tqmask> - <tqmask name="WDT" value="0x0008" > + </mask> + <mask name="WDT" value="0x0008" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0008" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0010" > + </mask> + <mask name="PWRTE" value="0x0010" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0010" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x0020" > + </mask> + <mask name="MCLRE" value="0x0020" > <value value="0x0000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x0020" name="External" cname="_MCLRE_ON" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN" /> - </tqmask> - <tqmask name="CP" value="0x0080" > + </mask> + <mask name="CP" value="0x0080" > <value value="0x0000" name="All" cname="_CP" /> <value value="0x0080" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x0100" > + </mask> + <mask name="CPD" value="0x0100" > <value value="0x0000" name="All" cname="_CPD" /> <value value="0x0100" name="Off" cname="_CPD_OFF" /> - </tqmask> - <tqmask name="BG" value="0x3000"> + </mask> + <mask name="BG" value="0x3000"> <value value="0x0000" name="Lowest" /> <value value="0x1000" name="Mid/Low" /> <value value="0x2000" name="Mid/High" /> <value value="0x3000" name="Highest" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F631.xml b/src/devices/pic/xml_data/16F631.xml index 9a0bb10..e6a5274 100644 --- a/src/devices/pic/xml_data/16F631.xml +++ b/src/devices/pic/xml_data/16F631.xml @@ -30,16 +30,16 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x03FF" /> - <memory name="calibration" start="0x2008" end="0x2008" cal_optqmask="0x0000" cal_opcode="0x0000" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="calibration" start="0x2008" end="0x2008" cal_opmask="0x0000" cal_opcode="0x0000" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="eeprom" start="0x0000" end="0x007F" hexfile_offset="0x2100" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x0FFF" > - <tqmask name="FOSC" value="0x0007" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x0FFF" > + <mask name="FOSC" value="0x0007" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -48,41 +48,41 @@ <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" /> <value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" /> <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" /> - </tqmask> - <tqmask name="WDT" value="0x0008" > + </mask> + <mask name="WDT" value="0x0008" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0008" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0010" > + </mask> + <mask name="PWRTE" value="0x0010" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0010" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x0020" > + </mask> + <mask name="MCLRE" value="0x0020" > <value value="0x0000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x0020" name="External" cname="_MCLRE_ON" /> - </tqmask> - <tqmask name="CP" value="0x0040" > + </mask> + <mask name="CP" value="0x0040" > <value value="0x0000" name="All" cname="_CP_ON" /> <value value="0x0040" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x0080" > + </mask> + <mask name="CPD" value="0x0080" > <value value="0x0000" name="All" cname="_CPD_ON" /> <value value="0x0080" name="Off" cname="_CPD_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0300" > + </mask> + <mask name="BODEN" value="0x0300" > <value value="0x0000" name="Off" cname="_BOR_OFF" /> <value value="0x0100" name="Software" cname="_BOR_SBODEN" /> <value value="0x0200" name="On_run" cname="_BOR_NSLEEP" /> <value value="0x0300" name="On" cname="_BOR_ON" /> - </tqmask> - <tqmask name="IESO" value="0x0400" > + </mask> + <mask name="IESO" value="0x0400" > <value value="0x0000" name="Off" cname="_IESO_OFF" /> <value value="0x0400" name="On" cname="_IESO_ON" /> - </tqmask> - <tqmask name="FCMEN" value="0x0800" > + </mask> + <mask name="FCMEN" value="0x0800" > <value value="0x0000" name="Off" cname="_FCMEN_OFF" /> <value value="0x0800" name="On" cname="_FCMEN_ON" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F636.xml b/src/devices/pic/xml_data/16F636.xml index d996191..e47314e 100644 --- a/src/devices/pic/xml_data/16F636.xml +++ b/src/devices/pic/xml_data/16F636.xml @@ -30,16 +30,16 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x07FF" /> - <memory name="calibration" start="0x2008" end="0x2009" cal_optqmask="0x0000" cal_opcode="0x0000" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="calibration" start="0x2008" end="0x2009" cal_opmask="0x0000" cal_opcode="0x0000" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x1FFF" > - <tqmask name="FOSC" value="0x0007" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x1FFF" > + <mask name="FOSC" value="0x0007" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -48,45 +48,45 @@ <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" /> <value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" /> <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" /> - </tqmask> - <tqmask name="WDT" value="0x0008" > + </mask> + <mask name="WDT" value="0x0008" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0008" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0010" > + </mask> + <mask name="PWRTE" value="0x0010" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0010" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x0020" > + </mask> + <mask name="MCLRE" value="0x0020" > <value value="0x0000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x0020" name="External" cname="_MCLRE_ON" /> - </tqmask> - <tqmask name="CP" value="0x0040" > + </mask> + <mask name="CP" value="0x0040" > <value value="0x0000" name="All" cname="_CP_ON" /> <value value="0x0040" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x0080" > + </mask> + <mask name="CPD" value="0x0080" > <value value="0x0000" name="All" cname="_CPD_ON" /> <value value="0x0080" name="Off" cname="_CPD_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0300" > + </mask> + <mask name="BODEN" value="0x0300" > <value value="0x0000" name="Off" cname="_BOD_OFF" /> <value value="0x0100" name="Software" cname="_BOD_SBODEN" /> <value value="0x0200" name="On_run" cname="_BOD_NSLEEP" /> <value value="0x0300" name="On" cname="_BOD_ON" /> - </tqmask> - <tqmask name="IESO" value="0x0400" > + </mask> + <mask name="IESO" value="0x0400" > <value value="0x0000" name="Off" cname="_IESO_OFF" /> <value value="0x0400" name="On" cname="_IESO_ON" /> - </tqmask> - <tqmask name="FCMEN" value="0x0800" > + </mask> + <mask name="FCMEN" value="0x0800" > <value value="0x0000" name="Off" cname="_FCMEN_OFF" /> <value value="0x0800" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="WUREN" value="0x1000" > + </mask> + <mask name="WUREN" value="0x1000" > <value value="0x0000" name="On" cname="_WUREN_ON" /> <value value="0x1000" name="Off" cname="_WUREN_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F639.xml b/src/devices/pic/xml_data/16F639.xml index 6cb669e..7affb7b 100644 --- a/src/devices/pic/xml_data/16F639.xml +++ b/src/devices/pic/xml_data/16F639.xml @@ -30,16 +30,16 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x07FF" /> - <memory name="calibration" start="0x2008" end="0x2009" cal_optqmask="0x0000" cal_opcode="0x0000" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="calibration" start="0x2008" end="0x2009" cal_opmask="0x0000" cal_opcode="0x0000" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x1FFF" > - <tqmask name="FOSC" value="0x0007" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x1FFF" > + <mask name="FOSC" value="0x0007" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -48,45 +48,45 @@ <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" /> <value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" /> <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" /> - </tqmask> - <tqmask name="WDT" value="0x0008" > + </mask> + <mask name="WDT" value="0x0008" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0008" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0010" > + </mask> + <mask name="PWRTE" value="0x0010" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0010" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x0020" > + </mask> + <mask name="MCLRE" value="0x0020" > <value value="0x0000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x0020" name="External" cname="_MCLRE_ON" /> - </tqmask> - <tqmask name="CP" value="0x0040" > + </mask> + <mask name="CP" value="0x0040" > <value value="0x0000" name="All" cname="_CP_ON" /> <value value="0x0040" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x0080" > + </mask> + <mask name="CPD" value="0x0080" > <value value="0x0000" name="All" cname="_CPD_ON" /> <value value="0x0080" name="Off" cname="_CPD_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0300" > + </mask> + <mask name="BODEN" value="0x0300" > <value value="0x0000" name="Off" cname="_BOD_OFF" /> <value value="0x0100" name="Software" cname="_BOD_SBODEN" /> <value value="0x0200" name="On_run" cname="_BOD_NSLEEP" /> <value value="0x0300" name="On" cname="_BOD_ON" /> - </tqmask> - <tqmask name="IESO" value="0x0400" > + </mask> + <mask name="IESO" value="0x0400" > <value value="0x0000" name="Off" cname="_IESO_OFF" /> <value value="0x0400" name="On" cname="_IESO_ON" /> - </tqmask> - <tqmask name="FCMEN" value="0x0800" > + </mask> + <mask name="FCMEN" value="0x0800" > <value value="0x0000" name="Off" cname="_FCMEN_OFF" /> <value value="0x0800" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="WUREN" value="0x1000" > + </mask> + <mask name="WUREN" value="0x1000" > <value value="0x0000" name="On" cname="_WUREN_ON" /> <value value="0x1000" name="Off" cname="_WUREN_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F648A.xml b/src/devices/pic/xml_data/16F648A.xml index 6ece38e..17b4f83 100644 --- a/src/devices/pic/xml_data/16F648A.xml +++ b/src/devices/pic/xml_data/16F648A.xml @@ -37,23 +37,23 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x0FFF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x21FF" > - <tqmask name="WDT" value="0x0004" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x21FF" > + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="FOSC" value="0x0013" > + </mask> + <mask name="FOSC" value="0x0013" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -62,27 +62,27 @@ <value value="0x0011" name="INTRC_CLKOUT" cname="_INTOSC_OSC_CLKOUT" ecnames="_INTRC_OSC_CLKOUT" /> <value value="0x0012" name="ER_IO" cname="_RC_OSC_NOCLKOUT" ecnames="_ER_OSC_NOCLKOUT" /> <value value="0x0013" name="ER_CLKOUT" cname="_RC_OSC_CLKOUT" ecnames="_ER_OSC_CLKOUT" /> - </tqmask> - <tqmask name="MCLRE" value="0x0020" > + </mask> + <mask name="MCLRE" value="0x0020" > <value value="0x0000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x0020" name="External" cname="_MCLRE_ON" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BOREN_OFF" ecnames="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BOREN_ON" ecnames="_BODEN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x0080" > + </mask> + <mask name="LVP" value="0x0080" > <value value="0x0000" name="Off" cname="_LVP_OFF" /> <value value="0x0080" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="CPD" value="0x0100" > + </mask> + <mask name="CPD" value="0x0100" > <value value="0x0000" name="All" cname="_DATA_CP_ON" /> <value value="0x0100" name="Off" cname="_DATA_CP_OFF" /> - </tqmask> - <tqmask name="CP" value="0x2000" > + </mask> + <mask name="CP" value="0x2000" > <value value="0x0000" name="All" cname="_CP_ON" /> <value value="0x2000" name="Off" cname="_CP_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F676.xml b/src/devices/pic/xml_data/16F676.xml index 6dc78bc..b608d48 100644 --- a/src/devices/pic/xml_data/16F676.xml +++ b/src/devices/pic/xml_data/16F676.xml @@ -36,16 +36,16 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x03FE" /> - <memory name="calibration" start="0x03FF" end="0x03FF" cal_optqmask="0x3C00" cal_opcode="0x3400" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="calibration" start="0x03FF" end="0x03FF" cal_opmask="0x3C00" cal_opcode="0x3400" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="eeprom" start="0x0000" end="0x007F" hexfile_offset="0x2100" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x31FF" bvalue="0x31FF" ptqmask="0x3000" > - <tqmask name="FOSC" value="0x0007" > + <config offset="0x0" name="" wmask="0x31FF" bvalue="0x31FF" pmask="0x3000" > + <mask name="FOSC" value="0x0007" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -54,37 +54,37 @@ <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" /> <value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" /> <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" /> - </tqmask> - <tqmask name="WDT" value="0x0008" > + </mask> + <mask name="WDT" value="0x0008" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0008" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0010" > + </mask> + <mask name="PWRTE" value="0x0010" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0010" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x0020" > + </mask> + <mask name="MCLRE" value="0x0020" > <value value="0x0000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x0020" name="External" cname="_MCLRE_ON" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN" /> - </tqmask> - <tqmask name="CP" value="0x0080" > + </mask> + <mask name="CP" value="0x0080" > <value value="0x0000" name="All" cname="_CP" /> <value value="0x0080" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x0100" > + </mask> + <mask name="CPD" value="0x0100" > <value value="0x0000" name="All" cname="_CPD" /> <value value="0x0100" name="Off" cname="_CPD_OFF" /> - </tqmask> - <tqmask name="BG" value="0x3000"> + </mask> + <mask name="BG" value="0x3000"> <value value="0x0000" name="Lowest" /> <value value="0x1000" name="Mid/Low" /> <value value="0x2000" name="Mid/High" /> <value value="0x3000" name="Highest" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F677.xml b/src/devices/pic/xml_data/16F677.xml index f819715..d27b2eb 100644 --- a/src/devices/pic/xml_data/16F677.xml +++ b/src/devices/pic/xml_data/16F677.xml @@ -30,16 +30,16 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x07FF" /> - <memory name="calibration" start="0x2008" end="0x2008" cal_optqmask="0x0000" cal_opcode="0x0000" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="calibration" start="0x2008" end="0x2008" cal_opmask="0x0000" cal_opcode="0x0000" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x0FFF" > - <tqmask name="FOSC" value="0x0007" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x0FFF" > + <mask name="FOSC" value="0x0007" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -48,41 +48,41 @@ <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" /> <value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" /> <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" /> - </tqmask> - <tqmask name="WDT" value="0x0008" > + </mask> + <mask name="WDT" value="0x0008" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0008" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0010" > + </mask> + <mask name="PWRTE" value="0x0010" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0010" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x0020" > + </mask> + <mask name="MCLRE" value="0x0020" > <value value="0x0000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x0020" name="External" cname="_MCLRE_ON" /> - </tqmask> - <tqmask name="CP" value="0x0040" > + </mask> + <mask name="CP" value="0x0040" > <value value="0x0000" name="All" cname="_CP_ON" /> <value value="0x0040" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x0080" > + </mask> + <mask name="CPD" value="0x0080" > <value value="0x0000" name="All" cname="_CPD_ON" /> <value value="0x0080" name="Off" cname="_CPD_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0300" > + </mask> + <mask name="BODEN" value="0x0300" > <value value="0x0000" name="Off" cname="_BOR_OFF" /> <value value="0x0100" name="Software" cname="_BOR_SBODEN" /> <value value="0x0200" name="On_run" cname="_BOR_NSLEEP" /> <value value="0x0300" name="On" cname="_BOR_ON" /> - </tqmask> - <tqmask name="IESO" value="0x0400" > + </mask> + <mask name="IESO" value="0x0400" > <value value="0x0000" name="Off" cname="_IESO_OFF" /> <value value="0x0400" name="On" cname="_IESO_ON" /> - </tqmask> - <tqmask name="FCMEN" value="0x0800" > + </mask> + <mask name="FCMEN" value="0x0800" > <value value="0x0000" name="Off" cname="_FCMEN_OFF" /> <value value="0x0800" name="On" cname="_FCMEN_ON" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F684.xml b/src/devices/pic/xml_data/16F684.xml index c620fc1..f330925 100644 --- a/src/devices/pic/xml_data/16F684.xml +++ b/src/devices/pic/xml_data/16F684.xml @@ -30,16 +30,16 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x07FF" /> - <memory name="calibration" start="0x2008" end="0x2008" cal_optqmask="0x0000" cal_opcode="0x0000" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="calibration" start="0x2008" end="0x2008" cal_opmask="0x0000" cal_opcode="0x0000" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x0FFF" > - <tqmask name="FOSC" value="0x0007" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x0FFF" > + <mask name="FOSC" value="0x0007" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -48,41 +48,41 @@ <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" /> <value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" /> <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" /> - </tqmask> - <tqmask name="WDT" value="0x0008" > + </mask> + <mask name="WDT" value="0x0008" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0008" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0010" > + </mask> + <mask name="PWRTE" value="0x0010" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0010" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x0020" > + </mask> + <mask name="MCLRE" value="0x0020" > <value value="0x0000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x0020" name="External" cname="_MCLRE_ON" /> - </tqmask> - <tqmask name="CP" value="0x0040" > + </mask> + <mask name="CP" value="0x0040" > <value value="0x0000" name="All" cname="_CP_ON" /> <value value="0x0040" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x0080" > + </mask> + <mask name="CPD" value="0x0080" > <value value="0x0000" name="All" cname="_CPD_ON" /> <value value="0x0080" name="Off" cname="_CPD_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0300" > + </mask> + <mask name="BODEN" value="0x0300" > <value value="0x0000" name="Off" cname="_BOD_OFF" /> <value value="0x0100" name="Software" cname="_BOD_SBODEN" /> <value value="0x0200" name="On_run" cname="_BOD_NSLEEP" /> <value value="0x0300" name="On" cname="_BOD_ON" /> - </tqmask> - <tqmask name="IESO" value="0x0400" > + </mask> + <mask name="IESO" value="0x0400" > <value value="0x0000" name="Off" cname="_IESO_OFF" /> <value value="0x0400" name="On" cname="_IESO_ON" /> - </tqmask> - <tqmask name="FCMEN" value="0x0800" > + </mask> + <mask name="FCMEN" value="0x0800" > <value value="0x0000" name="Off" cname="_FCMEN_OFF" /> <value value="0x0800" name="On" cname="_FCMEN_ON" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F685.xml b/src/devices/pic/xml_data/16F685.xml index a0c5713..aa35aa3 100644 --- a/src/devices/pic/xml_data/16F685.xml +++ b/src/devices/pic/xml_data/16F685.xml @@ -30,16 +30,16 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x0FFF" /> - <memory name="calibration" start="0x2008" end="0x2008" cal_optqmask="0x0000" cal_opcode="0x0000" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="calibration" start="0x2008" end="0x2008" cal_opmask="0x0000" cal_opcode="0x0000" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x0FFF" > - <tqmask name="FOSC" value="0x0007" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x0FFF" > + <mask name="FOSC" value="0x0007" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -48,41 +48,41 @@ <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" /> <value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" /> <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" /> - </tqmask> - <tqmask name="WDT" value="0x0008" > + </mask> + <mask name="WDT" value="0x0008" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0008" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0010" > + </mask> + <mask name="PWRTE" value="0x0010" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0010" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x0020" > + </mask> + <mask name="MCLRE" value="0x0020" > <value value="0x0000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x0020" name="External" cname="_MCLRE_ON" /> - </tqmask> - <tqmask name="CP" value="0x0040" > + </mask> + <mask name="CP" value="0x0040" > <value value="0x0000" name="All" cname="_CP_ON" /> <value value="0x0040" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x0080" > + </mask> + <mask name="CPD" value="0x0080" > <value value="0x0000" name="All" cname="_CPD_ON" /> <value value="0x0080" name="Off" cname="_CPD_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0300" > + </mask> + <mask name="BODEN" value="0x0300" > <value value="0x0000" name="Off" cname="_BOR_OFF" /> <value value="0x0100" name="Software" cname="_BOR_SBODEN" /> <value value="0x0200" name="On_run" cname="_BOR_NSLEEP" /> <value value="0x0300" name="On" cname="_BOR_ON" /> - </tqmask> - <tqmask name="IESO" value="0x0400" > + </mask> + <mask name="IESO" value="0x0400" > <value value="0x0000" name="Off" cname="_IESO_OFF" /> <value value="0x0400" name="On" cname="_IESO_ON" /> - </tqmask> - <tqmask name="FCMEN" value="0x0800" > + </mask> + <mask name="FCMEN" value="0x0800" > <value value="0x0000" name="Off" cname="_FCMEN_OFF" /> <value value="0x0800" name="On" cname="_FCMEN_ON" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F687.xml b/src/devices/pic/xml_data/16F687.xml index 093f879..2e58780 100644 --- a/src/devices/pic/xml_data/16F687.xml +++ b/src/devices/pic/xml_data/16F687.xml @@ -30,16 +30,16 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x07FF" /> - <memory name="calibration" start="0x2008" end="0x2008" cal_optqmask="0x0000" cal_opcode="0x0000" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="calibration" start="0x2008" end="0x2008" cal_opmask="0x0000" cal_opcode="0x0000" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x0FFF" > - <tqmask name="FOSC" value="0x0007" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x0FFF" > + <mask name="FOSC" value="0x0007" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -48,41 +48,41 @@ <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" /> <value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" /> <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" /> - </tqmask> - <tqmask name="WDT" value="0x0008" > + </mask> + <mask name="WDT" value="0x0008" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0008" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0010" > + </mask> + <mask name="PWRTE" value="0x0010" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0010" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x0020" > + </mask> + <mask name="MCLRE" value="0x0020" > <value value="0x0000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x0020" name="External" cname="_MCLRE_ON" /> - </tqmask> - <tqmask name="CP" value="0x0040" > + </mask> + <mask name="CP" value="0x0040" > <value value="0x0000" name="All" cname="_CP_ON" /> <value value="0x0040" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x0080" > + </mask> + <mask name="CPD" value="0x0080" > <value value="0x0000" name="All" cname="_CPD_ON" /> <value value="0x0080" name="Off" cname="_CPD_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0300" > + </mask> + <mask name="BODEN" value="0x0300" > <value value="0x0000" name="Off" cname="_BOR_OFF" /> <value value="0x0100" name="Software" cname="_BOR_SBODEN" /> <value value="0x0200" name="On_run" cname="_BOR_NSLEEP" /> <value value="0x0300" name="On" cname="_BOR_ON" /> - </tqmask> - <tqmask name="IESO" value="0x0400" > + </mask> + <mask name="IESO" value="0x0400" > <value value="0x0000" name="Off" cname="_IESO_OFF" /> <value value="0x0400" name="On" cname="_IESO_ON" /> - </tqmask> - <tqmask name="FCMEN" value="0x0800" > + </mask> + <mask name="FCMEN" value="0x0800" > <value value="0x0000" name="Off" cname="_FCMEN_OFF" /> <value value="0x0800" name="On" cname="_FCMEN_ON" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F688.xml b/src/devices/pic/xml_data/16F688.xml index bde2461..2692159 100644 --- a/src/devices/pic/xml_data/16F688.xml +++ b/src/devices/pic/xml_data/16F688.xml @@ -30,16 +30,16 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x0FFF" /> - <memory name="calibration" start="0x2008" end="0x2008" cal_optqmask="0x0000" cal_opcode="0x0000" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="calibration" start="0x2008" end="0x2008" cal_opmask="0x0000" cal_opcode="0x0000" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x0FFF" > - <tqmask name="FOSC" value="0x0007" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x0FFF" > + <mask name="FOSC" value="0x0007" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -48,41 +48,41 @@ <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" /> <value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" /> <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" /> - </tqmask> - <tqmask name="WDT" value="0x0008" > + </mask> + <mask name="WDT" value="0x0008" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0008" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0010" > + </mask> + <mask name="PWRTE" value="0x0010" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0010" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x0020" > + </mask> + <mask name="MCLRE" value="0x0020" > <value value="0x0000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x0020" name="External" cname="_MCLRE_ON" /> - </tqmask> - <tqmask name="CP" value="0x0040" > + </mask> + <mask name="CP" value="0x0040" > <value value="0x0000" name="All" cname="_CP_ON" /> <value value="0x0040" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x0080" > + </mask> + <mask name="CPD" value="0x0080" > <value value="0x0000" name="All" cname="_CPD_ON" /> <value value="0x0080" name="Off" cname="_CPD_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0300" > + </mask> + <mask name="BODEN" value="0x0300" > <value value="0x0000" name="Off" cname="_BOD_OFF" /> <value value="0x0100" name="Software" cname="_BOD_SBODEN" /> <value value="0x0200" name="On_run" cname="_BOD_NSLEEP" /> <value value="0x0300" name="On" cname="_BOD_ON" /> - </tqmask> - <tqmask name="IESO" value="0x0400" > + </mask> + <mask name="IESO" value="0x0400" > <value value="0x0000" name="Off" cname="_IESO_OFF" /> <value value="0x0400" name="On" cname="_IESO_ON" /> - </tqmask> - <tqmask name="FCMEN" value="0x0800" > + </mask> + <mask name="FCMEN" value="0x0800" > <value value="0x0000" name="Off" cname="_FCMEN_OFF" /> <value value="0x0800" name="On" cname="_FCMEN_ON" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F689.xml b/src/devices/pic/xml_data/16F689.xml index af0651f..f22fdcd 100644 --- a/src/devices/pic/xml_data/16F689.xml +++ b/src/devices/pic/xml_data/16F689.xml @@ -30,16 +30,16 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x0FFF" /> - <memory name="calibration" start="0x2008" end="0x2008" cal_optqmask="0x0000" cal_opcode="0x0000" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="calibration" start="0x2008" end="0x2008" cal_opmask="0x0000" cal_opcode="0x0000" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x0FFF" > - <tqmask name="FOSC" value="0x0007" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x0FFF" > + <mask name="FOSC" value="0x0007" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -48,41 +48,41 @@ <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" /> <value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" /> <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" /> - </tqmask> - <tqmask name="WDT" value="0x0008" > + </mask> + <mask name="WDT" value="0x0008" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0008" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0010" > + </mask> + <mask name="PWRTE" value="0x0010" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0010" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x0020" > + </mask> + <mask name="MCLRE" value="0x0020" > <value value="0x0000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x0020" name="External" cname="_MCLRE_ON" /> - </tqmask> - <tqmask name="CP" value="0x0040" > + </mask> + <mask name="CP" value="0x0040" > <value value="0x0000" name="All" cname="_CP_ON" /> <value value="0x0040" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x0080" > + </mask> + <mask name="CPD" value="0x0080" > <value value="0x0000" name="All" cname="_CPD_ON" /> <value value="0x0080" name="Off" cname="_CPD_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0300" > + </mask> + <mask name="BODEN" value="0x0300" > <value value="0x0000" name="Off" cname="_BOR_OFF" /> <value value="0x0100" name="Software" cname="_BOR_SBODEN" /> <value value="0x0200" name="On_run" cname="_BOR_NSLEEP" /> <value value="0x0300" name="On" cname="_BOR_ON" /> - </tqmask> - <tqmask name="IESO" value="0x0400" > + </mask> + <mask name="IESO" value="0x0400" > <value value="0x0000" name="Off" cname="_IESO_OFF" /> <value value="0x0400" name="On" cname="_IESO_ON" /> - </tqmask> - <tqmask name="FCMEN" value="0x0800" > + </mask> + <mask name="FCMEN" value="0x0800" > <value value="0x0000" name="Off" cname="_FCMEN_OFF" /> <value value="0x0800" name="On" cname="_FCMEN_ON" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F690.xml b/src/devices/pic/xml_data/16F690.xml index f606062..7a51bac 100644 --- a/src/devices/pic/xml_data/16F690.xml +++ b/src/devices/pic/xml_data/16F690.xml @@ -30,16 +30,16 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x0FFF" /> - <memory name="calibration" start="0x2008" end="0x2008" cal_optqmask="0x0000" cal_opcode="0x0000" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="calibration" start="0x2008" end="0x2008" cal_opmask="0x0000" cal_opcode="0x0000" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x0FFF" > - <tqmask name="FOSC" value="0x0007" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x0FFF" > + <mask name="FOSC" value="0x0007" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -48,41 +48,41 @@ <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" /> <value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" /> <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" /> - </tqmask> - <tqmask name="WDT" value="0x0008" > + </mask> + <mask name="WDT" value="0x0008" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0008" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0010" > + </mask> + <mask name="PWRTE" value="0x0010" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0010" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x0020" > + </mask> + <mask name="MCLRE" value="0x0020" > <value value="0x0000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x0020" name="External" cname="_MCLRE_ON" /> - </tqmask> - <tqmask name="CP" value="0x0040" > + </mask> + <mask name="CP" value="0x0040" > <value value="0x0000" name="All" cname="_CP_ON" /> <value value="0x0040" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x0080" > + </mask> + <mask name="CPD" value="0x0080" > <value value="0x0000" name="All" cname="_CPD_ON" /> <value value="0x0080" name="Off" cname="_CPD_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0300" > + </mask> + <mask name="BODEN" value="0x0300" > <value value="0x0000" name="Off" cname="_BOR_OFF" /> <value value="0x0100" name="Software" cname="_BOR_SBODEN" /> <value value="0x0200" name="On_run" cname="_BOR_NSLEEP" /> <value value="0x0300" name="On" cname="_BOR_ON" /> - </tqmask> - <tqmask name="IESO" value="0x0400" > + </mask> + <mask name="IESO" value="0x0400" > <value value="0x0000" name="Off" cname="_IESO_OFF" /> <value value="0x0400" name="On" cname="_IESO_ON" /> - </tqmask> - <tqmask name="FCMEN" value="0x0800" > + </mask> + <mask name="FCMEN" value="0x0800" > <value value="0x0000" name="Off" cname="_FCMEN_OFF" /> <value value="0x0800" name="On" cname="_FCMEN_ON" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F716.xml b/src/devices/pic/xml_data/16F716.xml index d0cc586..8ebaa00 100644 --- a/src/devices/pic/xml_data/16F716.xml +++ b/src/devices/pic/xml_data/16F716.xml @@ -36,39 +36,39 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x07FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x20CF" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x20CF" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BOREN_OFF" ecnames="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BOREN_ON" ecnames="_BODEN_ON" /> - </tqmask> - <tqmask name="BORV" value="0x0080" > + </mask> + <mask name="BORV" value="0x0080" > <value value="0x0000" name="2.5" cname="_VBOR_25" /> <value value="0x0080" name="4.0" cname="_VBOR_40" /> - </tqmask> - <tqmask name="CP" value="0x2000" > + </mask> + <mask name="CP" value="0x2000" > <value value="0x0000" name="All" cname="_CP_ON" ecnames="_CP_ALL" /> <value value="0x2000" name="Off" cname="_CP_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F72.xml b/src/devices/pic/xml_data/16F72.xml index a8c789d..d49b2cd 100644 --- a/src/devices/pic/xml_data/16F72.xml +++ b/src/devices/pic/xml_data/16F72.xml @@ -34,34 +34,34 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x07FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x000F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x000F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x005F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x005F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" ecnames="_WDTEN_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" ecnames="_WDTEN_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" ecnames="_PWRTEN_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" ecnames="_PWRTEN_OFF" /> - </tqmask> - <tqmask name="CP" value="0x0010" > + </mask> + <mask name="CP" value="0x0010" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x0010" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" ecnames="_BOREN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" ecnames="_BOREN_ON" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F73.xml b/src/devices/pic/xml_data/16F73.xml index 8659896..157cb74 100644 --- a/src/devices/pic/xml_data/16F73.xml +++ b/src/devices/pic/xml_data/16F73.xml @@ -25,34 +25,34 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x0FFF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x000F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x000F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x005F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x005F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" ecnames="_WDTEN_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" ecnames="_WDTEN_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" ecnames="_PWRTEN_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" ecnames="_PWRTEN_OFF" /> - </tqmask> - <tqmask name="CP" value="0x0010" > + </mask> + <mask name="CP" value="0x0010" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x0010" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" ecnames="_BOREN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" ecnames="_BOREN_ON" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F737.xml b/src/devices/pic/xml_data/16F737.xml index c17c0f8..0184aa9 100644 --- a/src/devices/pic/xml_data/16F737.xml +++ b/src/devices/pic/xml_data/16F737.xml @@ -34,22 +34,22 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x0FFF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2008" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1" wtqmask="0x3FFF" bvalue="0x39FF" > - <tqmask name="WDT" value="0x0004" > + <config offset="0x0" name="CONFIG1" wmask="0x3FFF" bvalue="0x39FF" > + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="FOSC" value="0x0013" > + </mask> + <mask name="FOSC" value="0x0013" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -58,48 +58,48 @@ <value value="0x0011" name="INTRC_CLKOUT" cname="_INTRC_CLKOUT" /> <value value="0x0012" name="EXTRC_IO" cname="_EXTRC_IO" /> <value value="0x0013" name="EXTRC_CLKOUT" cname="_EXTRC_CLKOUT" /> - </tqmask> - <tqmask name="MCLRE" value="0x0020" > + </mask> + <mask name="MCLRE" value="0x0020" > <value value="0x0000" name="Internal" cname="_MCLR_OFF" /> <value value="0x0020" name="External" cname="_MCLR_ON" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BOREN_0" /> <value value="0x0040" name="On" cname="_BOREN_1" /> - </tqmask> - <tqmask name="BORV" value="0x0180" > + </mask> + <mask name="BORV" value="0x0180" > <value value="0x0000" name="4.5" cname="_VBOR_4_5" /> <value value="0x0080" name="4.2" cname="_VBOR_4_2" /> <value value="0x0100" name="2.7" cname="_VBOR_2_7" /> <value value="0x0180" name="2.0" cname="_VBOR_2_0" /> - </tqmask> - <tqmask name="DEBUG" value="0x0800" > + </mask> + <mask name="DEBUG" value="0x0800" > <value value="0x0000" name="On" cname="_DEBUG_ON" /> <value value="0x0800" name="Off" cname="_DEBUG_OFF" /> - </tqmask> - <tqmask name="CCP2MX" value="0x1000" > + </mask> + <mask name="CCP2MX" value="0x1000" > <value value="0x0000" name="RB3" cname="_CCP2_RB3" /> <value value="0x1000" name="RC1" cname="_CCP2_RC1" /> - </tqmask> - <tqmask name="CP" value="0x2000" > + </mask> + <mask name="CP" value="0x2000" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x2000" name="Off" cname="_CP_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG2" wtqmask="0x3FFF" bvalue="0x0043" > - <tqmask name="FCMEN" value="0x0001" > + <config offset="0x1" name="CONFIG2" wmask="0x3FFF" bvalue="0x0043" > + <mask name="FCMEN" value="0x0001" > <value value="0x0000" name="Off" cname="_FCMEN_OFF" /> <value value="0x0001" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x0002" > + </mask> + <mask name="IESO" value="0x0002" > <value value="0x0000" name="Off" cname="_IESO_OFF" /> <value value="0x0002" name="On" cname="_IESO_ON" /> - </tqmask> - <tqmask name="BORSEN" value="0x0040" > + </mask> + <mask name="BORSEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BORSEN_0" /> <value value="0x0040" name="On" cname="_BORSEN_1" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F74.xml b/src/devices/pic/xml_data/16F74.xml index 7bfc1b3..fc2b312 100644 --- a/src/devices/pic/xml_data/16F74.xml +++ b/src/devices/pic/xml_data/16F74.xml @@ -25,34 +25,34 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x0FFF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x000F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x000F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x005F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x005F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" ecnames="_WDTEN_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" ecnames="_WDTEN_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" ecnames="_PWRTEN_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" ecnames="_PWRTEN_OFF" /> - </tqmask> - <tqmask name="CP" value="0x0010" > + </mask> + <mask name="CP" value="0x0010" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x0010" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" ecnames="_BOREN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" ecnames="_BOREN_ON" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F747.xml b/src/devices/pic/xml_data/16F747.xml index 1200a6c..ec03640 100644 --- a/src/devices/pic/xml_data/16F747.xml +++ b/src/devices/pic/xml_data/16F747.xml @@ -34,22 +34,22 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x0FFF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2008" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1" wtqmask="0x3FFF" bvalue="0x39FF" > - <tqmask name="WDT" value="0x0004" > + <config offset="0x0" name="CONFIG1" wmask="0x3FFF" bvalue="0x39FF" > + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="FOSC" value="0x0013" > + </mask> + <mask name="FOSC" value="0x0013" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -58,48 +58,48 @@ <value value="0x0011" name="INTRC_CLKOUT" cname="_INTRC_CLKOUT" /> <value value="0x0012" name="EXTRC_IO" cname="_EXTRC_IO" /> <value value="0x0013" name="EXTRC_CLKOUT" cname="_EXTRC_CLKOUT" /> - </tqmask> - <tqmask name="MCLRE" value="0x0020" > + </mask> + <mask name="MCLRE" value="0x0020" > <value value="0x0000" name="Internal" cname="_MCLR_OFF" /> <value value="0x0020" name="External" cname="_MCLR_ON" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BOREN_0" /> <value value="0x0040" name="On" cname="_BOREN_1" /> - </tqmask> - <tqmask name="BORV" value="0x0180" > + </mask> + <mask name="BORV" value="0x0180" > <value value="0x0000" name="4.5" cname="_VBOR_4_5" /> <value value="0x0080" name="4.2" cname="_VBOR_4_2" /> <value value="0x0100" name="2.7" cname="_VBOR_2_7" /> <value value="0x0180" name="2.0" cname="_VBOR_2_0" /> - </tqmask> - <tqmask name="DEBUG" value="0x0800" > + </mask> + <mask name="DEBUG" value="0x0800" > <value value="0x0000" name="On" cname="_DEBUG_ON" /> <value value="0x0800" name="Off" cname="_DEBUG_OFF" /> - </tqmask> - <tqmask name="CCP2MX" value="0x1000" > + </mask> + <mask name="CCP2MX" value="0x1000" > <value value="0x0000" name="RB3" cname="_CCP2_RB3" /> <value value="0x1000" name="RC1" cname="_CCP2_RC1" /> - </tqmask> - <tqmask name="CP" value="0x2000" > + </mask> + <mask name="CP" value="0x2000" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x2000" name="Off" cname="_CP_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG2" wtqmask="0x3FFF" bvalue="0x0043" > - <tqmask name="FCMEN" value="0x0001" > + <config offset="0x1" name="CONFIG2" wmask="0x3FFF" bvalue="0x0043" > + <mask name="FCMEN" value="0x0001" > <value value="0x0000" name="Off" cname="_FCMEN_OFF" /> <value value="0x0001" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x0002" > + </mask> + <mask name="IESO" value="0x0002" > <value value="0x0000" name="Off" cname="_IESO_OFF" /> <value value="0x0002" name="On" cname="_IESO_ON" /> - </tqmask> - <tqmask name="BORSEN" value="0x0040" > + </mask> + <mask name="BORSEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BORSEN_0" /> <value value="0x0040" name="On" cname="_BORSEN_1" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F76.xml b/src/devices/pic/xml_data/16F76.xml index 8fde14a..3b6fcf3 100644 --- a/src/devices/pic/xml_data/16F76.xml +++ b/src/devices/pic/xml_data/16F76.xml @@ -25,34 +25,34 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x1FFF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x000F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x000F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x005F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x005F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" ecnames="_WDTEN_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" ecnames="_WDTEN_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" ecnames="_PWRTEN_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" ecnames="_PWRTEN_OFF" /> - </tqmask> - <tqmask name="CP" value="0x0010" > + </mask> + <mask name="CP" value="0x0010" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x0010" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" ecnames="_BOREN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" ecnames="_BOREN_ON" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F767.xml b/src/devices/pic/xml_data/16F767.xml index 0dc2c9f..77ed134 100644 --- a/src/devices/pic/xml_data/16F767.xml +++ b/src/devices/pic/xml_data/16F767.xml @@ -34,22 +34,22 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x1FFF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2008" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1" wtqmask="0x3FFF" bvalue="0x39FF" > - <tqmask name="WDT" value="0x0004" > + <config offset="0x0" name="CONFIG1" wmask="0x3FFF" bvalue="0x39FF" > + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="FOSC" value="0x0013" > + </mask> + <mask name="FOSC" value="0x0013" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -58,48 +58,48 @@ <value value="0x0011" name="INTRC_CLKOUT" cname="_INTRC_CLKOUT" /> <value value="0x0012" name="EXTRC_IO" cname="_EXTRC_IO" /> <value value="0x0013" name="EXTRC_CLKOUT" cname="_EXTRC_CLKOUT" /> - </tqmask> - <tqmask name="MCLRE" value="0x0020" > + </mask> + <mask name="MCLRE" value="0x0020" > <value value="0x0000" name="Internal" cname="_MCLR_OFF" /> <value value="0x0020" name="External" cname="_MCLR_ON" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BOREN_0" /> <value value="0x0040" name="On" cname="_BOREN_1" /> - </tqmask> - <tqmask name="BORV" value="0x0180" > + </mask> + <mask name="BORV" value="0x0180" > <value value="0x0000" name="4.5" cname="_VBOR_4_5" /> <value value="0x0080" name="4.2" cname="_VBOR_4_2" /> <value value="0x0100" name="2.7" cname="_VBOR_2_7" /> <value value="0x0180" name="2.0" cname="_VBOR_2_0" /> - </tqmask> - <tqmask name="DEBUG" value="0x0800" > + </mask> + <mask name="DEBUG" value="0x0800" > <value value="0x0000" name="On" cname="_DEBUG_ON" /> <value value="0x0800" name="Off" cname="_DEBUG_OFF" /> - </tqmask> - <tqmask name="CCP2MX" value="0x1000" > + </mask> + <mask name="CCP2MX" value="0x1000" > <value value="0x0000" name="RB3" cname="_CCP2_RB3" /> <value value="0x1000" name="RC1" cname="_CCP2_RC1" /> - </tqmask> - <tqmask name="CP" value="0x2000" > + </mask> + <mask name="CP" value="0x2000" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x2000" name="Off" cname="_CP_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG2" wtqmask="0x3FFF" bvalue="0x0043" > - <tqmask name="FCMEN" value="0x0001" > + <config offset="0x1" name="CONFIG2" wmask="0x3FFF" bvalue="0x0043" > + <mask name="FCMEN" value="0x0001" > <value value="0x0000" name="Off" cname="_FCMEN_OFF" /> <value value="0x0001" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x0002" > + </mask> + <mask name="IESO" value="0x0002" > <value value="0x0000" name="Off" cname="_IESO_OFF" /> <value value="0x0002" name="On" cname="_IESO_ON" /> - </tqmask> - <tqmask name="BORSEN" value="0x0040" > + </mask> + <mask name="BORSEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BORSEN_0" /> <value value="0x0040" name="On" cname="_BORSEN_1" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F77.xml b/src/devices/pic/xml_data/16F77.xml index b17a20a..e02e2cb 100644 --- a/src/devices/pic/xml_data/16F77.xml +++ b/src/devices/pic/xml_data/16F77.xml @@ -25,34 +25,34 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x1FFF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x000F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x000F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x005F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x005F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" ecnames="_WDTEN_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" ecnames="_WDTEN_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" ecnames="_PWRTEN_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" ecnames="_PWRTEN_OFF" /> - </tqmask> - <tqmask name="CP" value="0x0010" > + </mask> + <mask name="CP" value="0x0010" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x0010" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" ecnames="_BOREN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" ecnames="_BOREN_ON" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F777.xml b/src/devices/pic/xml_data/16F777.xml index 54f6eb3..71899b2 100644 --- a/src/devices/pic/xml_data/16F777.xml +++ b/src/devices/pic/xml_data/16F777.xml @@ -34,22 +34,22 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x1FFF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2008" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1" wtqmask="0x3FFF" bvalue="0x39FF" > - <tqmask name="WDT" value="0x0004" > + <config offset="0x0" name="CONFIG1" wmask="0x3FFF" bvalue="0x39FF" > + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="FOSC" value="0x0013" > + </mask> + <mask name="FOSC" value="0x0013" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -58,48 +58,48 @@ <value value="0x0011" name="INTRC_CLKOUT" cname="_INTRC_CLKOUT" /> <value value="0x0012" name="EXTRC_IO" cname="_EXTRC_IO" /> <value value="0x0013" name="EXTRC_CLKOUT" cname="_EXTRC_CLKOUT" /> - </tqmask> - <tqmask name="MCLRE" value="0x0020" > + </mask> + <mask name="MCLRE" value="0x0020" > <value value="0x0000" name="Internal" cname="_MCLR_OFF" /> <value value="0x0020" name="External" cname="_MCLR_ON" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BOREN_0" /> <value value="0x0040" name="On" cname="_BOREN_1" /> - </tqmask> - <tqmask name="BORV" value="0x0180" > + </mask> + <mask name="BORV" value="0x0180" > <value value="0x0000" name="4.5" cname="_VBOR_4_5" /> <value value="0x0080" name="4.2" cname="_VBOR_4_2" /> <value value="0x0100" name="2.7" cname="_VBOR_2_7" /> <value value="0x0180" name="2.0" cname="_VBOR_2_0" /> - </tqmask> - <tqmask name="DEBUG" value="0x0800" > + </mask> + <mask name="DEBUG" value="0x0800" > <value value="0x0000" name="On" cname="_DEBUG_ON" /> <value value="0x0800" name="Off" cname="_DEBUG_OFF" /> - </tqmask> - <tqmask name="CCP2MX" value="0x1000" > + </mask> + <mask name="CCP2MX" value="0x1000" > <value value="0x0000" name="RB3" cname="_CCP2_RB3" /> <value value="0x1000" name="RC1" cname="_CCP2_RC1" /> - </tqmask> - <tqmask name="CP" value="0x2000" > + </mask> + <mask name="CP" value="0x2000" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x2000" name="Off" cname="_CP_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG2" wtqmask="0x3FFF" bvalue="0x0043" > - <tqmask name="FCMEN" value="0x0001" > + <config offset="0x1" name="CONFIG2" wmask="0x3FFF" bvalue="0x0043" > + <mask name="FCMEN" value="0x0001" > <value value="0x0000" name="Off" cname="_FCMEN_OFF" /> <value value="0x0001" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x0002" > + </mask> + <mask name="IESO" value="0x0002" > <value value="0x0000" name="Off" cname="_IESO_OFF" /> <value value="0x0002" name="On" cname="_IESO_ON" /> - </tqmask> - <tqmask name="BORSEN" value="0x0040" > + </mask> + <mask name="BORSEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BORSEN_0" /> <value value="0x0040" name="On" cname="_BORSEN_1" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F785.xml b/src/devices/pic/xml_data/16F785.xml index 29fd083..80c9091 100644 --- a/src/devices/pic/xml_data/16F785.xml +++ b/src/devices/pic/xml_data/16F785.xml @@ -38,16 +38,16 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x07FF" /> - <memory name="calibration" start="0x2008" end="0x2009" cal_optqmask="0x0000" cal_opcode="0x0000" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="calibration" start="0x2008" end="0x2009" cal_opmask="0x0000" cal_opcode="0x0000" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x0FFF" > - <tqmask name="FOSC" value="0x0007" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x0FFF" > + <mask name="FOSC" value="0x0007" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -56,41 +56,41 @@ <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" /> <value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" /> <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" /> - </tqmask> - <tqmask name="WDT" value="0x0008" > + </mask> + <mask name="WDT" value="0x0008" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0008" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0010" > + </mask> + <mask name="PWRTE" value="0x0010" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0010" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x0020" > + </mask> + <mask name="MCLRE" value="0x0020" > <value value="0x0000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x0020" name="External" cname="_MCLRE_ON" /> - </tqmask> - <tqmask name="CP" value="0x0040" > + </mask> + <mask name="CP" value="0x0040" > <value value="0x0000" name="All" cname="_CP_ON" /> <value value="0x0040" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x0080" > + </mask> + <mask name="CPD" value="0x0080" > <value value="0x0000" name="All" cname="_CPD_ON" /> <value value="0x0080" name="Off" cname="_CPD_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0300" > + </mask> + <mask name="BODEN" value="0x0300" > <value value="0x0000" name="Off" cname="_BOR_OFF" ecnames="_BOD_OFF" /> <value value="0x0100" name="Software" cname="_BOR_SBOREN" ecnames="_BOD_SBODEN" /> <value value="0x0200" name="On_run" cname="_BOR_NSLEEP" ecnames="_BOD_NSLEEP" /> <value value="0x0300" name="On" cname="_BOR_ON" ecnames="_BOD_ON" /> - </tqmask> - <tqmask name="IESO" value="0x0400" > + </mask> + <mask name="IESO" value="0x0400" > <value value="0x0000" name="Off" cname="_IESO_OFF" /> <value value="0x0400" name="On" cname="_IESO_ON" /> - </tqmask> - <tqmask name="FCMEN" value="0x0800" > + </mask> + <mask name="FCMEN" value="0x0800" > <value value="0x0000" name="Off" cname="_FCMEN_OFF" /> <value value="0x0800" name="On" cname="_FCMEN_ON" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F818.xml b/src/devices/pic/xml_data/16F818.xml index 86d9f5b..0ff73b5 100644 --- a/src/devices/pic/xml_data/16F818.xml +++ b/src/devices/pic/xml_data/16F818.xml @@ -35,23 +35,23 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x03FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="eeprom" start="0x0000" end="0x007F" hexfile_offset="0x2100" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" > - <tqmask name="WDT" value="0x0004" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" > + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="FOSC" value="0x0013" > + </mask> + <mask name="FOSC" value="0x0013" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -60,41 +60,41 @@ <value value="0x0011" name="INTRC_CLKOUT" cname="_INTRC_CLKOUT" /> <value value="0x0012" name="EXTRC_IO" cname="_EXTRC_IO" /> <value value="0x0013" name="EXTRC_CLKOUT" cname="_EXTRC_CLKOUT" /> - </tqmask> - <tqmask name="MCLRE" value="0x0020" > + </mask> + <mask name="MCLRE" value="0x0020" > <value value="0x0000" name="Internal" cname="_MCLR_OFF" /> <value value="0x0020" name="External" cname="_MCLR_ON" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x0080" > + </mask> + <mask name="LVP" value="0x0080" > <value value="0x0000" name="Off" cname="_LVP_OFF" /> <value value="0x0080" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="CPD" value="0x0100" > + </mask> + <mask name="CPD" value="0x0100" > <value value="0x0000" name="All" cname="_CPD_ON" /> <value value="0x0100" name="Off" cname="_CPD_OFF" /> - </tqmask> - <tqmask name="WRT" value="0x0600" > + </mask> + <mask name="WRT" value="0x0600" > <value value="0x0000" name="invalid" /> <value value="0x0200" name="000:3FF" cname="_WRT_ENABLE_1024" /> <value value="0x0400" name="000:1FF" cname="_WRT_ENABLE_512" /> <value value="0x0600" name="Off" cname="_WRT_ENABLE_OFF" /> - </tqmask> - <tqmask name="DEBUG" value="0x0800" > + </mask> + <mask name="DEBUG" value="0x0800" > <value value="0x0000" name="On" cname="_DEBUG_ON" /> <value value="0x0800" name="Off" cname="_DEBUG_OFF" /> - </tqmask> - <tqmask name="CCP1MX" value="0x1000" > + </mask> + <mask name="CCP1MX" value="0x1000" > <value value="0x0000" name="RB3" cname="_CCP1_RB3" /> <value value="0x1000" name="RB2" cname="_CCP1_RB2" /> - </tqmask> - <tqmask name="CP" value="0x2000" > + </mask> + <mask name="CP" value="0x2000" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x2000" name="Off" cname="_CP_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F819.xml b/src/devices/pic/xml_data/16F819.xml index 76d1de1..e7ee0a6 100644 --- a/src/devices/pic/xml_data/16F819.xml +++ b/src/devices/pic/xml_data/16F819.xml @@ -35,23 +35,23 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x07FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" > - <tqmask name="WDT" value="0x0004" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" > + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="FOSC" value="0x0013" > + </mask> + <mask name="FOSC" value="0x0013" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -60,41 +60,41 @@ <value value="0x0011" name="INTRC_CLKOUT" cname="_INTRC_CLKOUT" /> <value value="0x0012" name="EXTRC_IO" cname="_EXTRC_IO" /> <value value="0x0013" name="EXTRC_CLKOUT" cname="_EXTRC_CLKOUT" /> - </tqmask> - <tqmask name="MCLRE" value="0x0020" > + </mask> + <mask name="MCLRE" value="0x0020" > <value value="0x0000" name="Internal" cname="_MCLR_OFF" /> <value value="0x0020" name="External" cname="_MCLR_ON" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x0080" > + </mask> + <mask name="LVP" value="0x0080" > <value value="0x0000" name="Off" cname="_LVP_OFF" /> <value value="0x0080" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="CPD" value="0x0100" > + </mask> + <mask name="CPD" value="0x0100" > <value value="0x0000" name="All" cname="_CPD_ON" /> <value value="0x0100" name="Off" cname="_CPD_OFF" /> - </tqmask> - <tqmask name="WRT" value="0x0600" > + </mask> + <mask name="WRT" value="0x0600" > <value value="0x0000" name="000:5FF" cname="_WRT_ENABLE_1536" /> <value value="0x0200" name="000:3FF" cname="_WRT_ENABLE_1024" /> <value value="0x0400" name="000:1FF" cname="_WRT_ENABLE_512" /> <value value="0x0600" name="Off" cname="_WRT_ENABLE_OFF" /> - </tqmask> - <tqmask name="DEBUG" value="0x0800" > + </mask> + <mask name="DEBUG" value="0x0800" > <value value="0x0000" name="On" cname="_DEBUG_ON" /> <value value="0x0800" name="Off" cname="_DEBUG_OFF" /> - </tqmask> - <tqmask name="CCP1MX" value="0x1000" > + </mask> + <mask name="CCP1MX" value="0x1000" > <value value="0x0000" name="RB3" cname="_CCP1_RB3" /> <value value="0x1000" name="RB2" cname="_CCP1_RB2" /> - </tqmask> - <tqmask name="CP" value="0x2000" > + </mask> + <mask name="CP" value="0x2000" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x2000" name="Off" cname="_CP_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F83.xml b/src/devices/pic/xml_data/16F83.xml index ff9af73..25b80a3 100644 --- a/src/devices/pic/xml_data/16F83.xml +++ b/src/devices/pic/xml_data/16F83.xml @@ -31,31 +31,31 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x01FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="eeprom" start="0x0000" end="0x003F" hexfile_offset="0x2100" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="CP" value="0x3FF0" > + </mask> + <mask name="CP" value="0x3FF0" > <value value="0x0000" name="All" cname="_CP_ON" /> <value value="0x3FF0" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F84.xml b/src/devices/pic/xml_data/16F84.xml index 88cd1ae..62c1f8d 100644 --- a/src/devices/pic/xml_data/16F84.xml +++ b/src/devices/pic/xml_data/16F84.xml @@ -31,31 +31,31 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x03FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="eeprom" start="0x0000" end="0x003F" hexfile_offset="0x2100" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="CP" value="0x3FF0" > + </mask> + <mask name="CP" value="0x3FF0" > <value value="0x0000" name="All" cname="_CP_ON" /> <value value="0x3FF0" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F84A.xml b/src/devices/pic/xml_data/16F84A.xml index a179de1..ffffba1 100644 --- a/src/devices/pic/xml_data/16F84A.xml +++ b/src/devices/pic/xml_data/16F84A.xml @@ -32,32 +32,32 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x03FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="eeprom" start="0x0000" end="0x003F" hexfile_offset="0x2100" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="CP" value="0x3FF0" > + </mask> + <mask name="CP" value="0x3FF0" > <value value="0x0000" name="All" cname="_CP_ON" /> <value value="0x3FF0" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F87.xml b/src/devices/pic/xml_data/16F87.xml index 987ef0c..835b481 100644 --- a/src/devices/pic/xml_data/16F87.xml +++ b/src/devices/pic/xml_data/16F87.xml @@ -34,23 +34,23 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x0FFF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2008" /> <memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1" wtqmask="0x3FFF" bvalue="0x3FFF" > - <tqmask name="WDT" value="0x0004" > + <config offset="0x0" name="CONFIG1" wmask="0x3FFF" bvalue="0x3FFF" > + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="FOSC" value="0x0013" > + </mask> + <mask name="FOSC" value="0x0013" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -59,52 +59,52 @@ <value value="0x0011" name="INTRC_CLKOUT" cname="_INTRC_CLKOUT" /> <value value="0x0012" name="EXTRC_IO" cname="_EXTRC_IO" /> <value value="0x0013" name="EXTRC_CLKOUT" cname="_EXTRC_CLKOUT" /> - </tqmask> - <tqmask name="MCLRE" value="0x0020" > + </mask> + <mask name="MCLRE" value="0x0020" > <value value="0x0000" name="Internal" cname="_MCLR_OFF" /> <value value="0x0020" name="External" cname="_MCLR_ON" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x0080" > + </mask> + <mask name="LVP" value="0x0080" > <value value="0x0000" name="Off" cname="_LVP_OFF" /> <value value="0x0080" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="CPD" value="0x0100" > + </mask> + <mask name="CPD" value="0x0100" > <value value="0x0000" name="All" cname="_CPD_ON" /> <value value="0x0100" name="Off" cname="_CPD_OFF" /> - </tqmask> - <tqmask name="WRT" value="0x0600" > + </mask> + <mask name="WRT" value="0x0600" > <value value="0x0000" name="All" cname="_WRT_PROTECT_ALL" /> <value value="0x0200" name="000:7FF" cname="_WRT_PROTECT_2048" /> <value value="0x0400" name="000:0FF" cname="_WRT_PROTECT_256" /> <value value="0x0600" name="Off" cname="_WRT_PROTECT_OFF" /> - </tqmask> - <tqmask name="DEBUG" value="0x0800" > + </mask> + <mask name="DEBUG" value="0x0800" > <value value="0x0000" name="On" cname="_DEBUG_ON" /> <value value="0x0800" name="Off" cname="_DEBUG_OFF" /> - </tqmask> - <tqmask name="CCP1MX" value="0x1000" > + </mask> + <mask name="CCP1MX" value="0x1000" > <value value="0x0000" name="RB3" cname="_CCP1_RB3" /> <value value="0x1000" name="RB0" cname="_CCP1_RB0" /> - </tqmask> - <tqmask name="CP" value="0x2000" > + </mask> + <mask name="CP" value="0x2000" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x2000" name="Off" cname="_CP_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG2" wtqmask="0x3FFF" bvalue="0x0003" > - <tqmask name="FCMEN" value="0x0001" > + <config offset="0x1" name="CONFIG2" wmask="0x3FFF" bvalue="0x0003" > + <mask name="FCMEN" value="0x0001" > <value value="0x0000" name="Off" cname="_FCMEN_OFF" /> <value value="0x0001" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x0002" > + </mask> + <mask name="IESO" value="0x0002" > <value value="0x0000" name="Off" cname="_IESO_OFF" /> <value value="0x0002" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F870.xml b/src/devices/pic/xml_data/16F870.xml index 005a948..ec66b54 100644 --- a/src/devices/pic/xml_data/16F870.xml +++ b/src/devices/pic/xml_data/16F870.xml @@ -36,53 +36,53 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x07FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="eeprom" start="0x0000" end="0x003F" hexfile_offset="0x2100" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3BFF" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3BFF" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x0080" > + </mask> + <mask name="LVP" value="0x0080" > <value value="0x0000" name="Off" cname="_LVP_OFF" /> <value value="0x0080" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="CPD" value="0x0100" > + </mask> + <mask name="CPD" value="0x0100" > <value value="0x0000" name="All" cname="_CPD_ON" /> <value value="0x0100" name="Off" cname="_CPD_OFF" /> - </tqmask> - <tqmask name="WRT" value="0x0200" > + </mask> + <mask name="WRT" value="0x0200" > <value value="0x0000" name="Off" cname="_WRT_ENABLE_OFF" /> <value value="0x0200" name="All" cname="_WRT_ENABLE_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x0800" > + </mask> + <mask name="DEBUG" value="0x0800" > <value value="0x0000" name="On" cname="_DEBUG_ON" /> <value value="0x0800" name="Off" cname="_DEBUG_OFF" /> - </tqmask> - <tqmask name="CP" value="0x3030" > + </mask> + <mask name="CP" value="0x3030" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x3030" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F871.xml b/src/devices/pic/xml_data/16F871.xml index ddfd932..8b918ca 100644 --- a/src/devices/pic/xml_data/16F871.xml +++ b/src/devices/pic/xml_data/16F871.xml @@ -36,53 +36,53 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x07FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="eeprom" start="0x0000" end="0x003F" hexfile_offset="0x2100" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3BFF" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3BFF" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x0080" > + </mask> + <mask name="LVP" value="0x0080" > <value value="0x0000" name="Off" cname="_LVP_OFF" /> <value value="0x0080" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="CPD" value="0x0100" > + </mask> + <mask name="CPD" value="0x0100" > <value value="0x0000" name="All" cname="_CPD_ON" /> <value value="0x0100" name="Off" cname="_CPD_OFF" /> - </tqmask> - <tqmask name="WRT" value="0x0200" > + </mask> + <mask name="WRT" value="0x0200" > <value value="0x0000" name="Off" cname="_WRT_ENABLE_OFF" /> <value value="0x0200" name="All" cname="_WRT_ENABLE_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x0800" > + </mask> + <mask name="DEBUG" value="0x0800" > <value value="0x0000" name="On" cname="_DEBUG_ON" /> <value value="0x0800" name="Off" cname="_DEBUG_OFF" /> - </tqmask> - <tqmask name="CP" value="0x3030" > + </mask> + <mask name="CP" value="0x3030" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x3030" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F872.xml b/src/devices/pic/xml_data/16F872.xml index da5fe20..7702922 100644 --- a/src/devices/pic/xml_data/16F872.xml +++ b/src/devices/pic/xml_data/16F872.xml @@ -36,53 +36,53 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x07FF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="eeprom" start="0x0000" end="0x003F" hexfile_offset="0x2100" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3BFF" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3BFF" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x0080" > + </mask> + <mask name="LVP" value="0x0080" > <value value="0x0000" name="Off" cname="_LVP_OFF" /> <value value="0x0080" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="CPD" value="0x0100" > + </mask> + <mask name="CPD" value="0x0100" > <value value="0x0000" name="All" cname="_CPD_ON" /> <value value="0x0100" name="Off" cname="_CPD_OFF" /> - </tqmask> - <tqmask name="WRT" value="0x0200" > + </mask> + <mask name="WRT" value="0x0200" > <value value="0x0000" name="Off" cname="_WRT_ENABLE_OFF" /> <value value="0x0200" name="All" cname="_WRT_ENABLE_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x0800" > + </mask> + <mask name="DEBUG" value="0x0800" > <value value="0x0000" name="On" cname="_DEBUG_ON" /> <value value="0x0800" name="Off" cname="_DEBUG_OFF" /> - </tqmask> - <tqmask name="CP" value="0x3030" > + </mask> + <mask name="CP" value="0x3030" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x3030" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F873.xml b/src/devices/pic/xml_data/16F873.xml index b010152..4bbb1cb 100644 --- a/src/devices/pic/xml_data/16F873.xml +++ b/src/devices/pic/xml_data/16F873.xml @@ -41,55 +41,55 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x0FFF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="eeprom" start="0x0000" end="0x007F" hexfile_offset="0x2100" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3BFF" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3BFF" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x0080" > + </mask> + <mask name="LVP" value="0x0080" > <value value="0x0000" name="Off" cname="_LVP_OFF" /> <value value="0x0080" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="CPD" value="0x0100" > + </mask> + <mask name="CPD" value="0x0100" > <value value="0x0000" name="All" cname="_CPD_ON" /> <value value="0x0100" name="Off" cname="_CPD_OFF" /> - </tqmask> - <tqmask name="WRT" value="0x0200" > + </mask> + <mask name="WRT" value="0x0200" > <value value="0x0000" name="Off" cname="_WRT_ENABLE_OFF" /> <value value="0x0200" name="All" cname="_WRT_ENABLE_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x0800" > + </mask> + <mask name="DEBUG" value="0x0800" > <value value="0x0000" name="On" cname="_DEBUG_ON" /> <value value="0x0800" name="Off" cname="_DEBUG_OFF" /> - </tqmask> - <tqmask name="CP" value="0x3030" > + </mask> + <mask name="CP" value="0x3030" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1010" name="0800:0FFF" cname="_CP_HALF" /> <value value="0x2020" name="0F00:0FFF" cname="_CP_UPPER_256" /> <value value="0x3030" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F873A.xml b/src/devices/pic/xml_data/16F873A.xml index e9dd61a..ee26828 100644 --- a/src/devices/pic/xml_data/16F873A.xml +++ b/src/devices/pic/xml_data/16F873A.xml @@ -35,54 +35,54 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x0FFF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="eeprom" start="0x0000" end="0x007F" hexfile_offset="0x2100" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x2FCF" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x2FCF" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x0080" > + </mask> + <mask name="LVP" value="0x0080" > <value value="0x0000" name="Off" cname="_LVP_OFF" /> <value value="0x0080" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="CPD" value="0x0100" > + </mask> + <mask name="CPD" value="0x0100" > <value value="0x0000" name="All" cname="_CPD_ON" /> <value value="0x0100" name="Off" cname="_CPD_OFF" /> - </tqmask> - <tqmask name="WRT" value="0x0600" > + </mask> + <mask name="WRT" value="0x0600" > <value value="0x0000" name="0000:07FF" cname="_WRT_HALF" /> <value value="0x0200" name="0000:03FF" cname="_WRT_1FOURTH" /> <value value="0x0400" name="0000:00FF" cname="_WRT_256" /> <value value="0x0600" name="Off" cname="_WRT_OFF" /> - </tqmask> - <tqmask name="DEBUG" value="0x0800" > + </mask> + <mask name="DEBUG" value="0x0800" > <value value="0x0000" name="On" cname="_DEBUG_ON" /> <value value="0x0800" name="Off" cname="_DEBUG_OFF" /> - </tqmask> - <tqmask name="CP" value="0x2000" > + </mask> + <mask name="CP" value="0x2000" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x2000" name="Off" cname="_CP_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F874.xml b/src/devices/pic/xml_data/16F874.xml index 7135150..fe20128 100644 --- a/src/devices/pic/xml_data/16F874.xml +++ b/src/devices/pic/xml_data/16F874.xml @@ -41,55 +41,55 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x0FFF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="eeprom" start="0x0000" end="0x007F" hexfile_offset="0x2100" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3BFF" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3BFF" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x0080" > + </mask> + <mask name="LVP" value="0x0080" > <value value="0x0000" name="Off" cname="_LVP_OFF" /> <value value="0x0080" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="CPD" value="0x0100" > + </mask> + <mask name="CPD" value="0x0100" > <value value="0x0000" name="All" cname="_CPD_ON" /> <value value="0x0100" name="Off" cname="_CPD_OFF" /> - </tqmask> - <tqmask name="WRT" value="0x0200" > + </mask> + <mask name="WRT" value="0x0200" > <value value="0x0000" name="Off" cname="_WRT_ENABLE_OFF" /> <value value="0x0200" name="All" cname="_WRT_ENABLE_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x0800" > + </mask> + <mask name="DEBUG" value="0x0800" > <value value="0x0000" name="On" cname="_DEBUG_ON" /> <value value="0x0800" name="Off" cname="_DEBUG_OFF" /> - </tqmask> - <tqmask name="CP" value="0x3030" > + </mask> + <mask name="CP" value="0x3030" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1010" name="0800:0FFF" cname="_CP_HALF" /> <value value="0x2020" name="0F00:0FFF" cname="_CP_UPPER_256" /> <value value="0x3030" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F874A.xml b/src/devices/pic/xml_data/16F874A.xml index c827c6e..c89b407 100644 --- a/src/devices/pic/xml_data/16F874A.xml +++ b/src/devices/pic/xml_data/16F874A.xml @@ -35,54 +35,54 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x0FFF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="eeprom" start="0x0000" end="0x007F" hexfile_offset="0x2100" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x2FCF" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x2FCF" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x0080" > + </mask> + <mask name="LVP" value="0x0080" > <value value="0x0000" name="Off" cname="_LVP_OFF" /> <value value="0x0080" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="CPD" value="0x0100" > + </mask> + <mask name="CPD" value="0x0100" > <value value="0x0000" name="All" cname="_CPD_ON" /> <value value="0x0100" name="Off" cname="_CPD_OFF" /> - </tqmask> - <tqmask name="WRT" value="0x0600" > + </mask> + <mask name="WRT" value="0x0600" > <value value="0x0000" name="0000:07FF" cname="_WRT_HALF" /> <value value="0x0200" name="0000:03FF" cname="_WRT_1FOURTH" /> <value value="0x0400" name="0000:00FF" cname="_WRT_256" /> <value value="0x0600" name="Off" cname="_WRT_OFF" /> - </tqmask> - <tqmask name="DEBUG" value="0x0800" > + </mask> + <mask name="DEBUG" value="0x0800" > <value value="0x0000" name="On" cname="_DEBUG_ON" /> <value value="0x0800" name="Off" cname="_DEBUG_OFF" /> - </tqmask> - <tqmask name="CP" value="0x2000" > + </mask> + <mask name="CP" value="0x2000" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x2000" name="Off" cname="_CP_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F876.xml b/src/devices/pic/xml_data/16F876.xml index cf59664..19264e8 100644 --- a/src/devices/pic/xml_data/16F876.xml +++ b/src/devices/pic/xml_data/16F876.xml @@ -41,55 +41,55 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x1FFF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3BFF" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3BFF" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x0080" > + </mask> + <mask name="LVP" value="0x0080" > <value value="0x0000" name="Off" cname="_LVP_OFF" /> <value value="0x0080" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="CPD" value="0x0100" > + </mask> + <mask name="CPD" value="0x0100" > <value value="0x0000" name="All" cname="_CPD_ON" /> <value value="0x0100" name="Off" cname="_CPD_OFF" /> - </tqmask> - <tqmask name="WRT" value="0x0200" > + </mask> + <mask name="WRT" value="0x0200" > <value value="0x0000" name="Off" cname="_WRT_ENABLE_OFF" /> <value value="0x0200" name="All" cname="_WRT_ENABLE_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x0800" > + </mask> + <mask name="DEBUG" value="0x0800" > <value value="0x0000" name="On" cname="_DEBUG_ON" /> <value value="0x0800" name="Off" cname="_DEBUG_OFF" /> - </tqmask> - <tqmask name="CP" value="0x3030" > + </mask> + <mask name="CP" value="0x3030" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1010" name="1000:1FFF" cname="_CP_HALF" /> <value value="0x2020" name="1F00:1FFF" cname="_CP_UPPER_256" /> <value value="0x3030" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F876A.xml b/src/devices/pic/xml_data/16F876A.xml index 11b3214..f1c23ce 100644 --- a/src/devices/pic/xml_data/16F876A.xml +++ b/src/devices/pic/xml_data/16F876A.xml @@ -35,54 +35,54 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x1FFF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x2FCF"> - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x2FCF"> + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x0080" > + </mask> + <mask name="LVP" value="0x0080" > <value value="0x0000" name="Off" cname="_LVP_OFF" /> <value value="0x0080" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="CPD" value="0x0100" > + </mask> + <mask name="CPD" value="0x0100" > <value value="0x0000" name="All" cname="_CPD_ON" /> <value value="0x0100" name="Off" cname="_CPD_OFF" /> - </tqmask> - <tqmask name="WRT" value="0x0600" > + </mask> + <mask name="WRT" value="0x0600" > <value value="0x0000" name="0000:0FFF" cname="_WRT_HALF" /> <value value="0x0200" name="0000:07FF" cname="_WRT_1FOURTH" /> <value value="0x0400" name="0000:00FF" cname="_WRT_256" /> <value value="0x0600" name="Off" cname="_WRT_OFF" /> - </tqmask> - <tqmask name="DEBUG" value="0x0800" > + </mask> + <mask name="DEBUG" value="0x0800" > <value value="0x0000" name="On" cname="_DEBUG_ON" /> <value value="0x0800" name="Off" cname="_DEBUG_OFF" /> - </tqmask> - <tqmask name="CP" value="0x2000" > + </mask> + <mask name="CP" value="0x2000" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x2000" name="Off" cname="_CP_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F877.xml b/src/devices/pic/xml_data/16F877.xml index d9e65fc..f83da05 100644 --- a/src/devices/pic/xml_data/16F877.xml +++ b/src/devices/pic/xml_data/16F877.xml @@ -41,55 +41,55 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x1FFF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3BFF" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3BFF" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x0080" > + </mask> + <mask name="LVP" value="0x0080" > <value value="0x0000" name="Off" cname="_LVP_OFF" /> <value value="0x0080" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="CPD" value="0x0100" > + </mask> + <mask name="CPD" value="0x0100" > <value value="0x0000" name="All" cname="_CPD_ON" /> <value value="0x0100" name="Off" cname="_CPD_OFF" /> - </tqmask> - <tqmask name="WRT" value="0x0200" > + </mask> + <mask name="WRT" value="0x0200" > <value value="0x0000" name="Off" cname="_WRT_ENABLE_OFF" /> <value value="0x0200" name="All" cname="_WRT_ENABLE_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x0800" > + </mask> + <mask name="DEBUG" value="0x0800" > <value value="0x0000" name="On" cname="_DEBUG_ON" /> <value value="0x0800" name="Off" cname="_DEBUG_OFF" /> - </tqmask> - <tqmask name="CP" value="0x3030" > + </mask> + <mask name="CP" value="0x3030" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x1010" name="1000:1FFF" cname="_CP_HALF" /> <value value="0x2020" name="1F00:1FFF" cname="_CP_UPPER_256" /> <value value="0x3030" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F877A.xml b/src/devices/pic/xml_data/16F877A.xml index b47b113..3a16d77 100644 --- a/src/devices/pic/xml_data/16F877A.xml +++ b/src/devices/pic/xml_data/16F877A.xml @@ -35,54 +35,54 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x1FFF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x2FCF" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x2FCF" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> <value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x0004" > + </mask> + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x0080" > + </mask> + <mask name="LVP" value="0x0080" > <value value="0x0000" name="Off" cname="_LVP_OFF" /> <value value="0x0080" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="CPD" value="0x0100" > + </mask> + <mask name="CPD" value="0x0100" > <value value="0x0000" name="All" cname="_CPD_ON" /> <value value="0x0100" name="Off" cname="_CPD_OFF" /> - </tqmask> - <tqmask name="WRT" value="0x0600" > + </mask> + <mask name="WRT" value="0x0600" > <value value="0x0000" name="0000:0FFF" cname="_WRT_HALF" /> <value value="0x0200" name="0000:07FF" cname="_WRT_1FOURTH" /> <value value="0x0400" name="0000:00FF" cname="_WRT_256" /> <value value="0x0600" name="Off" cname="_WRT_OFF" /> - </tqmask> - <tqmask name="DEBUG" value="0x0800" > + </mask> + <mask name="DEBUG" value="0x0800" > <value value="0x0000" name="On" cname="_DEBUG_ON" /> <value value="0x0800" name="Off" cname="_DEBUG_OFF" /> - </tqmask> - <tqmask name="CP" value="0x2000" > + </mask> + <mask name="CP" value="0x2000" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x2000" name="Off" cname="_CP_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F88.xml b/src/devices/pic/xml_data/16F88.xml index 09fd755..b2325c3 100644 --- a/src/devices/pic/xml_data/16F88.xml +++ b/src/devices/pic/xml_data/16F88.xml @@ -32,23 +32,23 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x0FFF" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2008" /> <memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1" wtqmask="0x3FFF" bvalue="0x3FFF" > - <tqmask name="WDT" value="0x0004" > + <config offset="0x0" name="CONFIG1" wmask="0x3FFF" bvalue="0x3FFF" > + <mask name="WDT" value="0x0004" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0008" > + </mask> + <mask name="PWRTE" value="0x0008" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0008" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="FOSC" value="0x0013" > + </mask> + <mask name="FOSC" value="0x0013" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -57,52 +57,52 @@ <value value="0x0011" name="INTRC_CLKOUT" cname="_INTRC_CLKOUT" /> <value value="0x0012" name="EXTRC_IO" cname="_EXTRC_IO" /> <value value="0x0013" name="EXTRC_CLKOUT" cname="_EXTRC_CLKOUT" /> - </tqmask> - <tqmask name="MCLRE" value="0x0020" > + </mask> + <mask name="MCLRE" value="0x0020" > <value value="0x0000" name="Internal" cname="_MCLR_OFF" /> <value value="0x0020" name="External" cname="_MCLR_ON" /> - </tqmask> - <tqmask name="BODEN" value="0x0040" > + </mask> + <mask name="BODEN" value="0x0040" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x0040" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x0080" > + </mask> + <mask name="LVP" value="0x0080" > <value value="0x0000" name="Off" cname="_LVP_OFF" /> <value value="0x0080" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="CPD" value="0x0100" > + </mask> + <mask name="CPD" value="0x0100" > <value value="0x0000" name="All" cname="_CPD_ON" /> <value value="0x0100" name="Off" cname="_CPD_OFF" /> - </tqmask> - <tqmask name="WRT" value="0x0600" > + </mask> + <mask name="WRT" value="0x0600" > <value value="0x0000" name="All" cname="_WRT_PROTECT_ALL" /> <value value="0x0200" name="000:7FF" cname="_WRT_PROTECT_2048" /> <value value="0x0400" name="000:0FF" cname="_WRT_PROTECT_256" /> <value value="0x0600" name="Off" cname="_WRT_PROTECT_OFF" /> - </tqmask> - <tqmask name="DEBUG" value="0x0800" > + </mask> + <mask name="DEBUG" value="0x0800" > <value value="0x0000" name="On" cname="_DEBUG_ON" /> <value value="0x0800" name="Off" cname="_DEBUG_OFF" /> - </tqmask> - <tqmask name="CCP1MX" value="0x1000" > + </mask> + <mask name="CCP1MX" value="0x1000" > <value value="0x0000" name="RB3" cname="_CCP1_RB3" /> <value value="0x1000" name="RB0" cname="_CCP1_RB0" /> - </tqmask> - <tqmask name="CP" value="0x2000" > + </mask> + <mask name="CP" value="0x2000" > <value value="0x0000" name="All" cname="_CP_ALL" /> <value value="0x2000" name="Off" cname="_CP_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG2" wtqmask="0x3FFF" bvalue="0x0003" > - <tqmask name="FCMEN" value="0x0001" > + <config offset="0x1" name="CONFIG2" wmask="0x3FFF" bvalue="0x0003" > + <mask name="FCMEN" value="0x0001" > <value value="0x0000" name="Off" cname="_FCMEN_OFF" /> <value value="0x0001" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x0002" > + </mask> + <mask name="IESO" value="0x0002" > <value value="0x0000" name="Off" cname="_IESO_OFF" /> <value value="0x0002" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F882.xml b/src/devices/pic/xml_data/16F882.xml index 79cec09..db2c723 100644 --- a/src/devices/pic/xml_data/16F882.xml +++ b/src/devices/pic/xml_data/16F882.xml @@ -33,16 +33,16 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x07FF" /> - <memory name="calibration" start="0x2009" end="0x2009" cal_optqmask="0x0000" cal_opcode="0x0000" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="calibration" start="0x2009" end="0x2009" cal_opmask="0x0000" cal_opcode="0x0000" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2008" /> <memory name="eeprom" start="0x0000" end="0x007F" hexfile_offset="0x2100" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1" wtqmask="0x3FFF" bvalue="0x3FFF" > - <tqmask name="FOSC" value="0x0007" > + <config offset="0x0" name="CONFIG1" wmask="0x3FFF" bvalue="0x3FFF" > + <mask name="FOSC" value="0x0007" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -51,62 +51,62 @@ <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" /> <value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" /> <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" /> - </tqmask> - <tqmask name="WDT" value="0x0008" > + </mask> + <mask name="WDT" value="0x0008" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0008" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0010" > + </mask> + <mask name="PWRTE" value="0x0010" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0010" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x0020" > + </mask> + <mask name="MCLRE" value="0x0020" > <value value="0x0000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x0020" name="External" cname="_MCLRE_ON" /> - </tqmask> - <tqmask name="CP" value="0x0040" > + </mask> + <mask name="CP" value="0x0040" > <value value="0x0000" name="All" cname="_CP_ON" /> <value value="0x0040" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x0080" > + </mask> + <mask name="CPD" value="0x0080" > <value value="0x0000" name="All" cname="_CPD_ON" /> <value value="0x0080" name="Off" cname="_CPD_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0300" > + </mask> + <mask name="BODEN" value="0x0300" > <value value="0x0000" name="Off" cname="_BOR_OFF" /> <value value="0x0100" name="Software" cname="_BOR_SBODEN" /> <value value="0x0200" name="On_run" cname="_BOR_NSLEEP" /> <value value="0x0300" name="On" cname="_BOR_ON" /> - </tqmask> - <tqmask name="IESO" value="0x0400" > + </mask> + <mask name="IESO" value="0x0400" > <value value="0x0000" name="Off" cname="_IESO_OFF" /> <value value="0x0400" name="On" cname="_IESO_ON" /> - </tqmask> - <tqmask name="FCMEN" value="0x0800" > + </mask> + <mask name="FCMEN" value="0x0800" > <value value="0x0000" name="Off" cname="_FCMEN_OFF" /> <value value="0x0800" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x1000" > + </mask> + <mask name="LVP" value="0x1000" > <value value="0x0000" name="Off" cname="_LVP_OFF" /> <value value="0x1000" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x2000" > + </mask> + <mask name="DEBUG" value="0x2000" > <value value="0x0000" name="On" cname="_DEBUG_ON" /> <value value="0x2000" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG2" wtqmask="0x3FFF" bvalue="0x0700" > - <tqmask name="BORV" value="0x0100" > + <config offset="0x1" name="CONFIG2" wmask="0x3FFF" bvalue="0x0700" > + <mask name="BORV" value="0x0100" > <value value="0x0100" name="4.0" cname="_BOR40V" /> <value value="0x0000" name="2.1" cname="_BOR21V" /> - </tqmask> - <tqmask name="WRT" value="0x0600" > + </mask> + <mask name="WRT" value="0x0600" > <value value="0x0000" name="0000:03FF" cname="_WRT_HALF" /> <value value="0x0200" name="0000:00FF" cname="_WRT_1FOURTH" /> <value value="0x0400" name="invalid" /> <value value="0x0600" name="Off" cname="_WRT_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F883.xml b/src/devices/pic/xml_data/16F883.xml index 1ec6702..1140b72 100644 --- a/src/devices/pic/xml_data/16F883.xml +++ b/src/devices/pic/xml_data/16F883.xml @@ -33,16 +33,16 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x0FFF" /> - <memory name="calibration" start="0x2009" end="0x2009" cal_optqmask="0x0000" cal_opcode="0x0000" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="calibration" start="0x2009" end="0x2009" cal_opmask="0x0000" cal_opcode="0x0000" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2008" /> <memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1" wtqmask="0x3FFF" bvalue="0x3FFF" > - <tqmask name="FOSC" value="0x0007" > + <config offset="0x0" name="CONFIG1" wmask="0x3FFF" bvalue="0x3FFF" > + <mask name="FOSC" value="0x0007" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -51,62 +51,62 @@ <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" /> <value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" /> <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" /> - </tqmask> - <tqmask name="WDT" value="0x0008" > + </mask> + <mask name="WDT" value="0x0008" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0008" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0010" > + </mask> + <mask name="PWRTE" value="0x0010" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0010" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x0020" > + </mask> + <mask name="MCLRE" value="0x0020" > <value value="0x0000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x0020" name="External" cname="_MCLRE_ON" /> - </tqmask> - <tqmask name="CP" value="0x0040" > + </mask> + <mask name="CP" value="0x0040" > <value value="0x0000" name="All" cname="_CP_ON" /> <value value="0x0040" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x0080" > + </mask> + <mask name="CPD" value="0x0080" > <value value="0x0000" name="All" cname="_CPD_ON" /> <value value="0x0080" name="Off" cname="_CPD_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0300" > + </mask> + <mask name="BODEN" value="0x0300" > <value value="0x0000" name="Off" cname="_BOR_OFF" /> <value value="0x0100" name="Software" cname="_BOR_SBODEN" /> <value value="0x0200" name="On_run" cname="_BOR_NSLEEP" /> <value value="0x0300" name="On" cname="_BOR_ON" /> - </tqmask> - <tqmask name="IESO" value="0x0400" > + </mask> + <mask name="IESO" value="0x0400" > <value value="0x0000" name="Off" cname="_IESO_OFF" /> <value value="0x0400" name="On" cname="_IESO_ON" /> - </tqmask> - <tqmask name="FCMEN" value="0x0800" > + </mask> + <mask name="FCMEN" value="0x0800" > <value value="0x0000" name="Off" cname="_FCMEN_OFF" /> <value value="0x0800" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x1000" > + </mask> + <mask name="LVP" value="0x1000" > <value value="0x0000" name="Off" cname="_LVP_OFF" /> <value value="0x1000" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x2000" > + </mask> + <mask name="DEBUG" value="0x2000" > <value value="0x0000" name="On" cname="_DEBUG_ON" /> <value value="0x2000" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG2" wtqmask="0x3FFF" bvalue="0x0700" > - <tqmask name="BORV" value="0x0100" > + <config offset="0x1" name="CONFIG2" wmask="0x3FFF" bvalue="0x0700" > + <mask name="BORV" value="0x0100" > <value value="0x0100" name="4.0" cname="_BOR40V" /> <value value="0x0000" name="2.1" cname="_BOR21V" /> - </tqmask> - <tqmask name="WRT" value="0x0600" > + </mask> + <mask name="WRT" value="0x0600" > <value value="0x0000" name="0000:07FF" cname="_WRT_HALF" /> <value value="0x0200" name="0000:03FF" cname="_WRT_1FOURTH" /> <value value="0x0400" name="0000:00FF" cname="_WRT_256" /> <value value="0x0600" name="Off" cname="_WRT_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F884.xml b/src/devices/pic/xml_data/16F884.xml index 538d214..fbe9423 100644 --- a/src/devices/pic/xml_data/16F884.xml +++ b/src/devices/pic/xml_data/16F884.xml @@ -33,16 +33,16 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x0FFF" /> - <memory name="calibration" start="0x2009" end="0x2009" cal_optqmask="0x0000" cal_opcode="0x0000" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="calibration" start="0x2009" end="0x2009" cal_opmask="0x0000" cal_opcode="0x0000" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2008" /> <memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1" wtqmask="0x3FFF" bvalue="0x3FFF" > - <tqmask name="FOSC" value="0x0007" > + <config offset="0x0" name="CONFIG1" wmask="0x3FFF" bvalue="0x3FFF" > + <mask name="FOSC" value="0x0007" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -51,62 +51,62 @@ <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" /> <value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" /> <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" /> - </tqmask> - <tqmask name="WDT" value="0x0008" > + </mask> + <mask name="WDT" value="0x0008" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0008" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0010" > + </mask> + <mask name="PWRTE" value="0x0010" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0010" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x0020" > + </mask> + <mask name="MCLRE" value="0x0020" > <value value="0x0000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x0020" name="External" cname="_MCLRE_ON" /> - </tqmask> - <tqmask name="CP" value="0x0040" > + </mask> + <mask name="CP" value="0x0040" > <value value="0x0000" name="All" cname="_CP_ON" /> <value value="0x0040" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x0080" > + </mask> + <mask name="CPD" value="0x0080" > <value value="0x0000" name="All" cname="_CPD_ON" /> <value value="0x0080" name="Off" cname="_CPD_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0300" > + </mask> + <mask name="BODEN" value="0x0300" > <value value="0x0000" name="Off" cname="_BOR_OFF" /> <value value="0x0100" name="Software" cname="_BOR_SBODEN" /> <value value="0x0200" name="On_run" cname="_BOR_NSLEEP" /> <value value="0x0300" name="On" cname="_BOR_ON" /> - </tqmask> - <tqmask name="IESO" value="0x0400" > + </mask> + <mask name="IESO" value="0x0400" > <value value="0x0000" name="Off" cname="_IESO_OFF" /> <value value="0x0400" name="On" cname="_IESO_ON" /> - </tqmask> - <tqmask name="FCMEN" value="0x0800" > + </mask> + <mask name="FCMEN" value="0x0800" > <value value="0x0000" name="Off" cname="_FCMEN_OFF" /> <value value="0x0800" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x1000" > + </mask> + <mask name="LVP" value="0x1000" > <value value="0x0000" name="Off" cname="_LVP_OFF" /> <value value="0x1000" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x2000" > + </mask> + <mask name="DEBUG" value="0x2000" > <value value="0x0000" name="On" cname="_DEBUG_ON" /> <value value="0x2000" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG2" wtqmask="0x3FFF" bvalue="0x0700" > - <tqmask name="BORV" value="0x0100" > + <config offset="0x1" name="CONFIG2" wmask="0x3FFF" bvalue="0x0700" > + <mask name="BORV" value="0x0100" > <value value="0x0100" name="4.0" cname="_BOR40V" /> <value value="0x0000" name="2.1" cname="_BOR21V" /> - </tqmask> - <tqmask name="WRT" value="0x0600" > + </mask> + <mask name="WRT" value="0x0600" > <value value="0x0000" name="0000:07FF" cname="_WRT_HALF" /> <value value="0x0200" name="0000:03FF" cname="_WRT_1FOURTH" /> <value value="0x0400" name="0000:00FF" cname="_WRT_256" /> <value value="0x0600" name="Off" cname="_WRT_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F886.xml b/src/devices/pic/xml_data/16F886.xml index fe07fe7..3205cd7 100644 --- a/src/devices/pic/xml_data/16F886.xml +++ b/src/devices/pic/xml_data/16F886.xml @@ -33,16 +33,16 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x1FFF" /> - <memory name="calibration" start="0x2009" end="0x2009" cal_optqmask="0x0000" cal_opcode="0x0000" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="calibration" start="0x2009" end="0x2009" cal_opmask="0x0000" cal_opcode="0x0000" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2008" /> <memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1" wtqmask="0x3FFF" bvalue="0x3FFF" > - <tqmask name="FOSC" value="0x0007" > + <config offset="0x0" name="CONFIG1" wmask="0x3FFF" bvalue="0x3FFF" > + <mask name="FOSC" value="0x0007" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -51,62 +51,62 @@ <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" /> <value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" /> <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" /> - </tqmask> - <tqmask name="WDT" value="0x0008" > + </mask> + <mask name="WDT" value="0x0008" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0008" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0010" > + </mask> + <mask name="PWRTE" value="0x0010" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0010" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x0020" > + </mask> + <mask name="MCLRE" value="0x0020" > <value value="0x0000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x0020" name="External" cname="_MCLRE_ON" /> - </tqmask> - <tqmask name="CP" value="0x0040" > + </mask> + <mask name="CP" value="0x0040" > <value value="0x0000" name="All" cname="_CP_ON" /> <value value="0x0040" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x0080" > + </mask> + <mask name="CPD" value="0x0080" > <value value="0x0000" name="All" cname="_CPD_ON" /> <value value="0x0080" name="Off" cname="_CPD_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0300" > + </mask> + <mask name="BODEN" value="0x0300" > <value value="0x0000" name="Off" cname="_BOR_OFF" /> <value value="0x0100" name="Software" cname="_BOR_SBODEN" /> <value value="0x0200" name="On_run" cname="_BOR_NSLEEP" /> <value value="0x0300" name="On" cname="_BOR_ON" /> - </tqmask> - <tqmask name="IESO" value="0x0400" > + </mask> + <mask name="IESO" value="0x0400" > <value value="0x0000" name="Off" cname="_IESO_OFF" /> <value value="0x0400" name="On" cname="_IESO_ON" /> - </tqmask> - <tqmask name="FCMEN" value="0x0800" > + </mask> + <mask name="FCMEN" value="0x0800" > <value value="0x0000" name="Off" cname="_FCMEN_OFF" /> <value value="0x0800" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x1000" > + </mask> + <mask name="LVP" value="0x1000" > <value value="0x0000" name="Off" cname="_LVP_OFF" /> <value value="0x1000" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x2000" > + </mask> + <mask name="DEBUG" value="0x2000" > <value value="0x0000" name="On" cname="_DEBUG_ON" /> <value value="0x2000" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG2" wtqmask="0x3FFF" bvalue="0x0700" > - <tqmask name="BORV" value="0x0100" > + <config offset="0x1" name="CONFIG2" wmask="0x3FFF" bvalue="0x0700" > + <mask name="BORV" value="0x0100" > <value value="0x0100" name="4.0" cname="_BOR40V" /> <value value="0x0000" name="2.1" cname="_BOR21V" /> - </tqmask> - <tqmask name="WRT" value="0x0600" > + </mask> + <mask name="WRT" value="0x0600" > <value value="0x0000" name="0000:0FFF" cname="_WRT_HALF" /> <value value="0x0200" name="0000:07FF" cname="_WRT_1FOURTH" /> <value value="0x0400" name="0000:00FF" cname="_WRT_256" /> <value value="0x0600" name="Off" cname="_WRT_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F887.xml b/src/devices/pic/xml_data/16F887.xml index bbfdf91..78be11e 100644 --- a/src/devices/pic/xml_data/16F887.xml +++ b/src/devices/pic/xml_data/16F887.xml @@ -33,16 +33,16 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x1FFF" /> - <memory name="calibration" start="0x2009" end="0x2009" cal_optqmask="0x0000" cal_opcode="0x0000" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="calibration" start="0x2009" end="0x2009" cal_opmask="0x0000" cal_opcode="0x0000" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2008" /> <memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1" wtqmask="0x3FFF" bvalue="0x3FFF" > - <tqmask name="FOSC" value="0x0007" > + <config offset="0x0" name="CONFIG1" wmask="0x3FFF" bvalue="0x3FFF" > + <mask name="FOSC" value="0x0007" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -51,62 +51,62 @@ <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" /> <value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" /> <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" /> - </tqmask> - <tqmask name="WDT" value="0x0008" > + </mask> + <mask name="WDT" value="0x0008" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0008" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0010" > + </mask> + <mask name="PWRTE" value="0x0010" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0010" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x0020" > + </mask> + <mask name="MCLRE" value="0x0020" > <value value="0x0000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x0020" name="External" cname="_MCLRE_ON" /> - </tqmask> - <tqmask name="CP" value="0x0040" > + </mask> + <mask name="CP" value="0x0040" > <value value="0x0000" name="All" cname="_CP_ON" /> <value value="0x0040" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x0080" > + </mask> + <mask name="CPD" value="0x0080" > <value value="0x0000" name="All" cname="_CPD_ON" /> <value value="0x0080" name="Off" cname="_CPD_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0300" > + </mask> + <mask name="BODEN" value="0x0300" > <value value="0x0000" name="Off" cname="_BOR_OFF" /> <value value="0x0100" name="Software" cname="_BOR_SBODEN" /> <value value="0x0200" name="On_run" cname="_BOR_NSLEEP" /> <value value="0x0300" name="On" cname="_BOR_ON" /> - </tqmask> - <tqmask name="IESO" value="0x0400" > + </mask> + <mask name="IESO" value="0x0400" > <value value="0x0000" name="Off" cname="_IESO_OFF" /> <value value="0x0400" name="On" cname="_IESO_ON" /> - </tqmask> - <tqmask name="FCMEN" value="0x0800" > + </mask> + <mask name="FCMEN" value="0x0800" > <value value="0x0000" name="Off" cname="_FCMEN_OFF" /> <value value="0x0800" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x1000" > + </mask> + <mask name="LVP" value="0x1000" > <value value="0x0000" name="Off" cname="_LVP_OFF" /> <value value="0x1000" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x2000" > + </mask> + <mask name="DEBUG" value="0x2000" > <value value="0x0000" name="On" cname="_DEBUG_ON" /> <value value="0x2000" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG2" wtqmask="0x3FFF" bvalue="0x0700" > - <tqmask name="BORV" value="0x0100" > + <config offset="0x1" name="CONFIG2" wmask="0x3FFF" bvalue="0x0700" > + <mask name="BORV" value="0x0100" > <value value="0x0100" name="4.0" cname="_BOR40V" /> <value value="0x0000" name="2.1" cname="_BOR21V" /> - </tqmask> - <tqmask name="WRT" value="0x0600" > + </mask> + <mask name="WRT" value="0x0600" > <value value="0x0000" name="0000:0FFF" cname="_WRT_HALF" /> <value value="0x0200" name="0000:07FF" cname="_WRT_1FOURTH" /> <value value="0x0400" name="0000:00FF" cname="_WRT_256" /> <value value="0x0600" name="Off" cname="_WRT_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F913.xml b/src/devices/pic/xml_data/16F913.xml index c793c72..c904d5d 100644 --- a/src/devices/pic/xml_data/16F913.xml +++ b/src/devices/pic/xml_data/16F913.xml @@ -31,16 +31,16 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x0FFF" /> - <memory name="calibration" start="0x2008" end="0x2009" cal_optqmask="0x0000" cal_opcode="0x0000" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="calibration" start="0x2008" end="0x2009" cal_opmask="0x0000" cal_opcode="0x0000" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG" wtqmask="0x3FFF" bvalue="0x1FFF" > - <tqmask name="FOSC" value="0x0007" > + <config offset="0x0" name="CONFIG" wmask="0x3FFF" bvalue="0x1FFF" > + <mask name="FOSC" value="0x0007" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -49,45 +49,45 @@ <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" /> <value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" /> <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" /> - </tqmask> - <tqmask name="WDT" value="0x0008" > + </mask> + <mask name="WDT" value="0x0008" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0008" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0010" > + </mask> + <mask name="PWRTE" value="0x0010" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0010" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x0020" > + </mask> + <mask name="MCLRE" value="0x0020" > <value value="0x0000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x0020" name="External" cname="_MCLRE_ON" /> - </tqmask> - <tqmask name="CP" value="0x0040" > + </mask> + <mask name="CP" value="0x0040" > <value value="0x0000" name="All" cname="_CP_ON" /> <value value="0x0040" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x0080" > + </mask> + <mask name="CPD" value="0x0080" > <value value="0x0000" name="All" cname="_CPD_ON" /> <value value="0x0080" name="Off" cname="_CPD_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0300" > + </mask> + <mask name="BODEN" value="0x0300" > <value value="0x0000" name="Off" cname="_BOD_OFF" /> <value value="0x0100" name="Software" cname="_BOD_SBODEN" /> <value value="0x0200" name="On_run" cname="_BOD_NSLEEP" /> <value value="0x0300" name="On" cname="_BOD_ON" /> - </tqmask> - <tqmask name="IESO" value="0x0400" > + </mask> + <mask name="IESO" value="0x0400" > <value value="0x0000" name="Off" cname="_IESO_OFF" /> <value value="0x0400" name="On" cname="_IESO_ON" /> - </tqmask> - <tqmask name="FCMEN" value="0x0800" > + </mask> + <mask name="FCMEN" value="0x0800" > <value value="0x0000" name="Off" cname="_FCMEN_OFF" /> <value value="0x0800" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x1000" > + </mask> + <mask name="DEBUG" value="0x1000" > <value value="0x0000" name="On" cname="_DEBUG_ON" /> <value value="0x1000" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F914.xml b/src/devices/pic/xml_data/16F914.xml index 1bdd6ad..d74a0d5 100644 --- a/src/devices/pic/xml_data/16F914.xml +++ b/src/devices/pic/xml_data/16F914.xml @@ -31,16 +31,16 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x0FFF" /> - <memory name="calibration" start="0x2008" end="0x2009" cal_optqmask="0x0000" cal_opcode="0x0000" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="calibration" start="0x2008" end="0x2009" cal_opmask="0x0000" cal_opcode="0x0000" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG" wtqmask="0x3FFF" bvalue="0x1FFF" > - <tqmask name="FOSC" value="0x0007" > + <config offset="0x0" name="CONFIG" wmask="0x3FFF" bvalue="0x1FFF" > + <mask name="FOSC" value="0x0007" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -49,45 +49,45 @@ <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" /> <value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" /> <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" /> - </tqmask> - <tqmask name="WDT" value="0x0008" > + </mask> + <mask name="WDT" value="0x0008" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0008" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0010" > + </mask> + <mask name="PWRTE" value="0x0010" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0010" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x0020" > + </mask> + <mask name="MCLRE" value="0x0020" > <value value="0x0000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x0020" name="External" cname="_MCLRE_ON" /> - </tqmask> - <tqmask name="CP" value="0x0040" > + </mask> + <mask name="CP" value="0x0040" > <value value="0x0000" name="All" cname="_CP_ON" /> <value value="0x0040" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x0080" > + </mask> + <mask name="CPD" value="0x0080" > <value value="0x0000" name="All" cname="_CPD_ON" /> <value value="0x0080" name="Off" cname="_CPD_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0300" > + </mask> + <mask name="BODEN" value="0x0300" > <value value="0x0000" name="Off" cname="_BOD_OFF" /> <value value="0x0100" name="Software" cname="_BOD_SBODEN" /> <value value="0x0200" name="On_run" cname="_BOD_NSLEEP" /> <value value="0x0300" name="On" cname="_BOD_ON" /> - </tqmask> - <tqmask name="IESO" value="0x0400" > + </mask> + <mask name="IESO" value="0x0400" > <value value="0x0000" name="Off" cname="_IESO_OFF" /> <value value="0x0400" name="On" cname="_IESO_ON" /> - </tqmask> - <tqmask name="FCMEN" value="0x0800" > + </mask> + <mask name="FCMEN" value="0x0800" > <value value="0x0000" name="Off" cname="_FCMEN_OFF" /> <value value="0x0800" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x1000" > + </mask> + <mask name="DEBUG" value="0x1000" > <value value="0x0000" name="On" cname="_DEBUG_ON" /> <value value="0x1000" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F916.xml b/src/devices/pic/xml_data/16F916.xml index f2a139a..b066f93 100644 --- a/src/devices/pic/xml_data/16F916.xml +++ b/src/devices/pic/xml_data/16F916.xml @@ -31,16 +31,16 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x1FFF" /> - <memory name="calibration" start="0x2008" end="0x2009" cal_optqmask="0x0000" cal_opcode="0x0000" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="calibration" start="0x2008" end="0x2009" cal_opmask="0x0000" cal_opcode="0x0000" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG" wtqmask="0x3FFF" bvalue="0x1FFF" > - <tqmask name="FOSC" value="0x0007" > + <config offset="0x0" name="CONFIG" wmask="0x3FFF" bvalue="0x1FFF" > + <mask name="FOSC" value="0x0007" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -49,45 +49,45 @@ <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" /> <value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" /> <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" /> - </tqmask> - <tqmask name="WDT" value="0x0008" > + </mask> + <mask name="WDT" value="0x0008" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0008" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0010" > + </mask> + <mask name="PWRTE" value="0x0010" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0010" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x0020" > + </mask> + <mask name="MCLRE" value="0x0020" > <value value="0x0000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x0020" name="External" cname="_MCLRE_ON" /> - </tqmask> - <tqmask name="CP" value="0x0040" > + </mask> + <mask name="CP" value="0x0040" > <value value="0x0000" name="All" cname="_CP_ON" /> <value value="0x0040" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x0080" > + </mask> + <mask name="CPD" value="0x0080" > <value value="0x0000" name="All" cname="_CPD_ON" /> <value value="0x0080" name="Off" cname="_CPD_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0300" > + </mask> + <mask name="BODEN" value="0x0300" > <value value="0x0000" name="Off" cname="_BOD_OFF" /> <value value="0x0100" name="Software" cname="_BOD_SBODEN" /> <value value="0x0200" name="On_run" cname="_BOD_NSLEEP" /> <value value="0x0300" name="On" cname="_BOD_ON" /> - </tqmask> - <tqmask name="IESO" value="0x0400" > + </mask> + <mask name="IESO" value="0x0400" > <value value="0x0000" name="Off" cname="_IESO_OFF" /> <value value="0x0400" name="On" cname="_IESO_ON" /> - </tqmask> - <tqmask name="FCMEN" value="0x0800" > + </mask> + <mask name="FCMEN" value="0x0800" > <value value="0x0000" name="Off" cname="_FCMEN_OFF" /> <value value="0x0800" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x1000" > + </mask> + <mask name="DEBUG" value="0x1000" > <value value="0x0000" name="On" cname="_DEBUG_ON" /> <value value="0x1000" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F917.xml b/src/devices/pic/xml_data/16F917.xml index b2fb425..9e17dcc 100644 --- a/src/devices/pic/xml_data/16F917.xml +++ b/src/devices/pic/xml_data/16F917.xml @@ -31,16 +31,16 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x1FFF" /> - <memory name="calibration" start="0x2008" end="0x2009" cal_optqmask="0x0000" cal_opcode="0x0000" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="calibration" start="0x2008" end="0x2009" cal_opmask="0x0000" cal_opcode="0x0000" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG" wtqmask="0x3FFF" bvalue="0x1FFF" > - <tqmask name="FOSC" value="0x0007" > + <config offset="0x0" name="CONFIG" wmask="0x3FFF" bvalue="0x1FFF" > + <mask name="FOSC" value="0x0007" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -49,45 +49,45 @@ <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" /> <value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" /> <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" /> - </tqmask> - <tqmask name="WDT" value="0x0008" > + </mask> + <mask name="WDT" value="0x0008" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0008" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0010" > + </mask> + <mask name="PWRTE" value="0x0010" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0010" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x0020" > + </mask> + <mask name="MCLRE" value="0x0020" > <value value="0x0000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x0020" name="External" cname="_MCLRE_ON" /> - </tqmask> - <tqmask name="CP" value="0x0040" > + </mask> + <mask name="CP" value="0x0040" > <value value="0x0000" name="All" cname="_CP_ON" /> <value value="0x0040" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x0080" > + </mask> + <mask name="CPD" value="0x0080" > <value value="0x0000" name="All" cname="_CPD_ON" /> <value value="0x0080" name="Off" cname="_CPD_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0300" > + </mask> + <mask name="BODEN" value="0x0300" > <value value="0x0000" name="Off" cname="_BOD_OFF" /> <value value="0x0100" name="Software" cname="_BOD_SBODEN" /> <value value="0x0200" name="On_run" cname="_BOD_NSLEEP" /> <value value="0x0300" name="On" cname="_BOD_ON" /> - </tqmask> - <tqmask name="IESO" value="0x0400" > + </mask> + <mask name="IESO" value="0x0400" > <value value="0x0000" name="Off" cname="_IESO_OFF" /> <value value="0x0400" name="On" cname="_IESO_ON" /> - </tqmask> - <tqmask name="FCMEN" value="0x0800" > + </mask> + <mask name="FCMEN" value="0x0800" > <value value="0x0000" name="Off" cname="_FCMEN_OFF" /> <value value="0x0800" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x1000" > + </mask> + <mask name="DEBUG" value="0x1000" > <value value="0x0000" name="On" cname="_DEBUG_ON" /> <value value="0x1000" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16F946.xml b/src/devices/pic/xml_data/16F946.xml index df3ac70..53df522 100644 --- a/src/devices/pic/xml_data/16F946.xml +++ b/src/devices/pic/xml_data/16F946.xml @@ -31,16 +31,16 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x0000" end="0x1FFF" /> - <memory name="calibration" start="0x2008" end="0x2009" cal_optqmask="0x0000" cal_opcode="0x0000" /> - <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" /> + <memory name="calibration" start="0x2008" end="0x2009" cal_opmask="0x0000" cal_opcode="0x0000" /> + <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" /> <memory name="device_id" start="0x2006" end="0x2006" /> <memory name="config" start="0x2007" end="0x2007" /> <memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" /> <memory name="debug_vector" start="0x2004" end="0x2004" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG" wtqmask="0x3FFF" bvalue="0x1FFF" > - <tqmask name="FOSC" value="0x0007" > + <config offset="0x0" name="CONFIG" wmask="0x3FFF" bvalue="0x1FFF" > + <mask name="FOSC" value="0x0007" > <value value="0x0000" name="LP" cname="_LP_OSC" /> <value value="0x0001" name="XT" cname="_XT_OSC" /> <value value="0x0002" name="HS" cname="_HS_OSC" /> @@ -49,45 +49,45 @@ <value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" /> <value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" /> <value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" /> - </tqmask> - <tqmask name="WDT" value="0x0008" > + </mask> + <mask name="WDT" value="0x0008" > <value value="0x0000" name="Off" cname="_WDT_OFF" /> <value value="0x0008" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="PWRTE" value="0x0010" > + </mask> + <mask name="PWRTE" value="0x0010" > <value value="0x0000" name="On" cname="_PWRTE_ON" /> <value value="0x0010" name="Off" cname="_PWRTE_OFF" /> - </tqmask> - <tqmask name="MCLRE" value="0x0020" > + </mask> + <mask name="MCLRE" value="0x0020" > <value value="0x0000" name="Internal" cname="_MCLRE_OFF" /> <value value="0x0020" name="External" cname="_MCLRE_ON" /> - </tqmask> - <tqmask name="CP" value="0x0040" > + </mask> + <mask name="CP" value="0x0040" > <value value="0x0000" name="All" cname="_CP_ON" /> <value value="0x0040" name="Off" cname="_CP_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x0080" > + </mask> + <mask name="CPD" value="0x0080" > <value value="0x0000" name="All" cname="_CPD_ON" /> <value value="0x0080" name="Off" cname="_CPD_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x0300" > + </mask> + <mask name="BODEN" value="0x0300" > <value value="0x0000" name="Off" cname="_BOD_OFF" /> <value value="0x0100" name="Software" cname="_BOD_SBODEN" /> <value value="0x0200" name="On_run" cname="_BOD_NSLEEP" /> <value value="0x0300" name="On" cname="_BOD_ON" /> - </tqmask> - <tqmask name="IESO" value="0x0400" > + </mask> + <mask name="IESO" value="0x0400" > <value value="0x0000" name="Off" cname="_IESO_OFF" /> <value value="0x0400" name="On" cname="_IESO_ON" /> - </tqmask> - <tqmask name="FCMEN" value="0x0800" > + </mask> + <mask name="FCMEN" value="0x0800" > <value value="0x0000" name="Off" cname="_FCMEN_OFF" /> <value value="0x0800" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x1000" > + </mask> + <mask name="DEBUG" value="0x1000" > <value value="0x0000" name="On" cname="_DEBUG_ON" /> <value value="0x1000" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/16HV540.xml b/src/devices/pic/xml_data/16HV540.xml index 4acd802..439aa82 100644 --- a/src/devices/pic/xml_data/16HV540.xml +++ b/src/devices/pic/xml_data/16HV540.xml @@ -28,25 +28,25 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000" end="0x1FF" /> - <memory name="user_ids" start="0x200" end="0x203" rtqmask="0x00F" /> + <memory name="user_ids" start="0x200" end="0x203" rmask="0x00F" /> <memory name="config" start="0xFFF" end="0xFFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0xFFF" bvalue="0x00F" > - <tqmask name="FOSC" value="0x003" > + <config offset="0x0" name="" wmask="0xFFF" bvalue="0x00F" > + <mask name="FOSC" value="0x003" > <value value="0x000" name="LP" cname="_LP_OSC" /> <value value="0x001" name="XT" cname="_XT_OSC" /> <value value="0x002" name="HS" cname="_HS_OSC" /> <value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="WDT" value="0x004" > + </mask> + <mask name="WDT" value="0x004" > <value value="0x000" name="Off" cname="_WDT_OFF" /> <value value="0x004" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="CP" value="0x008" > + </mask> + <mask name="CP" value="0x008" > <value value="0x000" name="All" cname="_CP_ON" /> <value value="0x008" name="Off" cname="_CP_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/17C42.xml b/src/devices/pic/xml_data/17C42.xml index 7ca1e0f..e072c94 100644 --- a/src/devices/pic/xml_data/17C42.xml +++ b/src/devices/pic/xml_data/17C42.xml @@ -30,25 +30,25 @@ <memory name="config" start="0xFE00" end="0xFE00" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0xFFFF" bvalue="0x005F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0xFFFF" bvalue="0x005F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LF_OSC" /> <value value="0x0001" name="EXTRC_CLKOUT" cname="_RC_OSC" /> <value value="0x0002" name="XT" cname="_XT_OSC" /> <value value="0x0003" name="EC" cname="_EC_OSC" /> - </tqmask> - <tqmask name="WDTPS" value="0x000C" > + </mask> + <mask name="WDTPS" value="0x000C" > <value value="0x0000" name="Disabled" cname="_WDT_OFF" ecnames="_WDT_NORM" /> <value value="0x0004" name="1:128" cname="_WDT_64" /> <value value="0x0008" name="1:512" cname="_WDT_256" /> <value value="0x000C" name="1:1" cname="_WDT_1" /> - </tqmask> - <tqmask name="PM" value="0x0050" > + </mask> + <mask name="PM" value="0x0050" > <value value="0x0000" name="Code-protected microcontroller" cname="_PMC_MODE" /> <value value="0x0010" name="Extended microcontroller" cname="_XMC_MODE" /> <value value="0x0040" name="Microcontroller" cname="_MC_MODE" /> <value value="0x0050" name="Microprocessor" cname="_MP_MODE" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/17C42A.xml b/src/devices/pic/xml_data/17C42A.xml index 2c068ae..58c59b3 100644 --- a/src/devices/pic/xml_data/17C42A.xml +++ b/src/devices/pic/xml_data/17C42A.xml @@ -33,26 +33,26 @@ <memory name="config" start="0xFE00" end="0xFE00" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0xFFFF" bvalue="0x015F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0xFFFF" bvalue="0x015F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LF_OSC" /> <value value="0x0001" name="EXTRC_CLKOUT" cname="_RC_OSC" /> <value value="0x0002" name="XT" cname="_XT_OSC" /> <value value="0x0003" name="EC" cname="_EC_OSC" /> - </tqmask> - <tqmask name="WDTPS" value="0x000C" > + </mask> + <mask name="WDTPS" value="0x000C" > <value value="0x0000" name="Disabled" cname="_WDT_OFF" ecnames="_WDT_NORM" /> <value value="0x0004" name="1:128" cname="_WDT_64" /> <value value="0x0008" name="1:512" cname="_WDT_256" /> <value value="0x000C" name="1:1" cname="_WDT_1" /> - </tqmask> - <tqmask name="PM" value="0x0150" > + </mask> + <mask name="PM" value="0x0150" > <value value="0x0000" name="Code-protected microcontroller" cname="_PMC_MODE" /> <value value="0x0110" name="Extended microcontroller" cname="_XMC_MODE" /> <value value="0x0140" name="Microcontroller" cname="_MC_MODE" /> <value value="0x0150" name="Microprocessor" cname="_MP_MODE" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/17C43.xml b/src/devices/pic/xml_data/17C43.xml index b49734a..4c91f40 100644 --- a/src/devices/pic/xml_data/17C43.xml +++ b/src/devices/pic/xml_data/17C43.xml @@ -33,26 +33,26 @@ <memory name="config" start="0xFE00" end="0xFE00" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0xFFFF" bvalue="0x015F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0xFFFF" bvalue="0x015F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LF_OSC" /> <value value="0x0001" name="EXTRC_CLKOUT" cname="_RC_OSC" /> <value value="0x0002" name="XT" cname="_XT_OSC" /> <value value="0x0003" name="EC" cname="_EC_OSC" /> - </tqmask> - <tqmask name="WDTPS" value="0x000C" > + </mask> + <mask name="WDTPS" value="0x000C" > <value value="0x0000" name="Disabled" cname="_WDT_OFF" ecnames="_WDT_NORM" /> <value value="0x0004" name="1:128" cname="_WDT_64" /> <value value="0x0008" name="1:512" cname="_WDT_256" /> <value value="0x000C" name="1:1" cname="_WDT_1" /> - </tqmask> - <tqmask name="PM" value="0x0150" > + </mask> + <mask name="PM" value="0x0150" > <value value="0x0000" name="Code-protected microcontroller" cname="_PMC_MODE" /> <value value="0x0110" name="Extended microcontroller" cname="_XMC_MODE" /> <value value="0x0140" name="Microcontroller" cname="_MC_MODE" /> <value value="0x0150" name="Microprocessor" cname="_MP_MODE" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/17C44.xml b/src/devices/pic/xml_data/17C44.xml index ac0d8f6..da4be7b 100644 --- a/src/devices/pic/xml_data/17C44.xml +++ b/src/devices/pic/xml_data/17C44.xml @@ -33,26 +33,26 @@ <memory name="config" start="0xFE00" end="0xFE00" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0xFFFF" bvalue="0x015F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0xFFFF" bvalue="0x015F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LF_OSC" /> <value value="0x0001" name="EXTRC_CLKOUT" cname="_RC_OSC" /> <value value="0x0002" name="XT" cname="_XT_OSC" /> <value value="0x0003" name="EC" cname="_EC_OSC" /> - </tqmask> - <tqmask name="WDTPS" value="0x000C" > + </mask> + <mask name="WDTPS" value="0x000C" > <value value="0x0000" name="Disabled" cname="_WDT_OFF" ecnames="_WDT_NORM" /> <value value="0x0004" name="1:128" cname="_WDT_64" /> <value value="0x0008" name="1:512" cname="_WDT_256" /> <value value="0x000C" name="1:1" cname="_WDT_1" /> - </tqmask> - <tqmask name="PM" value="0x0150" > + </mask> + <mask name="PM" value="0x0150" > <value value="0x0000" name="Code-protected microcontroller" cname="_PMC_MODE" /> <value value="0x0110" name="Extended microcontroller" cname="_XMC_MODE" /> <value value="0x0140" name="Microcontroller" cname="_MC_MODE" /> <value value="0x0150" name="Microprocessor" cname="_MP_MODE" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/17C752.xml b/src/devices/pic/xml_data/17C752.xml index adb759c..20f798f 100644 --- a/src/devices/pic/xml_data/17C752.xml +++ b/src/devices/pic/xml_data/17C752.xml @@ -33,30 +33,30 @@ <memory name="config" start="0xFE00" end="0xFE00" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0xFFFF" bvalue="0xC05F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0xFFFF" bvalue="0xC05F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LF_OSC" /> <value value="0x0001" name="EXTRC_CLKOUT" cname="_RC_OSC" /> <value value="0x0002" name="XT" cname="_XT_OSC" /> <value value="0x0003" name="EC" cname="_EC_OSC" /> - </tqmask> - <tqmask name="WDTPS" value="0x000C" > + </mask> + <mask name="WDTPS" value="0x000C" > <value value="0x0000" name="Disabled" cname="_WDT_OFF" ecnames="_WDT_NORM" /> <value value="0x0004" name="1:64" cname="_WDT_64" /> <value value="0x0008" name="1:256" cname="_WDT_256" /> <value value="0x000C" name="1:1" cname="_WDT_1" ecnames="_WDT_0" /> - </tqmask> - <tqmask name="BODEN" value="0x4000" > + </mask> + <mask name="BODEN" value="0x4000" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x4000" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="PM" value="0x8050" > + </mask> + <mask name="PM" value="0x8050" > <value value="0x0000" name="Code-protected microcontroller" cname="_PMC_MODE" /> <value value="0x8010" name="Extended microcontroller" cname="_XMC_MODE" /> <value value="0x8040" name="Microcontroller" cname="_MC_MODE" /> <value value="0x8050" name="Microprocessor" cname="_MP_MODE" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/17C756.xml b/src/devices/pic/xml_data/17C756.xml index 68b0ae7..a5df4c4 100644 --- a/src/devices/pic/xml_data/17C756.xml +++ b/src/devices/pic/xml_data/17C756.xml @@ -33,30 +33,30 @@ <memory name="config" start="0xFE00" end="0xFE00" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0xFFFF" bvalue="0xC05F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0xFFFF" bvalue="0xC05F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LF_OSC" /> <value value="0x0001" name="EXTRC_CLKOUT" cname="_RC_OSC" /> <value value="0x0002" name="XT" cname="_XT_OSC" /> <value value="0x0003" name="EC" cname="_EC_OSC" /> - </tqmask> - <tqmask name="WDTPS" value="0x000C" > + </mask> + <mask name="WDTPS" value="0x000C" > <value value="0x0000" name="Disabled" cname="_WDT_OFF" ecnames="_WDT_NORM" /> <value value="0x0004" name="1:64" cname="_WDT_64" /> <value value="0x0008" name="1:256" cname="_WDT_256" /> <value value="0x000C" name="1:1" cname="_WDT_1" ecnames="_WDT_0" /> - </tqmask> - <tqmask name="BODEN" value="0x4000" > + </mask> + <mask name="BODEN" value="0x4000" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x4000" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="PM" value="0x8050" > + </mask> + <mask name="PM" value="0x8050" > <value value="0x0000" name="Code-protected microcontroller" cname="_PMC_MODE" /> <value value="0x8010" name="Extended microcontroller" cname="_XMC_MODE" /> <value value="0x8040" name="Microcontroller" cname="_MC_MODE" /> <value value="0x8050" name="Microprocessor" cname="_MP_MODE" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/17C756A.xml b/src/devices/pic/xml_data/17C756A.xml index 39c9b81..f20ee31 100644 --- a/src/devices/pic/xml_data/17C756A.xml +++ b/src/devices/pic/xml_data/17C756A.xml @@ -33,30 +33,30 @@ <memory name="config" start="0xFE00" end="0xFE00" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0xFFFF" bvalue="0xC05F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0xFFFF" bvalue="0xC05F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LF_OSC" /> <value value="0x0001" name="EXTRC_CLKOUT" cname="_RC_OSC" /> <value value="0x0002" name="XT" cname="_XT_OSC" /> <value value="0x0003" name="EC" cname="_EC_OSC" /> - </tqmask> - <tqmask name="WDTPS" value="0x000C" > + </mask> + <mask name="WDTPS" value="0x000C" > <value value="0x0000" name="Disabled" cname="_WDT_OFF" ecnames="_WDT_NORM" /> <value value="0x0004" name="1:64" cname="_WDT_64" /> <value value="0x0008" name="1:256" cname="_WDT_256" /> <value value="0x000C" name="1:1" cname="_WDT_1" ecnames="_WDT_0" /> - </tqmask> - <tqmask name="BODEN" value="0x4000" > + </mask> + <mask name="BODEN" value="0x4000" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x4000" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="PM" value="0x8050" > + </mask> + <mask name="PM" value="0x8050" > <value value="0x0000" name="Code-protected microcontroller" cname="_PMC_MODE" /> <value value="0x8010" name="Extended microcontroller" cname="_XMC_MODE" /> <value value="0x8040" name="Microcontroller" cname="_MC_MODE" /> <value value="0x8050" name="Microprocessor" cname="_MP_MODE" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/17C762.xml b/src/devices/pic/xml_data/17C762.xml index 311caa6..10e3a86 100644 --- a/src/devices/pic/xml_data/17C762.xml +++ b/src/devices/pic/xml_data/17C762.xml @@ -33,30 +33,30 @@ <memory name="config" start="0xFE00" end="0xFE00" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0xFFFF" bvalue="0xC05F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0xFFFF" bvalue="0xC05F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LF_OSC" /> <value value="0x0001" name="EXTRC_CLKOUT" cname="_RC_OSC" /> <value value="0x0002" name="XT" cname="_XT_OSC" /> <value value="0x0003" name="EC" cname="_EC_OSC" /> - </tqmask> - <tqmask name="WDTPS" value="0x000C" > + </mask> + <mask name="WDTPS" value="0x000C" > <value value="0x0000" name="Disabled" cname="_WDT_OFF" ecnames="_WDT_NORM" /> <value value="0x0004" name="1:64" cname="_WDT_64" /> <value value="0x0008" name="1:256" cname="_WDT_256" /> <value value="0x000C" name="1:1" cname="_WDT_1" ecnames="_WDT_0" /> - </tqmask> - <tqmask name="BODEN" value="0x4000" > + </mask> + <mask name="BODEN" value="0x4000" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x4000" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="PM" value="0x8050" > + </mask> + <mask name="PM" value="0x8050" > <value value="0x0000" name="Code-protected microcontroller" cname="_PMC_MODE" /> <value value="0x8010" name="Extended microcontroller" cname="_XMC_MODE" /> <value value="0x8040" name="Microcontroller" cname="_MC_MODE" /> <value value="0x8050" name="Microprocessor" cname="_MP_MODE" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/17C766.xml b/src/devices/pic/xml_data/17C766.xml index 059decd..0d2559d 100644 --- a/src/devices/pic/xml_data/17C766.xml +++ b/src/devices/pic/xml_data/17C766.xml @@ -33,30 +33,30 @@ <memory name="config" start="0xFE00" end="0xFE00" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0xFFFF" bvalue="0xC05F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0xFFFF" bvalue="0xC05F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LF_OSC" /> <value value="0x0001" name="EXTRC_CLKOUT" cname="_RC_OSC" /> <value value="0x0002" name="XT" cname="_XT_OSC" /> <value value="0x0003" name="EC" cname="_EC_OSC" /> - </tqmask> - <tqmask name="WDTPS" value="0x000C" > + </mask> + <mask name="WDTPS" value="0x000C" > <value value="0x0000" name="Disabled" cname="_WDT_OFF" ecnames="_WDT_NORM" /> <value value="0x0004" name="1:64" cname="_WDT_64" /> <value value="0x0008" name="1:256" cname="_WDT_256" /> <value value="0x000C" name="1:1" cname="_WDT_1" ecnames="_WDT_0" /> - </tqmask> - <tqmask name="BODEN" value="0x4000" > + </mask> + <mask name="BODEN" value="0x4000" > <value value="0x0000" name="Off" cname="_BODEN_OFF" /> <value value="0x4000" name="On" cname="_BODEN_ON" /> - </tqmask> - <tqmask name="PM" value="0x8050" > + </mask> + <mask name="PM" value="0x8050" > <value value="0x0000" name="Code-protected microcontroller" cname="_PMC_MODE" /> <value value="0x8010" name="Extended microcontroller" cname="_XMC_MODE" /> <value value="0x8040" name="Microcontroller" cname="_MC_MODE" /> <value value="0x8050" name="Microprocessor" cname="_MP_MODE" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/17CR42.xml b/src/devices/pic/xml_data/17CR42.xml index 21893f8..b691cd8 100644 --- a/src/devices/pic/xml_data/17CR42.xml +++ b/src/devices/pic/xml_data/17CR42.xml @@ -33,26 +33,26 @@ <memory name="config" start="0xFE00" end="0xFE00" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0xFFFF" bvalue="0x015F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0xFFFF" bvalue="0x015F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LF_OSC" /> <value value="0x0001" name="EXTRC_CLKOUT" cname="_RC_OSC" /> <value value="0x0002" name="XT" cname="_XT_OSC" /> <value value="0x0003" name="EC" cname="_EC_OSC" /> - </tqmask> - <tqmask name="WDTPS" value="0x000C" > + </mask> + <mask name="WDTPS" value="0x000C" > <value value="0x0000" name="Disabled" cname="_WDT_OFF" ecnames="_WDT_NORM" /> <value value="0x0004" name="1:128" cname="_WDT_64" /> <value value="0x0008" name="1:512" cname="_WDT_256" /> <value value="0x000C" name="1:1" cname="_WDT_1" /> - </tqmask> - <tqmask name="PM" value="0x0150" > + </mask> + <mask name="PM" value="0x0150" > <value value="0x0000" name="Code-protected microcontroller" cname="_PMC_MODE" /> <value value="0x0110" name="Extended microcontroller" cname="_XMC_MODE" /> <value value="0x0140" name="Microcontroller" cname="_MC_MODE" /> <value value="0x0150" name="Microprocessor" cname="_MP_MODE" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/17CR43.xml b/src/devices/pic/xml_data/17CR43.xml index 1e43eec..13c1f2c 100644 --- a/src/devices/pic/xml_data/17CR43.xml +++ b/src/devices/pic/xml_data/17CR43.xml @@ -33,26 +33,26 @@ <memory name="config" start="0xFE00" end="0xFE00" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="" wtqmask="0xFFFF" bvalue="0x015F" > - <tqmask name="FOSC" value="0x0003" > + <config offset="0x0" name="" wmask="0xFFFF" bvalue="0x015F" > + <mask name="FOSC" value="0x0003" > <value value="0x0000" name="LP" cname="_LF_OSC" /> <value value="0x0001" name="EXTRC_CLKOUT" cname="_RC_OSC" /> <value value="0x0002" name="XT" cname="_XT_OSC" /> <value value="0x0003" name="EC" cname="_EC_OSC" /> - </tqmask> - <tqmask name="WDTPS" value="0x000C" > + </mask> + <mask name="WDTPS" value="0x000C" > <value value="0x0000" name="Disabled" cname="_WDT_OFF" ecnames="_WDT_NORM" /> <value value="0x0004" name="1:128" cname="_WDT_64" /> <value value="0x0008" name="1:512" cname="_WDT_256" /> <value value="0x000C" name="1:1" cname="_WDT_1" /> - </tqmask> - <tqmask name="PM" value="0x0150" > + </mask> + <mask name="PM" value="0x0150" > <value value="0x0000" name="Code-protected microcontroller" cname="_PMC_MODE" /> <value value="0x0110" name="Extended microcontroller" cname="_XMC_MODE" /> <value value="0x0140" name="Microcontroller" cname="_MC_MODE" /> <value value="0x0150" name="Microprocessor" cname="_MP_MODE" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18C242.xml b/src/devices/pic/xml_data/18C242.xml index 32495ab..798c478 100644 --- a/src/devices/pic/xml_data/18C242.xml +++ b/src/devices/pic/xml_data/18C242.xml @@ -29,21 +29,21 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x003FFF" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x300007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG0" wtqmask="0xFF" bvalue="0xFF" > - <tqmask name="CP" value="0xFF" > + <config offset="0x0" name="CONFIG0" wmask="0xFF" bvalue="0xFF" > + <mask name="CP" value="0xFF" > <value value="0x00" name="All" cname="_CP_ON" /> <value value="0xFF" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1" wtqmask="0xFF" bvalue="0x27" > - <tqmask name="FOSC" value="0x07" > + <config offset="0x1" name="CONFIG1" wmask="0xFF" bvalue="0x27" > + <mask name="FOSC" value="0x07" > <value value="0x00" name="LP" cname="_LP_OSC" /> <value value="0x01" name="XT" cname="_XT_OSC" /> <value value="0x02" name="HS" cname="_HS_OSC" /> @@ -52,36 +52,36 @@ <value value="0x05" name="EC_IO" cname="_ECIO_OSC" /> <value value="0x06" name="H4" cname="_HSPLL_OSC" /> <value value="0x07" name="EXTRC_IO" cname="_RCIO_OSC" /> - </tqmask> - <tqmask name="OSCSEN" value="0x20" > + </mask> + <mask name="OSCSEN" value="0x20" > <value value="0x00" name="On" cname="_OSCS_ON" /> <value value="0x20" name="Off" cname="_OSCS_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2" wmask="0xFF" bvalue="0x0F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x02" > + </mask> + <mask name="BODEN" value="0x02" > <value value="0x00" name="Off" cname="_BOR_OFF" /> <value value="0x02" name="On" cname="_BOR_ON" /> - </tqmask> - <tqmask name="BORV" value="0x0C" > + </mask> + <mask name="BORV" value="0x0C" > <value value="0x00" name="4.5" cname="_BORV_45" /> <value value="0x04" name="4.2" cname="_BORV_42" /> <value value="0x08" name="2.7" cname="_BORV_27" /> <value value="0x0C" name="2.5" cname="_BORV_25" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG3" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG3" wmask="0xFF" bvalue="0x0F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x0E" > + </mask> + <mask name="WDTPS" value="0x0E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -90,26 +90,26 @@ <value value="0x0A" name="1:32" cname="_WDTPS_32" /> <value value="0x0C" name="1:64" cname="_WDTPS_64" /> <value value="0x0E" name="1:128" cname="_WDTPS_128" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG4" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG4" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG5" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG5" wmask="0xFF" bvalue="0x01" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="_CCP2MX_OFF" /> <value value="0x01" name="RC1" cname="_CCP2MX_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG6" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG6" wmask="0xFF" bvalue="0x01" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVR_OFF" /> <value value="0x01" name="On" cname="_STVR_ON" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG7" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG7" wmask="0xFF" bvalue="0x00" /> <!--* Packages *************************************************************--> <package types="pdip soic" nb_pins="28" > diff --git a/src/devices/pic/xml_data/18C252.xml b/src/devices/pic/xml_data/18C252.xml index d5a7161..81f370b 100644 --- a/src/devices/pic/xml_data/18C252.xml +++ b/src/devices/pic/xml_data/18C252.xml @@ -29,21 +29,21 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x007FFF" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x300007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG0" wtqmask="0xFF" bvalue="0xFF" > - <tqmask name="CP" value="0xFF" > + <config offset="0x0" name="CONFIG0" wmask="0xFF" bvalue="0xFF" > + <mask name="CP" value="0xFF" > <value value="0x00" name="All" cname="_CP_ON" /> <value value="0xFF" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1" wtqmask="0xFF" bvalue="0x27" > - <tqmask name="FOSC" value="0x07" > + <config offset="0x1" name="CONFIG1" wmask="0xFF" bvalue="0x27" > + <mask name="FOSC" value="0x07" > <value value="0x00" name="LP" cname="_LP_OSC" /> <value value="0x01" name="XT" cname="_XT_OSC" /> <value value="0x02" name="HS" cname="_HS_OSC" /> @@ -52,36 +52,36 @@ <value value="0x05" name="EC_IO" cname="_ECIO_OSC" /> <value value="0x06" name="H4" cname="_HSPLL_OSC" /> <value value="0x07" name="EXTRC_IO" cname="_RCIO_OSC" /> - </tqmask> - <tqmask name="OSCSEN" value="0x20" > + </mask> + <mask name="OSCSEN" value="0x20" > <value value="0x00" name="On" cname="_OSCS_ON" /> <value value="0x20" name="Off" cname="_OSCS_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2" wmask="0xFF" bvalue="0x0F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x02" > + </mask> + <mask name="BODEN" value="0x02" > <value value="0x00" name="Off" cname="_BOR_OFF" /> <value value="0x02" name="On" cname="_BOR_ON" /> - </tqmask> - <tqmask name="BORV" value="0x0C" > + </mask> + <mask name="BORV" value="0x0C" > <value value="0x00" name="4.5" cname="_BORV_45" /> <value value="0x04" name="4.2" cname="_BORV_42" /> <value value="0x08" name="2.7" cname="_BORV_27" /> <value value="0x0C" name="2.5" cname="_BORV_25" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG3" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG3" wmask="0xFF" bvalue="0x0F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x0E" > + </mask> + <mask name="WDTPS" value="0x0E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -90,26 +90,26 @@ <value value="0x0A" name="1:32" cname="_WDTPS_32" /> <value value="0x0C" name="1:64" cname="_WDTPS_64" /> <value value="0x0E" name="1:128" cname="_WDTPS_128" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG4" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG4" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG5" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG5" wmask="0xFF" bvalue="0x01" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="_CCP2MX_OFF" /> <value value="0x01" name="RC1" cname="_CCP2MX_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG6" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG6" wmask="0xFF" bvalue="0x01" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVR_OFF" /> <value value="0x01" name="On" cname="_STVR_ON" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG7" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG7" wmask="0xFF" bvalue="0x00" /> <!--* Packages *************************************************************--> <package types="pdip soic" nb_pins="28" > diff --git a/src/devices/pic/xml_data/18C442.xml b/src/devices/pic/xml_data/18C442.xml index 5ecb3b4..419ee29 100644 --- a/src/devices/pic/xml_data/18C442.xml +++ b/src/devices/pic/xml_data/18C442.xml @@ -29,21 +29,21 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x003FFF" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x300007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG0" wtqmask="0xFF" bvalue="0xFF" > - <tqmask name="CP" value="0xFF" > + <config offset="0x0" name="CONFIG0" wmask="0xFF" bvalue="0xFF" > + <mask name="CP" value="0xFF" > <value value="0x00" name="All" cname="_CP_ON" /> <value value="0xFF" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1" wtqmask="0xFF" bvalue="0x27" > - <tqmask name="FOSC" value="0x07" > + <config offset="0x1" name="CONFIG1" wmask="0xFF" bvalue="0x27" > + <mask name="FOSC" value="0x07" > <value value="0x00" name="LP" cname="_LP_OSC" /> <value value="0x01" name="XT" cname="_XT_OSC" /> <value value="0x02" name="HS" cname="_HS_OSC" /> @@ -52,36 +52,36 @@ <value value="0x05" name="EC_IO" cname="_ECIO_OSC" /> <value value="0x06" name="H4" cname="_HSPLL_OSC" /> <value value="0x07" name="EXTRC_IO" cname="_RCIO_OSC" /> - </tqmask> - <tqmask name="OSCSEN" value="0x20" > + </mask> + <mask name="OSCSEN" value="0x20" > <value value="0x00" name="On" cname="_OSCS_ON" /> <value value="0x20" name="Off" cname="_OSCS_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2" wmask="0xFF" bvalue="0x0F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x02" > + </mask> + <mask name="BODEN" value="0x02" > <value value="0x00" name="Off" cname="_BOR_OFF" /> <value value="0x02" name="On" cname="_BOR_ON" /> - </tqmask> - <tqmask name="BORV" value="0x0C" > + </mask> + <mask name="BORV" value="0x0C" > <value value="0x00" name="4.5" cname="_BORV_45" /> <value value="0x04" name="4.2" cname="_BORV_42" /> <value value="0x08" name="2.7" cname="_BORV_27" /> <value value="0x0C" name="2.5" cname="_BORV_25" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG3" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG3" wmask="0xFF" bvalue="0x0F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x0E" > + </mask> + <mask name="WDTPS" value="0x0E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -90,26 +90,26 @@ <value value="0x0A" name="1:32" cname="_WDTPS_32" /> <value value="0x0C" name="1:64" cname="_WDTPS_64" /> <value value="0x0E" name="1:128" cname="_WDTPS_128" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG4" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG4" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG5" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG5" wmask="0xFF" bvalue="0x01" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="_CCP2MX_OFF" /> <value value="0x01" name="RC1" cname="_CCP2MX_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG6" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG6" wmask="0xFF" bvalue="0x01" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVR_OFF" /> <value value="0x01" name="On" cname="_STVR_ON" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG7" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG7" wmask="0xFF" bvalue="0x00" /> <!--* Packages *************************************************************--> <package types="pdip" nb_pins="40" > diff --git a/src/devices/pic/xml_data/18C452.xml b/src/devices/pic/xml_data/18C452.xml index 5a6a07c..73e3610 100644 --- a/src/devices/pic/xml_data/18C452.xml +++ b/src/devices/pic/xml_data/18C452.xml @@ -29,21 +29,21 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x007FFF" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x300007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG0" wtqmask="0xFF" bvalue="0xFF" > - <tqmask name="CP" value="0xFF" > + <config offset="0x0" name="CONFIG0" wmask="0xFF" bvalue="0xFF" > + <mask name="CP" value="0xFF" > <value value="0x00" name="All" cname="_CP_ON" /> <value value="0xFF" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1" wtqmask="0xFF" bvalue="0x27" > - <tqmask name="FOSC" value="0x07" > + <config offset="0x1" name="CONFIG1" wmask="0xFF" bvalue="0x27" > + <mask name="FOSC" value="0x07" > <value value="0x00" name="LP" cname="_LP_OSC" /> <value value="0x01" name="XT" cname="_XT_OSC" /> <value value="0x02" name="HS" cname="_HS_OSC" /> @@ -52,36 +52,36 @@ <value value="0x05" name="EC_IO" cname="_ECIO_OSC" /> <value value="0x06" name="H4" cname="_HSPLL_OSC" /> <value value="0x07" name="EXTRC_IO" cname="_RCIO_OSC" /> - </tqmask> - <tqmask name="OSCSEN" value="0x20" > + </mask> + <mask name="OSCSEN" value="0x20" > <value value="0x00" name="On" cname="_OSCS_ON" /> <value value="0x20" name="Off" cname="_OSCS_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2" wmask="0xFF" bvalue="0x0F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x02" > + </mask> + <mask name="BODEN" value="0x02" > <value value="0x00" name="Off" cname="_BOR_OFF" /> <value value="0x02" name="On" cname="_BOR_ON" /> - </tqmask> - <tqmask name="BORV" value="0x0C" > + </mask> + <mask name="BORV" value="0x0C" > <value value="0x00" name="4.5" cname="_BORV_45" /> <value value="0x04" name="4.2" cname="_BORV_42" /> <value value="0x08" name="2.7" cname="_BORV_27" /> <value value="0x0C" name="2.5" cname="_BORV_25" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG3" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG3" wmask="0xFF" bvalue="0x0F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x0E" > + </mask> + <mask name="WDTPS" value="0x0E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -90,26 +90,26 @@ <value value="0x0A" name="1:32" cname="_WDTPS_32" /> <value value="0x0C" name="1:64" cname="_WDTPS_64" /> <value value="0x0E" name="1:128" cname="_WDTPS_128" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG4" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG4" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG5" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG5" wmask="0xFF" bvalue="0x01" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="_CCP2MX_OFF" /> <value value="0x01" name="RC1" cname="_CCP2MX_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG6" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG6" wmask="0xFF" bvalue="0x01" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVR_OFF" /> <value value="0x01" name="On" cname="_STVR_ON" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG7" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG7" wmask="0xFF" bvalue="0x00" /> <!--* Packages *************************************************************--> <package types="pdip" nb_pins="40" > diff --git a/src/devices/pic/xml_data/18C601.xml b/src/devices/pic/xml_data/18C601.xml index 9469902..6d41b1c 100644 --- a/src/devices/pic/xml_data/18C601.xml +++ b/src/devices/pic/xml_data/18C601.xml @@ -27,34 +27,34 @@ <memory name="config" start="0x300000" end="0x300007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x02" > - <tqmask name="FOSC" value="0x03" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x02" > + <mask name="FOSC" value="0x03" > <value value="0x00" name="LP" cname="_LP_OSC" /> <value value="0x01" name="EC_CLKOUT" cname="_EC_OSC" /> <value value="0x02" name="HS" cname="_HS_OSC" /> <value value="0x03" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x41" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x41" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BW" value="0x40" > + </mask> + <mask name="BW" value="0x40" > <value value="0x00" name="8" cname="_BW_8_BIT" /> <value value="0x40" name="16" cname="_BW_16_BIT" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x0E" > + </mask> + <mask name="WDTPS" value="0x0E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -63,25 +63,25 @@ <value value="0x0A" name="1:32" cname="_WDTPS_32" /> <value value="0x0C" name="1:64" cname="_WDTPS_64" /> <value value="0x0E" name="1:128" cname="_WDTPS_128" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x81" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x81" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVR_OFF" /> <value value="0x01" name="On" cname="_STVR_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="0x7F" /> <value value="0x80" name="Off" cname="0xFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> <!--* Packages *************************************************************--> <package types="tqfp" nb_pins="64" > diff --git a/src/devices/pic/xml_data/18C658.xml b/src/devices/pic/xml_data/18C658.xml index 5f115ee..9ca140c 100644 --- a/src/devices/pic/xml_data/18C658.xml +++ b/src/devices/pic/xml_data/18C658.xml @@ -29,21 +29,21 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x007FFF" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x300007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG0" wtqmask="0xFF" bvalue="0xFF" > - <tqmask name="CP" value="0xFF" > + <config offset="0x0" name="CONFIG0" wmask="0xFF" bvalue="0xFF" > + <mask name="CP" value="0xFF" > <value value="0x00" name="All" cname="_CP_ON" /> <value value="0xFF" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1" wtqmask="0xFF" bvalue="0x27" > - <tqmask name="FOSC" value="0x07" > + <config offset="0x1" name="CONFIG1" wmask="0xFF" bvalue="0x27" > + <mask name="FOSC" value="0x07" > <value value="0x00" name="LP" cname="_LP_OSC" /> <value value="0x01" name="XT" cname="_XT_OSC" /> <value value="0x02" name="HS" cname="_HS_OSC" /> @@ -52,36 +52,36 @@ <value value="0x05" name="EC_IO" cname="_ECIO_OSC" /> <value value="0x06" name="H4" cname="_HSPLL_OSC" /> <value value="0x07" name="EXTRC_IO" cname="_RCIO_OSC" /> - </tqmask> - <tqmask name="OSCSEN" value="0x20" > + </mask> + <mask name="OSCSEN" value="0x20" > <value value="0x00" name="On" cname="_OSCS_ON" /> <value value="0x20" name="Off" cname="_OSCS_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2" wmask="0xFF" bvalue="0x0F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x02" > + </mask> + <mask name="BODEN" value="0x02" > <value value="0x00" name="Off" cname="_BOR_OFF" /> <value value="0x02" name="On" cname="_BOR_ON" /> - </tqmask> - <tqmask name="BORV" value="0x0C" > + </mask> + <mask name="BORV" value="0x0C" > <value value="0x00" name="4.5" cname="_BORV_45" /> <value value="0x04" name="4.2" cname="_BORV_42" /> <value value="0x08" name="2.7" cname="_BORV_27" /> <value value="0x0C" name="2.5" cname="_BORV_25" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG3" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG3" wmask="0xFF" bvalue="0x0F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x0E" > + </mask> + <mask name="WDTPS" value="0x0E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -90,21 +90,21 @@ <value value="0x0A" name="1:32" cname="_WDTPS_32" /> <value value="0x0C" name="1:64" cname="_WDTPS_64" /> <value value="0x0E" name="1:128" cname="_WDTPS_128" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG4" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG4" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG5" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x5" name="CONFIG5" wmask="0xFF" bvalue="0x00" /> - <config offset="0x6" name="CONFIG6" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG6" wmask="0xFF" bvalue="0x01" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVR_OFF" /> <value value="0x01" name="On" cname="_STVR_ON" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG7" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG7" wmask="0xFF" bvalue="0x00" /> <!--* Packages *************************************************************--> <package types="tqfp" nb_pins="64" > diff --git a/src/devices/pic/xml_data/18C801.xml b/src/devices/pic/xml_data/18C801.xml index 186230c..3e067ad 100644 --- a/src/devices/pic/xml_data/18C801.xml +++ b/src/devices/pic/xml_data/18C801.xml @@ -27,34 +27,34 @@ <memory name="config" start="0x300000" end="0x300007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x02" > - <tqmask name="FOSC" value="0x03" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x02" > + <mask name="FOSC" value="0x03" > <value value="0x00" name="LP" cname="_LP_OSC" /> <value value="0x01" name="EC_CLKOUT" cname="_EC_OSC" /> <value value="0x02" name="HS" cname="_HS_OSC" /> <value value="0x03" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x41" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x41" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BW" value="0x40" > + </mask> + <mask name="BW" value="0x40" > <value value="0x00" name="8" cname="_BW_8_BIT" /> <value value="0x40" name="16" cname="_BW_16_BIT" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x0E" > + </mask> + <mask name="WDTPS" value="0x0E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -63,25 +63,25 @@ <value value="0x0A" name="1:32" cname="_WDTPS_32" /> <value value="0x0C" name="1:64" cname="_WDTPS_64" /> <value value="0x0E" name="1:128" cname="_WDTPS_128" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x81" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x81" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVR_OFF" /> <value value="0x01" name="On" cname="_STVR_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="0x7F" /> <value value="0x80" name="Off" cname="0xFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> <!--* Packages *************************************************************--> <package types="tqfp" nb_pins="80" > diff --git a/src/devices/pic/xml_data/18C858.xml b/src/devices/pic/xml_data/18C858.xml index 33eb056..7ce8087 100644 --- a/src/devices/pic/xml_data/18C858.xml +++ b/src/devices/pic/xml_data/18C858.xml @@ -29,21 +29,21 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x007FFF" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x300007" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG0" wtqmask="0xFF" bvalue="0xFF" > - <tqmask name="CP" value="0xFF" > + <config offset="0x0" name="CONFIG0" wmask="0xFF" bvalue="0xFF" > + <mask name="CP" value="0xFF" > <value value="0x00" name="All" cname="_CP_ON" /> <value value="0xFF" name="Off" cname="_CP_OFF" /> <value value="default" name="invalid" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1" wtqmask="0xFF" bvalue="0x27" > - <tqmask name="FOSC" value="0x07" > + <config offset="0x1" name="CONFIG1" wmask="0xFF" bvalue="0x27" > + <mask name="FOSC" value="0x07" > <value value="0x00" name="LP" cname="_LP_OSC" /> <value value="0x01" name="XT" cname="_XT_OSC" /> <value value="0x02" name="HS" cname="_HS_OSC" /> @@ -52,36 +52,36 @@ <value value="0x05" name="EC_IO" cname="_ECIO_OSC" /> <value value="0x06" name="H4" cname="_HSPLL_OSC" /> <value value="0x07" name="EXTRC_IO" cname="_RCIO_OSC" /> - </tqmask> - <tqmask name="OSCSEN" value="0x20" > + </mask> + <mask name="OSCSEN" value="0x20" > <value value="0x00" name="On" cname="_OSCS_ON" /> <value value="0x20" name="Off" cname="_OSCS_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2" wmask="0xFF" bvalue="0x0F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x02" > + </mask> + <mask name="BODEN" value="0x02" > <value value="0x00" name="Off" cname="_BOR_OFF" /> <value value="0x02" name="On" cname="_BOR_ON" /> - </tqmask> - <tqmask name="BORV" value="0x0C" > + </mask> + <mask name="BORV" value="0x0C" > <value value="0x00" name="4.5" cname="_BORV_45" /> <value value="0x04" name="4.2" cname="_BORV_42" /> <value value="0x08" name="2.7" cname="_BORV_27" /> <value value="0x0C" name="2.5" cname="_BORV_25" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG3" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG3" wmask="0xFF" bvalue="0x0F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x0E" > + </mask> + <mask name="WDTPS" value="0x0E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -90,21 +90,21 @@ <value value="0x0A" name="1:32" cname="_WDTPS_32" /> <value value="0x0C" name="1:64" cname="_WDTPS_64" /> <value value="0x0E" name="1:128" cname="_WDTPS_128" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG4" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG4" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG5" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x5" name="CONFIG5" wmask="0xFF" bvalue="0x00" /> - <config offset="0x6" name="CONFIG6" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG6" wmask="0xFF" bvalue="0x01" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVR_OFF" /> <value value="0x01" name="On" cname="_STVR_ON" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG7" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG7" wmask="0xFF" bvalue="0x00" /> <!--* Packages *************************************************************--> <package types="tqfp" nb_pins="80" > diff --git a/src/devices/pic/xml_data/18F1220.xml b/src/devices/pic/xml_data/18F1220.xml index 1cd826b..e46f7f0 100644 --- a/src/devices/pic/xml_data/18F1220.xml +++ b/src/devices/pic/xml_data/18F1220.xml @@ -34,17 +34,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x000FFF" word_write_align="4" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0xCF" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0xCF" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_LP_OSC" sdcc_cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_XT_OSC" sdcc_cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_HS_OSC" sdcc_cname="_OSC_HS" /> @@ -55,40 +55,40 @@ <value value="0x07" name="EXTRC_IO" cname="_RCIO_OSC" sdcc_cname="_OSC_EXT_Port_on_RA6" /> <value value="0x08" name="INTRC_IO" cname="_INTIO2_OSC" sdcc_cname="_OSC_INT_Port_on_RA6_Port_on_RA7" /> <value value="0x09" name="INTRC_CLKOUT" cname="_INTIO1_OSC" sdcc_cname="_OSC_INT_CLKOUT_on_RA6_Port_on_RA7" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FSCM_OFF" sdcc_cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FSCM_ON" sdcc_cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" sdcc_cname="_PUT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" sdcc_cname="_PUT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x02" > + </mask> + <mask name="BODEN" value="0x02" > <value value="0x00" name="Off" cname="_BOR_OFF" sdcc_cname="_BODEN_OFF" /> <value value="0x02" name="On" cname="_BOR_ON" sdcc_cname="_BODEN_ON" /> - </tqmask> - <tqmask name="BORV" value="0x0C" > + </mask> + <mask name="BORV" value="0x0C" > <value value="0x00" name="4.5" cname="_BORV_45" sdcc_cname="_BODENV_4_5V" /> <value value="0x04" name="4.2" cname="_BORV_42" sdcc_cname="_BODENV_4_2V" /> <value value="0x08" name="2.7" cname="_BORV_27" sdcc_cname="_BODENV_2_7V" /> <value value="0x0C" name="2.0" cname="_BORV_20" sdcc_cname="_BODENV_2_0V" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" sdcc_cname="_WDT_DISABLED_CONTROLLED" /> <value value="0x01" name="On" cname="_WDT_ON" sdcc_cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" sdcc_cname="_WDTPS_1_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" sdcc_cname="_WDTPS_1_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" sdcc_cname="_WDTPS_1_4" /> @@ -105,99 +105,99 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8K" sdcc_cname="_WDTPS_1_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16K" sdcc_cname="_WDTPS_1_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32K" sdcc_cname="_WDTPS_1_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x80" > - <tqmask name="MCLRE" value="0x80" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x80" > + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" sdcc_cname="_MCLRE_MCLR_disabled_RA5_input_en" /> <value value="0x80" name="External" cname="_MCLRE_ON" sdcc_cname="_MCLRE_MCLR_enabled_RA5_input_dis" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVR_OFF" /> <value value="0x01" name="On" cname="_STVR_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" sdcc_cname="_BACKBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" sdcc_cname="_BACKBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0200:07FF" cname="_CP0_ON" sdcc_cname="_CP_0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="0800:0FFF" cname="_CP1_ON" sdcc_cname="_CP_1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0200:07FF" cname="_WRT0_ON" sdcc_cname="_WRT_0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="0800:0FFF" cname="_WRT1_ON" sdcc_cname="_WRT_1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0200:07FF" cname="_EBTR0_ON" sdcc_cname="_EBTR_0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="0800:0FFF" cname="_EBTR1_ON" sdcc_cname="_EBTR_1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F1230.xml b/src/devices/pic/xml_data/18F1230.xml index c84d79f..043687a 100644 --- a/src/devices/pic/xml_data/18F1230.xml +++ b/src/devices/pic/xml_data/18F1230.xml @@ -39,17 +39,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x000FFF" word_write_align="4" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x00007F" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -60,42 +60,42 @@ <value value="0x08" name="INTRC_IO" cname="_OSC_INTIO2" /> <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO1" /> <value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOR_OFF" /> <value value="0x02" name="Software" cname="_BOR_SBORENCTRL" /> <value value="0x04" name="On_run" cname="_BOR_BOACTIVE" /> <value value="0x06" name="On" cname="_BOR_BOHW" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -112,124 +112,124 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x0E" > - <tqmask name="PWMPIN" value="0x02" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x0E" > + <mask name="PWMPIN" value="0x02" > <value value="0x00" name="On" cname="_PWMPIN_ON" /> <value value="0x02" name="Off" cname="_PWMPIN_OFF" /> - </tqmask> - <tqmask name="LPOL" value="0x04" > + </mask> + <mask name="LPOL" value="0x04" > <value value="0x00" name="low" cname="_LPOL_LOW" /> <value value="0x04" name="high" cname="_LPOL_HIGH" /> - </tqmask> - <tqmask name="HPOL" value="0x08" > + </mask> + <mask name="HPOL" value="0x08" > <value value="0x00" name="low" cname="_HPOL_LOW" /> <value value="0x08" name="high" cname="_HPOL_HIGH" /> - </tqmask> + </mask> </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x81" > - <tqmask name="FLTAMX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x81" > + <mask name="FLTAMX" value="0x01" > <value value="0x00" name="RA7" cname="_FLTAMX_RA7" /> <value value="0x01" name="RA5" cname="_FLTAMX_RA5" /> - </tqmask> - <tqmask name="T1OSCMX" value="0x08" > + </mask> + <mask name="T1OSCMX" value="0x08" > <value value="0x00" name="RB2" cname="_T1OSCMX_HIGH" /> <value value="0x08" name="RA6" cname="_T1OSCMX_LOW" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x81" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x81" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="BBSIZ" value="0x30" > + </mask> + <mask name="BBSIZ" value="0x30" > <value value="0x00" name="256" cname="_BBSIZ_BB256" /> <value value="default" name="512" cname="_BBSIZ_BB512" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0200/0400:07FF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="0800:0FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="All" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0200/0400:07FF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="0800:0FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="All" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0200/0400:07FF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="0800:0FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="All" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F1320.xml b/src/devices/pic/xml_data/18F1320.xml index 8cee921..d4dd214 100644 --- a/src/devices/pic/xml_data/18F1320.xml +++ b/src/devices/pic/xml_data/18F1320.xml @@ -34,17 +34,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x001FFF" word_write_align="4" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0xCF" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0xCF" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_LP_OSC" /> <value value="0x01" name="XT" cname="_XT_OSC" /> <value value="0x02" name="HS" cname="_HS_OSC" /> @@ -56,40 +56,40 @@ <value value="0x08" name="INTRC_IO" cname="_INTIO2_OSC" /> <value value="0x09" name="INTRC_CLKOUT" cname="_INTIO1_OSC" /> <value value="default" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FSCM_OFF" /> <value value="0x40" name="On" cname="_FSCM_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x02" > + </mask> + <mask name="BODEN" value="0x02" > <value value="0x00" name="Off" cname="_BOR_OFF" /> <value value="0x02" name="On" cname="_BOR_ON" /> - </tqmask> - <tqmask name="BORV" value="0x0C" > + </mask> + <mask name="BORV" value="0x0C" > <value value="0x00" name="4.5" cname="_BORV_45" /> <value value="0x04" name="4.2" cname="_BORV_42" /> <value value="0x08" name="2.7" cname="_BORV_27" /> <value value="0x0C" name="2.0" cname="_BORV_20" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -106,99 +106,99 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8K" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16K" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32K" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x80" > - <tqmask name="MCLRE" value="0x80" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x80" > + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVR_OFF" /> <value value="0x01" name="On" cname="_STVR_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0200:0FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="1000:1FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0200:0FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="1000:1FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0200:0FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="1000:1FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F1330.xml b/src/devices/pic/xml_data/18F1330.xml index fb11bbb..14130ce 100644 --- a/src/devices/pic/xml_data/18F1330.xml +++ b/src/devices/pic/xml_data/18F1330.xml @@ -40,17 +40,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x001FFF" word_write_align="4" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x00007F" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -61,42 +61,42 @@ <value value="0x08" name="INTRC_IO" cname="_OSC_INTIO2" /> <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO1" /> <value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOR_OFF" /> <value value="0x02" name="Software" cname="_BOR_SBORENCTRL" /> <value value="0x04" name="On_run" cname="_BOR_BOACTIVE" /> <value value="0x06" name="On" cname="_BOR_BOHW" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -113,125 +113,125 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x0E" > - <tqmask name="PWMPIN" value="0x02" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x0E" > + <mask name="PWMPIN" value="0x02" > <value value="0x00" name="On" cname="_PWMPIN_ON" /> <value value="0x02" name="Off" cname="_PWMPIN_OFF" /> - </tqmask> - <tqmask name="LPOL" value="0x04" > + </mask> + <mask name="LPOL" value="0x04" > <value value="0x00" name="low" cname="_LPOL_LOW" /> <value value="0x04" name="high" cname="_LPOL_HIGH" /> - </tqmask> - <tqmask name="HPOL" value="0x08" > + </mask> + <mask name="HPOL" value="0x08" > <value value="0x00" name="low" cname="_HPOL_LOW" /> <value value="0x08" name="high" cname="_HPOL_HIGH" /> - </tqmask> + </mask> </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x81" > - <tqmask name="FLTAMX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x81" > + <mask name="FLTAMX" value="0x01" > <value value="0x00" name="RA7" cname="_FLTAMX_RA7" /> <value value="0x01" name="RA5" cname="_FLTAMX_RA5" /> - </tqmask> - <tqmask name="T1OSCMX" value="0x08" > + </mask> + <mask name="T1OSCMX" value="0x08" > <value value="0x00" name="RB2" cname="_T1OSCMX_HIGH" /> <value value="0x08" name="RA6" cname="_T1OSCMX_LOW" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x81" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x81" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="BBSIZ" value="0x30" > + </mask> + <mask name="BBSIZ" value="0x30" > <value value="0x00" name="256" cname="_BBSIZ_BB256" /> <value value="0x10" name="512" cname="_BBSIZ_BB512" /> <value value="default" name="1024" cname="_BBSIZ_BB1K" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0200/0400/0800:0FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="1000:1FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="All" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0200/0400/0800:0FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="1000:1FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="All" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0200/0400/0800:0FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="1000:1FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="All" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F2220.xml b/src/devices/pic/xml_data/18F2220.xml index 7ea415b..43f6fbc 100644 --- a/src/devices/pic/xml_data/18F2220.xml +++ b/src/devices/pic/xml_data/18F2220.xml @@ -35,17 +35,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x000FFF" word_write_align="4" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0xCF" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0xCF" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_LP_OSC" sdcc_cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_XT_OSC" sdcc_cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_HS_OSC" sdcc_cname="_OSC_HS" /> @@ -56,40 +56,40 @@ <value value="0x07" name="EXTRC_IO" cname="_RCIO_OSC" sdcc_cname="_OSC_EXT_Port_on_RA6" /> <value value="0x08" name="INTRC_IO" cname="_INTIO2_OSC" sdcc_cname="_OSC_INT_Port_on_RA6_Port_on_RA7" /> <value value="0x09" name="INTRC_CLKOUT" cname="_INTIO1_OSC" sdcc_cname="_OSC_INT_CLKOUT_on_RA6_Port_on_RA7" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FSCM_OFF" sdcc_cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FSCM_ON" sdcc_cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" sdcc_cname="_PUT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" sdcc_cname="_PUT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x02" > + </mask> + <mask name="BODEN" value="0x02" > <value value="0x00" name="Off" cname="_BOR_OFF" sdcc_cname="_BODEN_OFF" /> <value value="0x02" name="On" cname="_BOR_ON" sdcc_cname="_BODEN_ON" /> - </tqmask> - <tqmask name="BORV" value="0x0C" > + </mask> + <mask name="BORV" value="0x0C" > <value value="0x00" name="4.5" cname="_BORV_45" sdcc_cname="_BODENV_4_5V" /> <value value="0x04" name="4.2" cname="_BORV_42" sdcc_cname="_BODENV_4_2V" /> <value value="0x08" name="2.7" cname="_BORV_27" sdcc_cname="_BODENV_2_7V" /> <value value="0x0C" name="2.0" cname="_BORV_20" sdcc_cname="_BODENV_2_0V" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" sdcc_cname="_WDT_DISABLED_CONTROLLED" /> <value value="0x01" name="On" cname="_WDT_ON" sdcc_cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" sdcc_cname="_WDTPS_1_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" sdcc_cname="_WDTPS_1_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" sdcc_cname="_WDTPS_1_4" /> @@ -106,107 +106,107 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8K" sdcc_cname="_WDTPS_1_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16K" sdcc_cname="_WDTPS_1_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32K" sdcc_cname="_WDTPS_1_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="_CCP2MX_B3" ecnames="_CCP2MX_OFF" sdcc_cname="_CCP2MUX_RB3" /> <value value="0x01" name="RC1" cname="_CCP2MX_C1" ecnames="_CCP2MX_ON" sdcc_cname="_CCP2MUX_RC1" /> - </tqmask> - <tqmask name="PBADEN" value="0x02" > + </mask> + <mask name="PBADEN" value="0x02" > <value value="0x00" name="digital" cname="_PBAD_DIG" sdcc_cname="_PBADEN_PORTB_4_0__digital_I_O_on_REST" /> <value value="0x02" name="analog" cname="_PBAD_ANA" sdcc_cname="_PBADEN_PORTB_4_0__analog_inputs_on_RSET" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" sdcc_cname="_MCLRE_MCLR_Disabled_RE3_Enabled" /> <value value="0x80" name="External" cname="_MCLRE_ON" sdcc_cname="_MCLRE_MCLR_Enabled_RE3_Disabled" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVR_OFF" /> <value value="0x01" name="On" cname="_STVR_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" sdcc_cname="_BACKBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" sdcc_cname="_BACKBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0200:07FF" cname="_CP0_ON" sdcc_cname="_CP_0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="0800:0FFF" cname="_CP1_ON" sdcc_cname="_CP_1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0200:07FF" cname="_WRT0_ON" sdcc_cname="_WRT_0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="0800:0FFF" cname="_WRT1_ON" sdcc_cname="_WRT_1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0200:07FF" cname="_EBTR0_ON" sdcc_cname="_EBTR_0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="0800:0FFF" cname="_EBTR1_ON" sdcc_cname="_EBTR_1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F2221.xml b/src/devices/pic/xml_data/18F2221.xml index b3436d5..f2a58d6 100644 --- a/src/devices/pic/xml_data/18F2221.xml +++ b/src/devices/pic/xml_data/18F2221.xml @@ -27,17 +27,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x000FFF" word_write_align="4" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -48,42 +48,42 @@ <value value="0x07" name="EXTRC_IO" cname="_OSC_RCIO" /> <value value="0x08" name="INTRC_IO" cname="_OSC_INTIO2" /> <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO1" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOR_OFF" /> <value value="0x02" name="Software" cname="_BOR_SOFT" /> <value value="0x04" name="On_run" cname="_BOR_NOSLP" /> <value value="0x06" name="On" cname="_BOR_ON" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -100,119 +100,119 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x87" ctqmask="0x01" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x87" cmask="0x01" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="_CCP2MX_RB3" /> <value value="0x01" name="RC1" cname="_CCP2MX_RC1" /> - </tqmask> - <tqmask name="PBADEN" value="0x02" > + </mask> + <mask name="PBADEN" value="0x02" > <value value="0x00" name="digital" cname="_PBADEN_DIG" /> <value value="0x02" name="analog" cname="_PBADEN_ANA" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x30" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x30" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="BBSIZ" value="0x30" > + </mask> + <mask name="BBSIZ" value="0x30" > <value value="0x00" name="256" cname="_BBSIZ_BB256" /> <value value="default" name="512" cname="_BBSIZ_BB512" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="200/400:7FF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="0800:0FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="All" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0200/0400:07FF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="0800:0FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="All" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0200/0400:07FF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="0800:0FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="All" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F2320.xml b/src/devices/pic/xml_data/18F2320.xml index d17d96a..80e8250 100644 --- a/src/devices/pic/xml_data/18F2320.xml +++ b/src/devices/pic/xml_data/18F2320.xml @@ -37,17 +37,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x001FFF" word_write_align="4" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0xCF" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0xCF" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_LP_OSC" /> <value value="0x01" name="XT" cname="_XT_OSC" /> <value value="0x02" name="HS" cname="_HS_OSC" /> @@ -59,40 +59,40 @@ <value value="0x08" name="INTRC_IO" cname="_INTIO2_OSC" /> <value value="0x09" name="INTRC_CLKOUT" cname="_INTIO1_OSC" /> <value value="default" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FSCM_OFF" /> <value value="0x40" name="On" cname="_FSCM_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x02" > + </mask> + <mask name="BODEN" value="0x02" > <value value="0x00" name="Off" cname="_BOR_OFF" /> <value value="0x02" name="On" cname="_BOR_ON" /> - </tqmask> - <tqmask name="BORV" value="0x0C" > + </mask> + <mask name="BORV" value="0x0C" > <value value="0x00" name="4.5" cname="_BORV_45" /> <value value="0x04" name="4.2" cname="_BORV_42" /> <value value="0x08" name="2.7" cname="_BORV_27" /> <value value="0x0C" name="2.0" cname="_BORV_20" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -109,131 +109,131 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8K" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16K" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32K" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="_CCP2MX_B3" ecnames="_CCP2MX_OFF" /> <value value="0x01" name="RC1" cname="_CCP2MX_C1" ecnames="_CCP2MX_ON" /> - </tqmask> - <tqmask name="PBADEN" value="0x02" > + </mask> + <mask name="PBADEN" value="0x02" > <value value="0x00" name="digital" cname="_PBAD_DIG" /> <value value="0x02" name="analog" cname="_PBAD_ANA" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVR_OFF" /> <value value="0x01" name="On" cname="_STVR_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0200:07FF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="0800:0FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="1000:17FF" cname="_CP2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" /> - </tqmask> - <tqmask name="CP_3" value="0x08" > + </mask> + <mask name="CP_3" value="0x08" > <value value="0x00" name="1800:1FFF" cname="_CP3_ON" /> <value value="0x08" name="Off" cname="_CP3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0200:07FF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="0800:0FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="1000:17FF" cname="_WRT2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" /> - </tqmask> - <tqmask name="WRT_3" value="0x08" > + </mask> + <mask name="WRT_3" value="0x08" > <value value="0x00" name="1800:1FFF" cname="_WRT3_ON" /> <value value="0x08" name="Off" cname="_WRT3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0200:07FF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="0800:0FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="1000:17FF" cname="_EBTR2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" /> - </tqmask> - <tqmask name="EBTR_3" value="0x08" > + </mask> + <mask name="EBTR_3" value="0x08" > <value value="0x00" name="1800:1FFF" cname="_EBTR3_ON" /> <value value="0x08" name="Off" cname="_EBTR3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F2321.xml b/src/devices/pic/xml_data/18F2321.xml index f00f7dc..a016fc7 100644 --- a/src/devices/pic/xml_data/18F2321.xml +++ b/src/devices/pic/xml_data/18F2321.xml @@ -27,17 +27,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x001FFF" word_write_align="4" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -48,42 +48,42 @@ <value value="0x08" name="INTRC_IO" cname="_OSC_INTIO2" /> <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO1" /> <value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOR_OFF" /> <value value="0x02" name="Software" cname="_BOR_SOFT" /> <value value="0x04" name="On_run" cname="_BOR_NOSLP" /> <value value="0x06" name="On" cname="_BOR_ON" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -100,120 +100,120 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x87" ctqmask="0x01" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x87" cmask="0x01" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="_CCP2MX_RB3" /> <value value="0x01" name="RC1" cname="_CCP2MX_RC1" /> - </tqmask> - <tqmask name="PBADEN" value="0x02" > + </mask> + <mask name="PBADEN" value="0x02" > <value value="0x00" name="digital" cname="_PBADEN_DIG" /> <value value="0x02" name="analog" cname="_PBADEN_ANA" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x30" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x30" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="BBSIZ" value="0x30" > + </mask> + <mask name="BBSIZ" value="0x30" > <value value="0x00" name="256" cname="_BBSIZ_BB256" /> <value value="0x10" name="512" cname="_BBSIZ_BB512" /> <value value="default" name="1024" cname="_BBSIZ_BB1K" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0200/0400/0800:0FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="1000:1FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="All" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0200/0400/0800:0FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="1000:1FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="All" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0200/0400/0800:0FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="1000:1FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="All" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F2331.xml b/src/devices/pic/xml_data/18F2331.xml index 7f73a7d..46a8872 100644 --- a/src/devices/pic/xml_data/18F2331.xml +++ b/src/devices/pic/xml_data/18F2331.xml @@ -34,17 +34,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x001FFF" word_write_align="4" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0xCF" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0xCF" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -55,40 +55,40 @@ <value value="0x08" name="INTRC_IO" cname="_OSC_IRCIO" /> <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_IRC" /> <value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRTEN_ON" /> <value value="0x01" name="Off" cname="_PWRTEN_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x02" > + </mask> + <mask name="BODEN" value="0x02" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="On" cname="_BOREN_ON" /> - </tqmask> - <tqmask name="BORV" value="0x0C" > + </mask> + <mask name="BORV" value="0x0C" > <value value="0x00" name="4.5" cname="_BORV_45" /> <value value="0x04" name="4.2" cname="_BORV_42" /> <value value="0x08" name="2.7" cname="_BORV_27" /> <value value="0x0C" name="2.0" cname="_BORV_20" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x3F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x3F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDTEN_OFF" /> <value value="0x01" name="On" cname="_WDTEN_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDPS_1" /> <value value="0x02" name="1:2" cname="_WDPS_2" /> <value value="0x04" name="1:4" cname="_WDPS_4" /> @@ -105,120 +105,120 @@ <value value="0x1A" name="1:8192" cname="_WDPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDPS_32768" /> - </tqmask> - <tqmask name="WINEN" value="0x20" > + </mask> + <mask name="WINEN" value="0x20" > <value value="0x00" name="On" cname="_WINEN_ON" /> <value value="0x20" name="Off" cname="_WINEN_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x3C" > - <tqmask name="PWMPIN" value="0x04" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x3C" > + <mask name="PWMPIN" value="0x04" > <value value="0x00" name="On" cname="_PWMPIN_ON" /> <value value="0x04" name="Off" cname="_PWMPIN_OFF" /> - </tqmask> - <tqmask name="LPOL" value="0x08" > + </mask> + <mask name="LPOL" value="0x08" > <value value="0x00" name="low" cname="_LPOL_LOW" /> <value value="0x08" name="high" cname="_LPOL_HIGH" /> - </tqmask> - <tqmask name="HPOL" value="0x10" > + </mask> + <mask name="HPOL" value="0x10" > <value value="0x00" name="low" cname="_HPOL_LOW" /> <value value="0x10" name="high" cname="_HPOL_HIGH" /> - </tqmask> - <tqmask name="T1OSCMX" value="0x20" > + </mask> + <mask name="T1OSCMX" value="0x20" > <value value="0x00" name="Legacy" cname="_T1OSCMX_OFF" /> <value value="0x20" name="Low Power" cname="_T1OSCMX_ON" /> - </tqmask> + </mask> </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x9D" > - <tqmask name="MCLRE" value="0x80" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x9D" > + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0200:0FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="1000:1FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0200:0FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="1000:1FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0200:0FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="1000:1FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F2410.xml b/src/devices/pic/xml_data/18F2410.xml index 76968f8..15d6179 100644 --- a/src/devices/pic/xml_data/18F2410.xml +++ b/src/devices/pic/xml_data/18F2410.xml @@ -27,16 +27,16 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x003FFF" word_write_align="16" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -47,42 +47,42 @@ <value value="0x08" name="INTRC_IO" cname="_OSC_INTIO67" /> <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" /> <value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="Software" cname="_BOREN_ON" /> <value value="0x04" name="On_run" cname="_BOREN_NOSLP" /> <value value="0x06" name="On" cname="_BOREN_SBORDIS" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -99,107 +99,107 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" /> <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" /> - </tqmask> - <tqmask name="PBADEN" value="0x02" > + </mask> + <mask name="PBADEN" value="0x02" > <value value="0x00" name="digital" cname="_PBADEN_OFF" /> <value value="0x02" name="analog" cname="_PBADEN_ON" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x40" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x60" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x60" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F242.xml b/src/devices/pic/xml_data/18F242.xml index 8588203..d09dd83 100644 --- a/src/devices/pic/xml_data/18F242.xml +++ b/src/devices/pic/xml_data/18F242.xml @@ -34,17 +34,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x003FFF" word_write_align="4" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" > - <tqmask name="FOSC" value="0x07" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" > + <mask name="FOSC" value="0x07" > <value value="0x00" name="LP" cname="_LP_OSC" sdcc_cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_XT_OSC" sdcc_cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_HS_OSC" sdcc_cname="_OSC_HS" /> @@ -53,36 +53,36 @@ <value value="0x05" name="EC_IO" cname="_ECIO_OSC" sdcc_cname="_OSC_EC_OSC2_RA6" /> <value value="0x06" name="H4" cname="_HSPLL_OSC" sdcc_cname="_OSC_HS_PLL" /> <value value="0x07" name="EXTRC_IO" cname="_RCIO_OSC" sdcc_cname="_OSC_RC_OSC2" /> - </tqmask> - <tqmask name="OSCSEN" value="0x20" > + </mask> + <mask name="OSCSEN" value="0x20" > <value value="0x00" name="On" cname="_OSCS_ON" /> <value value="0x20" name="Off" cname="_OSCS_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" sdcc_cname="_PUT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" sdcc_cname="_PUT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x02" > + </mask> + <mask name="BODEN" value="0x02" > <value value="0x00" name="Off" cname="_BOR_OFF" sdcc_cname="_BODEN_OFF" /> <value value="0x02" name="On" cname="_BOR_ON" sdcc_cname="_BODEN_ON" /> - </tqmask> - <tqmask name="BORV" value="0x0C" > + </mask> + <mask name="BORV" value="0x0C" > <value value="0x00" name="4.5" cname="_BORV_45" sdcc_cname="_BODENV_4_5V" /> <value value="0x04" name="4.2" cname="_BORV_42" sdcc_cname="_BODENV_4_2V" /> <value value="0x08" name="2.7" cname="_BORV_27" sdcc_cname="_BODENV_2_7V" /> <value value="0x0C" name="2.0" cname="_BORV_20" sdcc_cname="_BODENV_2_0V" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x0E" > + </mask> + <mask name="WDTPS" value="0x0E" > <value value="0x00" name="1:1" cname="_WDTPS_1" sdcc_cname="_WDTPS_1_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" sdcc_cname="_WDTPS_1_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" sdcc_cname="_WDTPS_1_4" /> @@ -91,99 +91,99 @@ <value value="0x0A" name="1:32" cname="_WDTPS_32" sdcc_cname="_WDTPS_1_32" /> <value value="0x0C" name="1:64" cname="_WDTPS_64" sdcc_cname="_WDTPS_1_64" /> <value value="0x0E" name="1:128" cname="_WDTPS_128" sdcc_cname="_WDTPS_1_128" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="_CCP2MX_OFF" sdcc_cname="_CCP2MUX_RB3" /> <value value="0x01" name="RC1" cname="_CCP2MX_ON" sdcc_cname="_CCP2MUX_RC1" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVR_OFF" /> <value value="0x01" name="On" cname="_STVR_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" sdcc_cname="_BACKBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" sdcc_cname="_BACKBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" icnames="_CP2_OFF _CP2_ON _CP3_OFF _CP3_ON" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" icnames="_CP2_OFF _CP2_ON _CP3_OFF _CP3_ON" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0200:1FFF" cname="_CP0_ON" sdcc_cname="_CP_0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_CP1_ON" sdcc_cname="_CP_1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" icnames="_WRT2_OFF _WRT2_ON _WRT3_OFF _WRT3_ON" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" icnames="_WRT2_OFF _WRT2_ON _WRT3_OFF _WRT3_ON" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0200:1FFF" cname="_WRT0_ON" sdcc_cname="_WRT_0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_WRT1_ON" sdcc_cname="_WRT_1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" icnames="_EBTR2_OFF _EBTR2_ON _EBTR3_OFF _EBTR3_ON" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" icnames="_EBTR2_OFF _EBTR2_ON _EBTR3_OFF _EBTR3_ON" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0200:1FFF" cname="_EBTR0_ON" sdcc_cname="_EBTR_0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" sdcc_cname="_EBTR_1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F2420.xml b/src/devices/pic/xml_data/18F2420.xml index d50dd2a..aba9ace 100644 --- a/src/devices/pic/xml_data/18F2420.xml +++ b/src/devices/pic/xml_data/18F2420.xml @@ -27,17 +27,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x003FFF" word_write_align="16" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -48,42 +48,42 @@ <value value="0x08" name="INTRC_IO" cname="_OSC_INTIO67" /> <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" /> <value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="Software" cname="_BOREN_ON" /> <value value="0x04" name="On_run" cname="_BOREN_NOSLP" /> <value value="0x06" name="On" cname="_BOREN_SBORDIS" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -100,115 +100,115 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" /> <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" /> - </tqmask> - <tqmask name="PBADEN" value="0x02" > + </mask> + <mask name="PBADEN" value="0x02" > <value value="0x00" name="digital" cname="_PBADEN_OFF" /> <value value="0x02" name="analog" cname="_PBADEN_ON" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" ctqmask="0x80" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" cmask="0x80" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" ctqmask="0x80" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" cmask="0x80" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F2423.xml b/src/devices/pic/xml_data/18F2423.xml index 29ff971..0905f18 100644 --- a/src/devices/pic/xml_data/18F2423.xml +++ b/src/devices/pic/xml_data/18F2423.xml @@ -24,17 +24,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x003FFF" word_write_align="16" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -45,42 +45,42 @@ <value value="0x08" name="INTRC_IO" cname="_OSC_INTIO67" /> <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" /> <value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="Software" cname="_BOREN_ON" /> <value value="0x04" name="On_run" cname="_BOREN_NOSLP" /> <value value="0x06" name="On" cname="_BOREN_SBORDIS" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -97,115 +97,115 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" /> <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" /> - </tqmask> - <tqmask name="PBADEN" value="0x02" > + </mask> + <mask name="PBADEN" value="0x02" > <value value="0x00" name="digital" cname="_PBADEN_OFF" /> <value value="0x02" name="analog" cname="_PBADEN_ON" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" ctqmask="0x80" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" cmask="0x80" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" ctqmask="0x80" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" cmask="0x80" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F2431.xml b/src/devices/pic/xml_data/18F2431.xml index f162ef2..f898f99 100644 --- a/src/devices/pic/xml_data/18F2431.xml +++ b/src/devices/pic/xml_data/18F2431.xml @@ -35,17 +35,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x003FFF" word_write_align="4" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0xCF" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0xCF" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -56,40 +56,40 @@ <value value="0x08" name="INTRC_IO" cname="_OSC_IRCIO" /> <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_IRC" /> <value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRTEN_ON" /> <value value="0x01" name="Off" cname="_PWRTEN_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x02" > + </mask> + <mask name="BODEN" value="0x02" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="On" cname="_BOREN_ON" /> - </tqmask> - <tqmask name="BORV" value="0x0C" > + </mask> + <mask name="BORV" value="0x0C" > <value value="0x00" name="4.5" cname="_BORV_45" /> <value value="0x04" name="4.2" cname="_BORV_42" /> <value value="0x08" name="2.7" cname="_BORV_27" /> <value value="0x0C" name="2.0" cname="_BORV_20" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x3F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x3F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDTEN_OFF" /> <value value="0x01" name="On" cname="_WDTEN_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDPS_1" /> <value value="0x02" name="1:2" cname="_WDPS_2" /> <value value="0x04" name="1:4" cname="_WDPS_4" /> @@ -106,120 +106,120 @@ <value value="0x1A" name="1:8192" cname="_WDPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDPS_32768" /> - </tqmask> - <tqmask name="WINEN" value="0x20" > + </mask> + <mask name="WINEN" value="0x20" > <value value="0x00" name="On" cname="_WINEN_ON" /> <value value="0x20" name="Off" cname="_WINEN_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x3C" > - <tqmask name="PWMPIN" value="0x04" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x3C" > + <mask name="PWMPIN" value="0x04" > <value value="0x00" name="On" cname="_PWMPIN_ON" /> <value value="0x04" name="Off" cname="_PWMPIN_OFF" /> - </tqmask> - <tqmask name="LPOL" value="0x08" > + </mask> + <mask name="LPOL" value="0x08" > <value value="0x00" name="low" cname="_LPOL_LOW" /> <value value="0x08" name="high" cname="_LPOL_HIGH" /> - </tqmask> - <tqmask name="HPOL" value="0x10" > + </mask> + <mask name="HPOL" value="0x10" > <value value="0x00" name="low" cname="_HPOL_LOW" /> <value value="0x10" name="high" cname="_HPOL_HIGH" /> - </tqmask> - <tqmask name="T1OSCMX" value="0x20" > + </mask> + <mask name="T1OSCMX" value="0x20" > <value value="0x00" name="Legacy" cname="_T1OSCMX_OFF" /> <value value="0x20" name="Low Power" cname="_T1OSCMX_ON" /> - </tqmask> + </mask> </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x9D" > - <tqmask name="MCLRE" value="0x80" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x9D" > + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0200:0FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="1000:1FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0200:0FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="1000:1FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0200:0FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="1000:1FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F2439.xml b/src/devices/pic/xml_data/18F2439.xml index edc3696..ad389e3 100644 --- a/src/devices/pic/xml_data/18F2439.xml +++ b/src/devices/pic/xml_data/18F2439.xml @@ -35,48 +35,48 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x003FFF" word_write_align="4" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" > - <tqmask name="FOSC" value="0x07" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" > + <mask name="FOSC" value="0x07" > <value value="default" name="invalid" /> <value value="0x02" name="HS" cname="_OSC_HS" /> <value value="0x04" name="EC_CLKOUT" cname="_OSC_EC" /> <value value="0x05" name="EC_IO" cname="_OSC_ECIO" /> <value value="0x06" name="H4" cname="_OSC_HSPLL" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x02" > + </mask> + <mask name="BODEN" value="0x02" > <value value="0x00" name="Off" cname="_BOR_OFF" /> <value value="0x02" name="On" cname="_BOR_ON" /> - </tqmask> - <tqmask name="BORV" value="0x0C" > + </mask> + <mask name="BORV" value="0x0C" > <value value="0x00" name="4.5" cname="_BORV_45" /> <value value="0x04" name="4.2" cname="_BORV_42" /> <value value="0x08" name="2.7" cname="_BORV_27" /> <value value="0x0C" name="2.5" cname="_BORV_25" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x0E" > + </mask> + <mask name="WDTPS" value="0x0E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -85,94 +85,94 @@ <value value="0x0A" name="1:32" cname="_WDTPS_32" /> <value value="0x0C" name="1:64" cname="_WDTPS_64" /> <value value="0x0E" name="1:128" cname="_WDTPS_128" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVR_OFF" /> <value value="0x01" name="On" cname="_STVR_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x07" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0200:1FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x07" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0200:1FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x07" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0200:1FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F2450.xml b/src/devices/pic/xml_data/18F2450.xml index ad3994f..2388a92 100644 --- a/src/devices/pic/xml_data/18F2450.xml +++ b/src/devices/pic/xml_data/18F2450.xml @@ -27,14 +27,14 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x003FFF" word_write_align="8" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x07" ctqmask="0x00" > - <tqmask name="PLLDIV" value="0x07" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x07" cmask="0x00" > + <mask name="PLLDIV" value="0x07" > <value value="0x00" name="1" cname="_PLLDIV_1" /> <value value="0x01" name="2" cname="_PLLDIV_2" /> <value value="0x02" name="3" cname="_PLLDIV_3" /> @@ -43,21 +43,21 @@ <value value="0x05" name="6" cname="_PLLDIV_6" /> <value value="0x06" name="10" cname="_PLLDIV_10" /> <value value="0x07" name="12" cname="_PLLDIV_12" /> - </tqmask> - <tqmask name="CPUDIV" value="0x18" > + </mask> + <mask name="CPUDIV" value="0x18" > <value value="0x00" name="1" cname="_CPUDIV_OSC1_PLL2" /> <value value="0x08" name="2" cname="_CPUDIV_OSC2_PLL3" /> <value value="0x10" name="3" cname="_CPUDIV_OSC3_PLL4" /> <value value="0x18" name="4" cname="_CPUDIV_OSC4_PLL6" /> - </tqmask> - <tqmask name="USBDIV" value="0x20" > + </mask> + <mask name="USBDIV" value="0x20" > <value value="0x00" name="1" cname="_USBDIV_1" /> <value value="0x20" name="2" cname="_USBDIV_2" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" ctqmask="0x00" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" cmask="0x00" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="XT" cname="_FOSC_XT_XT" /> <value value="0x01" name="XT" cname="_FOSC_XT_XT" /> <value value="0x02" name="XTPLL" cname="_FOSC_XTPLL" /> @@ -74,46 +74,46 @@ <value value="0x0D" name="HS" cname="_FOSC_HS" /> <value value="0x0E" name="HSPLL" cname="_FOSC_HSPLL_HS" /> <value value="0x0F" name="HSPLL" cname="_FOSC_HSPLL_HS" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOR_OFF" /> <value value="0x02" name="Software" cname="_BOR_SOFT" /> <value value="0x04" name="On_run" cname="_BOR_ON_ACTIVE" /> <value value="0x06" name="On" cname="_BOR_ON" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.6" cname="_BORV_46" /> <value value="0x08" name="4.3" cname="_BORV_43" /> <value value="0x10" name="2.8" cname="_BORV_28" /> <value value="0x18" name="2.1" cname="_BORV_21" /> - </tqmask> - <tqmask name="VREGEN" value="0x20" > + </mask> + <mask name="VREGEN" value="0x20" > <value value="0x00" name="Off" cname="_VREGEN_OFF" /> <value value="0x20" name="On" cname="_VREGEN_ON" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -130,107 +130,107 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x82" ctqmask="0x00" > - <tqmask name="PBADEN" value="0x02" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x82" cmask="0x00" > + <mask name="PBADEN" value="0x02" > <value value="0x00" name="digital" cname="_PBADEN_OFF" /> <value value="0x02" name="analog" cname="_PBADEN_ON" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x08" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x08" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="BBSIZ" value="0x08" > + </mask> + <mask name="BBSIZ" value="0x08" > <value value="0x00" name="1024" cname="_BBSIZ_BB1K" /> <value value="0x08" name="2048" cname="_BBSIZ_BB2K" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800/1000:1FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x40" > + <mask name="CPB" value="0x40" > <value value="0x00" name="All" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800/1000:1FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x60" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x60" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="All" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800/1000:1FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="All" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F2455.xml b/src/devices/pic/xml_data/18F2455.xml index c42923a..7097218 100644 --- a/src/devices/pic/xml_data/18F2455.xml +++ b/src/devices/pic/xml_data/18F2455.xml @@ -26,15 +26,15 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x005FFF" word_write_align="16" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" > - <tqmask name="PLLDIV" value="0x07" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" > + <mask name="PLLDIV" value="0x07" > <value value="0x00" name="1" cname="_PLLDIV_1" sdcc_cname="_PLLDIV_NO_DIVIDE__4MHZ_INPUT_" /> <value value="0x01" name="2" cname="_PLLDIV_2" sdcc_cname="_PLLDIV_DIVIDE_BY_2__8MHZ_INPUT_" /> <value value="0x02" name="3" cname="_PLLDIV_3" sdcc_cname="_PLLDIV_DIVIDE_BY_3__12MHZ_INPUT_" /> @@ -43,21 +43,21 @@ <value value="0x05" name="6" cname="_PLLDIV_6" sdcc_cname="_PLLDIV_DIVIDE_BY_6__24MHZ_INPUT_" /> <value value="0x06" name="10" cname="_PLLDIV_10" sdcc_cname="_PLLDIV_DIVIDE_BY_10__40MHZ_INPUT_" /> <value value="0x07" name="12" cname="_PLLDIV_12" sdcc_cname="_PLLDIV_DIVIDE_BY_12__48MHZ_INPUT_" /> - </tqmask> - <tqmask name="CPUDIV" value="0x18" > + </mask> + <mask name="CPUDIV" value="0x18" > <value value="0x00" name="1" cname="_CPUDIV_OSC1_PLL2" sdcc_cname="_CPUDIV__OSC1_OSC2_SRC___1__96MHZ_PLL_SRC___2_" /> <value value="0x08" name="2" cname="_CPUDIV_OSC2_PLL3" sdcc_cname="_CPUDIV__OSC1_OSC2_SRC___2__96MHZ_PLL_SRC___3_" /> <value value="0x10" name="3" cname="_CPUDIV_OSC3_PLL4" sdcc_cname="_CPUDIV__OSC1_OSC2_SRC___3__96MHZ_PLL_SRC___4_" /> <value value="0x18" name="4" cname="_CPUDIV_OSC4_PLL6" sdcc_cname="_CPUDIV__OSC1_OSC2_SRC___4__96MHZ_PLL_SRC___6_" /> - </tqmask> - <tqmask name="USBDIV" value="0x20" > + </mask> + <mask name="USBDIV" value="0x20" > <value value="0x00" name="1" cname="_USBDIV_1" sdcc_cname="_USBPLL_CLOCK_SRC_FROM_OSC1_OSC2" /> <value value="0x20" name="2" cname="_USBDIV_2" sdcc_cname="_USBPLL_CLOCK_SRC_FROM_96MHZ_PLL_2" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x05" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x05" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="XT" cname="_FOSC_XT_XT" sdcc_cname="_OSC_XT__USB_XT" /> <value value="0x01" name="XT" cname="_FOSC_XT_XT" sdcc_cname="_OSC_XT__USB_XT" /> <value value="0x02" name="XTPLL" cname="_FOSC_XTPLL" sdcc_cname="_OSC_XT__XT_PLL__USB_XT" /> @@ -74,46 +74,46 @@ <value value="0x0D" name="HS" cname="_FOSC_HS" sdcc_cname="_OSC_HS__USB_HS" /> <value value="0x0E" name="HSPLL" cname="_FOSC_HSPLL_HS" sdcc_cname="_OSC_HS__HS_PLL__USB_HS" /> <value value="0x0F" name="HSPLL" cname="_FOSC_HSPLL_HS" sdcc_cname="_OSC_HS__HS_PLL__USB_HS" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEM_OFF" sdcc_cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEM_ON" sdcc_cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" ctqmask="0x18" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" cmask="0x18" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" sdcc_cname="_PUT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" sdcc_cname="_PUT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOR_OFF" sdcc_cname="_BODEN_OFF" /> <value value="0x02" name="Software" cname="_BOR_SOFT" sdcc_cname="_BODEN_CONTROLLED_WITH_SBOREN_BIT" /> <value value="0x04" name="On_run" cname="_BOR_ON_ACTIVE" sdcc_cname="_BODEN_ON_WHILE_ACTIVE" /> <value value="0x06" name="On" cname="_BOR_ON" sdcc_cname="_BODEN_ON" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" sdcc_cname="_BODENV_4_5V" /> <value value="0x08" name="4.2" cname="_BORV_1" sdcc_cname="_BODENV_4_2V" /> <value value="0x10" name="2.7" cname="_BORV_2" sdcc_cname="_BODENV_2_7V" /> <value value="0x18" name="2.0" cname="_BORV_3" sdcc_cname="_BODENV_2_0V" /> - </tqmask> - <tqmask name="VREGEN" value="0x20" > + </mask> + <mask name="VREGEN" value="0x20" > <value value="0x00" name="Off" cname="_VREGEN_OFF" /> <value value="0x20" name="On" cname="_VREGEN_ON" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" sdcc_cname="_WDT_DISABLED_CONTROLLED" /> <value value="0x01" name="On" cname="_WDT_ON" sdcc_cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" sdcc_cname="_WDTPS_1_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" sdcc_cname="_WDTPS_1_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" sdcc_cname="_WDTPS_1_4" /> @@ -130,127 +130,127 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" sdcc_cname="_WDTPS_1_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" sdcc_cname="_WDTPS_1_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" sdcc_cname="_WDTPS_1_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="_CCP2MX_OFF" sdcc_cname="_CCP2MUX_RB3" /> <value value="0x01" name="RC1" cname="_CCP2MX_ON" sdcc_cname="_CCP2MUX_RC1" /> - </tqmask> - <tqmask name="PBADEN" value="0x02" > + </mask> + <mask name="PBADEN" value="0x02" > <value value="0x00" name="digital" cname="_PBADEN_OFF" sdcc_cname="_PBADEN_PORTB_4_0__CONFIGURED_AS_DIGITAL_I_O_ON_RESET" /> <value value="0x02" name="analog" cname="_PBADEN_ON" sdcc_cname="_PBADEN_PORTB_4_0__CONFIGURED_AS_ANALOG_INPUTS_ON_RESET" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" sdcc_cname="_MCLRE_MCLR_OFF_RE3_ON" /> <value value="0x80" name="External" cname="_MCLRE_ON" sdcc_cname="_MCLRE_MCLR_ON_RE3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xDF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xDF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" sdcc_cname="_STVR_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" sdcc_cname="_STVR_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" sdcc_cname="_ENHCPU_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" sdcc_cname="_ENHCPU_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" sdcc_cname="_BACKBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" sdcc_cname="_BACKBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x07" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_CP0_ON" sdcc_cname="_CP_0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_CP1_ON" sdcc_cname="_CP_1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_CP2_ON" sdcc_cname="_CP_2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" sdcc_cname="_CP_2_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x07" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_WRT0_ON" sdcc_cname="_WRT_0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_WRT1_ON" sdcc_cname="_WRT_1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_WRT2_ON" sdcc_cname="_WRT_2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" sdcc_cname="_WRT_2_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" ctqmask="0xC0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" cmask="0xC0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x07" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_EBTR0_ON" sdcc_cname="_EBTR_0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" sdcc_cname="_EBTR_1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_EBTR2_ON" sdcc_cname="_EBTR_2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" sdcc_cname="_EBTR_2_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F248.xml b/src/devices/pic/xml_data/18F248.xml index a7078ba..973ba90 100644 --- a/src/devices/pic/xml_data/18F248.xml +++ b/src/devices/pic/xml_data/18F248.xml @@ -34,17 +34,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x003FFF" word_write_align="4" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" > - <tqmask name="FOSC" value="0x07" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" > + <mask name="FOSC" value="0x07" > <value value="0x00" name="LP" cname="_LP_OSC" sdcc_cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_XT_OSC" sdcc_cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_HS_OSC" sdcc_cname="_OSC_HS" /> @@ -53,36 +53,36 @@ <value value="0x05" name="EC_IO" cname="_ECIO_OSC" sdcc_cname="_OSC_EC_OSC2_RA6" /> <value value="0x06" name="H4" cname="_HSPLL_OSC" sdcc_cname="_OSC_HS_PLL" /> <value value="0x07" name="EXTRC_IO" cname="_RCIO_OSC" sdcc_cname="_OSC_RC_OSC2" /> - </tqmask> - <tqmask name="OSCSEN" value="0x20" > + </mask> + <mask name="OSCSEN" value="0x20" > <value value="0x00" name="On" cname="_OSCS_ON" /> <value value="0x20" name="Off" cname="_OSCS_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" sdcc_cname="_PUT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" sdcc_cname="_PUT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x02" > + </mask> + <mask name="BODEN" value="0x02" > <value value="0x00" name="Off" cname="_BOR_OFF" sdcc_cname="_BODEN_OFF" /> <value value="0x02" name="On" cname="_BOR_ON" sdcc_cname="_BODEN_ON" /> - </tqmask> - <tqmask name="BORV" value="0x0C" > + </mask> + <mask name="BORV" value="0x0C" > <value value="0x00" name="4.5" cname="_BORV_45" sdcc_cname="_BODENV_4_5V" /> <value value="0x04" name="4.2" cname="_BORV_42" sdcc_cname="_BODENV_4_2V" /> <value value="0x08" name="2.7" cname="_BORV_27" sdcc_cname="_BODENV_2_7V" /> <value value="0x0C" name="2.0" cname="_BORV_25" sdcc_cname="_BODENV_2_0V" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x0E" > + </mask> + <mask name="WDTPS" value="0x0E" > <value value="0x00" name="1:1" cname="_WDTPS_1" sdcc_cname="_WDTPS_1_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" sdcc_cname="_WDTPS_1_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" sdcc_cname="_WDTPS_1_4" /> @@ -91,94 +91,94 @@ <value value="0x0A" name="1:32" cname="_WDTPS_32" sdcc_cname="_WDTPS_1_32" /> <value value="0x0C" name="1:64" cname="_WDTPS_64" sdcc_cname="_WDTPS_1_64" /> <value value="0x0E" name="1:128" cname="_WDTPS_128" sdcc_cname="_WDTPS_1_128" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVR_OFF" /> <value value="0x01" name="On" cname="_STVR_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" sdcc_cname="_BACKBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" sdcc_cname="_BACKBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0200:1FFF" cname="_CP0_ON" sdcc_cname="_CP_0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_CP1_ON" sdcc_cname="_CP_1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0200:1FFF" cname="_WRT0_ON" sdcc_cname="_WRT_0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_WRT1_ON" sdcc_cname="_WRT_1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0200:1FFF" cname="_EBTR0_ON" sdcc_cname="_EBTR_0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" sdcc_cname="_EBTR_1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F2480.xml b/src/devices/pic/xml_data/18F2480.xml index 4282365..7f8929b 100644 --- a/src/devices/pic/xml_data/18F2480.xml +++ b/src/devices/pic/xml_data/18F2480.xml @@ -27,17 +27,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x003FFF" word_write_align="16" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" ctqmask="0x0F" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" cmask="0x0F" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -54,42 +54,42 @@ <value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC" /> <value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC" /> <value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" ctqmask="0x06" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" cmask="0x06" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="Software" cname="_BOREN_SBORENCTRL" /> <value value="0x04" name="On_run" cname="_BOREN_BOACTIVE" /> <value value="0x06" name="On" cname="_BOREN_BOHW" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -106,115 +106,115 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x82" ctqmask="0x02" > - <tqmask name="PBADEN" value="0x02" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x82" cmask="0x02" > + <mask name="PBADEN" value="0x02" > <value value="0x00" name="digital" cname="_PBADEN_OFF" /> <value value="0x02" name="analog" cname="_PBADEN_ON" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x10" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x10" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="BBSIZ" value="0x10" > + </mask> + <mask name="BBSIZ" value="0x10" > <value value="0x00" name="1024" cname="_BBSIZ_1024" /> <value value="0x10" name="2048" cname="_BBSIZ_2048" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800/1000:1FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="All" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800/1000:1FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="All" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800/1000:1FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="All" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F24J10.xml b/src/devices/pic/xml_data/18F24J10.xml index b88c8f0..c4ae257 100644 --- a/src/devices/pic/xml_data/18F24J10.xml +++ b/src/devices/pic/xml_data/18F24J10.xml @@ -31,55 +31,55 @@ <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" > - <tqmask name="WDT" value="0x01" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="STVREN" value="0x20" > + </mask> + <mask name="STVREN" value="0x20" > <value value="0x00" name="Off" cname="" /> <value value="0x20" name="On" cname="" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="" /> <value value="0x40" name="On" cname="" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0x7F" bvalue="0x04" > - <tqmask name="CP" value="0x04" > + <config offset="0x1" name="CONFIG1H" wmask="0x7F" bvalue="0x04" > + <mask name="CP" value="0x04" > <value value="0x00" name="All" cname="" /> <value value="0x04" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="FOSC" value="0x03" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" > + <mask name="FOSC" value="0x03" > <value value="0x00" name="HS" cname="" /> <value value="0x01" name="HSPLL" cname="" /> <value value="0x02" name="EC" cname="" /> <value value="0x03" name="ECPLL_IO" cname="" /> - </tqmask> - <tqmask name="FOSC2" value="0x04" > + </mask> + <mask name="FOSC2" value="0x04" > <value value="0x00" name="FOSC1:FOSC0" cname="" /> <value value="0x04" name="INTRC" cname="" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="On" cname="" /> <value value="0x40" name="Off" cname="" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDTPS" value="0x0F" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDTPS" value="0x0F" > <value value="0x00" name="1:1" cname="" /> <value value="0x01" name="1:2" cname="" /> <value value="0x02" name="1:4" cname="" /> @@ -96,23 +96,23 @@ <value value="0x0D" name="1:8192" cname="" /> <value value="0x0E" name="1:16384" cname="" /> <value value="0x0F" name="1:32768" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" > </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x07" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="" /> <value value="0x01" name="RC1" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0xFF" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0xFF" > </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0xF8" > + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0xF8" > </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F2510.xml b/src/devices/pic/xml_data/18F2510.xml index 55c62f8..1950de1 100644 --- a/src/devices/pic/xml_data/18F2510.xml +++ b/src/devices/pic/xml_data/18F2510.xml @@ -27,16 +27,16 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x007FFF" word_write_align="16" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -53,42 +53,42 @@ <value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC" /> <value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC" /> <value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="Software" cname="_BOREN_ON" /> <value value="0x04" name="On_run" cname="_BOREN_NOSLP" /> <value value="0x06" name="On" cname="_BOREN_SBORDIS" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -105,131 +105,131 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" /> <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" /> - </tqmask> - <tqmask name="PBADEN" value="0x02" > + </mask> + <mask name="PBADEN" value="0x02" > <value value="0x00" name="digital" cname="_PBADEN_OFF" /> <value value="0x02" name="analog" cname="_PBADEN_ON" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_CP2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" /> - </tqmask> - <tqmask name="CP_3" value="0x08" > + </mask> + <mask name="CP_3" value="0x08" > <value value="0x00" name="6000:7FFF" cname="_CP3_ON" /> <value value="0x08" name="Off" cname="_CP3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x40" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_WRT2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" /> - </tqmask> - <tqmask name="WRT_3" value="0x08" > + </mask> + <mask name="WRT_3" value="0x08" > <value value="0x00" name="6000:7FFF" cname="_WRT3_ON" /> <value value="0x08" name="Off" cname="_WRT3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x60" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x60" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_EBTR2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" /> - </tqmask> - <tqmask name="EBTR_3" value="0x08" > + </mask> + <mask name="EBTR_3" value="0x08" > <value value="0x00" name="6000:7FFF" cname="_EBTR3_ON" /> <value value="0x08" name="Off" cname="_EBTR3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F2515.xml b/src/devices/pic/xml_data/18F2515.xml index fa07b14..89960ae 100644 --- a/src/devices/pic/xml_data/18F2515.xml +++ b/src/devices/pic/xml_data/18F2515.xml @@ -27,16 +27,16 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x00BFFF" word_write_align="32" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -53,42 +53,42 @@ <value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC" /> <value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC" /> <value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="Software" cname="_BOREN_ON" /> <value value="0x04" name="On_run" cname="_BOREN_NOSLP" /> <value value="0x06" name="On" cname="_BOREN_SBORDIS" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -105,119 +105,119 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" /> <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" /> - </tqmask> - <tqmask name="PBADEN" value="0x02" > + </mask> + <mask name="PBADEN" value="0x02" > <value value="0x00" name="digital" cname="_PBADEN_OFF" /> <value value="0x02" name="analog" cname="_PBADEN_ON" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x07" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800:3FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_CP2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x40" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x07" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800:3FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x60" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x60" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x07" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800:3FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F252.xml b/src/devices/pic/xml_data/18F252.xml index 595eb74..b1d4153 100644 --- a/src/devices/pic/xml_data/18F252.xml +++ b/src/devices/pic/xml_data/18F252.xml @@ -35,17 +35,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x007FFF" word_write_align="4" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" > - <tqmask name="FOSC" value="0x07" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" > + <mask name="FOSC" value="0x07" > <value value="0x00" name="LP" cname="_LP_OSC" sdcc_cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_XT_OSC" sdcc_cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_HS_OSC" sdcc_cname="_OSC_HS" /> @@ -54,36 +54,36 @@ <value value="0x05" name="EC_IO" cname="_ECIO_OSC" sdcc_cname="_OSC_EC_OSC2_RA6" /> <value value="0x06" name="H4" cname="_HSPLL_OSC" sdcc_cname="_OSC_HS_PLL" /> <value value="0x07" name="EXTRC_IO" cname="_RCIO_OSC" sdcc_cname="_OSC_RC_OSC2" /> - </tqmask> - <tqmask name="OSCSEN" value="0x20" > + </mask> + <mask name="OSCSEN" value="0x20" > <value value="0x00" name="On" cname="_OSCS_ON" /> <value value="0x20" name="Off" cname="_OSCS_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" sdcc_cname="_PUT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" sdcc_cname="_PUT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x02" > + </mask> + <mask name="BODEN" value="0x02" > <value value="0x00" name="Off" cname="_BOR_OFF" sdcc_cname="_BODEN_OFF" /> <value value="0x02" name="On" cname="_BOR_ON" sdcc_cname="_BODEN_ON" /> - </tqmask> - <tqmask name="BORV" value="0x0C" > + </mask> + <mask name="BORV" value="0x0C" > <value value="0x00" name="4.5" cname="_BORV_45" sdcc_cname="_BODENV_4_5V" /> <value value="0x04" name="4.2" cname="_BORV_42" sdcc_cname="_BODENV_4_2V" /> <value value="0x08" name="2.7" cname="_BORV_27" sdcc_cname="_BODENV_2_7V" /> <value value="0x0C" name="2.0" cname="_BORV_20" sdcc_cname="_BODENV_2_0V" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x0E" > + </mask> + <mask name="WDTPS" value="0x0E" > <value value="0x00" name="1:1" cname="_WDTPS_1" sdcc_cname="_WDTPS_1_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" sdcc_cname="_WDTPS_1_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" sdcc_cname="_WDTPS_1_4" /> @@ -92,123 +92,123 @@ <value value="0x0A" name="1:32" cname="_WDTPS_32" sdcc_cname="_WDTPS_1_32" /> <value value="0x0C" name="1:64" cname="_WDTPS_64" sdcc_cname="_WDTPS_1_64" /> <value value="0x0E" name="1:128" cname="_WDTPS_128" sdcc_cname="_WDTPS_1_128" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="_CCP2MX_OFF" sdcc_cname="_CCP2MUX_RB3" /> <value value="0x01" name="RC1" cname="_CCP2MX_ON" sdcc_cname="_CCP2MUX_RC1" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVR_OFF" /> <value value="0x01" name="On" cname="_STVR_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" sdcc_cname="_BACKBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" sdcc_cname="_BACKBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0200:1FFF" cname="_CP0_ON" sdcc_cname="_CP_0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_CP1_ON" sdcc_cname="_CP_1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_CP2_ON" sdcc_cname="_CP_2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" sdcc_cname="_CP_2_OFF" /> - </tqmask> - <tqmask name="CP_3" value="0x08" > + </mask> + <mask name="CP_3" value="0x08" > <value value="0x00" name="6000:7FFF" cname="_CP3_ON" sdcc_cname="_CP_3_ON" /> <value value="0x08" name="Off" cname="_CP3_OFF" sdcc_cname="_CP_3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0200:1FFF" cname="_WRT0_ON" sdcc_cname="_WRT_0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_WRT1_ON" sdcc_cname="_WRT_1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_WRT2_ON" sdcc_cname="_WRT_2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" sdcc_cname="_WRT_2_OFF" /> - </tqmask> - <tqmask name="WRT_3" value="0x08" > + </mask> + <mask name="WRT_3" value="0x08" > <value value="0x00" name="6000:7FFF" cname="_WRT3_ON" sdcc_cname="_WRT_3_ON" /> <value value="0x08" name="Off" cname="_WRT3_OFF" sdcc_cname="_WRT_3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0200:1FFF" cname="_EBTR0_ON" sdcc_cname="_EBTR_0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" sdcc_cname="_EBTR_1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_EBTR2_ON" sdcc_cname="_EBTR_2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" sdcc_cname="_EBTR_2_OFF" /> - </tqmask> - <tqmask name="EBTR_3" value="0x08" > + </mask> + <mask name="EBTR_3" value="0x08" > <value value="0x00" name="6000:7FFF" cname="_EBTR3_ON" sdcc_cname="_EBTR_3_ON" /> <value value="0x08" name="Off" cname="_EBTR3_OFF" sdcc_cname="_EBTR_3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F2520.xml b/src/devices/pic/xml_data/18F2520.xml index 07a97db..3c77df0 100644 --- a/src/devices/pic/xml_data/18F2520.xml +++ b/src/devices/pic/xml_data/18F2520.xml @@ -27,17 +27,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x007FFF" word_write_align="16" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -54,42 +54,42 @@ <value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC" /> <value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC" /> <value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="Software" cname="_BOREN_ON" /> <value value="0x04" name="On_run" cname="_BOREN_NOSLP" /> <value value="0x06" name="On" cname="_BOREN_SBORDIS" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -106,139 +106,139 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" /> <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" /> - </tqmask> - <tqmask name="PBADEN" value="0x02" > + </mask> + <mask name="PBADEN" value="0x02" > <value value="0x00" name="digital" cname="_PBADEN_OFF" /> <value value="0x02" name="analog" cname="_PBADEN_ON" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_CP2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" /> - </tqmask> - <tqmask name="CP_3" value="0x08" > + </mask> + <mask name="CP_3" value="0x08" > <value value="0x00" name="6000:7FFF" cname="_CP3_ON" /> <value value="0x08" name="Off" cname="_CP3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" ctqmask="0x80" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" cmask="0x80" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_WRT2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" /> - </tqmask> - <tqmask name="WRT_3" value="0x08" > + </mask> + <mask name="WRT_3" value="0x08" > <value value="0x00" name="6000:7FFF" cname="_WRT3_ON" /> <value value="0x08" name="Off" cname="_WRT3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" ctqmask="0x80" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" cmask="0x80" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_EBTR2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" /> - </tqmask> - <tqmask name="EBTR_3" value="0x08" > + </mask> + <mask name="EBTR_3" value="0x08" > <value value="0x00" name="6000:7FFF" cname="_EBTR3_ON" /> <value value="0x08" name="Off" cname="_EBTR3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F2523.xml b/src/devices/pic/xml_data/18F2523.xml index e630c60..6a92c8d 100644 --- a/src/devices/pic/xml_data/18F2523.xml +++ b/src/devices/pic/xml_data/18F2523.xml @@ -24,17 +24,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x007FFF" word_write_align="16" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -45,42 +45,42 @@ <value value="0x08" name="INTRC_IO" cname="_OSC_INTIO67" /> <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" /> <value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="Software" cname="_BOREN_ON" /> <value value="0x04" name="On_run" cname="_BOREN_NOSLP" /> <value value="0x06" name="On" cname="_BOREN_SBORDIS" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -97,139 +97,139 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" /> <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" /> - </tqmask> - <tqmask name="PBADEN" value="0x02" > + </mask> + <mask name="PBADEN" value="0x02" > <value value="0x00" name="digital" cname="_PBADEN_OFF" /> <value value="0x02" name="analog" cname="_PBADEN_ON" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_CP2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" /> - </tqmask> - <tqmask name="CP_3" value="0x08" > + </mask> + <mask name="CP_3" value="0x08" > <value value="0x00" name="6000:7FFF" cname="_CP3_ON" /> <value value="0x08" name="Off" cname="_CP3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" ctqmask="0x80" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" cmask="0x80" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_WRT2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" /> - </tqmask> - <tqmask name="WRT_3" value="0x08" > + </mask> + <mask name="WRT_3" value="0x08" > <value value="0x00" name="6000:7FFF" cname="_WRT3_ON" /> <value value="0x08" name="Off" cname="_WRT3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" ctqmask="0x80" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" cmask="0x80" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_EBTR2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" /> - </tqmask> - <tqmask name="EBTR_3" value="0x08" > + </mask> + <mask name="EBTR_3" value="0x08" > <value value="0x00" name="6000:7FFF" cname="_EBTR3_ON" /> <value value="0x08" name="Off" cname="_EBTR3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F2525.xml b/src/devices/pic/xml_data/18F2525.xml index eb2f3fe..2ff5bc7 100644 --- a/src/devices/pic/xml_data/18F2525.xml +++ b/src/devices/pic/xml_data/18F2525.xml @@ -27,17 +27,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x00BFFF" word_write_align="32" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -54,42 +54,42 @@ <value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC" /> <value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC" /> <value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="Software" cname="_BOREN_ON" /> <value value="0x04" name="On_run" cname="_BOREN_NOSLP" /> <value value="0x06" name="On" cname="_BOREN_SBORDIS" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -106,127 +106,127 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" /> <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" /> - </tqmask> - <tqmask name="PBADEN" value="0x02" > + </mask> + <mask name="PBADEN" value="0x02" > <value value="0x00" name="digital" cname="_PBADEN_OFF" /> <value value="0x02" name="analog" cname="_PBADEN_ON" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x07" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800:3FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_CP2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" ctqmask="0x80" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" cmask="0x80" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x07" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800:3FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" ctqmask="0x80" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" cmask="0x80" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x07" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800:3FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F2539.xml b/src/devices/pic/xml_data/18F2539.xml index 8e5f2cc..0f4a17a 100644 --- a/src/devices/pic/xml_data/18F2539.xml +++ b/src/devices/pic/xml_data/18F2539.xml @@ -35,48 +35,48 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x005FFF" word_write_align="4" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" > - <tqmask name="FOSC" value="0x07" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" > + <mask name="FOSC" value="0x07" > <value value="default" name="invalid" /> <value value="0x02" name="HS" cname="_OSC_HS" /> <value value="0x04" name="EC_CLKOUT" cname="_OSC_EC" /> <value value="0x05" name="EC_IO" cname="_OSC_ECIO" /> <value value="0x06" name="H4" cname="_OSC_HSPLL" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x02" > + </mask> + <mask name="BODEN" value="0x02" > <value value="0x00" name="Off" cname="_BOR_OFF" /> <value value="0x02" name="On" cname="_BOR_ON" /> - </tqmask> - <tqmask name="BORV" value="0x0C" > + </mask> + <mask name="BORV" value="0x0C" > <value value="0x00" name="4.5" cname="_BORV_45" /> <value value="0x04" name="4.2" cname="_BORV_42" /> <value value="0x08" name="2.7" cname="_BORV_27" /> <value value="0x0C" name="2.5" cname="_BORV_25" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x0E" > + </mask> + <mask name="WDTPS" value="0x0E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -85,106 +85,106 @@ <value value="0x0A" name="1:32" cname="_WDTPS_32" /> <value value="0x0C" name="1:64" cname="_WDTPS_64" /> <value value="0x0E" name="1:128" cname="_WDTPS_128" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVR_OFF" /> <value value="0x01" name="On" cname="_STVR_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x07" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0200:1FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_CP2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x07" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0200:1FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_WRT2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x07" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0200:1FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_EBTR2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F2550.xml b/src/devices/pic/xml_data/18F2550.xml index af87dd0..21ab9ae 100644 --- a/src/devices/pic/xml_data/18F2550.xml +++ b/src/devices/pic/xml_data/18F2550.xml @@ -26,15 +26,15 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x007FFF" word_write_align="16" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" > - <tqmask name="PLLDIV" value="0x07" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" > + <mask name="PLLDIV" value="0x07" > <value value="0x00" name="1" cname="_PLLDIV_1" sdcc_cname="_PLLDIV_NO_DIVIDE__4MHZ_INPUT_" /> <value value="0x01" name="2" cname="_PLLDIV_2" sdcc_cname="_PLLDIV_DIVIDE_BY_2__8MHZ_INPUT_" /> <value value="0x02" name="3" cname="_PLLDIV_3" sdcc_cname="_PLLDIV_DIVIDE_BY_3__12MHZ_INPUT_" /> @@ -43,21 +43,21 @@ <value value="0x05" name="6" cname="_PLLDIV_6" sdcc_cname="_PLLDIV_DIVIDE_BY_6__24MHZ_INPUT_" /> <value value="0x06" name="10" cname="_PLLDIV_10" sdcc_cname="_PLLDIV_DIVIDE_BY_10__40MHZ_INPUT_" /> <value value="0x07" name="12" cname="_PLLDIV_12" sdcc_cname="_PLLDIV_DIVIDE_BY_12__48MHZ_INPUT_" /> - </tqmask> - <tqmask name="CPUDIV" value="0x18" > + </mask> + <mask name="CPUDIV" value="0x18" > <value value="0x00" name="1" cname="_CPUDIV_OSC1_PLL2" sdcc_cname="_CPUDIV__OSC1_OSC2_SRC___1__96MHZ_PLL_SRC___2_" /> <value value="0x08" name="2" cname="_CPUDIV_OSC2_PLL3" sdcc_cname="_CPUDIV__OSC1_OSC2_SRC___2__96MHZ_PLL_SRC___3_" /> <value value="0x10" name="3" cname="_CPUDIV_OSC3_PLL4" sdcc_cname="_CPUDIV__OSC1_OSC2_SRC___3__96MHZ_PLL_SRC___4_" /> <value value="0x18" name="4" cname="_CPUDIV_OSC4_PLL6" sdcc_cname="_CPUDIV__OSC1_OSC2_SRC___4__96MHZ_PLL_SRC___6_" /> - </tqmask> - <tqmask name="USBDIV" value="0x20" > + </mask> + <mask name="USBDIV" value="0x20" > <value value="0x00" name="1" cname="_USBDIV_1" sdcc_cname="_USBPLL_CLOCK_SRC_FROM_OSC1_OSC2" /> <value value="0x20" name="2" cname="_USBDIV_2" sdcc_cname="_USBPLL_CLOCK_SRC_FROM_96MHZ_PLL_2" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x05" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x05" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="XT" cname="_FOSC_XT_XT" sdcc_cname="_OSC_XT__USB_XT" /> <value value="0x01" name="XT" cname="_FOSC_XT_XT" sdcc_cname="_OSC_XT__USB_XT" /> <value value="0x02" name="XTPLL" cname="_FOSC_XTPLL" sdcc_cname="_OSC_XT__XT_PLL__USB_XT" /> @@ -74,46 +74,46 @@ <value value="0x0D" name="HS" cname="_FOSC_HS" sdcc_cname="_OSC_HS__USB_HS" /> <value value="0x0E" name="HSPLL" cname="_FOSC_HSPLL_HS" sdcc_cname="_OSC_HS__HS_PLL__USB_HS" /> <value value="0x0F" name="HSPLL" cname="_FOSC_HSPLL_HS" sdcc_cname="_OSC_HS__HS_PLL__USB_HS" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEM_OFF" sdcc_cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEM_ON" sdcc_cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" sdcc_cname="_PUT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" sdcc_cname="_PUT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOR_OFF" sdcc_cname="_BODEN_OFF" /> <value value="0x02" name="Software" cname="_BOR_SOFT" sdcc_cname="_BODEN_CONTROLLED_WITH_SBOREN_BIT" /> <value value="0x04" name="On_run" cname="_BOR_ON_ACTIVE" sdcc_cname="_BODEN_ON_WHILE_ACTIVE" /> <value value="0x06" name="On" cname="_BOR_ON" sdcc_cname="_BODEN_ON" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" sdcc_cname="_BODENV_4_5V" /> <value value="0x08" name="4.2" cname="_BORV_1" sdcc_cname="_BODENV_4_2V" /> <value value="0x10" name="2.7" cname="_BORV_2" sdcc_cname="_BODENV_2_7V" /> <value value="0x18" name="2.0" cname="_BORV_3" sdcc_cname="_BODENV_2_0V" /> - </tqmask> - <tqmask name="VREGEN" value="0x20" > + </mask> + <mask name="VREGEN" value="0x20" > <value value="0x00" name="Off" cname="_VREGEN_OFF" /> <value value="0x20" name="On" cname="_VREGEN_ON" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" sdcc_cname="_WDT_DISABLED_CONTROLLED" /> <value value="0x01" name="On" cname="_WDT_ON" sdcc_cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" sdcc_cname="_WDTPS_1_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" sdcc_cname="_WDTPS_1_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" sdcc_cname="_WDTPS_1_4" /> @@ -130,131 +130,131 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" sdcc_cname="_WDTPS_1_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" sdcc_cname="_WDTPS_1_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" sdcc_cname="_WDTPS_1_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="_CCP2MX_OFF" sdcc_cname="_CCP2MUX_RB3" /> <value value="0x01" name="RC1" cname="_CCP2MX_ON" sdcc_cname="_CCP2MUX_RC1" /> - </tqmask> - <tqmask name="PBADEN" value="0x02" > + </mask> + <mask name="PBADEN" value="0x02" > <value value="0x00" name="digital" cname="_PBADEN_OFF" sdcc_cname="_PBADEN_PORTB_4_0__CONFIGURED_AS_DIGITAL_I_O_ON_RESET" /> <value value="0x02" name="analog" cname="_PBADEN_ON" sdcc_cname="_PBADEN_PORTB_4_0__CONFIGURED_AS_ANALOG_INPUTS_ON_RESET" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" sdcc_cname="_MCLRE_MCLR_OFF_RE3_ON" /> <value value="0x80" name="External" cname="_MCLRE_ON" sdcc_cname="_MCLRE_MCLR_ON_RE3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xDF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xDF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" sdcc_cname="_STVR_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" sdcc_cname="_STVR_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" sdcc_cname="_ENHCPU_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" sdcc_cname="_ENHCPU_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" sdcc_cname="_BACKBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" sdcc_cname="_BACKBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_CP0_ON" sdcc_cname="_CP_0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_CP1_ON" sdcc_cname="_CP_1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_CP2_ON" sdcc_cname="_CP_2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" sdcc_cname="_CP_2_OFF" /> - </tqmask> - <tqmask name="CP_3" value="0x08" > + </mask> + <mask name="CP_3" value="0x08" > <value value="0x00" name="6000:7FFF" cname="_CP3_ON" sdcc_cname="_CP_3_ON" /> <value value="0x08" name="Off" cname="_CP3_OFF" sdcc_cname="_CP_3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x40" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_WRT0_ON" sdcc_cname="_WRT_0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_WRT1_ON" sdcc_cname="_WRT_1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_WRT2_ON" sdcc_cname="_WRT_2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" sdcc_cname="_WRT_2_OFF" /> - </tqmask> - <tqmask name="WRT_3" value="0x08" > + </mask> + <mask name="WRT_3" value="0x08" > <value value="0x00" name="6000:7FFF" cname="_WRT3_ON" sdcc_cname="_WRT_3_ON" /> <value value="0x08" name="Off" cname="_WRT3_OFF" sdcc_cname="_WRT_3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x60" ctqmask="0x40" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x60" cmask="0x40" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_EBTR0_ON" sdcc_cname="_EBTR_0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" sdcc_cname="_EBTR_1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_EBTR2_ON" sdcc_cname="_EBTR_2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" sdcc_cname="_EBTR_2_OFF" /> - </tqmask> - <tqmask name="EBTR_3" value="0x08" > + </mask> + <mask name="EBTR_3" value="0x08" > <value value="0x00" name="6000:7FFF" cname="_EBTR3_ON" sdcc_cname="_EBTR_3_ON" /> <value value="0x08" name="Off" cname="_EBTR3_OFF" sdcc_cname="_EBTR_3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F258.xml b/src/devices/pic/xml_data/18F258.xml index c24567e..bb27ca5 100644 --- a/src/devices/pic/xml_data/18F258.xml +++ b/src/devices/pic/xml_data/18F258.xml @@ -35,17 +35,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x007FFF" word_write_align="4" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" > - <tqmask name="FOSC" value="0x07" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" > + <mask name="FOSC" value="0x07" > <value value="0x00" name="LP" cname="_LP_OSC" sdcc_cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_XT_OSC" sdcc_cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_HS_OSC" sdcc_cname="_OSC_HS" /> @@ -54,36 +54,36 @@ <value value="0x05" name="EC_IO" cname="_ECIO_OSC" sdcc_cname="_OSC_EC_OSC2_RA6" /> <value value="0x06" name="H4" cname="_HSPLL_OSC" sdcc_cname="_OSC_HS_PLL" /> <value value="0x07" name="EXTRC_IO" cname="_RCIO_OSC" sdcc_cname="_OSC_RC_OSC2" /> - </tqmask> - <tqmask name="OSCSEN" value="0x20" > + </mask> + <mask name="OSCSEN" value="0x20" > <value value="0x00" name="On" cname="_OSCS_ON" /> <value value="0x20" name="Off" cname="_OSCS_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" sdcc_cname="_PUT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" sdcc_cname="_PUT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x02" > + </mask> + <mask name="BODEN" value="0x02" > <value value="0x00" name="Off" cname="_BOR_OFF" sdcc_cname="_BODEN_OFF" /> <value value="0x02" name="On" cname="_BOR_ON" sdcc_cname="_BODEN_ON" /> - </tqmask> - <tqmask name="BORV" value="0x0C" > + </mask> + <mask name="BORV" value="0x0C" > <value value="0x00" name="4.5" cname="_BORV_45" sdcc_cname="_BODENV_4_5V" /> <value value="0x04" name="4.2" cname="_BORV_42" sdcc_cname="_BODENV_4_2V" /> <value value="0x08" name="2.7" cname="_BORV_27" sdcc_cname="_BODENV_2_7V" /> <value value="0x0C" name="2.0" cname="_BORV_20" sdcc_cname="_BODENV_2_0V" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x0E" > + </mask> + <mask name="WDTPS" value="0x0E" > <value value="0x00" name="1:1" cname="_WDTPS_1" sdcc_cname="_WDTPS_1_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" sdcc_cname="_WDTPS_1_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" sdcc_cname="_WDTPS_1_4" /> @@ -92,118 +92,118 @@ <value value="0x0A" name="1:32" cname="_WDTPS_32" sdcc_cname="_WDTPS_1_32" /> <value value="0x0C" name="1:64" cname="_WDTPS_64" sdcc_cname="_WDTPS_1_64" /> <value value="0x0E" name="1:128" cname="_WDTPS_128" sdcc_cname="_WDTPS_1_128" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVR_OFF" /> <value value="0x01" name="On" cname="_STVR_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" sdcc_cname="_BACKBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" sdcc_cname="_BACKBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0200:1FFF" cname="_CP0_ON" sdcc_cname="_CP_0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_CP1_ON" sdcc_cname="_CP_1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_CP2_ON" sdcc_cname="_CP_2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" sdcc_cname="_CP_2_OFF" /> - </tqmask> - <tqmask name="CP_3" value="0x08" > + </mask> + <mask name="CP_3" value="0x08" > <value value="0x00" name="6000:7FFF" cname="_CP3_ON" sdcc_cname="_CP_3_ON" /> <value value="0x08" name="Off" cname="_CP3_OFF" sdcc_cname="_CP_3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0200:1FFF" cname="_WRT0_ON" sdcc_cname="_WRT_0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_WRT1_ON" sdcc_cname="_WRT_1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_WRT2_ON" sdcc_cname="_WRT_2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" sdcc_cname="_WRT_2_OFF" /> - </tqmask> - <tqmask name="WRT_3" value="0x08" > + </mask> + <mask name="WRT_3" value="0x08" > <value value="0x00" name="6000:7FFF" cname="_WRT3_ON" sdcc_cname="_WRT_3_ON" /> <value value="0x08" name="Off" cname="_WRT3_OFF" sdcc_cname="_WRT_3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0200:1FFF" cname="_EBTR0_ON" sdcc_cname="_EBTR_0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" sdcc_cname="_EBTR_1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_EBTR2_ON" sdcc_cname="_EBTR_2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" sdcc_cname="_EBTR_2_OFF" /> - </tqmask> - <tqmask name="EBTR_3" value="0x08" > + </mask> + <mask name="EBTR_3" value="0x08" > <value value="0x00" name="6000:7FFF" cname="_EBTR3_ON" sdcc_cname="_EBTR_3_ON" /> <value value="0x08" name="Off" cname="_EBTR3_OFF" sdcc_cname="_EBTR_3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F2580.xml b/src/devices/pic/xml_data/18F2580.xml index 4458519..6721af5 100644 --- a/src/devices/pic/xml_data/18F2580.xml +++ b/src/devices/pic/xml_data/18F2580.xml @@ -27,17 +27,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x007FFF" word_write_align="16" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -54,42 +54,42 @@ <value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC" /> <value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC" /> <value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="Software" cname="_BOREN_SBORENCTRL" /> <value value="0x04" name="On_run" cname="_BOREN_BOACTIVE" /> <value value="0x06" name="On" cname="_BOREN_BOHW" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -106,139 +106,139 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x82" > - <tqmask name="PBADEN" value="0x02" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x82" > + <mask name="PBADEN" value="0x02" > <value value="0x00" name="digital" cname="_PBADEN_OFF" /> <value value="0x02" name="analog" cname="_PBADEN_ON" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x10" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x10" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="BBSIZ" value="0x10" > + </mask> + <mask name="BBSIZ" value="0x10" > <value value="0x00" name="1024" cname="_BBSIZ_1024" /> <value value="0x10" name="2048" cname="_BBSIZ_2048" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800/1000:1FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_CP2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" /> - </tqmask> - <tqmask name="CP_3" value="0x08" > + </mask> + <mask name="CP_3" value="0x08" > <value value="0x00" name="6000:7FFF" cname="_CP3_ON" /> <value value="0x08" name="Off" cname="_CP3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="All" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800/1000:1FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_WRT2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" /> - </tqmask> - <tqmask name="WRT_3" value="0x08" > + </mask> + <mask name="WRT_3" value="0x08" > <value value="0x00" name="6000:7FFF" cname="_WRT3_ON" /> <value value="0x08" name="Off" cname="_WRT3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="All" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800/1000:1FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_EBTR2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" /> - </tqmask> - <tqmask name="EBTR_3" value="0x08" > + </mask> + <mask name="EBTR_3" value="0x08" > <value value="0x00" name="6000:7FFF" cname="_EBTR3_ON" /> <value value="0x08" name="Off" cname="_EBTR3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="All" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F2585.xml b/src/devices/pic/xml_data/18F2585.xml index fa6d739..12b38f1 100644 --- a/src/devices/pic/xml_data/18F2585.xml +++ b/src/devices/pic/xml_data/18F2585.xml @@ -27,17 +27,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x00BFFF" word_write_align="32" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -54,42 +54,42 @@ <value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC" /> <value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC" /> <value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="Software" cname="_BOREN_SBORENCTRL" /> <value value="0x04" name="On_run" cname="_BOREN_BOACTIVE" /> <value value="0x06" name="On" cname="_BOREN_BOHW" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -106,129 +106,129 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x82" > - <tqmask name="PBADEN" value="0x02" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x82" > + <mask name="PBADEN" value="0x02" > <value value="0x00" name="digital" cname="_PBADEN_OFF" /> <value value="0x02" name="analog" cname="_PBADEN_ON" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x30" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x30" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="BBSIZ" value="0x30" > + </mask> + <mask name="BBSIZ" value="0x30" > <value value="0x00" name="1024" cname="_BBSIZ_1024" /> <value value="0x10" name="2048" cname="_BBSIZ_2048" /> <value value="0x20" name="4096" cname="_BBSIZ_4096" /> <value value="0x30" name="4096" cname="_BBSIZ_4096" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x07" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800/1000/2000:3FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_CP2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="All" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x07" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800/1000/2000:3FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="All" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x07" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800/1000/2000:3FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="All" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F25J10.xml b/src/devices/pic/xml_data/18F25J10.xml index e6b94e0..57f37d4 100644 --- a/src/devices/pic/xml_data/18F25J10.xml +++ b/src/devices/pic/xml_data/18F25J10.xml @@ -31,55 +31,55 @@ <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" > - <tqmask name="WDT" value="0x01" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="STVREN" value="0x20" > + </mask> + <mask name="STVREN" value="0x20" > <value value="0x00" name="Off" cname="" /> <value value="0x20" name="On" cname="" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="" /> <value value="0x40" name="On" cname="" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0x7F" bvalue="0x04" > - <tqmask name="CP" value="0x04" > + <config offset="0x1" name="CONFIG1H" wmask="0x7F" bvalue="0x04" > + <mask name="CP" value="0x04" > <value value="0x00" name="All" cname="" /> <value value="0x04" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="FOSC" value="0x03" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" > + <mask name="FOSC" value="0x03" > <value value="0x00" name="HS" cname="" /> <value value="0x01" name="HSPLL" cname="" /> <value value="0x02" name="EC" cname="" /> <value value="0x03" name="ECPLL_IO" cname="" /> - </tqmask> - <tqmask name="FOSC2" value="0x04" > + </mask> + <mask name="FOSC2" value="0x04" > <value value="0x00" name="FOSC1:FOSC0" cname="" /> <value value="0x04" name="INTRC" cname="" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="On" cname="" /> <value value="0x40" name="Off" cname="" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDTPS" value="0x0F" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDTPS" value="0x0F" > <value value="0x00" name="1:1" cname="" /> <value value="0x01" name="1:2" cname="" /> <value value="0x02" name="1:4" cname="" /> @@ -96,23 +96,23 @@ <value value="0x0D" name="1:8192" cname="" /> <value value="0x0E" name="1:16384" cname="" /> <value value="0x0F" name="1:32768" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" > </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x07" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="" /> <value value="0x01" name="RC1" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0xFF" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0xFF" > </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0xF8" > + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0xF8" > </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F2610.xml b/src/devices/pic/xml_data/18F2610.xml index 3de5893..e38c6d2 100644 --- a/src/devices/pic/xml_data/18F2610.xml +++ b/src/devices/pic/xml_data/18F2610.xml @@ -27,16 +27,16 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x00FFFF" word_write_align="32" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -53,42 +53,42 @@ <value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC" /> <value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC" /> <value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="Software" cname="_BOREN_ON" /> <value value="0x04" name="On_run" cname="_BOREN_NOSLP" /> <value value="0x06" name="On" cname="_BOREN_SBORDIS" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -105,131 +105,131 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" /> <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" /> - </tqmask> - <tqmask name="PBADEN" value="0x02" > + </mask> + <mask name="PBADEN" value="0x02" > <value value="0x00" name="digital" cname="_PBADEN_OFF" /> <value value="0x02" name="analog" cname="_PBADEN_ON" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800:3FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_CP2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" /> - </tqmask> - <tqmask name="CP_3" value="0x08" > + </mask> + <mask name="CP_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_CP3_ON" /> <value value="0x08" name="Off" cname="_CP3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x40" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800:3FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" /> - </tqmask> - <tqmask name="WRT_3" value="0x08" > + </mask> + <mask name="WRT_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_WRT3_ON" /> <value value="0x08" name="Off" cname="_WRT3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x60" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x60" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800:3FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" /> - </tqmask> - <tqmask name="EBTR_3" value="0x08" > + </mask> + <mask name="EBTR_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" /> <value value="0x08" name="Off" cname="_EBTR3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F2620.xml b/src/devices/pic/xml_data/18F2620.xml index faacae3..7c25f21 100644 --- a/src/devices/pic/xml_data/18F2620.xml +++ b/src/devices/pic/xml_data/18F2620.xml @@ -30,17 +30,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x00FFFF" word_write_align="32" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -51,42 +51,42 @@ <value value="0x07" name="EXTRC_IO" cname="_OSC_RCIO6" /> <value value="0x08" name="INTRC_IO" cname="_OSC_INTIO67" /> <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="Software" cname="_BOREN_ON" /> <value value="0x04" name="On_run" cname="_BOREN_NOSLP" /> <value value="0x06" name="On" cname="_BOREN_SBORDIS" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.6" cname="_BORV_0" sdcc_cname="_BORV_46" /> <value value="0x08" name="4.3" cname="_BORV_1" sdcc_cname="_BORV_43" /> <value value="0x10" name="2.8" cname="_BORV_2" sdcc_cname="_BORV_28" /> <value value="0x18" name="2.1" cname="_BORV_3" sdcc_cname="_BORV_21" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" sdcc_cname="_WDT_DISABLED_CONTROLLED" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" sdcc_cname="_WDTPS_1_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" sdcc_cname="_WDTPS_1_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" sdcc_cname="_WDTPS_1_4" /> @@ -103,131 +103,131 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" sdcc_cname="_WDTPS_1_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" sdcc_cname="_WDTPS_1_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" sdcc_cname="_WDTPS_1_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" sdcc_cname="_CCP2MUX_RB3" /> <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" sdcc_cname="_CCP2MUX_RC1" /> - </tqmask> - <tqmask name="PBADEN" value="0x02" > + </mask> + <mask name="PBADEN" value="0x02" > <value value="0x00" name="digital" cname="_PBADEN_OFF" sdcc_cname="_PBADEN_PORTB_4_0__CONFIGURED_AS_DIGITAL_I_O_ON_RESET" /> <value value="0x02" name="analog" cname="_PBADEN_ON" sdcc_cname="_PBADEN_PORTB_4_0__CONFIGURED_AS_ANALOG_INPUTS_ON_RESET" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" sdcc_cname="_MCLRE_MCLR_OFF_RE3_ON" /> <value value="0x80" name="External" cname="_MCLRE_ON" sdcc_cname="_MCLRE_MCLR_ON_RE3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" sdcc_cname="_STVR_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" sdcc_cname="_STVR_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800:3FFF" cname="_CP0_ON" sdcc_cname="_CP_0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_CP1_ON" sdcc_cname="_CP_1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_CP2_ON" sdcc_cname="_CP_2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" sdcc_cname="_CP_2_OFF" /> - </tqmask> - <tqmask name="CP_3" value="0x08" > + </mask> + <mask name="CP_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_CP3_ON" sdcc_cname="_CP_3_ON" /> <value value="0x08" name="Off" cname="_CP3_OFF" sdcc_cname="_CP_3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x40" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800:3FFF" cname="_WRT0_ON" sdcc_cname="_WRT_0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_WRT1_ON" sdcc_cname="_WRT_1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" sdcc_cname="_WRT_2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" sdcc_cname="_WRT_2_OFF" /> - </tqmask> - <tqmask name="WRT_3" value="0x08" > + </mask> + <mask name="WRT_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_WRT3_ON" sdcc_cname="_WRT_3_ON" /> <value value="0x08" name="Off" cname="_WRT3_OFF" sdcc_cname="_WRT_3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x60" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x60" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800:3FFF" cname="_EBTR0_ON" sdcc_cname="_EBTR_0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" sdcc_cname="_EBTR_1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" sdcc_cname="_EBTR_2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" sdcc_cname="_EBTR_2_OFF" /> - </tqmask> - <tqmask name="EBTR_3" value="0x08" > + </mask> + <mask name="EBTR_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" sdcc_cname="_EBTR_3_ON" /> <value value="0x08" name="Off" cname="_EBTR3_OFF" sdcc_cname="_EBTR_3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F2680.xml b/src/devices/pic/xml_data/18F2680.xml index 09c4863..2dcd013 100644 --- a/src/devices/pic/xml_data/18F2680.xml +++ b/src/devices/pic/xml_data/18F2680.xml @@ -27,17 +27,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x00FFFF" word_write_align="32" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -54,42 +54,42 @@ <value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC" /> <value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC" /> <value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="Software" cname="_BOREN_SBORENCTRL" /> <value value="0x04" name="On_run" cname="_BOREN_BOACTIVE" /> <value value="0x06" name="On" cname="_BOREN_BOHW" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -106,141 +106,141 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x82" > - <tqmask name="PBADEN" value="0x02" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x82" > + <mask name="PBADEN" value="0x02" > <value value="0x00" name="digital" cname="_PBADEN_OFF" /> <value value="0x02" name="analog" cname="_PBADEN_ON" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x30" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x30" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="BBSIZ" value="0x30" > + </mask> + <mask name="BBSIZ" value="0x30" > <value value="0x00" name="1024" cname="_BBSIZ_1024" /> <value value="0x10" name="2048" cname="_BBSIZ_2048" /> <value value="0x20" name="4096" cname="_BBSIZ_4096" /> <value value="0x30" name="4096" cname="_BBSIZ_4096" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800/1000/2000:3FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_CP2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" /> - </tqmask> - <tqmask name="CP_3" value="0x08" > + </mask> + <mask name="CP_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_CP3_ON" /> <value value="0x08" name="Off" cname="_CP3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="All" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800/1000/2000:3FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" /> - </tqmask> - <tqmask name="WRT_3" value="0x08" > + </mask> + <mask name="WRT_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_WRT3_ON" /> <value value="0x08" name="Off" cname="_WRT3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="All" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800/1000/2000:3FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" /> - </tqmask> - <tqmask name="EBTR_3" value="0x08" > + </mask> + <mask name="EBTR_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" /> <value value="0x08" name="Off" cname="_EBTR3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="All" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F2682.xml b/src/devices/pic/xml_data/18F2682.xml index 9f5501f..8c13b2d 100644 --- a/src/devices/pic/xml_data/18F2682.xml +++ b/src/devices/pic/xml_data/18F2682.xml @@ -27,17 +27,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x013FFF" word_write_align="32" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -48,42 +48,42 @@ <value value="0x07" name="EXTRC_IO" cname="_OSC_RCIO" /> <value value="0x08" name="INTRC_IO" cname="_OSC_IRCIO67" /> <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_IRCIO7" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="Software" cname="_BOREN_SBORENCTRL" /> <value value="0x04" name="On_run" cname="_BOREN_BOACTIVE" /> <value value="0x06" name="On" cname="_BOREN_BOHW" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -100,153 +100,153 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x82" > - <tqmask name="PBADEN" value="0x02" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x82" > + <mask name="PBADEN" value="0x02" > <value value="0x00" name="digital" cname="_PBADEN_OFF" /> <value value="0x02" name="analog" cname="_PBADEN_ON" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x30" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x30" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="BBSIZ" value="0x30" > + </mask> + <mask name="BBSIZ" value="0x30" > <value value="0x00" name="1024" cname="_BBSIZ_1024" /> <value value="0x10" name="2048" cname="_BBSIZ_2048" /> <value value="0x20" name="4096" cname="_BBSIZ_4096" /> <value value="0x30" name="4096" cname="_BBSIZ_4096" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x1F" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800/1000/2000:3FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_CP2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" /> - </tqmask> - <tqmask name="CP_3" value="0x08" > + </mask> + <mask name="CP_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_CP3_ON" /> <value value="0x08" name="Off" cname="_CP3_OFF" /> - </tqmask> - <tqmask name="CP_4" value="0x10" > + </mask> + <mask name="CP_4" value="0x10" > <value value="0x00" name="10000:13FFF" cname="_CP4_ON" /> <value value="0x10" name="Off" cname="_CP4_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="All" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x1F" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800/1000/2000:3FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" /> - </tqmask> - <tqmask name="WRT_3" value="0x08" > + </mask> + <mask name="WRT_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_WRT3_ON" /> <value value="0x08" name="Off" cname="_WRT3_OFF" /> - </tqmask> - <tqmask name="WRT_4" value="0x10" > + </mask> + <mask name="WRT_4" value="0x10" > <value value="0x00" name="10000:13FFF" cname="_WRT4_ON" /> <value value="0x10" name="Off" cname="_WRT4_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="All" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x1F" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800/1000/2000:3FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" /> - </tqmask> - <tqmask name="EBTR_3" value="0x08" > + </mask> + <mask name="EBTR_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" /> <value value="0x08" name="Off" cname="_EBTR3_OFF" /> - </tqmask> - <tqmask name="EBTR_4" value="0x10" > + </mask> + <mask name="EBTR_4" value="0x10" > <value value="0x00" name="10000:13FFF" cname="_EBTR4_ON" /> <value value="0x10" name="Off" cname="_EBTR4_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="All" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F2685.xml b/src/devices/pic/xml_data/18F2685.xml index cba2b20..bca6818 100644 --- a/src/devices/pic/xml_data/18F2685.xml +++ b/src/devices/pic/xml_data/18F2685.xml @@ -27,17 +27,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x017FFF" word_write_align="32" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -48,42 +48,42 @@ <value value="0x07" name="EXTRC_IO" cname="_OSC_RCIO" /> <value value="0x08" name="INTRC_IO" cname="_OSC_IRCIO67" /> <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_IRCIO7" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="Software" cname="_BOREN_SBORENCTRL" /> <value value="0x04" name="On_run" cname="_BOREN_BOACTIVE" /> <value value="0x06" name="On" cname="_BOREN_BOHW" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -100,165 +100,165 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x82" > - <tqmask name="PBADEN" value="0x02" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x82" > + <mask name="PBADEN" value="0x02" > <value value="0x00" name="digital" cname="_PBADEN_OFF" /> <value value="0x02" name="analog" cname="_PBADEN_ON" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x30" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x30" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="BBSIZ" value="0x30" > + </mask> + <mask name="BBSIZ" value="0x30" > <value value="0x00" name="1024" cname="_BBSIZ_1024" /> <value value="0x10" name="2048" cname="_BBSIZ_2048" /> <value value="0x20" name="4096" cname="_BBSIZ_4096" /> <value value="0x30" name="4096" cname="_BBSIZ_4096" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x3F" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x3F" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800/1000/2000:3FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_CP2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" /> - </tqmask> - <tqmask name="CP_3" value="0x08" > + </mask> + <mask name="CP_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_CP3_ON" /> <value value="0x08" name="Off" cname="_CP3_OFF" /> - </tqmask> - <tqmask name="CP_4" value="0x10" > + </mask> + <mask name="CP_4" value="0x10" > <value value="0x00" name="10000:13FFF" cname="_CP4_ON" /> <value value="0x10" name="Off" cname="_CP4_OFF" /> - </tqmask> - <tqmask name="CP_5" value="0x20" > + </mask> + <mask name="CP_5" value="0x20" > <value value="0x00" name="14000:17FFF" cname="_CP5_ON" /> <value value="0x20" name="Off" cname="_CP5_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="All" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x3F" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x3F" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800/1000/2000:3FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" /> - </tqmask> - <tqmask name="WRT_3" value="0x08" > + </mask> + <mask name="WRT_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_WRT3_ON" /> <value value="0x08" name="Off" cname="_WRT3_OFF" /> - </tqmask> - <tqmask name="WRT_4" value="0x10" > + </mask> + <mask name="WRT_4" value="0x10" > <value value="0x00" name="10000:13FFF" cname="_WRT4_ON" /> <value value="0x10" name="Off" cname="_WRT4_OFF" /> - </tqmask> - <tqmask name="WRT_5" value="0x20" > + </mask> + <mask name="WRT_5" value="0x20" > <value value="0x00" name="14000:17FFF" cname="_WRT5_ON" /> <value value="0x20" name="Off" cname="_WRT5_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="All" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x3F" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x3F" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800/1000/2000:3FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" /> - </tqmask> - <tqmask name="EBTR_3" value="0x08" > + </mask> + <mask name="EBTR_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" /> <value value="0x08" name="Off" cname="_EBTR3_OFF" /> - </tqmask> - <tqmask name="EBTR_4" value="0x10" > + </mask> + <mask name="EBTR_4" value="0x10" > <value value="0x00" name="10000:13FFF" cname="_EBTR4_ON" /> <value value="0x10" name="Off" cname="_EBTR4_OFF" /> - </tqmask> - <tqmask name="EBTR_5" value="0x20" > + </mask> + <mask name="EBTR_5" value="0x20" > <value value="0x00" name="14000:17FFF" cname="_EBTR5_ON" /> <value value="0x20" name="Off" cname="_EBTR5_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="All" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F4220.xml b/src/devices/pic/xml_data/18F4220.xml index 12dda87..f1c19c7 100644 --- a/src/devices/pic/xml_data/18F4220.xml +++ b/src/devices/pic/xml_data/18F4220.xml @@ -35,17 +35,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x000FFF" word_write_align="4" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0xCF" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0xCF" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_LP_OSC" /> <value value="0x01" name="XT" cname="_XT_OSC" /> <value value="0x02" name="HS" cname="_HS_OSC" /> @@ -57,40 +57,40 @@ <value value="0x08" name="INTRC_IO" cname="_INTIO2_OSC" /> <value value="0x09" name="INTRC_CLKOUT" cname="_INTIO1_OSC" /> <value value="default" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FSCM_OFF" /> <value value="0x40" name="On" cname="_FSCM_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x02" > + </mask> + <mask name="BODEN" value="0x02" > <value value="0x00" name="Off" cname="_BOR_OFF" /> <value value="0x02" name="On" cname="_BOR_ON" /> - </tqmask> - <tqmask name="BORV" value="0x0C" > + </mask> + <mask name="BORV" value="0x0C" > <value value="0x00" name="4.5" cname="_BORV_45" /> <value value="0x04" name="4.2" cname="_BORV_42" /> <value value="0x08" name="2.7" cname="_BORV_27" /> <value value="0x0C" name="2.0" cname="_BORV_20" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -107,107 +107,107 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8K" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16K" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32K" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="_CCP2MX_B3" /> <value value="0x01" name="RC1" cname="_CCP2MX_C1" /> - </tqmask> - <tqmask name="PBADEN" value="0x02" > + </mask> + <mask name="PBADEN" value="0x02" > <value value="0x00" name="digital" cname="_PBAD_DIG" /> <value value="0x02" name="analog" cname="_PBAD_ANA" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVR_OFF" /> <value value="0x01" name="On" cname="_STVR_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0200:07FF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="0800:0FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0200:07FF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="0800:0FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0200:07FF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="0800:0FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F4221.xml b/src/devices/pic/xml_data/18F4221.xml index 417ae32..d4a7e11 100644 --- a/src/devices/pic/xml_data/18F4221.xml +++ b/src/devices/pic/xml_data/18F4221.xml @@ -27,17 +27,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x000FFF" word_write_align="4" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -54,42 +54,42 @@ <value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC" /> <value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC" /> <value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOR_OFF" /> <value value="0x02" name="Software" cname="_BOR_SOFT" /> <value value="0x04" name="On_run" cname="_BOR_NOSLP" /> <value value="0x06" name="On" cname="_BOR_ON" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -106,125 +106,125 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x87" ctqmask="0x01" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x87" cmask="0x01" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="_CCP2MX_RB3" /> <value value="0x01" name="RC1" cname="_CCP2MX_RC1" /> - </tqmask> - <tqmask name="PBADEN" value="0x02" > + </mask> + <mask name="PBADEN" value="0x02" > <value value="0x00" name="digital" cname="_PBADEN_DIG" /> <value value="0x02" name="analog" cname="_PBADEN_ANA" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x38" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x38" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="ICPORT" value="0x08" > + </mask> + <mask name="ICPORT" value="0x08" > <value value="0x00" name="Off" cname="_ICPORT_OFF" /> <value value="0x08" name="On" cname="_ICPORT_ON" /> - </tqmask> - <tqmask name="BBSIZ" value="0x30" > + </mask> + <mask name="BBSIZ" value="0x30" > <value value="0x00" name="256" cname="_BBSIZ_BB256" /> <value value="0x10" name="512" cname="_BBSIZ_BB512" /> <value value="0x20" name="512" cname="_BBSIZ_BB512" /> <value value="0x30" name="512" cname="_BBSIZ_BB512" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0200/0400:07FF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="0800:0FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="All" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0200/0400:07FF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="0800:0FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="All" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0200/0400:07FF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="0800:0FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="All" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F4320.xml b/src/devices/pic/xml_data/18F4320.xml index 141b008..734bb11 100644 --- a/src/devices/pic/xml_data/18F4320.xml +++ b/src/devices/pic/xml_data/18F4320.xml @@ -37,17 +37,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x001FFF" word_write_align="4" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0xCF" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0xCF" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_LP_OSC" /> <value value="0x01" name="XT" cname="_XT_OSC" /> <value value="0x02" name="HS" cname="_HS_OSC" /> @@ -59,40 +59,40 @@ <value value="0x08" name="INTRC_IO" cname="_INTIO2_OSC" /> <value value="0x09" name="INTRC_CLKOUT" cname="_INTIO1_OSC" /> <value value="default" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FSCM_OFF" /> <value value="0x40" name="On" cname="_FSCM_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x02" > + </mask> + <mask name="BODEN" value="0x02" > <value value="0x00" name="Off" cname="_BOR_OFF" /> <value value="0x02" name="On" cname="_BOR_ON" /> - </tqmask> - <tqmask name="BORV" value="0x0C" > + </mask> + <mask name="BORV" value="0x0C" > <value value="0x00" name="4.5" cname="_BORV_45" /> <value value="0x04" name="4.2" cname="_BORV_42" /> <value value="0x08" name="2.7" cname="_BORV_27" /> <value value="0x0C" name="2.0" cname="_BORV_20" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -109,131 +109,131 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8K" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16K" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32K" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="_CCP2MX_B3" /> <value value="0x01" name="RC1" cname="_CCP2MX_C1" /> - </tqmask> - <tqmask name="PBADEN" value="0x02" > + </mask> + <mask name="PBADEN" value="0x02" > <value value="0x00" name="digital" cname="_PBAD_DIG" /> <value value="0x02" name="analog" cname="_PBAD_ANA" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVR_OFF" /> <value value="0x01" name="On" cname="_STVR_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0200:07FF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="0800:0FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="1000:17FF" cname="_CP2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" /> - </tqmask> - <tqmask name="CP_3" value="0x08" > + </mask> + <mask name="CP_3" value="0x08" > <value value="0x00" name="1800:1FFF" cname="_CP3_ON" /> <value value="0x08" name="Off" cname="_CP3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0200:07FF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="0800:0FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="1000:17FF" cname="_WRT2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" /> - </tqmask> - <tqmask name="WRT_3" value="0x08" > + </mask> + <mask name="WRT_3" value="0x08" > <value value="0x00" name="1800:1FFF" cname="_WRT3_ON" /> <value value="0x08" name="Off" cname="_WRT3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0200:07FF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="0800:0FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="1000:17FF" cname="_EBTR2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" /> - </tqmask> - <tqmask name="EBTR_3" value="0x08" > + </mask> + <mask name="EBTR_3" value="0x08" > <value value="0x00" name="1800:1FFF" cname="_EBTR3_ON" /> <value value="0x08" name="Off" cname="_EBTR3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F4321.xml b/src/devices/pic/xml_data/18F4321.xml index a7f5bd9..6bdd265 100644 --- a/src/devices/pic/xml_data/18F4321.xml +++ b/src/devices/pic/xml_data/18F4321.xml @@ -27,17 +27,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x001FFF" word_write_align="4" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -54,42 +54,42 @@ <value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC" /> <value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC" /> <value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOR_OFF" /> <value value="0x02" name="Software" cname="_BOR_SOFT" /> <value value="0x04" name="On_run" cname="_BOR_NOSLP" /> <value value="0x06" name="On" cname="_BOR_ON" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -106,125 +106,125 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x87" ctqmask="0x01" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x87" cmask="0x01" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="_CPP2MX_RB3" /> <value value="0x01" name="RC1" cname="_CPP2MX_RC1" /> - </tqmask> - <tqmask name="PBADEN" value="0x02" > + </mask> + <mask name="PBADEN" value="0x02" > <value value="0x00" name="digital" cname="_PBADEN_DIG" /> <value value="0x02" name="analog" cname="_PBADEN_ANA" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x38" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x38" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="ICPORT" value="0x08" > + </mask> + <mask name="ICPORT" value="0x08" > <value value="0x00" name="Off" cname="_ICPORT_OFF" /> <value value="0x08" name="On" cname="_ICPORT_ON" /> - </tqmask> - <tqmask name="BBSIZ" value="0x30" > + </mask> + <mask name="BBSIZ" value="0x30" > <value value="0x00" name="256" cname="_BBSIZ_BB256" /> <value value="0x10" name="512" cname="_BBSIZ_BB512" /> <value value="0x20" name="1024" cname="_BBSIZ_BB512" /> <value value="0x30" name="1024" cname="_BBSIZ_BB512" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0200/0400/0800:0FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="1000:1FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="All" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0200/0400/0800:0FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="1000:1FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="All" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0200/0400/0800:0FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="1000:1FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="All" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F4331.xml b/src/devices/pic/xml_data/18F4331.xml index 7709516..a22e667 100644 --- a/src/devices/pic/xml_data/18F4331.xml +++ b/src/devices/pic/xml_data/18F4331.xml @@ -34,17 +34,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x001FFF" word_write_align="4" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0xCF" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0xCF" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -61,40 +61,40 @@ <value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC" /> <value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC" /> <value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRTEN_ON" /> <value value="0x01" name="Off" cname="_PWRTEN_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x02" > + </mask> + <mask name="BODEN" value="0x02" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="On" cname="_BOREN_ON" /> - </tqmask> - <tqmask name="BORV" value="0x0C" > + </mask> + <mask name="BORV" value="0x0C" > <value value="0x00" name="4.5" cname="_BORV_45" /> <value value="0x04" name="4.2" cname="_BORV_42" /> <value value="0x08" name="2.7" cname="_BORV_27" /> <value value="0x0C" name="2.0" cname="_BORV_20" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x3F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x3F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDTEN_OFF" /> <value value="0x01" name="On" cname="_WDTEN_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDPS_1" /> <value value="0x02" name="1:2" cname="_WDPS_2" /> <value value="0x04" name="1:4" cname="_WDPS_4" /> @@ -111,136 +111,136 @@ <value value="0x1A" name="1:8192" cname="_WDPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDPS_32768" /> - </tqmask> - <tqmask name="WINEN" value="0x20" > + </mask> + <mask name="WINEN" value="0x20" > <value value="0x00" name="On" cname="_WINEN_ON" /> <value value="0x20" name="Off" cname="_WINEN_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x3C" > - <tqmask name="PWMPIN" value="0x04" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x3C" > + <mask name="PWMPIN" value="0x04" > <value value="0x00" name="On" cname="_PWMPIN_ON" /> <value value="0x04" name="Off" cname="_PWMPIN_OFF" /> - </tqmask> - <tqmask name="LPOL" value="0x08" > + </mask> + <mask name="LPOL" value="0x08" > <value value="0x00" name="low" cname="_LPOL_LOW" /> <value value="0x08" name="high" cname="_LPOL_HIGH" /> - </tqmask> - <tqmask name="HPOL" value="0x10" > + </mask> + <mask name="HPOL" value="0x10" > <value value="0x00" name="low" cname="_HPOL_LOW" /> <value value="0x10" name="high" cname="_HPOL_HIGH" /> - </tqmask> - <tqmask name="T1OSCMX" value="0x20" > + </mask> + <mask name="T1OSCMX" value="0x20" > <value value="0x00" name="Legacy" cname="_T1OSCMX_OFF" /> <value value="0x20" name="Low Power" cname="_T1OSCMX_ON" /> - </tqmask> + </mask> </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x9D" > - <tqmask name="FLTAMX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x9D" > + <mask name="FLTAMX" value="0x01" > <value value="0x00" name="RD4" cname="_FLTAMX_RD4" /> <value value="0x01" name="RC1" cname="_FLTAMX_RC1" /> - </tqmask> - <tqmask name="SSPMX" value="0x04" > + </mask> + <mask name="SSPMX" value="0x04" > <value value="0x00" name="RD3, RD2, RD1" cname="_SSPMX_RD1" /> <value value="0x04" name="RC5, RC4, RC7" cname="_SSPMX_RC7" /> - </tqmask> - <tqmask name="PWM4MX" value="0x08" > + </mask> + <mask name="PWM4MX" value="0x08" > <value value="0x00" name="RD5" cname="_PWM4MX_RD5" /> <value value="0x08" name="RB5" cname="_PWM4MX_RB5" /> - </tqmask> - <tqmask name="EXCLKMX" value="0x10" > + </mask> + <mask name="EXCLKMX" value="0x10" > <value value="0x00" name="RD0" cname="_EXCLKMX_RD0" /> <value value="0x10" name="RC3" cname="_EXCLKMX_RC3" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0200:0FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="1000:1FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0200:0FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="1000:1FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0200:0FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="1000:1FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F4410.xml b/src/devices/pic/xml_data/18F4410.xml index 42557f8..8ca9b17 100644 --- a/src/devices/pic/xml_data/18F4410.xml +++ b/src/devices/pic/xml_data/18F4410.xml @@ -27,16 +27,16 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x003FFF" word_write_align="16" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -53,42 +53,42 @@ <value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC" /> <value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC" /> <value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="Software" cname="_BOREN_ON" /> <value value="0x04" name="On_run" cname="_BOREN_NOSLP" /> <value value="0x06" name="On" cname="_BOREN_SBORDIS" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -105,107 +105,107 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" /> <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" /> - </tqmask> - <tqmask name="PBADEN" value="0x02" > + </mask> + <mask name="PBADEN" value="0x02" > <value value="0x00" name="digital" cname="_PBADEN_OFF" /> <value value="0x02" name="analog" cname="_PBADEN_ON" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x40" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x60" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x60" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F442.xml b/src/devices/pic/xml_data/18F442.xml index 1a864f5..61f6a63 100644 --- a/src/devices/pic/xml_data/18F442.xml +++ b/src/devices/pic/xml_data/18F442.xml @@ -34,17 +34,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x003FFF" word_write_align="4" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" > - <tqmask name="FOSC" value="0x07" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" > + <mask name="FOSC" value="0x07" > <value value="0x00" name="LP" cname="_LP_OSC" sdcc_cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_XT_OSC" sdcc_cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_HS_OSC" sdcc_cname="_OSC_HS" /> @@ -53,36 +53,36 @@ <value value="0x05" name="EC_IO" cname="_ECIO_OSC" sdcc_cname="_OSC_EC_OSC2_RA6" /> <value value="0x06" name="H4" cname="_HSPLL_OSC" sdcc_cname="_OSC_HS_PLL" /> <value value="0x07" name="EXTRC_IO" cname="_RCIO_OSC" sdcc_cname="_OSC_RC_OSC2" /> - </tqmask> - <tqmask name="OSCSEN" value="0x20" > + </mask> + <mask name="OSCSEN" value="0x20" > <value value="0x00" name="On" cname="_OSCS_ON" /> <value value="0x20" name="Off" cname="_OSCS_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" sdcc_cname="_PUT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" sdcc_cname="_PUT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x02" > + </mask> + <mask name="BODEN" value="0x02" > <value value="0x00" name="Off" cname="_BOR_OFF" sdcc_cname="_BODEN_OFF" /> <value value="0x02" name="On" cname="_BOR_ON" sdcc_cname="_BODEN_ON" /> - </tqmask> - <tqmask name="BORV" value="0x0C" > + </mask> + <mask name="BORV" value="0x0C" > <value value="0x00" name="4.5" cname="_BORV_45" sdcc_cname="_BODENV_4_5V" /> <value value="0x04" name="4.2" cname="_BORV_42" sdcc_cname="_BODENV_4_2V" /> <value value="0x08" name="2.7" cname="_BORV_27" sdcc_cname="_BODENV_2_7V" /> <value value="0x0C" name="2.0" cname="_BORV_20" sdcc_cname="_BODENV_2_0V" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x0E" > + </mask> + <mask name="WDTPS" value="0x0E" > <value value="0x00" name="1:1" cname="_WDTPS_1" sdcc_cname="_WDTPS_1_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" sdcc_cname="_WDTPS_1_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" sdcc_cname="_WDTPS_1_4" /> @@ -91,99 +91,99 @@ <value value="0x0A" name="1:32" cname="_WDTPS_32" sdcc_cname="_WDTPS_1_32" /> <value value="0x0C" name="1:64" cname="_WDTPS_64" sdcc_cname="_WDTPS_1_64" /> <value value="0x0E" name="1:128" cname="_WDTPS_128" sdcc_cname="_WDTPS_1_128" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="_CCP2MX_OFF" sdcc_cname="_CCP2MUX_RB3" /> <value value="0x01" name="RC1" cname="_CCP2MX_ON" sdcc_cname="_CCP2MUX_RC1"/> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVR_OFF" /> <value value="0x01" name="On" cname="_STVR_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" sdcc_cname="_BACKBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" sdcc_cname="_BACKBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0200:1FFF" cname="_CP0_ON" sdcc_cname="_CP_0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_CP1_ON" sdcc_cname="_CP_1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0200:1FFF" cname="_WRT0_ON" sdcc_cname="_WRT_0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_WRT1_ON" sdcc_cname="_WRT_1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0200:1FFF" cname="_EBTR0_ON" sdcc_cname="_EBTR_0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" sdcc_cname="_EBTR_1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F4420.xml b/src/devices/pic/xml_data/18F4420.xml index 19e9c62..83a0022 100644 --- a/src/devices/pic/xml_data/18F4420.xml +++ b/src/devices/pic/xml_data/18F4420.xml @@ -27,17 +27,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x003FFF" word_write_align="16" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -54,42 +54,42 @@ <value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC" /> <value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC" /> <value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="Software" cname="_BOREN_ON" /> <value value="0x04" name="On_run" cname="_BOREN_NOSLP" /> <value value="0x06" name="On" cname="_BOREN_SBORDIS" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -106,115 +106,115 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" /> <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" /> - </tqmask> - <tqmask name="PBADEN" value="0x02" > + </mask> + <mask name="PBADEN" value="0x02" > <value value="0x00" name="digital" cname="_PBADEN_OFF" /> <value value="0x02" name="analog" cname="_PBADEN_ON" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" ctqmask="0x80" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" cmask="0x80" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" ctqmask="0x80" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" cmask="0x80" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F4423.xml b/src/devices/pic/xml_data/18F4423.xml index 540c8e4..1760494 100644 --- a/src/devices/pic/xml_data/18F4423.xml +++ b/src/devices/pic/xml_data/18F4423.xml @@ -24,17 +24,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x003FFF" word_write_align="16" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -45,42 +45,42 @@ <value value="0x08" name="INTRC_IO" cname="_OSC_INTIO67" /> <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" /> <value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="Software" cname="_BOREN_ON" /> <value value="0x04" name="On_run" cname="_BOREN_NOSLP" /> <value value="0x06" name="On" cname="_BOREN_SBORDIS" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -97,115 +97,115 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" /> <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" /> - </tqmask> - <tqmask name="PBADEN" value="0x02" > + </mask> + <mask name="PBADEN" value="0x02" > <value value="0x00" name="digital" cname="_PBADEN_OFF" /> <value value="0x02" name="analog" cname="_PBADEN_ON" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" ctqmask="0x80" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" cmask="0x80" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" ctqmask="0x80" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" cmask="0x80" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F4431.xml b/src/devices/pic/xml_data/18F4431.xml index dc8edc0..c19b48a 100644 --- a/src/devices/pic/xml_data/18F4431.xml +++ b/src/devices/pic/xml_data/18F4431.xml @@ -35,17 +35,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x003FFF" word_write_align="4" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0xCF" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0xCF" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -62,40 +62,40 @@ <value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC" /> <value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC" /> <value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRTEN_ON" /> <value value="0x01" name="Off" cname="_PWRTEN_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x02" > + </mask> + <mask name="BODEN" value="0x02" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="On" cname="_BOREN_ON" /> - </tqmask> - <tqmask name="BORV" value="0x0C" > + </mask> + <mask name="BORV" value="0x0C" > <value value="0x00" name="4.5" cname="_BORV_45" /> <value value="0x04" name="4.2" cname="_BORV_42" /> <value value="0x08" name="2.7" cname="_BORV_27" /> <value value="0x0C" name="2.0" cname="_BORV_20" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x3F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x3F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDTEN_OFF" /> <value value="0x01" name="On" cname="_WDTEN_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDPS_1" /> <value value="0x02" name="1:2" cname="_WDPS_2" /> <value value="0x04" name="1:4" cname="_WDPS_4" /> @@ -112,160 +112,160 @@ <value value="0x1A" name="1:8192" cname="_WDPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDPS_32768" /> - </tqmask> - <tqmask name="WINEN" value="0x20" > + </mask> + <mask name="WINEN" value="0x20" > <value value="0x00" name="On" cname="_WINEN_ON" /> <value value="0x20" name="Off" cname="_WINEN_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x3C" > - <tqmask name="PWMPIN" value="0x04" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x3C" > + <mask name="PWMPIN" value="0x04" > <value value="0x00" name="On" cname="_PWMPIN_ON" /> <value value="0x04" name="Off" cname="_PWMPIN_OFF" /> - </tqmask> - <tqmask name="LPOL" value="0x08" > + </mask> + <mask name="LPOL" value="0x08" > <value value="0x00" name="low" cname="_LPOL_LOW" /> <value value="0x08" name="high" cname="_LPOL_HIGH" /> - </tqmask> - <tqmask name="HPOL" value="0x10" > + </mask> + <mask name="HPOL" value="0x10" > <value value="0x00" name="low" cname="_HPOL_LOW" /> <value value="0x10" name="high" cname="_HPOL_HIGH" /> - </tqmask> - <tqmask name="T1OSCMX" value="0x20" > + </mask> + <mask name="T1OSCMX" value="0x20" > <value value="0x00" name="Legacy" cname="_T1OSCMX_OFF" /> <value value="0x20" name="Low Power" cname="_T1OSCMX_ON" /> - </tqmask> + </mask> </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x9D" > - <tqmask name="FLTAMX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x9D" > + <mask name="FLTAMX" value="0x01" > <value value="0x00" name="RD4" cname="_FLTAMX_RD4" /> <value value="0x01" name="RC1" cname="_FLTAMX_RC1" /> - </tqmask> - <tqmask name="SSPMX" value="0x04" > + </mask> + <mask name="SSPMX" value="0x04" > <value value="0x00" name="RD3, RD2, RD1" cname="_SSPMX_RD1" /> <value value="0x04" name="RC5, RC4, RC7" cname="_SSPMX_RC7" /> - </tqmask> - <tqmask name="PWM4MX" value="0x08" > + </mask> + <mask name="PWM4MX" value="0x08" > <value value="0x00" name="RD5" cname="_PWM4MX_RD5" /> <value value="0x08" name="RB5" cname="_PWM4MX_RB5" /> - </tqmask> - <tqmask name="EXCLKMX" value="0x10" > + </mask> + <mask name="EXCLKMX" value="0x10" > <value value="0x00" name="RD0" cname="_EXCLKMX_RD0" /> <value value="0x10" name="RC3" cname="_EXCLKMX_RC3" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0200:0FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="1000:1FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="2000:2FFF" cname="_CP2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" /> - </tqmask> - <tqmask name="CP_3" value="0x08" > + </mask> + <mask name="CP_3" value="0x08" > <value value="0x00" name="3000:3FFF" cname="_CP3_ON" /> <value value="0x08" name="Off" cname="_CP3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0200:0FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="1000:1FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="2000:2FFF" cname="_WRT2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" /> - </tqmask> - <tqmask name="WRT_3" value="0x08" > + </mask> + <mask name="WRT_3" value="0x08" > <value value="0x00" name="3000:3FFF" cname="_WRT3_ON" /> <value value="0x08" name="Off" cname="_WRT3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0200:0FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="1000:1FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="2000:2FFF" cname="_EBTR2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" /> - </tqmask> - <tqmask name="EBTR_3" value="0x08" > + </mask> + <mask name="EBTR_3" value="0x08" > <value value="0x00" name="3000:3FFF" cname="_EBTR3_ON" /> <value value="0x08" name="Off" cname="_EBTR3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F4439.xml b/src/devices/pic/xml_data/18F4439.xml index 9104408..3441809 100644 --- a/src/devices/pic/xml_data/18F4439.xml +++ b/src/devices/pic/xml_data/18F4439.xml @@ -35,48 +35,48 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x003FFF" word_write_align="4" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" > - <tqmask name="FOSC" value="0x07" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" > + <mask name="FOSC" value="0x07" > <value value="default" name="invalid" /> <value value="0x02" name="HS" cname="_OSC_HS" /> <value value="0x04" name="EC_CLKOUT" cname="_OSC_EC" /> <value value="0x05" name="EC_IO" cname="_OSC_ECIO" /> <value value="0x06" name="H4" cname="_OSC_HSPLL" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x02" > + </mask> + <mask name="BODEN" value="0x02" > <value value="0x00" name="Off" cname="_BOR_OFF" /> <value value="0x02" name="On" cname="_BOR_ON" /> - </tqmask> - <tqmask name="BORV" value="0x0C" > + </mask> + <mask name="BORV" value="0x0C" > <value value="0x00" name="4.5" cname="_BORV_45" /> <value value="0x04" name="4.2" cname="_BORV_42" /> <value value="0x08" name="2.7" cname="_BORV_27" /> <value value="0x0C" name="2.5" cname="_BORV_25" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x0E" > + </mask> + <mask name="WDTPS" value="0x0E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -85,94 +85,94 @@ <value value="0x0A" name="1:32" cname="_WDTPS_32" /> <value value="0x0C" name="1:64" cname="_WDTPS_64" /> <value value="0x0E" name="1:128" cname="_WDTPS_128" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVR_OFF" /> <value value="0x01" name="On" cname="_STVR_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x07" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0200:1FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x07" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0200:1FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x07" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0200:1FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F4450.xml b/src/devices/pic/xml_data/18F4450.xml index 208518e..e634df1 100644 --- a/src/devices/pic/xml_data/18F4450.xml +++ b/src/devices/pic/xml_data/18F4450.xml @@ -27,14 +27,14 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x003FFF" word_write_align="8" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x07" ctqmask="0x00" > - <tqmask name="PLLDIV" value="0x07" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x07" cmask="0x00" > + <mask name="PLLDIV" value="0x07" > <value value="0x00" name="1" cname="_PLLDIV_1" /> <value value="0x01" name="2" cname="_PLLDIV_2" /> <value value="0x02" name="3" cname="_PLLDIV_3" /> @@ -43,21 +43,21 @@ <value value="0x05" name="6" cname="_PLLDIV_6" /> <value value="0x06" name="10" cname="_PLLDIV_10" /> <value value="0x07" name="12" cname="_PLLDIV_12" /> - </tqmask> - <tqmask name="CPUDIV" value="0x18" > + </mask> + <mask name="CPUDIV" value="0x18" > <value value="0x00" name="1" cname="_CPUDIV_OSC1_PLL2" /> <value value="0x08" name="2" cname="_CPUDIV_OSC2_PLL3" /> <value value="0x10" name="3" cname="_CPUDIV_OSC3_PLL4" /> <value value="0x18" name="4" cname="_CPUDIV_OSC4_PLL6" /> - </tqmask> - <tqmask name="USBDIV" value="0x20" > + </mask> + <mask name="USBDIV" value="0x20" > <value value="0x00" name="1" cname="_USBDIV_1" /> <value value="0x20" name="2" cname="_USBDIV_2" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" ctqmask="0x00" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" cmask="0x00" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="XT" cname="_FOSC_XT_XT" /> <value value="0x01" name="XT" cname="_FOSC_XT_XT" /> <value value="0x02" name="XTPLL" cname="_FOSC_XTPLL" /> @@ -74,46 +74,46 @@ <value value="0x0D" name="HS" cname="_FOSC_HS" /> <value value="0x0E" name="HSPLL" cname="_FOSC_HSPLL_HS" /> <value value="0x0F" name="HSPLL" cname="_FOSC_HSPLL_HS" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOR_OFF" /> <value value="0x02" name="Software" cname="_BOR_SOFT" /> <value value="0x04" name="On_run" cname="_BOR_ON_ACTIVE" /> <value value="0x06" name="On" cname="_BOR_ON" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.6" cname="_BORV_46" /> <value value="0x08" name="4.3" cname="_BORV_43" /> <value value="0x10" name="2.8" cname="_BORV_28" /> <value value="0x18" name="2.1" cname="_BORV_21" /> - </tqmask> - <tqmask name="VREGEN" value="0x20" > + </mask> + <mask name="VREGEN" value="0x20" > <value value="0x00" name="Off" cname="_VREGEN_OFF" /> <value value="0x20" name="On" cname="_VREGEN_ON" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -130,111 +130,111 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x82" ctqmask="0x00" > - <tqmask name="PBADEN" value="0x02" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x82" cmask="0x00" > + <mask name="PBADEN" value="0x02" > <value value="0x00" name="digital" cname="_PBADEN_OFF" /> <value value="0x02" name="analog" cname="_PBADEN_ON" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x28" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x28" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="BBSIZ" value="0x08" > + </mask> + <mask name="BBSIZ" value="0x08" > <value value="0x00" name="1024" cname="_BBSIZ_1024" /> <value value="0x08" name="2048" cname="_BBSIZ_2048" /> - </tqmask> - <tqmask name="ICPORT" value="0x20" > + </mask> + <mask name="ICPORT" value="0x20" > <value value="0x00" name="On" cname="_ICPORT_ON" /> <value value="0x20" name="Off" cname="_ICPORT_OFF" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800/1000:1FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x40" > + <mask name="CPB" value="0x40" > <value value="0x00" name="All" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800/1000:1FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x60" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x60" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="All" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800/1000:1FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="All" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F4455.xml b/src/devices/pic/xml_data/18F4455.xml index 6a77cfb..282decb 100644 --- a/src/devices/pic/xml_data/18F4455.xml +++ b/src/devices/pic/xml_data/18F4455.xml @@ -26,15 +26,15 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x005FFF" word_write_align="16" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" > - <tqmask name="PLLDIV" value="0x07" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" > + <mask name="PLLDIV" value="0x07" > <value value="0x00" name="1" cname="_PLLDIV_1" sdcc_cname="_PLLDIV_NO_DIVIDE__4MHZ_INPUT_" /> <value value="0x01" name="2" cname="_PLLDIV_2" sdcc_cname="_PLLDIV_DIVIDE_BY_2__8MHZ_INPUT_" /> <value value="0x02" name="3" cname="_PLLDIV_3" sdcc_cname="_PLLDIV_DIVIDE_BY_3__12MHZ_INPUT_" /> @@ -43,21 +43,21 @@ <value value="0x05" name="6" cname="_PLLDIV_6" sdcc_cname="_PLLDIV_DIVIDE_BY_6__24MHZ_INPUT_" /> <value value="0x06" name="10" cname="_PLLDIV_10" sdcc_cname="_PLLDIV_DIVIDE_BY_10__40MHZ_INPUT_" /> <value value="0x07" name="12" cname="_PLLDIV_12" sdcc_cname="_PLLDIV_DIVIDE_BY_12__48MHZ_INPUT_" /> - </tqmask> - <tqmask name="CPUDIV" value="0x18" > + </mask> + <mask name="CPUDIV" value="0x18" > <value value="0x00" name="1" cname="_CPUDIV_OSC1_PLL2" sdcc_cname="_CPUDIV__OSC1_OSC2_SRC___1__96MHZ_PLL_SRC___2_" /> <value value="0x08" name="2" cname="_CPUDIV_OSC2_PLL3" sdcc_cname="_CPUDIV__OSC1_OSC2_SRC___2__96MHZ_PLL_SRC___3_" /> <value value="0x10" name="3" cname="_CPUDIV_OSC3_PLL4" sdcc_cname="_CPUDIV__OSC1_OSC2_SRC___3__96MHZ_PLL_SRC___4_" /> <value value="0x18" name="4" cname="_CPUDIV_OSC4_PLL6" sdcc_cname="_CPUDIV__OSC1_OSC2_SRC___4__96MHZ_PLL_SRC___6_" /> - </tqmask> - <tqmask name="USBDIV" value="0x20" > + </mask> + <mask name="USBDIV" value="0x20" > <value value="0x00" name="1" cname="_USBDIV_1" sdcc_cname="_USBPLL_CLOCK_SRC_FROM_OSC1_OSC2" /> <value value="0x20" name="2" cname="_USBDIV_2" sdcc_cname="_USBPLL_CLOCK_SRC_FROM_96MHZ_PLL_2" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x05" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x05" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="XT" cname="_FOSC_XT_XT" sdcc_cname="_OSC_XT__USB_XT" /> <value value="0x01" name="XT" cname="_FOSC_XT_XT" sdcc_cname="_OSC_XT__USB_XT" /> <value value="0x02" name="XTPLL" cname="_FOSC_XTPLL" sdcc_cname="_OSC_XT__XT_PLL__USB_XT" /> @@ -74,46 +74,46 @@ <value value="0x0D" name="HS" cname="_FOSC_HS" sdcc_cname="_OSC_HS__USB_HS" /> <value value="0x0E" name="HSPLL" cname="_FOSC_HSPLL_HS" sdcc_cname="_OSC_HS__HS_PLL__USB_HS" /> <value value="0x0F" name="HSPLL" cname="_FOSC_HSPLL_HS" sdcc_cname="_OSC_HS__HS_PLL__USB_HS" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEM_OFF" sdcc_cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEM_ON" sdcc_cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" sdcc_cname="_PUT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" sdcc_cname="_PUT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOR_OFF" sdcc_cname="_BODEN_OFF" /> <value value="0x02" name="Software" cname="_BOR_SOFT" sdcc_cname="_BODEN_CONTROLLED_WITH_SBOREN_BIT" /> <value value="0x04" name="On_run" cname="_BOR_ON_ACTIVE" sdcc_cname="_BODEN_ON_WHILE_ACTIVE" /> <value value="0x06" name="On" cname="_BOR_ON" sdcc_cname="_BODEN_ON" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" sdcc_cname="_BODENV_4_5V" /> <value value="0x08" name="4.2" cname="_BORV_1" sdcc_cname="_BODENV_4_2V" /> <value value="0x10" name="2.7" cname="_BORV_2" sdcc_cname="_BODENV_2_7V" /> <value value="0x18" name="2.0" cname="_BORV_3" sdcc_cname="_BODENV_2_0V" /> - </tqmask> - <tqmask name="VREGEN" value="0x20" > + </mask> + <mask name="VREGEN" value="0x20" > <value value="0x00" name="Off" cname="_VREGEN_OFF" /> <value value="0x20" name="On" cname="_VREGEN_ON" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" sdcc_cname="_WDT_DISABLED_CONTROLLED" /> <value value="0x01" name="On" cname="_WDT_ON" sdcc_cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" sdcc_cname="_WDTPS_1_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" sdcc_cname="_WDTPS_1_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" sdcc_cname="_WDTPS_1_4" /> @@ -130,131 +130,131 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" sdcc_cname="_WDTPS_1_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" sdcc_cname="_WDTPS_1_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" sdcc_cname="_WDTPS_1_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="_CCP2MX_OFF" sdcc_cname="_CCP2MUX_RB3" /> <value value="0x01" name="RC1" cname="_CCP2MX_ON" sdcc_cname="_CCP2MUX_RC1" /> - </tqmask> - <tqmask name="PBADEN" value="0x02" > + </mask> + <mask name="PBADEN" value="0x02" > <value value="0x00" name="digital" cname="_PBADEN_OFF" sdcc_cname="_PBADEN_PORTB_4_0__CONFIGURED_AS_DIGITAL_I_O_ON_RESET" /> <value value="0x02" name="analog" cname="_PBADEN_ON" sdcc_cname="_PBADEN_PORTB_4_0__CONFIGURED_AS_ANALOG_INPUTS_ON_RESET" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" sdcc_cname="_MCLRE_MCLR_OFF_RE3_ON" /> <value value="0x80" name="External" cname="_MCLRE_ON" sdcc_cname="_MCLRE_MCLR_ON_RE3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x20" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x20" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" sdcc_cname="_STVR_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" sdcc_cname="_STVR_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="ICPORT" value="0x20" > + </mask> + <mask name="ICPORT" value="0x20" > <value value="0x00" name="Off" cname="_ICPRT_OFF" sdcc_cname="_ENICPORT_OFF" /> <value value="0x20" name="On" cname="_ICPRT_ON" sdcc_cname="_ENICPORT_ON" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" sdcc_cname="_ENHCPU_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" sdcc_cname="_ENHCPU_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" sdcc_cname="_BACKBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" sdcc_cname="_BACKBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x07" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_CP0_ON" sdcc_cname="_CP_0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_CP1_ON" sdcc_cname="_CP_1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_CP2_ON" sdcc_cname="_CP_2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" sdcc_cname="_CP_2_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x07" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_WRT0_ON" sdcc_cname="_WRT_0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_WRT1_ON" sdcc_cname="_WRT_1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_WRT2_ON" sdcc_cname="_WRT_2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" sdcc_cname="_WRT_2_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" ctqmask="0xC0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" cmask="0xC0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x07" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_EBTR0_ON" sdcc_cname="_EBTR_0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" sdcc_cname="_EBTR_1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_EBTR2_ON" sdcc_cname="_EBTR_2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" sdcc_cname="_EBTR_2_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F448.xml b/src/devices/pic/xml_data/18F448.xml index 137b34a..40de124 100644 --- a/src/devices/pic/xml_data/18F448.xml +++ b/src/devices/pic/xml_data/18F448.xml @@ -34,17 +34,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x003FFF" word_write_align="4" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" > - <tqmask name="FOSC" value="0x07" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" > + <mask name="FOSC" value="0x07" > <value value="0x00" name="LP" cname="_LP_OSC" sdcc_cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_XT_OSC" sdcc_cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_HS_OSC" sdcc_cname="_OSC_HS" /> @@ -53,36 +53,36 @@ <value value="0x05" name="EC_IO" cname="_ECIO_OSC" sdcc_cname="_OSC_EC_OSC2_RA6" /> <value value="0x06" name="H4" cname="_HSPLL_OSC" sdcc_cname="_OSC_HS_PLL" /> <value value="0x07" name="EXTRC_IO" cname="_RCIO_OSC" sdcc_cname="_OSC_RC_OSC2" /> - </tqmask> - <tqmask name="OSCSEN" value="0x20" > + </mask> + <mask name="OSCSEN" value="0x20" > <value value="0x00" name="On" cname="_OSCS_ON" /> <value value="0x20" name="Off" cname="_OSCS_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" sdcc_cname="_PUT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" sdcc_cname="_PUT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x02" > + </mask> + <mask name="BODEN" value="0x02" > <value value="0x00" name="Off" cname="_BOR_OFF" sdcc_cname="_BODEN_OFF" /> <value value="0x02" name="On" cname="_BOR_ON" sdcc_cname="_BODEN_ON" /> - </tqmask> - <tqmask name="BORV" value="0x0C" > + </mask> + <mask name="BORV" value="0x0C" > <value value="0x00" name="4.5" cname="_BORV_45" sdcc_cname="_BODENV_4_5V" /> <value value="0x04" name="4.2" cname="_BORV_42" sdcc_cname="_BODENV_4_2V" /> <value value="0x08" name="2.7" cname="_BORV_27" sdcc_cname="_BODENV_2_7V" /> <value value="0x0C" name="2.0" cname="_BORV_25" sdcc_cname="_BODENV_2_0V" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x0E" > + </mask> + <mask name="WDTPS" value="0x0E" > <value value="0x00" name="1:1" cname="_WDTPS_1" sdcc_cname="_WDTPS_1_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" sdcc_cname="_WDTPS_1_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" sdcc_cname="_WDTPS_1_4" /> @@ -91,94 +91,94 @@ <value value="0x0A" name="1:32" cname="_WDTPS_32" sdcc_cname="_WDTPS_1_32" /> <value value="0x0C" name="1:64" cname="_WDTPS_64" sdcc_cname="_WDTPS_1_64" /> <value value="0x0E" name="1:128" cname="_WDTPS_128" sdcc_cname="_WDTPS_1_128" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVR_OFF" /> <value value="0x01" name="On" cname="_STVR_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" sdcc_cname="_BACKBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" sdcc_cname="_BACKBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0200:1FFF" cname="_CP0_ON" sdcc_cname="_CP_0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_CP1_ON" sdcc_cname="_CP_1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0200:1FFF" cname="_WRT0_ON" sdcc_cname="_WRT_0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_WRT1_ON" sdcc_cname="_WRT_1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0200:1FFF" cname="_EBTR0_ON" sdcc_cname="_EBTR_0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" sdcc_cname="_EBTR_1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F4480.xml b/src/devices/pic/xml_data/18F4480.xml index 14b60cb..b9a87da 100644 --- a/src/devices/pic/xml_data/18F4480.xml +++ b/src/devices/pic/xml_data/18F4480.xml @@ -27,17 +27,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x003FFF" word_write_align="16" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -54,42 +54,42 @@ <value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC" /> <value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC" /> <value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="Software" cname="_BOREN_SBORENCTRL" /> <value value="0x04" name="On_run" cname="_BOREN_BOACTIVE" /> <value value="0x06" name="On" cname="_BOREN_BOHW" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -106,115 +106,115 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x82" > - <tqmask name="PBADEN" value="0x02" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x82" > + <mask name="PBADEN" value="0x02" > <value value="0x00" name="digital" cname="_PBADEN_OFF" /> <value value="0x02" name="analog" cname="_PBADEN_ON" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x10" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x10" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="BBSIZ" value="0x10" > + </mask> + <mask name="BBSIZ" value="0x10" > <value value="0x00" name="1024" cname="_BBSIZ_1024" /> <value value="0x10" name="2048" cname="_BBSIZ_2048" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800/1000:1FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="All" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800/1000:1FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="All" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800/1000:1FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="All" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F44J10.xml b/src/devices/pic/xml_data/18F44J10.xml index c9ce5b8..ddf2019 100644 --- a/src/devices/pic/xml_data/18F44J10.xml +++ b/src/devices/pic/xml_data/18F44J10.xml @@ -31,55 +31,55 @@ <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" > - <tqmask name="WDT" value="0x01" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="STVREN" value="0x20" > + </mask> + <mask name="STVREN" value="0x20" > <value value="0x00" name="Off" cname="" /> <value value="0x20" name="On" cname="" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="" /> <value value="0x40" name="On" cname="" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0x7F" bvalue="0x04" > - <tqmask name="CP" value="0x04" > + <config offset="0x1" name="CONFIG1H" wmask="0x7F" bvalue="0x04" > + <mask name="CP" value="0x04" > <value value="0x00" name="All" cname="" /> <value value="0x04" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="FOSC" value="0x03" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" > + <mask name="FOSC" value="0x03" > <value value="0x00" name="HS" cname="" /> <value value="0x01" name="HSPLL" cname="" /> <value value="0x02" name="EC" cname="" /> <value value="0x03" name="ECPLL_IO" cname="" /> - </tqmask> - <tqmask name="FOSC2" value="0x04" > + </mask> + <mask name="FOSC2" value="0x04" > <value value="0x00" name="FOSC1:FOSC0" cname="" /> <value value="0x04" name="INTRC" cname="" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="On" cname="" /> <value value="0x40" name="Off" cname="" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDTPS" value="0x0F" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDTPS" value="0x0F" > <value value="0x00" name="1:1" cname="" /> <value value="0x01" name="1:2" cname="" /> <value value="0x02" name="1:4" cname="" /> @@ -96,23 +96,23 @@ <value value="0x0D" name="1:8192" cname="" /> <value value="0x0E" name="1:16384" cname="" /> <value value="0x0F" name="1:32768" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" > </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x07" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="" /> <value value="0x01" name="RC1" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0xFF" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0xFF" > </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0xF8" > + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0xF8" > </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F4510.xml b/src/devices/pic/xml_data/18F4510.xml index bcfec9c..b038b39 100644 --- a/src/devices/pic/xml_data/18F4510.xml +++ b/src/devices/pic/xml_data/18F4510.xml @@ -27,16 +27,16 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x007FFF" word_write_align="16" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -53,42 +53,42 @@ <value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC" /> <value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC" /> <value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="Software" cname="_BOREN_ON" /> <value value="0x04" name="On_run" cname="_BOREN_NOSLP" /> <value value="0x06" name="On" cname="_BOREN_SBORDIS" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -105,131 +105,131 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" /> <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" /> - </tqmask> - <tqmask name="PBADEN" value="0x02" > + </mask> + <mask name="PBADEN" value="0x02" > <value value="0x00" name="digital" cname="_PBADEN_OFF" /> <value value="0x02" name="analog" cname="_PBADEN_ON" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_CP2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" /> - </tqmask> - <tqmask name="CP_3" value="0x08" > + </mask> + <mask name="CP_3" value="0x08" > <value value="0x00" name="6000:7FFF" cname="_CP3_ON" /> <value value="0x08" name="Off" cname="_CP3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x40" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_WRT2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" /> - </tqmask> - <tqmask name="WRT_3" value="0x08" > + </mask> + <mask name="WRT_3" value="0x08" > <value value="0x00" name="6000:7FFF" cname="_WRT3_ON" /> <value value="0x08" name="Off" cname="_WRT3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x60" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x60" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_EBTR2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" /> - </tqmask> - <tqmask name="EBTR_3" value="0x08" > + </mask> + <mask name="EBTR_3" value="0x08" > <value value="0x00" name="6000:7FFF" cname="_EBTR3_ON" /> <value value="0x08" name="Off" cname="_EBTR3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F4515.xml b/src/devices/pic/xml_data/18F4515.xml index 671198c..4325432 100644 --- a/src/devices/pic/xml_data/18F4515.xml +++ b/src/devices/pic/xml_data/18F4515.xml @@ -27,16 +27,16 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x00BFFF" word_write_align="32" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -53,42 +53,42 @@ <value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC" /> <value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC" /> <value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="Software" cname="_BOREN_ON" /> <value value="0x04" name="On_run" cname="_BOREN_NOSLP" /> <value value="0x06" name="On" cname="_BOREN_SBORDIS" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -105,119 +105,119 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" /> <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" /> - </tqmask> - <tqmask name="PBADEN" value="0x02" > + </mask> + <mask name="PBADEN" value="0x02" > <value value="0x00" name="digital" cname="_PBADEN_OFF" /> <value value="0x02" name="analog" cname="_PBADEN_ON" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x07" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800:3FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_CP2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x40" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x07" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800:3FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x60" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x60" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x07" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800:3FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F452.xml b/src/devices/pic/xml_data/18F452.xml index 24d1e3d..12ad5ce 100644 --- a/src/devices/pic/xml_data/18F452.xml +++ b/src/devices/pic/xml_data/18F452.xml @@ -35,17 +35,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x007FFF" word_write_align="4" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" > - <tqmask name="FOSC" value="0x07" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" > + <mask name="FOSC" value="0x07" > <value value="0x00" name="LP" cname="_LP_OSC" sdcc_cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_XT_OSC" sdcc_cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_HS_OSC" sdcc_cname="_OSC_HS" /> @@ -54,36 +54,36 @@ <value value="0x05" name="EC_IO" cname="_ECIO_OSC" sdcc_cname="_OSC_EC_OSC2_RA6" /> <value value="0x06" name="H4" cname="_HSPLL_OSC" sdcc_cname="_OSC_HS_PLL" /> <value value="0x07" name="EXTRC_IO" cname="_RCIO_OSC" sdcc_cname="_OSC_RC_OSC2" /> - </tqmask> - <tqmask name="OSCSEN" value="0x20" > + </mask> + <mask name="OSCSEN" value="0x20" > <value value="0x00" name="On" cname="_OSCS_ON" /> <value value="0x20" name="Off" cname="_OSCS_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" sdcc_cname="_PUT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" sdcc_cname="_PUT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x02" > + </mask> + <mask name="BODEN" value="0x02" > <value value="0x00" name="Off" cname="_BOR_OFF" sdcc_cname="_BODEN_OFF" /> <value value="0x02" name="On" cname="_BOR_ON" sdcc_cname="_BODEN_ON" /> - </tqmask> - <tqmask name="BORV" value="0x0C" > + </mask> + <mask name="BORV" value="0x0C" > <value value="0x00" name="4.5" cname="_BORV_45" sdcc_cname="_BODENV_4_5V" /> <value value="0x04" name="4.2" cname="_BORV_42" sdcc_cname="_BODENV_4_2V" /> <value value="0x08" name="2.7" cname="_BORV_27" sdcc_cname="_BODENV_2_7V" /> <value value="0x0C" name="2.0" cname="_BORV_20" sdcc_cname="_BODENV_2_0V" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x0E" > + </mask> + <mask name="WDTPS" value="0x0E" > <value value="0x00" name="1:1" cname="_WDTPS_1" sdcc_cname="_WDTPS_1_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" sdcc_cname="_WDTPS_1_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" sdcc_cname="_WDTPS_1_4" /> @@ -92,123 +92,123 @@ <value value="0x0A" name="1:32" cname="_WDTPS_32" sdcc_cname="_WDTPS_1_32" /> <value value="0x0C" name="1:64" cname="_WDTPS_64" sdcc_cname="_WDTPS_1_64" /> <value value="0x0E" name="1:128" cname="_WDTPS_128" sdcc_cname="_WDTPS_1_128" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="_CCP2MX_OFF" sdcc_cname="_CCP2MUX_RB3" /> <value value="0x01" name="RC1" cname="_CCP2MX_ON" sdcc_cname="_CCP2MUX_RC1" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVR_OFF" /> <value value="0x01" name="On" cname="_STVR_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" sdcc_cname="_BACKBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" sdcc_cname="_BACKBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0200:1FFF" cname="_CP0_ON" sdcc_cname="_CP_0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_CP1_ON" sdcc_cname="_CP_1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_CP2_ON" sdcc_cname="_CP_2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" sdcc_cname="_CP_2_OFF" /> - </tqmask> - <tqmask name="CP_3" value="0x08" > + </mask> + <mask name="CP_3" value="0x08" > <value value="0x00" name="6000:7FFF" cname="_CP3_ON" sdcc_cname="_CP_3_ON" /> <value value="0x08" name="Off" cname="_CP3_OFF" sdcc_cname="_CP_3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0200:1FFF" cname="_WRT0_ON" sdcc_cname="_WRT_0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_WRT1_ON" sdcc_cname="_WRT_1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_WRT2_ON" sdcc_cname="_WRT_2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" sdcc_cname="_WRT_2_OFF" /> - </tqmask> - <tqmask name="WRT_3" value="0x08" > + </mask> + <mask name="WRT_3" value="0x08" > <value value="0x00" name="6000:7FFF" cname="_WRT3_ON" sdcc_cname="_WRT_3_ON" /> <value value="0x08" name="Off" cname="_WRT3_OFF" sdcc_cname="_WRT_3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0200:1FFF" cname="_EBTR0_ON" sdcc_cname="_EBTR_0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" sdcc_cname="_EBTR_1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_EBTR2_ON" sdcc_cname="_EBTR_2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" sdcc_cname="_EBTR_2_OFF" /> - </tqmask> - <tqmask name="EBTR_3" value="0x08" > + </mask> + <mask name="EBTR_3" value="0x08" > <value value="0x00" name="6000:7FFF" cname="_EBTR3_ON" sdcc_cname="_EBTR_3_ON" /> <value value="0x08" name="Off" cname="_EBTR3_OFF" sdcc_cname="_EBTR_3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F4520.xml b/src/devices/pic/xml_data/18F4520.xml index 4699c01..a1a1e75 100644 --- a/src/devices/pic/xml_data/18F4520.xml +++ b/src/devices/pic/xml_data/18F4520.xml @@ -27,17 +27,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x007FFF" word_write_align="16" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -54,42 +54,42 @@ <value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC" /> <value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC" /> <value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="Software" cname="_BOREN_ON" /> <value value="0x04" name="On_run" cname="_BOREN_NOSLP" /> <value value="0x06" name="On" cname="_BOREN_SBORDIS" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -106,139 +106,139 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" /> <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" /> - </tqmask> - <tqmask name="PBADEN" value="0x02" > + </mask> + <mask name="PBADEN" value="0x02" > <value value="0x00" name="digital" cname="_PBADEN_OFF" /> <value value="0x02" name="analog" cname="_PBADEN_ON" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_CP2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" /> - </tqmask> - <tqmask name="CP_3" value="0x08" > + </mask> + <mask name="CP_3" value="0x08" > <value value="0x00" name="6000:7FFF" cname="_CP3_ON" /> <value value="0x08" name="Off" cname="_CP3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_WRT2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" /> - </tqmask> - <tqmask name="WRT_3" value="0x08" > + </mask> + <mask name="WRT_3" value="0x08" > <value value="0x00" name="6000:7FFF" cname="_WRT3_ON" /> <value value="0x08" name="Off" cname="_WRT3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_EBTR2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" /> - </tqmask> - <tqmask name="EBTR_3" value="0x08" > + </mask> + <mask name="EBTR_3" value="0x08" > <value value="0x00" name="6000:7FFF" cname="_EBTR3_ON" /> <value value="0x08" name="Off" cname="_EBTR3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F4523.xml b/src/devices/pic/xml_data/18F4523.xml index 26db550..29b2583 100644 --- a/src/devices/pic/xml_data/18F4523.xml +++ b/src/devices/pic/xml_data/18F4523.xml @@ -24,17 +24,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x007FFF" word_write_align="16" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -51,42 +51,42 @@ <value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC" /> <value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC" /> <value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="Software" cname="_BOREN_ON" /> <value value="0x04" name="On_run" cname="_BOREN_NOSLP" /> <value value="0x06" name="On" cname="_BOREN_SBORDIS" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -103,139 +103,139 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="_CCP2MX_PORTB" /> <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" /> - </tqmask> - <tqmask name="PBADEN" value="0x02" > + </mask> + <mask name="PBADEN" value="0x02" > <value value="0x00" name="digital" cname="_PBADEN_OFF" /> <value value="0x02" name="analog" cname="_PBADEN_ON" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_CP2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" /> - </tqmask> - <tqmask name="CP_3" value="0x08" > + </mask> + <mask name="CP_3" value="0x08" > <value value="0x00" name="6000:7FFF" cname="_CP3_ON" /> <value value="0x08" name="Off" cname="_CP3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_WRT2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" /> - </tqmask> - <tqmask name="WRT_3" value="0x08" > + </mask> + <mask name="WRT_3" value="0x08" > <value value="0x00" name="6000:7FFF" cname="_WRT3_ON" /> <value value="0x08" name="Off" cname="_WRT3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_EBTR2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" /> - </tqmask> - <tqmask name="EBTR_3" value="0x08" > + </mask> + <mask name="EBTR_3" value="0x08" > <value value="0x00" name="6000:7FFF" cname="_EBTR3_ON" /> <value value="0x08" name="Off" cname="_EBTR3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F4525.xml b/src/devices/pic/xml_data/18F4525.xml index 0928756..f37d90b 100644 --- a/src/devices/pic/xml_data/18F4525.xml +++ b/src/devices/pic/xml_data/18F4525.xml @@ -27,17 +27,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x00BFFF" word_write_align="32" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -54,42 +54,42 @@ <value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC" /> <value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC" /> <value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="Software" cname="_BOREN_ON" /> <value value="0x04" name="On_run" cname="_BOREN_NOSLP" /> <value value="0x06" name="On" cname="_BOREN_SBORDIS" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -106,127 +106,127 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" /> <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" /> - </tqmask> - <tqmask name="PBADEN" value="0x02" > + </mask> + <mask name="PBADEN" value="0x02" > <value value="0x00" name="digital" cname="_PBADEN_OFF" /> <value value="0x02" name="analog" cname="_PBADEN_ON" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x07" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800:3FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_CP2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x07" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800:3FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x07" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800:3FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F4539.xml b/src/devices/pic/xml_data/18F4539.xml index 2733301..71a1f4c 100644 --- a/src/devices/pic/xml_data/18F4539.xml +++ b/src/devices/pic/xml_data/18F4539.xml @@ -35,48 +35,48 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x005FFF" word_write_align="4" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" > - <tqmask name="FOSC" value="0x07" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" > + <mask name="FOSC" value="0x07" > <value value="default" name="invalid" /> <value value="0x02" name="HS" cname="_OSC_HS" /> <value value="0x04" name="EC_CLKOUT" cname="_OSC_EC" /> <value value="0x05" name="EC_IO" cname="_OSC_ECIO" /> <value value="0x06" name="H4" cname="_OSC_HSPLL" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x02" > + </mask> + <mask name="BODEN" value="0x02" > <value value="0x00" name="Off" cname="_BOR_OFF" /> <value value="0x02" name="On" cname="_BOR_ON" /> - </tqmask> - <tqmask name="BORV" value="0x0C" > + </mask> + <mask name="BORV" value="0x0C" > <value value="0x00" name="4.5" cname="_BORV_45" /> <value value="0x04" name="4.2" cname="_BORV_42" /> <value value="0x08" name="2.7" cname="_BORV_27" /> <value value="0x0C" name="2.5" cname="_BORV_25" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x0E" > + </mask> + <mask name="WDTPS" value="0x0E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -85,106 +85,106 @@ <value value="0x0A" name="1:32" cname="_WDTPS_32" /> <value value="0x0C" name="1:64" cname="_WDTPS_64" /> <value value="0x0E" name="1:128" cname="_WDTPS_128" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVR_OFF" /> <value value="0x01" name="On" cname="_STVR_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x07" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0200:1FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_CP2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x07" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0200:1FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_WRT2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x07" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0200:1FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_EBTR2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F4550.xml b/src/devices/pic/xml_data/18F4550.xml index d988438..b0e26c8 100644 --- a/src/devices/pic/xml_data/18F4550.xml +++ b/src/devices/pic/xml_data/18F4550.xml @@ -26,15 +26,15 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x007FFF" word_write_align="16" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" > - <tqmask name="PLLDIV" value="0x07" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" > + <mask name="PLLDIV" value="0x07" > <value value="0x00" name="1" cname="_PLLDIV_1" sdcc_cname="_PLLDIV_NO_DIVIDE__4MHZ_INPUT_" /> <value value="0x01" name="2" cname="_PLLDIV_2" sdcc_cname="_PLLDIV_DIVIDE_BY_2__8MHZ_INPUT_" /> <value value="0x02" name="3" cname="_PLLDIV_3" sdcc_cname="_PLLDIV_DIVIDE_BY_3__12MHZ_INPUT_" /> @@ -43,21 +43,21 @@ <value value="0x05" name="6" cname="_PLLDIV_6" sdcc_cname="_PLLDIV_DIVIDE_BY_6__24MHZ_INPUT_" /> <value value="0x06" name="10" cname="_PLLDIV_10" sdcc_cname="_PLLDIV_DIVIDE_BY_10__40MHZ_INPUT_" /> <value value="0x07" name="12" cname="_PLLDIV_12" sdcc_cname="_PLLDIV_DIVIDE_BY_12__48MHZ_INPUT_" /> - </tqmask> - <tqmask name="CPUDIV" value="0x18" > + </mask> + <mask name="CPUDIV" value="0x18" > <value value="0x00" name="1" cname="_CPUDIV_OSC1_PLL2" sdcc_cname="_CPUDIV__OSC1_OSC2_SRC___1__96MHZ_PLL_SRC___2_" /> <value value="0x08" name="2" cname="_CPUDIV_OSC2_PLL3" sdcc_cname="_CPUDIV__OSC1_OSC2_SRC___2__96MHZ_PLL_SRC___3_" /> <value value="0x10" name="3" cname="_CPUDIV_OSC3_PLL4" sdcc_cname="_CPUDIV__OSC1_OSC2_SRC___3__96MHZ_PLL_SRC___4_" /> <value value="0x18" name="4" cname="_CPUDIV_OSC4_PLL6" sdcc_cname="_CPUDIV__OSC1_OSC2_SRC___4__96MHZ_PLL_SRC___6_" /> - </tqmask> - <tqmask name="USBDIV" value="0x20" > + </mask> + <mask name="USBDIV" value="0x20" > <value value="0x00" name="1" cname="_USBDIV_1" sdcc_cname="_USBPLL_CLOCK_SRC_FROM_OSC1_OSC2" /> <value value="0x20" name="2" cname="_USBDIV_2" sdcc_cname="_USBPLL_CLOCK_SRC_FROM_96MHZ_PLL_2" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x05" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x05" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="XT" cname="_FOSC_XT_XT" sdcc_cname="_OSC_XT__USB_XT" /> <value value="0x01" name="XT" cname="_FOSC_XT_XT" sdcc_cname="_OSC_XT__USB_XT" /> <value value="0x02" name="XTPLL" cname="_FOSC_XTPLL" sdcc_cname="_OSC_XT__XT_PLL__USB_XT" /> @@ -74,46 +74,46 @@ <value value="0x0D" name="HS" cname="_FOSC_HS" sdcc_cname="_OSC_HS__USB_HS" /> <value value="0x0E" name="HSPLL" cname="_FOSC_HSPLL_HS" sdcc_cname="_OSC_HS__HS_PLL__USB_HS" /> <value value="0x0F" name="HSPLL" cname="_FOSC_HSPLL_HS" sdcc_cname="_OSC_HS__HS_PLL__USB_HS" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEM_OFF" sdcc_cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEM_ON" sdcc_cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" sdcc_cname="_PUT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" sdcc_cname="_PUT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOR_OFF" sdcc_cname="_BODEN_OFF" /> <value value="0x02" name="Software" cname="_BOR_SOFT" sdcc_cname="_BODEN_CONTROLLED_WITH_SBOREN_BIT" /> <value value="0x04" name="On_run" cname="_BOR_ON_ACTIVE" sdcc_cname="_BODEN_ON_WHILE_ACTIVE" /> <value value="0x06" name="On" cname="_BOR_ON" sdcc_cname="_BODEN_ON" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" sdcc_cname="_BODENV_4_5V" /> <value value="0x08" name="4.2" cname="_BORV_1" sdcc_cname="_BODENV_4_2V" /> <value value="0x10" name="2.7" cname="_BORV_2" sdcc_cname="_BODENV_2_7V" /> <value value="0x18" name="2.0" cname="_BORV_3" sdcc_cname="_BODENV_2_0V" /> - </tqmask> - <tqmask name="VREGEN" value="0x20" > + </mask> + <mask name="VREGEN" value="0x20" > <value value="0x00" name="Off" cname="_VREGEN_OFF" /> <value value="0x20" name="On" cname="_VREGEN_ON" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" sdcc_cname="_WDT_DISABLED_CONTROLLED" /> <value value="0x01" name="On" cname="_WDT_ON" sdcc_cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" sdcc_cname="_WDTPS_1_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" sdcc_cname="_WDTPS_1_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" sdcc_cname="_WDTPS_1_4" /> @@ -130,135 +130,135 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" sdcc_cname="_WDTPS_1_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" sdcc_cname="_WDTPS_1_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" sdcc_cname="_WDTPS_1_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="_CCP2MX_OFF" sdcc_cname="_CCP2MUX_RB3" /> <value value="0x01" name="RC1" cname="_CCP2MX_ON" sdcc_cname="_CCP2MUX_RC1" /> - </tqmask> - <tqmask name="PBADEN" value="0x02" > + </mask> + <mask name="PBADEN" value="0x02" > <value value="0x00" name="digital" cname="_PBADEN_OFF" sdcc_cname="_PBADEN_PORTB_4_0__CONFIGURED_AS_DIGITAL_I_O_ON_RESET" /> <value value="0x02" name="analog" cname="_PBADEN_ON" sdcc_cname="_PBADEN_PORTB_4_0__CONFIGURED_AS_ANALOG_INPUTS_ON_RESET" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" sdcc_cname="_MCLRE_MCLR_OFF_RE3_ON" /> <value value="0x80" name="External" cname="_MCLRE_ON" sdcc_cname="_MCLRE_MCLR_ON_RE3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x20" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x20" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" sdcc_cname="_STVR_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" sdcc_cname="_STVR_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="ICPORT" value="0x20" > + </mask> + <mask name="ICPORT" value="0x20" > <value value="0x00" name="Off" cname="_ICPRT_OFF" sdcc_cname="_ENICPORT_OFF" /> <value value="0x20" name="On" cname="_ICPRT_ON" sdcc_cname="_ENICPORT_ON" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" sdcc_cname="_ENHCPU_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" sdcc_cname="_ENHCPU_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" sdcc_cname="_BACKBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" sdcc_cname="_BACKBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_CP0_ON" sdcc_cname="_CP_0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_CP1_ON" sdcc_cname="_CP_1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_CP2_ON" sdcc_cname="_CP_2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" sdcc_cname="_CP_2_OFF" /> - </tqmask> - <tqmask name="CP_3" value="0x08" > + </mask> + <mask name="CP_3" value="0x08" > <value value="0x00" name="6000:7FFF" cname="_CP3_ON" sdcc_cname="_CP_3_ON" /> <value value="0x08" name="Off" cname="_CP3_OFF" sdcc_cname="_CP_3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x40" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_WRT0_ON" sdcc_cname="_WRT_0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_WRT1_ON" sdcc_cname="_WRT_1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_WRT2_ON" sdcc_cname="_WRT_2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" sdcc_cname="_WRT_2_OFF" /> - </tqmask> - <tqmask name="WRT_3" value="0x08" > + </mask> + <mask name="WRT_3" value="0x08" > <value value="0x00" name="6000:7FFF" cname="_WRT3_ON" sdcc_cname="_WRT_3_ON" /> <value value="0x08" name="Off" cname="_WRT3_OFF" sdcc_cname="_WRT_3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x60" ctqmask="0x40" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x60" cmask="0x40" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_EBTR0_ON" sdcc_cname="_EBTR_0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" sdcc_cname="_EBTR_1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_EBTR2_ON" sdcc_cname="_EBTR_2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" sdcc_cname="_EBTR_2_OFF" /> - </tqmask> - <tqmask name="EBTR_3" value="0x08" > + </mask> + <mask name="EBTR_3" value="0x08" > <value value="0x00" name="6000:7FFF" cname="_EBTR3_ON" sdcc_cname="_EBTR_3_ON" /> <value value="0x08" name="Off" cname="_EBTR3_OFF" sdcc_cname="_EBTR_3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F458.xml b/src/devices/pic/xml_data/18F458.xml index 758acc8..33069dd 100644 --- a/src/devices/pic/xml_data/18F458.xml +++ b/src/devices/pic/xml_data/18F458.xml @@ -35,17 +35,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x007FFF" word_write_align="4" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" > - <tqmask name="FOSC" value="0x07" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" > + <mask name="FOSC" value="0x07" > <value value="0x00" name="LP" cname="_LP_OSC" sdcc_cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_XT_OSC" sdcc_cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_HS_OSC" sdcc_cname="_OSC_HS" /> @@ -54,36 +54,36 @@ <value value="0x05" name="EC_IO" cname="_ECIO_OSC" sdcc_cname="_OSC_EC_OSC2_RA6" /> <value value="0x06" name="H4" cname="_HSPLL_OSC" sdcc_cname="_OSC_HS_PLL" /> <value value="0x07" name="EXTRC_IO" cname="_RCIO_OSC" sdcc_cname="_OSC_RC_OSC2" /> - </tqmask> - <tqmask name="OSCSEN" value="0x20" > + </mask> + <mask name="OSCSEN" value="0x20" > <value value="0x00" name="On" cname="_OSCS_ON" /> <value value="0x20" name="Off" cname="_OSCS_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" sdcc_cname="_PUT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" sdcc_cname="_PUT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x02" > + </mask> + <mask name="BODEN" value="0x02" > <value value="0x00" name="Off" cname="_BOR_OFF" sdcc_cname="_BODEN_OFF" /> <value value="0x02" name="On" cname="_BOR_ON" sdcc_cname="_BODEN_ON" /> - </tqmask> - <tqmask name="BORV" value="0x0C" > + </mask> + <mask name="BORV" value="0x0C" > <value value="0x00" name="4.5" cname="_BORV_45" sdcc_cname="_BODENV_4_5V" /> <value value="0x04" name="4.2" cname="_BORV_42" sdcc_cname="_BODENV_4_2V" /> <value value="0x08" name="2.7" cname="_BORV_27" sdcc_cname="_BODENV_2_7V" /> <value value="0x0C" name="2.0" cname="_BORV_20" sdcc_cname="_BODENV_2_0V" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x0E" > + </mask> + <mask name="WDTPS" value="0x0E" > <value value="0x00" name="1:1" cname="_WDTPS_1" sdcc_cname="_WDTPS_1_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" sdcc_cname="_WDTPS_1_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" sdcc_cname="_WDTPS_1_4" /> @@ -92,118 +92,118 @@ <value value="0x0A" name="1:32" cname="_WDTPS_32" sdcc_cname="_WDTPS_1_32" /> <value value="0x0C" name="1:64" cname="_WDTPS_64" sdcc_cname="_WDTPS_1_64" /> <value value="0x0E" name="1:128" cname="_WDTPS_128" sdcc_cname="_WDTPS_1_128" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVR_OFF" /> <value value="0x01" name="On" cname="_STVR_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" sdcc_cname="_BACKBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" sdcc_cname="_BACKBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0200:1FFF" cname="_CP0_ON" sdcc_cname="_CP_0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_CP1_ON" sdcc_cname="_CP_1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_CP2_ON" sdcc_cname="_CP_2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" sdcc_cname="_CP_2_OFF" /> - </tqmask> - <tqmask name="CP_3" value="0x08" > + </mask> + <mask name="CP_3" value="0x08" > <value value="0x00" name="6000:7FFF" cname="_CP3_ON" sdcc_cname="_CP_3_ON" /> <value value="0x08" name="Off" cname="_CP3_OFF" sdcc_cname="_CP_3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0200:1FFF" cname="_WRT0_ON" sdcc_cname="_WRT_0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_WRT1_ON" sdcc_cname="_WRT_1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_WRT2_ON" sdcc_cname="_WRT_2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" sdcc_cname="_WRT_2_OFF" /> - </tqmask> - <tqmask name="WRT_3" value="0x08" > + </mask> + <mask name="WRT_3" value="0x08" > <value value="0x00" name="6000:7FFF" cname="_WRT3_ON" sdcc_cname="_WRT_3_ON" /> <value value="0x08" name="Off" cname="_WRT3_OFF" sdcc_cname="_WRT_3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0200:1FFF" cname="_EBTR0_ON" sdcc_cname="_EBTR_0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" sdcc_cname="_EBTR_1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_EBTR2_ON" sdcc_cname="_EBTR_2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" sdcc_cname="_EBTR_2_OFF" /> - </tqmask> - <tqmask name="EBTR_3" value="0x08" > + </mask> + <mask name="EBTR_3" value="0x08" > <value value="0x00" name="6000:7FFF" cname="_EBTR3_ON" sdcc_cname="_EBTR_3_ON" /> <value value="0x08" name="Off" cname="_EBTR3_OFF" sdcc_cname="_EBTR_3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F4580.xml b/src/devices/pic/xml_data/18F4580.xml index cd1e077..e6e105a 100644 --- a/src/devices/pic/xml_data/18F4580.xml +++ b/src/devices/pic/xml_data/18F4580.xml @@ -27,17 +27,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x007FFF" word_write_align="16" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -54,42 +54,42 @@ <value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC" /> <value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC" /> <value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="Software" cname="_BOREN_SBORENCTRL" /> <value value="0x04" name="On_run" cname="_BOREN_BOACTIVE" /> <value value="0x06" name="On" cname="_BOREN_BOHW" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -106,139 +106,139 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x82" > - <tqmask name="PBADEN" value="0x02" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x82" > + <mask name="PBADEN" value="0x02" > <value value="0x00" name="digital" cname="_PBADEN_OFF" /> <value value="0x02" name="analog" cname="_PBADEN_ON" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x10" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x10" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="BBSIZ" value="0x10" > + </mask> + <mask name="BBSIZ" value="0x10" > <value value="0x00" name="1024" cname="_BBSIZ_1024" /> <value value="0x10" name="2048" cname="_BBSIZ_2048" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800/1000:1FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_CP2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" /> - </tqmask> - <tqmask name="CP_3" value="0x08" > + </mask> + <mask name="CP_3" value="0x08" > <value value="0x00" name="6000:7FFF" cname="_CP3_ON" /> <value value="0x08" name="Off" cname="_CP3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="All" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800/1000:1FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_WRT2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" /> - </tqmask> - <tqmask name="WRT_3" value="0x08" > + </mask> + <mask name="WRT_3" value="0x08" > <value value="0x00" name="6000:7FFF" cname="_WRT3_ON" /> <value value="0x08" name="Off" cname="_WRT3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="All" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800/1000:1FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_EBTR2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" /> - </tqmask> - <tqmask name="EBTR_3" value="0x08" > + </mask> + <mask name="EBTR_3" value="0x08" > <value value="0x00" name="6000:7FFF" cname="_EBTR3_ON" /> <value value="0x08" name="Off" cname="_EBTR3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="All" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F4585.xml b/src/devices/pic/xml_data/18F4585.xml index dca0022..fb438b8 100644 --- a/src/devices/pic/xml_data/18F4585.xml +++ b/src/devices/pic/xml_data/18F4585.xml @@ -27,17 +27,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x00BFFF" word_write_align="32" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -54,42 +54,42 @@ <value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC" /> <value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC" /> <value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="Software" cname="_BOREN_SBORENCTRL" /> <value value="0x04" name="On_run" cname="_BOREN_BOACTIVE" /> <value value="0x06" name="On" cname="_BOREN_BOHW" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -106,129 +106,129 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x82" > - <tqmask name="PBADEN" value="0x02" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x82" > + <mask name="PBADEN" value="0x02" > <value value="0x00" name="digital" cname="_PBADEN_OFF" /> <value value="0x02" name="analog" cname="_PBADEN_ON" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x30" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x30" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="BBSIZ" value="0x30" > + </mask> + <mask name="BBSIZ" value="0x30" > <value value="0x00" name="1024" cname="_BBSIZ_1024" /> <value value="0x10" name="2048" cname="_BBSIZ_2048" /> <value value="0x20" name="4096" cname="_BBSIZ_4096" /> <value value="0x30" name="4096" cname="_BBSIZ_4096" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x07" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800/1000/2000:3FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_CP2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="All" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x07" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800/1000/2000:3FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="All" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x07" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800/1000/2000:3FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="All" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F45J10.xml b/src/devices/pic/xml_data/18F45J10.xml index aede454..af2c752 100644 --- a/src/devices/pic/xml_data/18F45J10.xml +++ b/src/devices/pic/xml_data/18F45J10.xml @@ -31,55 +31,55 @@ <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" > - <tqmask name="WDT" value="0x01" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="STVREN" value="0x20" > + </mask> + <mask name="STVREN" value="0x20" > <value value="0x00" name="Off" cname="" /> <value value="0x20" name="On" cname="" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="" /> <value value="0x40" name="On" cname="" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0x7F" bvalue="0x04" > - <tqmask name="CP" value="0x04" > + <config offset="0x1" name="CONFIG1H" wmask="0x7F" bvalue="0x04" > + <mask name="CP" value="0x04" > <value value="0x00" name="All" cname="" /> <value value="0x04" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="FOSC" value="0x03" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" > + <mask name="FOSC" value="0x03" > <value value="0x00" name="HS" cname="" /> <value value="0x01" name="HSPLL" cname="" /> <value value="0x02" name="EC" cname="" /> <value value="0x03" name="ECPLL_IO" cname="" /> - </tqmask> - <tqmask name="FOSC2" value="0x04" > + </mask> + <mask name="FOSC2" value="0x04" > <value value="0x00" name="FOSC1:FOSC0" cname="" /> <value value="0x04" name="INTRC" cname="" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="On" cname="" /> <value value="0x40" name="Off" cname="" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDTPS" value="0x0F" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDTPS" value="0x0F" > <value value="0x00" name="1:1" cname="" /> <value value="0x01" name="1:2" cname="" /> <value value="0x02" name="1:4" cname="" /> @@ -96,23 +96,23 @@ <value value="0x0D" name="1:8192" cname="" /> <value value="0x0E" name="1:16384" cname="" /> <value value="0x0F" name="1:32768" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" > </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x07" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="" /> <value value="0x01" name="RC1" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0xFF" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0xFF" > </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0xF8" > + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0xF8" > </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F4610.xml b/src/devices/pic/xml_data/18F4610.xml index 9c3fe13..d105cdb 100644 --- a/src/devices/pic/xml_data/18F4610.xml +++ b/src/devices/pic/xml_data/18F4610.xml @@ -27,16 +27,16 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x00FFFF" word_write_align="32" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -53,42 +53,42 @@ <value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC" /> <value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC" /> <value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="Software" cname="_BOREN_ON" /> <value value="0x04" name="On_run" cname="_BOREN_NOSLP" /> <value value="0x06" name="On" cname="_BOREN_SBORDIS" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -105,131 +105,131 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" /> <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" /> - </tqmask> - <tqmask name="PBADEN" value="0x02" > + </mask> + <mask name="PBADEN" value="0x02" > <value value="0x00" name="digital" cname="_PBADEN_OFF" /> <value value="0x02" name="analog" cname="_PBADEN_ON" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800:3FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_CP2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" /> - </tqmask> - <tqmask name="CP_3" value="0x08" > + </mask> + <mask name="CP_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_CP3_ON" /> <value value="0x08" name="Off" cname="_CP3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x40" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800:3FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" /> - </tqmask> - <tqmask name="WRT_3" value="0x08" > + </mask> + <mask name="WRT_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_WRT3_ON" /> <value value="0x08" name="Off" cname="_WRT3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x60" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x60" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800:3FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" /> - </tqmask> - <tqmask name="EBTR_3" value="0x08" > + </mask> + <mask name="EBTR_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" /> <value value="0x08" name="Off" cname="_EBTR3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F4620.xml b/src/devices/pic/xml_data/18F4620.xml index ff74392..5964590 100644 --- a/src/devices/pic/xml_data/18F4620.xml +++ b/src/devices/pic/xml_data/18F4620.xml @@ -30,17 +30,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x00FFFF" word_write_align="32" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -51,42 +51,42 @@ <value value="0x07" name="EXTRC_IO" cname="_OSC_RCIO6" /> <value value="0x08" name="INTRC_IO" cname="_OSC_INTIO67" /> <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" sdcc_cname="_PUT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" sdcc_cname="_PUT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOREN_OFF" sdcc_cname="_BODEN_OFF" /> <value value="0x02" name="Software" cname="_BOREN_ON" sdcc_cname="_BODEN_ON" /> <value value="0x04" name="On_run" cname="_BOREN_NOSLP" sdcc_cname="_BODEN_ON_WHILE_ACTIVE" /> <value value="0x06" name="On" cname="_BOREN_SBORDIS" sdcc_cname="_BODEN_CONTROLLED_WITH_SBOREN_BIT" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.6" cname="_BORV_0" sdcc_cname="_BODENV_4_5V" /> <value value="0x08" name="4.3" cname="_BORV_1" sdcc_cname="_BODENV_4_2V" /> <value value="0x10" name="2.8" cname="_BORV_2" sdcc_cname="_BODENV_2_7V" /> <value value="0x18" name="2.1" cname="_BORV_3" sdcc_cname="_BODENV_2_0V" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" sdcc_cname="_WDT_DISABLED_CONTROLLED" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" sdcc_cname="_WDTPS_1_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" sdcc_cname="_WDTPS_1_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" sdcc_cname="_WDTPS_1_4" /> @@ -103,131 +103,131 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" sdcc_cname="_WDTPS_1_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" sdcc_cname="_WDTPS_1_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" sdcc_cname="_WDTPS_1_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" sdcc_cname="_CCP2MUX_RB3" /> <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" sdcc_cname="_CCP2MUX_RC1" /> - </tqmask> - <tqmask name="PBADEN" value="0x02" > + </mask> + <mask name="PBADEN" value="0x02" > <value value="0x00" name="digital" cname="_PBADEN_OFF" sdcc_cname="_PBADEN_PORTB_4_0__CONFIGURED_AS_DIGITAL_I_O_ON_RESET" /> <value value="0x02" name="analog" cname="_PBADEN_ON" sdcc_cname="_PBADEN_PORTB_4_0__CONFIGURED_AS_ANALOG_INPUTS_ON_RESET" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" sdcc_cname="_MCLRE_MCLR_OFF_RE3_ON" /> <value value="0x80" name="External" cname="_MCLRE_ON" sdcc_cname="_MCLRE_MCLR_ON_RE3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" sdcc_cname="_STVR_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" sdcc_cname="_STVR_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" sdcc_cname="_BACKBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" sdcc_cname="_BACKBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800:3FFF" cname="_CP0_ON" sdcc_cname="_CP_0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_CP1_ON" sdcc_cname="_CP_1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_CP2_ON" sdcc_cname="_CP_2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" sdcc_cname="_CP_2_OFF" /> - </tqmask> - <tqmask name="CP_3" value="0x08" > + </mask> + <mask name="CP_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_CP3_ON" sdcc_cname="_CP_3_ON" /> <value value="0x08" name="Off" cname="_CP3_OFF" sdcc_cname="_CP_3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x40" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800:3FFF" cname="_WRT0_ON" sdcc_cname="_WRT_0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_WRT1_ON" sdcc_cname="_WRT_1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" sdcc_cname="_WRT_2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" sdcc_cname="_WRT_2_OFF" /> - </tqmask> - <tqmask name="WRT_3" value="0x08" > + </mask> + <mask name="WRT_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_WRT3_ON" sdcc_cname="_WRT_3_ON" /> <value value="0x08" name="Off" cname="_WRT3_OFF" sdcc_cname="_WRT_3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x60" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x60" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800:3FFF" cname="_EBTR0_ON" sdcc_cname="_EBTR_0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" sdcc_cname="_EBTR_1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" sdcc_cname="_EBTR_2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" sdcc_cname="_EBTR_2_OFF" /> - </tqmask> - <tqmask name="EBTR_3" value="0x08" > + </mask> + <mask name="EBTR_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" sdcc_cname="_EBTR_3_ON" /> <value value="0x08" name="Off" cname="_EBTR3_OFF" sdcc_cname="_EBTR_3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F4680.xml b/src/devices/pic/xml_data/18F4680.xml index 155abb9..f5ef137 100644 --- a/src/devices/pic/xml_data/18F4680.xml +++ b/src/devices/pic/xml_data/18F4680.xml @@ -27,17 +27,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x00FFFF" word_write_align="32" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -54,42 +54,42 @@ <value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC" /> <value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC" /> <value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="Software" cname="_BOREN_SBORENCTRL" /> <value value="0x04" name="On_run" cname="_BOREN_BOACTIVE" /> <value value="0x06" name="On" cname="_BOREN_BOHW" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -106,141 +106,141 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x82" > - <tqmask name="PBADEN" value="0x02" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x82" > + <mask name="PBADEN" value="0x02" > <value value="0x00" name="digital" cname="_PBADEN_OFF" /> <value value="0x02" name="analog" cname="_PBADEN_ON" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x30" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x30" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="BBSIZ" value="0x30" > + </mask> + <mask name="BBSIZ" value="0x30" > <value value="0x00" name="1024" cname="_BBSIZ_1024" /> <value value="0x10" name="2048" cname="_BBSIZ_2048" /> <value value="0x20" name="4096" cname="_BBSIZ_4096" /> <value value="0x30" name="4096" cname="_BBSIZ_4096" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800/1000/2000:3FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_CP2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" /> - </tqmask> - <tqmask name="CP_3" value="0x08" > + </mask> + <mask name="CP_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_CP3_ON" /> <value value="0x08" name="Off" cname="_CP3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="All" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800/1000/2000:3FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" /> - </tqmask> - <tqmask name="WRT_3" value="0x08" > + </mask> + <mask name="WRT_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_WRT3_ON" /> <value value="0x08" name="Off" cname="_WRT3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="All" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800/1000/2000:3FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" /> - </tqmask> - <tqmask name="EBTR_3" value="0x08" > + </mask> + <mask name="EBTR_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" /> <value value="0x08" name="Off" cname="_EBTR3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="All" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F4682.xml b/src/devices/pic/xml_data/18F4682.xml index c6ce618..19b387b 100644 --- a/src/devices/pic/xml_data/18F4682.xml +++ b/src/devices/pic/xml_data/18F4682.xml @@ -27,17 +27,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x013FFF" word_write_align="32" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -48,42 +48,42 @@ <value value="0x07" name="EXTRC_IO" cname="_OSC_RCIO" /> <value value="0x08" name="INTRC_IO" cname="_OSC_IRCIO67" /> <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_IRCIO7" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="Software" cname="_BOREN_SBORENCTRL" /> <value value="0x04" name="On_run" cname="_BOREN_BOACTIVE" /> <value value="0x06" name="On" cname="_BOREN_BOHW" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -100,153 +100,153 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x82" > - <tqmask name="PBADEN" value="0x02" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x82" > + <mask name="PBADEN" value="0x02" > <value value="0x00" name="digital" cname="_PBADEN_OFF" /> <value value="0x02" name="analog" cname="_PBADEN_ON" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x30" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x30" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="BBSIZ" value="0x30" > + </mask> + <mask name="BBSIZ" value="0x30" > <value value="0x00" name="1024" cname="_BBSIZ_1024" /> <value value="0x10" name="2048" cname="_BBSIZ_2048" /> <value value="0x20" name="4096" cname="_BBSIZ_4096" /> <value value="0x30" name="4096" cname="_BBSIZ_4096" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x1F" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800/1000/2000:3FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_CP2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" /> - </tqmask> - <tqmask name="CP_3" value="0x08" > + </mask> + <mask name="CP_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_CP3_ON" /> <value value="0x08" name="Off" cname="_CP3_OFF" /> - </tqmask> - <tqmask name="CP_4" value="0x10" > + </mask> + <mask name="CP_4" value="0x10" > <value value="0x00" name="10000:13FFF" cname="_CP4_ON" /> <value value="0x10" name="Off" cname="_CP4_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="All" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x1F" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800/1000/2000:3FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" /> - </tqmask> - <tqmask name="WRT_3" value="0x08" > + </mask> + <mask name="WRT_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_WRT3_ON" /> <value value="0x08" name="Off" cname="_WRT3_OFF" /> - </tqmask> - <tqmask name="WRT_4" value="0x10" > + </mask> + <mask name="WRT_4" value="0x10" > <value value="0x00" name="10000:13FFF" cname="_WRT4_ON" /> <value value="0x10" name="Off" cname="_WRT4_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="All" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x1F" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800/1000/2000:3FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" /> - </tqmask> - <tqmask name="EBTR_3" value="0x08" > + </mask> + <mask name="EBTR_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" /> <value value="0x08" name="Off" cname="_EBTR3_OFF" /> - </tqmask> - <tqmask name="EBTR_4" value="0x10" > + </mask> + <mask name="EBTR_4" value="0x10" > <value value="0x00" name="10000:13FFF" cname="_EBTR4_ON" /> <value value="0x10" name="Off" cname="_EBTR4_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="All" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F4685.xml b/src/devices/pic/xml_data/18F4685.xml index 1e73ffd..7b68ee2 100644 --- a/src/devices/pic/xml_data/18F4685.xml +++ b/src/devices/pic/xml_data/18F4685.xml @@ -27,17 +27,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x017FFF" word_write_align="32" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -48,42 +48,42 @@ <value value="0x07" name="EXTRC_IO" cname="_OSC_RCIO" /> <value value="0x08" name="INTRC_IO" cname="_OSC_IRCIO67" /> <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_IRCIO7" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="Software" cname="_BOREN_SBORENCTRL" /> <value value="0x04" name="On_run" cname="_BOREN_BOACTIVE" /> <value value="0x06" name="On" cname="_BOREN_BOHW" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -100,165 +100,165 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x82" > - <tqmask name="PBADEN" value="0x02" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x82" > + <mask name="PBADEN" value="0x02" > <value value="0x00" name="digital" cname="_PBADEN_OFF" /> <value value="0x02" name="analog" cname="_PBADEN_ON" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x30" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x30" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="BBSIZ" value="0x30" > + </mask> + <mask name="BBSIZ" value="0x30" > <value value="0x00" name="1024" cname="_BBSIZ_1024" /> <value value="0x10" name="2048" cname="_BBSIZ_2048" /> <value value="0x20" name="4096" cname="_BBSIZ_4096" /> <value value="0x30" name="4096" cname="_BBSIZ_4096" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x3F" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x3F" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800/1000/2000:3FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_CP2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" /> - </tqmask> - <tqmask name="CP_3" value="0x08" > + </mask> + <mask name="CP_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_CP3_ON" /> <value value="0x08" name="Off" cname="_CP3_OFF" /> - </tqmask> - <tqmask name="CP_4" value="0x10" > + </mask> + <mask name="CP_4" value="0x10" > <value value="0x00" name="10000:13FFF" cname="_CP4_ON" /> <value value="0x10" name="Off" cname="_CP4_OFF" /> - </tqmask> - <tqmask name="CP_5" value="0x20" > + </mask> + <mask name="CP_5" value="0x20" > <value value="0x00" name="14000:17FFF" cname="_CP5_ON" /> <value value="0x20" name="Off" cname="_CP5_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="All" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x3F" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x3F" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800/1000/2000:3FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" /> - </tqmask> - <tqmask name="WRT_3" value="0x08" > + </mask> + <mask name="WRT_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_WRT3_ON" /> <value value="0x08" name="Off" cname="_WRT3_OFF" /> - </tqmask> - <tqmask name="WRT_4" value="0x10" > + </mask> + <mask name="WRT_4" value="0x10" > <value value="0x00" name="10000:13FFF" cname="_WRT4_ON" /> <value value="0x10" name="Off" cname="_WRT4_OFF" /> - </tqmask> - <tqmask name="WRT_5" value="0x20" > + </mask> + <mask name="WRT_5" value="0x20" > <value value="0x00" name="14000:17FFF" cname="_WRT5_ON" /> <value value="0x20" name="Off" cname="_WRT5_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="All" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x3F" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x3F" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800/1000/2000:3FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" /> - </tqmask> - <tqmask name="EBTR_3" value="0x08" > + </mask> + <mask name="EBTR_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" /> <value value="0x08" name="Off" cname="_EBTR3_OFF" /> - </tqmask> - <tqmask name="EBTR_4" value="0x10" > + </mask> + <mask name="EBTR_4" value="0x10" > <value value="0x00" name="10000:13FFF" cname="_EBTR4_ON" /> <value value="0x10" name="Off" cname="_EBTR4_OFF" /> - </tqmask> - <tqmask name="EBTR_5" value="0x20" > + </mask> + <mask name="EBTR_5" value="0x20" > <value value="0x00" name="14000:17FFF" cname="_EBTR5_ON" /> <value value="0x20" name="Off" cname="_EBTR5_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="All" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F6310.xml b/src/devices/pic/xml_data/18F6310.xml index f975990..9bdbfb7 100644 --- a/src/devices/pic/xml_data/18F6310.xml +++ b/src/devices/pic/xml_data/18F6310.xml @@ -33,16 +33,16 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x001FFF" word_write_align="8" word_erase_align="0" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -53,42 +53,42 @@ <value value="0x08" name="INTRC_IO" cname="_OSC_INTIO67" /> <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" /> <value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="Software" cname="_BOREN_ON" /> <value value="0x04" name="On_run" cname="_BOREN_NOSLP" /> <value value="0x06" name="On" cname="_BOREN_SBORDIS" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -105,79 +105,79 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xC3" > - <tqmask name="PM" value="0x03" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xC3" > + <mask name="PM" value="0x03" > <value value="0x00" name="Extended microcontroller" cname="_PM_EM" /> <value value="0x01" name="Microprocessor with boot" cname="_PM_MPB" /> <value value="0x02" name="Microprocessor" cname="_PM_MP" /> <value value="0x03" name="Microcontroller" cname="_PM_MC" /> - </tqmask> - <tqmask name="BW" value="0x40" > + </mask> + <mask name="BW" value="0x40" > <value value="0x00" name="8" cname="_BW_8" /> <value value="0x40" name="16" cname="_BW_16" /> - </tqmask> - <tqmask name="WAIT" value="0x80" > + </mask> + <mask name="WAIT" value="0x80" > <value value="0x00" name="On" cname="_WAIT_ON" /> <value value="0x80" name="Off" cname="_WAIT_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x81" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x81" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RE7/RB3" cname="_CCP2MX_PORTE" /> <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x81" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x81" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="CP" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x01" > + <mask name="CP" value="0x01" > <value value="0x00" name="All" cname="_CP_ON" /> <value value="0x01" name="Off" cname="_CP_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x00" /> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x00" /> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x00" /> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="EBTR" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x01" > + <mask name="EBTR" value="0x01" > <value value="0x00" name="All" cname="_EBTR_ON" /> <value value="0x01" name="Off" cname="_EBTR_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x00" /> <!--* Packages *************************************************************--> <package types="tqfp" nb_pins="64" > diff --git a/src/devices/pic/xml_data/18F6390.xml b/src/devices/pic/xml_data/18F6390.xml index ec6b10c..02f2498 100644 --- a/src/devices/pic/xml_data/18F6390.xml +++ b/src/devices/pic/xml_data/18F6390.xml @@ -33,16 +33,16 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x001FFF" word_write_align="8" word_erase_align="0" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -53,42 +53,42 @@ <value value="0x08" name="INTRC_IO" cname="_OSC_INTIO67" /> <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" /> <value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="Software" cname="_BOREN_ON" /> <value value="0x04" name="On_run" cname="_BOREN_NOSLP" /> <value value="0x06" name="On" cname="_BOREN_SBORDIS" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -105,79 +105,79 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xC3" > - <tqmask name="PM" value="0x03" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xC3" > + <mask name="PM" value="0x03" > <value value="0x00" name="Extended microcontroller" cname="_PM_EM" /> <value value="0x01" name="Microprocessor with boot" cname="_PM_MPB" /> <value value="0x02" name="Microprocessor" cname="_PM_MP" /> <value value="0x03" name="Microcontroller" cname="_PM_MC" /> - </tqmask> - <tqmask name="BW" value="0x40" > + </mask> + <mask name="BW" value="0x40" > <value value="0x00" name="8" cname="_BW_8" /> <value value="0x40" name="16" cname="_BW_16" /> - </tqmask> - <tqmask name="WAIT" value="0x80" > + </mask> + <mask name="WAIT" value="0x80" > <value value="0x00" name="On" cname="_WAIT_ON" /> <value value="0x80" name="Off" cname="_WAIT_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x81" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x81" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RE7/RB3" cname="_CCP2MX_PORTE" /> <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x81" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x81" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="CP" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x01" > + <mask name="CP" value="0x01" > <value value="0x00" name="All" cname="_CP_ON" /> <value value="0x01" name="Off" cname="_CP_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x00" /> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x00" /> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x00" /> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="EBTR" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x01" > + <mask name="EBTR" value="0x01" > <value value="0x00" name="All" cname="_EBTR_ON" /> <value value="0x01" name="Off" cname="_EBTR_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x00" /> <!--* Packages *************************************************************--> <package types="tqfp" nb_pins="64" > diff --git a/src/devices/pic/xml_data/18F6393.xml b/src/devices/pic/xml_data/18F6393.xml index bb48cbe..bc778f4 100644 --- a/src/devices/pic/xml_data/18F6393.xml +++ b/src/devices/pic/xml_data/18F6393.xml @@ -36,16 +36,16 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x001FFF" word_write_align="8" word_erase_align="0" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -56,42 +56,42 @@ <value value="0x08" name="INTRC_IO" cname="_OSC_INTIO67" /> <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" /> <value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="Software" cname="_BOREN_ON" /> <value value="0x04" name="On_run" cname="_BOREN_NOSLP" /> <value value="0x06" name="On" cname="_BOREN_SBORDIS" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -108,79 +108,79 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xC3" > - <tqmask name="PM" value="0x03" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xC3" > + <mask name="PM" value="0x03" > <value value="0x00" name="Extended microcontroller" cname="_PM_EM" /> <value value="0x01" name="Microprocessor with boot" cname="_PM_MPB" /> <value value="0x02" name="Microprocessor" cname="_PM_MP" /> <value value="0x03" name="Microcontroller" cname="_PM_MC" /> - </tqmask> - <tqmask name="BW" value="0x40" > + </mask> + <mask name="BW" value="0x40" > <value value="0x00" name="8" cname="_BW_8" /> <value value="0x40" name="16" cname="_BW_16" /> - </tqmask> - <tqmask name="WAIT" value="0x80" > + </mask> + <mask name="WAIT" value="0x80" > <value value="0x00" name="On" cname="_WAIT_ON" /> <value value="0x80" name="Off" cname="_WAIT_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x81" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x81" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RE7/RB3" cname="_CCP2MX_PORTE" /> <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x81" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x81" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="CP" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x01" > + <mask name="CP" value="0x01" > <value value="0x00" name="All" cname="_CP_ON" /> <value value="0x01" name="Off" cname="_CP_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x00" /> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x00" /> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x00" /> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="EBTR" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x01" > + <mask name="EBTR" value="0x01" > <value value="0x00" name="All" cname="_EBTR_ON" /> <value value="0x01" name="Off" cname="_EBTR_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x00" /> <!--* Packages *************************************************************--> <package types="tqfp" nb_pins="64" > diff --git a/src/devices/pic/xml_data/18F63J11.xml b/src/devices/pic/xml_data/18F63J11.xml index 481e5e8..37273bc 100644 --- a/src/devices/pic/xml_data/18F63J11.xml +++ b/src/devices/pic/xml_data/18F63J11.xml @@ -29,55 +29,55 @@ <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" > - <tqmask name="WDT" value="0x01" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="STVREN" value="0x20" > + </mask> + <mask name="STVREN" value="0x20" > <value value="0x00" name="Off" cname="" /> <value value="0x20" name="On" cname="" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="" /> <value value="0x40" name="On" cname="" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" > - <tqmask name="CP" value="0x04" > + <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" > + <mask name="CP" value="0x04" > <value value="0x00" name="All" cname="" /> <value value="0x04" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="FOSC" value="0x03" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" > + <mask name="FOSC" value="0x03" > <value value="0x00" name="HS" cname="" /> <value value="0x01" name="HSPLL" cname="" /> <value value="0x02" name="EC" cname="" /> <value value="0x03" name="ECPLL_IO" cname="" /> - </tqmask> - <tqmask name="FOSC2" value="0x04" > + </mask> + <mask name="FOSC2" value="0x04" > <value value="0x00" name="FOSC1:FOSC0" cname="" /> <value value="0x04" name="INTRC" cname="" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="On" cname="" /> <value value="0x40" name="Off" cname="" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDTPS" value="0x0F" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDTPS" value="0x0F" > <value value="0x00" name="1:1" cname="" /> <value value="0x01" name="1:2" cname="" /> <value value="0x02" name="1:4" cname="" /> @@ -94,23 +94,23 @@ <value value="0x0D" name="1:8192" cname="" /> <value value="0x0E" name="1:16384" cname="" /> <value value="0x0F" name="1:32768" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="" /> <value value="0x01" name="RC1" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" > </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F63J90.xml b/src/devices/pic/xml_data/18F63J90.xml index 48f5c8e..ef1310c 100644 --- a/src/devices/pic/xml_data/18F63J90.xml +++ b/src/devices/pic/xml_data/18F63J90.xml @@ -28,55 +28,55 @@ <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" > - <tqmask name="WDT" value="0x01" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="STVREN" value="0x20" > + </mask> + <mask name="STVREN" value="0x20" > <value value="0x00" name="Off" cname="" /> <value value="0x20" name="On" cname="" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="" /> <value value="0x40" name="On" cname="" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" > - <tqmask name="CP" value="0x04" > + <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" > + <mask name="CP" value="0x04" > <value value="0x00" name="All" cname="" /> <value value="0x04" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="FOSC" value="0x03" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" > + <mask name="FOSC" value="0x03" > <value value="0x00" name="HS" cname="" /> <value value="0x01" name="HSPLL" cname="" /> <value value="0x02" name="EC" cname="" /> <value value="0x03" name="ECPLL_IO" cname="" /> - </tqmask> - <tqmask name="FOSC2" value="0x04" > + </mask> + <mask name="FOSC2" value="0x04" > <value value="0x00" name="FOSC1:FOSC0" cname="" /> <value value="0x04" name="INTRC" cname="" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="On" cname="" /> <value value="0x40" name="Off" cname="" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDTPS" value="0x0F" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDTPS" value="0x0F" > <value value="0x00" name="1:1" cname="" /> <value value="0x01" name="1:2" cname="" /> <value value="0x02" name="1:4" cname="" /> @@ -93,23 +93,23 @@ <value value="0x0D" name="1:8192" cname="" /> <value value="0x0E" name="1:16384" cname="" /> <value value="0x0F" name="1:32768" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="" /> <value value="0x01" name="RC1" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" > </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F6410.xml b/src/devices/pic/xml_data/18F6410.xml index 670937b..c270208 100644 --- a/src/devices/pic/xml_data/18F6410.xml +++ b/src/devices/pic/xml_data/18F6410.xml @@ -33,16 +33,16 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x003FFF" word_write_align="8" word_erase_align="0" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -53,42 +53,42 @@ <value value="0x08" name="INTRC_IO" cname="_OSC_INTIO67" /> <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" /> <value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="Software" cname="_BOREN_ON" /> <value value="0x04" name="On_run" cname="_BOREN_NOSLP" /> <value value="0x06" name="On" cname="_BOREN_SBORDIS" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -105,79 +105,79 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xC3" > - <tqmask name="PM" value="0x03" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xC3" > + <mask name="PM" value="0x03" > <value value="0x00" name="Extended microcontroller" cname="_PM_EM" /> <value value="0x01" name="Microprocessor with boot" cname="_PM_MPB" /> <value value="0x02" name="Microprocessor" cname="_PM_MP" /> <value value="0x03" name="Microcontroller" cname="_PM_MC" /> - </tqmask> - <tqmask name="BW" value="0x40" > + </mask> + <mask name="BW" value="0x40" > <value value="0x00" name="8" cname="_BW_8" /> <value value="0x40" name="16" cname="_BW_16" /> - </tqmask> - <tqmask name="WAIT" value="0x80" > + </mask> + <mask name="WAIT" value="0x80" > <value value="0x00" name="On" cname="_WAIT_ON" /> <value value="0x80" name="Off" cname="_WAIT_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x81" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x81" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RE7/RB3" cname="_CCP2MX_PORTE" /> <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x81" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x81" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="CP" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x01" > + <mask name="CP" value="0x01" > <value value="0x00" name="All" cname="_CP_ON" /> <value value="0x01" name="Off" cname="_CP_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x00" /> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x00" /> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x00" /> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="EBTR" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x01" > + <mask name="EBTR" value="0x01" > <value value="0x00" name="All" cname="_EBTR_ON" /> <value value="0x01" name="Off" cname="_EBTR_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x00" /> <!--* Packages *************************************************************--> <package types="tqfp" nb_pins="64" > diff --git a/src/devices/pic/xml_data/18F6490.xml b/src/devices/pic/xml_data/18F6490.xml index bd4ae20..1727686 100644 --- a/src/devices/pic/xml_data/18F6490.xml +++ b/src/devices/pic/xml_data/18F6490.xml @@ -33,16 +33,16 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x003FFF" word_write_align="8" word_erase_align="0" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -53,42 +53,42 @@ <value value="0x08" name="INTRC_IO" cname="_OSC_INTIO67" /> <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" /> <value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="Software" cname="_BOREN_ON" /> <value value="0x04" name="On_run" cname="_BOREN_NOSLP" /> <value value="0x06" name="On" cname="_BOREN_SBORDIS" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -105,79 +105,79 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xC3" > - <tqmask name="PM" value="0x03" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xC3" > + <mask name="PM" value="0x03" > <value value="0x00" name="Extended microcontroller" cname="_PM_EM" /> <value value="0x01" name="Microprocessor with boot" cname="_PM_MPB" /> <value value="0x02" name="Microprocessor" cname="_PM_MP" /> <value value="0x03" name="Microcontroller" cname="_PM_MC" /> - </tqmask> - <tqmask name="BW" value="0x40" > + </mask> + <mask name="BW" value="0x40" > <value value="0x00" name="8" cname="_BW_8" /> <value value="0x40" name="16" cname="_BW_16" /> - </tqmask> - <tqmask name="WAIT" value="0x80" > + </mask> + <mask name="WAIT" value="0x80" > <value value="0x00" name="On" cname="_WAIT_ON" /> <value value="0x80" name="Off" cname="_WAIT_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x81" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x81" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RE7/RB3" cname="_CCP2MX_PORTE" /> <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x81" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x81" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="CP" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x01" > + <mask name="CP" value="0x01" > <value value="0x00" name="All" cname="_CP_ON" /> <value value="0x01" name="Off" cname="_CP_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x00" /> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x00" /> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x00" /> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="EBTR" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x01" > + <mask name="EBTR" value="0x01" > <value value="0x00" name="All" cname="_EBTR_ON" /> <value value="0x01" name="Off" cname="_EBTR_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x00" /> <!--* Packages *************************************************************--> <package types="tqfp" nb_pins="64" > diff --git a/src/devices/pic/xml_data/18F6493.xml b/src/devices/pic/xml_data/18F6493.xml index f980eca..89f409d 100644 --- a/src/devices/pic/xml_data/18F6493.xml +++ b/src/devices/pic/xml_data/18F6493.xml @@ -36,16 +36,16 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x003FFF" word_write_align="8" word_erase_align="0" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -56,42 +56,42 @@ <value value="0x08" name="INTRC_IO" cname="_OSC_INTIO67" /> <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" /> <value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="Software" cname="_BOREN_ON" /> <value value="0x04" name="On_run" cname="_BOREN_NOSLP" /> <value value="0x06" name="On" cname="_BOREN_SBORDIS" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -108,79 +108,79 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xC3" > - <tqmask name="PM" value="0x03" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xC3" > + <mask name="PM" value="0x03" > <value value="0x00" name="Extended microcontroller" cname="_PM_EM" /> <value value="0x01" name="Microprocessor with boot" cname="_PM_MPB" /> <value value="0x02" name="Microprocessor" cname="_PM_MP" /> <value value="0x03" name="Microcontroller" cname="_PM_MC" /> - </tqmask> - <tqmask name="BW" value="0x40" > + </mask> + <mask name="BW" value="0x40" > <value value="0x00" name="8" cname="_BW_8" /> <value value="0x40" name="16" cname="_BW_16" /> - </tqmask> - <tqmask name="WAIT" value="0x80" > + </mask> + <mask name="WAIT" value="0x80" > <value value="0x00" name="On" cname="_WAIT_ON" /> <value value="0x80" name="Off" cname="_WAIT_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x81" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x81" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RE7/RB3" cname="_CCP2MX_PORTE" /> <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x81" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x81" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="CP" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x01" > + <mask name="CP" value="0x01" > <value value="0x00" name="All" cname="_CP_ON" /> <value value="0x01" name="Off" cname="_CP_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x00" /> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x00" /> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x00" /> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="EBTR" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x01" > + <mask name="EBTR" value="0x01" > <value value="0x00" name="All" cname="_EBTR_ON" /> <value value="0x01" name="Off" cname="_EBTR_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x00" /> <!--* Packages *************************************************************--> <package types="tqfp" nb_pins="64" > diff --git a/src/devices/pic/xml_data/18F64J11.xml b/src/devices/pic/xml_data/18F64J11.xml index d3e9696..fd126a0 100644 --- a/src/devices/pic/xml_data/18F64J11.xml +++ b/src/devices/pic/xml_data/18F64J11.xml @@ -29,55 +29,55 @@ <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" > - <tqmask name="WDT" value="0x01" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="STVREN" value="0x20" > + </mask> + <mask name="STVREN" value="0x20" > <value value="0x00" name="Off" cname="" /> <value value="0x20" name="On" cname="" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="" /> <value value="0x40" name="On" cname="" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" > - <tqmask name="CP" value="0x04" > + <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" > + <mask name="CP" value="0x04" > <value value="0x00" name="All" cname="" /> <value value="0x04" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="FOSC" value="0x03" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" > + <mask name="FOSC" value="0x03" > <value value="0x00" name="HS" cname="" /> <value value="0x01" name="HSPLL" cname="" /> <value value="0x02" name="EC" cname="" /> <value value="0x03" name="ECPLL_IO" cname="" /> - </tqmask> - <tqmask name="FOSC2" value="0x04" > + </mask> + <mask name="FOSC2" value="0x04" > <value value="0x00" name="FOSC1:FOSC0" cname="" /> <value value="0x04" name="INTRC" cname="" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="On" cname="" /> <value value="0x40" name="Off" cname="" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDTPS" value="0x0F" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDTPS" value="0x0F" > <value value="0x00" name="1:1" cname="" /> <value value="0x01" name="1:2" cname="" /> <value value="0x02" name="1:4" cname="" /> @@ -94,23 +94,23 @@ <value value="0x0D" name="1:8192" cname="" /> <value value="0x0E" name="1:16384" cname="" /> <value value="0x0F" name="1:32768" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="" /> <value value="0x01" name="RC1" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" > </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F64J90.xml b/src/devices/pic/xml_data/18F64J90.xml index 70df11f..fedf592 100644 --- a/src/devices/pic/xml_data/18F64J90.xml +++ b/src/devices/pic/xml_data/18F64J90.xml @@ -29,55 +29,55 @@ <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" > - <tqmask name="WDT" value="0x01" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="STVREN" value="0x20" > + </mask> + <mask name="STVREN" value="0x20" > <value value="0x00" name="Off" cname="" /> <value value="0x20" name="On" cname="" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="" /> <value value="0x40" name="On" cname="" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" > - <tqmask name="CP" value="0x04" > + <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" > + <mask name="CP" value="0x04" > <value value="0x00" name="All" cname="" /> <value value="0x04" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="FOSC" value="0x03" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" > + <mask name="FOSC" value="0x03" > <value value="0x00" name="HS" cname="" /> <value value="0x01" name="HSPLL" cname="" /> <value value="0x02" name="EC" cname="" /> <value value="0x03" name="ECPLL_IO" cname="" /> - </tqmask> - <tqmask name="FOSC2" value="0x04" > + </mask> + <mask name="FOSC2" value="0x04" > <value value="0x00" name="FOSC1:FOSC0" cname="" /> <value value="0x04" name="INTRC" cname="" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="On" cname="" /> <value value="0x40" name="Off" cname="" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDTPS" value="0x0F" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDTPS" value="0x0F" > <value value="0x00" name="1:1" cname="" /> <value value="0x01" name="1:2" cname="" /> <value value="0x02" name="1:4" cname="" /> @@ -94,23 +94,23 @@ <value value="0x0D" name="1:8192" cname="" /> <value value="0x0E" name="1:16384" cname="" /> <value value="0x0F" name="1:32768" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="" /> <value value="0x01" name="RC1" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" > </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F6520.xml b/src/devices/pic/xml_data/18F6520.xml index 20eac42..a022295 100644 --- a/src/devices/pic/xml_data/18F6520.xml +++ b/src/devices/pic/xml_data/18F6520.xml @@ -36,17 +36,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x007FFF" word_write_align="4" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" > - <tqmask name="FOSC" value="0x07" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" > + <mask name="FOSC" value="0x07" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -55,36 +55,36 @@ <value value="0x05" name="EC_IO" cname="_OSC_ECIO" /> <value value="0x06" name="H4" cname="_OSC_HSPLL" /> <value value="0x07" name="EXTRC_IO" cname="_OSC_RCIO" /> - </tqmask> - <tqmask name="OSCSEN" value="0x20" > + </mask> + <mask name="OSCSEN" value="0x20" > <value value="0x00" name="On" cname="_OSCS_ON" /> <value value="0x20" name="Off" cname="_OSCS_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x02" > + </mask> + <mask name="BODEN" value="0x02" > <value value="0x00" name="Off" cname="_BOR_OFF" /> <value value="0x02" name="On" cname="_BOR_ON" /> - </tqmask> - <tqmask name="BORV" value="0x0C" > + </mask> + <mask name="BORV" value="0x0C" > <value value="0x00" name="4.5" cname="_BORV_45" /> <value value="0x04" name="4.2" cname="_BORV_42" /> <value value="0x08" name="2.7" cname="_BORV_27" /> <value value="0x0C" name="2.5" cname="_BORV_25" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x0E" > + </mask> + <mask name="WDTPS" value="0x0E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -93,123 +93,123 @@ <value value="0x0A" name="1:32" cname="_WDTPS_32" /> <value value="0x0C" name="1:64" cname="_WDTPS_64" /> <value value="0x0E" name="1:128" cname="_WDTPS_128" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RE7" cname="_CCP2MUX_RE7" /> <value value="0x01" name="RC1" cname="_CCP2MUX_RC1" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVR_OFF" /> <value value="0x01" name="On" cname="_STVR_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0xFF" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0xFF" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_CP2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" /> - </tqmask> - <tqmask name="CP_3" value="0x08" > + </mask> + <mask name="CP_3" value="0x08" > <value value="0x00" name="6000:7FFF" cname="_CP3_ON" /> <value value="0x08" name="Off" cname="_CP3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0xFF" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0xFF" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_WRT2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" /> - </tqmask> - <tqmask name="WRT_3" value="0x08" > + </mask> + <mask name="WRT_3" value="0x08" > <value value="0x00" name="6000:7FFF" cname="_WRT3_ON" /> <value value="0x08" name="Off" cname="_WRT3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0xFF" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0xFF" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_EBTR2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" /> - </tqmask> - <tqmask name="EBTR_3" value="0x08" > + </mask> + <mask name="EBTR_3" value="0x08" > <value value="0x00" name="6000:7FFF" cname="_EBTR3_ON" /> <value value="0x08" name="Off" cname="_EBTR3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F6525.xml b/src/devices/pic/xml_data/18F6525.xml index c3206cb..953e12a 100644 --- a/src/devices/pic/xml_data/18F6525.xml +++ b/src/devices/pic/xml_data/18F6525.xml @@ -35,17 +35,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x00BFFF" word_write_align="4" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x2F" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x2F" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -59,36 +59,36 @@ <value value="0x0D" name="E4S_IO" cname="_OSC_ECIOSWPLL" /> <value value="0x0E" name="H4S" cname="_OSC_HSSWPLL" /> <value value="0x0F" name="EXTRC_IO" cname="_OSC_RCIO" /> - </tqmask> - <tqmask name="OSCSEN" value="0x20" > + </mask> + <mask name="OSCSEN" value="0x20" > <value value="0x00" name="On" cname="_OSCS_ON" /> <value value="0x20" name="Off" cname="_OSCS_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x02" > + </mask> + <mask name="BODEN" value="0x02" > <value value="0x00" name="Off" cname="_BOR_OFF" /> <value value="0x02" name="On" cname="_BOR_ON" /> - </tqmask> - <tqmask name="BORV" value="0x0C" > + </mask> + <mask name="BORV" value="0x0C" > <value value="0x00" name="4.5" cname="_BORV_45" /> <value value="0x04" name="4.2" cname="_BORV_42" /> <value value="0x08" name="2.7" cname="_BORV_27" /> <value value="0x0C" name="2.0" cname="_BORV_20" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -105,115 +105,115 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RE7" cname="_CCP2MX_PORTBE" /> <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVR_OFF" /> <value value="0x01" name="On" cname="_STVR_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0xFF" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0xFF" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800:3FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_CP2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0xFF" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0xFF" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800:3FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0xFF" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0xFF" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800:3FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F6527.xml b/src/devices/pic/xml_data/18F6527.xml index 8779fa8..04a2bf1 100644 --- a/src/devices/pic/xml_data/18F6527.xml +++ b/src/devices/pic/xml_data/18F6527.xml @@ -27,17 +27,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x00BFFF" word_write_align="32" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_LP_OSC" /> <value value="0x01" name="XT" cname="_XT_OSC" /> <value value="0x02" name="HS" cname="_HS_OSC" /> @@ -54,42 +54,42 @@ <value value="0x0D" name="EXTRC_CLKOUT" cname="_RC_OSC" /> <value value="0x0E" name="EXTRC_CLKOUT" cname="_RC_OSC" /> <value value="0x0F" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FSCM_OFF" /> <value value="0x40" name="On" cname="_FSCM_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="Software" cname="_BOREN_ON" /> <value value="0x04" name="On_run" cname="_BOREN_NOSLP" /> <value value="0x06" name="On" cname="_BOREN_SBORDIS" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -106,129 +106,129 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8K" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16K" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32K" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x85" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RE7" cname="_CCP2MX_PORTE" /> <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="BBSIZ" value="0x30" > + </mask> + <mask name="BBSIZ" value="0x30" > <value value="0x00" name="1024" cname="_BBSIZ_1024" /> <value value="0x10" name="2048" cname="_BBSIZ_2048" /> <value value="0x20" name="4096" cname="_BBSIZ_4096" /> <value value="0x30" name="4096" cname="_BBSIZ_4096" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x07" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800/1000/2000:3FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_CP2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="All" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x07" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800/1000/2000:3FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="All" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x07" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800/1000/2000:3FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="All" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F6585.xml b/src/devices/pic/xml_data/18F6585.xml index d602f95..0bf9bab 100644 --- a/src/devices/pic/xml_data/18F6585.xml +++ b/src/devices/pic/xml_data/18F6585.xml @@ -27,17 +27,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x00BFFF" word_write_align="4" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x2F" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x2F" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -51,36 +51,36 @@ <value value="0x0D" name="E4S_IO" cname="_OSC_ECIOSWPLL" /> <value value="0x0E" name="H4S" cname="_OSC_HSSWPLL" /> <value value="0x0F" name="EXTRC_IO" cname="_OSC_RCIO" /> - </tqmask> - <tqmask name="OSCSEN" value="0x20" > + </mask> + <mask name="OSCSEN" value="0x20" > <value value="0x00" name="On" cname="_OSCS_ON" /> <value value="0x20" name="Off" cname="_OSCS_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x02" > + </mask> + <mask name="BODEN" value="0x02" > <value value="0x00" name="Off" cname="_BOR_OFF" /> <value value="0x02" name="On" cname="_BOR_ON" /> - </tqmask> - <tqmask name="BORV" value="0x0C" > + </mask> + <mask name="BORV" value="0x0C" > <value value="0x00" name="4.5" cname="_BORV_45" /> <value value="0x04" name="4.2" cname="_BORV_42" /> <value value="0x08" name="2.7" cname="_BORV_27" /> <value value="0x0C" name="2.0" cname="_BORV_20" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -97,115 +97,115 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x81" ctqmask="0x02" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x81" cmask="0x02" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RE7" cname="_CCP2MX_OFF" /> <value value="0x01" name="RC1" cname="_CCP2MX_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVR_OFF" /> <value value="0x01" name="On" cname="_STVR_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x07" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800:3FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_CP2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x07" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800:3FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x07" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800:3FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F65J10.xml b/src/devices/pic/xml_data/18F65J10.xml index 473c590..a67fe87 100644 --- a/src/devices/pic/xml_data/18F65J10.xml +++ b/src/devices/pic/xml_data/18F65J10.xml @@ -29,55 +29,55 @@ <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" > - <tqmask name="WDT" value="0x01" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="STVREN" value="0x20" > + </mask> + <mask name="STVREN" value="0x20" > <value value="0x00" name="Off" cname="" /> <value value="0x20" name="On" cname="" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="" /> <value value="0x40" name="On" cname="" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" > - <tqmask name="CP" value="0x04" > + <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" > + <mask name="CP" value="0x04" > <value value="0x00" name="All" cname="" /> <value value="0x04" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="FOSC" value="0x03" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" > + <mask name="FOSC" value="0x03" > <value value="0x00" name="HS" cname="" /> <value value="0x01" name="HSPLL" cname="" /> <value value="0x02" name="EC" cname="" /> <value value="0x03" name="ECPLL_IO" cname="" /> - </tqmask> - <tqmask name="FOSC2" value="0x04" > + </mask> + <mask name="FOSC2" value="0x04" > <value value="0x00" name="FOSC1:FOSC0" cname="" /> <value value="0x04" name="INTRC" cname="" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="On" cname="" /> <value value="0x40" name="Off" cname="" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDTPS" value="0x0F" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDTPS" value="0x0F" > <value value="0x00" name="1:1" cname="" /> <value value="0x01" name="1:2" cname="" /> <value value="0x02" name="1:4" cname="" /> @@ -94,23 +94,23 @@ <value value="0x0D" name="1:8192" cname="" /> <value value="0x0E" name="1:16384" cname="" /> <value value="0x0F" name="1:32768" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="" /> <value value="0x01" name="RC1" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" > </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F65J11.xml b/src/devices/pic/xml_data/18F65J11.xml index c4284fc..2ef5b3d 100644 --- a/src/devices/pic/xml_data/18F65J11.xml +++ b/src/devices/pic/xml_data/18F65J11.xml @@ -29,55 +29,55 @@ <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" > - <tqmask name="WDT" value="0x01" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="STVREN" value="0x20" > + </mask> + <mask name="STVREN" value="0x20" > <value value="0x00" name="Off" cname="" /> <value value="0x20" name="On" cname="" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="" /> <value value="0x40" name="On" cname="" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" > - <tqmask name="CP" value="0x04" > + <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" > + <mask name="CP" value="0x04" > <value value="0x00" name="All" cname="" /> <value value="0x04" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="FOSC" value="0x03" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" > + <mask name="FOSC" value="0x03" > <value value="0x00" name="HS" cname="" /> <value value="0x01" name="HSPLL" cname="" /> <value value="0x02" name="EC" cname="" /> <value value="0x03" name="ECPLL_IO" cname="" /> - </tqmask> - <tqmask name="FOSC2" value="0x04" > + </mask> + <mask name="FOSC2" value="0x04" > <value value="0x00" name="FOSC1:FOSC0" cname="" /> <value value="0x04" name="INTRC" cname="" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="On" cname="" /> <value value="0x40" name="Off" cname="" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDTPS" value="0x0F" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDTPS" value="0x0F" > <value value="0x00" name="1:1" cname="" /> <value value="0x01" name="1:2" cname="" /> <value value="0x02" name="1:4" cname="" /> @@ -94,23 +94,23 @@ <value value="0x0D" name="1:8192" cname="" /> <value value="0x0E" name="1:16384" cname="" /> <value value="0x0F" name="1:32768" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="" /> <value value="0x01" name="RC1" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" > </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F65J15.xml b/src/devices/pic/xml_data/18F65J15.xml index 6c212d2..f5f310a 100644 --- a/src/devices/pic/xml_data/18F65J15.xml +++ b/src/devices/pic/xml_data/18F65J15.xml @@ -29,55 +29,55 @@ <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" > - <tqmask name="WDT" value="0x01" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="STVREN" value="0x20" > + </mask> + <mask name="STVREN" value="0x20" > <value value="0x00" name="Off" cname="" /> <value value="0x20" name="On" cname="" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="" /> <value value="0x40" name="On" cname="" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" > - <tqmask name="CP" value="0x04" > + <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" > + <mask name="CP" value="0x04" > <value value="0x00" name="All" cname="" /> <value value="0x04" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="FOSC" value="0x03" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" > + <mask name="FOSC" value="0x03" > <value value="0x00" name="HS" cname="" /> <value value="0x01" name="HSPLL" cname="" /> <value value="0x02" name="EC" cname="" /> <value value="0x03" name="ECPLL_IO" cname="" /> - </tqmask> - <tqmask name="FOSC2" value="0x04" > + </mask> + <mask name="FOSC2" value="0x04" > <value value="0x00" name="FOSC1:FOSC0" cname="" /> <value value="0x04" name="INTRC" cname="" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="On" cname="" /> <value value="0x40" name="Off" cname="" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDTPS" value="0x0F" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDTPS" value="0x0F" > <value value="0x00" name="1:1" cname="" /> <value value="0x01" name="1:2" cname="" /> <value value="0x02" name="1:4" cname="" /> @@ -94,23 +94,23 @@ <value value="0x0D" name="1:8192" cname="" /> <value value="0x0E" name="1:16384" cname="" /> <value value="0x0F" name="1:32768" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="" /> <value value="0x01" name="RC1" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" > </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F65J50.xml b/src/devices/pic/xml_data/18F65J50.xml index ad5bc75..d0cdd2b 100644 --- a/src/devices/pic/xml_data/18F65J50.xml +++ b/src/devices/pic/xml_data/18F65J50.xml @@ -29,12 +29,12 @@ <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xEF" > - <tqmask name="WDT" value="0x01" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xEF" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="PLLDIV" value="0x0E" > + </mask> + <mask name="PLLDIV" value="0x0E" > <value value="0x00" name="12" cname="" /> <value value="0x02" name="10" cname="" /> <value value="0x04" name="6" cname="" /> @@ -43,51 +43,51 @@ <value value="0x0A" name="3" cname="" /> <value value="0x0C" name="2" cname="" /> <value value="0x0E" name="1" cname="" /> - </tqmask> - <tqmask name="STVREN" value="0x20" > + </mask> + <mask name="STVREN" value="0x20" > <value value="0x00" name="Off" cname="" /> <value value="0x20" name="On" cname="" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="" /> <value value="0x40" name="On" cname="" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" > - <tqmask name="CP" value="0x04" > + <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" > + <mask name="CP" value="0x04" > <value value="0x00" name="All" cname="" /> <value value="0x04" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="FOSC" value="0x03" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" > + <mask name="FOSC" value="0x03" > <value value="0x00" name="HS" cname="" /> <value value="0x01" name="HSPLL" cname="" /> <value value="0x02" name="EC" cname="" /> <value value="0x03" name="ECPLL_IO" cname="" /> - </tqmask> - <tqmask name="FOSC2" value="0x04" > + </mask> + <mask name="FOSC2" value="0x04" > <value value="0x00" name="FOSC1:FOSC0" cname="" /> <value value="0x04" name="INTRC" cname="" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="On" cname="" /> <value value="0x40" name="Off" cname="" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDTPS" value="0x0F" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDTPS" value="0x0F" > <value value="0x00" name="1:1" cname="" /> <value value="0x01" name="1:2" cname="" /> <value value="0x02" name="1:4" cname="" /> @@ -104,27 +104,27 @@ <value value="0x0D" name="1:8192" cname="" /> <value value="0x0E" name="1:16384" cname="" /> <value value="0x0F" name="1:32768" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x09" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x09" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="" /> <value value="0x01" name="RC1" cname="" /> - </tqmask> - <tqmask name="MSSPSEL" value="0x08" > + </mask> + <mask name="MSSPSEL" value="0x08" > <value value="0x00" name="5BIT" cname="" /> <value value="0x08" name="7BIT" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" > </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F65J90.xml b/src/devices/pic/xml_data/18F65J90.xml index 34e7be9..91997da 100644 --- a/src/devices/pic/xml_data/18F65J90.xml +++ b/src/devices/pic/xml_data/18F65J90.xml @@ -29,55 +29,55 @@ <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" > - <tqmask name="WDT" value="0x01" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="STVREN" value="0x20" > + </mask> + <mask name="STVREN" value="0x20" > <value value="0x00" name="Off" cname="" /> <value value="0x20" name="On" cname="" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="" /> <value value="0x40" name="On" cname="" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" > - <tqmask name="CP" value="0x04" > + <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" > + <mask name="CP" value="0x04" > <value value="0x00" name="All" cname="" /> <value value="0x04" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="FOSC" value="0x03" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" > + <mask name="FOSC" value="0x03" > <value value="0x00" name="HS" cname="" /> <value value="0x01" name="HSPLL" cname="" /> <value value="0x02" name="EC" cname="" /> <value value="0x03" name="ECPLL_IO" cname="" /> - </tqmask> - <tqmask name="FOSC2" value="0x04" > + </mask> + <mask name="FOSC2" value="0x04" > <value value="0x00" name="FOSC1:FOSC0" cname="" /> <value value="0x04" name="INTRC" cname="" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="On" cname="" /> <value value="0x40" name="Off" cname="" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDTPS" value="0x0F" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDTPS" value="0x0F" > <value value="0x00" name="1:1" cname="" /> <value value="0x01" name="1:2" cname="" /> <value value="0x02" name="1:4" cname="" /> @@ -94,23 +94,23 @@ <value value="0x0D" name="1:8192" cname="" /> <value value="0x0E" name="1:16384" cname="" /> <value value="0x0F" name="1:32768" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="" /> <value value="0x01" name="RC1" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" > </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F6620.xml b/src/devices/pic/xml_data/18F6620.xml index 8159b62..e88ee06 100644 --- a/src/devices/pic/xml_data/18F6620.xml +++ b/src/devices/pic/xml_data/18F6620.xml @@ -38,17 +38,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x00FFFF" word_write_align="4" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" > - <tqmask name="FOSC" value="0x07" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" > + <mask name="FOSC" value="0x07" > <value value="0x00" name="LP" cname="_LP_OSC" sdcc_cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_XT_OSC" sdcc_cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_HS_OSC" sdcc_cname="_OSC_HS" /> @@ -57,36 +57,36 @@ <value value="0x05" name="EC_IO" cname="_ECIO_OSC" sdcc_cname="_OSC_EC_OSC2_RA6" /> <value value="0x06" name="H4" cname="_HSPLL_OSC" sdcc_cname="_OSC_HS_PLL" /> <value value="0x07" name="EXTRC_IO" cname="_RCIO_OSC" sdcc_cname="_OSC_RC_OSC2" /> - </tqmask> - <tqmask name="OSCSEN" value="0x20" > + </mask> + <mask name="OSCSEN" value="0x20" > <value value="0x00" name="On" cname="_OSCS_ON" /> <value value="0x20" name="Off" cname="_OSCS_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" sdcc_cname="_PUT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" sdcc_cname="_PUT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x02" > + </mask> + <mask name="BODEN" value="0x02" > <value value="0x00" name="Off" cname="_BOR_OFF" sdcc_cname="_BODEN_OFF" /> <value value="0x02" name="On" cname="_BOR_ON" sdcc_cname="_BODEN_ON" /> - </tqmask> - <tqmask name="BORV" value="0x0C" > + </mask> + <mask name="BORV" value="0x0C" > <value value="0x00" name="4.5" cname="_BORV_45" sdcc_cname="_BODENV_4_5V" /> <value value="0x04" name="4.2" cname="_BORV_42" sdcc_cname="_BODENV_4_2V" /> <value value="0x08" name="2.7" cname="_BORV_27" sdcc_cname="_BODENV_2_7V" /> <value value="0x0C" name="2.5" cname="_BORV_20" sdcc_cname="_BODENV_2_5V" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x0E" > + </mask> + <mask name="WDTPS" value="0x0E" > <value value="0x00" name="1:1" cname="_WDTPS_1" sdcc_cname="_WDTPS_1_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" sdcc_cname="_WDTPS_1_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" sdcc_cname="_WDTPS_1_4" /> @@ -95,123 +95,123 @@ <value value="0x0A" name="1:32" cname="_WDTPS_32" sdcc_cname="_WDTPS_1_32" /> <value value="0x0C" name="1:64" cname="_WDTPS_64" sdcc_cname="_WDTPS_1_64" /> <value value="0x0E" name="1:128" cname="_WDTPS_128" sdcc_cname="_WDTPS_1_128" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RE7" cname="_CCP2MX_OFF" sdcc_cname="_CCP2MUX_RE7" /> <value value="0x01" name="RC1" cname="_CCP2MX_ON" sdcc_cname="_CCP2MUX_RC1" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVR_OFF" /> <value value="0x01" name="On" cname="_STVR_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" sdcc_cname="_BACKBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" sdcc_cname="_BACKBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0200:3FFF" cname="_CP0_ON" sdcc_cname="_CP_0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_CP1_ON" sdcc_cname="_CP_1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_CP2_ON" sdcc_cname="_CP_2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" sdcc_cname="_CP_2_OFF" /> - </tqmask> - <tqmask name="CP_3" value="0x08" > + </mask> + <mask name="CP_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_CP3_ON" sdcc_cname="_CP_3_ON" /> <value value="0x08" name="Off" cname="_CP3_OFF" sdcc_cname="_CP_3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0200:3FFF" cname="_WRT0_ON" sdcc_cname="_WRT_0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_WRT1_ON" sdcc_cname="_WRT_1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" sdcc_cname="_WRT_2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" sdcc_cname="_WRT_2_OFF" /> - </tqmask> - <tqmask name="WRT_3" value="0x08" > + </mask> + <mask name="WRT_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_WRT3_ON" sdcc_cname="_WRT_3_ON" /> <value value="0x08" name="Off" cname="_WRT3_OFF" sdcc_cname="_WRT_3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0200:3FFF" cname="_EBTR0_ON" sdcc_cname="_EBTR_0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" sdcc_cname="_EBTR_1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" sdcc_cname="_EBTR_2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" sdcc_cname="_EBTR_2_OFF" /> - </tqmask> - <tqmask name="EBTR_3" value="0x08" > + </mask> + <mask name="EBTR_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" sdcc_cname="_EBTR_3_ON" /> <value value="0x08" name="Off" cname="_EBTR3_OFF" sdcc_cname="_EBTR_3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F6621.xml b/src/devices/pic/xml_data/18F6621.xml index e043ddf..664de3f 100644 --- a/src/devices/pic/xml_data/18F6621.xml +++ b/src/devices/pic/xml_data/18F6621.xml @@ -35,17 +35,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x00FFFF" word_write_align="4" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x2F" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x2F" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -59,36 +59,36 @@ <value value="0x0D" name="E4S_IO" cname="_OSC_ECIOSWPLL" /> <value value="0x0E" name="H4S" cname="_OSC_HSSWPLL" /> <value value="0x0F" name="EXTRC_IO" cname="_OSC_RCIO" /> - </tqmask> - <tqmask name="OSCSEN" value="0x20" > + </mask> + <mask name="OSCSEN" value="0x20" > <value value="0x00" name="On" cname="_OSCS_ON" /> <value value="0x20" name="Off" cname="_OSCS_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x02" > + </mask> + <mask name="BODEN" value="0x02" > <value value="0x00" name="Off" cname="_BOR_OFF" /> <value value="0x02" name="On" cname="_BOR_ON" /> - </tqmask> - <tqmask name="BORV" value="0x0C" > + </mask> + <mask name="BORV" value="0x0C" > <value value="0x00" name="4.5" cname="_BORV_45" /> <value value="0x04" name="4.2" cname="_BORV_42" /> <value value="0x08" name="2.7" cname="_BORV_27" /> <value value="0x0C" name="2.0" cname="_BORV_20" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -105,127 +105,127 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RE7" cname="_CCP2MX_PORTBE" /> <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVR_OFF" /> <value value="0x01" name="On" cname="_STVR_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800:3FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_CP2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" /> - </tqmask> - <tqmask name="CP_3" value="0x08" > + </mask> + <mask name="CP_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_CP3_ON" /> <value value="0x08" name="Off" cname="_CP3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800:3FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" /> - </tqmask> - <tqmask name="WRT_3" value="0x08" > + </mask> + <mask name="WRT_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_WRT3_ON" /> <value value="0x08" name="Off" cname="_WRT3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800:3FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" /> - </tqmask> - <tqmask name="EBTR_3" value="0x08" > + </mask> + <mask name="EBTR_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" /> <value value="0x08" name="Off" cname="_EBTR3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F6622.xml b/src/devices/pic/xml_data/18F6622.xml index b8e0bb7..6fb81d7 100644 --- a/src/devices/pic/xml_data/18F6622.xml +++ b/src/devices/pic/xml_data/18F6622.xml @@ -27,17 +27,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x00FFFF" word_write_align="32" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_LP_OSC" /> <value value="0x01" name="XT" cname="_XT_OSC" /> <value value="0x02" name="HS" cname="_HS_OSC" /> @@ -54,42 +54,42 @@ <value value="0x0D" name="EXTRC_CLKOUT" cname="_RC_OSC" /> <value value="0x0E" name="EXTRC_CLKOUT" cname="_RC_OSC" /> <value value="0x0F" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FSCM_OFF" /> <value value="0x40" name="On" cname="_FSCM_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="Software" cname="_BOREN_ON" /> <value value="0x04" name="On_run" cname="_BOREN_NOSLP" /> <value value="0x06" name="On" cname="_BOREN_SBORDIS" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -106,141 +106,141 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8K" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16K" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32K" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x85" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RE7" cname="_CCP2MX_PORTE" /> <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="BBSIZ" value="0x30" > + </mask> + <mask name="BBSIZ" value="0x30" > <value value="0x00" name="1024" cname="_BBSIZ_BB2K" /> <value value="0x10" name="2048" cname="_BBSIZ_BB4K" /> <value value="0x20" name="4096" cname="_BBSIZ_BB8K" /> <value value="0x30" name="4096" cname="_BBSIZ_BB8K" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800/1000/2000:3FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_CP2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" /> - </tqmask> - <tqmask name="CP_3" value="0x08" > + </mask> + <mask name="CP_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_CP3_ON" /> <value value="0x08" name="Off" cname="_CP3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="All" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800/1000/2000:3FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" /> - </tqmask> - <tqmask name="WRT_3" value="0x08" > + </mask> + <mask name="WRT_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_WRT3_ON" /> <value value="0x08" name="Off" cname="_WRT3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="All" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800/1000/2000:3FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" /> - </tqmask> - <tqmask name="EBTR_3" value="0x08" > + </mask> + <mask name="EBTR_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" /> <value value="0x08" name="Off" cname="_EBTR3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="All" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F6627.xml b/src/devices/pic/xml_data/18F6627.xml index 1b0bbc8..74248c6 100644 --- a/src/devices/pic/xml_data/18F6627.xml +++ b/src/devices/pic/xml_data/18F6627.xml @@ -27,17 +27,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x017FFF" word_write_align="32" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -48,42 +48,42 @@ <value value="0x08" name="INTRC_IO" cname="_OSC_INTIO67" /> <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" /> <value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="Software" cname="_BOREN_ON" /> <value value="0x04" name="On_run" cname="_BOREN_NOSLP" /> <value value="0x06" name="On" cname="_BOREN_SBORDIS" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -100,165 +100,165 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x85" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RE7" cname="_CCP2MX_PORTE" /> <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="BBSIZ" value="0x30" > + </mask> + <mask name="BBSIZ" value="0x30" > <value value="0x00" name="1024" cname="_BBSIZ_BB2K" /> <value value="0x10" name="2048" cname="_BBSIZ_BB4K" /> <value value="0x20" name="4096" cname="_BBSIZ_BB8K" /> <value value="0x30" name="4096" cname="_BBSIZ_BB8K" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x3F" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x3F" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800/1000/2000:3FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_CP2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" /> - </tqmask> - <tqmask name="CP_3" value="0x08" > + </mask> + <mask name="CP_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_CP3_ON" /> <value value="0x08" name="Off" cname="_CP3_OFF" /> - </tqmask> - <tqmask name="CP_4" value="0x10" > + </mask> + <mask name="CP_4" value="0x10" > <value value="0x00" name="10000:13FFF" cname="_CP4_ON" /> <value value="0x10" name="Off" cname="_CP4_OFF" /> - </tqmask> - <tqmask name="CP_5" value="0x20" > + </mask> + <mask name="CP_5" value="0x20" > <value value="0x00" name="14000:17FFF" cname="_CP5_ON" /> <value value="0x20" name="Off" cname="_CP5_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="All" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x3F" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x3F" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800/1000/2000:3FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" /> - </tqmask> - <tqmask name="WRT_3" value="0x08" > + </mask> + <mask name="WRT_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_WRT3_ON" /> <value value="0x08" name="Off" cname="_WRT3_OFF" /> - </tqmask> - <tqmask name="WRT_4" value="0x10" > + </mask> + <mask name="WRT_4" value="0x10" > <value value="0x00" name="10000:13FFF" cname="_WRT4_ON" /> <value value="0x10" name="Off" cname="_WRT4_OFF" /> - </tqmask> - <tqmask name="WRT_5" value="0x20" > + </mask> + <mask name="WRT_5" value="0x20" > <value value="0x00" name="14000:17FFF" cname="_WRT5_ON" /> <value value="0x20" name="Off" cname="_WRT5_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="All" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x3F" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x3F" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800/1000/2000:3FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" /> - </tqmask> - <tqmask name="EBTR_3" value="0x08" > + </mask> + <mask name="EBTR_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" /> <value value="0x08" name="Off" cname="_EBTR3_OFF" /> - </tqmask> - <tqmask name="EBTR_4" value="0x10" > + </mask> + <mask name="EBTR_4" value="0x10" > <value value="0x00" name="10000:13FFF" cname="_EBTR4_ON" /> <value value="0x10" name="Off" cname="_EBTR4_OFF" /> - </tqmask> - <tqmask name="EBTR_5" value="0x20" > + </mask> + <mask name="EBTR_5" value="0x20" > <value value="0x00" name="14000:17FFF" cname="_EBTR5_ON" /> <value value="0x20" name="Off" cname="_EBTR5_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="All" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F6680.xml b/src/devices/pic/xml_data/18F6680.xml index 6780e23..d0a9922 100644 --- a/src/devices/pic/xml_data/18F6680.xml +++ b/src/devices/pic/xml_data/18F6680.xml @@ -27,17 +27,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x00FFFF" word_write_align="4" word_erase_align="32"/> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x2F" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x2F" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -51,36 +51,36 @@ <value value="0x0D" name="E4S_IO" cname="_OSC_ECIOSWPLL" /> <value value="0x0E" name="H4S" cname="_OSC_HSSWPLL" /> <value value="0x0F" name="EXTRC_IO" cname="_OSC_RCIO" /> - </tqmask> - <tqmask name="OSCSEN" value="0x20" > + </mask> + <mask name="OSCSEN" value="0x20" > <value value="0x00" name="On" cname="_OSCS_ON" /> <value value="0x20" name="Off" cname="_OSCS_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x02" > + </mask> + <mask name="BODEN" value="0x02" > <value value="0x00" name="Off" cname="_BOR_OFF" /> <value value="0x02" name="On" cname="_BOR_ON" /> - </tqmask> - <tqmask name="BORV" value="0x0C" > + </mask> + <mask name="BORV" value="0x0C" > <value value="0x00" name="4.5" cname="_BORV_45" /> <value value="0x04" name="4.2" cname="_BORV_42" /> <value value="0x08" name="2.7" cname="_BORV_27" /> <value value="0x0C" name="2.0" cname="_BORV_20" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -97,127 +97,127 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x81" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x81" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RE7" cname="_CCP2MX_OFF" /> <value value="0x01" name="RC1" cname="_CCP2MX_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVR_OFF" /> <value value="0x01" name="On" cname="_STVR_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" ctqmask="0x08" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" cmask="0x08" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800:3FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_CP2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" /> - </tqmask> - <tqmask name="CP_3" value="0x08" > + </mask> + <mask name="CP_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_CP3_ON" /> <value value="0x08" name="Off" cname="_CP3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" ctqmask="0x08" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" cmask="0x08" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800:3FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" /> - </tqmask> - <tqmask name="WRT_3" value="0x08" > + </mask> + <mask name="WRT_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_WRT3_ON" /> <value value="0x08" name="Off" cname="_WRT3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" ctqmask="0x08" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" cmask="0x08" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800:3FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" /> - </tqmask> - <tqmask name="EBTR_3" value="0x08" > + </mask> + <mask name="EBTR_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" /> <value value="0x08" name="Off" cname="_EBTR3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F66J10.xml b/src/devices/pic/xml_data/18F66J10.xml index 6df51e5..7bb9aa7 100644 --- a/src/devices/pic/xml_data/18F66J10.xml +++ b/src/devices/pic/xml_data/18F66J10.xml @@ -29,55 +29,55 @@ <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" > - <tqmask name="WDT" value="0x01" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="STVREN" value="0x20" > + </mask> + <mask name="STVREN" value="0x20" > <value value="0x00" name="Off" cname="" /> <value value="0x20" name="On" cname="" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="" /> <value value="0x40" name="On" cname="" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" > - <tqmask name="CP" value="0x04" > + <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" > + <mask name="CP" value="0x04" > <value value="0x00" name="All" cname="" /> <value value="0x04" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="FOSC" value="0x03" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" > + <mask name="FOSC" value="0x03" > <value value="0x00" name="HS" cname="" /> <value value="0x01" name="HSPLL" cname="" /> <value value="0x02" name="EC" cname="" /> <value value="0x03" name="ECPLL_IO" cname="" /> - </tqmask> - <tqmask name="FOSC2" value="0x04" > + </mask> + <mask name="FOSC2" value="0x04" > <value value="0x00" name="FOSC1:FOSC0" cname="" /> <value value="0x04" name="INTRC" cname="" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="On" cname="" /> <value value="0x40" name="Off" cname="" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDTPS" value="0x0F" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDTPS" value="0x0F" > <value value="0x00" name="1:1" cname="" /> <value value="0x01" name="1:2" cname="" /> <value value="0x02" name="1:4" cname="" /> @@ -94,23 +94,23 @@ <value value="0x0D" name="1:8192" cname="" /> <value value="0x0E" name="1:16384" cname="" /> <value value="0x0F" name="1:32768" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="" /> <value value="0x01" name="RC1" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" > </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F66J11.xml b/src/devices/pic/xml_data/18F66J11.xml index 11d7f05..8fd1314 100644 --- a/src/devices/pic/xml_data/18F66J11.xml +++ b/src/devices/pic/xml_data/18F66J11.xml @@ -30,55 +30,55 @@ <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" > - <tqmask name="WDT" value="0x01" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="STVREN" value="0x20" > + </mask> + <mask name="STVREN" value="0x20" > <value value="0x00" name="Off" cname="" /> <value value="0x20" name="On" cname="" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="" /> <value value="0x40" name="On" cname="" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" > - <tqmask name="CP" value="0x04" > + <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" > + <mask name="CP" value="0x04" > <value value="0x00" name="All" cname="" /> <value value="0x04" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="FOSC" value="0x03" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" > + <mask name="FOSC" value="0x03" > <value value="0x00" name="HS" cname="" /> <value value="0x01" name="HSPLL" cname="" /> <value value="0x02" name="EC" cname="" /> <value value="0x03" name="ECPLL_IO" cname="" /> - </tqmask> - <tqmask name="FOSC2" value="0x04" > + </mask> + <mask name="FOSC2" value="0x04" > <value value="0x00" name="FOSC1:FOSC0" cname="" /> <value value="0x04" name="INTRC" cname="" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="On" cname="" /> <value value="0x40" name="Off" cname="" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDTPS" value="0x0F" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDTPS" value="0x0F" > <value value="0x00" name="1:1" cname="" /> <value value="0x01" name="1:2" cname="" /> <value value="0x02" name="1:4" cname="" /> @@ -95,27 +95,27 @@ <value value="0x0D" name="1:8192" cname="" /> <value value="0x0E" name="1:16384" cname="" /> <value value="0x0F" name="1:32768" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x09" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x09" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="" /> <value value="0x01" name="RC1" cname="" /> - </tqmask> - <tqmask name="MSSPSEL" value="0x08" > + </mask> + <mask name="MSSPSEL" value="0x08" > <value value="0x00" name="5BIT" cname="" /> <value value="0x08" name="7BIT" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" > </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F66J15.xml b/src/devices/pic/xml_data/18F66J15.xml index 651b2d4..c1c5c95 100644 --- a/src/devices/pic/xml_data/18F66J15.xml +++ b/src/devices/pic/xml_data/18F66J15.xml @@ -29,55 +29,55 @@ <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" > - <tqmask name="WDT" value="0x01" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="STVREN" value="0x20" > + </mask> + <mask name="STVREN" value="0x20" > <value value="0x00" name="Off" cname="" /> <value value="0x20" name="On" cname="" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="" /> <value value="0x40" name="On" cname="" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" > - <tqmask name="CP" value="0x04" > + <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" > + <mask name="CP" value="0x04" > <value value="0x00" name="All" cname="" /> <value value="0x04" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="FOSC" value="0x03" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" > + <mask name="FOSC" value="0x03" > <value value="0x00" name="HS" cname="" /> <value value="0x01" name="HSPLL" cname="" /> <value value="0x02" name="EC" cname="" /> <value value="0x03" name="ECPLL_IO" cname="" /> - </tqmask> - <tqmask name="FOSC2" value="0x04" > + </mask> + <mask name="FOSC2" value="0x04" > <value value="0x00" name="FOSC1:FOSC0" cname="" /> <value value="0x04" name="INTRC" cname="" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="On" cname="" /> <value value="0x40" name="Off" cname="" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDTPS" value="0x0F" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDTPS" value="0x0F" > <value value="0x00" name="1:1" cname="" /> <value value="0x01" name="1:2" cname="" /> <value value="0x02" name="1:4" cname="" /> @@ -94,23 +94,23 @@ <value value="0x0D" name="1:8192" cname="" /> <value value="0x0E" name="1:16384" cname="" /> <value value="0x0F" name="1:32768" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="" /> <value value="0x01" name="RC1" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" > </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F66J16.xml b/src/devices/pic/xml_data/18F66J16.xml index 8a15ffd..cf84f44 100644 --- a/src/devices/pic/xml_data/18F66J16.xml +++ b/src/devices/pic/xml_data/18F66J16.xml @@ -29,55 +29,55 @@ <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" > - <tqmask name="WDT" value="0x01" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="STVREN" value="0x20" > + </mask> + <mask name="STVREN" value="0x20" > <value value="0x00" name="Off" cname="" /> <value value="0x20" name="On" cname="" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="" /> <value value="0x40" name="On" cname="" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" > - <tqmask name="CP" value="0x04" > + <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" > + <mask name="CP" value="0x04" > <value value="0x00" name="All" cname="" /> <value value="0x04" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="FOSC" value="0x03" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" > + <mask name="FOSC" value="0x03" > <value value="0x00" name="HS" cname="" /> <value value="0x01" name="HSPLL" cname="" /> <value value="0x02" name="EC" cname="" /> <value value="0x03" name="ECPLL_IO" cname="" /> - </tqmask> - <tqmask name="FOSC2" value="0x04" > + </mask> + <mask name="FOSC2" value="0x04" > <value value="0x00" name="FOSC1:FOSC0" cname="" /> <value value="0x04" name="INTRC" cname="" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="On" cname="" /> <value value="0x40" name="Off" cname="" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDTPS" value="0x0F" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDTPS" value="0x0F" > <value value="0x00" name="1:1" cname="" /> <value value="0x01" name="1:2" cname="" /> <value value="0x02" name="1:4" cname="" /> @@ -94,27 +94,27 @@ <value value="0x0D" name="1:8192" cname="" /> <value value="0x0E" name="1:16384" cname="" /> <value value="0x0F" name="1:32768" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x09" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x09" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="" /> <value value="0x01" name="RC1" cname="" /> - </tqmask> - <tqmask name="MSSPSEL" value="0x08" > + </mask> + <mask name="MSSPSEL" value="0x08" > <value value="0x00" name="5BIT" cname="" /> <value value="0x08" name="7BIT" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" > </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F66J50.xml b/src/devices/pic/xml_data/18F66J50.xml index 4d60faa..34dbe21 100644 --- a/src/devices/pic/xml_data/18F66J50.xml +++ b/src/devices/pic/xml_data/18F66J50.xml @@ -29,12 +29,12 @@ <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xEF" > - <tqmask name="WDT" value="0x01" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xEF" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="PLLDIV" value="0x0E" > + </mask> + <mask name="PLLDIV" value="0x0E" > <value value="0x00" name="12" cname="" /> <value value="0x02" name="10" cname="" /> <value value="0x04" name="6" cname="" /> @@ -43,51 +43,51 @@ <value value="0x0A" name="3" cname="" /> <value value="0x0C" name="2" cname="" /> <value value="0x0E" name="1" cname="" /> - </tqmask> - <tqmask name="STVREN" value="0x20" > + </mask> + <mask name="STVREN" value="0x20" > <value value="0x00" name="Off" cname="" /> <value value="0x20" name="On" cname="" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="" /> <value value="0x40" name="On" cname="" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" > - <tqmask name="CP" value="0x04" > + <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" > + <mask name="CP" value="0x04" > <value value="0x00" name="All" cname="" /> <value value="0x04" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="FOSC" value="0x03" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" > + <mask name="FOSC" value="0x03" > <value value="0x00" name="HS" cname="" /> <value value="0x01" name="HSPLL" cname="" /> <value value="0x02" name="EC" cname="" /> <value value="0x03" name="ECPLL_IO" cname="" /> - </tqmask> - <tqmask name="FOSC2" value="0x04" > + </mask> + <mask name="FOSC2" value="0x04" > <value value="0x00" name="FOSC1:FOSC0" cname="" /> <value value="0x04" name="INTRC" cname="" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="On" cname="" /> <value value="0x40" name="Off" cname="" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDTPS" value="0x0F" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDTPS" value="0x0F" > <value value="0x00" name="1:1" cname="" /> <value value="0x01" name="1:2" cname="" /> <value value="0x02" name="1:4" cname="" /> @@ -104,27 +104,27 @@ <value value="0x0D" name="1:8192" cname="" /> <value value="0x0E" name="1:16384" cname="" /> <value value="0x0F" name="1:32768" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x09" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x09" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="" /> <value value="0x01" name="RC1" cname="" /> - </tqmask> - <tqmask name="MSSPSEL" value="0x08" > + </mask> + <mask name="MSSPSEL" value="0x08" > <value value="0x00" name="5BIT" cname="" /> <value value="0x08" name="7BIT" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" > </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F66J55.xml b/src/devices/pic/xml_data/18F66J55.xml index d97b54a..7e95978 100644 --- a/src/devices/pic/xml_data/18F66J55.xml +++ b/src/devices/pic/xml_data/18F66J55.xml @@ -29,12 +29,12 @@ <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xEF" > - <tqmask name="WDT" value="0x01" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xEF" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="PLLDIV" value="0x0E" > + </mask> + <mask name="PLLDIV" value="0x0E" > <value value="0x00" name="12" cname="" /> <value value="0x02" name="10" cname="" /> <value value="0x04" name="6" cname="" /> @@ -43,51 +43,51 @@ <value value="0x0A" name="3" cname="" /> <value value="0x0C" name="2" cname="" /> <value value="0x0E" name="1" cname="" /> - </tqmask> - <tqmask name="STVREN" value="0x20" > + </mask> + <mask name="STVREN" value="0x20" > <value value="0x00" name="Off" cname="" /> <value value="0x20" name="On" cname="" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="" /> <value value="0x40" name="On" cname="" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" > - <tqmask name="CP" value="0x04" > + <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" > + <mask name="CP" value="0x04" > <value value="0x00" name="All" cname="" /> <value value="0x04" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="FOSC" value="0x03" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" > + <mask name="FOSC" value="0x03" > <value value="0x00" name="HS" cname="" /> <value value="0x01" name="HSPLL" cname="" /> <value value="0x02" name="EC" cname="" /> <value value="0x03" name="ECPLL_IO" cname="" /> - </tqmask> - <tqmask name="FOSC2" value="0x04" > + </mask> + <mask name="FOSC2" value="0x04" > <value value="0x00" name="FOSC1:FOSC0" cname="" /> <value value="0x04" name="INTRC" cname="" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="On" cname="" /> <value value="0x40" name="Off" cname="" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDTPS" value="0x0F" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDTPS" value="0x0F" > <value value="0x00" name="1:1" cname="" /> <value value="0x01" name="1:2" cname="" /> <value value="0x02" name="1:4" cname="" /> @@ -104,27 +104,27 @@ <value value="0x0D" name="1:8192" cname="" /> <value value="0x0E" name="1:16384" cname="" /> <value value="0x0F" name="1:32768" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x09" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x09" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="" /> <value value="0x01" name="RC1" cname="" /> - </tqmask> - <tqmask name="MSSPSEL" value="0x08" > + </mask> + <mask name="MSSPSEL" value="0x08" > <value value="0x00" name="5BIT" cname="" /> <value value="0x08" name="7BIT" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" > </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F66J60.xml b/src/devices/pic/xml_data/18F66J60.xml index 430812c..e4ac5ea 100644 --- a/src/devices/pic/xml_data/18F66J60.xml +++ b/src/devices/pic/xml_data/18F66J60.xml @@ -29,55 +29,55 @@ <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" > - <tqmask name="WDT" value="0x01" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="STVREN" value="0x20" > + </mask> + <mask name="STVREN" value="0x20" > <value value="0x00" name="Off" cname="" /> <value value="0x20" name="On" cname="" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="" /> <value value="0x40" name="On" cname="" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" > - <tqmask name="CP" value="0x04" > + <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" > + <mask name="CP" value="0x04" > <value value="0x00" name="All" cname="" /> <value value="0x04" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="FOSC" value="0x03" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" > + <mask name="FOSC" value="0x03" > <value value="0x00" name="HS" cname="" /> <value value="0x01" name="HSPLL" cname="" /> <value value="0x02" name="EC" cname="" /> <value value="0x03" name="ECPLL_IO" cname="" /> - </tqmask> - <tqmask name="FOSC2" value="0x04" > + </mask> + <mask name="FOSC2" value="0x04" > <value value="0x00" name="FOSC1:FOSC0" cname="" /> <value value="0x04" name="INTRC" cname="" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="On" cname="" /> <value value="0x40" name="Off" cname="" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDTPS" value="0x0F" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDTPS" value="0x0F" > <value value="0x00" name="1:1" cname="" /> <value value="0x01" name="1:2" cname="" /> <value value="0x02" name="1:4" cname="" /> @@ -94,23 +94,23 @@ <value value="0x0D" name="1:8192" cname="" /> <value value="0x0E" name="1:16384" cname="" /> <value value="0x0F" name="1:32768" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="ETHLED" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" > + <mask name="ETHLED" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" > </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F66J65.xml b/src/devices/pic/xml_data/18F66J65.xml index 3a54046..8431ec8 100644 --- a/src/devices/pic/xml_data/18F66J65.xml +++ b/src/devices/pic/xml_data/18F66J65.xml @@ -29,55 +29,55 @@ <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" > - <tqmask name="WDT" value="0x01" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="STVREN" value="0x20" > + </mask> + <mask name="STVREN" value="0x20" > <value value="0x00" name="Off" cname="" /> <value value="0x20" name="On" cname="" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="" /> <value value="0x40" name="On" cname="" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" > - <tqmask name="CP" value="0x04" > + <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" > + <mask name="CP" value="0x04" > <value value="0x00" name="All" cname="" /> <value value="0x04" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="FOSC" value="0x03" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" > + <mask name="FOSC" value="0x03" > <value value="0x00" name="HS" cname="" /> <value value="0x01" name="HSPLL" cname="" /> <value value="0x02" name="EC" cname="" /> <value value="0x03" name="ECPLL_IO" cname="" /> - </tqmask> - <tqmask name="FOSC2" value="0x04" > + </mask> + <mask name="FOSC2" value="0x04" > <value value="0x00" name="FOSC1:FOSC0" cname="" /> <value value="0x04" name="INTRC" cname="" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="On" cname="" /> <value value="0x40" name="Off" cname="" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDTPS" value="0x0F" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDTPS" value="0x0F" > <value value="0x00" name="1:1" cname="" /> <value value="0x01" name="1:2" cname="" /> <value value="0x02" name="1:4" cname="" /> @@ -94,23 +94,23 @@ <value value="0x0D" name="1:8192" cname="" /> <value value="0x0E" name="1:16384" cname="" /> <value value="0x0F" name="1:32768" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="ETHLED" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" > + <mask name="ETHLED" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" > </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F6720.xml b/src/devices/pic/xml_data/18F6720.xml index a609ee9..c023b5e 100644 --- a/src/devices/pic/xml_data/18F6720.xml +++ b/src/devices/pic/xml_data/18F6720.xml @@ -35,17 +35,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x01FFFF" word_write_align="4" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" > - <tqmask name="FOSC" value="0x07" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" > + <mask name="FOSC" value="0x07" > <value value="0x00" name="LP" cname="_LP_OSC" /> <value value="0x01" name="XT" cname="_XT_OSC" /> <value value="0x02" name="HS" cname="_HS_OSC" /> @@ -54,36 +54,36 @@ <value value="0x05" name="EC_IO" cname="_ECIO_OSC" /> <value value="0x06" name="H4" cname="_HSPLL_OSC" /> <value value="0x07" name="EXTRC_IO" cname="_RCIO_OSC" /> - </tqmask> - <tqmask name="OSCSEN" value="0x20" > + </mask> + <mask name="OSCSEN" value="0x20" > <value value="0x00" name="On" cname="_OSCS_ON" /> <value value="0x20" name="Off" cname="_OSCS_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x02" > + </mask> + <mask name="BODEN" value="0x02" > <value value="0x00" name="Off" cname="_BOR_OFF" /> <value value="0x02" name="On" cname="_BOR_ON" /> - </tqmask> - <tqmask name="BORV" value="0x0C" > + </mask> + <mask name="BORV" value="0x0C" > <value value="0x00" name="4.5" cname="_BORV_45" /> <value value="0x04" name="4.2" cname="_BORV_42" /> <value value="0x08" name="2.7" cname="_BORV_27" /> <value value="0x0C" name="2.0" cname="_BORV_20" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x0E" > + </mask> + <mask name="WDTPS" value="0x0E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -92,171 +92,171 @@ <value value="0x0A" name="1:32" cname="_WDTPS_32" /> <value value="0x0C" name="1:64" cname="_WDTPS_64" /> <value value="0x0E" name="1:128" cname="_WDTPS_128" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RE7" cname="_CCP2MX_OFF" /> <value value="0x01" name="RC1" cname="_CCP2MX_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVR_OFF" /> <value value="0x01" name="On" cname="_STVR_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0xFF" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0xFF" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0200:3FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_CP2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" /> - </tqmask> - <tqmask name="CP_3" value="0x08" > + </mask> + <mask name="CP_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_CP3_ON" /> <value value="0x08" name="Off" cname="_CP3_OFF" /> - </tqmask> - <tqmask name="CP_4" value="0x10" > + </mask> + <mask name="CP_4" value="0x10" > <value value="0x00" name="10000:13FFF" cname="_CP4_ON" /> <value value="0x10" name="Off" cname="_CP4_OFF" /> - </tqmask> - <tqmask name="CP_5" value="0x20" > + </mask> + <mask name="CP_5" value="0x20" > <value value="0x00" name="14000:17FFF" cname="_CP5_ON" /> <value value="0x20" name="Off" cname="_CP5_OFF" /> - </tqmask> - <tqmask name="CP_6" value="0x40" > + </mask> + <mask name="CP_6" value="0x40" > <value value="0x00" name="18000:1BFFF" cname="_CP6_ON" /> <value value="0x40" name="Off" cname="_CP6_OFF" /> - </tqmask> - <tqmask name="CP_7" value="0x80" > + </mask> + <mask name="CP_7" value="0x80" > <value value="0x00" name="1C000:1FFFF" cname="_CP7_ON" /> <value value="0x80" name="Off" cname="_CP7_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0xFF" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0xFF" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0200:3FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" /> - </tqmask> - <tqmask name="WRT_3" value="0x08" > + </mask> + <mask name="WRT_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_WRT3_ON" /> <value value="0x08" name="Off" cname="_WRT3_OFF" /> - </tqmask> - <tqmask name="WRT_4" value="0x10" > + </mask> + <mask name="WRT_4" value="0x10" > <value value="0x00" name="10000:13FFF" cname="_WRT4_ON" /> <value value="0x10" name="Off" cname="_WRT4_OFF" /> - </tqmask> - <tqmask name="WRT_5" value="0x20" > + </mask> + <mask name="WRT_5" value="0x20" > <value value="0x00" name="14000:17FFF" cname="_WRT5_ON" /> <value value="0x20" name="Off" cname="_WRT5_OFF" /> - </tqmask> - <tqmask name="WRT_6" value="0x40" > + </mask> + <mask name="WRT_6" value="0x40" > <value value="0x00" name="18000:1BFFF" cname="_WRT6_ON" /> <value value="0x40" name="Off" cname="_WRT6_OFF" /> - </tqmask> - <tqmask name="WRT_7" value="0x80" > + </mask> + <mask name="WRT_7" value="0x80" > <value value="0x00" name="1C000:1FFFF" cname="_WRT7_ON" /> <value value="0x80" name="Off" cname="_WRT7_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0xFF" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0xFF" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0200:3FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" /> - </tqmask> - <tqmask name="EBTR_3" value="0x08" > + </mask> + <mask name="EBTR_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" /> <value value="0x08" name="Off" cname="_EBTR3_OFF" /> - </tqmask> - <tqmask name="EBTR_4" value="0x10" > + </mask> + <mask name="EBTR_4" value="0x10" > <value value="0x00" name="10000:13FFF" cname="_EBTR4_ON" /> <value value="0x10" name="Off" cname="_EBTR4_OFF" /> - </tqmask> - <tqmask name="EBTR_5" value="0x20" > + </mask> + <mask name="EBTR_5" value="0x20" > <value value="0x00" name="14000:17FFF" cname="_EBTR5_ON" /> <value value="0x20" name="Off" cname="_EBTR5_OFF" /> - </tqmask> - <tqmask name="EBTR_6" value="0x40" > + </mask> + <mask name="EBTR_6" value="0x40" > <value value="0x00" name="18000:1BFFF" cname="_EBTR6_ON" /> <value value="0x40" name="Off" cname="_EBTR6_OFF" /> - </tqmask> - <tqmask name="EBTR_7" value="0x80" > + </mask> + <mask name="EBTR_7" value="0x80" > <value value="0x00" name="1C000:1FFFF" cname="_EBTR7_ON" /> <value value="0x80" name="Off" cname="_EBTR7_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F6722.xml b/src/devices/pic/xml_data/18F6722.xml index 6a3c8ad..fb30985 100644 --- a/src/devices/pic/xml_data/18F6722.xml +++ b/src/devices/pic/xml_data/18F6722.xml @@ -27,17 +27,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x01FFFF" word_write_align="32" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -48,42 +48,42 @@ <value value="0x08" name="INTRC_IO" cname="_OSC_INTIO67" /> <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" /> <value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="Software" cname="_BOREN_ON" /> <value value="0x04" name="On_run" cname="_BOREN_NOSLP" /> <value value="0x06" name="On" cname="_BOREN_SBORDIS" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -100,189 +100,189 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x85" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RE7" cname="_CCP2MX_PORTE" /> <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="BBSIZ" value="0x30" > + </mask> + <mask name="BBSIZ" value="0x30" > <value value="0x00" name="1024" cname="_BBSIZ_BB2K" /> <value value="0x10" name="2048" cname="_BBSIZ_BB4K" /> <value value="0x20" name="4096" cname="_BBSIZ_BB8K" /> <value value="0x30" name="4096" cname="_BBSIZ_BB8K" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0xFF" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0xFF" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800/1000/2000:3FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_CP2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" /> - </tqmask> - <tqmask name="CP_3" value="0x08" > + </mask> + <mask name="CP_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_CP3_ON" /> <value value="0x08" name="Off" cname="_CP3_OFF" /> - </tqmask> - <tqmask name="CP_4" value="0x10" > + </mask> + <mask name="CP_4" value="0x10" > <value value="0x00" name="10000:13FFF" cname="_CP4_ON" /> <value value="0x10" name="Off" cname="_CP4_OFF" /> - </tqmask> - <tqmask name="CP_5" value="0x20" > + </mask> + <mask name="CP_5" value="0x20" > <value value="0x00" name="14000:17FFF" cname="_CP5_ON" /> <value value="0x20" name="Off" cname="_CP5_OFF" /> - </tqmask> - <tqmask name="CP_6" value="0x40" > + </mask> + <mask name="CP_6" value="0x40" > <value value="0x00" name="18000:1BFFF" cname="_CP6_ON" /> <value value="0x40" name="Off" cname="_CP6_OFF" /> - </tqmask> - <tqmask name="CP_7" value="0x80" > + </mask> + <mask name="CP_7" value="0x80" > <value value="0x00" name="1C000:1FFFF" cname="_CP7_ON" /> <value value="0x80" name="Off" cname="_CP7_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="All" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0xFF" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0xFF" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800/1000/2000:3FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" /> - </tqmask> - <tqmask name="WRT_3" value="0x08" > + </mask> + <mask name="WRT_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_WRT3_ON" /> <value value="0x08" name="Off" cname="_WRT3_OFF" /> - </tqmask> - <tqmask name="WRT_4" value="0x10" > + </mask> + <mask name="WRT_4" value="0x10" > <value value="0x00" name="10000:13FFF" cname="_WRT4_ON" /> <value value="0x10" name="Off" cname="_WRT4_OFF" /> - </tqmask> - <tqmask name="WRT_5" value="0x20" > + </mask> + <mask name="WRT_5" value="0x20" > <value value="0x00" name="14000:17FFF" cname="_WRT5_ON" /> <value value="0x20" name="Off" cname="_WRT5_OFF" /> - </tqmask> - <tqmask name="WRT_6" value="0x40" > + </mask> + <mask name="WRT_6" value="0x40" > <value value="0x00" name="18000:1BFFF" cname="_WRT6_ON" /> <value value="0x40" name="Off" cname="_WRT6_OFF" /> - </tqmask> - <tqmask name="WRT_7" value="0x80" > + </mask> + <mask name="WRT_7" value="0x80" > <value value="0x00" name="1C000:1FFFF" cname="_WRT7_ON" /> <value value="0x80" name="Off" cname="_WRT7_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="All" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0xFF" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0xFF" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800/1000/2000:3FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" /> - </tqmask> - <tqmask name="EBTR_3" value="0x08" > + </mask> + <mask name="EBTR_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" /> <value value="0x08" name="Off" cname="_EBTR3_OFF" /> - </tqmask> - <tqmask name="EBTR_4" value="0x10" > + </mask> + <mask name="EBTR_4" value="0x10" > <value value="0x00" name="10000:13FFF" cname="_EBTR4_ON" /> <value value="0x10" name="Off" cname="_EBTR4_OFF" /> - </tqmask> - <tqmask name="EBTR_5" value="0x20" > + </mask> + <mask name="EBTR_5" value="0x20" > <value value="0x00" name="14000:17FFF" cname="_EBTR5_ON" /> <value value="0x20" name="Off" cname="_EBTR5_OFF" /> - </tqmask> - <tqmask name="EBTR_6" value="0x40" > + </mask> + <mask name="EBTR_6" value="0x40" > <value value="0x00" name="18000:1BFFF" cname="_EBTR6_ON" /> <value value="0x40" name="Off" cname="_EBTR6_OFF" /> - </tqmask> - <tqmask name="EBTR_7" value="0x80" > + </mask> + <mask name="EBTR_7" value="0x80" > <value value="0x00" name="1C000:1FFFF" cname="_EBTR7_ON" /> <value value="0x80" name="Off" cname="_EBTR7_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="All" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F67J10.xml b/src/devices/pic/xml_data/18F67J10.xml index 4c6f875..78223c3 100644 --- a/src/devices/pic/xml_data/18F67J10.xml +++ b/src/devices/pic/xml_data/18F67J10.xml @@ -29,55 +29,55 @@ <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" > - <tqmask name="WDT" value="0x01" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="STVREN" value="0x20" > + </mask> + <mask name="STVREN" value="0x20" > <value value="0x00" name="Off" cname="" /> <value value="0x20" name="On" cname="" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="" /> <value value="0x40" name="On" cname="" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" > - <tqmask name="CP" value="0x04" > + <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" > + <mask name="CP" value="0x04" > <value value="0x00" name="All" cname="" /> <value value="0x04" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="FOSC" value="0x03" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" > + <mask name="FOSC" value="0x03" > <value value="0x00" name="HS" cname="" /> <value value="0x01" name="HSPLL" cname="" /> <value value="0x02" name="EC" cname="" /> <value value="0x03" name="ECPLL_IO" cname="" /> - </tqmask> - <tqmask name="FOSC2" value="0x04" > + </mask> + <mask name="FOSC2" value="0x04" > <value value="0x00" name="FOSC1:FOSC0" cname="" /> <value value="0x04" name="INTRC" cname="" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="On" cname="" /> <value value="0x40" name="Off" cname="" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDTPS" value="0x0F" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDTPS" value="0x0F" > <value value="0x00" name="1:1" cname="" /> <value value="0x01" name="1:2" cname="" /> <value value="0x02" name="1:4" cname="" /> @@ -94,23 +94,23 @@ <value value="0x0D" name="1:8192" cname="" /> <value value="0x0E" name="1:16384" cname="" /> <value value="0x0F" name="1:32768" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="" /> <value value="0x01" name="RC1" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" > </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F67J11.xml b/src/devices/pic/xml_data/18F67J11.xml index 3f12d71..d13e7dc 100644 --- a/src/devices/pic/xml_data/18F67J11.xml +++ b/src/devices/pic/xml_data/18F67J11.xml @@ -30,55 +30,55 @@ <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" > - <tqmask name="WDT" value="0x01" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="STVREN" value="0x20" > + </mask> + <mask name="STVREN" value="0x20" > <value value="0x00" name="Off" cname="" /> <value value="0x20" name="On" cname="" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="" /> <value value="0x40" name="On" cname="" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" > - <tqmask name="CP" value="0x04" > + <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" > + <mask name="CP" value="0x04" > <value value="0x00" name="All" cname="" /> <value value="0x04" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="FOSC" value="0x03" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" > + <mask name="FOSC" value="0x03" > <value value="0x00" name="HS" cname="" /> <value value="0x01" name="HSPLL" cname="" /> <value value="0x02" name="EC" cname="" /> <value value="0x03" name="ECPLL_IO" cname="" /> - </tqmask> - <tqmask name="FOSC2" value="0x04" > + </mask> + <mask name="FOSC2" value="0x04" > <value value="0x00" name="FOSC1:FOSC0" cname="" /> <value value="0x04" name="INTRC" cname="" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="On" cname="" /> <value value="0x40" name="Off" cname="" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDTPS" value="0x0F" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDTPS" value="0x0F" > <value value="0x00" name="1:1" cname="" /> <value value="0x01" name="1:2" cname="" /> <value value="0x02" name="1:4" cname="" /> @@ -95,27 +95,27 @@ <value value="0x0D" name="1:8192" cname="" /> <value value="0x0E" name="1:16384" cname="" /> <value value="0x0F" name="1:32768" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x09" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x09" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="" /> <value value="0x01" name="RC1" cname="" /> - </tqmask> - <tqmask name="MSSPSEL" value="0x08" > + </mask> + <mask name="MSSPSEL" value="0x08" > <value value="0x00" name="5BIT" cname="" /> <value value="0x08" name="7BIT" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" > </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F67J50.xml b/src/devices/pic/xml_data/18F67J50.xml index d704f33..91eade3 100644 --- a/src/devices/pic/xml_data/18F67J50.xml +++ b/src/devices/pic/xml_data/18F67J50.xml @@ -29,12 +29,12 @@ <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xEF" > - <tqmask name="WDT" value="0x01" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xEF" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="PLLDIV" value="0x0E" > + </mask> + <mask name="PLLDIV" value="0x0E" > <value value="0x00" name="12" cname="" /> <value value="0x02" name="10" cname="" /> <value value="0x04" name="6" cname="" /> @@ -43,51 +43,51 @@ <value value="0x0A" name="3" cname="" /> <value value="0x0C" name="2" cname="" /> <value value="0x0E" name="1" cname="" /> - </tqmask> - <tqmask name="STVREN" value="0x20" > + </mask> + <mask name="STVREN" value="0x20" > <value value="0x00" name="Off" cname="" /> <value value="0x20" name="On" cname="" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="" /> <value value="0x40" name="On" cname="" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" > - <tqmask name="CP" value="0x04" > + <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" > + <mask name="CP" value="0x04" > <value value="0x00" name="All" cname="" /> <value value="0x04" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="FOSC" value="0x03" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" > + <mask name="FOSC" value="0x03" > <value value="0x00" name="HS" cname="" /> <value value="0x01" name="HSPLL" cname="" /> <value value="0x02" name="EC" cname="" /> <value value="0x03" name="ECPLL_IO" cname="" /> - </tqmask> - <tqmask name="FOSC2" value="0x04" > + </mask> + <mask name="FOSC2" value="0x04" > <value value="0x00" name="FOSC1:FOSC0" cname="" /> <value value="0x04" name="INTRC" cname="" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="On" cname="" /> <value value="0x40" name="Off" cname="" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDTPS" value="0x0F" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDTPS" value="0x0F" > <value value="0x00" name="1:1" cname="" /> <value value="0x01" name="1:2" cname="" /> <value value="0x02" name="1:4" cname="" /> @@ -104,27 +104,27 @@ <value value="0x0D" name="1:8192" cname="" /> <value value="0x0E" name="1:16384" cname="" /> <value value="0x0F" name="1:32768" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x09" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x09" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="" /> <value value="0x01" name="RC1" cname="" /> - </tqmask> - <tqmask name="MSSPSEL" value="0x08" > + </mask> + <mask name="MSSPSEL" value="0x08" > <value value="0x00" name="5BIT" cname="" /> <value value="0x08" name="7BIT" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" > </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F67J60.xml b/src/devices/pic/xml_data/18F67J60.xml index a5bfdcf..29922db 100644 --- a/src/devices/pic/xml_data/18F67J60.xml +++ b/src/devices/pic/xml_data/18F67J60.xml @@ -29,55 +29,55 @@ <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" > - <tqmask name="WDT" value="0x01" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="STVREN" value="0x20" > + </mask> + <mask name="STVREN" value="0x20" > <value value="0x00" name="Off" cname="" /> <value value="0x20" name="On" cname="" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="" /> <value value="0x40" name="On" cname="" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" > - <tqmask name="CP" value="0x04" > + <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" > + <mask name="CP" value="0x04" > <value value="0x00" name="All" cname="" /> <value value="0x04" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="FOSC" value="0x03" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" > + <mask name="FOSC" value="0x03" > <value value="0x00" name="HS" cname="" /> <value value="0x01" name="HSPLL" cname="" /> <value value="0x02" name="EC" cname="" /> <value value="0x03" name="ECPLL_IO" cname="" /> - </tqmask> - <tqmask name="FOSC2" value="0x04" > + </mask> + <mask name="FOSC2" value="0x04" > <value value="0x00" name="FOSC1:FOSC0" cname="" /> <value value="0x04" name="INTRC" cname="" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="On" cname="" /> <value value="0x40" name="Off" cname="" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDTPS" value="0x0F" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDTPS" value="0x0F" > <value value="0x00" name="1:1" cname="" /> <value value="0x01" name="1:2" cname="" /> <value value="0x02" name="1:4" cname="" /> @@ -94,23 +94,23 @@ <value value="0x0D" name="1:8192" cname="" /> <value value="0x0E" name="1:16384" cname="" /> <value value="0x0F" name="1:32768" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="ETHLED" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" > + <mask name="ETHLED" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" > </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F8310.xml b/src/devices/pic/xml_data/18F8310.xml index 5a16736..1fe084d 100644 --- a/src/devices/pic/xml_data/18F8310.xml +++ b/src/devices/pic/xml_data/18F8310.xml @@ -33,16 +33,16 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x001FFF" word_write_align="8" word_erase_align="0" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -53,42 +53,42 @@ <value value="0x08" name="INTRC_IO" cname="_OSC_INTIO67" /> <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" /> <value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="Software" cname="_BOREN_ON" /> <value value="0x04" name="On_run" cname="_BOREN_NOSLP" /> <value value="0x06" name="On" cname="_BOREN_SBORDIS" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -105,79 +105,79 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xC3" > - <tqmask name="PM" value="0x03" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xC3" > + <mask name="PM" value="0x03" > <value value="0x00" name="Extended microcontroller" cname="_PM_EM" /> <value value="0x01" name="Microprocessor with boot" cname="_PM_MPB" /> <value value="0x02" name="Microprocessor" cname="_PM_MP" /> <value value="0x03" name="Microcontroller" cname="_PM_MC" /> - </tqmask> - <tqmask name="BW" value="0x40" > + </mask> + <mask name="BW" value="0x40" > <value value="0x00" name="8" cname="_BW_8" /> <value value="0x40" name="16" cname="_BW_16" /> - </tqmask> - <tqmask name="WAIT" value="0x80" > + </mask> + <mask name="WAIT" value="0x80" > <value value="0x00" name="On" cname="_WAIT_ON" /> <value value="0x80" name="Off" cname="_WAIT_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x81" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x81" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RE7/RB3" cname="_CCP2MX_PORTBE" /> <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x81" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x81" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="CP" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x01" > + <mask name="CP" value="0x01" > <value value="0x00" name="All" cname="_CP_ON" /> <value value="0x01" name="Off" cname="_CP_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x00" /> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x00" /> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x00" /> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="EBTR" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x01" > + <mask name="EBTR" value="0x01" > <value value="0x00" name="All" cname="_EBTR_ON" /> <value value="0x01" name="Off" cname="_EBTR_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x00" /> <!--* Packages *************************************************************--> <package types="tqfp" nb_pins="80" > diff --git a/src/devices/pic/xml_data/18F8390.xml b/src/devices/pic/xml_data/18F8390.xml index 182acf1..4dbff0c 100644 --- a/src/devices/pic/xml_data/18F8390.xml +++ b/src/devices/pic/xml_data/18F8390.xml @@ -33,16 +33,16 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x001FFF" word_write_align="8" word_erase_align="0" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -53,42 +53,42 @@ <value value="0x08" name="INTRC_IO" cname="_OSC_INTIO67" /> <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" /> <value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="Software" cname="_BOREN_ON" /> <value value="0x04" name="On_run" cname="_BOREN_NOSLP" /> <value value="0x06" name="On" cname="_BOREN_SBORDIS" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -105,79 +105,79 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xC3" > - <tqmask name="PM" value="0x03" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xC3" > + <mask name="PM" value="0x03" > <value value="0x00" name="Extended microcontroller" cname="_PM_EM" /> <value value="0x01" name="Microprocessor with boot" cname="_PM_MPB" /> <value value="0x02" name="Microprocessor" cname="_PM_MP" /> <value value="0x03" name="Microcontroller" cname="_PM_MC" /> - </tqmask> - <tqmask name="BW" value="0x40" > + </mask> + <mask name="BW" value="0x40" > <value value="0x00" name="8" cname="_BW_8" /> <value value="0x40" name="16" cname="_BW_16" /> - </tqmask> - <tqmask name="WAIT" value="0x80" > + </mask> + <mask name="WAIT" value="0x80" > <value value="0x00" name="On" cname="_WAIT_ON" /> <value value="0x80" name="Off" cname="_WAIT_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x81" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x81" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RE7/RB3" cname="_CCP2MX_PORTBE" /> <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x81" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x81" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="CP" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x01" > + <mask name="CP" value="0x01" > <value value="0x00" name="All" cname="_CP_ON" /> <value value="0x01" name="Off" cname="_CP_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x00" /> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x00" /> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x00" /> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="EBTR" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x01" > + <mask name="EBTR" value="0x01" > <value value="0x00" name="All" cname="_EBTR_ON" /> <value value="0x01" name="Off" cname="_EBTR_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x00" /> <!--* Packages *************************************************************--> <package types="tqfp" nb_pins="80" > diff --git a/src/devices/pic/xml_data/18F8393.xml b/src/devices/pic/xml_data/18F8393.xml index bd27973..ce846db 100644 --- a/src/devices/pic/xml_data/18F8393.xml +++ b/src/devices/pic/xml_data/18F8393.xml @@ -36,16 +36,16 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x001FFF" word_write_align="8" word_erase_align="0" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -56,42 +56,42 @@ <value value="0x08" name="INTRC_IO" cname="_OSC_INTIO67" /> <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" /> <value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="Software" cname="_BOREN_ON" /> <value value="0x04" name="On_run" cname="_BOREN_NOSLP" /> <value value="0x06" name="On" cname="_BOREN_SBORDIS" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -108,64 +108,64 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xC3" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xC3" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x81" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x81" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RE7/RB3" cname="_CCP2MX_PORTBE" /> <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x81" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x81" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="CP" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x01" > + <mask name="CP" value="0x01" > <value value="0x00" name="All" cname="_CP_ON" /> <value value="0x01" name="Off" cname="_CP_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x00" /> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x00" /> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x00" /> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="EBTR" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x01" > + <mask name="EBTR" value="0x01" > <value value="0x00" name="All" cname="_EBTR_ON" /> <value value="0x01" name="Off" cname="_EBTR_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x00" /> <!--* Packages *************************************************************--> <package types="tqfp" nb_pins="80" > diff --git a/src/devices/pic/xml_data/18F83J11.xml b/src/devices/pic/xml_data/18F83J11.xml index 6fbfbc0..4a9d249 100644 --- a/src/devices/pic/xml_data/18F83J11.xml +++ b/src/devices/pic/xml_data/18F83J11.xml @@ -29,55 +29,55 @@ <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" > - <tqmask name="WDT" value="0x01" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="STVREN" value="0x20" > + </mask> + <mask name="STVREN" value="0x20" > <value value="0x00" name="Off" cname="" /> <value value="0x20" name="On" cname="" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="" /> <value value="0x40" name="On" cname="" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" > - <tqmask name="CP" value="0x04" > + <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" > + <mask name="CP" value="0x04" > <value value="0x00" name="All" cname="" /> <value value="0x04" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="FOSC" value="0x03" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" > + <mask name="FOSC" value="0x03" > <value value="0x00" name="HS" cname="" /> <value value="0x01" name="HSPLL" cname="" /> <value value="0x02" name="EC" cname="" /> <value value="0x03" name="ECPLL_IO" cname="" /> - </tqmask> - <tqmask name="FOSC2" value="0x04" > + </mask> + <mask name="FOSC2" value="0x04" > <value value="0x00" name="FOSC1:FOSC0" cname="" /> <value value="0x04" name="INTRC" cname="" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="On" cname="" /> <value value="0x40" name="Off" cname="" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDTPS" value="0x0F" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDTPS" value="0x0F" > <value value="0x00" name="1:1" cname="" /> <value value="0x01" name="1:2" cname="" /> <value value="0x02" name="1:4" cname="" /> @@ -94,45 +94,45 @@ <value value="0x0D" name="1:8192" cname="" /> <value value="0x0E" name="1:16384" cname="" /> <value value="0x0F" name="1:32768" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" > - <tqmask name="EASHFT" value="0x08" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" > + <mask name="EASHFT" value="0x08" > <value value="0x00" name="Off" cname="" /> <value value="0x08" name="On" cname="" /> - </tqmask> - <tqmask name="EMB" value="0x30" > + </mask> + <mask name="EMB" value="0x30" > <value value="0x00" name="20BIT" cname="" /> <value value="0x10" name="16BIT" cname="" /> <value value="0x20" name="12BIT" cname="" /> <value value="0x30" name="Disabled" cname="" /> - </tqmask> - <tqmask name="BW" value="0x40" > + </mask> + <mask name="BW" value="0x40" > <value value="0x00" name="8" cname="" /> <value value="0x40" name="16" cname="" /> - </tqmask> - <tqmask name="WAIT" value="0x80" > + </mask> + <mask name="WAIT" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x03" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="" /> <value value="0x01" name="RC1" cname="" /> - </tqmask> - <tqmask name="ECCPMX" value="0x02" > + </mask> + <mask name="ECCPMX" value="0x02" > <value value="0x00" name="RH7-RH4" cname="" /> <value value="0x02" name="RE6-RE3" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" > </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F83J90.xml b/src/devices/pic/xml_data/18F83J90.xml index c8fc70e..8e10c27 100644 --- a/src/devices/pic/xml_data/18F83J90.xml +++ b/src/devices/pic/xml_data/18F83J90.xml @@ -29,55 +29,55 @@ <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" > - <tqmask name="WDT" value="0x01" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="STVREN" value="0x20" > + </mask> + <mask name="STVREN" value="0x20" > <value value="0x00" name="Off" cname="" /> <value value="0x20" name="On" cname="" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="" /> <value value="0x40" name="On" cname="" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" > - <tqmask name="CP" value="0x04" > + <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" > + <mask name="CP" value="0x04" > <value value="0x00" name="All" cname="" /> <value value="0x04" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="FOSC" value="0x03" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" > + <mask name="FOSC" value="0x03" > <value value="0x00" name="HS" cname="" /> <value value="0x01" name="HSPLL" cname="" /> <value value="0x02" name="EC" cname="" /> <value value="0x03" name="ECPLL_IO" cname="" /> - </tqmask> - <tqmask name="FOSC2" value="0x04" > + </mask> + <mask name="FOSC2" value="0x04" > <value value="0x00" name="FOSC1:FOSC0" cname="" /> <value value="0x04" name="INTRC" cname="" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="On" cname="" /> <value value="0x40" name="Off" cname="" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDTPS" value="0x0F" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDTPS" value="0x0F" > <value value="0x00" name="1:1" cname="" /> <value value="0x01" name="1:2" cname="" /> <value value="0x02" name="1:4" cname="" /> @@ -94,45 +94,45 @@ <value value="0x0D" name="1:8192" cname="" /> <value value="0x0E" name="1:16384" cname="" /> <value value="0x0F" name="1:32768" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" > - <tqmask name="EASHFT" value="0x08" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" > + <mask name="EASHFT" value="0x08" > <value value="0x00" name="Off" cname="" /> <value value="0x08" name="On" cname="" /> - </tqmask> - <tqmask name="EMB" value="0x30" > + </mask> + <mask name="EMB" value="0x30" > <value value="0x00" name="20BIT" cname="" /> <value value="0x10" name="16BIT" cname="" /> <value value="0x20" name="12BIT" cname="" /> <value value="0x30" name="Disabled" cname="" /> - </tqmask> - <tqmask name="BW" value="0x40" > + </mask> + <mask name="BW" value="0x40" > <value value="0x00" name="8" cname="" /> <value value="0x40" name="16" cname="" /> - </tqmask> - <tqmask name="WAIT" value="0x80" > + </mask> + <mask name="WAIT" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x03" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="" /> <value value="0x01" name="RC1" cname="" /> - </tqmask> - <tqmask name="ECCPMX" value="0x02" > + </mask> + <mask name="ECCPMX" value="0x02" > <value value="0x00" name="RH7-RH4" cname="" /> <value value="0x02" name="RE6-RE3" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" > </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F8410.xml b/src/devices/pic/xml_data/18F8410.xml index 46d46a3..b5c49cd 100644 --- a/src/devices/pic/xml_data/18F8410.xml +++ b/src/devices/pic/xml_data/18F8410.xml @@ -33,16 +33,16 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x003FFF" word_write_align="8" word_erase_align="0" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -53,42 +53,42 @@ <value value="0x08" name="INTRC_IO" cname="_OSC_INTIO67" /> <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" /> <value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="Software" cname="_BOREN_ON" /> <value value="0x04" name="On_run" cname="_BOREN_NOSLP" /> <value value="0x06" name="On" cname="_BOREN_SBORDIS" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -105,64 +105,64 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xC3" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xC3" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x81" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x81" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RE7/RB3" cname="_CCP2MX_PORTBE" /> <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x81" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x81" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="CP" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x01" > + <mask name="CP" value="0x01" > <value value="0x00" name="All" cname="_CP_ON" /> <value value="0x01" name="Off" cname="_CP_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x00" /> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x00" /> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x00" /> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="EBTR" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x01" > + <mask name="EBTR" value="0x01" > <value value="0x00" name="All" cname="_EBTR_ON" /> <value value="0x01" name="Off" cname="_EBTR_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x00" /> <!--* Packages *************************************************************--> <package types="tqfp" nb_pins="80" > diff --git a/src/devices/pic/xml_data/18F8490.xml b/src/devices/pic/xml_data/18F8490.xml index 0f2e987..3871a60 100644 --- a/src/devices/pic/xml_data/18F8490.xml +++ b/src/devices/pic/xml_data/18F8490.xml @@ -33,16 +33,16 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x003FFF" word_write_align="8" word_erase_align="0" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -53,42 +53,42 @@ <value value="0x08" name="INTRC_IO" cname="_OSC_INTIO67" /> <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" /> <value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="Software" cname="_BOREN_ON" /> <value value="0x04" name="On_run" cname="_BOREN_NOSLP" /> <value value="0x06" name="On" cname="_BOREN_SBORDIS" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -105,64 +105,64 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xC3" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xC3" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x81" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x81" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RE7/RB3" cname="_CCP2MX_PORTBE" /> <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x81" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x81" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="CP" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x01" > + <mask name="CP" value="0x01" > <value value="0x00" name="All" cname="_CP_ON" /> <value value="0x01" name="Off" cname="_CP_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x00" /> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x00" /> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x00" /> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="EBTR" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x01" > + <mask name="EBTR" value="0x01" > <value value="0x00" name="All" cname="_EBTR_ON" /> <value value="0x01" name="Off" cname="_EBTR_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x00" /> <!--* Packages *************************************************************--> <package types="tqfp" nb_pins="80" > diff --git a/src/devices/pic/xml_data/18F8493.xml b/src/devices/pic/xml_data/18F8493.xml index 4d61277..4e8bc52 100644 --- a/src/devices/pic/xml_data/18F8493.xml +++ b/src/devices/pic/xml_data/18F8493.xml @@ -36,16 +36,16 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x003FFF" word_write_align="8" word_erase_align="0" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -56,42 +56,42 @@ <value value="0x08" name="INTRC_IO" cname="_OSC_INTIO67" /> <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" /> <value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="Software" cname="_BOREN_ON" /> <value value="0x04" name="On_run" cname="_BOREN_NOSLP" /> <value value="0x06" name="On" cname="_BOREN_SBORDIS" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -108,64 +108,64 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xC3" /> + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xC3" /> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x81" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x81" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RE7/RB3" cname="_CCP2MX_PORTBE" /> <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x81" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x81" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="CP" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x01" > + <mask name="CP" value="0x01" > <value value="0x00" name="All" cname="_CP_ON" /> <value value="0x01" name="Off" cname="_CP_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x00" /> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x00" /> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x00" /> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="EBTR" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x01" > + <mask name="EBTR" value="0x01" > <value value="0x00" name="All" cname="_EBTR_ON" /> <value value="0x01" name="Off" cname="_EBTR_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x00" /> <!--* Packages *************************************************************--> <package types="tqfp" nb_pins="80" > diff --git a/src/devices/pic/xml_data/18F84J11.xml b/src/devices/pic/xml_data/18F84J11.xml index efdf05a..9c69d2b 100644 --- a/src/devices/pic/xml_data/18F84J11.xml +++ b/src/devices/pic/xml_data/18F84J11.xml @@ -29,55 +29,55 @@ <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" > - <tqmask name="WDT" value="0x01" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="STVREN" value="0x20" > + </mask> + <mask name="STVREN" value="0x20" > <value value="0x00" name="Off" cname="" /> <value value="0x20" name="On" cname="" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="" /> <value value="0x40" name="On" cname="" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" > - <tqmask name="CP" value="0x04" > + <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" > + <mask name="CP" value="0x04" > <value value="0x00" name="All" cname="" /> <value value="0x04" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="FOSC" value="0x03" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" > + <mask name="FOSC" value="0x03" > <value value="0x00" name="HS" cname="" /> <value value="0x01" name="HSPLL" cname="" /> <value value="0x02" name="EC" cname="" /> <value value="0x03" name="ECPLL_IO" cname="" /> - </tqmask> - <tqmask name="FOSC2" value="0x04" > + </mask> + <mask name="FOSC2" value="0x04" > <value value="0x00" name="FOSC1:FOSC0" cname="" /> <value value="0x04" name="INTRC" cname="" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="On" cname="" /> <value value="0x40" name="Off" cname="" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDTPS" value="0x0F" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDTPS" value="0x0F" > <value value="0x00" name="1:1" cname="" /> <value value="0x01" name="1:2" cname="" /> <value value="0x02" name="1:4" cname="" /> @@ -94,45 +94,45 @@ <value value="0x0D" name="1:8192" cname="" /> <value value="0x0E" name="1:16384" cname="" /> <value value="0x0F" name="1:32768" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" > - <tqmask name="EASHFT" value="0x08" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" > + <mask name="EASHFT" value="0x08" > <value value="0x00" name="Off" cname="" /> <value value="0x08" name="On" cname="" /> - </tqmask> - <tqmask name="EMB" value="0x30" > + </mask> + <mask name="EMB" value="0x30" > <value value="0x00" name="20BIT" cname="" /> <value value="0x10" name="16BIT" cname="" /> <value value="0x20" name="12BIT" cname="" /> <value value="0x30" name="Disabled" cname="" /> - </tqmask> - <tqmask name="BW" value="0x40" > + </mask> + <mask name="BW" value="0x40" > <value value="0x00" name="8" cname="" /> <value value="0x40" name="16" cname="" /> - </tqmask> - <tqmask name="WAIT" value="0x80" > + </mask> + <mask name="WAIT" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x03" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="" /> <value value="0x01" name="RC1" cname="" /> - </tqmask> - <tqmask name="ECCPMX" value="0x02" > + </mask> + <mask name="ECCPMX" value="0x02" > <value value="0x00" name="RH7-RH4" cname="" /> <value value="0x02" name="RE6-RE3" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" > </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F84J90.xml b/src/devices/pic/xml_data/18F84J90.xml index 1236e43..59711f3 100644 --- a/src/devices/pic/xml_data/18F84J90.xml +++ b/src/devices/pic/xml_data/18F84J90.xml @@ -29,55 +29,55 @@ <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" > - <tqmask name="WDT" value="0x01" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="STVREN" value="0x20" > + </mask> + <mask name="STVREN" value="0x20" > <value value="0x00" name="Off" cname="" /> <value value="0x20" name="On" cname="" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="" /> <value value="0x40" name="On" cname="" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" > - <tqmask name="CP" value="0x04" > + <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" > + <mask name="CP" value="0x04" > <value value="0x00" name="All" cname="" /> <value value="0x04" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="FOSC" value="0x03" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" > + <mask name="FOSC" value="0x03" > <value value="0x00" name="HS" cname="" /> <value value="0x01" name="HSPLL" cname="" /> <value value="0x02" name="EC" cname="" /> <value value="0x03" name="ECPLL_IO" cname="" /> - </tqmask> - <tqmask name="FOSC2" value="0x04" > + </mask> + <mask name="FOSC2" value="0x04" > <value value="0x00" name="FOSC1:FOSC0" cname="" /> <value value="0x04" name="INTRC" cname="" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="On" cname="" /> <value value="0x40" name="Off" cname="" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDTPS" value="0x0F" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDTPS" value="0x0F" > <value value="0x00" name="1:1" cname="" /> <value value="0x01" name="1:2" cname="" /> <value value="0x02" name="1:4" cname="" /> @@ -94,45 +94,45 @@ <value value="0x0D" name="1:8192" cname="" /> <value value="0x0E" name="1:16384" cname="" /> <value value="0x0F" name="1:32768" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" > - <tqmask name="EASHFT" value="0x08" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" > + <mask name="EASHFT" value="0x08" > <value value="0x00" name="Off" cname="" /> <value value="0x08" name="On" cname="" /> - </tqmask> - <tqmask name="EMB" value="0x30" > + </mask> + <mask name="EMB" value="0x30" > <value value="0x00" name="20BIT" cname="" /> <value value="0x10" name="16BIT" cname="" /> <value value="0x20" name="12BIT" cname="" /> <value value="0x30" name="Disabled" cname="" /> - </tqmask> - <tqmask name="BW" value="0x40" > + </mask> + <mask name="BW" value="0x40" > <value value="0x00" name="8" cname="" /> <value value="0x40" name="16" cname="" /> - </tqmask> - <tqmask name="WAIT" value="0x80" > + </mask> + <mask name="WAIT" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x03" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="" /> <value value="0x01" name="RC1" cname="" /> - </tqmask> - <tqmask name="ECCPMX" value="0x02" > + </mask> + <mask name="ECCPMX" value="0x02" > <value value="0x00" name="RH7-RH4" cname="" /> <value value="0x02" name="RE6-RE3" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" > </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F8520.xml b/src/devices/pic/xml_data/18F8520.xml index ed9b7c7..6bc1aae 100644 --- a/src/devices/pic/xml_data/18F8520.xml +++ b/src/devices/pic/xml_data/18F8520.xml @@ -37,17 +37,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x007FFF" word_write_align="4" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" > - <tqmask name="FOSC" value="0x07" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" > + <mask name="FOSC" value="0x07" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -56,36 +56,36 @@ <value value="0x05" name="EC_IO" cname="_OSC_ECIO" /> <value value="0x06" name="H4" cname="_OSC_HSPLL" /> <value value="0x07" name="EXTRC_IO" cname="_OSC_RCIO" /> - </tqmask> - <tqmask name="OSCSEN" value="0x20" > + </mask> + <mask name="OSCSEN" value="0x20" > <value value="0x00" name="On" cname="_OSCS_ON" /> <value value="0x20" name="Off" cname="_OSCS_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x02" > + </mask> + <mask name="BODEN" value="0x02" > <value value="0x00" name="Off" cname="_BOR_OFF" /> <value value="0x02" name="On" cname="_BOR_ON" /> - </tqmask> - <tqmask name="BORV" value="0x0C" > + </mask> + <mask name="BORV" value="0x0C" > <value value="0x00" name="4.5" cname="_BORV_45" /> <value value="0x04" name="4.2" cname="_BORV_42" /> <value value="0x08" name="2.7" cname="_BORV_27" /> <value value="0x0C" name="2.5" cname="_BORV_25" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x0E" > + </mask> + <mask name="WDTPS" value="0x0E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -94,134 +94,134 @@ <value value="0x0A" name="1:32" cname="_WDTPS_32" /> <value value="0x0C" name="1:64" cname="_WDTPS_64" /> <value value="0x0E" name="1:128" cname="_WDTPS_128" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x83" > - <tqmask name="PM" value="0x03" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x83" > + <mask name="PM" value="0x03" > <value value="0x00" name="Extended microcontroller" cname="_MODE_EM" /> <value value="0x01" name="Microprocessor with boot" cname="_MODE_MPB" /> <value value="0x02" name="Microprocessor" cname="_MODE_MP" /> <value value="0x03" name="Microcontroller" cname="_MODE_MC" /> - </tqmask> - <tqmask name="WAIT" value="0x80" > + </mask> + <mask name="WAIT" value="0x80" > <value value="0x00" name="On" cname="_WAIT_ON" /> <value value="0x80" name="Off" cname="_WAIT_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" ctqmask="0x02" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" cmask="0x02" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RE7" cname="_CCP2MUX_RE7" /> <value value="0x01" name="RC1" cname="_CCP2MUX_RC1" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVR_OFF" /> <value value="0x01" name="On" cname="_STVR_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_CP2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" /> - </tqmask> - <tqmask name="CP_3" value="0x08" > + </mask> + <mask name="CP_3" value="0x08" > <value value="0x00" name="6000:7FFF" cname="_CP3_ON" /> <value value="0x08" name="Off" cname="_CP3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" ctqmask="0x40" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" cmask="0x40" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_WRT2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" /> - </tqmask> - <tqmask name="WRT_3" value="0x08" > + </mask> + <mask name="WRT_3" value="0x08" > <value value="0x00" name="6000:7FFF" cname="_WRT3_ON" /> <value value="0x08" name="Off" cname="_WRT3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" ctqmask="0x40" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" cmask="0x40" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800:1FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="4000:5FFF" cname="_EBTR2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" /> - </tqmask> - <tqmask name="EBTR_3" value="0x08" > + </mask> + <mask name="EBTR_3" value="0x08" > <value value="0x00" name="6000:7FFF" cname="_EBTR3_ON" /> <value value="0x08" name="Off" cname="_EBTR3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F8525.xml b/src/devices/pic/xml_data/18F8525.xml index 7e016eb..e7b5219 100644 --- a/src/devices/pic/xml_data/18F8525.xml +++ b/src/devices/pic/xml_data/18F8525.xml @@ -29,17 +29,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x00BFFF" word_write_align="4" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x2F" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x2F" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -53,36 +53,36 @@ <value value="0x0D" name="E4S_IO" cname="_OSC_ECIOSWPLL" /> <value value="0x0E" name="H4S" cname="_OSC_HSSWPLL" /> <value value="0x0F" name="EXTRC_IO" cname="_OSC_RCIO" /> - </tqmask> - <tqmask name="OSCSEN" value="0x20" > + </mask> + <mask name="OSCSEN" value="0x20" > <value value="0x00" name="On" cname="_OSCS_ON" /> <value value="0x20" name="Off" cname="_OSCS_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x02" > + </mask> + <mask name="BODEN" value="0x02" > <value value="0x00" name="Off" cname="_BOR_OFF" /> <value value="0x02" name="On" cname="_BOR_ON" /> - </tqmask> - <tqmask name="BORV" value="0x0C" > + </mask> + <mask name="BORV" value="0x0C" > <value value="0x00" name="4.5" cname="_BORV_45" /> <value value="0x04" name="4.2" cname="_BORV_42" /> <value value="0x08" name="2.7" cname="_BORV_27" /> <value value="0x0C" name="2.0" cname="_BORV_20" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -99,130 +99,130 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x83" > - <tqmask name="PM" value="0x03" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x83" > + <mask name="PM" value="0x03" > <value value="0x00" name="Extended microcontroller" cname="_MODE_EM" /> <value value="0x01" name="Microprocessor with boot" cname="_MODE_MPB" /> <value value="0x02" name="Microprocessor" cname="_MODE_MP" /> <value value="0x03" name="Microcontroller" cname="_MODE_MC" /> - </tqmask> - <tqmask name="WAIT" value="0x80" > + </mask> + <mask name="WAIT" value="0x80" > <value value="0x00" name="On" cname="_WAIT_ON" /> <value value="0x80" name="Off" cname="_WAIT_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x02" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x02" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RE7" cname="_CCP2MX_PORTBE" /> <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" /> - </tqmask> - <tqmask name="ECCPMX" value="0x02" > + </mask> + <mask name="ECCPMX" value="0x02" > <value value="0x00" name="RH7-RH4" cname="_ECCPMX_PORTH" /> <value value="0x02" name="RE6-RE3" cname="_ECCPMX_PORTE" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVR_OFF" /> <value value="0x01" name="On" cname="_STVR_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x07" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800:3FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_CP2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x07" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800:3FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x07" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800:3FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F8527.xml b/src/devices/pic/xml_data/18F8527.xml index e5159bd..62c01d4 100644 --- a/src/devices/pic/xml_data/18F8527.xml +++ b/src/devices/pic/xml_data/18F8527.xml @@ -30,17 +30,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x00BFFF" word_write_align="32" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_LP_OSC" /> <value value="0x01" name="XT" cname="_XT_OSC" /> <value value="0x02" name="HS" cname="_HS_OSC" /> @@ -57,42 +57,42 @@ <value value="0x0D" name="EXTRC_CLKOUT" cname="_RC_OSC" /> <value value="0x0E" name="EXTRC_CLKOUT" cname="_RC_OSC" /> <value value="0x0F" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FSCM_OFF" /> <value value="0x40" name="On" cname="_FSCM_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="Software" cname="_BOREN_ON" /> <value value="0x04" name="On_run" cname="_BOREN_NOSLP" /> <value value="0x06" name="On" cname="_BOREN_SBORDIS" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -109,154 +109,154 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8K" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16K" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32K" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF3" > - <tqmask name="PM" value="0x03" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF3" > + <mask name="PM" value="0x03" > <value value="0x00" name="Extended microcontroller" cname="_MODE_EM" /> <value value="0x01" name="Microprocessor with boot" cname="_MODE_MPB" /> <value value="0x02" name="Microprocessor" cname="_MODE_MP" /> <value value="0x03" name="Microcontroller" cname="_MODE_MC" /> - </tqmask> - <tqmask name="ABW" value="0x30" > + </mask> + <mask name="ABW" value="0x30" > <value value="0x00" name="8" cname="_ADDRBW_ADDR8BIT" /> <value value="0x10" name="12" cname="_ADDRBW_ADDR12BIT" /> <value value="0x20" name="16" cname="_ADDRBW_ADDR16BIT" /> <value value="0x30" name="20" cname="_ADDRBW_ADDR20BIT" /> - </tqmask> - <tqmask name="BW" value="0x40" > + </mask> + <mask name="BW" value="0x40" > <value value="0x00" name="8" cname="_DATABW_DATA8BIT" /> <value value="0x40" name="16" cname="_DATABW_DATA16BIT" /> - </tqmask> - <tqmask name="WAIT" value="0x80" > + </mask> + <mask name="WAIT" value="0x80" > <value value="0x00" name="On" cname="_WAIT_ON" /> <value value="0x80" name="Off" cname="_WAIT_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x02" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x02" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" /> <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" /> - </tqmask> - <tqmask name="ECCPMX" value="0x02" > + </mask> + <mask name="ECCPMX" value="0x02" > <value value="0x00" name="RH7-RH4" cname="_ECCPMX_PORTH" /> <value value="0x02" name="RE6-RE3" cname="_ECCPMX_PORTE" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="BBSIZ" value="0x30" > + </mask> + <mask name="BBSIZ" value="0x30" > <value value="0x00" name="1024" cname="_BBSIZ_BB2K" /> <value value="0x10" name="2048" cname="_BBSIZ_BB4K" /> <value value="0x20" name="4096" cname="_BBSIZ_BB8K" /> <value value="0x30" name="4096" cname="_BBSIZ_BB8K" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x07" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800/1000/2000:3FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_CP2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="All" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x07" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800/1000/2000:3FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="All" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x07" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800/1000/2000:3FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="All" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F8585.xml b/src/devices/pic/xml_data/18F8585.xml index 85b3561..08367ab 100644 --- a/src/devices/pic/xml_data/18F8585.xml +++ b/src/devices/pic/xml_data/18F8585.xml @@ -29,17 +29,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x00BFFF" word_write_align="4" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x2F" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x2F" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -53,36 +53,36 @@ <value value="0x0D" name="E4S_IO" cname="_OSC_ECIOSWPLL" /> <value value="0x0E" name="H4S" cname="_OSC_HSSWPLL" /> <value value="0x0F" name="EXTRC_IO" cname="_OSC_RCIO" /> - </tqmask> - <tqmask name="OSCSEN" value="0x20" > + </mask> + <mask name="OSCSEN" value="0x20" > <value value="0x00" name="On" cname="_OSCS_ON" /> <value value="0x20" name="Off" cname="_OSCS_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x02" > + </mask> + <mask name="BODEN" value="0x02" > <value value="0x00" name="Off" cname="_BOR_OFF" /> <value value="0x02" name="On" cname="_BOR_ON" /> - </tqmask> - <tqmask name="BORV" value="0x0C" > + </mask> + <mask name="BORV" value="0x0C" > <value value="0x00" name="4.5" cname="_BORV_45" /> <value value="0x04" name="4.2" cname="_BORV_42" /> <value value="0x08" name="2.7" cname="_BORV_27" /> <value value="0x0C" name="2.0" cname="_BORV_20" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -99,130 +99,130 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x83" > - <tqmask name="PM" value="0x03" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x83" > + <mask name="PM" value="0x03" > <value value="0x00" name="Extended microcontroller" cname="_MODE_EM" /> <value value="0x01" name="Microprocessor with boot" cname="_MODE_MPB" /> <value value="0x02" name="Microprocessor" cname="_MODE_MP" /> <value value="0x03" name="Microcontroller" cname="_MODE_MC" /> - </tqmask> - <tqmask name="WAIT" value="0x80" > + </mask> + <mask name="WAIT" value="0x80" > <value value="0x00" name="On" cname="_WAIT_ON" /> <value value="0x80" name="Off" cname="_WAIT_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x02" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x02" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RE7" cname="_CCP2MX_OFF" /> <value value="0x01" name="RC1" cname="_CCP2MX_ON" /> - </tqmask> - <tqmask name="ECCPMX" value="0x02" > + </mask> + <mask name="ECCPMX" value="0x02" > <value value="0x00" name="RH7-RH6" cname="_ECCPMX_PORTH" /> <value value="0x02" name="RE6-RE5" cname="_ECCPMX_PORTE" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVR_OFF" /> <value value="0x01" name="On" cname="_STVR_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x07" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800:3FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_CP2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x07" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800:3FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x07" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800:3FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F85J10.xml b/src/devices/pic/xml_data/18F85J10.xml index 6fab213..99b998c 100644 --- a/src/devices/pic/xml_data/18F85J10.xml +++ b/src/devices/pic/xml_data/18F85J10.xml @@ -29,55 +29,55 @@ <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" > - <tqmask name="WDT" value="0x01" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="STVREN" value="0x20" > + </mask> + <mask name="STVREN" value="0x20" > <value value="0x00" name="Off" cname="" /> <value value="0x20" name="On" cname="" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="" /> <value value="0x40" name="On" cname="" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" > - <tqmask name="CP" value="0x04" > + <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" > + <mask name="CP" value="0x04" > <value value="0x00" name="All" cname="" /> <value value="0x04" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="FOSC" value="0x03" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" > + <mask name="FOSC" value="0x03" > <value value="0x00" name="HS" cname="" /> <value value="0x01" name="HSPLL" cname="" /> <value value="0x02" name="EC" cname="" /> <value value="0x03" name="ECPLL_IO" cname="" /> - </tqmask> - <tqmask name="FOSC2" value="0x04" > + </mask> + <mask name="FOSC2" value="0x04" > <value value="0x00" name="FOSC1:FOSC0" cname="" /> <value value="0x04" name="INTRC" cname="" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="On" cname="" /> <value value="0x40" name="Off" cname="" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDTPS" value="0x0F" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDTPS" value="0x0F" > <value value="0x00" name="1:1" cname="" /> <value value="0x01" name="1:2" cname="" /> <value value="0x02" name="1:4" cname="" /> @@ -94,45 +94,45 @@ <value value="0x0D" name="1:8192" cname="" /> <value value="0x0E" name="1:16384" cname="" /> <value value="0x0F" name="1:32768" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" > - <tqmask name="EASHFT" value="0x08" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" > + <mask name="EASHFT" value="0x08" > <value value="0x00" name="Off" cname="" /> <value value="0x08" name="On" cname="" /> - </tqmask> - <tqmask name="EMB" value="0x30" > + </mask> + <mask name="EMB" value="0x30" > <value value="0x00" name="20BIT" cname="" /> <value value="0x10" name="16BIT" cname="" /> <value value="0x20" name="12BIT" cname="" /> <value value="0x30" name="Disabled" cname="" /> - </tqmask> - <tqmask name="BW" value="0x40" > + </mask> + <mask name="BW" value="0x40" > <value value="0x00" name="8" cname="" /> <value value="0x40" name="16" cname="" /> - </tqmask> - <tqmask name="WAIT" value="0x80" > + </mask> + <mask name="WAIT" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x03" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="" /> <value value="0x01" name="RC1" cname="" /> - </tqmask> - <tqmask name="ECCPMX" value="0x02" > + </mask> + <mask name="ECCPMX" value="0x02" > <value value="0x00" name="RH7-RH4" cname="" /> <value value="0x02" name="RE6-RE3" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" > </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F85J11.xml b/src/devices/pic/xml_data/18F85J11.xml index 0193782..91b4cc2 100644 --- a/src/devices/pic/xml_data/18F85J11.xml +++ b/src/devices/pic/xml_data/18F85J11.xml @@ -29,55 +29,55 @@ <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" > - <tqmask name="WDT" value="0x01" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="STVREN" value="0x20" > + </mask> + <mask name="STVREN" value="0x20" > <value value="0x00" name="Off" cname="" /> <value value="0x20" name="On" cname="" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="" /> <value value="0x40" name="On" cname="" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" > - <tqmask name="CP" value="0x04" > + <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" > + <mask name="CP" value="0x04" > <value value="0x00" name="All" cname="" /> <value value="0x04" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="FOSC" value="0x03" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" > + <mask name="FOSC" value="0x03" > <value value="0x00" name="HS" cname="" /> <value value="0x01" name="HSPLL" cname="" /> <value value="0x02" name="EC" cname="" /> <value value="0x03" name="ECPLL_IO" cname="" /> - </tqmask> - <tqmask name="FOSC2" value="0x04" > + </mask> + <mask name="FOSC2" value="0x04" > <value value="0x00" name="FOSC1:FOSC0" cname="" /> <value value="0x04" name="INTRC" cname="" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="On" cname="" /> <value value="0x40" name="Off" cname="" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDTPS" value="0x0F" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDTPS" value="0x0F" > <value value="0x00" name="1:1" cname="" /> <value value="0x01" name="1:2" cname="" /> <value value="0x02" name="1:4" cname="" /> @@ -94,45 +94,45 @@ <value value="0x0D" name="1:8192" cname="" /> <value value="0x0E" name="1:16384" cname="" /> <value value="0x0F" name="1:32768" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" > - <tqmask name="EASHFT" value="0x08" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" > + <mask name="EASHFT" value="0x08" > <value value="0x00" name="Off" cname="" /> <value value="0x08" name="On" cname="" /> - </tqmask> - <tqmask name="EMB" value="0x30" > + </mask> + <mask name="EMB" value="0x30" > <value value="0x00" name="20BIT" cname="" /> <value value="0x10" name="16BIT" cname="" /> <value value="0x20" name="12BIT" cname="" /> <value value="0x30" name="Disabled" cname="" /> - </tqmask> - <tqmask name="BW" value="0x40" > + </mask> + <mask name="BW" value="0x40" > <value value="0x00" name="8" cname="" /> <value value="0x40" name="16" cname="" /> - </tqmask> - <tqmask name="WAIT" value="0x80" > + </mask> + <mask name="WAIT" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x03" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="" /> <value value="0x01" name="RC1" cname="" /> - </tqmask> - <tqmask name="ECCPMX" value="0x02" > + </mask> + <mask name="ECCPMX" value="0x02" > <value value="0x00" name="RH7-RH4" cname="" /> <value value="0x02" name="RE6-RE3" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" > </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F85J15.xml b/src/devices/pic/xml_data/18F85J15.xml index 3011a51..c2445ab 100644 --- a/src/devices/pic/xml_data/18F85J15.xml +++ b/src/devices/pic/xml_data/18F85J15.xml @@ -29,55 +29,55 @@ <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" > - <tqmask name="WDT" value="0x01" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="STVREN" value="0x20" > + </mask> + <mask name="STVREN" value="0x20" > <value value="0x00" name="Off" cname="" /> <value value="0x20" name="On" cname="" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="" /> <value value="0x40" name="On" cname="" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" > - <tqmask name="CP" value="0x04" > + <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" > + <mask name="CP" value="0x04" > <value value="0x00" name="All" cname="" /> <value value="0x04" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="FOSC" value="0x03" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" > + <mask name="FOSC" value="0x03" > <value value="0x00" name="HS" cname="" /> <value value="0x01" name="HSPLL" cname="" /> <value value="0x02" name="EC" cname="" /> <value value="0x03" name="ECPLL_IO" cname="" /> - </tqmask> - <tqmask name="FOSC2" value="0x04" > + </mask> + <mask name="FOSC2" value="0x04" > <value value="0x00" name="FOSC1:FOSC0" cname="" /> <value value="0x04" name="INTRC" cname="" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="On" cname="" /> <value value="0x40" name="Off" cname="" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDTPS" value="0x0F" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDTPS" value="0x0F" > <value value="0x00" name="1:1" cname="" /> <value value="0x01" name="1:2" cname="" /> <value value="0x02" name="1:4" cname="" /> @@ -94,45 +94,45 @@ <value value="0x0D" name="1:8192" cname="" /> <value value="0x0E" name="1:16384" cname="" /> <value value="0x0F" name="1:32768" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" > - <tqmask name="EASHFT" value="0x08" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" > + <mask name="EASHFT" value="0x08" > <value value="0x00" name="Off" cname="" /> <value value="0x08" name="On" cname="" /> - </tqmask> - <tqmask name="EMB" value="0x30" > + </mask> + <mask name="EMB" value="0x30" > <value value="0x00" name="20BIT" cname="" /> <value value="0x10" name="16BIT" cname="" /> <value value="0x20" name="12BIT" cname="" /> <value value="0x30" name="Disabled" cname="" /> - </tqmask> - <tqmask name="BW" value="0x40" > + </mask> + <mask name="BW" value="0x40" > <value value="0x00" name="8" cname="" /> <value value="0x40" name="16" cname="" /> - </tqmask> - <tqmask name="WAIT" value="0x80" > + </mask> + <mask name="WAIT" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x03" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="" /> <value value="0x01" name="RC1" cname="" /> - </tqmask> - <tqmask name="ECCPMX" value="0x02" > + </mask> + <mask name="ECCPMX" value="0x02" > <value value="0x00" name="RH7-RH4" cname="" /> <value value="0x02" name="RE6-RE3" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" > </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F85J50.xml b/src/devices/pic/xml_data/18F85J50.xml index 80199eb..dee0637 100644 --- a/src/devices/pic/xml_data/18F85J50.xml +++ b/src/devices/pic/xml_data/18F85J50.xml @@ -29,16 +29,16 @@ <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xEF" > - <tqmask name="WDT" value="0x01" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xEF" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="STVREN" value="0x20" > + </mask> + <mask name="STVREN" value="0x20" > <value value="0x00" name="Off" cname="" /> <value value="0x20" name="On" cname="" /> - </tqmask> - <tqmask name="PLLDIV" value="0x0E" > + </mask> + <mask name="PLLDIV" value="0x0E" > <value value="0x00" name="12" cname="" /> <value value="0x02" name="10" cname="" /> <value value="0x04" name="6" cname="" /> @@ -47,47 +47,47 @@ <value value="0x0A" name="3" cname="" /> <value value="0x0C" name="2" cname="" /> <value value="0x0E" name="1" cname="" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="" /> <value value="0x40" name="On" cname="" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" > - <tqmask name="CP" value="0x04" > + <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" > + <mask name="CP" value="0x04" > <value value="0x00" name="All" cname="" /> <value value="0x04" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="FOSC" value="0x03" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" > + <mask name="FOSC" value="0x03" > <value value="0x00" name="HS" cname="" /> <value value="0x01" name="HSPLL" cname="" /> <value value="0x02" name="EC" cname="" /> <value value="0x03" name="ECPLL_IO" cname="" /> - </tqmask> - <tqmask name="FOSC2" value="0x04" > + </mask> + <mask name="FOSC2" value="0x04" > <value value="0x00" name="FOSC1:FOSC0" cname="" /> <value value="0x04" name="INTRC" cname="" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="On" cname="" /> <value value="0x40" name="Off" cname="" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDTPS" value="0x0F" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDTPS" value="0x0F" > <value value="0x00" name="1:1" cname="" /> <value value="0x01" name="1:2" cname="" /> <value value="0x02" name="1:4" cname="" /> @@ -104,53 +104,53 @@ <value value="0x0D" name="1:8192" cname="" /> <value value="0x0E" name="1:16384" cname="" /> <value value="0x0F" name="1:32768" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" > - <tqmask name="EASHFT" value="0x08" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" > + <mask name="EASHFT" value="0x08" > <value value="0x00" name="Off" cname="" /> <value value="0x08" name="On" cname="" /> - </tqmask> - <tqmask name="EMB" value="0x30" > + </mask> + <mask name="EMB" value="0x30" > <value value="0x00" name="20BIT" cname="" /> <value value="0x10" name="16BIT" cname="" /> <value value="0x20" name="12BIT" cname="" /> <value value="0x30" name="Disabled" cname="" /> - </tqmask> - <tqmask name="BW" value="0x40" > + </mask> + <mask name="BW" value="0x40" > <value value="0x00" name="8" cname="" /> <value value="0x40" name="16" cname="" /> - </tqmask> - <tqmask name="WAIT" value="0x80" > + </mask> + <mask name="WAIT" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x0F" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="" /> <value value="0x01" name="RC1" cname="" /> - </tqmask> - <tqmask name="ECCPMX" value="0x02" > + </mask> + <mask name="ECCPMX" value="0x02" > <value value="0x00" name="RH7-RH4" cname="" /> <value value="0x02" name="RE6-RE3" cname="" /> - </tqmask> - <tqmask name="PMPMX" value="0x04" > + </mask> + <mask name="PMPMX" value="0x04" > <value value="0x00" name="NotConnected" cname="" /> <value value="0x04" name="Connected" cname="" /> - </tqmask> - <tqmask name="MSSPSEL" value="0x08" > + </mask> + <mask name="MSSPSEL" value="0x08" > <value value="0x00" name="5BIT" cname="" /> <value value="0x08" name="7BIT" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" > </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F85J90.xml b/src/devices/pic/xml_data/18F85J90.xml index 51d6085..61e7571 100644 --- a/src/devices/pic/xml_data/18F85J90.xml +++ b/src/devices/pic/xml_data/18F85J90.xml @@ -28,55 +28,55 @@ <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" > - <tqmask name="WDT" value="0x01" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="STVREN" value="0x20" > + </mask> + <mask name="STVREN" value="0x20" > <value value="0x00" name="Off" cname="" /> <value value="0x20" name="On" cname="" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="" /> <value value="0x40" name="On" cname="" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" > - <tqmask name="CP" value="0x04" > + <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" > + <mask name="CP" value="0x04" > <value value="0x00" name="All" cname="" /> <value value="0x04" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="FOSC" value="0x03" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" > + <mask name="FOSC" value="0x03" > <value value="0x00" name="HS" cname="" /> <value value="0x01" name="HSPLL" cname="" /> <value value="0x02" name="EC" cname="" /> <value value="0x03" name="ECPLL_IO" cname="" /> - </tqmask> - <tqmask name="FOSC2" value="0x04" > + </mask> + <mask name="FOSC2" value="0x04" > <value value="0x00" name="FOSC1:FOSC0" cname="" /> <value value="0x04" name="INTRC" cname="" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="On" cname="" /> <value value="0x40" name="Off" cname="" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDTPS" value="0x0F" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDTPS" value="0x0F" > <value value="0x00" name="1:1" cname="" /> <value value="0x01" name="1:2" cname="" /> <value value="0x02" name="1:4" cname="" /> @@ -93,45 +93,45 @@ <value value="0x0D" name="1:8192" cname="" /> <value value="0x0E" name="1:16384" cname="" /> <value value="0x0F" name="1:32768" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" > - <tqmask name="EASHFT" value="0x08" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" > + <mask name="EASHFT" value="0x08" > <value value="0x00" name="Off" cname="" /> <value value="0x08" name="On" cname="" /> - </tqmask> - <tqmask name="EMB" value="0x30" > + </mask> + <mask name="EMB" value="0x30" > <value value="0x00" name="20BIT" cname="" /> <value value="0x10" name="16BIT" cname="" /> <value value="0x20" name="12BIT" cname="" /> <value value="0x30" name="Disabled" cname="" /> - </tqmask> - <tqmask name="BW" value="0x40" > + </mask> + <mask name="BW" value="0x40" > <value value="0x00" name="8" cname="" /> <value value="0x40" name="16" cname="" /> - </tqmask> - <tqmask name="WAIT" value="0x80" > + </mask> + <mask name="WAIT" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x03" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="" /> <value value="0x01" name="RC1" cname="" /> - </tqmask> - <tqmask name="ECCPMX" value="0x02" > + </mask> + <mask name="ECCPMX" value="0x02" > <value value="0x00" name="RH7-RH4" cname="" /> <value value="0x02" name="RE6-RE3" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" > </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F8620.xml b/src/devices/pic/xml_data/18F8620.xml index fe596c1..8503556 100644 --- a/src/devices/pic/xml_data/18F8620.xml +++ b/src/devices/pic/xml_data/18F8620.xml @@ -37,17 +37,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x00FFFF" word_write_align="4" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" > - <tqmask name="FOSC" value="0x07" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" > + <mask name="FOSC" value="0x07" > <value value="0x00" name="LP" cname="_LP_OSC" sdcc_cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_XT_OSC" sdcc_cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_HS_OSC" sdcc_cname="_OSC_HS" /> @@ -56,36 +56,36 @@ <value value="0x05" name="EC_IO" cname="_ECIO_OSC" sdcc_cname="_OSC_EC_OSC2_RA6" /> <value value="0x06" name="H4" cname="_HSPLL_OSC" sdcc_cname="_OSC_HS_PLL" /> <value value="0x07" name="EXTRC_IO" cname="_RCIO_OSC" sdcc_cname="_OSC_RC_OSC2" /> - </tqmask> - <tqmask name="OSCSEN" value="0x20" > + </mask> + <mask name="OSCSEN" value="0x20" > <value value="0x00" name="On" cname="_OSCS_ON" /> <value value="0x20" name="Off" cname="_OSCS_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" sdcc_cname="_PUT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" sdcc_cname="_PUT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x02" > + </mask> + <mask name="BODEN" value="0x02" > <value value="0x00" name="Off" cname="_BOR_OFF" sdcc_cname="_BODEN_OFF" /> <value value="0x02" name="On" cname="_BOR_ON" sdcc_cname="_BODEN_ON" /> - </tqmask> - <tqmask name="BORV" value="0x0C" > + </mask> + <mask name="BORV" value="0x0C" > <value value="0x00" name="4.5" cname="_BORV_45" sdcc_cname="_BODENV_4_5V" /> <value value="0x04" name="4.2" cname="_BORV_42" sdcc_cname="_BODENV_4_2V" /> <value value="0x08" name="2.7" cname="_BORV_27" sdcc_cname="_BODENV_2_7V" /> <value value="0x0C" name="2.5" cname="_BORV_20" sdcc_cname="_BODENV_2_5V" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x0E" > + </mask> + <mask name="WDTPS" value="0x0E" > <value value="0x00" name="1:1" cname="_WDTPS_1" sdcc_cname="_WDTPS_1_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" sdcc_cname="_WDTPS_1_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" sdcc_cname="_WDTPS_1_4" /> @@ -94,134 +94,134 @@ <value value="0x0A" name="1:32" cname="_WDTPS_32" sdcc_cname="_WDTPS_1_32" /> <value value="0x0C" name="1:64" cname="_WDTPS_64" sdcc_cname="_WDTPS_1_64" /> <value value="0x0E" name="1:128" cname="_WDTPS_128" sdcc_cname="_WDTPS_1_128" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x83" > - <tqmask name="PM" value="0x03" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x83" > + <mask name="PM" value="0x03" > <value value="0x00" name="Extended microcontroller" cname="_XMC_MODE" sdcc_cname="_PMODE_EXT" /> <value value="0x01" name="Microprocessor with boot" cname="_MPB_MODE" sdcc_cname="_PMODE_MICROPROCESSOR_w_Boot" /> <value value="0x02" name="Microprocessor" cname="_MP_MODE" sdcc_cname="_PMODE_MICROPROCESSOR_" /> <value value="0x03" name="Microcontroller" cname="_MC_MODE" sdcc_cname="_PMODE_MICROCONTROLLER" /> - </tqmask> - <tqmask name="WAIT" value="0x80" > + </mask> + <mask name="WAIT" value="0x80" > <value value="0x00" name="On" cname="_WAIT_ON" /> <value value="0x80" name="Off" cname="_WAIT_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RE7" cname="_CCP2MX_OFF" sdcc_cname="_CCP2MUX_RE7_MICROCONTROLLER__RB3" /> <value value="0x01" name="RC1" cname="_CCP2MX_ON" sdcc_cname="_CCP2MUX_RC1" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVR_OFF" /> <value value="0x01" name="On" cname="_STVR_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" sdcc_cname="_BACKBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" sdcc_cname="_BACKBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0200:3FFF" cname="_CP0_ON" sdcc_cname="_CP_0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_CP1_ON" sdcc_cname="_CP_1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_CP2_ON" sdcc_cname="_CP_2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" sdcc_cname="_CP_2_OFF" /> - </tqmask> - <tqmask name="CP_3" value="0x08" > + </mask> + <mask name="CP_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_CP3_ON" sdcc_cname="_CP_3_ON" /> <value value="0x08" name="Off" cname="_CP3_OFF" sdcc_cname="_CP_3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0200:3FFF" cname="_WRT0_ON" sdcc_cname="_WRT_0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_WRT1_ON" sdcc_cname="_WRT_1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" sdcc_cname="_WRT_2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" sdcc_cname="_WRT_2_OFF" /> - </tqmask> - <tqmask name="WRT_3" value="0x08" > + </mask> + <mask name="WRT_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_WRT3_ON" sdcc_cname="_WRT_3_ON" /> <value value="0x08" name="Off" cname="_WRT3_OFF" sdcc_cname="_WRT_3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0200:3FFF" cname="_EBTR0_ON" sdcc_cname="_EBTR_0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" sdcc_cname="_EBTR_1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" sdcc_cname="_EBTR_2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" sdcc_cname="_EBTR_2_OFF" /> - </tqmask> - <tqmask name="EBTR_3" value="0x08" > + </mask> + <mask name="EBTR_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" sdcc_cname="_EBTR_3_ON" /> <value value="0x08" name="Off" cname="_EBTR3_OFF" sdcc_cname="_EBTR_3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F8621.xml b/src/devices/pic/xml_data/18F8621.xml index 654f4a2..e5689ae 100644 --- a/src/devices/pic/xml_data/18F8621.xml +++ b/src/devices/pic/xml_data/18F8621.xml @@ -29,17 +29,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x00FFFF" word_write_align="4" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x2F" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x2F" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -53,36 +53,36 @@ <value value="0x0D" name="E4S_IO" cname="_OSC_ECIOSWPLL" /> <value value="0x0E" name="H4S" cname="_OSC_HSSWPLL" /> <value value="0x0F" name="EXTRC_IO" cname="_OSC_RCIO" /> - </tqmask> - <tqmask name="OSCSEN" value="0x20" > + </mask> + <mask name="OSCSEN" value="0x20" > <value value="0x00" name="On" cname="_OSCS_ON" /> <value value="0x20" name="Off" cname="_OSCS_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x02" > + </mask> + <mask name="BODEN" value="0x02" > <value value="0x00" name="Off" cname="_BOR_OFF" /> <value value="0x02" name="On" cname="_BOR_ON" /> - </tqmask> - <tqmask name="BORV" value="0x0C" > + </mask> + <mask name="BORV" value="0x0C" > <value value="0x00" name="4.5" cname="_BORV_45" /> <value value="0x04" name="4.2" cname="_BORV_42" /> <value value="0x08" name="2.7" cname="_BORV_27" /> <value value="0x0C" name="2.0" cname="_BORV_20" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -99,142 +99,142 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x83" > - <tqmask name="PM" value="0x03" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x83" > + <mask name="PM" value="0x03" > <value value="0x00" name="Extended microcontroller" cname="_MODE_EM" /> <value value="0x01" name="Microprocessor with boot" cname="_MODE_MPB" /> <value value="0x02" name="Microprocessor" cname="_MODE_MP" /> <value value="0x03" name="Microcontroller" cname="_MODE_MC" /> - </tqmask> - <tqmask name="WAIT" value="0x80" > + </mask> + <mask name="WAIT" value="0x80" > <value value="0x00" name="On" cname="_WAIT_ON" /> <value value="0x80" name="Off" cname="_WAIT_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x02" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x02" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RE7" cname="_CCP2MX_PORTBE" /> <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" /> - </tqmask> - <tqmask name="ECCPMX" value="0x02" > + </mask> + <mask name="ECCPMX" value="0x02" > <value value="0x00" name="RH7-RH4" cname="_ECCPMX_PORTH" /> <value value="0x02" name="RE6-RE3" cname="_ECCPMX_PORTE" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVR_OFF" /> <value value="0x01" name="On" cname="_STVR_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" ctqmask="0x08" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" cmask="0x08" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800:3FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_CP2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" /> - </tqmask> - <tqmask name="CP_3" value="0x08" > + </mask> + <mask name="CP_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_CP3_ON" /> <value value="0x08" name="Off" cname="_CP3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" ctqmask="0x08" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" cmask="0x08" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800:3FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" /> - </tqmask> - <tqmask name="WRT_3" value="0x08" > + </mask> + <mask name="WRT_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_WRT3_ON" /> <value value="0x08" name="Off" cname="_WRT3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" ctqmask="0x08" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" cmask="0x08" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800:3FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" /> - </tqmask> - <tqmask name="EBTR_3" value="0x08" > + </mask> + <mask name="EBTR_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" /> <value value="0x08" name="Off" cname="_EBTR3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F8622.xml b/src/devices/pic/xml_data/18F8622.xml index 9a38941..fe29be9 100644 --- a/src/devices/pic/xml_data/18F8622.xml +++ b/src/devices/pic/xml_data/18F8622.xml @@ -30,17 +30,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x00FFFF" word_write_align="32" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_LP_OSC" /> <value value="0x01" name="XT" cname="_XT_OSC" /> <value value="0x02" name="HS" cname="_HS_OSC" /> @@ -57,42 +57,42 @@ <value value="0x0D" name="EXTRC_CLKOUT" cname="_RC_OSC" /> <value value="0x0E" name="EXTRC_CLKOUT" cname="_RC_OSC" /> <value value="0x0F" name="EXTRC_CLKOUT" cname="_RC_OSC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FSCM_OFF" /> <value value="0x40" name="On" cname="_FSCM_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="Software" cname="_BOREN_ON" /> <value value="0x04" name="On_run" cname="_BOREN_NOSLP" /> <value value="0x06" name="On" cname="_BOREN_SBORDIS" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -109,166 +109,166 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8K" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16K" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32K" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF3" > - <tqmask name="PM" value="0x03" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF3" > + <mask name="PM" value="0x03" > <value value="0x00" name="Extended microcontroller" cname="_MODE_EM" /> <value value="0x01" name="Microprocessor with boot" cname="_MODE_MPB" /> <value value="0x02" name="Microprocessor" cname="_MODE_MP" /> <value value="0x03" name="Microcontroller" cname="_MODE_MC" /> - </tqmask> - <tqmask name="ABW" value="0x30" > + </mask> + <mask name="ABW" value="0x30" > <value value="0x00" name="8" cname="_ADDRBW_ADDR8BIT" /> <value value="0x10" name="12" cname="_ADDRBW_ADDR12BIT" /> <value value="0x20" name="16" cname="_ADDRBW_ADDR16BIT" /> <value value="0x30" name="20" cname="_ADDRBW_ADDR20BIT" /> - </tqmask> - <tqmask name="BW" value="0x40" > + </mask> + <mask name="BW" value="0x40" > <value value="0x00" name="8" cname="_DATABW_DATA8BIT" /> <value value="0x40" name="16" cname="_DATABW_DATA16BIT" /> - </tqmask> - <tqmask name="WAIT" value="0x80" > + </mask> + <mask name="WAIT" value="0x80" > <value value="0x00" name="On" cname="_WAIT_ON" /> <value value="0x80" name="Off" cname="_WAIT_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x02" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x02" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="_CPP2MX_PORTBE" /> <value value="0x01" name="RC1" cname="_CPP2MX_PORTC" /> - </tqmask> - <tqmask name="ECCPMX" value="0x02" > + </mask> + <mask name="ECCPMX" value="0x02" > <value value="0x00" name="RH7-RH6" cname="_ECCPMX_PORTH" /> <value value="0x02" name="RE6-RE5" cname="_ECCPMX_PORTE" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="BBSIZ" value="0x30" > + </mask> + <mask name="BBSIZ" value="0x30" > <value value="0x00" name="1024" cname="_BBSIZ_BB2K" /> <value value="0x10" name="2048" cname="_BBSIZ_BB4K" /> <value value="0x20" name="4096" cname="_BBSIZ_BB8K" /> <value value="0x30" name="4096" cname="_BBSIZ_BB7K" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800/1000/2000:3FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_CP2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" /> - </tqmask> - <tqmask name="CP_3" value="0x08" > + </mask> + <mask name="CP_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_CP3_ON" /> <value value="0x08" name="Off" cname="_CP3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="All" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800/1000/2000:3FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" /> - </tqmask> - <tqmask name="WRT_3" value="0x08" > + </mask> + <mask name="WRT_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_WRT3_ON" /> <value value="0x08" name="Off" cname="_WRT3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="All" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800/1000/2000:3FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" /> - </tqmask> - <tqmask name="EBTR_3" value="0x08" > + </mask> + <mask name="EBTR_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" /> <value value="0x08" name="Off" cname="_EBTR3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="All" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F8627.xml b/src/devices/pic/xml_data/18F8627.xml index 3a5ab09..2b7f70b 100644 --- a/src/devices/pic/xml_data/18F8627.xml +++ b/src/devices/pic/xml_data/18F8627.xml @@ -30,17 +30,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x017FFF" word_write_align="32" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -51,42 +51,42 @@ <value value="0x08" name="INTRC_IO" cname="_OSC_INTIO67" /> <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" /> <value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="Software" cname="_BOREN_ON" /> <value value="0x04" name="On_run" cname="_BOREN_NOSLP" /> <value value="0x06" name="On" cname="_BOREN_SBORDIS" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -103,190 +103,190 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF3" > - <tqmask name="PM" value="0x03" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF3" > + <mask name="PM" value="0x03" > <value value="0x00" name="Extended microcontroller" cname="_MODE_EM" /> <value value="0x01" name="Microprocessor with boot" cname="_MODE_MPB" /> <value value="0x02" name="Microprocessor" cname="_MODE_MP" /> <value value="0x03" name="Microcontroller" cname="_MODE_MC" /> - </tqmask> - <tqmask name="ABW" value="0x30" > + </mask> + <mask name="ABW" value="0x30" > <value value="0x00" name="8" cname="_ADDRBW_ADDR8BIT" /> <value value="0x10" name="12" cname="_ADDRBW_ADDR12BIT" /> <value value="0x20" name="16" cname="_ADDRBW_ADDR16BIT" /> <value value="0x30" name="20" cname="_ADDRBW_ADDR20BIT" /> - </tqmask> - <tqmask name="BW" value="0x40" > + </mask> + <mask name="BW" value="0x40" > <value value="0x00" name="8" cname="_DATABW_DATA8BIT" /> <value value="0x40" name="16" cname="_DATABW_DATA16BIT" /> - </tqmask> - <tqmask name="WAIT" value="0x80" > + </mask> + <mask name="WAIT" value="0x80" > <value value="0x00" name="On" cname="_WAIT_ON" /> <value value="0x80" name="Off" cname="_WAIT_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x02" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x02" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" /> <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" /> - </tqmask> - <tqmask name="ECCPMX" value="0x02" > + </mask> + <mask name="ECCPMX" value="0x02" > <value value="0x00" name="RH7-RH6" cname="_ECCPMX_PORTH" /> <value value="0x02" name="RE6-RE5" cname="_ECCPMX_PORTE" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="BBSIZ" value="0x30" > + </mask> + <mask name="BBSIZ" value="0x30" > <value value="0x00" name="1024" cname="_BBSIZ_BB2K" /> <value value="0x10" name="2048" cname="_BBSIZ_BB4K" /> <value value="0x20" name="4096" cname="_BBSIZ_BB8K" /> <value value="0x30" name="4096" cname="_BBSIZ_BB8K" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x3F" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x3F" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800/1000/2000:3FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_CP2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" /> - </tqmask> - <tqmask name="CP_3" value="0x08" > + </mask> + <mask name="CP_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_CP3_ON" /> <value value="0x08" name="Off" cname="_CP3_OFF" /> - </tqmask> - <tqmask name="CP_4" value="0x10" > + </mask> + <mask name="CP_4" value="0x10" > <value value="0x00" name="10000:13FFF" cname="_CP4_ON" /> <value value="0x10" name="Off" cname="_CP4_OFF" /> - </tqmask> - <tqmask name="CP_5" value="0x20" > + </mask> + <mask name="CP_5" value="0x20" > <value value="0x00" name="14000:17FFF" cname="_CP5_ON" /> <value value="0x20" name="Off" cname="_CP5_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="All" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x3F" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x3F" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800/1000/2000:3FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" /> - </tqmask> - <tqmask name="WRT_3" value="0x08" > + </mask> + <mask name="WRT_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_WRT3_ON" /> <value value="0x08" name="Off" cname="_WRT3_OFF" /> - </tqmask> - <tqmask name="WRT_4" value="0x10" > + </mask> + <mask name="WRT_4" value="0x10" > <value value="0x00" name="10000:13FFF" cname="_WRT4_ON" /> <value value="0x10" name="Off" cname="_WRT4_OFF" /> - </tqmask> - <tqmask name="WRT_5" value="0x20" > + </mask> + <mask name="WRT_5" value="0x20" > <value value="0x00" name="14000:17FFF" cname="_WRT5_ON" /> <value value="0x20" name="Off" cname="_WRT5_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="All" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x3F" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x3F" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800/1000/2000:3FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" /> - </tqmask> - <tqmask name="EBTR_3" value="0x08" > + </mask> + <mask name="EBTR_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" /> <value value="0x08" name="Off" cname="_EBTR3_OFF" /> - </tqmask> - <tqmask name="EBTR_4" value="0x10" > + </mask> + <mask name="EBTR_4" value="0x10" > <value value="0x00" name="10000:13FFF" cname="_EBTR4_ON" /> <value value="0x10" name="Off" cname="_EBTR4_OFF" /> - </tqmask> - <tqmask name="EBTR_5" value="0x20" > + </mask> + <mask name="EBTR_5" value="0x20" > <value value="0x00" name="14000:17FFF" cname="_EBTR5_ON" /> <value value="0x20" name="Off" cname="_EBTR5_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="All" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F8680.xml b/src/devices/pic/xml_data/18F8680.xml index 607bf0f..97ec3c0 100644 --- a/src/devices/pic/xml_data/18F8680.xml +++ b/src/devices/pic/xml_data/18F8680.xml @@ -29,17 +29,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x00FFFF" word_write_align="4" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x2F" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x2F" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -53,36 +53,36 @@ <value value="0x0D" name="E4S_IO" cname="_OSC_ECIOSWPLL" /> <value value="0x0E" name="H4S" cname="_OSC_HSSWPLL" /> <value value="0x0F" name="EXTRC_IO" cname="_OSC_RCIO" /> - </tqmask> - <tqmask name="OSCSEN" value="0x20" > + </mask> + <mask name="OSCSEN" value="0x20" > <value value="0x00" name="On" cname="_OSCS_ON" /> <value value="0x20" name="Off" cname="_OSCS_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x02" > + </mask> + <mask name="BODEN" value="0x02" > <value value="0x00" name="Off" cname="_BOR_OFF" /> <value value="0x02" name="On" cname="_BOR_ON" /> - </tqmask> - <tqmask name="BORV" value="0x0C" > + </mask> + <mask name="BORV" value="0x0C" > <value value="0x00" name="4.5" cname="_BORV_45" /> <value value="0x04" name="4.2" cname="_BORV_42" /> <value value="0x08" name="2.7" cname="_BORV_27" /> <value value="0x0C" name="2.0" cname="_BORV_20" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -99,142 +99,142 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x83" > - <tqmask name="PM" value="0x03" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x83" > + <mask name="PM" value="0x03" > <value value="0x00" name="Extended microcontroller" cname="_MODE_EM" /> <value value="0x01" name="Microprocessor with boot" cname="_MODE_MPB" /> <value value="0x02" name="Microprocessor" cname="_MODE_MP" /> <value value="0x03" name="Microcontroller" cname="_MODE_MC" /> - </tqmask> - <tqmask name="WAIT" value="0x80" > + </mask> + <mask name="WAIT" value="0x80" > <value value="0x00" name="On" cname="_WAIT_ON" /> <value value="0x80" name="Off" cname="_WAIT_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x02" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x02" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RE7" cname="_CCP2MX_OFF" /> <value value="0x01" name="RC1" cname="_CCP2MX_ON" /> - </tqmask> - <tqmask name="ECCPMX" value="0x02" > + </mask> + <mask name="ECCPMX" value="0x02" > <value value="0x00" name="RH7-RH6" cname="_ECCPMX_PORTH" /> <value value="0x02" name="RE6-RE5" cname="_ECCPMX_PORTE" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVR_OFF" /> <value value="0x01" name="On" cname="_STVR_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" ctqmask="0x08" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" cmask="0x08" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800:3FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_CP2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" /> - </tqmask> - <tqmask name="CP_3" value="0x08" > + </mask> + <mask name="CP_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_CP3_ON" /> <value value="0x08" name="Off" cname="_CP3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" ctqmask="0x08" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" cmask="0x08" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800:3FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" /> - </tqmask> - <tqmask name="WRT_3" value="0x08" > + </mask> + <mask name="WRT_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_WRT3_ON" /> <value value="0x08" name="Off" cname="_WRT3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" ctqmask="0x08" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" cmask="0x08" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800:3FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" /> - </tqmask> - <tqmask name="EBTR_3" value="0x08" > + </mask> + <mask name="EBTR_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" /> <value value="0x08" name="Off" cname="_EBTR3_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F86J10.xml b/src/devices/pic/xml_data/18F86J10.xml index 1974a92..6cc1ec1 100644 --- a/src/devices/pic/xml_data/18F86J10.xml +++ b/src/devices/pic/xml_data/18F86J10.xml @@ -29,55 +29,55 @@ <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" > - <tqmask name="WDT" value="0x01" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="STVREN" value="0x20" > + </mask> + <mask name="STVREN" value="0x20" > <value value="0x00" name="Off" cname="" /> <value value="0x20" name="On" cname="" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="" /> <value value="0x40" name="On" cname="" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" > - <tqmask name="CP" value="0x04" > + <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" > + <mask name="CP" value="0x04" > <value value="0x00" name="All" cname="" /> <value value="0x04" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="FOSC" value="0x03" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" > + <mask name="FOSC" value="0x03" > <value value="0x00" name="HS" cname="" /> <value value="0x01" name="HSPLL" cname="" /> <value value="0x02" name="EC" cname="" /> <value value="0x03" name="ECPLL_IO" cname="" /> - </tqmask> - <tqmask name="FOSC2" value="0x04" > + </mask> + <mask name="FOSC2" value="0x04" > <value value="0x00" name="FOSC1:FOSC0" cname="" /> <value value="0x04" name="INTRC" cname="" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="On" cname="" /> <value value="0x40" name="Off" cname="" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDTPS" value="0x0F" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDTPS" value="0x0F" > <value value="0x00" name="1:1" cname="" /> <value value="0x01" name="1:2" cname="" /> <value value="0x02" name="1:4" cname="" /> @@ -94,45 +94,45 @@ <value value="0x0D" name="1:8192" cname="" /> <value value="0x0E" name="1:16384" cname="" /> <value value="0x0F" name="1:32768" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" > - <tqmask name="EASHFT" value="0x08" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" > + <mask name="EASHFT" value="0x08" > <value value="0x00" name="Off" cname="" /> <value value="0x08" name="On" cname="" /> - </tqmask> - <tqmask name="EMB" value="0x30" > + </mask> + <mask name="EMB" value="0x30" > <value value="0x00" name="20BIT" cname="" /> <value value="0x10" name="16BIT" cname="" /> <value value="0x20" name="12BIT" cname="" /> <value value="0x30" name="Disabled" cname="" /> - </tqmask> - <tqmask name="BW" value="0x40" > + </mask> + <mask name="BW" value="0x40" > <value value="0x00" name="8" cname="" /> <value value="0x40" name="16" cname="" /> - </tqmask> - <tqmask name="WAIT" value="0x80" > + </mask> + <mask name="WAIT" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x03" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="" /> <value value="0x01" name="RC1" cname="" /> - </tqmask> - <tqmask name="ECCPMX" value="0x02" > + </mask> + <mask name="ECCPMX" value="0x02" > <value value="0x00" name="RH7-RH4" cname="" /> <value value="0x02" name="RE6-RE3" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" > </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F86J11.xml b/src/devices/pic/xml_data/18F86J11.xml index 844b0e1..05e065e 100644 --- a/src/devices/pic/xml_data/18F86J11.xml +++ b/src/devices/pic/xml_data/18F86J11.xml @@ -30,55 +30,55 @@ <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" > - <tqmask name="WDT" value="0x01" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="STVREN" value="0x20" > + </mask> + <mask name="STVREN" value="0x20" > <value value="0x00" name="Off" cname="" /> <value value="0x20" name="On" cname="" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="" /> <value value="0x40" name="On" cname="" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" > - <tqmask name="CP" value="0x04" > + <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" > + <mask name="CP" value="0x04" > <value value="0x00" name="All" cname="" /> <value value="0x04" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="FOSC" value="0x03" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" > + <mask name="FOSC" value="0x03" > <value value="0x00" name="HS" cname="" /> <value value="0x01" name="HSPLL" cname="" /> <value value="0x02" name="EC" cname="" /> <value value="0x03" name="ECPLL_IO" cname="" /> - </tqmask> - <tqmask name="FOSC2" value="0x04" > + </mask> + <mask name="FOSC2" value="0x04" > <value value="0x00" name="FOSC1:FOSC0" cname="" /> <value value="0x04" name="INTRC" cname="" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="On" cname="" /> <value value="0x40" name="Off" cname="" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDTPS" value="0x0F" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDTPS" value="0x0F" > <value value="0x00" name="1:1" cname="" /> <value value="0x01" name="1:2" cname="" /> <value value="0x02" name="1:4" cname="" /> @@ -95,53 +95,53 @@ <value value="0x0D" name="1:8192" cname="" /> <value value="0x0E" name="1:16384" cname="" /> <value value="0x0F" name="1:32768" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" > - <tqmask name="EASHFT" value="0x08" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" > + <mask name="EASHFT" value="0x08" > <value value="0x00" name="Off" cname="" /> <value value="0x08" name="On" cname="" /> - </tqmask> - <tqmask name="EMB" value="0x30" > + </mask> + <mask name="EMB" value="0x30" > <value value="0x00" name="20BIT" cname="" /> <value value="0x10" name="16BIT" cname="" /> <value value="0x20" name="12BIT" cname="" /> <value value="0x30" name="Disabled" cname="" /> - </tqmask> - <tqmask name="BW" value="0x40" > + </mask> + <mask name="BW" value="0x40" > <value value="0x00" name="8" cname="" /> <value value="0x40" name="16" cname="" /> - </tqmask> - <tqmask name="WAIT" value="0x80" > + </mask> + <mask name="WAIT" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x0F" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="" /> <value value="0x01" name="RC1" cname="" /> - </tqmask> - <tqmask name="ECCPMX" value="0x02" > + </mask> + <mask name="ECCPMX" value="0x02" > <value value="0x00" name="RH7-RH4" cname="" /> <value value="0x02" name="RE6-RE3" cname="" /> - </tqmask> - <tqmask name="PMPMX" value="0x04" > + </mask> + <mask name="PMPMX" value="0x04" > <value value="0x00" name="NotConnected" cname="" /> <value value="0x04" name="Connected" cname="" /> - </tqmask> - <tqmask name="MSSPSEL" value="0x08" > + </mask> + <mask name="MSSPSEL" value="0x08" > <value value="0x00" name="5BIT" cname="" /> <value value="0x08" name="7BIT" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" > </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F86J15.xml b/src/devices/pic/xml_data/18F86J15.xml index e5f94df..bcebf10 100644 --- a/src/devices/pic/xml_data/18F86J15.xml +++ b/src/devices/pic/xml_data/18F86J15.xml @@ -29,55 +29,55 @@ <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" > - <tqmask name="WDT" value="0x01" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="STVREN" value="0x20" > + </mask> + <mask name="STVREN" value="0x20" > <value value="0x00" name="Off" cname="" /> <value value="0x20" name="On" cname="" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="" /> <value value="0x40" name="On" cname="" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" > - <tqmask name="CP" value="0x04" > + <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" > + <mask name="CP" value="0x04" > <value value="0x00" name="All" cname="" /> <value value="0x04" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="FOSC" value="0x03" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" > + <mask name="FOSC" value="0x03" > <value value="0x00" name="HS" cname="" /> <value value="0x01" name="HSPLL" cname="" /> <value value="0x02" name="EC" cname="" /> <value value="0x03" name="ECPLL_IO" cname="" /> - </tqmask> - <tqmask name="FOSC2" value="0x04" > + </mask> + <mask name="FOSC2" value="0x04" > <value value="0x00" name="FOSC1:FOSC0" cname="" /> <value value="0x04" name="INTRC" cname="" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="On" cname="" /> <value value="0x40" name="Off" cname="" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDTPS" value="0x0F" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDTPS" value="0x0F" > <value value="0x00" name="1:1" cname="" /> <value value="0x01" name="1:2" cname="" /> <value value="0x02" name="1:4" cname="" /> @@ -94,45 +94,45 @@ <value value="0x0D" name="1:8192" cname="" /> <value value="0x0E" name="1:16384" cname="" /> <value value="0x0F" name="1:32768" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" > - <tqmask name="EASHFT" value="0x08" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" > + <mask name="EASHFT" value="0x08" > <value value="0x00" name="Off" cname="" /> <value value="0x08" name="On" cname="" /> - </tqmask> - <tqmask name="EMB" value="0x30" > + </mask> + <mask name="EMB" value="0x30" > <value value="0x00" name="20BIT" cname="" /> <value value="0x10" name="16BIT" cname="" /> <value value="0x20" name="12BIT" cname="" /> <value value="0x30" name="Disabled" cname="" /> - </tqmask> - <tqmask name="BW" value="0x40" > + </mask> + <mask name="BW" value="0x40" > <value value="0x00" name="8" cname="" /> <value value="0x40" name="16" cname="" /> - </tqmask> - <tqmask name="WAIT" value="0x80" > + </mask> + <mask name="WAIT" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x03" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="" /> <value value="0x01" name="RC1" cname="" /> - </tqmask> - <tqmask name="ECCPMX" value="0x02" > + </mask> + <mask name="ECCPMX" value="0x02" > <value value="0x00" name="RH7-RH4" cname="" /> <value value="0x02" name="RE6-RE3" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" > </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F86J16.xml b/src/devices/pic/xml_data/18F86J16.xml index ce5d2c4..b06b858 100644 --- a/src/devices/pic/xml_data/18F86J16.xml +++ b/src/devices/pic/xml_data/18F86J16.xml @@ -29,55 +29,55 @@ <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" > - <tqmask name="WDT" value="0x01" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="STVREN" value="0x20" > + </mask> + <mask name="STVREN" value="0x20" > <value value="0x00" name="Off" cname="" /> <value value="0x20" name="On" cname="" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="" /> <value value="0x40" name="On" cname="" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" > - <tqmask name="CP" value="0x04" > + <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" > + <mask name="CP" value="0x04" > <value value="0x00" name="All" cname="" /> <value value="0x04" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="FOSC" value="0x03" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" > + <mask name="FOSC" value="0x03" > <value value="0x00" name="HS" cname="" /> <value value="0x01" name="HSPLL" cname="" /> <value value="0x02" name="EC" cname="" /> <value value="0x03" name="ECPLL_IO" cname="" /> - </tqmask> - <tqmask name="FOSC2" value="0x04" > + </mask> + <mask name="FOSC2" value="0x04" > <value value="0x00" name="FOSC1:FOSC0" cname="" /> <value value="0x04" name="INTRC" cname="" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="On" cname="" /> <value value="0x40" name="Off" cname="" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDTPS" value="0x0F" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDTPS" value="0x0F" > <value value="0x00" name="1:1" cname="" /> <value value="0x01" name="1:2" cname="" /> <value value="0x02" name="1:4" cname="" /> @@ -94,53 +94,53 @@ <value value="0x0D" name="1:8192" cname="" /> <value value="0x0E" name="1:16384" cname="" /> <value value="0x0F" name="1:32768" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" > - <tqmask name="EASHFT" value="0x08" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" > + <mask name="EASHFT" value="0x08" > <value value="0x00" name="Off" cname="" /> <value value="0x08" name="On" cname="" /> - </tqmask> - <tqmask name="EMB" value="0x30" > + </mask> + <mask name="EMB" value="0x30" > <value value="0x00" name="20BIT" cname="" /> <value value="0x10" name="16BIT" cname="" /> <value value="0x20" name="12BIT" cname="" /> <value value="0x30" name="Disabled" cname="" /> - </tqmask> - <tqmask name="BW" value="0x40" > + </mask> + <mask name="BW" value="0x40" > <value value="0x00" name="8" cname="" /> <value value="0x40" name="16" cname="" /> - </tqmask> - <tqmask name="WAIT" value="0x80" > + </mask> + <mask name="WAIT" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x0F" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="" /> <value value="0x01" name="RC1" cname="" /> - </tqmask> - <tqmask name="ECCPMX" value="0x02" > + </mask> + <mask name="ECCPMX" value="0x02" > <value value="0x00" name="RH7-RH4" cname="" /> <value value="0x02" name="RE6-RE3" cname="" /> - </tqmask> - <tqmask name="PMPMX" value="0x04" > + </mask> + <mask name="PMPMX" value="0x04" > <value value="0x00" name="NotConnected" cname="" /> <value value="0x04" name="Connected" cname="" /> - </tqmask> - <tqmask name="MSSPSEL" value="0x08" > + </mask> + <mask name="MSSPSEL" value="0x08" > <value value="0x00" name="5BIT" cname="" /> <value value="0x08" name="7BIT" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" > </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F86J50.xml b/src/devices/pic/xml_data/18F86J50.xml index 44acae5..fa67e08 100644 --- a/src/devices/pic/xml_data/18F86J50.xml +++ b/src/devices/pic/xml_data/18F86J50.xml @@ -29,16 +29,16 @@ <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xEF" > - <tqmask name="WDT" value="0x01" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xEF" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="STVREN" value="0x20" > + </mask> + <mask name="STVREN" value="0x20" > <value value="0x00" name="Off" cname="" /> <value value="0x20" name="On" cname="" /> - </tqmask> - <tqmask name="PLLDIV" value="0x0E" > + </mask> + <mask name="PLLDIV" value="0x0E" > <value value="0x00" name="12" cname="" /> <value value="0x02" name="10" cname="" /> <value value="0x04" name="6" cname="" /> @@ -47,47 +47,47 @@ <value value="0x0A" name="3" cname="" /> <value value="0x0C" name="2" cname="" /> <value value="0x0E" name="1" cname="" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="" /> <value value="0x40" name="On" cname="" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" > - <tqmask name="CP" value="0x04" > + <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" > + <mask name="CP" value="0x04" > <value value="0x00" name="All" cname="" /> <value value="0x04" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="FOSC" value="0x03" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" > + <mask name="FOSC" value="0x03" > <value value="0x00" name="HS" cname="" /> <value value="0x01" name="HSPLL" cname="" /> <value value="0x02" name="EC" cname="" /> <value value="0x03" name="ECPLL_IO" cname="" /> - </tqmask> - <tqmask name="FOSC2" value="0x04" > + </mask> + <mask name="FOSC2" value="0x04" > <value value="0x00" name="FOSC1:FOSC0" cname="" /> <value value="0x04" name="INTRC" cname="" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="On" cname="" /> <value value="0x40" name="Off" cname="" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDTPS" value="0x0F" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDTPS" value="0x0F" > <value value="0x00" name="1:1" cname="" /> <value value="0x01" name="1:2" cname="" /> <value value="0x02" name="1:4" cname="" /> @@ -104,53 +104,53 @@ <value value="0x0D" name="1:8192" cname="" /> <value value="0x0E" name="1:16384" cname="" /> <value value="0x0F" name="1:32768" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" > - <tqmask name="EASHFT" value="0x08" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" > + <mask name="EASHFT" value="0x08" > <value value="0x00" name="Off" cname="" /> <value value="0x08" name="On" cname="" /> - </tqmask> - <tqmask name="EMB" value="0x30" > + </mask> + <mask name="EMB" value="0x30" > <value value="0x00" name="20BIT" cname="" /> <value value="0x10" name="16BIT" cname="" /> <value value="0x20" name="12BIT" cname="" /> <value value="0x30" name="Disabled" cname="" /> - </tqmask> - <tqmask name="BW" value="0x40" > + </mask> + <mask name="BW" value="0x40" > <value value="0x00" name="8" cname="" /> <value value="0x40" name="16" cname="" /> - </tqmask> - <tqmask name="WAIT" value="0x80" > + </mask> + <mask name="WAIT" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x0F" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="" /> <value value="0x01" name="RC1" cname="" /> - </tqmask> - <tqmask name="ECCPMX" value="0x02" > + </mask> + <mask name="ECCPMX" value="0x02" > <value value="0x00" name="RH7-RH4" cname="" /> <value value="0x02" name="RE6-RE3" cname="" /> - </tqmask> - <tqmask name="PMPMX" value="0x04" > + </mask> + <mask name="PMPMX" value="0x04" > <value value="0x00" name="NotConnected" cname="" /> <value value="0x04" name="Connected" cname="" /> - </tqmask> - <tqmask name="MSSPSEL" value="0x08" > + </mask> + <mask name="MSSPSEL" value="0x08" > <value value="0x00" name="5BIT" cname="" /> <value value="0x08" name="7BIT" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" > </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F86J55.xml b/src/devices/pic/xml_data/18F86J55.xml index 1b9d553..9b29823 100644 --- a/src/devices/pic/xml_data/18F86J55.xml +++ b/src/devices/pic/xml_data/18F86J55.xml @@ -29,16 +29,16 @@ <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xEF" > - <tqmask name="WDT" value="0x01" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xEF" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="STVREN" value="0x20" > + </mask> + <mask name="STVREN" value="0x20" > <value value="0x00" name="Off" cname="" /> <value value="0x20" name="On" cname="" /> - </tqmask> - <tqmask name="PLLDIV" value="0x0E" > + </mask> + <mask name="PLLDIV" value="0x0E" > <value value="0x00" name="12" cname="" /> <value value="0x02" name="10" cname="" /> <value value="0x04" name="6" cname="" /> @@ -47,47 +47,47 @@ <value value="0x0A" name="3" cname="" /> <value value="0x0C" name="2" cname="" /> <value value="0x0E" name="1" cname="" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="" /> <value value="0x40" name="On" cname="" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" > - <tqmask name="CP" value="0x04" > + <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" > + <mask name="CP" value="0x04" > <value value="0x00" name="All" cname="" /> <value value="0x04" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="FOSC" value="0x03" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" > + <mask name="FOSC" value="0x03" > <value value="0x00" name="HS" cname="" /> <value value="0x01" name="HSPLL" cname="" /> <value value="0x02" name="EC" cname="" /> <value value="0x03" name="ECPLL_IO" cname="" /> - </tqmask> - <tqmask name="FOSC2" value="0x04" > + </mask> + <mask name="FOSC2" value="0x04" > <value value="0x00" name="FOSC1:FOSC0" cname="" /> <value value="0x04" name="INTRC" cname="" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="On" cname="" /> <value value="0x40" name="Off" cname="" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDTPS" value="0x0F" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDTPS" value="0x0F" > <value value="0x00" name="1:1" cname="" /> <value value="0x01" name="1:2" cname="" /> <value value="0x02" name="1:4" cname="" /> @@ -104,53 +104,53 @@ <value value="0x0D" name="1:8192" cname="" /> <value value="0x0E" name="1:16384" cname="" /> <value value="0x0F" name="1:32768" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" > - <tqmask name="EASHFT" value="0x08" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" > + <mask name="EASHFT" value="0x08" > <value value="0x00" name="Off" cname="" /> <value value="0x08" name="On" cname="" /> - </tqmask> - <tqmask name="EMB" value="0x30" > + </mask> + <mask name="EMB" value="0x30" > <value value="0x00" name="20BIT" cname="" /> <value value="0x10" name="16BIT" cname="" /> <value value="0x20" name="12BIT" cname="" /> <value value="0x30" name="Disabled" cname="" /> - </tqmask> - <tqmask name="BW" value="0x40" > + </mask> + <mask name="BW" value="0x40" > <value value="0x00" name="8" cname="" /> <value value="0x40" name="16" cname="" /> - </tqmask> - <tqmask name="WAIT" value="0x80" > + </mask> + <mask name="WAIT" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x0F" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="" /> <value value="0x01" name="RC1" cname="" /> - </tqmask> - <tqmask name="ECCPMX" value="0x02" > + </mask> + <mask name="ECCPMX" value="0x02" > <value value="0x00" name="RH7-RH4" cname="" /> <value value="0x02" name="RE6-RE3" cname="" /> - </tqmask> - <tqmask name="PMPMX" value="0x04" > + </mask> + <mask name="PMPMX" value="0x04" > <value value="0x00" name="NotConnected" cname="" /> <value value="0x04" name="Connected" cname="" /> - </tqmask> - <tqmask name="MSSPSEL" value="0x08" > + </mask> + <mask name="MSSPSEL" value="0x08" > <value value="0x00" name="5BIT" cname="" /> <value value="0x08" name="7BIT" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" > </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F86J60.xml b/src/devices/pic/xml_data/18F86J60.xml index 3fa4f03..42f3d20 100644 --- a/src/devices/pic/xml_data/18F86J60.xml +++ b/src/devices/pic/xml_data/18F86J60.xml @@ -32,55 +32,55 @@ <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" > - <tqmask name="WDT" value="0x01" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="STVREN" value="0x20" > + </mask> + <mask name="STVREN" value="0x20" > <value value="0x00" name="Off" cname="" /> <value value="0x20" name="On" cname="" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="" /> <value value="0x40" name="On" cname="" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" > - <tqmask name="CP" value="0x04" > + <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" > + <mask name="CP" value="0x04" > <value value="0x00" name="All" cname="" /> <value value="0x04" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="FOSC" value="0x03" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" > + <mask name="FOSC" value="0x03" > <value value="0x00" name="HS" cname="" /> <value value="0x01" name="HSPLL" cname="" /> <value value="0x02" name="EC" cname="" /> <value value="0x03" name="ECPLL_IO" cname="" /> - </tqmask> - <tqmask name="FOSC2" value="0x04" > + </mask> + <mask name="FOSC2" value="0x04" > <value value="0x00" name="FOSC1:FOSC0" cname="" /> <value value="0x04" name="INTRC" cname="" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="On" cname="" /> <value value="0x40" name="Off" cname="" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDTPS" value="0x0F" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDTPS" value="0x0F" > <value value="0x00" name="1:1" cname="" /> <value value="0x01" name="1:2" cname="" /> <value value="0x02" name="1:4" cname="" /> @@ -97,31 +97,31 @@ <value value="0x0D" name="1:8192" cname="" /> <value value="0x0E" name="1:16384" cname="" /> <value value="0x0F" name="1:32768" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="ETHLED" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x07" > + <mask name="ETHLED" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="ECCPMX" value="0x02" > + </mask> + <mask name="ECCPMX" value="0x02" > <value value="0x00" name="RH7-RH4" cname="" /> <value value="0x02" name="RE6-RE3" cname="" /> - </tqmask> - <tqmask name="CCP2MX" value="0x04" > + </mask> + <mask name="CCP2MX" value="0x04" > <value value="0x00" name="RE7" cname="" /> <value value="0x04" name="RC1" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" > </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F86J65.xml b/src/devices/pic/xml_data/18F86J65.xml index d482c93..c2cdf41 100644 --- a/src/devices/pic/xml_data/18F86J65.xml +++ b/src/devices/pic/xml_data/18F86J65.xml @@ -29,55 +29,55 @@ <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" > - <tqmask name="WDT" value="0x01" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="STVREN" value="0x20" > + </mask> + <mask name="STVREN" value="0x20" > <value value="0x00" name="Off" cname="" /> <value value="0x20" name="On" cname="" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="" /> <value value="0x40" name="On" cname="" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" > - <tqmask name="CP" value="0x04" > + <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" > + <mask name="CP" value="0x04" > <value value="0x00" name="All" cname="" /> <value value="0x04" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="FOSC" value="0x03" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" > + <mask name="FOSC" value="0x03" > <value value="0x00" name="HS" cname="" /> <value value="0x01" name="HSPLL" cname="" /> <value value="0x02" name="EC" cname="" /> <value value="0x03" name="ECPLL_IO" cname="" /> - </tqmask> - <tqmask name="FOSC2" value="0x04" > + </mask> + <mask name="FOSC2" value="0x04" > <value value="0x00" name="FOSC1:FOSC0" cname="" /> <value value="0x04" name="INTRC" cname="" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="On" cname="" /> <value value="0x40" name="Off" cname="" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDTPS" value="0x0F" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDTPS" value="0x0F" > <value value="0x00" name="1:1" cname="" /> <value value="0x01" name="1:2" cname="" /> <value value="0x02" name="1:4" cname="" /> @@ -94,31 +94,31 @@ <value value="0x0D" name="1:8192" cname="" /> <value value="0x0E" name="1:16384" cname="" /> <value value="0x0F" name="1:32768" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="ETHLED" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x07" > + <mask name="ETHLED" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="ECCPMX" value="0x02" > + </mask> + <mask name="ECCPMX" value="0x02" > <value value="0x00" name="RH7-RH4" cname="" /> <value value="0x02" name="RE6-RE3" cname="" /> - </tqmask> - <tqmask name="CCP2MX" value="0x04" > + </mask> + <mask name="CCP2MX" value="0x04" > <value value="0x00" name="RE7" cname="" /> <value value="0x04" name="RC1" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" > </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F8720.xml b/src/devices/pic/xml_data/18F8720.xml index 8905720..f634b25 100644 --- a/src/devices/pic/xml_data/18F8720.xml +++ b/src/devices/pic/xml_data/18F8720.xml @@ -37,17 +37,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x01FFFF" word_write_align="4" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" > - <tqmask name="FOSC" value="0x07" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" > + <mask name="FOSC" value="0x07" > <value value="0x00" name="LP" cname="_LP_OSC" /> <value value="0x01" name="XT" cname="_XT_OSC" /> <value value="0x02" name="HS" cname="_HS_OSC" /> @@ -56,36 +56,36 @@ <value value="0x05" name="EC_IO" cname="_ECIO_OSC" /> <value value="0x06" name="H4" cname="_HSPLL_OSC" /> <value value="0x07" name="EXTRC_IO" cname="_RCIO_OSC" /> - </tqmask> - <tqmask name="OSCSEN" value="0x20" > + </mask> + <mask name="OSCSEN" value="0x20" > <value value="0x00" name="On" cname="_OSCS_ON" /> <value value="0x20" name="Off" cname="_OSCS_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x02" > + </mask> + <mask name="BODEN" value="0x02" > <value value="0x00" name="Off" cname="_BOR_OFF" /> <value value="0x02" name="On" cname="_BOR_ON" /> - </tqmask> - <tqmask name="BORV" value="0x0C" > + </mask> + <mask name="BORV" value="0x0C" > <value value="0x00" name="4.5" cname="_BORV_45" /> <value value="0x04" name="4.2" cname="_BORV_42" /> <value value="0x08" name="2.7" cname="_BORV_27" /> <value value="0x0C" name="2.0" cname="_BORV_20" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x0E" > + </mask> + <mask name="WDTPS" value="0x0E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -94,182 +94,182 @@ <value value="0x0A" name="1:32" cname="_WDTPS_32" /> <value value="0x0C" name="1:64" cname="_WDTPS_64" /> <value value="0x0E" name="1:128" cname="_WDTPS_128" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x83" > - <tqmask name="PM" value="0x03" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x83" > + <mask name="PM" value="0x03" > <value value="0x00" name="Extended microcontroller" cname="_XMC_MODE" /> <value value="0x01" name="Microprocessor with boot" cname="_MPB_MODE" /> <value value="0x02" name="Microprocessor" cname="_MP_MODE" /> <value value="0x03" name="Microcontroller" cname="_MC_MODE" /> - </tqmask> - <tqmask name="WAIT" value="0x80" > + </mask> + <mask name="WAIT" value="0x80" > <value value="0x00" name="On" cname="_WAIT_ON" /> <value value="0x80" name="Off" cname="_WAIT_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RE7" cname="_CCP2MX_OFF" /> <value value="0x01" name="RC1" cname="_CCP2MX_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVR_OFF" /> <value value="0x01" name="On" cname="_STVR_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0xFF" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0xFF" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0200:3FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_CP2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" /> - </tqmask> - <tqmask name="CP_3" value="0x08" > + </mask> + <mask name="CP_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_CP3_ON" /> <value value="0x08" name="Off" cname="_CP3_OFF" /> - </tqmask> - <tqmask name="CP_4" value="0x10" > + </mask> + <mask name="CP_4" value="0x10" > <value value="0x00" name="10000:13FFF" cname="_CP4_ON" /> <value value="0x10" name="Off" cname="_CP4_OFF" /> - </tqmask> - <tqmask name="CP_5" value="0x20" > + </mask> + <mask name="CP_5" value="0x20" > <value value="0x00" name="14000:17FFF" cname="_CP5_ON" /> <value value="0x20" name="Off" cname="_CP5_OFF" /> - </tqmask> - <tqmask name="CP_6" value="0x40" > + </mask> + <mask name="CP_6" value="0x40" > <value value="0x00" name="18000:1BFFF" cname="_CP6_ON" /> <value value="0x40" name="Off" cname="_CP6_OFF" /> - </tqmask> - <tqmask name="CP_7" value="0x80" > + </mask> + <mask name="CP_7" value="0x80" > <value value="0x00" name="1C000:1FFFF" cname="_CP7_ON" /> <value value="0x80" name="Off" cname="_CP7_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0xFF" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0xFF" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0200:3FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" /> - </tqmask> - <tqmask name="WRT_3" value="0x08" > + </mask> + <mask name="WRT_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_WRT3_ON" /> <value value="0x08" name="Off" cname="_WRT3_OFF" /> - </tqmask> - <tqmask name="WRT_4" value="0x10" > + </mask> + <mask name="WRT_4" value="0x10" > <value value="0x00" name="10000:13FFF" cname="_WRT4_ON" /> <value value="0x10" name="Off" cname="_WRT4_OFF" /> - </tqmask> - <tqmask name="WRT_5" value="0x20" > + </mask> + <mask name="WRT_5" value="0x20" > <value value="0x00" name="14000:17FFF" cname="_WRT5_ON" /> <value value="0x20" name="Off" cname="_WRT5_OFF" /> - </tqmask> - <tqmask name="WRT_6" value="0x40" > + </mask> + <mask name="WRT_6" value="0x40" > <value value="0x00" name="18000:1BFFF" cname="_WRT6_ON" /> <value value="0x40" name="Off" cname="_WRT6_OFF" /> - </tqmask> - <tqmask name="WRT_7" value="0x80" > + </mask> + <mask name="WRT_7" value="0x80" > <value value="0x00" name="1C000:1FFFF" cname="_WRT7_ON" /> <value value="0x80" name="Off" cname="_WRT7_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="0000:01FF" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0xFF" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0xFF" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0200:3FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" /> - </tqmask> - <tqmask name="EBTR_3" value="0x08" > + </mask> + <mask name="EBTR_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" /> <value value="0x08" name="Off" cname="_EBTR3_OFF" /> - </tqmask> - <tqmask name="EBTR_4" value="0x10" > + </mask> + <mask name="EBTR_4" value="0x10" > <value value="0x00" name="10000:13FFF" cname="_EBTR4_ON" /> <value value="0x10" name="Off" cname="_EBTR4_OFF" /> - </tqmask> - <tqmask name="EBTR_5" value="0x20" > + </mask> + <mask name="EBTR_5" value="0x20" > <value value="0x00" name="14000:17FFF" cname="_EBTR5_ON" /> <value value="0x20" name="Off" cname="_EBTR5_OFF" /> - </tqmask> - <tqmask name="EBTR_6" value="0x40" > + </mask> + <mask name="EBTR_6" value="0x40" > <value value="0x00" name="18000:1BFFF" cname="_EBTR6_ON" /> <value value="0x40" name="Off" cname="_EBTR6_OFF" /> - </tqmask> - <tqmask name="EBTR_7" value="0x80" > + </mask> + <mask name="EBTR_7" value="0x80" > <value value="0x00" name="1C000:1FFFF" cname="_EBTR7_ON" /> <value value="0x80" name="Off" cname="_EBTR7_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="0000:07FF" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F8722.xml b/src/devices/pic/xml_data/18F8722.xml index 8cdffbb..3db0bbd 100644 --- a/src/devices/pic/xml_data/18F8722.xml +++ b/src/devices/pic/xml_data/18F8722.xml @@ -30,17 +30,17 @@ <!--* Memory ***************************************************************--> <memory name="code" start="0x000000" end="0x01FFFF" word_write_align="32" word_erase_align="32" /> - <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" /> + <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" /> <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <memory name="config" start="0x300000" end="0x30000D" /> <memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" /> <memory name="debug_vector" start="0x200028" end="0x200037" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" /> - <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FOSC" value="0x0F" > + <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" > + <mask name="FOSC" value="0x0F" > <value value="0x00" name="LP" cname="_OSC_LP" /> <value value="0x01" name="XT" cname="_OSC_XT" /> <value value="0x02" name="HS" cname="_OSC_HS" /> @@ -51,42 +51,42 @@ <value value="0x08" name="INTRC_IO" cname="_OSC_INTIO67" /> <value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" /> <value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="Off" cname="_FCMEN_OFF" /> <value value="0x40" name="On" cname="_FCMEN_ON" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" cname="_IESO_OFF" /> <value value="0x80" name="On" cname="_IESO_ON" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="PWRTE" value="0x01" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" > + <mask name="PWRTE" value="0x01" > <value value="0x00" name="On" cname="_PWRT_ON" /> <value value="0x01" name="Off" cname="_PWRT_OFF" /> - </tqmask> - <tqmask name="BODEN" value="0x06" > + </mask> + <mask name="BODEN" value="0x06" > <value value="0x00" name="Off" cname="_BOREN_OFF" /> <value value="0x02" name="Software" cname="_BOREN_ON" /> <value value="0x04" name="On_run" cname="_BOREN_NOSLP" /> <value value="0x06" name="On" cname="_BOREN_SBORDIS" /> - </tqmask> - <tqmask name="BORV" value="0x18" > + </mask> + <mask name="BORV" value="0x18" > <value value="0x00" name="4.5" cname="_BORV_0" /> <value value="0x08" name="4.2" cname="_BORV_1" /> <value value="0x10" name="2.7" cname="_BORV_2" /> <value value="0x18" name="2.0" cname="_BORV_3" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" > - <tqmask name="WDT" value="0x01" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="_WDT_OFF" /> <value value="0x01" name="On" cname="_WDT_ON" /> - </tqmask> - <tqmask name="WDTPS" value="0x1E" > + </mask> + <mask name="WDTPS" value="0x1E" > <value value="0x00" name="1:1" cname="_WDTPS_1" /> <value value="0x02" name="1:2" cname="_WDTPS_2" /> <value value="0x04" name="1:4" cname="_WDTPS_4" /> @@ -103,214 +103,214 @@ <value value="0x1A" name="1:8192" cname="_WDTPS_8192" /> <value value="0x1C" name="1:16384" cname="_WDTPS_16384" /> <value value="0x1E" name="1:32768" cname="_WDTPS_32768" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF3" > - <tqmask name="PM" value="0x03" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF3" > + <mask name="PM" value="0x03" > <value value="0x00" name="Extended microcontroller" cname="_MODE_EM" /> <value value="0x01" name="Microprocessor with boot" cname="_MODE_MPB" /> <value value="0x02" name="Microprocessor" cname="_MODE_MP" /> <value value="0x03" name="Microcontroller" cname="_MODE_MC" /> - </tqmask> - <tqmask name="ABW" value="0x30" > + </mask> + <mask name="ABW" value="0x30" > <value value="0x00" name="8" cname="_ADDRBW_ADDR8BIT" /> <value value="0x10" name="12" cname="_ADDRBW_ADDR12BIT" /> <value value="0x20" name="16" cname="_ADDRBW_ADDR16BIT" /> <value value="0x30" name="20" cname="_ADDRBW_ADDR20BIT" /> - </tqmask> - <tqmask name="BW" value="0x40" > + </mask> + <mask name="BW" value="0x40" > <value value="0x00" name="8" cname="_DATABW_DATA8BIT" /> <value value="0x40" name="16" cname="_DATABW_DATA16BIT" /> - </tqmask> - <tqmask name="WAIT" value="0x80" > + </mask> + <mask name="WAIT" value="0x80" > <value value="0x00" name="On" cname="_WAIT_ON" /> <value value="0x80" name="Off" cname="_WAIT_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x02" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x02" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" /> <value value="0x01" name="RC1" cname="_CCP2MX_PORTC" /> - </tqmask> - <tqmask name="ECCPMX" value="0x02" > + </mask> + <mask name="ECCPMX" value="0x02" > <value value="0x00" name="RH7-RH6" cname="_ECCPMX_PORTH" /> <value value="0x02" name="RE6-RE5" cname="_ECCPMX_PORTE" /> - </tqmask> - <tqmask name="LPT1OSC" value="0x04" > + </mask> + <mask name="LPT1OSC" value="0x04" > <value value="0x00" name="Off" cname="_LPT1OSC_OFF" /> <value value="0x04" name="On" cname="_LPT1OSC_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x80" > + </mask> + <mask name="MCLRE" value="0x80" > <value value="0x00" name="Internal" cname="_MCLRE_OFF" /> <value value="0x80" name="External" cname="_MCLRE_ON" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" > - <tqmask name="STVREN" value="0x01" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" > + <mask name="STVREN" value="0x01" > <value value="0x00" name="Off" cname="_STVREN_OFF" /> <value value="0x01" name="On" cname="_STVREN_ON" /> - </tqmask> - <tqmask name="LVP" value="0x04" > + </mask> + <mask name="LVP" value="0x04" > <value value="0x00" name="Off" cname="_LVP_OFF" /> <value value="0x04" name="On" cname="_LVP_ON" /> - </tqmask> - <tqmask name="BBSIZ" value="0x30" > + </mask> + <mask name="BBSIZ" value="0x30" > <value value="0x00" name="1024" cname="_BBSIZ_BB2K" /> <value value="0x10" name="2048" cname="_BBSIZ_BB4K" /> <value value="0x20" name="4096" cname="_BBSIZ_BB8K" /> <value value="0x30" name="4096" cname="_BBSIZ_BB8K" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="_XINST_OFF" /> <value value="0x40" name="On" cname="_XINST_ON" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="_DEBUG_ON" /> <value value="0x80" name="Off" cname="_DEBUG_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" /> + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" /> - <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0xFF" > - <tqmask name="CP_0" value="0x01" > + <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0xFF" > + <mask name="CP_0" value="0x01" > <value value="0x00" name="0800/1000/2000:3FFF" cname="_CP0_ON" /> <value value="0x01" name="Off" cname="_CP0_OFF" /> - </tqmask> - <tqmask name="CP_1" value="0x02" > + </mask> + <mask name="CP_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_CP1_ON" /> <value value="0x02" name="Off" cname="_CP1_OFF" /> - </tqmask> - <tqmask name="CP_2" value="0x04" > + </mask> + <mask name="CP_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_CP2_ON" /> <value value="0x04" name="Off" cname="_CP2_OFF" /> - </tqmask> - <tqmask name="CP_3" value="0x08" > + </mask> + <mask name="CP_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_CP3_ON" /> <value value="0x08" name="Off" cname="_CP3_OFF" /> - </tqmask> - <tqmask name="CP_4" value="0x10" > + </mask> + <mask name="CP_4" value="0x10" > <value value="0x00" name="10000:13FFF" cname="_CP4_ON" /> <value value="0x10" name="Off" cname="_CP4_OFF" /> - </tqmask> - <tqmask name="CP_5" value="0x20" > + </mask> + <mask name="CP_5" value="0x20" > <value value="0x00" name="14000:17FFF" cname="_CP5_ON" /> <value value="0x20" name="Off" cname="_CP5_OFF" /> - </tqmask> - <tqmask name="CP_6" value="0x40" > + </mask> + <mask name="CP_6" value="0x40" > <value value="0x00" name="18000:1BFFF" cname="_CP6_ON" /> <value value="0x40" name="Off" cname="_CP6_OFF" /> - </tqmask> - <tqmask name="CP_7" value="0x80" > + </mask> + <mask name="CP_7" value="0x80" > <value value="0x00" name="1C000:1FFFF" cname="_CP7_ON" /> <value value="0x80" name="Off" cname="_CP7_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" > - <tqmask name="CPB" value="0x40" > + <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" > + <mask name="CPB" value="0x40" > <value value="0x00" name="All" cname="_CPB_ON" /> <value value="0x40" name="Off" cname="_CPB_OFF" /> - </tqmask> - <tqmask name="CPD" value="0x80" > + </mask> + <mask name="CPD" value="0x80" > <value value="0x00" name="All" cname="_CPD_ON" /> <value value="0x80" name="Off" cname="_CPD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0xFF" > - <tqmask name="WRT_0" value="0x01" > + <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0xFF" > + <mask name="WRT_0" value="0x01" > <value value="0x00" name="0800/1000/2000:3FFF" cname="_WRT0_ON" /> <value value="0x01" name="Off" cname="_WRT0_OFF" /> - </tqmask> - <tqmask name="WRT_1" value="0x02" > + </mask> + <mask name="WRT_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_WRT1_ON" /> <value value="0x02" name="Off" cname="_WRT1_OFF" /> - </tqmask> - <tqmask name="WRT_2" value="0x04" > + </mask> + <mask name="WRT_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_WRT2_ON" /> <value value="0x04" name="Off" cname="_WRT2_OFF" /> - </tqmask> - <tqmask name="WRT_3" value="0x08" > + </mask> + <mask name="WRT_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_WRT3_ON" /> <value value="0x08" name="Off" cname="_WRT3_OFF" /> - </tqmask> - <tqmask name="WRT_4" value="0x10" > + </mask> + <mask name="WRT_4" value="0x10" > <value value="0x00" name="10000:13FFF" cname="_WRT4_ON" /> <value value="0x10" name="Off" cname="_WRT4_OFF" /> - </tqmask> - <tqmask name="WRT_5" value="0x20" > + </mask> + <mask name="WRT_5" value="0x20" > <value value="0x00" name="14000:17FFF" cname="_WRT5_ON" /> <value value="0x20" name="Off" cname="_WRT5_OFF" /> - </tqmask> - <tqmask name="WRT_6" value="0x40" > + </mask> + <mask name="WRT_6" value="0x40" > <value value="0x00" name="18000:1BFFF" cname="_WRT6_ON" /> <value value="0x40" name="Off" cname="_WRT6_OFF" /> - </tqmask> - <tqmask name="WRT_7" value="0x80" > + </mask> + <mask name="WRT_7" value="0x80" > <value value="0x00" name="1C000:1FFFF" cname="_WRT7_ON" /> <value value="0x80" name="Off" cname="_WRT7_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" > - <tqmask name="WRTC" value="0x20" > + <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" > + <mask name="WRTC" value="0x20" > <value value="0x00" name="All" cname="_WRTC_ON" /> <value value="0x20" name="Off" cname="_WRTC_OFF" /> - </tqmask> - <tqmask name="WRTB" value="0x40" > + </mask> + <mask name="WRTB" value="0x40" > <value value="0x00" name="All" cname="_WRTB_ON" /> <value value="0x40" name="Off" cname="_WRTB_OFF" /> - </tqmask> - <tqmask name="WRTD" value="0x80" > + </mask> + <mask name="WRTD" value="0x80" > <value value="0x00" name="All" cname="_WRTD_ON" /> <value value="0x80" name="Off" cname="_WRTD_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0xFF" > - <tqmask name="EBTR_0" value="0x01" > + <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0xFF" > + <mask name="EBTR_0" value="0x01" > <value value="0x00" name="0800/1000/2000:3FFF" cname="_EBTR0_ON" /> <value value="0x01" name="Off" cname="_EBTR0_OFF" /> - </tqmask> - <tqmask name="EBTR_1" value="0x02" > + </mask> + <mask name="EBTR_1" value="0x02" > <value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" /> <value value="0x02" name="Off" cname="_EBTR1_OFF" /> - </tqmask> - <tqmask name="EBTR_2" value="0x04" > + </mask> + <mask name="EBTR_2" value="0x04" > <value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" /> <value value="0x04" name="Off" cname="_EBTR2_OFF" /> - </tqmask> - <tqmask name="EBTR_3" value="0x08" > + </mask> + <mask name="EBTR_3" value="0x08" > <value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" /> <value value="0x08" name="Off" cname="_EBTR3_OFF" /> - </tqmask> - <tqmask name="EBTR_4" value="0x10" > + </mask> + <mask name="EBTR_4" value="0x10" > <value value="0x00" name="10000:13FFF" cname="_EBTR4_ON" /> <value value="0x10" name="Off" cname="_EBTR4_OFF" /> - </tqmask> - <tqmask name="EBTR_5" value="0x20" > + </mask> + <mask name="EBTR_5" value="0x20" > <value value="0x00" name="14000:17FFF" cname="_EBTR5_ON" /> <value value="0x20" name="Off" cname="_EBTR5_OFF" /> - </tqmask> - <tqmask name="EBTR_6" value="0x40" > + </mask> + <mask name="EBTR_6" value="0x40" > <value value="0x00" name="18000:1BFFF" cname="_EBTR6_ON" /> <value value="0x40" name="Off" cname="_EBTR6_OFF" /> - </tqmask> - <tqmask name="EBTR_7" value="0x80" > + </mask> + <mask name="EBTR_7" value="0x80" > <value value="0x00" name="1C000:1FFFF" cname="_EBTR7_ON" /> <value value="0x80" name="Off" cname="_EBTR7_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" > - <tqmask name="EBTRB" value="0x40" > + <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" > + <mask name="EBTRB" value="0x40" > <value value="0x00" name="All" cname="_EBTRB_ON" /> <value value="0x40" name="Off" cname="_EBTRB_OFF" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F87J10.xml b/src/devices/pic/xml_data/18F87J10.xml index d7790cb..bc21af2 100644 --- a/src/devices/pic/xml_data/18F87J10.xml +++ b/src/devices/pic/xml_data/18F87J10.xml @@ -29,55 +29,55 @@ <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xC1" > - <tqmask name="WDT" value="0x01" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xC1" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="STVREN" value="0x20" > + </mask> + <mask name="STVREN" value="0x20" > <value value="0x00" name="Off" cname="" /> <value value="0x20" name="On" cname="" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="" /> <value value="0x40" name="On" cname="" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" > - <tqmask name="CP" value="0x04" > + <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" > + <mask name="CP" value="0x04" > <value value="0x00" name="All" cname="" /> <value value="0x04" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="FOSC" value="0x03" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" > + <mask name="FOSC" value="0x03" > <value value="0x00" name="HS" cname="" /> <value value="0x01" name="HSPLL" cname="" /> <value value="0x02" name="EC" cname="" /> <value value="0x03" name="ECPLL_IO" cname="" /> - </tqmask> - <tqmask name="FOSC2" value="0x04" > + </mask> + <mask name="FOSC2" value="0x04" > <value value="0x00" name="FOSC1:FOSC0" cname="" /> <value value="0x04" name="INTRC" cname="" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="On" cname="" /> <value value="0x40" name="Off" cname="" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDTPS" value="0x0F" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDTPS" value="0x0F" > <value value="0x00" name="1:1" cname="" /> <value value="0x01" name="1:2" cname="" /> <value value="0x02" name="1:4" cname="" /> @@ -94,45 +94,45 @@ <value value="0x0D" name="1:8192" cname="" /> <value value="0x0E" name="1:16384" cname="" /> <value value="0x0F" name="1:32768" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" > - <tqmask name="EASHFT" value="0x08" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" > + <mask name="EASHFT" value="0x08" > <value value="0x00" name="Off" cname="" /> <value value="0x08" name="On" cname="" /> - </tqmask> - <tqmask name="EMB" value="0x30" > + </mask> + <mask name="EMB" value="0x30" > <value value="0x00" name="20BIT" cname="" /> <value value="0x10" name="16BIT" cname="" /> <value value="0x20" name="12BIT" cname="" /> <value value="0x30" name="Disabled" cname="" /> - </tqmask> - <tqmask name="BW" value="0x40" > + </mask> + <mask name="BW" value="0x40" > <value value="0x00" name="8" cname="" /> <value value="0x40" name="16" cname="" /> - </tqmask> - <tqmask name="WAIT" value="0x80" > + </mask> + <mask name="WAIT" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x03" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x03" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RE7" cname="" /> <value value="0x01" name="RC1" cname="" /> - </tqmask> - <tqmask name="ECCPMX" value="0x02" > + </mask> + <mask name="ECCPMX" value="0x02" > <value value="0x00" name="RH7-RH4" cname="" /> <value value="0x02" name="RE6-RE3" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" > </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F87J11.xml b/src/devices/pic/xml_data/18F87J11.xml index 495ecda..d3c84fb 100644 --- a/src/devices/pic/xml_data/18F87J11.xml +++ b/src/devices/pic/xml_data/18F87J11.xml @@ -29,55 +29,55 @@ <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" > - <tqmask name="WDT" value="0x01" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="STVREN" value="0x20" > + </mask> + <mask name="STVREN" value="0x20" > <value value="0x00" name="Off" cname="" /> <value value="0x20" name="On" cname="" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="" /> <value value="0x40" name="On" cname="" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" > - <tqmask name="CP" value="0x04" > + <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" > + <mask name="CP" value="0x04" > <value value="0x00" name="All" cname="" /> <value value="0x04" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="FOSC" value="0x03" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" > + <mask name="FOSC" value="0x03" > <value value="0x00" name="HS" cname="" /> <value value="0x01" name="HSPLL" cname="" /> <value value="0x02" name="EC" cname="" /> <value value="0x03" name="ECPLL_IO" cname="" /> - </tqmask> - <tqmask name="FOSC2" value="0x04" > + </mask> + <mask name="FOSC2" value="0x04" > <value value="0x00" name="FOSC1:FOSC0" cname="" /> <value value="0x04" name="INTRC" cname="" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="On" cname="" /> <value value="0x40" name="Off" cname="" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDTPS" value="0x0F" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDTPS" value="0x0F" > <value value="0x00" name="1:1" cname="" /> <value value="0x01" name="1:2" cname="" /> <value value="0x02" name="1:4" cname="" /> @@ -94,53 +94,53 @@ <value value="0x0D" name="1:8192" cname="" /> <value value="0x0E" name="1:16384" cname="" /> <value value="0x0F" name="1:32768" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" > - <tqmask name="EASHFT" value="0x08" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" > + <mask name="EASHFT" value="0x08" > <value value="0x00" name="Off" cname="" /> <value value="0x08" name="On" cname="" /> - </tqmask> - <tqmask name="EMB" value="0x30" > + </mask> + <mask name="EMB" value="0x30" > <value value="0x00" name="20BIT" cname="" /> <value value="0x10" name="16BIT" cname="" /> <value value="0x20" name="12BIT" cname="" /> <value value="0x30" name="Disabled" cname="" /> - </tqmask> - <tqmask name="BW" value="0x40" > + </mask> + <mask name="BW" value="0x40" > <value value="0x00" name="8" cname="" /> <value value="0x40" name="16" cname="" /> - </tqmask> - <tqmask name="WAIT" value="0x80" > + </mask> + <mask name="WAIT" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x0F" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="" /> <value value="0x01" name="RC1" cname="" /> - </tqmask> - <tqmask name="ECCPMX" value="0x02" > + </mask> + <mask name="ECCPMX" value="0x02" > <value value="0x00" name="RH7-RH4" cname="" /> <value value="0x02" name="RE6-RE3" cname="" /> - </tqmask> - <tqmask name="PMPMX" value="0x04" > + </mask> + <mask name="PMPMX" value="0x04" > <value value="0x00" name="NotConnected" cname="" /> <value value="0x04" name="Connected" cname="" /> - </tqmask> - <tqmask name="MSSPSEL" value="0x08" > + </mask> + <mask name="MSSPSEL" value="0x08" > <value value="0x00" name="5BIT" cname="" /> <value value="0x08" name="7BIT" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" > </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F87J50.xml b/src/devices/pic/xml_data/18F87J50.xml index 24207fe..1749435 100644 --- a/src/devices/pic/xml_data/18F87J50.xml +++ b/src/devices/pic/xml_data/18F87J50.xml @@ -29,16 +29,16 @@ <memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xEF" > - <tqmask name="WDT" value="0x01" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xEF" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="STVREN" value="0x20" > + </mask> + <mask name="STVREN" value="0x20" > <value value="0x00" name="Off" cname="" /> <value value="0x20" name="On" cname="" /> - </tqmask> - <tqmask name="PLLDIV" value="0x0E" > + </mask> + <mask name="PLLDIV" value="0x0E" > <value value="0x00" name="12" cname="" /> <value value="0x02" name="10" cname="" /> <value value="0x04" name="6" cname="" /> @@ -47,47 +47,47 @@ <value value="0x0A" name="3" cname="" /> <value value="0x0C" name="2" cname="" /> <value value="0x0E" name="1" cname="" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="" /> <value value="0x40" name="On" cname="" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" > - <tqmask name="CP" value="0x04" > + <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" > + <mask name="CP" value="0x04" > <value value="0x00" name="All" cname="" /> <value value="0x04" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="FOSC" value="0x03" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" > + <mask name="FOSC" value="0x03" > <value value="0x00" name="HS" cname="" /> <value value="0x01" name="HSPLL" cname="" /> <value value="0x02" name="EC" cname="" /> <value value="0x03" name="ECPLL_IO" cname="" /> - </tqmask> - <tqmask name="FOSC2" value="0x04" > + </mask> + <mask name="FOSC2" value="0x04" > <value value="0x00" name="FOSC1:FOSC0" cname="" /> <value value="0x04" name="INTRC" cname="" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="On" cname="" /> <value value="0x40" name="Off" cname="" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDTPS" value="0x0F" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDTPS" value="0x0F" > <value value="0x00" name="1:1" cname="" /> <value value="0x01" name="1:2" cname="" /> <value value="0x02" name="1:4" cname="" /> @@ -104,53 +104,53 @@ <value value="0x0D" name="1:8192" cname="" /> <value value="0x0E" name="1:16384" cname="" /> <value value="0x0F" name="1:32768" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" > - <tqmask name="EASHFT" value="0x08" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" > + <mask name="EASHFT" value="0x08" > <value value="0x00" name="Off" cname="" /> <value value="0x08" name="On" cname="" /> - </tqmask> - <tqmask name="EMB" value="0x30" > + </mask> + <mask name="EMB" value="0x30" > <value value="0x00" name="20BIT" cname="" /> <value value="0x10" name="16BIT" cname="" /> <value value="0x20" name="12BIT" cname="" /> <value value="0x30" name="Disabled" cname="" /> - </tqmask> - <tqmask name="BW" value="0x40" > + </mask> + <mask name="BW" value="0x40" > <value value="0x00" name="8" cname="" /> <value value="0x40" name="16" cname="" /> - </tqmask> - <tqmask name="WAIT" value="0x80" > + </mask> + <mask name="WAIT" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="CCP2MX" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x0F" > + <mask name="CCP2MX" value="0x01" > <value value="0x00" name="RB3" cname="" /> <value value="0x01" name="RC1" cname="" /> - </tqmask> - <tqmask name="ECCPMX" value="0x02" > + </mask> + <mask name="ECCPMX" value="0x02" > <value value="0x00" name="RH7-RH4" cname="" /> <value value="0x02" name="RE6-RE3" cname="" /> - </tqmask> - <tqmask name="PMPMX" value="0x04" > + </mask> + <mask name="PMPMX" value="0x04" > <value value="0x00" name="NotConnected" cname="" /> <value value="0x04" name="Connected" cname="" /> - </tqmask> - <tqmask name="MSSPSEL" value="0x08" > + </mask> + <mask name="MSSPSEL" value="0x08" > <value value="0x00" name="5BIT" cname="" /> <value value="0x08" name="7BIT" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" > </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F87J60.xml b/src/devices/pic/xml_data/18F87J60.xml index fcf788a..d101ed3 100644 --- a/src/devices/pic/xml_data/18F87J60.xml +++ b/src/devices/pic/xml_data/18F87J60.xml @@ -29,55 +29,55 @@ <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" > - <tqmask name="WDT" value="0x01" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="STVREN" value="0x20" > + </mask> + <mask name="STVREN" value="0x20" > <value value="0x00" name="Off" cname="" /> <value value="0x20" name="On" cname="" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="" /> <value value="0x40" name="On" cname="" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" > - <tqmask name="CP" value="0x04" > + <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" > + <mask name="CP" value="0x04" > <value value="0x00" name="0000:FFF7" cname="" /> <value value="0x04" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="FOSC" value="0x03" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" > + <mask name="FOSC" value="0x03" > <value value="0x00" name="HS" cname="" /> <value value="0x01" name="HSPLL" cname="" /> <value value="0x02" name="EC" cname="" /> <value value="0x03" name="ECPLL_IO" cname="" /> - </tqmask> - <tqmask name="FOSC2" value="0x04" > + </mask> + <mask name="FOSC2" value="0x04" > <value value="0x00" name="FOSC1:FOSC0" cname="" /> <value value="0x04" name="INTRC" cname="" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="On" cname="" /> <value value="0x40" name="Off" cname="" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDTPS" value="0x0F" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDTPS" value="0x0F" > <value value="0x00" name="1:1" cname="" /> <value value="0x01" name="1:2" cname="" /> <value value="0x02" name="1:4" cname="" /> @@ -94,31 +94,31 @@ <value value="0x0D" name="1:8192" cname="" /> <value value="0x0E" name="1:16384" cname="" /> <value value="0x0F" name="1:32768" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="ETHLED" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x07" > + <mask name="ETHLED" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="ECCPMX" value="0x02" > + </mask> + <mask name="ECCPMX" value="0x02" > <value value="0x00" name="RH7-RH4" cname="" /> <value value="0x02" name="RE6-RE3" cname="" /> - </tqmask> - <tqmask name="CCP2MX" value="0x04" > + </mask> + <mask name="CCP2MX" value="0x04" > <value value="0x00" name="RE7" cname="" /> <value value="0x04" name="RC1" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" > </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F96J60.xml b/src/devices/pic/xml_data/18F96J60.xml index 9b3dca7..655b586 100644 --- a/src/devices/pic/xml_data/18F96J60.xml +++ b/src/devices/pic/xml_data/18F96J60.xml @@ -29,55 +29,55 @@ <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" > - <tqmask name="WDT" value="0x01" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="STVREN" value="0x20" > + </mask> + <mask name="STVREN" value="0x20" > <value value="0x00" name="Off" cname="" /> <value value="0x20" name="On" cname="" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="" /> <value value="0x40" name="On" cname="" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" > - <tqmask name="CP" value="0x04" > + <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" > + <mask name="CP" value="0x04" > <value value="0x00" name="All" cname="" /> <value value="0x04" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="FOSC" value="0x03" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" > + <mask name="FOSC" value="0x03" > <value value="0x00" name="HS" cname="" /> <value value="0x01" name="HSPLL" cname="" /> <value value="0x02" name="EC" cname="" /> <value value="0x03" name="ECPLL_IO" cname="" /> - </tqmask> - <tqmask name="FOSC2" value="0x04" > + </mask> + <mask name="FOSC2" value="0x04" > <value value="0x00" name="FOSC1:FOSC0" cname="" /> <value value="0x04" name="INTRC" cname="" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="On" cname="" /> <value value="0x40" name="Off" cname="" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDTPS" value="0x0F" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDTPS" value="0x0F" > <value value="0x00" name="1:1" cname="" /> <value value="0x01" name="1:2" cname="" /> <value value="0x02" name="1:4" cname="" /> @@ -94,49 +94,49 @@ <value value="0x0D" name="1:8192" cname="" /> <value value="0x0E" name="1:16384" cname="" /> <value value="0x0F" name="1:32768" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" > - <tqmask name="WAIT" value="0x80" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" > + <mask name="WAIT" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> - <tqmask name="BW" value="0x40" > + </mask> + <mask name="BW" value="0x40" > <value value="0x00" name="8" cname="" /> <value value="0x40" name="16" cname="" /> - </tqmask> - <tqmask name="EMB" value="0x30" > + </mask> + <mask name="EMB" value="0x30" > <value value="0x00" name="Disabled" cname="" /> <value value="0x10" name="12BIT" cname="" /> <value value="0x20" name="16BIT" cname="" /> <value value="0x30" name="20BIT" cname="" /> - </tqmask> - <tqmask name="EASHFT" value="0x08" > + </mask> + <mask name="EASHFT" value="0x08" > <value value="0x00" name="Off" cname="" /> <value value="0x08" name="On" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="ETHLED" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x07" > + <mask name="ETHLED" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="ECCPMX" value="0x02" > + </mask> + <mask name="ECCPMX" value="0x02" > <value value="0x00" name="RH7-RH4" cname="" /> <value value="0x02" name="RE6-RE3" cname="" /> - </tqmask> - <tqmask name="CCP2MX" value="0x04" > + </mask> + <mask name="CCP2MX" value="0x04" > <value value="0x00" name="RE7" cname="" /> <value value="0x04" name="RC1" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" > </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F96J65.xml b/src/devices/pic/xml_data/18F96J65.xml index 678e2f3..a61bb94 100644 --- a/src/devices/pic/xml_data/18F96J65.xml +++ b/src/devices/pic/xml_data/18F96J65.xml @@ -29,55 +29,55 @@ <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" > - <tqmask name="WDT" value="0x01" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="STVREN" value="0x20" > + </mask> + <mask name="STVREN" value="0x20" > <value value="0x00" name="Off" cname="" /> <value value="0x20" name="On" cname="" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="" /> <value value="0x40" name="On" cname="" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" > - <tqmask name="CP" value="0x04" > + <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" > + <mask name="CP" value="0x04" > <value value="0x00" name="All" cname="" /> <value value="0x04" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="FOSC" value="0x03" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" > + <mask name="FOSC" value="0x03" > <value value="0x00" name="HS" cname="" /> <value value="0x01" name="HSPLL" cname="" /> <value value="0x02" name="EC" cname="" /> <value value="0x03" name="ECPLL_IO" cname="" /> - </tqmask> - <tqmask name="FOSC2" value="0x04" > + </mask> + <mask name="FOSC2" value="0x04" > <value value="0x00" name="FOSC1:FOSC0" cname="" /> <value value="0x04" name="INTRC" cname="" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="On" cname="" /> <value value="0x40" name="Off" cname="" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDTPS" value="0x0F" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDTPS" value="0x0F" > <value value="0x00" name="1:1" cname="" /> <value value="0x01" name="1:2" cname="" /> <value value="0x02" name="1:4" cname="" /> @@ -94,49 +94,49 @@ <value value="0x0D" name="1:8192" cname="" /> <value value="0x0E" name="1:16384" cname="" /> <value value="0x0F" name="1:32768" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" > - <tqmask name="WAIT" value="0x80" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" > + <mask name="WAIT" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> - <tqmask name="BW" value="0x40" > + </mask> + <mask name="BW" value="0x40" > <value value="0x00" name="8" cname="" /> <value value="0x40" name="16" cname="" /> - </tqmask> - <tqmask name="EMB" value="0x30" > + </mask> + <mask name="EMB" value="0x30" > <value value="0x00" name="Disabled" cname="" /> <value value="0x10" name="12BIT" cname="" /> <value value="0x20" name="16BIT" cname="" /> <value value="0x30" name="20BIT" cname="" /> - </tqmask> - <tqmask name="EASHFT" value="0x08" > + </mask> + <mask name="EASHFT" value="0x08" > <value value="0x00" name="Off" cname="" /> <value value="0x08" name="On" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="ETHLED" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x07" > + <mask name="ETHLED" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="ECCPMX" value="0x02" > + </mask> + <mask name="ECCPMX" value="0x02" > <value value="0x00" name="RH7-RH4" cname="" /> <value value="0x02" name="RE6-RE3" cname="" /> - </tqmask> - <tqmask name="CCP2MX" value="0x04" > + </mask> + <mask name="CCP2MX" value="0x04" > <value value="0x00" name="RE7" cname="" /> <value value="0x04" name="RC1" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" > </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/18F97J60.xml b/src/devices/pic/xml_data/18F97J60.xml index a47d6d1..ce570ba 100644 --- a/src/devices/pic/xml_data/18F97J60.xml +++ b/src/devices/pic/xml_data/18F97J60.xml @@ -29,55 +29,55 @@ <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" > - <tqmask name="WDT" value="0x01" > + <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" > + <mask name="WDT" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="STVREN" value="0x20" > + </mask> + <mask name="STVREN" value="0x20" > <value value="0x00" name="Off" cname="" /> <value value="0x20" name="On" cname="" /> - </tqmask> - <tqmask name="XINST" value="0x40" > + </mask> + <mask name="XINST" value="0x40" > <value value="0x00" name="Off" cname="" /> <value value="0x40" name="On" cname="" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" > - <tqmask name="CP" value="0x04" > + <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" > + <mask name="CP" value="0x04" > <value value="0x00" name="All" cname="" /> <value value="0x04" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="FOSC" value="0x03" > + <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" > + <mask name="FOSC" value="0x03" > <value value="0x00" name="HS" cname="" /> <value value="0x01" name="HSPLL" cname="" /> <value value="0x02" name="EC" cname="" /> <value value="0x03" name="ECPLL_IO" cname="" /> - </tqmask> - <tqmask name="FOSC2" value="0x04" > + </mask> + <mask name="FOSC2" value="0x04" > <value value="0x00" name="FOSC1:FOSC0" cname="" /> <value value="0x04" name="INTRC" cname="" /> - </tqmask> - <tqmask name="FCMEN" value="0x40" > + </mask> + <mask name="FCMEN" value="0x40" > <value value="0x00" name="On" cname="" /> <value value="0x40" name="Off" cname="" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WDTPS" value="0x0F" > + <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" > + <mask name="WDTPS" value="0x0F" > <value value="0x00" name="1:1" cname="" /> <value value="0x01" name="1:2" cname="" /> <value value="0x02" name="1:4" cname="" /> @@ -94,49 +94,49 @@ <value value="0x0D" name="1:8192" cname="" /> <value value="0x0E" name="1:16384" cname="" /> <value value="0x0F" name="1:32768" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" > - <tqmask name="WAIT" value="0x80" > + <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" > + <mask name="WAIT" value="0x80" > <value value="0x00" name="On" cname="" /> <value value="0x80" name="Off" cname="" /> - </tqmask> - <tqmask name="BW" value="0x40" > + </mask> + <mask name="BW" value="0x40" > <value value="0x00" name="8" cname="" /> <value value="0x40" name="16" cname="" /> - </tqmask> - <tqmask name="EMB" value="0x30" > + </mask> + <mask name="EMB" value="0x30" > <value value="0x00" name="Disabled" cname="" /> <value value="0x10" name="12BIT" cname="" /> <value value="0x20" name="16BIT" cname="" /> <value value="0x30" name="20BIT" cname="" /> - </tqmask> - <tqmask name="EASHFT" value="0x08" > + </mask> + <mask name="EASHFT" value="0x08" > <value value="0x00" name="Off" cname="" /> <value value="0x08" name="On" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="ETHLED" value="0x01" > + <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x07" > + <mask name="ETHLED" value="0x01" > <value value="0x00" name="Off" cname="" /> <value value="0x01" name="On" cname="" /> - </tqmask> - <tqmask name="ECCPMX" value="0x02" > + </mask> + <mask name="ECCPMX" value="0x02" > <value value="0x00" name="RH7-RH4" cname="" /> <value value="0x02" name="RE6-RE3" cname="" /> - </tqmask> - <tqmask name="CCP2MX" value="0x04" > + </mask> + <mask name="CCP2MX" value="0x04" > <value value="0x00" name="RE7" cname="" /> <value value="0x04" name="RC1" cname="" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" > </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/24FJ128GA006.xml b/src/devices/pic/xml_data/24FJ128GA006.xml index a68bc37..7f264b9 100644 --- a/src/devices/pic/xml_data/24FJ128GA006.xml +++ b/src/devices/pic/xml_data/24FJ128GA006.xml @@ -24,13 +24,13 @@ <memory name="code" start="0x000200" end="0x0157FB" /> <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0x0157FC" end="0x0157FF" /> -<!-- <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFFFF" /> --> +<!-- <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFFFF" /> --> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x8007EF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1" wtqmask="0xFFFFFF" bvalue="0x007DDF" > - <tqmask name="WDTPOST" value="0x00000F" > + <config offset="0x0" name="CONFIG1" wmask="0xFFFFFF" bvalue="0x007DDF" > + <mask name="WDTPOST" value="0x00000F" > <value value="0x000000" name="1:1" /> <value value="0x000001" name="1:2" /> <value value="0x000002" name="1:4" /> @@ -47,59 +47,59 @@ <value value="0x00000D" name="1:8192" /> <value value="0x00000E" name="1:16384" /> <value value="0x00000F" name="1:32768" /> - </tqmask> - <tqmask name="WDTPRE" value="0x000010" > + </mask> + <mask name="WDTPRE" value="0x000010" > <value value="0x000000" name="1:32" /> <value value="0x000010" name="1:128" /> - </tqmask> - <tqmask name="WINDIS" value="0x000040" > + </mask> + <mask name="WINDIS" value="0x000040" > <value value="0x000000" name="On" /> <value value="0x000040" name="Off" /> - </tqmask> - <tqmask name="FWDTEN" value="0x000080" > + </mask> + <mask name="FWDTEN" value="0x000080" > <value value="0x000000" name="Software" /> <value value="0x000080" name="On" /> - </tqmask> - <tqmask name="ICS" value="0x000100" > + </mask> + <mask name="ICS" value="0x000100" > <value value="0x000000" name="EMUC1, EMUD1" /> <value value="0x000100" name="EMUC2, EMUD2" /> - </tqmask> - <tqmask name="DEBUG" value="0x000800" > + </mask> + <mask name="DEBUG" value="0x000800" > <value value="0x000000" name="On" /> <value value="0x000800" name="Off" /> - </tqmask> - <tqmask name="GWRP" value="0x001000" > + </mask> + <mask name="GWRP" value="0x001000" > <value value="0x000000" name="All" /> <value value="0x001000" name="Off" /> - </tqmask> - <tqmask name="GCP" value="0x002000" > + </mask> + <mask name="GCP" value="0x002000" > <value value="0x000000" name="All" /> <value value="0x002000" name="Off" /> - </tqmask> - <tqmask name="JTAGEN" value="0x004000" > + </mask> + <mask name="JTAGEN" value="0x004000" > <value value="0x000000" name="Off" /> <value value="0x004000" name="On" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2" wtqmask="0xFFFFFF" bvalue="0x0087E3" > - <tqmask name="POSCMD" value="0x000003" > + <config offset="0x2" name="CONFIG2" wmask="0xFFFFFF" bvalue="0x0087E3" > + <mask name="POSCMD" value="0x000003" > <value value="0x000000" name="EC" /> <value value="0x000001" name="XT" /> <value value="0x000002" name="HS" /> <value value="0x000003" name="Off" /> - </tqmask> - <tqmask name="OSCIOFNC" value="0x000020" > + </mask> + <mask name="OSCIOFNC" value="0x000020" > <value value="0x000000" name="IO" /> <value value="0x000020" name="Clock" /> - </tqmask> - <tqmask name="FCKSM" value="0x0000C0" > + </mask> + <mask name="FCKSM" value="0x0000C0" > <value value="0x000000" name="Switching on, monitor on" /> <value value="0x000040" name="Switching on, monitor off" /> <value value="0x000080" name="Switching off, monitor off" /> <value value="0x0000C0" name="Switching off, monitor off" /> - </tqmask> - <tqmask name="FNOSC" value="0x000700" > + </mask> + <mask name="FNOSC" value="0x000700" > <value value="0x000000" name="EXTRC_F" /> <value value="0x000100" name="INTRC_F_PLL" /> <value value="0x000200" name="PRIM" /> @@ -108,11 +108,11 @@ <value value="0x000500" name="EXTRC_LP" /> <value value="0x000600" name="invalid" /> <value value="0x000700" name="INTRC_F_POST" /> - </tqmask> - <tqmask name="IESO" value="0x008000" > + </mask> + <mask name="IESO" value="0x008000" > <value value="0x000000" name="Off" /> <value value="0x008000" name="On" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/24FJ128GA008.xml b/src/devices/pic/xml_data/24FJ128GA008.xml index 14e4f29..b8d43d8 100644 --- a/src/devices/pic/xml_data/24FJ128GA008.xml +++ b/src/devices/pic/xml_data/24FJ128GA008.xml @@ -24,13 +24,13 @@ <memory name="code" start="0x000200" end="0x0157FB" /> <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0x0157FC" end="0x0157FF" /> -<!-- <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFFFF" /> --> +<!-- <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFFFF" /> --> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x8007EF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1" wtqmask="0xFFFFFF" bvalue="0x007DDF" > - <tqmask name="WDTPOST" value="0x00000F" > + <config offset="0x0" name="CONFIG1" wmask="0xFFFFFF" bvalue="0x007DDF" > + <mask name="WDTPOST" value="0x00000F" > <value value="0x000000" name="1:1" /> <value value="0x000001" name="1:2" /> <value value="0x000002" name="1:4" /> @@ -47,59 +47,59 @@ <value value="0x00000D" name="1:8192" /> <value value="0x00000E" name="1:16384" /> <value value="0x00000F" name="1:32768" /> - </tqmask> - <tqmask name="WDTPRE" value="0x000010" > + </mask> + <mask name="WDTPRE" value="0x000010" > <value value="0x000000" name="1:32" /> <value value="0x000010" name="1:128" /> - </tqmask> - <tqmask name="WINDIS" value="0x000040" > + </mask> + <mask name="WINDIS" value="0x000040" > <value value="0x000000" name="On" /> <value value="0x000040" name="Off" /> - </tqmask> - <tqmask name="FWDTEN" value="0x000080" > + </mask> + <mask name="FWDTEN" value="0x000080" > <value value="0x000000" name="Software" /> <value value="0x000080" name="On" /> - </tqmask> - <tqmask name="ICS" value="0x000100" > + </mask> + <mask name="ICS" value="0x000100" > <value value="0x000000" name="EMUC1, EMUD1" /> <value value="0x000100" name="EMUC2, EMUD2" /> - </tqmask> - <tqmask name="DEBUG" value="0x000800" > + </mask> + <mask name="DEBUG" value="0x000800" > <value value="0x000000" name="On" /> <value value="0x000800" name="Off" /> - </tqmask> - <tqmask name="GWRP" value="0x001000" > + </mask> + <mask name="GWRP" value="0x001000" > <value value="0x000000" name="All" /> <value value="0x001000" name="Off" /> - </tqmask> - <tqmask name="GCP" value="0x002000" > + </mask> + <mask name="GCP" value="0x002000" > <value value="0x000000" name="All" /> <value value="0x002000" name="Off" /> - </tqmask> - <tqmask name="JTAGEN" value="0x004000" > + </mask> + <mask name="JTAGEN" value="0x004000" > <value value="0x000000" name="Off" /> <value value="0x004000" name="On" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2" wtqmask="0xFFFFFF" bvalue="0x0087E3" > - <tqmask name="POSCMD" value="0x000003" > + <config offset="0x2" name="CONFIG2" wmask="0xFFFFFF" bvalue="0x0087E3" > + <mask name="POSCMD" value="0x000003" > <value value="0x000000" name="EC" /> <value value="0x000001" name="XT" /> <value value="0x000002" name="HS" /> <value value="0x000003" name="Off" /> - </tqmask> - <tqmask name="OSCIOFNC" value="0x000020" > + </mask> + <mask name="OSCIOFNC" value="0x000020" > <value value="0x000000" name="IO" /> <value value="0x000020" name="Clock" /> - </tqmask> - <tqmask name="FCKSM" value="0x0000C0" > + </mask> + <mask name="FCKSM" value="0x0000C0" > <value value="0x000000" name="Switching on, monitor on" /> <value value="0x000040" name="Switching on, monitor off" /> <value value="0x000080" name="Switching off, monitor off" /> <value value="0x0000C0" name="Switching off, monitor off" /> - </tqmask> - <tqmask name="FNOSC" value="0x000700" > + </mask> + <mask name="FNOSC" value="0x000700" > <value value="0x000000" name="EXTRC_F" /> <value value="0x000100" name="INTRC_F_PLL" /> <value value="0x000200" name="PRIM" /> @@ -108,11 +108,11 @@ <value value="0x000500" name="EXTRC_LP" /> <value value="0x000600" name="invalid" /> <value value="0x000700" name="INTRC_F_POST" /> - </tqmask> - <tqmask name="IESO" value="0x008000" > + </mask> + <mask name="IESO" value="0x008000" > <value value="0x000000" name="Off" /> <value value="0x008000" name="On" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/24FJ128GA010.xml b/src/devices/pic/xml_data/24FJ128GA010.xml index cb01c2d..d57c7ff 100644 --- a/src/devices/pic/xml_data/24FJ128GA010.xml +++ b/src/devices/pic/xml_data/24FJ128GA010.xml @@ -24,13 +24,13 @@ <memory name="code" start="0x000200" end="0x0157FB" /> <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0x0157FC" end="0x0157FF" /> -<!-- <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFFFF" /> --> +<!-- <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFFFF" /> --> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x8007EF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1" wtqmask="0xFFFFFF" bvalue="0x007DDF" > - <tqmask name="WDTPOST" value="0x00000F" > + <config offset="0x0" name="CONFIG1" wmask="0xFFFFFF" bvalue="0x007DDF" > + <mask name="WDTPOST" value="0x00000F" > <value value="0x000000" name="1:1" /> <value value="0x000001" name="1:2" /> <value value="0x000002" name="1:4" /> @@ -47,59 +47,59 @@ <value value="0x00000D" name="1:8192" /> <value value="0x00000E" name="1:16384" /> <value value="0x00000F" name="1:32768" /> - </tqmask> - <tqmask name="WDTPRE" value="0x000010" > + </mask> + <mask name="WDTPRE" value="0x000010" > <value value="0x000000" name="1:32" /> <value value="0x000010" name="1:128" /> - </tqmask> - <tqmask name="WINDIS" value="0x000040" > + </mask> + <mask name="WINDIS" value="0x000040" > <value value="0x000000" name="On" /> <value value="0x000040" name="Off" /> - </tqmask> - <tqmask name="FWDTEN" value="0x000080" > + </mask> + <mask name="FWDTEN" value="0x000080" > <value value="0x000000" name="Software" /> <value value="0x000080" name="On" /> - </tqmask> - <tqmask name="ICS" value="0x000100" > + </mask> + <mask name="ICS" value="0x000100" > <value value="0x000000" name="EMUC1, EMUD1" /> <value value="0x000100" name="EMUC2, EMUD2" /> - </tqmask> - <tqmask name="DEBUG" value="0x000800" > + </mask> + <mask name="DEBUG" value="0x000800" > <value value="0x000000" name="On" /> <value value="0x000800" name="Off" /> - </tqmask> - <tqmask name="GWRP" value="0x001000" > + </mask> + <mask name="GWRP" value="0x001000" > <value value="0x000000" name="All" /> <value value="0x001000" name="Off" /> - </tqmask> - <tqmask name="GCP" value="0x002000" > + </mask> + <mask name="GCP" value="0x002000" > <value value="0x000000" name="All" /> <value value="0x002000" name="Off" /> - </tqmask> - <tqmask name="JTAGEN" value="0x004000" > + </mask> + <mask name="JTAGEN" value="0x004000" > <value value="0x000000" name="Off" /> <value value="0x004000" name="On" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2" wtqmask="0xFFFFFF" bvalue="0x0087E3" > - <tqmask name="POSCMD" value="0x000003" > + <config offset="0x2" name="CONFIG2" wmask="0xFFFFFF" bvalue="0x0087E3" > + <mask name="POSCMD" value="0x000003" > <value value="0x000000" name="EC" /> <value value="0x000001" name="XT" /> <value value="0x000002" name="HS" /> <value value="0x000003" name="Off" /> - </tqmask> - <tqmask name="OSCIOFNC" value="0x000020" > + </mask> + <mask name="OSCIOFNC" value="0x000020" > <value value="0x000000" name="IO" /> <value value="0x000020" name="Clock" /> - </tqmask> - <tqmask name="FCKSM" value="0x0000C0" > + </mask> + <mask name="FCKSM" value="0x0000C0" > <value value="0x000000" name="Switching on, monitor on" /> <value value="0x000040" name="Switching on, monitor off" /> <value value="0x000080" name="Switching off, monitor off" /> <value value="0x0000C0" name="Switching off, monitor off" /> - </tqmask> - <tqmask name="FNOSC" value="0x000700" > + </mask> + <mask name="FNOSC" value="0x000700" > <value value="0x000000" name="EXTRC_F" /> <value value="0x000100" name="INTRC_F_PLL" /> <value value="0x000200" name="PRIM" /> @@ -108,11 +108,11 @@ <value value="0x000500" name="EXTRC_LP" /> <value value="0x000600" name="invalid" /> <value value="0x000700" name="INTRC_F_POST" /> - </tqmask> - <tqmask name="IESO" value="0x008000" > + </mask> + <mask name="IESO" value="0x008000" > <value value="0x000000" name="Off" /> <value value="0x008000" name="On" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/24FJ64GA002.xml b/src/devices/pic/xml_data/24FJ64GA002.xml index 90b9f05..e051b07 100644 --- a/src/devices/pic/xml_data/24FJ64GA002.xml +++ b/src/devices/pic/xml_data/24FJ64GA002.xml @@ -24,13 +24,13 @@ <memory name="code" start="0x000200" end="0x00ABFB" /> <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0x00ABFC" end="0x00ABFF" /> -<!-- <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFFFF" /> --> +<!-- <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFFFF" /> --> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x8007EF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1" wtqmask="0xFFFFFF" bvalue="0x007FDF" > - <tqmask name="WDTPOST" value="0x00000F" > + <config offset="0x0" name="CONFIG1" wmask="0xFFFFFF" bvalue="0x007FDF" > + <mask name="WDTPOST" value="0x00000F" > <value value="0x000000" name="1:1" /> <value value="0x000001" name="1:2" /> <value value="0x000002" name="1:4" /> @@ -47,69 +47,69 @@ <value value="0x00000D" name="1:8192" /> <value value="0x00000E" name="1:16384" /> <value value="0x00000F" name="1:32768" /> - </tqmask> - <tqmask name="WDTPRE" value="0x000010" > + </mask> + <mask name="WDTPRE" value="0x000010" > <value value="0x000000" name="1:32" /> <value value="0x000010" name="1:128" /> - </tqmask> - <tqmask name="WINDIS" value="0x000040" > + </mask> + <mask name="WINDIS" value="0x000040" > <value value="0x000000" name="On" /> <value value="0x000040" name="Off" /> - </tqmask> - <tqmask name="FWDTEN" value="0x000080" > + </mask> + <mask name="FWDTEN" value="0x000080" > <value value="0x000000" name="Software" /> <value value="0x000080" name="On" /> - </tqmask> - <tqmask name="ICS" value="0x000300" > + </mask> + <mask name="ICS" value="0x000300" > <value value="0x000000" name="invalid" /> <value value="0x000100" name="EMUC3, EMUD3" /> <value value="0x000200" name="EMUC2, EMUD2" /> <value value="0x000300" name="EMUC1, EMUD1" /> - </tqmask> - <tqmask name="DEBUG" value="0x000800" > + </mask> + <mask name="DEBUG" value="0x000800" > <value value="0x000000" name="On" /> <value value="0x000800" name="Off" /> - </tqmask> - <tqmask name="GWRP" value="0x001000" > + </mask> + <mask name="GWRP" value="0x001000" > <value value="0x000000" name="All" /> <value value="0x001000" name="Off" /> - </tqmask> - <tqmask name="GCP" value="0x002000" > + </mask> + <mask name="GCP" value="0x002000" > <value value="0x000000" name="All" /> <value value="0x002000" name="Off" /> - </tqmask> - <tqmask name="JTAGEN" value="0x004000" > + </mask> + <mask name="JTAGEN" value="0x004000" > <value value="0x000000" name="Off" /> <value value="0x004000" name="On" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2" wtqmask="0xFFFFFF" bvalue="0x0087F7" > - <tqmask name="POSCMD" value="0x000003" > + <config offset="0x2" name="CONFIG2" wmask="0xFFFFFF" bvalue="0x0087F7" > + <mask name="POSCMD" value="0x000003" > <value value="0x000000" name="EC" /> <value value="0x000001" name="XT" /> <value value="0x000002" name="HS" /> <value value="0x000003" name="Off" /> - </tqmask> - <tqmask name="I2C1SEL" value="0x000004" > + </mask> + <mask name="I2C1SEL" value="0x000004" > <value value="0x000000" name="Alternate" /> <value value="0x000004" name="Default" /> - </tqmask> - <tqmask name="IOL1WAY" value="0x000010" > + </mask> + <mask name="IOL1WAY" value="0x000010" > <value value="0x000000" name="Multiple reconfigurations" /> <value value="0x000010" name="One reconfiguration" /> - </tqmask> - <tqmask name="OSCIOFNC" value="0x000020" > + </mask> + <mask name="OSCIOFNC" value="0x000020" > <value value="0x000000" name="IO" /> <value value="0x000020" name="Clock" /> - </tqmask> - <tqmask name="FCKSM" value="0x0000C0" > + </mask> + <mask name="FCKSM" value="0x0000C0" > <value value="0x000000" name="Switching on, monitor on" /> <value value="0x000040" name="Switching on, monitor off" /> <value value="0x000080" name="Switching off, monitor off" /> <value value="0x0000C0" name="Switching off, monitor off" /> - </tqmask> - <tqmask name="FNOSC" value="0x000700" > + </mask> + <mask name="FNOSC" value="0x000700" > <value value="0x000000" name="EXTRC_F" /> <value value="0x000100" name="INTRC_F_PLL" /> <value value="0x000200" name="PRIM" /> @@ -118,11 +118,11 @@ <value value="0x000500" name="EXTRC_LP" /> <value value="0x000600" name="invalid" /> <value value="0x000700" name="INTRC_F_POST" /> - </tqmask> - <tqmask name="IESO" value="0x008000" > + </mask> + <mask name="IESO" value="0x008000" > <value value="0x000000" name="Off" /> <value value="0x008000" name="On" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/24FJ64GA004.xml b/src/devices/pic/xml_data/24FJ64GA004.xml index 8cda66c..c87748e 100644 --- a/src/devices/pic/xml_data/24FJ64GA004.xml +++ b/src/devices/pic/xml_data/24FJ64GA004.xml @@ -24,13 +24,13 @@ <memory name="code" start="0x000200" end="0x00ABFB" /> <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0x00ABFC" end="0x00ABFF" /> -<!-- <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFFFF" /> --> +<!-- <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFFFF" /> --> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x8007EF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1" wtqmask="0xFFFFFF" bvalue="0x007FDF" > - <tqmask name="WDTPOST" value="0x00000F" > + <config offset="0x0" name="CONFIG1" wmask="0xFFFFFF" bvalue="0x007FDF" > + <mask name="WDTPOST" value="0x00000F" > <value value="0x000000" name="1:1" /> <value value="0x000001" name="1:2" /> <value value="0x000002" name="1:4" /> @@ -47,69 +47,69 @@ <value value="0x00000D" name="1:8192" /> <value value="0x00000E" name="1:16384" /> <value value="0x00000F" name="1:32768" /> - </tqmask> - <tqmask name="WDTPRE" value="0x000010" > + </mask> + <mask name="WDTPRE" value="0x000010" > <value value="0x000000" name="1:32" /> <value value="0x000010" name="1:128" /> - </tqmask> - <tqmask name="WINDIS" value="0x000040" > + </mask> + <mask name="WINDIS" value="0x000040" > <value value="0x000000" name="On" /> <value value="0x000040" name="Off" /> - </tqmask> - <tqmask name="FWDTEN" value="0x000080" > + </mask> + <mask name="FWDTEN" value="0x000080" > <value value="0x000000" name="Software" /> <value value="0x000080" name="On" /> - </tqmask> - <tqmask name="ICS" value="0x000300" > + </mask> + <mask name="ICS" value="0x000300" > <value value="0x000000" name="invalid" /> <value value="0x000100" name="EMUC3, EMUD3" /> <value value="0x000200" name="EMUC2, EMUD2" /> <value value="0x000300" name="EMUC1, EMUD1" /> - </tqmask> - <tqmask name="DEBUG" value="0x000800" > + </mask> + <mask name="DEBUG" value="0x000800" > <value value="0x000000" name="On" /> <value value="0x000800" name="Off" /> - </tqmask> - <tqmask name="GWRP" value="0x001000" > + </mask> + <mask name="GWRP" value="0x001000" > <value value="0x000000" name="All" /> <value value="0x001000" name="Off" /> - </tqmask> - <tqmask name="GCP" value="0x002000" > + </mask> + <mask name="GCP" value="0x002000" > <value value="0x000000" name="All" /> <value value="0x002000" name="Off" /> - </tqmask> - <tqmask name="JTAGEN" value="0x004000" > + </mask> + <mask name="JTAGEN" value="0x004000" > <value value="0x000000" name="Off" /> <value value="0x004000" name="On" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2" wtqmask="0xFFFFFF" bvalue="0x0087F7" > - <tqmask name="POSCMD" value="0x000003" > + <config offset="0x2" name="CONFIG2" wmask="0xFFFFFF" bvalue="0x0087F7" > + <mask name="POSCMD" value="0x000003" > <value value="0x000000" name="EC" /> <value value="0x000001" name="XT" /> <value value="0x000002" name="HS" /> <value value="0x000003" name="Off" /> - </tqmask> - <tqmask name="I2C1SEL" value="0x000004" > + </mask> + <mask name="I2C1SEL" value="0x000004" > <value value="0x000000" name="Alternate" /> <value value="0x000004" name="Default" /> - </tqmask> - <tqmask name="IOL1WAY" value="0x000010" > + </mask> + <mask name="IOL1WAY" value="0x000010" > <value value="0x000000" name="Multiple reconfigurations" /> <value value="0x000010" name="One reconfiguration" /> - </tqmask> - <tqmask name="OSCIOFNC" value="0x000020" > + </mask> + <mask name="OSCIOFNC" value="0x000020" > <value value="0x000000" name="IO" /> <value value="0x000020" name="Clock" /> - </tqmask> - <tqmask name="FCKSM" value="0x0000C0" > + </mask> + <mask name="FCKSM" value="0x0000C0" > <value value="0x000000" name="Switching on, monitor on" /> <value value="0x000040" name="Switching on, monitor off" /> <value value="0x000080" name="Switching off, monitor off" /> <value value="0x0000C0" name="Switching off, monitor off" /> - </tqmask> - <tqmask name="FNOSC" value="0x000700" > + </mask> + <mask name="FNOSC" value="0x000700" > <value value="0x000000" name="EXTRC_F" /> <value value="0x000100" name="INTRC_F_PLL" /> <value value="0x000200" name="PRIM" /> @@ -118,11 +118,11 @@ <value value="0x000500" name="EXTRC_LP" /> <value value="0x000600" name="invalid" /> <value value="0x000700" name="INTRC_F_POST" /> - </tqmask> - <tqmask name="IESO" value="0x008000" > + </mask> + <mask name="IESO" value="0x008000" > <value value="0x000000" name="Off" /> <value value="0x008000" name="On" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/24FJ64GA006.xml b/src/devices/pic/xml_data/24FJ64GA006.xml index dab1819..6492f51 100644 --- a/src/devices/pic/xml_data/24FJ64GA006.xml +++ b/src/devices/pic/xml_data/24FJ64GA006.xml @@ -24,13 +24,13 @@ <memory name="code" start="0x000200" end="0x00ABFB" /> <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0x00ABFC" end="0x00ABFF" /> -<!-- <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFFFF" /> --> +<!-- <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFFFF" /> --> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x8007EF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1" wtqmask="0xFFFFFF" bvalue="0x007DDF" > - <tqmask name="WDTPOST" value="0x00000F" > + <config offset="0x0" name="CONFIG1" wmask="0xFFFFFF" bvalue="0x007DDF" > + <mask name="WDTPOST" value="0x00000F" > <value value="0x000000" name="1:1" /> <value value="0x000001" name="1:2" /> <value value="0x000002" name="1:4" /> @@ -47,59 +47,59 @@ <value value="0x00000D" name="1:8192" /> <value value="0x00000E" name="1:16384" /> <value value="0x00000F" name="1:32768" /> - </tqmask> - <tqmask name="WDTPRE" value="0x000010" > + </mask> + <mask name="WDTPRE" value="0x000010" > <value value="0x000000" name="1:32" /> <value value="0x000010" name="1:128" /> - </tqmask> - <tqmask name="WINDIS" value="0x000040" > + </mask> + <mask name="WINDIS" value="0x000040" > <value value="0x000000" name="On" /> <value value="0x000040" name="Off" /> - </tqmask> - <tqmask name="FWDTEN" value="0x000080" > + </mask> + <mask name="FWDTEN" value="0x000080" > <value value="0x000000" name="Software" /> <value value="0x000080" name="On" /> - </tqmask> - <tqmask name="ICS" value="0x000100" > + </mask> + <mask name="ICS" value="0x000100" > <value value="0x000000" name="EMUC1, EMUD1" /> <value value="0x000100" name="EMUC2, EMUD2" /> - </tqmask> - <tqmask name="DEBUG" value="0x000800" > + </mask> + <mask name="DEBUG" value="0x000800" > <value value="0x000000" name="On" /> <value value="0x000800" name="Off" /> - </tqmask> - <tqmask name="GWRP" value="0x001000" > + </mask> + <mask name="GWRP" value="0x001000" > <value value="0x000000" name="All" /> <value value="0x001000" name="Off" /> - </tqmask> - <tqmask name="GCP" value="0x002000" > + </mask> + <mask name="GCP" value="0x002000" > <value value="0x000000" name="All" /> <value value="0x002000" name="Off" /> - </tqmask> - <tqmask name="JTAGEN" value="0x004000" > + </mask> + <mask name="JTAGEN" value="0x004000" > <value value="0x000000" name="Off" /> <value value="0x004000" name="On" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2" wtqmask="0xFFFFFF" bvalue="0x0087E3" > - <tqmask name="POSCMD" value="0x000003" > + <config offset="0x2" name="CONFIG2" wmask="0xFFFFFF" bvalue="0x0087E3" > + <mask name="POSCMD" value="0x000003" > <value value="0x000000" name="EC" /> <value value="0x000001" name="XT" /> <value value="0x000002" name="HS" /> <value value="0x000003" name="Off" /> - </tqmask> - <tqmask name="OSCIOFNC" value="0x000020" > + </mask> + <mask name="OSCIOFNC" value="0x000020" > <value value="0x000000" name="IO" /> <value value="0x000020" name="Clock" /> - </tqmask> - <tqmask name="FCKSM" value="0x0000C0" > + </mask> + <mask name="FCKSM" value="0x0000C0" > <value value="0x000000" name="Switching on, monitor on" /> <value value="0x000040" name="Switching on, monitor off" /> <value value="0x000080" name="Switching off, monitor off" /> <value value="0x0000C0" name="Switching off, monitor off" /> - </tqmask> - <tqmask name="FNOSC" value="0x000700" > + </mask> + <mask name="FNOSC" value="0x000700" > <value value="0x000000" name="EXTRC_F" /> <value value="0x000100" name="INTRC_F_PLL" /> <value value="0x000200" name="PRIM" /> @@ -108,11 +108,11 @@ <value value="0x000500" name="EXTRC_LP" /> <value value="0x000600" name="invalid" /> <value value="0x000700" name="INTRC_F_POST" /> - </tqmask> - <tqmask name="IESO" value="0x008000" > + </mask> + <mask name="IESO" value="0x008000" > <value value="0x000000" name="Off" /> <value value="0x008000" name="On" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/24FJ64GA008.xml b/src/devices/pic/xml_data/24FJ64GA008.xml index 5149c82..2ead302 100644 --- a/src/devices/pic/xml_data/24FJ64GA008.xml +++ b/src/devices/pic/xml_data/24FJ64GA008.xml @@ -24,13 +24,13 @@ <memory name="code" start="0x000200" end="0x00ABFB" /> <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0x00ABFC" end="0x00ABFF" /> -<!-- <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFFFF" /> --> +<!-- <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFFFF" /> --> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x8007EF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1" wtqmask="0xFFFFFF" bvalue="0x007DDF" > - <tqmask name="WDTPOST" value="0x00000F" > + <config offset="0x0" name="CONFIG1" wmask="0xFFFFFF" bvalue="0x007DDF" > + <mask name="WDTPOST" value="0x00000F" > <value value="0x000000" name="1:1" /> <value value="0x000001" name="1:2" /> <value value="0x000002" name="1:4" /> @@ -47,59 +47,59 @@ <value value="0x00000D" name="1:8192" /> <value value="0x00000E" name="1:16384" /> <value value="0x00000F" name="1:32768" /> - </tqmask> - <tqmask name="WDTPRE" value="0x000010" > + </mask> + <mask name="WDTPRE" value="0x000010" > <value value="0x000000" name="1:32" /> <value value="0x000010" name="1:128" /> - </tqmask> - <tqmask name="WINDIS" value="0x000040" > + </mask> + <mask name="WINDIS" value="0x000040" > <value value="0x000000" name="On" /> <value value="0x000040" name="Off" /> - </tqmask> - <tqmask name="FWDTEN" value="0x000080" > + </mask> + <mask name="FWDTEN" value="0x000080" > <value value="0x000000" name="Software" /> <value value="0x000080" name="On" /> - </tqmask> - <tqmask name="ICS" value="0x000100" > + </mask> + <mask name="ICS" value="0x000100" > <value value="0x000000" name="EMUC1, EMUD1" /> <value value="0x000100" name="EMUC2, EMUD2" /> - </tqmask> - <tqmask name="DEBUG" value="0x000800" > + </mask> + <mask name="DEBUG" value="0x000800" > <value value="0x000000" name="On" /> <value value="0x000800" name="Off" /> - </tqmask> - <tqmask name="GWRP" value="0x001000" > + </mask> + <mask name="GWRP" value="0x001000" > <value value="0x000000" name="All" /> <value value="0x001000" name="Off" /> - </tqmask> - <tqmask name="GCP" value="0x002000" > + </mask> + <mask name="GCP" value="0x002000" > <value value="0x000000" name="All" /> <value value="0x002000" name="Off" /> - </tqmask> - <tqmask name="JTAGEN" value="0x004000" > + </mask> + <mask name="JTAGEN" value="0x004000" > <value value="0x000000" name="Off" /> <value value="0x004000" name="On" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2" wtqmask="0xFFFFFF" bvalue="0x0087E3" > - <tqmask name="POSCMD" value="0x000003" > + <config offset="0x2" name="CONFIG2" wmask="0xFFFFFF" bvalue="0x0087E3" > + <mask name="POSCMD" value="0x000003" > <value value="0x000000" name="EC" /> <value value="0x000001" name="XT" /> <value value="0x000002" name="HS" /> <value value="0x000003" name="Off" /> - </tqmask> - <tqmask name="OSCIOFNC" value="0x000020" > + </mask> + <mask name="OSCIOFNC" value="0x000020" > <value value="0x000000" name="IO" /> <value value="0x000020" name="Clock" /> - </tqmask> - <tqmask name="FCKSM" value="0x0000C0" > + </mask> + <mask name="FCKSM" value="0x0000C0" > <value value="0x000000" name="Switching on, monitor on" /> <value value="0x000040" name="Switching on, monitor off" /> <value value="0x000080" name="Switching off, monitor off" /> <value value="0x0000C0" name="Switching off, monitor off" /> - </tqmask> - <tqmask name="FNOSC" value="0x000700" > + </mask> + <mask name="FNOSC" value="0x000700" > <value value="0x000000" name="EXTRC_F" /> <value value="0x000100" name="INTRC_F_PLL" /> <value value="0x000200" name="PRIM" /> @@ -108,11 +108,11 @@ <value value="0x000500" name="EXTRC_LP" /> <value value="0x000600" name="invalid" /> <value value="0x000700" name="INTRC_F_POST" /> - </tqmask> - <tqmask name="IESO" value="0x008000" > + </mask> + <mask name="IESO" value="0x008000" > <value value="0x000000" name="Off" /> <value value="0x008000" name="On" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/24FJ64GA010.xml b/src/devices/pic/xml_data/24FJ64GA010.xml index 43f2806..627da04 100644 --- a/src/devices/pic/xml_data/24FJ64GA010.xml +++ b/src/devices/pic/xml_data/24FJ64GA010.xml @@ -24,13 +24,13 @@ <memory name="code" start="0x000200" end="0x00ABFB" /> <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0x00ABFC" end="0x00ABFF" /> -<!-- <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFFFF" /> --> +<!-- <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFFFF" /> --> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x8007EF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1" wtqmask="0xFFFFFF" bvalue="0x007DDF" > - <tqmask name="WDTPOST" value="0x00000F" > + <config offset="0x0" name="CONFIG1" wmask="0xFFFFFF" bvalue="0x007DDF" > + <mask name="WDTPOST" value="0x00000F" > <value value="0x000000" name="1:1" /> <value value="0x000001" name="1:2" /> <value value="0x000002" name="1:4" /> @@ -47,59 +47,59 @@ <value value="0x00000D" name="1:8192" /> <value value="0x00000E" name="1:16384" /> <value value="0x00000F" name="1:32768" /> - </tqmask> - <tqmask name="WDTPRE" value="0x000010" > + </mask> + <mask name="WDTPRE" value="0x000010" > <value value="0x000000" name="1:32" /> <value value="0x000010" name="1:128" /> - </tqmask> - <tqmask name="WINDIS" value="0x000040" > + </mask> + <mask name="WINDIS" value="0x000040" > <value value="0x000000" name="On" /> <value value="0x000040" name="Off" /> - </tqmask> - <tqmask name="FWDTEN" value="0x000080" > + </mask> + <mask name="FWDTEN" value="0x000080" > <value value="0x000000" name="Software" /> <value value="0x000080" name="On" /> - </tqmask> - <tqmask name="ICS" value="0x000100" > + </mask> + <mask name="ICS" value="0x000100" > <value value="0x000000" name="EMUC1, EMUD1" /> <value value="0x000100" name="EMUC2, EMUD2" /> - </tqmask> - <tqmask name="DEBUG" value="0x000800" > + </mask> + <mask name="DEBUG" value="0x000800" > <value value="0x000000" name="On" /> <value value="0x000800" name="Off" /> - </tqmask> - <tqmask name="GWRP" value="0x001000" > + </mask> + <mask name="GWRP" value="0x001000" > <value value="0x000000" name="All" /> <value value="0x001000" name="Off" /> - </tqmask> - <tqmask name="GCP" value="0x002000" > + </mask> + <mask name="GCP" value="0x002000" > <value value="0x000000" name="All" /> <value value="0x002000" name="Off" /> - </tqmask> - <tqmask name="JTAGEN" value="0x004000" > + </mask> + <mask name="JTAGEN" value="0x004000" > <value value="0x000000" name="Off" /> <value value="0x004000" name="On" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2" wtqmask="0xFFFFFF" bvalue="0x0087E3" > - <tqmask name="POSCMD" value="0x000003" > + <config offset="0x2" name="CONFIG2" wmask="0xFFFFFF" bvalue="0x0087E3" > + <mask name="POSCMD" value="0x000003" > <value value="0x000000" name="EC" /> <value value="0x000001" name="XT" /> <value value="0x000002" name="HS" /> <value value="0x000003" name="Off" /> - </tqmask> - <tqmask name="OSCIOFNC" value="0x000020" > + </mask> + <mask name="OSCIOFNC" value="0x000020" > <value value="0x000000" name="IO" /> <value value="0x000020" name="Clock" /> - </tqmask> - <tqmask name="FCKSM" value="0x0000C0" > + </mask> + <mask name="FCKSM" value="0x0000C0" > <value value="0x000000" name="Switching on, monitor on" /> <value value="0x000040" name="Switching on, monitor off" /> <value value="0x000080" name="Switching off, monitor off" /> <value value="0x0000C0" name="Switching off, monitor off" /> - </tqmask> - <tqmask name="FNOSC" value="0x000700" > + </mask> + <mask name="FNOSC" value="0x000700" > <value value="0x000000" name="EXTRC_F" /> <value value="0x000100" name="INTRC_F_PLL" /> <value value="0x000200" name="PRIM" /> @@ -108,11 +108,11 @@ <value value="0x000500" name="EXTRC_LP" /> <value value="0x000600" name="invalid" /> <value value="0x000700" name="INTRC_F_POST" /> - </tqmask> - <tqmask name="IESO" value="0x008000" > + </mask> + <mask name="IESO" value="0x008000" > <value value="0x000000" name="Off" /> <value value="0x008000" name="On" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/24FJ96GA006.xml b/src/devices/pic/xml_data/24FJ96GA006.xml index 2b17512..9f02be4 100644 --- a/src/devices/pic/xml_data/24FJ96GA006.xml +++ b/src/devices/pic/xml_data/24FJ96GA006.xml @@ -24,13 +24,13 @@ <memory name="code" start="0x000200" end="0x00FFFB" /> <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0x00FFFC" end="0x00FFFF" /> -<!-- <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFFFF" /> --> +<!-- <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFFFF" /> --> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x8007EF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1" wtqmask="0xFFFFFF" bvalue="0x007DDF" > - <tqmask name="WDTPOST" value="0x00000F" > + <config offset="0x0" name="CONFIG1" wmask="0xFFFFFF" bvalue="0x007DDF" > + <mask name="WDTPOST" value="0x00000F" > <value value="0x000000" name="1:1" /> <value value="0x000001" name="1:2" /> <value value="0x000002" name="1:4" /> @@ -47,59 +47,59 @@ <value value="0x00000D" name="1:8192" /> <value value="0x00000E" name="1:16384" /> <value value="0x00000F" name="1:32768" /> - </tqmask> - <tqmask name="WDTPRE" value="0x000010" > + </mask> + <mask name="WDTPRE" value="0x000010" > <value value="0x000000" name="1:32" /> <value value="0x000010" name="1:128" /> - </tqmask> - <tqmask name="WINDIS" value="0x000040" > + </mask> + <mask name="WINDIS" value="0x000040" > <value value="0x000000" name="On" /> <value value="0x000040" name="Off" /> - </tqmask> - <tqmask name="FWDTEN" value="0x000080" > + </mask> + <mask name="FWDTEN" value="0x000080" > <value value="0x000000" name="Software" /> <value value="0x000080" name="On" /> - </tqmask> - <tqmask name="ICS" value="0x000100" > + </mask> + <mask name="ICS" value="0x000100" > <value value="0x000000" name="EMUC1, EMUD1" /> <value value="0x000100" name="EMUC2, EMUD2" /> - </tqmask> - <tqmask name="DEBUG" value="0x000800" > + </mask> + <mask name="DEBUG" value="0x000800" > <value value="0x000000" name="On" /> <value value="0x000800" name="Off" /> - </tqmask> - <tqmask name="GWRP" value="0x001000" > + </mask> + <mask name="GWRP" value="0x001000" > <value value="0x000000" name="All" /> <value value="0x001000" name="Off" /> - </tqmask> - <tqmask name="GCP" value="0x002000" > + </mask> + <mask name="GCP" value="0x002000" > <value value="0x000000" name="All" /> <value value="0x002000" name="Off" /> - </tqmask> - <tqmask name="JTAGEN" value="0x004000" > + </mask> + <mask name="JTAGEN" value="0x004000" > <value value="0x000000" name="Off" /> <value value="0x004000" name="On" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2" wtqmask="0xFFFFFF" bvalue="0x0087E3" > - <tqmask name="POSCMD" value="0x000003" > + <config offset="0x2" name="CONFIG2" wmask="0xFFFFFF" bvalue="0x0087E3" > + <mask name="POSCMD" value="0x000003" > <value value="0x000000" name="EC" /> <value value="0x000001" name="XT" /> <value value="0x000002" name="HS" /> <value value="0x000003" name="Off" /> - </tqmask> - <tqmask name="OSCIOFNC" value="0x000020" > + </mask> + <mask name="OSCIOFNC" value="0x000020" > <value value="0x000000" name="IO" /> <value value="0x000020" name="Clock" /> - </tqmask> - <tqmask name="FCKSM" value="0x0000C0" > + </mask> + <mask name="FCKSM" value="0x0000C0" > <value value="0x000000" name="Switching on, monitor on" /> <value value="0x000040" name="Switching on, monitor off" /> <value value="0x000080" name="Switching off, monitor off" /> <value value="0x0000C0" name="Switching off, monitor off" /> - </tqmask> - <tqmask name="FNOSC" value="0x000700" > + </mask> + <mask name="FNOSC" value="0x000700" > <value value="0x000000" name="EXTRC_F" /> <value value="0x000100" name="INTRC_F_PLL" /> <value value="0x000200" name="PRIM" /> @@ -108,11 +108,11 @@ <value value="0x000500" name="EXTRC_LP" /> <value value="0x000600" name="invalid" /> <value value="0x000700" name="INTRC_F_POST" /> - </tqmask> - <tqmask name="IESO" value="0x008000" > + </mask> + <mask name="IESO" value="0x008000" > <value value="0x000000" name="Off" /> <value value="0x008000" name="On" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/24FJ96GA008.xml b/src/devices/pic/xml_data/24FJ96GA008.xml index ee3212e..eeba6d2 100644 --- a/src/devices/pic/xml_data/24FJ96GA008.xml +++ b/src/devices/pic/xml_data/24FJ96GA008.xml @@ -24,13 +24,13 @@ <memory name="code" start="0x000200" end="0x00FFFB" /> <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0x00FFFC" end="0x00FFFF" /> -<!-- <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFFFF" /> --> +<!-- <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFFFF" /> --> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x8007EF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1" wtqmask="0xFFFFFF" bvalue="0x007DDF" > - <tqmask name="WDTPOST" value="0x00000F" > + <config offset="0x0" name="CONFIG1" wmask="0xFFFFFF" bvalue="0x007DDF" > + <mask name="WDTPOST" value="0x00000F" > <value value="0x000000" name="1:1" /> <value value="0x000001" name="1:2" /> <value value="0x000002" name="1:4" /> @@ -47,59 +47,59 @@ <value value="0x00000D" name="1:8192" /> <value value="0x00000E" name="1:16384" /> <value value="0x00000F" name="1:32768" /> - </tqmask> - <tqmask name="WDTPRE" value="0x000010" > + </mask> + <mask name="WDTPRE" value="0x000010" > <value value="0x000000" name="1:32" /> <value value="0x000010" name="1:128" /> - </tqmask> - <tqmask name="WINDIS" value="0x000040" > + </mask> + <mask name="WINDIS" value="0x000040" > <value value="0x000000" name="On" /> <value value="0x000040" name="Off" /> - </tqmask> - <tqmask name="FWDTEN" value="0x000080" > + </mask> + <mask name="FWDTEN" value="0x000080" > <value value="0x000000" name="Software" /> <value value="0x000080" name="On" /> - </tqmask> - <tqmask name="ICS" value="0x000100" > + </mask> + <mask name="ICS" value="0x000100" > <value value="0x000000" name="EMUC1, EMUD1" /> <value value="0x000100" name="EMUC2, EMUD2" /> - </tqmask> - <tqmask name="DEBUG" value="0x000800" > + </mask> + <mask name="DEBUG" value="0x000800" > <value value="0x000000" name="On" /> <value value="0x000800" name="Off" /> - </tqmask> - <tqmask name="GWRP" value="0x001000" > + </mask> + <mask name="GWRP" value="0x001000" > <value value="0x000000" name="All" /> <value value="0x001000" name="Off" /> - </tqmask> - <tqmask name="GCP" value="0x002000" > + </mask> + <mask name="GCP" value="0x002000" > <value value="0x000000" name="All" /> <value value="0x002000" name="Off" /> - </tqmask> - <tqmask name="JTAGEN" value="0x004000" > + </mask> + <mask name="JTAGEN" value="0x004000" > <value value="0x000000" name="Off" /> <value value="0x004000" name="On" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2" wtqmask="0xFFFFFF" bvalue="0x0087E3" > - <tqmask name="POSCMD" value="0x000003" > + <config offset="0x2" name="CONFIG2" wmask="0xFFFFFF" bvalue="0x0087E3" > + <mask name="POSCMD" value="0x000003" > <value value="0x000000" name="EC" /> <value value="0x000001" name="XT" /> <value value="0x000002" name="HS" /> <value value="0x000003" name="Off" /> - </tqmask> - <tqmask name="OSCIOFNC" value="0x000020" > + </mask> + <mask name="OSCIOFNC" value="0x000020" > <value value="0x000000" name="IO" /> <value value="0x000020" name="Clock" /> - </tqmask> - <tqmask name="FCKSM" value="0x0000C0" > + </mask> + <mask name="FCKSM" value="0x0000C0" > <value value="0x000000" name="Switching on, monitor on" /> <value value="0x000040" name="Switching on, monitor off" /> <value value="0x000080" name="Switching off, monitor off" /> <value value="0x0000C0" name="Switching off, monitor off" /> - </tqmask> - <tqmask name="FNOSC" value="0x000700" > + </mask> + <mask name="FNOSC" value="0x000700" > <value value="0x000000" name="EXTRC_F" /> <value value="0x000100" name="INTRC_F_PLL" /> <value value="0x000200" name="PRIM" /> @@ -108,11 +108,11 @@ <value value="0x000500" name="EXTRC_LP" /> <value value="0x000600" name="invalid" /> <value value="0x000700" name="INTRC_F_POST" /> - </tqmask> - <tqmask name="IESO" value="0x008000" > + </mask> + <mask name="IESO" value="0x008000" > <value value="0x000000" name="Off" /> <value value="0x008000" name="On" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/24FJ96GA010.xml b/src/devices/pic/xml_data/24FJ96GA010.xml index e609719..700d288 100644 --- a/src/devices/pic/xml_data/24FJ96GA010.xml +++ b/src/devices/pic/xml_data/24FJ96GA010.xml @@ -24,13 +24,13 @@ <memory name="code" start="0x000200" end="0x00FFFB" /> <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0x00FFFC" end="0x00FFFF" /> -<!-- <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFFFF" /> --> +<!-- <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFFFF" /> --> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x8007EF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="CONFIG1" wtqmask="0xFFFFFF" bvalue="0x007DDF" > - <tqmask name="WDTPOST" value="0x00000F" > + <config offset="0x0" name="CONFIG1" wmask="0xFFFFFF" bvalue="0x007DDF" > + <mask name="WDTPOST" value="0x00000F" > <value value="0x000000" name="1:1" /> <value value="0x000001" name="1:2" /> <value value="0x000002" name="1:4" /> @@ -47,59 +47,59 @@ <value value="0x00000D" name="1:8192" /> <value value="0x00000E" name="1:16384" /> <value value="0x00000F" name="1:32768" /> - </tqmask> - <tqmask name="WDTPRE" value="0x000010" > + </mask> + <mask name="WDTPRE" value="0x000010" > <value value="0x000000" name="1:32" /> <value value="0x000010" name="1:128" /> - </tqmask> - <tqmask name="WINDIS" value="0x000040" > + </mask> + <mask name="WINDIS" value="0x000040" > <value value="0x000000" name="On" /> <value value="0x000040" name="Off" /> - </tqmask> - <tqmask name="FWDTEN" value="0x000080" > + </mask> + <mask name="FWDTEN" value="0x000080" > <value value="0x000000" name="Software" /> <value value="0x000080" name="On" /> - </tqmask> - <tqmask name="ICS" value="0x000100" > + </mask> + <mask name="ICS" value="0x000100" > <value value="0x000000" name="EMUC1, EMUD1" /> <value value="0x000100" name="EMUC2, EMUD2" /> - </tqmask> - <tqmask name="DEBUG" value="0x000800" > + </mask> + <mask name="DEBUG" value="0x000800" > <value value="0x000000" name="On" /> <value value="0x000800" name="Off" /> - </tqmask> - <tqmask name="GWRP" value="0x001000" > + </mask> + <mask name="GWRP" value="0x001000" > <value value="0x000000" name="All" /> <value value="0x001000" name="Off" /> - </tqmask> - <tqmask name="GCP" value="0x002000" > + </mask> + <mask name="GCP" value="0x002000" > <value value="0x000000" name="All" /> <value value="0x002000" name="Off" /> - </tqmask> - <tqmask name="JTAGEN" value="0x004000" > + </mask> + <mask name="JTAGEN" value="0x004000" > <value value="0x000000" name="Off" /> <value value="0x004000" name="On" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="CONFIG2" wtqmask="0xFFFFFF" bvalue="0x0087E3" > - <tqmask name="POSCMD" value="0x000003" > + <config offset="0x2" name="CONFIG2" wmask="0xFFFFFF" bvalue="0x0087E3" > + <mask name="POSCMD" value="0x000003" > <value value="0x000000" name="EC" /> <value value="0x000001" name="XT" /> <value value="0x000002" name="HS" /> <value value="0x000003" name="Off" /> - </tqmask> - <tqmask name="OSCIOFNC" value="0x000020" > + </mask> + <mask name="OSCIOFNC" value="0x000020" > <value value="0x000000" name="IO" /> <value value="0x000020" name="Clock" /> - </tqmask> - <tqmask name="FCKSM" value="0x0000C0" > + </mask> + <mask name="FCKSM" value="0x0000C0" > <value value="0x000000" name="Switching on, monitor on" /> <value value="0x000040" name="Switching on, monitor off" /> <value value="0x000080" name="Switching off, monitor off" /> <value value="0x0000C0" name="Switching off, monitor off" /> - </tqmask> - <tqmask name="FNOSC" value="0x000700" > + </mask> + <mask name="FNOSC" value="0x000700" > <value value="0x000000" name="EXTRC_F" /> <value value="0x000100" name="INTRC_F_PLL" /> <value value="0x000200" name="PRIM" /> @@ -108,11 +108,11 @@ <value value="0x000500" name="EXTRC_LP" /> <value value="0x000600" name="invalid" /> <value value="0x000700" name="INTRC_F_POST" /> - </tqmask> - <tqmask name="IESO" value="0x008000" > + </mask> + <mask name="IESO" value="0x008000" > <value value="0x000000" name="Off" /> <value value="0x008000" name="On" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/24HJ128GP206.xml b/src/devices/pic/xml_data/24HJ128GP206.xml index 60c824c..c065e99 100644 --- a/src/devices/pic/xml_data/24HJ128GP206.xml +++ b/src/devices/pic/xml_data/24HJ128GP206.xml @@ -21,72 +21,72 @@ <memory name="code" start="0x000200" end="0x0157FF" /> <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0xF80000" end="0xF8000F" /> - <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFF" /> + <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFF" /> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x800FFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0xCF" > - <tqmask name="WRTBS" value="0x01" > + <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0xCF" > + <mask name="WRTBS" value="0x01" > <value value="0x00" name="All" /> <value value="0x01" name="Off" /> - </tqmask> - <tqmask name="BSSIZ" value="0x06" > + </mask> + <mask name="BSSIZ" value="0x06" > <value value="0x00" name="8192" /> <value value="0x02" name="4096" /> <value value="0x04" name="1024" /> <value value="0x06" name="0" /> - </tqmask> - <tqmask name="BSSEC" value="0x08" > + </mask> + <mask name="BSSEC" value="0x08" > <value value="0x00" name="High Security" /> <value value="0x08" name="Standard Security" /> - </tqmask> - <tqmask name="RBSSIZ" value="0xC0" > + </mask> + <mask name="RBSSIZ" value="0xC0" > <value value="0x00" name="1024" /> <value value="0x40" name="256" /> <value value="0x80" name="128" /> <value value="0xC0" name="0" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="FSS" wtqmask="0xFF" bvalue="0xCF" > - <tqmask name="WRTSS" value="0x01" > + <config offset="0x2" name="FSS" wmask="0xFF" bvalue="0xCF" > + <mask name="WRTSS" value="0x01" > <value value="0x00" name="All" /> <value value="0x01" name="Off" /> - </tqmask> - <tqmask name="SSSIZ" value="0x06" > + </mask> + <mask name="SSSIZ" value="0x06" > <value value="0x00" name="32768" /> <value value="0x02" name="16384" /> <value value="0x04" name="8192" /> <value value="0x06" name="0" /> - </tqmask> - <tqmask name="SSSEC" value="0x08" > + </mask> + <mask name="SSSEC" value="0x08" > <value value="0x00" name="High Security" /> <value value="0x08" name="Standard Security" /> - </tqmask> - <tqmask name="RSSSIZ" value="0xC0" > + </mask> + <mask name="RSSSIZ" value="0xC0" > <value value="0x00" name="4096" /> <value value="0x40" name="2048" /> <value value="0x80" name="256" /> <value value="0xC0" name="0" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="WRTGS" value="0x01" > + <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" > + <mask name="WRTGS" value="0x01" > <value value="0x00" name="All" /> <value value="0x01" name="Off" /> - </tqmask> - <tqmask name="GSSEC" value="0x06" > + </mask> + <mask name="GSSEC" value="0x06" > <value value="0x00" name="High Security" /> <value value="0x02" name="High Security" /> <value value="0x04" name="Standard Security" /> <value value="0x06" name="Off" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0xA7" > - <tqmask name="FNOSC" value="0x07" > + <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0xA7" > + <mask name="FNOSC" value="0x07" > <value value="0x00" name="EXTRC_F" /> <value value="0x01" name="INTRC_F_PLL" /> <value value="0x02" name="PRIM" /> @@ -95,38 +95,38 @@ <value value="0x05" name="EXTRC_LP" /> <value value="0x06" name="invalid" /> <value value="0x07" name="INTRC_F_POST" /> - </tqmask> - <tqmask name="TEMP" value="0x20" > + </mask> + <mask name="TEMP" value="0x20" > <value value="0x00" name="On" /> <value value="0x20" name="Off" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" /> <value value="0x80" name="On" /> - </tqmask> + </mask> </config> - <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="POSCMD" value="0x03" > + <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" > + <mask name="POSCMD" value="0x03" > <value value="0x00" name="EC" /> <value value="0x01" name="XT" /> <value value="0x02" name="HS" /> <value value="0x03" name="Off" /> - </tqmask> - <tqmask name="OSCIOFNC" value="0x04" > + </mask> + <mask name="OSCIOFNC" value="0x04" > <value value="0x00" name="IO" /> <value value="0x04" name="Clock" /> - </tqmask> - <tqmask name="FCKSM" value="0xC0" > + </mask> + <mask name="FCKSM" value="0xC0" > <value value="0x00" name="Switching on, monitor on" /> <value value="0x40" name="Switching on, monitor off" /> <value value="0x80" name="Switching off, monitor off" /> <value value="0xC0" name="Switching off, monitor off" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF"> - <tqmask name="WDTPOST" value="0x0F" > + <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF"> + <mask name="WDTPOST" value="0x0F" > <value value="0x00" name="1:1" /> <value value="0x01" name="1:2" /> <value value="0x02" name="1:4" /> @@ -143,23 +143,23 @@ <value value="0x0D" name="1:8192" /> <value value="0x0E" name="1:16384" /> <value value="0x0F" name="1:32768" /> - </tqmask> - <tqmask name="WDTPRE" value="0x10" > + </mask> + <mask name="WDTPRE" value="0x10" > <value value="0x00" name="1:32" /> <value value="0x10" name="1:128" /> - </tqmask> - <tqmask name="WINDIS" value="0x40" > + </mask> + <mask name="WINDIS" value="0x40" > <value value="0x00" name="On" /> <value value="0x40" name="Off" /> - </tqmask> - <tqmask name="FWDTEN" value="0x80" > + </mask> + <mask name="FWDTEN" value="0x80" > <value value="0x00" name="Software" /> <value value="0x80" name="On" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FPWRT" value="0x07" > + <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x07" > + <mask name="FPWRT" value="0x07" > <value value="0x00" name="0" /> <value value="0x01" name="2" /> <value value="0x02" name="4" /> @@ -168,28 +168,28 @@ <value value="0x05" name="32" /> <value value="0x06" name="64" /> <value value="0x07" name="128" /> - </tqmask> + </mask> </config> - <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" > - <tqmask name="ICS" value="0x03" > + <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" > + <mask name="ICS" value="0x03" > <value value="0x00" name="EMUC3, EMUD3" /> <value value="0x01" name="EMUC2, EMUD2" /> <value value="0x02" name="EMUC1, EMUD1" /> <value value="0x03" name="PGC/EMUC, PGD/EMUD" /> - </tqmask> - <tqmask name="JTAGEN" value="0x20" > + </mask> + <mask name="JTAGEN" value="0x20" > <value value="0x00" name="Off" /> <value value="0x20" name="On" /> - </tqmask> - <tqmask name="COE" value="0x40" > + </mask> + <mask name="COE" value="0x40" > <value value="0x00" name="On" /> <value value="0x40" name="Off" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" /> <value value="0x80" name="Off" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/24HJ128GP210.xml b/src/devices/pic/xml_data/24HJ128GP210.xml index 6e1983d..b0922d0 100644 --- a/src/devices/pic/xml_data/24HJ128GP210.xml +++ b/src/devices/pic/xml_data/24HJ128GP210.xml @@ -21,72 +21,72 @@ <memory name="code" start="0x000200" end="0x0157FF" /> <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0xF80000" end="0xF8000F" /> - <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFF" /> + <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFF" /> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x800FFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0xCF" > - <tqmask name="WRTBS" value="0x01" > + <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0xCF" > + <mask name="WRTBS" value="0x01" > <value value="0x00" name="All" /> <value value="0x01" name="Off" /> - </tqmask> - <tqmask name="BSSIZ" value="0x06" > + </mask> + <mask name="BSSIZ" value="0x06" > <value value="0x00" name="8192" /> <value value="0x02" name="4096" /> <value value="0x04" name="1024" /> <value value="0x06" name="0" /> - </tqmask> - <tqmask name="BSSEC" value="0x08" > + </mask> + <mask name="BSSEC" value="0x08" > <value value="0x00" name="High Security" /> <value value="0x08" name="Standard Security" /> - </tqmask> - <tqmask name="RBSSIZ" value="0xC0" > + </mask> + <mask name="RBSSIZ" value="0xC0" > <value value="0x00" name="1024" /> <value value="0x40" name="256" /> <value value="0x80" name="128" /> <value value="0xC0" name="0" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="FSS" wtqmask="0xFF" bvalue="0xCF" > - <tqmask name="WRTSS" value="0x01" > + <config offset="0x2" name="FSS" wmask="0xFF" bvalue="0xCF" > + <mask name="WRTSS" value="0x01" > <value value="0x00" name="All" /> <value value="0x01" name="Off" /> - </tqmask> - <tqmask name="SSSIZ" value="0x06" > + </mask> + <mask name="SSSIZ" value="0x06" > <value value="0x00" name="32768" /> <value value="0x02" name="16384" /> <value value="0x04" name="8192" /> <value value="0x06" name="0" /> - </tqmask> - <tqmask name="SSSEC" value="0x08" > + </mask> + <mask name="SSSEC" value="0x08" > <value value="0x00" name="High Security" /> <value value="0x08" name="Standard Security" /> - </tqmask> - <tqmask name="RSSSIZ" value="0xC0" > + </mask> + <mask name="RSSSIZ" value="0xC0" > <value value="0x00" name="4096" /> <value value="0x40" name="2048" /> <value value="0x80" name="256" /> <value value="0xC0" name="0" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="WRTGS" value="0x01" > + <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" > + <mask name="WRTGS" value="0x01" > <value value="0x00" name="All" /> <value value="0x01" name="Off" /> - </tqmask> - <tqmask name="GSSEC" value="0x06" > + </mask> + <mask name="GSSEC" value="0x06" > <value value="0x00" name="High Security" /> <value value="0x02" name="High Security" /> <value value="0x04" name="Standard Security" /> <value value="0x06" name="Off" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0xA7" > - <tqmask name="FNOSC" value="0x07" > + <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0xA7" > + <mask name="FNOSC" value="0x07" > <value value="0x00" name="EXTRC_F" /> <value value="0x01" name="INTRC_F_PLL" /> <value value="0x02" name="PRIM" /> @@ -95,38 +95,38 @@ <value value="0x05" name="EXTRC_LP" /> <value value="0x06" name="invalid" /> <value value="0x07" name="INTRC_F_POST" /> - </tqmask> - <tqmask name="TEMP" value="0x20" > + </mask> + <mask name="TEMP" value="0x20" > <value value="0x00" name="On" /> <value value="0x20" name="Off" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" /> <value value="0x80" name="On" /> - </tqmask> + </mask> </config> - <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="POSCMD" value="0x03" > + <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" > + <mask name="POSCMD" value="0x03" > <value value="0x00" name="EC" /> <value value="0x01" name="XT" /> <value value="0x02" name="HS" /> <value value="0x03" name="Off" /> - </tqmask> - <tqmask name="OSCIOFNC" value="0x04" > + </mask> + <mask name="OSCIOFNC" value="0x04" > <value value="0x00" name="IO" /> <value value="0x04" name="Clock" /> - </tqmask> - <tqmask name="FCKSM" value="0xC0" > + </mask> + <mask name="FCKSM" value="0xC0" > <value value="0x00" name="Switching on, monitor on" /> <value value="0x40" name="Switching on, monitor off" /> <value value="0x80" name="Switching off, monitor off" /> <value value="0xC0" name="Switching off, monitor off" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF"> - <tqmask name="WDTPOST" value="0x0F" > + <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF"> + <mask name="WDTPOST" value="0x0F" > <value value="0x00" name="1:1" /> <value value="0x01" name="1:2" /> <value value="0x02" name="1:4" /> @@ -143,23 +143,23 @@ <value value="0x0D" name="1:8192" /> <value value="0x0E" name="1:16384" /> <value value="0x0F" name="1:32768" /> - </tqmask> - <tqmask name="WDTPRE" value="0x10" > + </mask> + <mask name="WDTPRE" value="0x10" > <value value="0x00" name="1:32" /> <value value="0x10" name="1:128" /> - </tqmask> - <tqmask name="WINDIS" value="0x40" > + </mask> + <mask name="WINDIS" value="0x40" > <value value="0x00" name="On" /> <value value="0x40" name="Off" /> - </tqmask> - <tqmask name="FWDTEN" value="0x80" > + </mask> + <mask name="FWDTEN" value="0x80" > <value value="0x00" name="Software" /> <value value="0x80" name="On" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FPWRT" value="0x07" > + <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x07" > + <mask name="FPWRT" value="0x07" > <value value="0x00" name="0" /> <value value="0x01" name="2" /> <value value="0x02" name="4" /> @@ -168,28 +168,28 @@ <value value="0x05" name="32" /> <value value="0x06" name="64" /> <value value="0x07" name="128" /> - </tqmask> + </mask> </config> - <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" > - <tqmask name="ICS" value="0x03" > + <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" > + <mask name="ICS" value="0x03" > <value value="0x00" name="EMUC3, EMUD3" /> <value value="0x01" name="EMUC2, EMUD2" /> <value value="0x02" name="EMUC1, EMUD1" /> <value value="0x03" name="PGC/EMUC, PGD/EMUD" /> - </tqmask> - <tqmask name="JTAGEN" value="0x20" > + </mask> + <mask name="JTAGEN" value="0x20" > <value value="0x00" name="Off" /> <value value="0x20" name="On" /> - </tqmask> - <tqmask name="COE" value="0x40" > + </mask> + <mask name="COE" value="0x40" > <value value="0x00" name="On" /> <value value="0x40" name="Off" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" /> <value value="0x80" name="Off" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/24HJ128GP306.xml b/src/devices/pic/xml_data/24HJ128GP306.xml index 7e8f67e..97f23e1 100644 --- a/src/devices/pic/xml_data/24HJ128GP306.xml +++ b/src/devices/pic/xml_data/24HJ128GP306.xml @@ -21,72 +21,72 @@ <memory name="code" start="0x000200" end="0x0157FF" /> <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0xF80000" end="0xF8000F" /> - <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFF" /> + <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFF" /> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x800FFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0xCF" > - <tqmask name="WRTBS" value="0x01" > + <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0xCF" > + <mask name="WRTBS" value="0x01" > <value value="0x00" name="All" /> <value value="0x01" name="Off" /> - </tqmask> - <tqmask name="BSSIZ" value="0x06" > + </mask> + <mask name="BSSIZ" value="0x06" > <value value="0x00" name="8192" /> <value value="0x02" name="4096" /> <value value="0x04" name="1024" /> <value value="0x06" name="0" /> - </tqmask> - <tqmask name="BSSEC" value="0x08" > + </mask> + <mask name="BSSEC" value="0x08" > <value value="0x00" name="High Security" /> <value value="0x08" name="Standard Security" /> - </tqmask> - <tqmask name="RBSSIZ" value="0xC0" > + </mask> + <mask name="RBSSIZ" value="0xC0" > <value value="0x00" name="1024" /> <value value="0x40" name="256" /> <value value="0x80" name="128" /> <value value="0xC0" name="0" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="FSS" wtqmask="0xFF" bvalue="0xCF" > - <tqmask name="WRTSS" value="0x01" > + <config offset="0x2" name="FSS" wmask="0xFF" bvalue="0xCF" > + <mask name="WRTSS" value="0x01" > <value value="0x00" name="All" /> <value value="0x01" name="Off" /> - </tqmask> - <tqmask name="SSSIZ" value="0x06" > + </mask> + <mask name="SSSIZ" value="0x06" > <value value="0x00" name="32768" /> <value value="0x02" name="16384" /> <value value="0x04" name="8192" /> <value value="0x06" name="0" /> - </tqmask> - <tqmask name="SSSEC" value="0x08" > + </mask> + <mask name="SSSEC" value="0x08" > <value value="0x00" name="High Security" /> <value value="0x08" name="Standard Security" /> - </tqmask> - <tqmask name="RSSSIZ" value="0xC0" > + </mask> + <mask name="RSSSIZ" value="0xC0" > <value value="0x00" name="4096" /> <value value="0x40" name="2048" /> <value value="0x80" name="256" /> <value value="0xC0" name="0" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="WRTGS" value="0x01" > + <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" > + <mask name="WRTGS" value="0x01" > <value value="0x00" name="All" /> <value value="0x01" name="Off" /> - </tqmask> - <tqmask name="GSSEC" value="0x06" > + </mask> + <mask name="GSSEC" value="0x06" > <value value="0x00" name="High Security" /> <value value="0x02" name="High Security" /> <value value="0x04" name="Standard Security" /> <value value="0x06" name="Off" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0xA7" > - <tqmask name="FNOSC" value="0x07" > + <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0xA7" > + <mask name="FNOSC" value="0x07" > <value value="0x00" name="EXTRC_F" /> <value value="0x01" name="INTRC_F_PLL" /> <value value="0x02" name="PRIM" /> @@ -95,38 +95,38 @@ <value value="0x05" name="EXTRC_LP" /> <value value="0x06" name="invalid" /> <value value="0x07" name="INTRC_F_POST" /> - </tqmask> - <tqmask name="TEMP" value="0x20" > + </mask> + <mask name="TEMP" value="0x20" > <value value="0x00" name="On" /> <value value="0x20" name="Off" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" /> <value value="0x80" name="On" /> - </tqmask> + </mask> </config> - <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="POSCMD" value="0x03" > + <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" > + <mask name="POSCMD" value="0x03" > <value value="0x00" name="EC" /> <value value="0x01" name="XT" /> <value value="0x02" name="HS" /> <value value="0x03" name="Off" /> - </tqmask> - <tqmask name="OSCIOFNC" value="0x04" > + </mask> + <mask name="OSCIOFNC" value="0x04" > <value value="0x00" name="IO" /> <value value="0x04" name="Clock" /> - </tqmask> - <tqmask name="FCKSM" value="0xC0" > + </mask> + <mask name="FCKSM" value="0xC0" > <value value="0x00" name="Switching on, monitor on" /> <value value="0x40" name="Switching on, monitor off" /> <value value="0x80" name="Switching off, monitor off" /> <value value="0xC0" name="Switching off, monitor off" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF"> - <tqmask name="WDTPOST" value="0x0F" > + <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF"> + <mask name="WDTPOST" value="0x0F" > <value value="0x00" name="1:1" /> <value value="0x01" name="1:2" /> <value value="0x02" name="1:4" /> @@ -143,23 +143,23 @@ <value value="0x0D" name="1:8192" /> <value value="0x0E" name="1:16384" /> <value value="0x0F" name="1:32768" /> - </tqmask> - <tqmask name="WDTPRE" value="0x10" > + </mask> + <mask name="WDTPRE" value="0x10" > <value value="0x00" name="1:32" /> <value value="0x10" name="1:128" /> - </tqmask> - <tqmask name="WINDIS" value="0x40" > + </mask> + <mask name="WINDIS" value="0x40" > <value value="0x00" name="On" /> <value value="0x40" name="Off" /> - </tqmask> - <tqmask name="FWDTEN" value="0x80" > + </mask> + <mask name="FWDTEN" value="0x80" > <value value="0x00" name="Software" /> <value value="0x80" name="On" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FPWRT" value="0x07" > + <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x07" > + <mask name="FPWRT" value="0x07" > <value value="0x00" name="0" /> <value value="0x01" name="2" /> <value value="0x02" name="4" /> @@ -168,28 +168,28 @@ <value value="0x05" name="32" /> <value value="0x06" name="64" /> <value value="0x07" name="128" /> - </tqmask> + </mask> </config> - <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" > - <tqmask name="ICS" value="0x03" > + <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" > + <mask name="ICS" value="0x03" > <value value="0x00" name="EMUC3, EMUD3" /> <value value="0x01" name="EMUC2, EMUD2" /> <value value="0x02" name="EMUC1, EMUD1" /> <value value="0x03" name="PGC/EMUC, PGD/EMUD" /> - </tqmask> - <tqmask name="JTAGEN" value="0x20" > + </mask> + <mask name="JTAGEN" value="0x20" > <value value="0x00" name="Off" /> <value value="0x20" name="On" /> - </tqmask> - <tqmask name="COE" value="0x40" > + </mask> + <mask name="COE" value="0x40" > <value value="0x00" name="On" /> <value value="0x40" name="Off" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" /> <value value="0x80" name="Off" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/24HJ128GP310.xml b/src/devices/pic/xml_data/24HJ128GP310.xml index 8e148b0..a600601 100644 --- a/src/devices/pic/xml_data/24HJ128GP310.xml +++ b/src/devices/pic/xml_data/24HJ128GP310.xml @@ -21,72 +21,72 @@ <memory name="code" start="0x000200" end="0x0157FF" /> <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0xF80000" end="0xF8000F" /> - <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFF" /> + <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFF" /> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x800FFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0xCF" > - <tqmask name="WRTBS" value="0x01" > + <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0xCF" > + <mask name="WRTBS" value="0x01" > <value value="0x00" name="All" /> <value value="0x01" name="Off" /> - </tqmask> - <tqmask name="BSSIZ" value="0x06" > + </mask> + <mask name="BSSIZ" value="0x06" > <value value="0x00" name="8192" /> <value value="0x02" name="4096" /> <value value="0x04" name="1024" /> <value value="0x06" name="0" /> - </tqmask> - <tqmask name="BSSEC" value="0x08" > + </mask> + <mask name="BSSEC" value="0x08" > <value value="0x00" name="High Security" /> <value value="0x08" name="Standard Security" /> - </tqmask> - <tqmask name="RBSSIZ" value="0xC0" > + </mask> + <mask name="RBSSIZ" value="0xC0" > <value value="0x00" name="1024" /> <value value="0x40" name="256" /> <value value="0x80" name="128" /> <value value="0xC0" name="0" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="FSS" wtqmask="0xFF" bvalue="0xCF" > - <tqmask name="WRTSS" value="0x01" > + <config offset="0x2" name="FSS" wmask="0xFF" bvalue="0xCF" > + <mask name="WRTSS" value="0x01" > <value value="0x00" name="All" /> <value value="0x01" name="Off" /> - </tqmask> - <tqmask name="SSSIZ" value="0x06" > + </mask> + <mask name="SSSIZ" value="0x06" > <value value="0x00" name="32768" /> <value value="0x02" name="16384" /> <value value="0x04" name="8192" /> <value value="0x06" name="0" /> - </tqmask> - <tqmask name="SSSEC" value="0x08" > + </mask> + <mask name="SSSEC" value="0x08" > <value value="0x00" name="High Security" /> <value value="0x08" name="Standard Security" /> - </tqmask> - <tqmask name="RSSSIZ" value="0xC0" > + </mask> + <mask name="RSSSIZ" value="0xC0" > <value value="0x00" name="4096" /> <value value="0x40" name="2048" /> <value value="0x80" name="256" /> <value value="0xC0" name="0" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="WRTGS" value="0x01" > + <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" > + <mask name="WRTGS" value="0x01" > <value value="0x00" name="All" /> <value value="0x01" name="Off" /> - </tqmask> - <tqmask name="GSSEC" value="0x06" > + </mask> + <mask name="GSSEC" value="0x06" > <value value="0x00" name="High Security" /> <value value="0x02" name="High Security" /> <value value="0x04" name="Standard Security" /> <value value="0x06" name="Off" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0xA7" > - <tqmask name="FNOSC" value="0x07" > + <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0xA7" > + <mask name="FNOSC" value="0x07" > <value value="0x00" name="EXTRC_F" /> <value value="0x01" name="INTRC_F_PLL" /> <value value="0x02" name="PRIM" /> @@ -95,38 +95,38 @@ <value value="0x05" name="EXTRC_LP" /> <value value="0x06" name="invalid" /> <value value="0x07" name="INTRC_F_POST" /> - </tqmask> - <tqmask name="TEMP" value="0x20" > + </mask> + <mask name="TEMP" value="0x20" > <value value="0x00" name="On" /> <value value="0x20" name="Off" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" /> <value value="0x80" name="On" /> - </tqmask> + </mask> </config> - <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="POSCMD" value="0x03" > + <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" > + <mask name="POSCMD" value="0x03" > <value value="0x00" name="EC" /> <value value="0x01" name="XT" /> <value value="0x02" name="HS" /> <value value="0x03" name="Off" /> - </tqmask> - <tqmask name="OSCIOFNC" value="0x04" > + </mask> + <mask name="OSCIOFNC" value="0x04" > <value value="0x00" name="IO" /> <value value="0x04" name="Clock" /> - </tqmask> - <tqmask name="FCKSM" value="0xC0" > + </mask> + <mask name="FCKSM" value="0xC0" > <value value="0x00" name="Switching on, monitor on" /> <value value="0x40" name="Switching on, monitor off" /> <value value="0x80" name="Switching off, monitor off" /> <value value="0xC0" name="Switching off, monitor off" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF"> - <tqmask name="WDTPOST" value="0x0F" > + <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF"> + <mask name="WDTPOST" value="0x0F" > <value value="0x00" name="1:1" /> <value value="0x01" name="1:2" /> <value value="0x02" name="1:4" /> @@ -143,23 +143,23 @@ <value value="0x0D" name="1:8192" /> <value value="0x0E" name="1:16384" /> <value value="0x0F" name="1:32768" /> - </tqmask> - <tqmask name="WDTPRE" value="0x10" > + </mask> + <mask name="WDTPRE" value="0x10" > <value value="0x00" name="1:32" /> <value value="0x10" name="1:128" /> - </tqmask> - <tqmask name="WINDIS" value="0x40" > + </mask> + <mask name="WINDIS" value="0x40" > <value value="0x00" name="On" /> <value value="0x40" name="Off" /> - </tqmask> - <tqmask name="FWDTEN" value="0x80" > + </mask> + <mask name="FWDTEN" value="0x80" > <value value="0x00" name="Software" /> <value value="0x80" name="On" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FPWRT" value="0x07" > + <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x07" > + <mask name="FPWRT" value="0x07" > <value value="0x00" name="0" /> <value value="0x01" name="2" /> <value value="0x02" name="4" /> @@ -168,28 +168,28 @@ <value value="0x05" name="32" /> <value value="0x06" name="64" /> <value value="0x07" name="128" /> - </tqmask> + </mask> </config> - <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" > - <tqmask name="ICS" value="0x03" > + <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" > + <mask name="ICS" value="0x03" > <value value="0x00" name="EMUC3, EMUD3" /> <value value="0x01" name="EMUC2, EMUD2" /> <value value="0x02" name="EMUC1, EMUD1" /> <value value="0x03" name="PGC/EMUC, PGD/EMUD" /> - </tqmask> - <tqmask name="JTAGEN" value="0x20" > + </mask> + <mask name="JTAGEN" value="0x20" > <value value="0x00" name="Off" /> <value value="0x20" name="On" /> - </tqmask> - <tqmask name="COE" value="0x40" > + </mask> + <mask name="COE" value="0x40" > <value value="0x00" name="On" /> <value value="0x40" name="Off" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" /> <value value="0x80" name="Off" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/24HJ128GP506.xml b/src/devices/pic/xml_data/24HJ128GP506.xml index ddb2d13..ae2fd06 100644 --- a/src/devices/pic/xml_data/24HJ128GP506.xml +++ b/src/devices/pic/xml_data/24HJ128GP506.xml @@ -21,72 +21,72 @@ <memory name="code" start="0x000200" end="0x0157FF" /> <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0xF80000" end="0xF8000F" /> - <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFF" /> + <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFF" /> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x800FFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0xCF" > - <tqmask name="WRTBS" value="0x01" > + <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0xCF" > + <mask name="WRTBS" value="0x01" > <value value="0x00" name="All" /> <value value="0x01" name="Off" /> - </tqmask> - <tqmask name="BSSIZ" value="0x06" > + </mask> + <mask name="BSSIZ" value="0x06" > <value value="0x00" name="8192" /> <value value="0x02" name="4096" /> <value value="0x04" name="1024" /> <value value="0x06" name="0" /> - </tqmask> - <tqmask name="BSSEC" value="0x08" > + </mask> + <mask name="BSSEC" value="0x08" > <value value="0x00" name="High Security" /> <value value="0x08" name="Standard Security" /> - </tqmask> - <tqmask name="RBSSIZ" value="0xC0" > + </mask> + <mask name="RBSSIZ" value="0xC0" > <value value="0x00" name="1024" /> <value value="0x40" name="256" /> <value value="0x80" name="128" /> <value value="0xC0" name="0" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="FSS" wtqmask="0xFF" bvalue="0xCF" > - <tqmask name="WRTSS" value="0x01" > + <config offset="0x2" name="FSS" wmask="0xFF" bvalue="0xCF" > + <mask name="WRTSS" value="0x01" > <value value="0x00" name="All" /> <value value="0x01" name="Off" /> - </tqmask> - <tqmask name="SSSIZ" value="0x06" > + </mask> + <mask name="SSSIZ" value="0x06" > <value value="0x00" name="32768" /> <value value="0x02" name="16384" /> <value value="0x04" name="8192" /> <value value="0x06" name="0" /> - </tqmask> - <tqmask name="SSSEC" value="0x08" > + </mask> + <mask name="SSSEC" value="0x08" > <value value="0x00" name="High Security" /> <value value="0x08" name="Standard Security" /> - </tqmask> - <tqmask name="RSSSIZ" value="0xC0" > + </mask> + <mask name="RSSSIZ" value="0xC0" > <value value="0x00" name="4096" /> <value value="0x40" name="2048" /> <value value="0x80" name="256" /> <value value="0xC0" name="0" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="WRTGS" value="0x01" > + <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" > + <mask name="WRTGS" value="0x01" > <value value="0x00" name="All" /> <value value="0x01" name="Off" /> - </tqmask> - <tqmask name="GSSEC" value="0x06" > + </mask> + <mask name="GSSEC" value="0x06" > <value value="0x00" name="High Security" /> <value value="0x02" name="High Security" /> <value value="0x04" name="Standard Security" /> <value value="0x06" name="Off" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0xA7" > - <tqmask name="FNOSC" value="0x07" > + <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0xA7" > + <mask name="FNOSC" value="0x07" > <value value="0x00" name="EXTRC_F" /> <value value="0x01" name="INTRC_F_PLL" /> <value value="0x02" name="PRIM" /> @@ -95,38 +95,38 @@ <value value="0x05" name="EXTRC_LP" /> <value value="0x06" name="invalid" /> <value value="0x07" name="INTRC_F_POST" /> - </tqmask> - <tqmask name="TEMP" value="0x20" > + </mask> + <mask name="TEMP" value="0x20" > <value value="0x00" name="On" /> <value value="0x20" name="Off" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" /> <value value="0x80" name="On" /> - </tqmask> + </mask> </config> - <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="POSCMD" value="0x03" > + <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" > + <mask name="POSCMD" value="0x03" > <value value="0x00" name="EC" /> <value value="0x01" name="XT" /> <value value="0x02" name="HS" /> <value value="0x03" name="Off" /> - </tqmask> - <tqmask name="OSCIOFNC" value="0x04" > + </mask> + <mask name="OSCIOFNC" value="0x04" > <value value="0x00" name="IO" /> <value value="0x04" name="Clock" /> - </tqmask> - <tqmask name="FCKSM" value="0xC0" > + </mask> + <mask name="FCKSM" value="0xC0" > <value value="0x00" name="Switching on, monitor on" /> <value value="0x40" name="Switching on, monitor off" /> <value value="0x80" name="Switching off, monitor off" /> <value value="0xC0" name="Switching off, monitor off" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF"> - <tqmask name="WDTPOST" value="0x0F" > + <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF"> + <mask name="WDTPOST" value="0x0F" > <value value="0x00" name="1:1" /> <value value="0x01" name="1:2" /> <value value="0x02" name="1:4" /> @@ -143,23 +143,23 @@ <value value="0x0D" name="1:8192" /> <value value="0x0E" name="1:16384" /> <value value="0x0F" name="1:32768" /> - </tqmask> - <tqmask name="WDTPRE" value="0x10" > + </mask> + <mask name="WDTPRE" value="0x10" > <value value="0x00" name="1:32" /> <value value="0x10" name="1:128" /> - </tqmask> - <tqmask name="WINDIS" value="0x40" > + </mask> + <mask name="WINDIS" value="0x40" > <value value="0x00" name="On" /> <value value="0x40" name="Off" /> - </tqmask> - <tqmask name="FWDTEN" value="0x80" > + </mask> + <mask name="FWDTEN" value="0x80" > <value value="0x00" name="Software" /> <value value="0x80" name="On" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FPWRT" value="0x07" > + <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x07" > + <mask name="FPWRT" value="0x07" > <value value="0x00" name="0" /> <value value="0x01" name="2" /> <value value="0x02" name="4" /> @@ -168,28 +168,28 @@ <value value="0x05" name="32" /> <value value="0x06" name="64" /> <value value="0x07" name="128" /> - </tqmask> + </mask> </config> - <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" > - <tqmask name="ICS" value="0x03" > + <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" > + <mask name="ICS" value="0x03" > <value value="0x00" name="EMUC3, EMUD3" /> <value value="0x01" name="EMUC2, EMUD2" /> <value value="0x02" name="EMUC1, EMUD1" /> <value value="0x03" name="PGC/EMUC, PGD/EMUD" /> - </tqmask> - <tqmask name="JTAGEN" value="0x20" > + </mask> + <mask name="JTAGEN" value="0x20" > <value value="0x00" name="Off" /> <value value="0x20" name="On" /> - </tqmask> - <tqmask name="COE" value="0x40" > + </mask> + <mask name="COE" value="0x40" > <value value="0x00" name="On" /> <value value="0x40" name="Off" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" /> <value value="0x80" name="Off" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/24HJ128GP510.xml b/src/devices/pic/xml_data/24HJ128GP510.xml index 80a0f24..7195e60 100644 --- a/src/devices/pic/xml_data/24HJ128GP510.xml +++ b/src/devices/pic/xml_data/24HJ128GP510.xml @@ -21,72 +21,72 @@ <memory name="code" start="0x000200" end="0x0157FF" /> <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0xF80000" end="0xF8000F" /> - <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFF" /> + <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFF" /> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x800FFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0xCF" > - <tqmask name="WRTBS" value="0x01" > + <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0xCF" > + <mask name="WRTBS" value="0x01" > <value value="0x00" name="All" /> <value value="0x01" name="Off" /> - </tqmask> - <tqmask name="BSSIZ" value="0x06" > + </mask> + <mask name="BSSIZ" value="0x06" > <value value="0x00" name="8192" /> <value value="0x02" name="4096" /> <value value="0x04" name="1024" /> <value value="0x06" name="0" /> - </tqmask> - <tqmask name="BSSEC" value="0x08" > + </mask> + <mask name="BSSEC" value="0x08" > <value value="0x00" name="High Security" /> <value value="0x08" name="Standard Security" /> - </tqmask> - <tqmask name="RBSSIZ" value="0xC0" > + </mask> + <mask name="RBSSIZ" value="0xC0" > <value value="0x00" name="1024" /> <value value="0x40" name="256" /> <value value="0x80" name="128" /> <value value="0xC0" name="0" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="FSS" wtqmask="0xFF" bvalue="0xCF" > - <tqmask name="WRTSS" value="0x01" > + <config offset="0x2" name="FSS" wmask="0xFF" bvalue="0xCF" > + <mask name="WRTSS" value="0x01" > <value value="0x00" name="All" /> <value value="0x01" name="Off" /> - </tqmask> - <tqmask name="SSSIZ" value="0x06" > + </mask> + <mask name="SSSIZ" value="0x06" > <value value="0x00" name="32768" /> <value value="0x02" name="16384" /> <value value="0x04" name="8192" /> <value value="0x06" name="0" /> - </tqmask> - <tqmask name="SSSEC" value="0x08" > + </mask> + <mask name="SSSEC" value="0x08" > <value value="0x00" name="High Security" /> <value value="0x08" name="Standard Security" /> - </tqmask> - <tqmask name="RSSSIZ" value="0xC0" > + </mask> + <mask name="RSSSIZ" value="0xC0" > <value value="0x00" name="4096" /> <value value="0x40" name="2048" /> <value value="0x80" name="256" /> <value value="0xC0" name="0" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="WRTGS" value="0x01" > + <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" > + <mask name="WRTGS" value="0x01" > <value value="0x00" name="All" /> <value value="0x01" name="Off" /> - </tqmask> - <tqmask name="GSSEC" value="0x06" > + </mask> + <mask name="GSSEC" value="0x06" > <value value="0x00" name="High Security" /> <value value="0x02" name="High Security" /> <value value="0x04" name="Standard Security" /> <value value="0x06" name="Off" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0xA7" > - <tqmask name="FNOSC" value="0x07" > + <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0xA7" > + <mask name="FNOSC" value="0x07" > <value value="0x00" name="EXTRC_F" /> <value value="0x01" name="INTRC_F_PLL" /> <value value="0x02" name="PRIM" /> @@ -95,38 +95,38 @@ <value value="0x05" name="EXTRC_LP" /> <value value="0x06" name="invalid" /> <value value="0x07" name="INTRC_F_POST" /> - </tqmask> - <tqmask name="TEMP" value="0x20" > + </mask> + <mask name="TEMP" value="0x20" > <value value="0x00" name="On" /> <value value="0x20" name="Off" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" /> <value value="0x80" name="On" /> - </tqmask> + </mask> </config> - <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="POSCMD" value="0x03" > + <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" > + <mask name="POSCMD" value="0x03" > <value value="0x00" name="EC" /> <value value="0x01" name="XT" /> <value value="0x02" name="HS" /> <value value="0x03" name="Off" /> - </tqmask> - <tqmask name="OSCIOFNC" value="0x04" > + </mask> + <mask name="OSCIOFNC" value="0x04" > <value value="0x00" name="IO" /> <value value="0x04" name="Clock" /> - </tqmask> - <tqmask name="FCKSM" value="0xC0" > + </mask> + <mask name="FCKSM" value="0xC0" > <value value="0x00" name="Switching on, monitor on" /> <value value="0x40" name="Switching on, monitor off" /> <value value="0x80" name="Switching off, monitor off" /> <value value="0xC0" name="Switching off, monitor off" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF"> - <tqmask name="WDTPOST" value="0x0F" > + <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF"> + <mask name="WDTPOST" value="0x0F" > <value value="0x00" name="1:1" /> <value value="0x01" name="1:2" /> <value value="0x02" name="1:4" /> @@ -143,23 +143,23 @@ <value value="0x0D" name="1:8192" /> <value value="0x0E" name="1:16384" /> <value value="0x0F" name="1:32768" /> - </tqmask> - <tqmask name="WDTPRE" value="0x10" > + </mask> + <mask name="WDTPRE" value="0x10" > <value value="0x00" name="1:32" /> <value value="0x10" name="1:128" /> - </tqmask> - <tqmask name="WINDIS" value="0x40" > + </mask> + <mask name="WINDIS" value="0x40" > <value value="0x00" name="On" /> <value value="0x40" name="Off" /> - </tqmask> - <tqmask name="FWDTEN" value="0x80" > + </mask> + <mask name="FWDTEN" value="0x80" > <value value="0x00" name="Software" /> <value value="0x80" name="On" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FPWRT" value="0x07" > + <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x07" > + <mask name="FPWRT" value="0x07" > <value value="0x00" name="0" /> <value value="0x01" name="2" /> <value value="0x02" name="4" /> @@ -168,28 +168,28 @@ <value value="0x05" name="32" /> <value value="0x06" name="64" /> <value value="0x07" name="128" /> - </tqmask> + </mask> </config> - <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" > - <tqmask name="ICS" value="0x03" > + <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" > + <mask name="ICS" value="0x03" > <value value="0x00" name="EMUC3, EMUD3" /> <value value="0x01" name="EMUC2, EMUD2" /> <value value="0x02" name="EMUC1, EMUD1" /> <value value="0x03" name="PGC/EMUC, PGD/EMUD" /> - </tqmask> - <tqmask name="JTAGEN" value="0x20" > + </mask> + <mask name="JTAGEN" value="0x20" > <value value="0x00" name="Off" /> <value value="0x20" name="On" /> - </tqmask> - <tqmask name="COE" value="0x40" > + </mask> + <mask name="COE" value="0x40" > <value value="0x00" name="On" /> <value value="0x40" name="Off" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" /> <value value="0x80" name="Off" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/24HJ12GP201.xml b/src/devices/pic/xml_data/24HJ12GP201.xml index 3dccc43..b0c3357 100644 --- a/src/devices/pic/xml_data/24HJ12GP201.xml +++ b/src/devices/pic/xml_data/24HJ12GP201.xml @@ -21,46 +21,46 @@ <memory name="code" start="0x000200" end="0x001FFF" /> <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0xF80000" end="0xF8000F" /> - <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFF" /> + <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFF" /> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x800FFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WRTBS" value="0x01" > + <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0x0F" > + <mask name="WRTBS" value="0x01" > <value value="0x00" name="All" /> <value value="0x01" name="Off" /> - </tqmask> - <tqmask name="BSSIZ" value="0x06" > + </mask> + <mask name="BSSIZ" value="0x06" > <value value="0x00" name="1792" /> <value value="0x02" name="768" /> <value value="0x04" name="256" /> <value value="0x06" name="0" /> - </tqmask> - <tqmask name="BSSEC" value="0x08" > + </mask> + <mask name="BSSEC" value="0x08" > <value value="0x00" name="High Security" /> <value value="0x08" name="Standard Security" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="reserved" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x2" name="reserved" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="WRTGS" value="0x01" > + <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" > + <mask name="WRTGS" value="0x01" > <value value="0x00" name="All" /> <value value="0x01" name="Off" /> - </tqmask> - <tqmask name="GSSEC" value="0x06" > + </mask> + <mask name="GSSEC" value="0x06" > <value value="0x00" name="High Security" /> <value value="0x02" name="High Security" /> <value value="0x04" name="Standard Security" /> <value value="0x06" name="Off" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0x87" > - <tqmask name="FNOSC" value="0x07" > + <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0x87" > + <mask name="FNOSC" value="0x07" > <value value="0x00" name="EXTRC_F" /> <value value="0x01" name="INTRC_F_PLL" /> <value value="0x02" name="PRIM" /> @@ -69,38 +69,38 @@ <value value="0x05" name="EXTRC_LP" /> <value value="0x06" name="invalid" /> <value value="0x07" name="INTRC_F_POST" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" /> <value value="0x80" name="On" /> - </tqmask> + </mask> </config> - <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="POSCMD" value="0x03" > + <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" > + <mask name="POSCMD" value="0x03" > <value value="0x00" name="EC" /> <value value="0x01" name="XT" /> <value value="0x02" name="HS" /> <value value="0x03" name="Off" /> - </tqmask> - <tqmask name="OSCIOFNC" value="0x04" > + </mask> + <mask name="OSCIOFNC" value="0x04" > <value value="0x00" name="IO" /> <value value="0x04" name="Clock" /> - </tqmask> - <tqmask name="IOL1WAY" value="0x20" > + </mask> + <mask name="IOL1WAY" value="0x20" > <value value="0x00" name="Multiple reconfigurations" /> <value value="0x20" name="One reconfiguration" /> - </tqmask> - <tqmask name="FCKSM" value="0xC0" > + </mask> + <mask name="FCKSM" value="0xC0" > <value value="0x00" name="Switching on, monitor on" /> <value value="0x40" name="Switching on, monitor off" /> <value value="0x80" name="Switching off, monitor off" /> <value value="0xC0" name="Switching off, monitor off" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF"> - <tqmask name="WDTPOST" value="0x0F" > + <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF"> + <mask name="WDTPOST" value="0x0F" > <value value="0x00" name="1:1" /> <value value="0x01" name="1:2" /> <value value="0x02" name="1:4" /> @@ -117,23 +117,23 @@ <value value="0x0D" name="1:8192" /> <value value="0x0E" name="1:16384" /> <value value="0x0F" name="1:32768" /> - </tqmask> - <tqmask name="WDTPRE" value="0x10" > + </mask> + <mask name="WDTPRE" value="0x10" > <value value="0x00" name="1:32" /> <value value="0x10" name="1:128" /> - </tqmask> - <tqmask name="WINDIS" value="0x40" > + </mask> + <mask name="WINDIS" value="0x40" > <value value="0x00" name="On" /> <value value="0x40" name="Off" /> - </tqmask> - <tqmask name="FWDTEN" value="0x80" > + </mask> + <mask name="FWDTEN" value="0x80" > <value value="0x00" name="Software" /> <value value="0x80" name="On" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x17" > - <tqmask name="FPWRT" value="0x07" > + <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x17" > + <mask name="FPWRT" value="0x07" > <value value="0x00" name="0" /> <value value="0x01" name="2" /> <value value="0x02" name="4" /> @@ -142,32 +142,32 @@ <value value="0x05" name="32" /> <value value="0x06" name="64" /> <value value="0x07" name="128" /> - </tqmask> - <tqmask name="ALTI2C" value="0x10" > + </mask> + <mask name="ALTI2C" value="0x10" > <value value="0x00" name="ASDA1/ASCL1" /> <value value="0x10" name="SDA1/SCL1" /> - </tqmask> + </mask> </config> - <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" > - <tqmask name="ICS" value="0x03" > + <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" > + <mask name="ICS" value="0x03" > <value value="0x00" name="EMUC3, EMUD3" /> <value value="0x01" name="EMUC2, EMUD2" /> <value value="0x02" name="EMUC1, EMUD1" /> <value value="0x03" name="PGC/EMUC, PGD/EMUD" /> - </tqmask> - <tqmask name="JTAGEN" value="0x20" > + </mask> + <mask name="JTAGEN" value="0x20" > <value value="0x00" name="Off" /> <value value="0x20" name="On" /> - </tqmask> - <tqmask name="COE" value="0x40" > + </mask> + <mask name="COE" value="0x40" > <value value="0x00" name="On" /> <value value="0x40" name="Off" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" /> <value value="0x80" name="Off" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/24HJ12GP202.xml b/src/devices/pic/xml_data/24HJ12GP202.xml index 10dfdbb..60fdce8 100644 --- a/src/devices/pic/xml_data/24HJ12GP202.xml +++ b/src/devices/pic/xml_data/24HJ12GP202.xml @@ -21,46 +21,46 @@ <memory name="code" start="0x000200" end="0x001FFF" /> <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0xF80000" end="0xF8000F" /> - <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFF" /> + <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFF" /> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x800FFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WRTBS" value="0x01" > + <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0x0F" > + <mask name="WRTBS" value="0x01" > <value value="0x00" name="All" /> <value value="0x01" name="Off" /> - </tqmask> - <tqmask name="BSSIZ" value="0x06" > + </mask> + <mask name="BSSIZ" value="0x06" > <value value="0x00" name="1792" /> <value value="0x02" name="768" /> <value value="0x04" name="256" /> <value value="0x06" name="0" /> - </tqmask> - <tqmask name="BSSEC" value="0x08" > + </mask> + <mask name="BSSEC" value="0x08" > <value value="0x00" name="High Security" /> <value value="0x08" name="Standard Security" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="reserved" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x2" name="reserved" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="WRTGS" value="0x01" > + <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" > + <mask name="WRTGS" value="0x01" > <value value="0x00" name="All" /> <value value="0x01" name="Off" /> - </tqmask> - <tqmask name="GSSEC" value="0x06" > + </mask> + <mask name="GSSEC" value="0x06" > <value value="0x00" name="High Security" /> <value value="0x02" name="High Security" /> <value value="0x04" name="Standard Security" /> <value value="0x06" name="Off" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0x87" > - <tqmask name="FNOSC" value="0x07" > + <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0x87" > + <mask name="FNOSC" value="0x07" > <value value="0x00" name="EXTRC_F" /> <value value="0x01" name="INTRC_F_PLL" /> <value value="0x02" name="PRIM" /> @@ -69,38 +69,38 @@ <value value="0x05" name="EXTRC_LP" /> <value value="0x06" name="invalid" /> <value value="0x07" name="INTRC_F_POST" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" /> <value value="0x80" name="On" /> - </tqmask> + </mask> </config> - <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="POSCMD" value="0x03" > + <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" > + <mask name="POSCMD" value="0x03" > <value value="0x00" name="EC" /> <value value="0x01" name="XT" /> <value value="0x02" name="HS" /> <value value="0x03" name="Off" /> - </tqmask> - <tqmask name="OSCIOFNC" value="0x04" > + </mask> + <mask name="OSCIOFNC" value="0x04" > <value value="0x00" name="IO" /> <value value="0x04" name="Clock" /> - </tqmask> - <tqmask name="IOL1WAY" value="0x20" > + </mask> + <mask name="IOL1WAY" value="0x20" > <value value="0x00" name="Multiple reconfigurations" /> <value value="0x20" name="One reconfiguration" /> - </tqmask> - <tqmask name="FCKSM" value="0xC0" > + </mask> + <mask name="FCKSM" value="0xC0" > <value value="0x00" name="Switching on, monitor on" /> <value value="0x40" name="Switching on, monitor off" /> <value value="0x80" name="Switching off, monitor off" /> <value value="0xC0" name="Switching off, monitor off" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF"> - <tqmask name="WDTPOST" value="0x0F" > + <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF"> + <mask name="WDTPOST" value="0x0F" > <value value="0x00" name="1:1" /> <value value="0x01" name="1:2" /> <value value="0x02" name="1:4" /> @@ -117,23 +117,23 @@ <value value="0x0D" name="1:8192" /> <value value="0x0E" name="1:16384" /> <value value="0x0F" name="1:32768" /> - </tqmask> - <tqmask name="WDTPRE" value="0x10" > + </mask> + <mask name="WDTPRE" value="0x10" > <value value="0x00" name="1:32" /> <value value="0x10" name="1:128" /> - </tqmask> - <tqmask name="WINDIS" value="0x40" > + </mask> + <mask name="WINDIS" value="0x40" > <value value="0x00" name="On" /> <value value="0x40" name="Off" /> - </tqmask> - <tqmask name="FWDTEN" value="0x80" > + </mask> + <mask name="FWDTEN" value="0x80" > <value value="0x00" name="Software" /> <value value="0x80" name="On" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x17" > - <tqmask name="FPWRT" value="0x07" > + <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x17" > + <mask name="FPWRT" value="0x07" > <value value="0x00" name="0" /> <value value="0x01" name="2" /> <value value="0x02" name="4" /> @@ -142,32 +142,32 @@ <value value="0x05" name="32" /> <value value="0x06" name="64" /> <value value="0x07" name="128" /> - </tqmask> - <tqmask name="ALTI2C" value="0x10" > + </mask> + <mask name="ALTI2C" value="0x10" > <value value="0x00" name="ASDA1/ASCL1" /> <value value="0x10" name="SDA1/SCL1" /> - </tqmask> + </mask> </config> - <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" > - <tqmask name="ICS" value="0x03" > + <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" > + <mask name="ICS" value="0x03" > <value value="0x00" name="EMUC3, EMUD3" /> <value value="0x01" name="EMUC2, EMUD2" /> <value value="0x02" name="EMUC1, EMUD1" /> <value value="0x03" name="PGC/EMUC, PGD/EMUD" /> - </tqmask> - <tqmask name="JTAGEN" value="0x20" > + </mask> + <mask name="JTAGEN" value="0x20" > <value value="0x00" name="Off" /> <value value="0x20" name="On" /> - </tqmask> - <tqmask name="COE" value="0x40" > + </mask> + <mask name="COE" value="0x40" > <value value="0x00" name="On" /> <value value="0x40" name="Off" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" /> <value value="0x80" name="Off" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/24HJ16GP304.xml b/src/devices/pic/xml_data/24HJ16GP304.xml index 09096ec..f4d50d8 100644 --- a/src/devices/pic/xml_data/24HJ16GP304.xml +++ b/src/devices/pic/xml_data/24HJ16GP304.xml @@ -24,46 +24,46 @@ <memory name="code" start="0x000200" end="0x002BFF" /> <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0xF80000" end="0xF8000F" /> - <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFF" /> + <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFF" /> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x800FFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WRTBS" value="0x01" > + <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0x0F" > + <mask name="WRTBS" value="0x01" > <value value="0x00" name="All" /> <value value="0x01" name="Off" /> - </tqmask> - <tqmask name="BSSIZ" value="0x06" > + </mask> + <mask name="BSSIZ" value="0x06" > <value value="0x00" name="1792" /> <value value="0x02" name="768" /> <value value="0x04" name="256" /> <value value="0x06" name="0" /> - </tqmask> - <tqmask name="BSSEC" value="0x08" > + </mask> + <mask name="BSSEC" value="0x08" > <value value="0x00" name="High Security" /> <value value="0x08" name="Standard Security" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="reserved" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x2" name="reserved" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="WRTGS" value="0x01" > + <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" > + <mask name="WRTGS" value="0x01" > <value value="0x00" name="All" /> <value value="0x01" name="Off" /> - </tqmask> - <tqmask name="GSSEC" value="0x06" > + </mask> + <mask name="GSSEC" value="0x06" > <value value="0x00" name="High Security" /> <value value="0x02" name="High Security" /> <value value="0x04" name="Standard Security" /> <value value="0x06" name="Off" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0x87" > - <tqmask name="FNOSC" value="0x07" > + <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0x87" > + <mask name="FNOSC" value="0x07" > <value value="0x00" name="EXTRC_F" /> <value value="0x01" name="INTRC_F_PLL" /> <value value="0x02" name="PRIM" /> @@ -72,38 +72,38 @@ <value value="0x05" name="EXTRC_LP" /> <value value="0x06" name="invalid" /> <value value="0x07" name="INTRC_F_POST" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" /> <value value="0x80" name="On" /> - </tqmask> + </mask> </config> - <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="POSCMD" value="0x03" > + <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" > + <mask name="POSCMD" value="0x03" > <value value="0x00" name="EC" /> <value value="0x01" name="XT" /> <value value="0x02" name="HS" /> <value value="0x03" name="Off" /> - </tqmask> - <tqmask name="OSCIOFNC" value="0x04" > + </mask> + <mask name="OSCIOFNC" value="0x04" > <value value="0x00" name="IO" /> <value value="0x04" name="Clock" /> - </tqmask> - <tqmask name="IOL1WAY" value="0x20" > + </mask> + <mask name="IOL1WAY" value="0x20" > <value value="0x00" name="Multiple reconfigurations" /> <value value="0x20" name="One reconfiguration" /> - </tqmask> - <tqmask name="FCKSM" value="0xC0" > + </mask> + <mask name="FCKSM" value="0xC0" > <value value="0x00" name="Switching on, monitor on" /> <value value="0x40" name="Switching on, monitor off" /> <value value="0x80" name="Switching off, monitor off" /> <value value="0xC0" name="Switching off, monitor off" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF"> - <tqmask name="WDTPOST" value="0x0F" > + <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF"> + <mask name="WDTPOST" value="0x0F" > <value value="0x00" name="1:1" /> <value value="0x01" name="1:2" /> <value value="0x02" name="1:4" /> @@ -120,23 +120,23 @@ <value value="0x0D" name="1:8192" /> <value value="0x0E" name="1:16384" /> <value value="0x0F" name="1:32768" /> - </tqmask> - <tqmask name="WDTPRE" value="0x10" > + </mask> + <mask name="WDTPRE" value="0x10" > <value value="0x00" name="1:32" /> <value value="0x10" name="1:128" /> - </tqmask> - <tqmask name="WINDIS" value="0x40" > + </mask> + <mask name="WINDIS" value="0x40" > <value value="0x00" name="On" /> <value value="0x40" name="Off" /> - </tqmask> - <tqmask name="FWDTEN" value="0x80" > + </mask> + <mask name="FWDTEN" value="0x80" > <value value="0x00" name="Software" /> <value value="0x80" name="On" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x17" > - <tqmask name="FPWRT" value="0x07" > + <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x17" > + <mask name="FPWRT" value="0x07" > <value value="0x00" name="0" /> <value value="0x01" name="2" /> <value value="0x02" name="4" /> @@ -145,32 +145,32 @@ <value value="0x05" name="32" /> <value value="0x06" name="64" /> <value value="0x07" name="128" /> - </tqmask> - <tqmask name="ALTI2C" value="0x10" > + </mask> + <mask name="ALTI2C" value="0x10" > <value value="0x00" name="ASDA1/ASCL1" /> <value value="0x10" name="SDA1/SCL1" /> - </tqmask> + </mask> </config> - <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" > - <tqmask name="ICS" value="0x03" > + <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" > + <mask name="ICS" value="0x03" > <value value="0x00" name="EMUC3, EMUD3" /> <value value="0x01" name="EMUC2, EMUD2" /> <value value="0x02" name="EMUC1, EMUD1" /> <value value="0x03" name="PGC/EMUC, PGD/EMUD" /> - </tqmask> - <tqmask name="JTAGEN" value="0x20" > + </mask> + <mask name="JTAGEN" value="0x20" > <value value="0x00" name="Off" /> <value value="0x20" name="On" /> - </tqmask> - <tqmask name="COE" value="0x40" > + </mask> + <mask name="COE" value="0x40" > <value value="0x00" name="On" /> <value value="0x40" name="Off" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" /> <value value="0x80" name="Off" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/24HJ256GP206.xml b/src/devices/pic/xml_data/24HJ256GP206.xml index 3335305..d977b29 100644 --- a/src/devices/pic/xml_data/24HJ256GP206.xml +++ b/src/devices/pic/xml_data/24HJ256GP206.xml @@ -21,72 +21,72 @@ <memory name="code" start="0x000200" end="0x02ABFF" /> <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0xF80000" end="0xF8000F" /> - <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFF" /> + <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFF" /> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x800FFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0xCF" > - <tqmask name="WRTBS" value="0x01" > + <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0xCF" > + <mask name="WRTBS" value="0x01" > <value value="0x00" name="All" /> <value value="0x01" name="Off" /> - </tqmask> - <tqmask name="BSSIZ" value="0x06" > + </mask> + <mask name="BSSIZ" value="0x06" > <value value="0x00" name="8192" /> <value value="0x02" name="4096" /> <value value="0x04" name="1024" /> <value value="0x06" name="0" /> - </tqmask> - <tqmask name="BSSEC" value="0x08" > + </mask> + <mask name="BSSEC" value="0x08" > <value value="0x00" name="High Security" /> <value value="0x08" name="Standard Security" /> - </tqmask> - <tqmask name="RBSSIZ" value="0xC0" > + </mask> + <mask name="RBSSIZ" value="0xC0" > <value value="0x00" name="1024" /> <value value="0x40" name="256" /> <value value="0x80" name="128" /> <value value="0xC0" name="0" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="FSS" wtqmask="0xFF" bvalue="0xCF" > - <tqmask name="WRTSS" value="0x01" > + <config offset="0x2" name="FSS" wmask="0xFF" bvalue="0xCF" > + <mask name="WRTSS" value="0x01" > <value value="0x00" name="All" /> <value value="0x01" name="Off" /> - </tqmask> - <tqmask name="SSSIZ" value="0x06" > + </mask> + <mask name="SSSIZ" value="0x06" > <value value="0x00" name="32768" /> <value value="0x02" name="16384" /> <value value="0x04" name="8192" /> <value value="0x06" name="0" /> - </tqmask> - <tqmask name="SSSEC" value="0x08" > + </mask> + <mask name="SSSEC" value="0x08" > <value value="0x00" name="High Security" /> <value value="0x08" name="Standard Security" /> - </tqmask> - <tqmask name="RSSSIZ" value="0xC0" > + </mask> + <mask name="RSSSIZ" value="0xC0" > <value value="0x00" name="4096" /> <value value="0x40" name="2048" /> <value value="0x80" name="256" /> <value value="0xC0" name="0" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="WRTGS" value="0x01" > + <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" > + <mask name="WRTGS" value="0x01" > <value value="0x00" name="All" /> <value value="0x01" name="Off" /> - </tqmask> - <tqmask name="GSSEC" value="0x06" > + </mask> + <mask name="GSSEC" value="0x06" > <value value="0x00" name="High Security" /> <value value="0x02" name="High Security" /> <value value="0x04" name="Standard Security" /> <value value="0x06" name="Off" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0xA7" > - <tqmask name="FNOSC" value="0x07" > + <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0xA7" > + <mask name="FNOSC" value="0x07" > <value value="0x00" name="EXTRC_F" /> <value value="0x01" name="INTRC_F_PLL" /> <value value="0x02" name="PRIM" /> @@ -95,38 +95,38 @@ <value value="0x05" name="EXTRC_LP" /> <value value="0x06" name="invalid" /> <value value="0x07" name="INTRC_F_POST" /> - </tqmask> - <tqmask name="TEMP" value="0x20" > + </mask> + <mask name="TEMP" value="0x20" > <value value="0x00" name="On" /> <value value="0x20" name="Off" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" /> <value value="0x80" name="On" /> - </tqmask> + </mask> </config> - <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="POSCMD" value="0x03" > + <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" > + <mask name="POSCMD" value="0x03" > <value value="0x00" name="EC" /> <value value="0x01" name="XT" /> <value value="0x02" name="HS" /> <value value="0x03" name="Off" /> - </tqmask> - <tqmask name="OSCIOFNC" value="0x04" > + </mask> + <mask name="OSCIOFNC" value="0x04" > <value value="0x00" name="IO" /> <value value="0x04" name="Clock" /> - </tqmask> - <tqmask name="FCKSM" value="0xC0" > + </mask> + <mask name="FCKSM" value="0xC0" > <value value="0x00" name="Switching on, monitor on" /> <value value="0x40" name="Switching on, monitor off" /> <value value="0x80" name="Switching off, monitor off" /> <value value="0xC0" name="Switching off, monitor off" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF"> - <tqmask name="WDTPOST" value="0x0F" > + <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF"> + <mask name="WDTPOST" value="0x0F" > <value value="0x00" name="1:1" /> <value value="0x01" name="1:2" /> <value value="0x02" name="1:4" /> @@ -143,23 +143,23 @@ <value value="0x0D" name="1:8192" /> <value value="0x0E" name="1:16384" /> <value value="0x0F" name="1:32768" /> - </tqmask> - <tqmask name="WDTPRE" value="0x10" > + </mask> + <mask name="WDTPRE" value="0x10" > <value value="0x00" name="1:32" /> <value value="0x10" name="1:128" /> - </tqmask> - <tqmask name="WINDIS" value="0x40" > + </mask> + <mask name="WINDIS" value="0x40" > <value value="0x00" name="On" /> <value value="0x40" name="Off" /> - </tqmask> - <tqmask name="FWDTEN" value="0x80" > + </mask> + <mask name="FWDTEN" value="0x80" > <value value="0x00" name="Software" /> <value value="0x80" name="On" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FPWRT" value="0x07" > + <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x07" > + <mask name="FPWRT" value="0x07" > <value value="0x00" name="0" /> <value value="0x01" name="2" /> <value value="0x02" name="4" /> @@ -168,28 +168,28 @@ <value value="0x05" name="32" /> <value value="0x06" name="64" /> <value value="0x07" name="128" /> - </tqmask> + </mask> </config> - <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" > - <tqmask name="ICS" value="0x03" > + <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" > + <mask name="ICS" value="0x03" > <value value="0x00" name="EMUC3, EMUD3" /> <value value="0x01" name="EMUC2, EMUD2" /> <value value="0x02" name="EMUC1, EMUD1" /> <value value="0x03" name="PGC/EMUC, PGD/EMUD" /> - </tqmask> - <tqmask name="JTAGEN" value="0x20" > + </mask> + <mask name="JTAGEN" value="0x20" > <value value="0x00" name="Off" /> <value value="0x20" name="On" /> - </tqmask> - <tqmask name="COE" value="0x40" > + </mask> + <mask name="COE" value="0x40" > <value value="0x00" name="On" /> <value value="0x40" name="Off" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" /> <value value="0x80" name="Off" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/24HJ256GP210.xml b/src/devices/pic/xml_data/24HJ256GP210.xml index 60f9102..000bc00 100644 --- a/src/devices/pic/xml_data/24HJ256GP210.xml +++ b/src/devices/pic/xml_data/24HJ256GP210.xml @@ -21,72 +21,72 @@ <memory name="code" start="0x000200" end="0x02ABFF" /> <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0xF80000" end="0xF8000F" /> - <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFF" /> + <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFF" /> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x800FFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0xCF" > - <tqmask name="WRTBS" value="0x01" > + <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0xCF" > + <mask name="WRTBS" value="0x01" > <value value="0x00" name="All" /> <value value="0x01" name="Off" /> - </tqmask> - <tqmask name="BSSIZ" value="0x06" > + </mask> + <mask name="BSSIZ" value="0x06" > <value value="0x00" name="8192" /> <value value="0x02" name="4096" /> <value value="0x04" name="1024" /> <value value="0x06" name="0" /> - </tqmask> - <tqmask name="BSSEC" value="0x08" > + </mask> + <mask name="BSSEC" value="0x08" > <value value="0x00" name="High Security" /> <value value="0x08" name="Standard Security" /> - </tqmask> - <tqmask name="RBSSIZ" value="0xC0" > + </mask> + <mask name="RBSSIZ" value="0xC0" > <value value="0x00" name="1024" /> <value value="0x40" name="256" /> <value value="0x80" name="128" /> <value value="0xC0" name="0" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="FSS" wtqmask="0xFF" bvalue="0xCF" > - <tqmask name="WRTSS" value="0x01" > + <config offset="0x2" name="FSS" wmask="0xFF" bvalue="0xCF" > + <mask name="WRTSS" value="0x01" > <value value="0x00" name="All" /> <value value="0x01" name="Off" /> - </tqmask> - <tqmask name="SSSIZ" value="0x06" > + </mask> + <mask name="SSSIZ" value="0x06" > <value value="0x00" name="32768" /> <value value="0x02" name="16384" /> <value value="0x04" name="8192" /> <value value="0x06" name="0" /> - </tqmask> - <tqmask name="SSSEC" value="0x08" > + </mask> + <mask name="SSSEC" value="0x08" > <value value="0x00" name="High Security" /> <value value="0x08" name="Standard Security" /> - </tqmask> - <tqmask name="RSSSIZ" value="0xC0" > + </mask> + <mask name="RSSSIZ" value="0xC0" > <value value="0x00" name="4096" /> <value value="0x40" name="2048" /> <value value="0x80" name="256" /> <value value="0xC0" name="0" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="WRTGS" value="0x01" > + <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" > + <mask name="WRTGS" value="0x01" > <value value="0x00" name="All" /> <value value="0x01" name="Off" /> - </tqmask> - <tqmask name="GSSEC" value="0x06" > + </mask> + <mask name="GSSEC" value="0x06" > <value value="0x00" name="High Security" /> <value value="0x02" name="High Security" /> <value value="0x04" name="Standard Security" /> <value value="0x06" name="Off" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0xA7" > - <tqmask name="FNOSC" value="0x07" > + <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0xA7" > + <mask name="FNOSC" value="0x07" > <value value="0x00" name="EXTRC_F" /> <value value="0x01" name="INTRC_F_PLL" /> <value value="0x02" name="PRIM" /> @@ -95,38 +95,38 @@ <value value="0x05" name="EXTRC_LP" /> <value value="0x06" name="invalid" /> <value value="0x07" name="INTRC_F_POST" /> - </tqmask> - <tqmask name="TEMP" value="0x20" > + </mask> + <mask name="TEMP" value="0x20" > <value value="0x00" name="On" /> <value value="0x20" name="Off" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" /> <value value="0x80" name="On" /> - </tqmask> + </mask> </config> - <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="POSCMD" value="0x03" > + <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" > + <mask name="POSCMD" value="0x03" > <value value="0x00" name="EC" /> <value value="0x01" name="XT" /> <value value="0x02" name="HS" /> <value value="0x03" name="Off" /> - </tqmask> - <tqmask name="OSCIOFNC" value="0x04" > + </mask> + <mask name="OSCIOFNC" value="0x04" > <value value="0x00" name="IO" /> <value value="0x04" name="Clock" /> - </tqmask> - <tqmask name="FCKSM" value="0xC0" > + </mask> + <mask name="FCKSM" value="0xC0" > <value value="0x00" name="Switching on, monitor on" /> <value value="0x40" name="Switching on, monitor off" /> <value value="0x80" name="Switching off, monitor off" /> <value value="0xC0" name="Switching off, monitor off" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF"> - <tqmask name="WDTPOST" value="0x0F" > + <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF"> + <mask name="WDTPOST" value="0x0F" > <value value="0x00" name="1:1" /> <value value="0x01" name="1:2" /> <value value="0x02" name="1:4" /> @@ -143,23 +143,23 @@ <value value="0x0D" name="1:8192" /> <value value="0x0E" name="1:16384" /> <value value="0x0F" name="1:32768" /> - </tqmask> - <tqmask name="WDTPRE" value="0x10" > + </mask> + <mask name="WDTPRE" value="0x10" > <value value="0x00" name="1:32" /> <value value="0x10" name="1:128" /> - </tqmask> - <tqmask name="WINDIS" value="0x40" > + </mask> + <mask name="WINDIS" value="0x40" > <value value="0x00" name="On" /> <value value="0x40" name="Off" /> - </tqmask> - <tqmask name="FWDTEN" value="0x80" > + </mask> + <mask name="FWDTEN" value="0x80" > <value value="0x00" name="Software" /> <value value="0x80" name="On" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FPWRT" value="0x07" > + <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x07" > + <mask name="FPWRT" value="0x07" > <value value="0x00" name="0" /> <value value="0x01" name="2" /> <value value="0x02" name="4" /> @@ -168,28 +168,28 @@ <value value="0x05" name="32" /> <value value="0x06" name="64" /> <value value="0x07" name="128" /> - </tqmask> + </mask> </config> - <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" > - <tqmask name="ICS" value="0x03" > + <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" > + <mask name="ICS" value="0x03" > <value value="0x00" name="EMUC3, EMUD3" /> <value value="0x01" name="EMUC2, EMUD2" /> <value value="0x02" name="EMUC1, EMUD1" /> <value value="0x03" name="PGC/EMUC, PGD/EMUD" /> - </tqmask> - <tqmask name="JTAGEN" value="0x20" > + </mask> + <mask name="JTAGEN" value="0x20" > <value value="0x00" name="Off" /> <value value="0x20" name="On" /> - </tqmask> - <tqmask name="COE" value="0x40" > + </mask> + <mask name="COE" value="0x40" > <value value="0x00" name="On" /> <value value="0x40" name="Off" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" /> <value value="0x80" name="Off" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/24HJ256GP610.xml b/src/devices/pic/xml_data/24HJ256GP610.xml index 3189c39..4c1e714 100644 --- a/src/devices/pic/xml_data/24HJ256GP610.xml +++ b/src/devices/pic/xml_data/24HJ256GP610.xml @@ -21,72 +21,72 @@ <memory name="code" start="0x000200" end="0x02ABFF" /> <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0xF80000" end="0xF8000F" /> - <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFF" /> + <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFF" /> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x800FFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0xCF" > - <tqmask name="WRTBS" value="0x01" > + <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0xCF" > + <mask name="WRTBS" value="0x01" > <value value="0x00" name="All" /> <value value="0x01" name="Off" /> - </tqmask> - <tqmask name="BSSIZ" value="0x06" > + </mask> + <mask name="BSSIZ" value="0x06" > <value value="0x00" name="8192" /> <value value="0x02" name="4096" /> <value value="0x04" name="1024" /> <value value="0x06" name="0" /> - </tqmask> - <tqmask name="BSSEC" value="0x08" > + </mask> + <mask name="BSSEC" value="0x08" > <value value="0x00" name="High Security" /> <value value="0x08" name="Standard Security" /> - </tqmask> - <tqmask name="RBSSIZ" value="0xC0" > + </mask> + <mask name="RBSSIZ" value="0xC0" > <value value="0x00" name="1024" /> <value value="0x40" name="256" /> <value value="0x80" name="128" /> <value value="0xC0" name="0" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="FSS" wtqmask="0xFF" bvalue="0xCF" > - <tqmask name="WRTSS" value="0x01" > + <config offset="0x2" name="FSS" wmask="0xFF" bvalue="0xCF" > + <mask name="WRTSS" value="0x01" > <value value="0x00" name="All" /> <value value="0x01" name="Off" /> - </tqmask> - <tqmask name="SSSIZ" value="0x06" > + </mask> + <mask name="SSSIZ" value="0x06" > <value value="0x00" name="32768" /> <value value="0x02" name="16384" /> <value value="0x04" name="8192" /> <value value="0x06" name="0" /> - </tqmask> - <tqmask name="SSSEC" value="0x08" > + </mask> + <mask name="SSSEC" value="0x08" > <value value="0x00" name="High Security" /> <value value="0x08" name="Standard Security" /> - </tqmask> - <tqmask name="RSSSIZ" value="0xC0" > + </mask> + <mask name="RSSSIZ" value="0xC0" > <value value="0x00" name="4096" /> <value value="0x40" name="2048" /> <value value="0x80" name="256" /> <value value="0xC0" name="0" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="WRTGS" value="0x01" > + <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" > + <mask name="WRTGS" value="0x01" > <value value="0x00" name="All" /> <value value="0x01" name="Off" /> - </tqmask> - <tqmask name="GSSEC" value="0x06" > + </mask> + <mask name="GSSEC" value="0x06" > <value value="0x00" name="High Security" /> <value value="0x02" name="High Security" /> <value value="0x04" name="Standard Security" /> <value value="0x06" name="Off" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0xA7" > - <tqmask name="FNOSC" value="0x07" > + <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0xA7" > + <mask name="FNOSC" value="0x07" > <value value="0x00" name="EXTRC_F" /> <value value="0x01" name="INTRC_F_PLL" /> <value value="0x02" name="PRIM" /> @@ -95,38 +95,38 @@ <value value="0x05" name="EXTRC_LP" /> <value value="0x06" name="invalid" /> <value value="0x07" name="INTRC_F_POST" /> - </tqmask> - <tqmask name="TEMP" value="0x20" > + </mask> + <mask name="TEMP" value="0x20" > <value value="0x00" name="On" /> <value value="0x20" name="Off" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" /> <value value="0x80" name="On" /> - </tqmask> + </mask> </config> - <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="POSCMD" value="0x03" > + <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" > + <mask name="POSCMD" value="0x03" > <value value="0x00" name="EC" /> <value value="0x01" name="XT" /> <value value="0x02" name="HS" /> <value value="0x03" name="Off" /> - </tqmask> - <tqmask name="OSCIOFNC" value="0x04" > + </mask> + <mask name="OSCIOFNC" value="0x04" > <value value="0x00" name="IO" /> <value value="0x04" name="Clock" /> - </tqmask> - <tqmask name="FCKSM" value="0xC0" > + </mask> + <mask name="FCKSM" value="0xC0" > <value value="0x00" name="Switching on, monitor on" /> <value value="0x40" name="Switching on, monitor off" /> <value value="0x80" name="Switching off, monitor off" /> <value value="0xC0" name="Switching off, monitor off" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF"> - <tqmask name="WDTPOST" value="0x0F" > + <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF"> + <mask name="WDTPOST" value="0x0F" > <value value="0x00" name="1:1" /> <value value="0x01" name="1:2" /> <value value="0x02" name="1:4" /> @@ -143,23 +143,23 @@ <value value="0x0D" name="1:8192" /> <value value="0x0E" name="1:16384" /> <value value="0x0F" name="1:32768" /> - </tqmask> - <tqmask name="WDTPRE" value="0x10" > + </mask> + <mask name="WDTPRE" value="0x10" > <value value="0x00" name="1:32" /> <value value="0x10" name="1:128" /> - </tqmask> - <tqmask name="WINDIS" value="0x40" > + </mask> + <mask name="WINDIS" value="0x40" > <value value="0x00" name="On" /> <value value="0x40" name="Off" /> - </tqmask> - <tqmask name="FWDTEN" value="0x80" > + </mask> + <mask name="FWDTEN" value="0x80" > <value value="0x00" name="Software" /> <value value="0x80" name="On" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FPWRT" value="0x07" > + <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x07" > + <mask name="FPWRT" value="0x07" > <value value="0x00" name="0" /> <value value="0x01" name="2" /> <value value="0x02" name="4" /> @@ -168,28 +168,28 @@ <value value="0x05" name="32" /> <value value="0x06" name="64" /> <value value="0x07" name="128" /> - </tqmask> + </mask> </config> - <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" > - <tqmask name="ICS" value="0x03" > + <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" > + <mask name="ICS" value="0x03" > <value value="0x00" name="EMUC3, EMUD3" /> <value value="0x01" name="EMUC2, EMUD2" /> <value value="0x02" name="EMUC1, EMUD1" /> <value value="0x03" name="PGC/EMUC, PGD/EMUD" /> - </tqmask> - <tqmask name="JTAGEN" value="0x20" > + </mask> + <mask name="JTAGEN" value="0x20" > <value value="0x00" name="Off" /> <value value="0x20" name="On" /> - </tqmask> - <tqmask name="COE" value="0x40" > + </mask> + <mask name="COE" value="0x40" > <value value="0x00" name="On" /> <value value="0x40" name="Off" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" /> <value value="0x80" name="Off" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/24HJ32GP202.xml b/src/devices/pic/xml_data/24HJ32GP202.xml index 6f67086..d93607a 100644 --- a/src/devices/pic/xml_data/24HJ32GP202.xml +++ b/src/devices/pic/xml_data/24HJ32GP202.xml @@ -24,46 +24,46 @@ <memory name="code" start="0x000200" end="0x0057FF" /> <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0xF80000" end="0xF8000F" /> - <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFF" /> + <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFF" /> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x800FFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WRTBS" value="0x01" > + <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0x0F" > + <mask name="WRTBS" value="0x01" > <value value="0x00" name="All" /> <value value="0x01" name="Off" /> - </tqmask> - <tqmask name="BSSIZ" value="0x06" > + </mask> + <mask name="BSSIZ" value="0x06" > <value value="0x00" name="1792" /> <value value="0x02" name="768" /> <value value="0x04" name="256" /> <value value="0x06" name="0" /> - </tqmask> - <tqmask name="BSSEC" value="0x08" > + </mask> + <mask name="BSSEC" value="0x08" > <value value="0x00" name="High Security" /> <value value="0x08" name="Standard Security" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="reserved" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x2" name="reserved" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="WRTGS" value="0x01" > + <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" > + <mask name="WRTGS" value="0x01" > <value value="0x00" name="All" /> <value value="0x01" name="Off" /> - </tqmask> - <tqmask name="GSSEC" value="0x06" > + </mask> + <mask name="GSSEC" value="0x06" > <value value="0x00" name="High Security" /> <value value="0x02" name="High Security" /> <value value="0x04" name="Standard Security" /> <value value="0x06" name="Off" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0x87" > - <tqmask name="FNOSC" value="0x07" > + <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0x87" > + <mask name="FNOSC" value="0x07" > <value value="0x00" name="EXTRC_F" /> <value value="0x01" name="INTRC_F_PLL" /> <value value="0x02" name="PRIM" /> @@ -72,38 +72,38 @@ <value value="0x05" name="EXTRC_LP" /> <value value="0x06" name="invalid" /> <value value="0x07" name="INTRC_F_POST" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" /> <value value="0x80" name="On" /> - </tqmask> + </mask> </config> - <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="POSCMD" value="0x03" > + <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" > + <mask name="POSCMD" value="0x03" > <value value="0x00" name="EC" /> <value value="0x01" name="XT" /> <value value="0x02" name="HS" /> <value value="0x03" name="Off" /> - </tqmask> - <tqmask name="OSCIOFNC" value="0x04" > + </mask> + <mask name="OSCIOFNC" value="0x04" > <value value="0x00" name="IO" /> <value value="0x04" name="Clock" /> - </tqmask> - <tqmask name="IOL1WAY" value="0x20" > + </mask> + <mask name="IOL1WAY" value="0x20" > <value value="0x00" name="Multiple reconfigurations" /> <value value="0x20" name="One reconfiguration" /> - </tqmask> - <tqmask name="FCKSM" value="0xC0" > + </mask> + <mask name="FCKSM" value="0xC0" > <value value="0x00" name="Switching on, monitor on" /> <value value="0x40" name="Switching on, monitor off" /> <value value="0x80" name="Switching off, monitor off" /> <value value="0xC0" name="Switching off, monitor off" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF"> - <tqmask name="WDTPOST" value="0x0F" > + <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF"> + <mask name="WDTPOST" value="0x0F" > <value value="0x00" name="1:1" /> <value value="0x01" name="1:2" /> <value value="0x02" name="1:4" /> @@ -120,23 +120,23 @@ <value value="0x0D" name="1:8192" /> <value value="0x0E" name="1:16384" /> <value value="0x0F" name="1:32768" /> - </tqmask> - <tqmask name="WDTPRE" value="0x10" > + </mask> + <mask name="WDTPRE" value="0x10" > <value value="0x00" name="1:32" /> <value value="0x10" name="1:128" /> - </tqmask> - <tqmask name="WINDIS" value="0x40" > + </mask> + <mask name="WINDIS" value="0x40" > <value value="0x00" name="On" /> <value value="0x40" name="Off" /> - </tqmask> - <tqmask name="FWDTEN" value="0x80" > + </mask> + <mask name="FWDTEN" value="0x80" > <value value="0x00" name="Software" /> <value value="0x80" name="On" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x17" > - <tqmask name="FPWRT" value="0x07" > + <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x17" > + <mask name="FPWRT" value="0x07" > <value value="0x00" name="0" /> <value value="0x01" name="2" /> <value value="0x02" name="4" /> @@ -145,32 +145,32 @@ <value value="0x05" name="32" /> <value value="0x06" name="64" /> <value value="0x07" name="128" /> - </tqmask> - <tqmask name="ALTI2C" value="0x10" > + </mask> + <mask name="ALTI2C" value="0x10" > <value value="0x00" name="ASDA1/ASCL1" /> <value value="0x10" name="SDA1/SCL1" /> - </tqmask> + </mask> </config> - <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" > - <tqmask name="ICS" value="0x03" > + <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" > + <mask name="ICS" value="0x03" > <value value="0x00" name="EMUC3, EMUD3" /> <value value="0x01" name="EMUC2, EMUD2" /> <value value="0x02" name="EMUC1, EMUD1" /> <value value="0x03" name="PGC/EMUC, PGD/EMUD" /> - </tqmask> - <tqmask name="JTAGEN" value="0x20" > + </mask> + <mask name="JTAGEN" value="0x20" > <value value="0x00" name="Off" /> <value value="0x20" name="On" /> - </tqmask> - <tqmask name="COE" value="0x40" > + </mask> + <mask name="COE" value="0x40" > <value value="0x00" name="On" /> <value value="0x40" name="Off" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" /> <value value="0x80" name="Off" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/24HJ32GP204.xml b/src/devices/pic/xml_data/24HJ32GP204.xml index 40d90b2..5a9e126 100644 --- a/src/devices/pic/xml_data/24HJ32GP204.xml +++ b/src/devices/pic/xml_data/24HJ32GP204.xml @@ -24,46 +24,46 @@ <memory name="code" start="0x000200" end="0x0057FF" /> <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0xF80000" end="0xF8000F" /> - <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFF" /> + <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFF" /> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x800FFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0x0F" > - <tqmask name="WRTBS" value="0x01" > + <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0x0F" > + <mask name="WRTBS" value="0x01" > <value value="0x00" name="All" /> <value value="0x01" name="Off" /> - </tqmask> - <tqmask name="BSSIZ" value="0x06" > + </mask> + <mask name="BSSIZ" value="0x06" > <value value="0x00" name="1792" /> <value value="0x02" name="768" /> <value value="0x04" name="256" /> <value value="0x06" name="0" /> - </tqmask> - <tqmask name="BSSEC" value="0x08" > + </mask> + <mask name="BSSEC" value="0x08" > <value value="0x00" name="High Security" /> <value value="0x08" name="Standard Security" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="reserved" wtqmask="0xFF" bvalue="0x00" > + <config offset="0x2" name="reserved" wmask="0xFF" bvalue="0x00" > </config> - <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="WRTGS" value="0x01" > + <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" > + <mask name="WRTGS" value="0x01" > <value value="0x00" name="All" /> <value value="0x01" name="Off" /> - </tqmask> - <tqmask name="GSSEC" value="0x06" > + </mask> + <mask name="GSSEC" value="0x06" > <value value="0x00" name="High Security" /> <value value="0x02" name="High Security" /> <value value="0x04" name="Standard Security" /> <value value="0x06" name="Off" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0x87" > - <tqmask name="FNOSC" value="0x07" > + <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0x87" > + <mask name="FNOSC" value="0x07" > <value value="0x00" name="EXTRC_F" /> <value value="0x01" name="INTRC_F_PLL" /> <value value="0x02" name="PRIM" /> @@ -72,38 +72,38 @@ <value value="0x05" name="EXTRC_LP" /> <value value="0x06" name="invalid" /> <value value="0x07" name="INTRC_F_POST" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" /> <value value="0x80" name="On" /> - </tqmask> + </mask> </config> - <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="POSCMD" value="0x03" > + <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" > + <mask name="POSCMD" value="0x03" > <value value="0x00" name="EC" /> <value value="0x01" name="XT" /> <value value="0x02" name="HS" /> <value value="0x03" name="Off" /> - </tqmask> - <tqmask name="OSCIOFNC" value="0x04" > + </mask> + <mask name="OSCIOFNC" value="0x04" > <value value="0x00" name="IO" /> <value value="0x04" name="Clock" /> - </tqmask> - <tqmask name="IOL1WAY" value="0x20" > + </mask> + <mask name="IOL1WAY" value="0x20" > <value value="0x00" name="Multiple reconfigurations" /> <value value="0x20" name="One reconfiguration" /> - </tqmask> - <tqmask name="FCKSM" value="0xC0" > + </mask> + <mask name="FCKSM" value="0xC0" > <value value="0x00" name="Switching on, monitor on" /> <value value="0x40" name="Switching on, monitor off" /> <value value="0x80" name="Switching off, monitor off" /> <value value="0xC0" name="Switching off, monitor off" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF"> - <tqmask name="WDTPOST" value="0x0F" > + <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF"> + <mask name="WDTPOST" value="0x0F" > <value value="0x00" name="1:1" /> <value value="0x01" name="1:2" /> <value value="0x02" name="1:4" /> @@ -120,23 +120,23 @@ <value value="0x0D" name="1:8192" /> <value value="0x0E" name="1:16384" /> <value value="0x0F" name="1:32768" /> - </tqmask> - <tqmask name="WDTPRE" value="0x10" > + </mask> + <mask name="WDTPRE" value="0x10" > <value value="0x00" name="1:32" /> <value value="0x10" name="1:128" /> - </tqmask> - <tqmask name="WINDIS" value="0x40" > + </mask> + <mask name="WINDIS" value="0x40" > <value value="0x00" name="On" /> <value value="0x40" name="Off" /> - </tqmask> - <tqmask name="FWDTEN" value="0x80" > + </mask> + <mask name="FWDTEN" value="0x80" > <value value="0x00" name="Software" /> <value value="0x80" name="On" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x17" > - <tqmask name="FPWRT" value="0x07" > + <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x17" > + <mask name="FPWRT" value="0x07" > <value value="0x00" name="0" /> <value value="0x01" name="2" /> <value value="0x02" name="4" /> @@ -145,32 +145,32 @@ <value value="0x05" name="32" /> <value value="0x06" name="64" /> <value value="0x07" name="128" /> - </tqmask> - <tqmask name="ALTI2C" value="0x10" > + </mask> + <mask name="ALTI2C" value="0x10" > <value value="0x00" name="ASDA1/ASCL1" /> <value value="0x10" name="SDA1/SCL1" /> - </tqmask> + </mask> </config> - <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" > - <tqmask name="ICS" value="0x03" > + <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" > + <mask name="ICS" value="0x03" > <value value="0x00" name="EMUC3, EMUD3" /> <value value="0x01" name="EMUC2, EMUD2" /> <value value="0x02" name="EMUC1, EMUD1" /> <value value="0x03" name="PGC/EMUC, PGD/EMUD" /> - </tqmask> - <tqmask name="JTAGEN" value="0x20" > + </mask> + <mask name="JTAGEN" value="0x20" > <value value="0x00" name="Off" /> <value value="0x20" name="On" /> - </tqmask> - <tqmask name="COE" value="0x40" > + </mask> + <mask name="COE" value="0x40" > <value value="0x00" name="On" /> <value value="0x40" name="Off" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" /> <value value="0x80" name="Off" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/24HJ64GP206.xml b/src/devices/pic/xml_data/24HJ64GP206.xml index 42b47d2..a3266fa 100644 --- a/src/devices/pic/xml_data/24HJ64GP206.xml +++ b/src/devices/pic/xml_data/24HJ64GP206.xml @@ -21,72 +21,72 @@ <memory name="code" start="0x000200" end="0x00ABFF" /> <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0xF80000" end="0xF8000F" /> - <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFF" /> + <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFF" /> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x800FFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0xCF" > - <tqmask name="WRTBS" value="0x01" > + <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0xCF" > + <mask name="WRTBS" value="0x01" > <value value="0x00" name="All" /> <value value="0x01" name="Off" /> - </tqmask> - <tqmask name="BSSIZ" value="0x06" > + </mask> + <mask name="BSSIZ" value="0x06" > <value value="0x00" name="8192" /> <value value="0x02" name="4096" /> <value value="0x04" name="1024" /> <value value="0x06" name="0" /> - </tqmask> - <tqmask name="BSSEC" value="0x08" > + </mask> + <mask name="BSSEC" value="0x08" > <value value="0x00" name="High Security" /> <value value="0x08" name="Standard Security" /> - </tqmask> - <tqmask name="RBSSIZ" value="0xC0" > + </mask> + <mask name="RBSSIZ" value="0xC0" > <value value="0x00" name="1024" /> <value value="0x40" name="256" /> <value value="0x80" name="128" /> <value value="0xC0" name="0" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="FSS" wtqmask="0xFF" bvalue="0xCF" > - <tqmask name="WRTSS" value="0x01" > + <config offset="0x2" name="FSS" wmask="0xFF" bvalue="0xCF" > + <mask name="WRTSS" value="0x01" > <value value="0x00" name="All" /> <value value="0x01" name="Off" /> - </tqmask> - <tqmask name="SSSIZ" value="0x06" > + </mask> + <mask name="SSSIZ" value="0x06" > <value value="0x00" name="16384" /> <value value="0x02" name="8192" /> <value value="0x04" name="4096" /> <value value="0x06" name="0" /> - </tqmask> - <tqmask name="SSSEC" value="0x08" > + </mask> + <mask name="SSSEC" value="0x08" > <value value="0x00" name="High Security" /> <value value="0x08" name="Standard Security" /> - </tqmask> - <tqmask name="RSSSIZ" value="0xC0" > + </mask> + <mask name="RSSSIZ" value="0xC0" > <value value="0x00" name="4096" /> <value value="0x40" name="2048" /> <value value="0x80" name="256" /> <value value="0xC0" name="0" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="WRTGS" value="0x01" > + <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" > + <mask name="WRTGS" value="0x01" > <value value="0x00" name="All" /> <value value="0x01" name="Off" /> - </tqmask> - <tqmask name="GSSEC" value="0x06" > + </mask> + <mask name="GSSEC" value="0x06" > <value value="0x00" name="High Security" /> <value value="0x02" name="High Security" /> <value value="0x04" name="Standard Security" /> <value value="0x06" name="Off" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0xA7" > - <tqmask name="FNOSC" value="0x07" > + <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0xA7" > + <mask name="FNOSC" value="0x07" > <value value="0x00" name="EXTRC_F" /> <value value="0x01" name="INTRC_F_PLL" /> <value value="0x02" name="PRIM" /> @@ -95,38 +95,38 @@ <value value="0x05" name="EXTRC_LP" /> <value value="0x06" name="invalid" /> <value value="0x07" name="INTRC_F_POST" /> - </tqmask> - <tqmask name="TEMP" value="0x20" > + </mask> + <mask name="TEMP" value="0x20" > <value value="0x00" name="On" /> <value value="0x20" name="Off" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" /> <value value="0x80" name="On" /> - </tqmask> + </mask> </config> - <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="POSCMD" value="0x03" > + <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" > + <mask name="POSCMD" value="0x03" > <value value="0x00" name="EC" /> <value value="0x01" name="XT" /> <value value="0x02" name="HS" /> <value value="0x03" name="Off" /> - </tqmask> - <tqmask name="OSCIOFNC" value="0x04" > + </mask> + <mask name="OSCIOFNC" value="0x04" > <value value="0x00" name="IO" /> <value value="0x04" name="Clock" /> - </tqmask> - <tqmask name="FCKSM" value="0xC0" > + </mask> + <mask name="FCKSM" value="0xC0" > <value value="0x00" name="Switching on, monitor on" /> <value value="0x40" name="Switching on, monitor off" /> <value value="0x80" name="Switching off, monitor off" /> <value value="0xC0" name="Switching off, monitor off" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF"> - <tqmask name="WDTPOST" value="0x0F" > + <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF"> + <mask name="WDTPOST" value="0x0F" > <value value="0x00" name="1:1" /> <value value="0x01" name="1:2" /> <value value="0x02" name="1:4" /> @@ -143,23 +143,23 @@ <value value="0x0D" name="1:8192" /> <value value="0x0E" name="1:16384" /> <value value="0x0F" name="1:32768" /> - </tqmask> - <tqmask name="WDTPRE" value="0x10" > + </mask> + <mask name="WDTPRE" value="0x10" > <value value="0x00" name="1:32" /> <value value="0x10" name="1:128" /> - </tqmask> - <tqmask name="WINDIS" value="0x40" > + </mask> + <mask name="WINDIS" value="0x40" > <value value="0x00" name="On" /> <value value="0x40" name="Off" /> - </tqmask> - <tqmask name="FWDTEN" value="0x80" > + </mask> + <mask name="FWDTEN" value="0x80" > <value value="0x00" name="Software" /> <value value="0x80" name="On" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FPWRT" value="0x07" > + <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x07" > + <mask name="FPWRT" value="0x07" > <value value="0x00" name="0" /> <value value="0x01" name="2" /> <value value="0x02" name="4" /> @@ -168,28 +168,28 @@ <value value="0x05" name="32" /> <value value="0x06" name="64" /> <value value="0x07" name="128" /> - </tqmask> + </mask> </config> - <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" > - <tqmask name="ICS" value="0x03" > + <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" > + <mask name="ICS" value="0x03" > <value value="0x00" name="EMUC3, EMUD3" /> <value value="0x01" name="EMUC2, EMUD2" /> <value value="0x02" name="EMUC1, EMUD1" /> <value value="0x03" name="PGC/EMUC, PGD/EMUD" /> - </tqmask> - <tqmask name="JTAGEN" value="0x20" > + </mask> + <mask name="JTAGEN" value="0x20" > <value value="0x00" name="Off" /> <value value="0x20" name="On" /> - </tqmask> - <tqmask name="COE" value="0x40" > + </mask> + <mask name="COE" value="0x40" > <value value="0x00" name="On" /> <value value="0x40" name="Off" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" /> <value value="0x80" name="Off" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/24HJ64GP210.xml b/src/devices/pic/xml_data/24HJ64GP210.xml index 734ce51..630a12a 100644 --- a/src/devices/pic/xml_data/24HJ64GP210.xml +++ b/src/devices/pic/xml_data/24HJ64GP210.xml @@ -21,72 +21,72 @@ <memory name="code" start="0x000200" end="0x00ABFF" /> <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0xF80000" end="0xF8000F" /> - <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFF" /> + <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFF" /> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x800FFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0xCF" > - <tqmask name="WRTBS" value="0x01" > + <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0xCF" > + <mask name="WRTBS" value="0x01" > <value value="0x00" name="All" /> <value value="0x01" name="Off" /> - </tqmask> - <tqmask name="BSSIZ" value="0x06" > + </mask> + <mask name="BSSIZ" value="0x06" > <value value="0x00" name="8192" /> <value value="0x02" name="4096" /> <value value="0x04" name="1024" /> <value value="0x06" name="0" /> - </tqmask> - <tqmask name="BSSEC" value="0x08" > + </mask> + <mask name="BSSEC" value="0x08" > <value value="0x00" name="High Security" /> <value value="0x08" name="Standard Security" /> - </tqmask> - <tqmask name="RBSSIZ" value="0xC0" > + </mask> + <mask name="RBSSIZ" value="0xC0" > <value value="0x00" name="1024" /> <value value="0x40" name="256" /> <value value="0x80" name="128" /> <value value="0xC0" name="0" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="FSS" wtqmask="0xFF" bvalue="0xCF" > - <tqmask name="WRTSS" value="0x01" > + <config offset="0x2" name="FSS" wmask="0xFF" bvalue="0xCF" > + <mask name="WRTSS" value="0x01" > <value value="0x00" name="All" /> <value value="0x01" name="Off" /> - </tqmask> - <tqmask name="SSSIZ" value="0x06" > + </mask> + <mask name="SSSIZ" value="0x06" > <value value="0x00" name="16384" /> <value value="0x02" name="8192" /> <value value="0x04" name="4096" /> <value value="0x06" name="0" /> - </tqmask> - <tqmask name="SSSEC" value="0x08" > + </mask> + <mask name="SSSEC" value="0x08" > <value value="0x00" name="High Security" /> <value value="0x08" name="Standard Security" /> - </tqmask> - <tqmask name="RSSSIZ" value="0xC0" > + </mask> + <mask name="RSSSIZ" value="0xC0" > <value value="0x00" name="4096" /> <value value="0x40" name="2048" /> <value value="0x80" name="256" /> <value value="0xC0" name="0" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="WRTGS" value="0x01" > + <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" > + <mask name="WRTGS" value="0x01" > <value value="0x00" name="All" /> <value value="0x01" name="Off" /> - </tqmask> - <tqmask name="GSSEC" value="0x06" > + </mask> + <mask name="GSSEC" value="0x06" > <value value="0x00" name="High Security" /> <value value="0x02" name="High Security" /> <value value="0x04" name="Standard Security" /> <value value="0x06" name="Off" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0xA7" > - <tqmask name="FNOSC" value="0x07" > + <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0xA7" > + <mask name="FNOSC" value="0x07" > <value value="0x00" name="EXTRC_F" /> <value value="0x01" name="INTRC_F_PLL" /> <value value="0x02" name="PRIM" /> @@ -95,38 +95,38 @@ <value value="0x05" name="EXTRC_LP" /> <value value="0x06" name="invalid" /> <value value="0x07" name="INTRC_F_POST" /> - </tqmask> - <tqmask name="TEMP" value="0x20" > + </mask> + <mask name="TEMP" value="0x20" > <value value="0x00" name="On" /> <value value="0x20" name="Off" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" /> <value value="0x80" name="On" /> - </tqmask> + </mask> </config> - <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="POSCMD" value="0x03" > + <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" > + <mask name="POSCMD" value="0x03" > <value value="0x00" name="EC" /> <value value="0x01" name="XT" /> <value value="0x02" name="HS" /> <value value="0x03" name="Off" /> - </tqmask> - <tqmask name="OSCIOFNC" value="0x04" > + </mask> + <mask name="OSCIOFNC" value="0x04" > <value value="0x00" name="IO" /> <value value="0x04" name="Clock" /> - </tqmask> - <tqmask name="FCKSM" value="0xC0" > + </mask> + <mask name="FCKSM" value="0xC0" > <value value="0x00" name="Switching on, monitor on" /> <value value="0x40" name="Switching on, monitor off" /> <value value="0x80" name="Switching off, monitor off" /> <value value="0xC0" name="Switching off, monitor off" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF"> - <tqmask name="WDTPOST" value="0x0F" > + <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF"> + <mask name="WDTPOST" value="0x0F" > <value value="0x00" name="1:1" /> <value value="0x01" name="1:2" /> <value value="0x02" name="1:4" /> @@ -143,23 +143,23 @@ <value value="0x0D" name="1:8192" /> <value value="0x0E" name="1:16384" /> <value value="0x0F" name="1:32768" /> - </tqmask> - <tqmask name="WDTPRE" value="0x10" > + </mask> + <mask name="WDTPRE" value="0x10" > <value value="0x00" name="1:32" /> <value value="0x10" name="1:128" /> - </tqmask> - <tqmask name="WINDIS" value="0x40" > + </mask> + <mask name="WINDIS" value="0x40" > <value value="0x00" name="On" /> <value value="0x40" name="Off" /> - </tqmask> - <tqmask name="FWDTEN" value="0x80" > + </mask> + <mask name="FWDTEN" value="0x80" > <value value="0x00" name="Software" /> <value value="0x80" name="On" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FPWRT" value="0x07" > + <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x07" > + <mask name="FPWRT" value="0x07" > <value value="0x00" name="0" /> <value value="0x01" name="2" /> <value value="0x02" name="4" /> @@ -168,28 +168,28 @@ <value value="0x05" name="32" /> <value value="0x06" name="64" /> <value value="0x07" name="128" /> - </tqmask> + </mask> </config> - <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" > - <tqmask name="ICS" value="0x03" > + <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" > + <mask name="ICS" value="0x03" > <value value="0x00" name="EMUC3, EMUD3" /> <value value="0x01" name="EMUC2, EMUD2" /> <value value="0x02" name="EMUC1, EMUD1" /> <value value="0x03" name="PGC/EMUC, PGD/EMUD" /> - </tqmask> - <tqmask name="JTAGEN" value="0x20" > + </mask> + <mask name="JTAGEN" value="0x20" > <value value="0x00" name="Off" /> <value value="0x20" name="On" /> - </tqmask> - <tqmask name="COE" value="0x40" > + </mask> + <mask name="COE" value="0x40" > <value value="0x00" name="On" /> <value value="0x40" name="Off" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" /> <value value="0x80" name="Off" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/24HJ64GP506.xml b/src/devices/pic/xml_data/24HJ64GP506.xml index 74a6cfa..372c767 100644 --- a/src/devices/pic/xml_data/24HJ64GP506.xml +++ b/src/devices/pic/xml_data/24HJ64GP506.xml @@ -21,72 +21,72 @@ <memory name="code" start="0x000200" end="0x00ABFF" /> <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0xF80000" end="0xF8000F" /> - <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFF" /> + <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFF" /> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x800FFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0xCF" > - <tqmask name="WRTBS" value="0x01" > + <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0xCF" > + <mask name="WRTBS" value="0x01" > <value value="0x00" name="All" /> <value value="0x01" name="Off" /> - </tqmask> - <tqmask name="BSSIZ" value="0x06" > + </mask> + <mask name="BSSIZ" value="0x06" > <value value="0x00" name="8192" /> <value value="0x02" name="4096" /> <value value="0x04" name="1024" /> <value value="0x06" name="0" /> - </tqmask> - <tqmask name="BSSEC" value="0x08" > + </mask> + <mask name="BSSEC" value="0x08" > <value value="0x00" name="High Security" /> <value value="0x08" name="Standard Security" /> - </tqmask> - <tqmask name="RBSSIZ" value="0xC0" > + </mask> + <mask name="RBSSIZ" value="0xC0" > <value value="0x00" name="1024" /> <value value="0x40" name="256" /> <value value="0x80" name="128" /> <value value="0xC0" name="0" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="FSS" wtqmask="0xFF" bvalue="0xCF" > - <tqmask name="WRTSS" value="0x01" > + <config offset="0x2" name="FSS" wmask="0xFF" bvalue="0xCF" > + <mask name="WRTSS" value="0x01" > <value value="0x00" name="All" /> <value value="0x01" name="Off" /> - </tqmask> - <tqmask name="SSSIZ" value="0x06" > + </mask> + <mask name="SSSIZ" value="0x06" > <value value="0x00" name="16384" /> <value value="0x02" name="8192" /> <value value="0x04" name="4096" /> <value value="0x06" name="0" /> - </tqmask> - <tqmask name="SSSEC" value="0x08" > + </mask> + <mask name="SSSEC" value="0x08" > <value value="0x00" name="High Security" /> <value value="0x08" name="Standard Security" /> - </tqmask> - <tqmask name="RSSSIZ" value="0xC0" > + </mask> + <mask name="RSSSIZ" value="0xC0" > <value value="0x00" name="4096" /> <value value="0x40" name="2048" /> <value value="0x80" name="256" /> <value value="0xC0" name="0" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="WRTGS" value="0x01" > + <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" > + <mask name="WRTGS" value="0x01" > <value value="0x00" name="All" /> <value value="0x01" name="Off" /> - </tqmask> - <tqmask name="GSSEC" value="0x06" > + </mask> + <mask name="GSSEC" value="0x06" > <value value="0x00" name="High Security" /> <value value="0x02" name="High Security" /> <value value="0x04" name="Standard Security" /> <value value="0x06" name="Off" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0xA7" > - <tqmask name="FNOSC" value="0x07" > + <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0xA7" > + <mask name="FNOSC" value="0x07" > <value value="0x00" name="EXTRC_F" /> <value value="0x01" name="INTRC_F_PLL" /> <value value="0x02" name="PRIM" /> @@ -95,38 +95,38 @@ <value value="0x05" name="EXTRC_LP" /> <value value="0x06" name="invalid" /> <value value="0x07" name="INTRC_F_POST" /> - </tqmask> - <tqmask name="TEMP" value="0x20" > + </mask> + <mask name="TEMP" value="0x20" > <value value="0x00" name="On" /> <value value="0x20" name="Off" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" /> <value value="0x80" name="On" /> - </tqmask> + </mask> </config> - <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="POSCMD" value="0x03" > + <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" > + <mask name="POSCMD" value="0x03" > <value value="0x00" name="EC" /> <value value="0x01" name="XT" /> <value value="0x02" name="HS" /> <value value="0x03" name="Off" /> - </tqmask> - <tqmask name="OSCIOFNC" value="0x04" > + </mask> + <mask name="OSCIOFNC" value="0x04" > <value value="0x00" name="IO" /> <value value="0x04" name="Clock" /> - </tqmask> - <tqmask name="FCKSM" value="0xC0" > + </mask> + <mask name="FCKSM" value="0xC0" > <value value="0x00" name="Switching on, monitor on" /> <value value="0x40" name="Switching on, monitor off" /> <value value="0x80" name="Switching off, monitor off" /> <value value="0xC0" name="Switching off, monitor off" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF"> - <tqmask name="WDTPOST" value="0x0F" > + <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF"> + <mask name="WDTPOST" value="0x0F" > <value value="0x00" name="1:1" /> <value value="0x01" name="1:2" /> <value value="0x02" name="1:4" /> @@ -143,23 +143,23 @@ <value value="0x0D" name="1:8192" /> <value value="0x0E" name="1:16384" /> <value value="0x0F" name="1:32768" /> - </tqmask> - <tqmask name="WDTPRE" value="0x10" > + </mask> + <mask name="WDTPRE" value="0x10" > <value value="0x00" name="1:32" /> <value value="0x10" name="1:128" /> - </tqmask> - <tqmask name="WINDIS" value="0x40" > + </mask> + <mask name="WINDIS" value="0x40" > <value value="0x00" name="On" /> <value value="0x40" name="Off" /> - </tqmask> - <tqmask name="FWDTEN" value="0x80" > + </mask> + <mask name="FWDTEN" value="0x80" > <value value="0x00" name="Software" /> <value value="0x80" name="On" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FPWRT" value="0x07" > + <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x07" > + <mask name="FPWRT" value="0x07" > <value value="0x00" name="0" /> <value value="0x01" name="2" /> <value value="0x02" name="4" /> @@ -168,28 +168,28 @@ <value value="0x05" name="32" /> <value value="0x06" name="64" /> <value value="0x07" name="128" /> - </tqmask> + </mask> </config> - <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" > - <tqmask name="ICS" value="0x03" > + <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" > + <mask name="ICS" value="0x03" > <value value="0x00" name="EMUC3, EMUD3" /> <value value="0x01" name="EMUC2, EMUD2" /> <value value="0x02" name="EMUC1, EMUD1" /> <value value="0x03" name="PGC/EMUC, PGD/EMUD" /> - </tqmask> - <tqmask name="JTAGEN" value="0x20" > + </mask> + <mask name="JTAGEN" value="0x20" > <value value="0x00" name="Off" /> <value value="0x20" name="On" /> - </tqmask> - <tqmask name="COE" value="0x40" > + </mask> + <mask name="COE" value="0x40" > <value value="0x00" name="On" /> <value value="0x40" name="Off" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" /> <value value="0x80" name="Off" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/24HJ64GP510.xml b/src/devices/pic/xml_data/24HJ64GP510.xml index 099ab2a..8711793 100644 --- a/src/devices/pic/xml_data/24HJ64GP510.xml +++ b/src/devices/pic/xml_data/24HJ64GP510.xml @@ -21,72 +21,72 @@ <memory name="code" start="0x000200" end="0x00ABFF" /> <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0xF80000" end="0xF8000F" /> - <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFF" /> + <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFF" /> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x800FFF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0xCF" > - <tqmask name="WRTBS" value="0x01" > + <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0xCF" > + <mask name="WRTBS" value="0x01" > <value value="0x00" name="All" /> <value value="0x01" name="Off" /> - </tqmask> - <tqmask name="BSSIZ" value="0x06" > + </mask> + <mask name="BSSIZ" value="0x06" > <value value="0x00" name="8192" /> <value value="0x02" name="4096" /> <value value="0x04" name="1024" /> <value value="0x06" name="0" /> - </tqmask> - <tqmask name="BSSEC" value="0x08" > + </mask> + <mask name="BSSEC" value="0x08" > <value value="0x00" name="High Security" /> <value value="0x08" name="Standard Security" /> - </tqmask> - <tqmask name="RBSSIZ" value="0xC0" > + </mask> + <mask name="RBSSIZ" value="0xC0" > <value value="0x00" name="1024" /> <value value="0x40" name="256" /> <value value="0x80" name="128" /> <value value="0xC0" name="0" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="FSS" wtqmask="0xFF" bvalue="0xCF" > - <tqmask name="WRTSS" value="0x01" > + <config offset="0x2" name="FSS" wmask="0xFF" bvalue="0xCF" > + <mask name="WRTSS" value="0x01" > <value value="0x00" name="All" /> <value value="0x01" name="Off" /> - </tqmask> - <tqmask name="SSSIZ" value="0x06" > + </mask> + <mask name="SSSIZ" value="0x06" > <value value="0x00" name="16384" /> <value value="0x02" name="8192" /> <value value="0x04" name="4096" /> <value value="0x06" name="0" /> - </tqmask> - <tqmask name="SSSEC" value="0x08" > + </mask> + <mask name="SSSEC" value="0x08" > <value value="0x00" name="High Security" /> <value value="0x08" name="Standard Security" /> - </tqmask> - <tqmask name="RSSSIZ" value="0xC0" > + </mask> + <mask name="RSSSIZ" value="0xC0" > <value value="0x00" name="4096" /> <value value="0x40" name="2048" /> <value value="0x80" name="256" /> <value value="0xC0" name="0" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="WRTGS" value="0x01" > + <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" > + <mask name="WRTGS" value="0x01" > <value value="0x00" name="All" /> <value value="0x01" name="Off" /> - </tqmask> - <tqmask name="GSSEC" value="0x06" > + </mask> + <mask name="GSSEC" value="0x06" > <value value="0x00" name="High Security" /> <value value="0x02" name="High Security" /> <value value="0x04" name="Standard Security" /> <value value="0x06" name="Off" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0xA7" > - <tqmask name="FNOSC" value="0x07" > + <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0xA7" > + <mask name="FNOSC" value="0x07" > <value value="0x00" name="EXTRC_F" /> <value value="0x01" name="INTRC_F_PLL" /> <value value="0x02" name="PRIM" /> @@ -95,38 +95,38 @@ <value value="0x05" name="EXTRC_LP" /> <value value="0x06" name="invalid" /> <value value="0x07" name="INTRC_F_POST" /> - </tqmask> - <tqmask name="TEMP" value="0x20" > + </mask> + <mask name="TEMP" value="0x20" > <value value="0x00" name="On" /> <value value="0x20" name="Off" /> - </tqmask> - <tqmask name="IESO" value="0x80" > + </mask> + <mask name="IESO" value="0x80" > <value value="0x00" name="Off" /> <value value="0x80" name="On" /> - </tqmask> + </mask> </config> - <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" > - <tqmask name="POSCMD" value="0x03" > + <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" > + <mask name="POSCMD" value="0x03" > <value value="0x00" name="EC" /> <value value="0x01" name="XT" /> <value value="0x02" name="HS" /> <value value="0x03" name="Off" /> - </tqmask> - <tqmask name="OSCIOFNC" value="0x04" > + </mask> + <mask name="OSCIOFNC" value="0x04" > <value value="0x00" name="IO" /> <value value="0x04" name="Clock" /> - </tqmask> - <tqmask name="FCKSM" value="0xC0" > + </mask> + <mask name="FCKSM" value="0xC0" > <value value="0x00" name="Switching on, monitor on" /> <value value="0x40" name="Switching on, monitor off" /> <value value="0x80" name="Switching off, monitor off" /> <value value="0xC0" name="Switching off, monitor off" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF"> - <tqmask name="WDTPOST" value="0x0F" > + <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF"> + <mask name="WDTPOST" value="0x0F" > <value value="0x00" name="1:1" /> <value value="0x01" name="1:2" /> <value value="0x02" name="1:4" /> @@ -143,23 +143,23 @@ <value value="0x0D" name="1:8192" /> <value value="0x0E" name="1:16384" /> <value value="0x0F" name="1:32768" /> - </tqmask> - <tqmask name="WDTPRE" value="0x10" > + </mask> + <mask name="WDTPRE" value="0x10" > <value value="0x00" name="1:32" /> <value value="0x10" name="1:128" /> - </tqmask> - <tqmask name="WINDIS" value="0x40" > + </mask> + <mask name="WINDIS" value="0x40" > <value value="0x00" name="On" /> <value value="0x40" name="Off" /> - </tqmask> - <tqmask name="FWDTEN" value="0x80" > + </mask> + <mask name="FWDTEN" value="0x80" > <value value="0x00" name="Software" /> <value value="0x80" name="On" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x07" > - <tqmask name="FPWRT" value="0x07" > + <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x07" > + <mask name="FPWRT" value="0x07" > <value value="0x00" name="0" /> <value value="0x01" name="2" /> <value value="0x02" name="4" /> @@ -168,28 +168,28 @@ <value value="0x05" name="32" /> <value value="0x06" name="64" /> <value value="0x07" name="128" /> - </tqmask> + </mask> </config> - <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" > - <tqmask name="ICS" value="0x03" > + <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" > + <mask name="ICS" value="0x03" > <value value="0x00" name="EMUC3, EMUD3" /> <value value="0x01" name="EMUC2, EMUD2" /> <value value="0x02" name="EMUC1, EMUD1" /> <value value="0x03" name="PGC/EMUC, PGD/EMUD" /> - </tqmask> - <tqmask name="JTAGEN" value="0x20" > + </mask> + <mask name="JTAGEN" value="0x20" > <value value="0x00" name="Off" /> <value value="0x20" name="On" /> - </tqmask> - <tqmask name="COE" value="0x40" > + </mask> + <mask name="COE" value="0x40" > <value value="0x00" name="On" /> <value value="0x40" name="Off" /> - </tqmask> - <tqmask name="DEBUG" value="0x80" > + </mask> + <mask name="DEBUG" value="0x80" > <value value="0x00" name="On" /> <value value="0x80" name="Off" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/30F1010.xml b/src/devices/pic/xml_data/30F1010.xml index 7aa7c07..1d59008 100644 --- a/src/devices/pic/xml_data/30F1010.xml +++ b/src/devices/pic/xml_data/30F1010.xml @@ -27,77 +27,77 @@ <memory name="code" start="0x000000" end="0x000FFF" /> <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0xF80000" end="0xF8000F" /> - <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" /> + <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" /> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x80053F" /> <!--* Configuration bits ***************************************************--> -<config offset="0x0" name="FBS" wtqmask="0xFFFF" bvalue="0x000F" > - <tqmask name="WRTBS" value="0x0001" > +<config offset="0x0" name="FBS" wmask="0xFFFF" bvalue="0x000F" > + <mask name="WRTBS" value="0x0001" > <value value="0x0000" name="All" /> <value value="0x0001" name="Off" /> - </tqmask> - <tqmask name="BSSIZ" value="0x0006" > + </mask> + <mask name="BSSIZ" value="0x0006" > <value value="0x0000" name="0" /> <value value="0x0002" name="invalid" /> <value value="0x0004" name="1024" /> <value value="0x0006" name="0" /> - </tqmask> - <tqmask name="BSSEC" value="0x0008" > + </mask> + <mask name="BSSEC" value="0x0008" > <value value="0x0000" name="High Security" /> <value value="0x0008" name="Standard Security" /> - </tqmask> + </mask> </config> -<config offset="0x2" name="reserved" wtqmask="0xFFFF" bvalue="0x0000" ></config> +<config offset="0x2" name="reserved" wmask="0xFFFF" bvalue="0x0000" ></config> -<config offset="0x4" name="FGS" wtqmask="0xFFFF" bvalue="0x0007" > - <tqmask name="WRTGS" value="0x0001" > +<config offset="0x4" name="FGS" wmask="0xFFFF" bvalue="0x0007" > + <mask name="WRTGS" value="0x0001" > <value value="0x0000" name="All" /> <value value="0x0001" name="Off" /> - </tqmask> - <tqmask name="GSSEC" value="0x0006" > + </mask> + <mask name="GSSEC" value="0x0006" > <value value="0x0000" name="High Security" /> <value value="0x0002" name="High Security" /> <value value="0x0004" name="Standard Security" /> <value value="0x0006" name="Off" /> - </tqmask> + </mask> </config> -<config offset="0x6" name="FOSCSEL" wtqmask="0xFFFF" bvalue="0x0003" > - <tqmask name="FNOSC" value="0x0003" > +<config offset="0x6" name="FOSCSEL" wmask="0xFFFF" bvalue="0x0003" > + <mask name="FNOSC" value="0x0003" > <value value="0x0000" name="INTRC_F" /> <value value="0x0001" name="INTRC_F_PLL" /> <value value="0x0002" name="PRIM" /> <value value="0x0003" name="PRIM_PLL" /> - </tqmask> + </mask> </config> -<config offset="0x8" name="FOSC" wtqmask="0xFFFF" bvalue="0x00E7" > - <tqmask name="POSCMD" value="0x0003" > +<config offset="0x8" name="FOSC" wmask="0xFFFF" bvalue="0x00E7" > + <mask name="POSCMD" value="0x0003" > <value value="0x0000" name="EC" /> <value value="0x0001" name="invalid" /> <value value="0x0002" name="HS" /> <value value="0x0003" name="Off" /> - </tqmask> - <tqmask name="OSCIOFNC" value="0x0004" > + </mask> + <mask name="OSCIOFNC" value="0x0004" > <value value="0x0000" name="IO" /> <value value="0x0004" name="Clock" /> - </tqmask> - <tqmask name="FRANGE" value="0x0020" > + </mask> + <mask name="FRANGE" value="0x0020" > <value value="0x0000" name="Low range" /> <value value="0x0020" name="High range" /> - </tqmask> - <tqmask name="FCKSM" value="0x00C0" > + </mask> + <mask name="FCKSM" value="0x00C0" > <value value="0x0000" name="Switching on, monitor on" /> <value value="0x0040" name="Switching on, monitor off" /> <value value="0x0080" name="Switching off, monitor off" /> <value value="0x00C0" name="Switching off, monitor off" /> - </tqmask> + </mask> </config> -<config offset="0xA" name="FWDT" wtqmask="0xFFFF" bvalue="0x00DF"> - <tqmask name="WDTPOST" value="0x000F" > +<config offset="0xA" name="FWDT" wmask="0xFFFF" bvalue="0x00DF"> + <mask name="WDTPOST" value="0x000F" > <value value="0x0000" name="1:1" /> <value value="0x0001" name="1:2" /> <value value="0x0002" name="1:4" /> @@ -114,23 +114,23 @@ <value value="0x000D" name="1:8192" /> <value value="0x000E" name="1:16384" /> <value value="0x000F" name="1:32768" /> - </tqmask> - <tqmask name="WDTPRE" value="0x0010" > + </mask> + <mask name="WDTPRE" value="0x0010" > <value value="0x0000" name="1:32" /> <value value="0x0010" name="1:128" /> - </tqmask> - <tqmask name="WINDIS" value="0x0040" > + </mask> + <mask name="WINDIS" value="0x0040" > <value value="0x0000" name="On" /> <value value="0x0040" name="Off" /> - </tqmask> - <tqmask name="FWDTEN" value="0x0080" > + </mask> + <mask name="FWDTEN" value="0x0080" > <value value="0x0000" name="Software" /> <value value="0x0080" name="On" /> - </tqmask> + </mask> </config> -<config offset="0xC" name="FPOR" wtqmask="0xFFFF" bvalue="0x0007" > - <tqmask name="FPWRT" value="0x0007" > +<config offset="0xC" name="FPOR" wmask="0xFFFF" bvalue="0x0007" > + <mask name="FPWRT" value="0x0007" > <value value="0x0000" name="0" /> <value value="0x0001" name="2" /> <value value="0x0002" name="4" /> @@ -139,20 +139,20 @@ <value value="0x0005" name="32" /> <value value="0x0006" name="64" /> <value value="0x0007" name="128" /> - </tqmask> + </mask> </config> -<config offset="0xE" name="FICD" wtqmask="0xFFFF" bvalue="0x0083" > - <tqmask name="ICS" value="0x0003" > +<config offset="0xE" name="FICD" wmask="0xFFFF" bvalue="0x0083" > + <mask name="ICS" value="0x0003" > <value value="0x0000" name="invalid" /> <value value="0x0001" name="EMUC2, EMUD2" /> <value value="0x0002" name="EMUC1, EMUD1" /> <value value="0x0003" name="PGC/EMUC, PGD/EMUD" /> - </tqmask> - <tqmask name="DEBUG" value="0x0080" > + </mask> + <mask name="DEBUG" value="0x0080" > <value value="0x0000" name="On" /> <value value="0x0080" name="Off" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/30F2010.xml b/src/devices/pic/xml_data/30F2010.xml index 85ec165..f252785 100644 --- a/src/devices/pic/xml_data/30F2010.xml +++ b/src/devices/pic/xml_data/30F2010.xml @@ -36,13 +36,13 @@ <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0xF80000" end="0xF8000D" /> <memory name="eeprom" start="0x7FFC00" end="0x7FFFFF" /> - <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" /> + <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" /> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x80053F" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="FOSC" wtqmask="0xC30F" bvalue="0xC30F" ctqmask="0xC10F" > - <tqmask name="FPR" value="0x000F" > + <config offset="0x0" name="FOSC" wmask="0xC30F" bvalue="0xC30F" cmask="0xC10F" > + <mask name="FPR" value="0x000F" > <value value="0x0000" name="XTL" cname="XTL" /> <value value="0x0001" name="XTL" cname="XTL" /> <value value="0x0002" name="HS" cname="HS" /> @@ -59,22 +59,22 @@ <value value="0x000D" name="EC4" cname="EC_PLL4" /> <value value="0x000E" name="EC8" cname="EC_PLL8" /> <value value="0x000F" name="EC16" cname="EC_PLL16" /> - </tqmask> - <tqmask name="FOS" value="0x0300" > + </mask> + <mask name="FOS" value="0x0300" > <value value="0x0000" name="TMR1" cname="LP" /> <value value="0x0100" name="INTRC_F" cname="FRC" /> <value value="0x0200" name="INTRC_LP" cname="LPRC" /> <value value="0x0300" name="PRIM" cname="_" /> - </tqmask> - <tqmask name="FCKSM" value="0xC000" > + </mask> + <mask name="FCKSM" value="0xC000" > <value value="0x0000" name="Switching on, monitor on" cname="CSW_FSCM_ON" /> <value value="0x4000" name="Switching on, monitor off" cname="CSW_ON_FSCM_OFF" /> <value value="default" name="Switching off, monitor off" cname="CSW_FSCM_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="FWDT" wtqmask="0x803F" bvalue="0x803F" > - <tqmask name="FWPSB" value="0x000F" > + <config offset="0x2" name="FWDT" wmask="0x803F" bvalue="0x803F" > + <mask name="FWPSB" value="0x000F" > <value value="0x0000" name="1:1" cname="WDTPSB_1" /> <value value="0x0001" name="1:2" cname="WDTPSB_2" /> <value value="0x0002" name="1:3" cname="WDTPSB_3" /> @@ -91,84 +91,84 @@ <value value="0x000D" name="1:14" cname="WDTPSB_14" /> <value value="0x000E" name="1:15" cname="WDTPSB_15" /> <value value="0x000F" name="1:16" cname="WDTPSB_16" /> - </tqmask> - <tqmask name="FWPSA" value="0x0030" > + </mask> + <mask name="FWPSA" value="0x0030" > <value value="0x0000" name="1:1" cname="WDTPSA_1" /> <value value="0x0010" name="1:8" cname="WDTPSA_8" /> <value value="0x0020" name="1:64" cname="WDTPSA_64" /> <value value="0x0030" name="1:512" cname="WDTPSA_512" /> - </tqmask> - <tqmask name="FWDTEN" value="0x8000" > + </mask> + <mask name="FWDTEN" value="0x8000" > <value value="0x0000" name="Off" cname="WDT_OFF" /> <value value="0x8000" name="On" cname="WDT_ON" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="FBORPOR" wtqmask="0x87B3" bvalue="0x87B3" > - <tqmask name="FPWRT" value="0x0003" > + <config offset="0x4" name="FBORPOR" wmask="0x87B3" bvalue="0x87B3" > + <mask name="FPWRT" value="0x0003" > <value value="0x0000" name="0" cname="PWRT_OFF" /> <value value="0x0001" name="4" cname="PWRT_4" /> <value value="0x0002" name="16" cname="PWRT_16" /> <value value="0x0003" name="64" cname="PWRT_64" /> - </tqmask> - <tqmask name="BORV" value="0x0030" > + </mask> + <mask name="BORV" value="0x0030" > <value value="0x0000" name="4.5" cname="BORV_45" /> <value value="0x0010" name="4.2" cname="BORV_42" /> <value value="0x0020" name="2.7" cname="BORV_27" /> <value value="0x0030" name="2.0" cname="BORV_20" /> - </tqmask> - <tqmask name="BODEN" value="0x0080" > + </mask> + <mask name="BODEN" value="0x0080" > <value value="0x0000" name="Off" cname="PBOR_OFF" /> <value value="0x0080" name="On" cname="PBOR_ON" /> - </tqmask> - <tqmask name="LPOL" value="0x0100" > + </mask> + <mask name="LPOL" value="0x0100" > <value value="0x0000" name="low" cname="PWMxL_ACT_LO" /> <value value="0x0100" name="high" cname="PWMxL_ACT_HI" /> - </tqmask> - <tqmask name="HPOL" value="0x0200" > + </mask> + <mask name="HPOL" value="0x0200" > <value value="0x0000" name="low" cname="PWMxH_ACT_LO" /> <value value="0x0200" name="high" cname="PWMxH_ACT_HI" /> - </tqmask> - <tqmask name="PWMPIN" value="0x0400" > + </mask> + <mask name="PWMPIN" value="0x0400" > <value value="0x0000" name="On" cname="RST_PWMPIN" /> <value value="0x0400" name="Off" cname="RST_IOPIN" /> - </tqmask> - <tqmask name="MCLRE" value="0x8000" > + </mask> + <mask name="MCLRE" value="0x8000" > <value value="0x0000" name="Internal" cname="MCLR_DIS" /> <value value="0x8000" name="External" cname="MCLR_EN" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x310F" /> + <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x310F" /> - <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x330F" /> + <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x330F" /> - <config offset="0xA" name="FGS" wtqmask="0x0007" bvalue="0x0007" > - <tqmask name="GWRP" value="0x0001" > + <config offset="0xA" name="FGS" wmask="0x0007" bvalue="0x0007" > + <mask name="GWRP" value="0x0001" > <value value="0x0000" name="All" cname="0xFFFE" /> <value value="0x0001" name="Off" cname="_" /> - </tqmask> - <tqmask name="GCP" value="0x0002" > + </mask> + <mask name="GCP" value="0x0002" > <value value="0x0000" name="All" cname="CODE_PROT_ON" /> <value value="0x0002" name="Off" cname="CODE_PROT_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="ICD" wtqmask="0xC003" bvalue="0xC003" > - <tqmask name="ICS" value="0x0003" > + <config offset="0xC" name="ICD" wmask="0xC003" bvalue="0xC003" > + <mask name="ICS" value="0x0003" > <value value="0x0000" name="EMUC3, EMUD3" cname="0xFFFC" /> <value value="0x0001" name="EMUC2, EMUD2" cname="0xFFFD" /> <value value="0x0002" name="EMUC1, EMUD1" cname="0xFFFE" /> <value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" /> - </tqmask> - <tqmask name="COE" value="0x4000" > + </mask> + <mask name="COE" value="0x4000" > <value value="0x0000" name="On" cname="0xBFFF" /> <value value="0x4000" name="Off" cname="_" /> - </tqmask> - <tqmask name="DEBUG" value="0x8000" > + </mask> + <mask name="DEBUG" value="0x8000" > <value value="0x0000" name="On" cname="0x7FFF" /> <value value="0x8000" name="Off" cname="_" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/30F2011.xml b/src/devices/pic/xml_data/30F2011.xml index 54886ed..a767855 100644 --- a/src/devices/pic/xml_data/30F2011.xml +++ b/src/devices/pic/xml_data/30F2011.xml @@ -27,13 +27,13 @@ <memory name="code" start="0x000000" end="0x001FFF" /> <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0xF80000" end="0xF8000D" /> - <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" /> + <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" /> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x80053F" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="FOSC" wtqmask="0xC71F" bvalue="0xC71F" > - <tqmask name="FOSFPR" value="0x071F" > + <config offset="0x0" name="FOSC" wmask="0xC71F" bvalue="0xC71F" > + <mask name="FOSFPR" value="0x071F" > <value value="default" name="invalid" /> <value value="0x001F" name="TMR1" cname="LP" /> <value value="0x011F" name="INTRC_F" cname="FRC" /> @@ -53,16 +53,16 @@ <value value="0x0715" name="HS3_4" cname="HS3_PLL4" /> <value value="0x0716" name="HS3_8" cname="HS3_PLL8" /> <value value="0x0717" name="HS3_16" cname="HS3_PLL16" /> - </tqmask> - <tqmask name="FCKSM" value="0xC000" > + </mask> + <mask name="FCKSM" value="0xC000" > <value value="0x0000" name="Switching on, monitor on" cname="CSW_FSCM_ON" /> <value value="0x4000" name="Switching on, monitor off" cname="CSW_ON_FSCM_OFF" /> <value value="default" name="Switching off, monitor off" cname="CSW_FSCM_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="FWDT" wtqmask="0x803F" bvalue="0x803F" > - <tqmask name="FWPSB" value="0x000F" > + <config offset="0x2" name="FWDT" wmask="0x803F" bvalue="0x803F" > + <mask name="FWPSB" value="0x000F" > <value value="0x0000" name="1:1" cname="WDTPSB_1" /> <value value="0x0001" name="1:2" cname="WDTPSB_2" /> <value value="0x0002" name="1:3" cname="WDTPSB_3" /> @@ -79,72 +79,72 @@ <value value="0x000D" name="1:14" cname="WDTPSB_14" /> <value value="0x000E" name="1:15" cname="WDTPSB_15" /> <value value="0x000F" name="1:16" cname="WDTPSB_16" /> - </tqmask> - <tqmask name="FWPSA" value="0x0030" > + </mask> + <mask name="FWPSA" value="0x0030" > <value value="0x0000" name="1:1" cname="WDTPSA_1" /> <value value="0x0010" name="1:8" cname="WDTPSA_8" /> <value value="0x0020" name="1:64" cname="WDTPSA_64" /> <value value="0x0030" name="1:512" cname="WDTPSA_512" /> - </tqmask> - <tqmask name="FWDTEN" value="0x8000" > + </mask> + <mask name="FWDTEN" value="0x8000" > <value value="0x0000" name="Off" cname="WDT_OFF" /> <value value="0x8000" name="On" cname="WDT_ON" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="FBORPOR" wtqmask="0x87B3" bvalue="0x80B3" > - <tqmask name="FPWRT" value="0x0003" > + <config offset="0x4" name="FBORPOR" wmask="0x87B3" bvalue="0x80B3" > + <mask name="FPWRT" value="0x0003" > <value value="0x0000" name="0" cname="PWRT_OFF" /> <value value="0x0001" name="4" cname="PWRT_4" /> <value value="0x0002" name="16" cname="PWRT_16" /> <value value="0x0003" name="64" cname="PWRT_64" /> - </tqmask> - <tqmask name="BORV" value="0x0030" > + </mask> + <mask name="BORV" value="0x0030" > <value value="0x0000" name="4.5" cname="BORV_45" /> <value value="0x0010" name="4.2" cname="BORV_42" /> <value value="0x0020" name="2.7" cname="BORV_27" /> <value value="0x0030" name="2.0" cname="BORV_20" /> - </tqmask> - <tqmask name="BODEN" value="0x0080" > + </mask> + <mask name="BODEN" value="0x0080" > <value value="0x0000" name="Off" cname="PBOR_OFF" /> <value value="0x0080" name="On" cname="PBOR_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x8000" > + </mask> + <mask name="MCLRE" value="0x8000" > <value value="0x0000" name="Internal" cname="MCLR_DIS" /> <value value="0x8000" name="External" cname="MCLR_EN" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x0000" /> + <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x0000" /> - <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x0000" /> + <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x0000" /> - <config offset="0xA" name="FGS" wtqmask="0x0007" bvalue="0x0003" > - <tqmask name="GWRP" value="0x0001" > + <config offset="0xA" name="FGS" wmask="0x0007" bvalue="0x0003" > + <mask name="GWRP" value="0x0001" > <value value="0x0000" name="All" cname="0xFFFE" /> <value value="0x0001" name="Off" cname="_" /> - </tqmask> - <tqmask name="GCP" value="0x0002" > + </mask> + <mask name="GCP" value="0x0002" > <value value="0x0000" name="All" cname="CODE_PROT_ON" /> <value value="0x0002" name="Off" cname="CODE_PROT_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="ICD" wtqmask="0xC003" bvalue="0xC003" > - <tqmask name="ICS" value="0x0003" > + <config offset="0xC" name="ICD" wmask="0xC003" bvalue="0xC003" > + <mask name="ICS" value="0x0003" > <value value="0x0000" name="EMUC3, EMUD3" cname="0xFFFC" /> <value value="0x0001" name="EMUC2, EMUD2" cname="0xFFFD" /> <value value="0x0002" name="EMUC1, EMUD1" cname="0xFFFE" /> <value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" /> - </tqmask> - <tqmask name="COE" value="0x4000" > + </mask> + <mask name="COE" value="0x4000" > <value value="0x0000" name="On" cname="0xBFFF" /> <value value="0x4000" name="Off" cname="_" /> - </tqmask> - <tqmask name="DEBUG" value="0x8000" > + </mask> + <mask name="DEBUG" value="0x8000" > <value value="0x0000" name="On" cname="0x7FFF" /> <value value="0x8000" name="Off" cname="_" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/30F2012.xml b/src/devices/pic/xml_data/30F2012.xml index 3f0d7ec..6da9eb7 100644 --- a/src/devices/pic/xml_data/30F2012.xml +++ b/src/devices/pic/xml_data/30F2012.xml @@ -27,13 +27,13 @@ <memory name="code" start="0x000000" end="0x001FFF" /> <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0xF80000" end="0xF8000D" /> - <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" /> + <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" /> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x80053F" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="FOSC" wtqmask="0xC71F" bvalue="0xC71F" > - <tqmask name="FOSFPR" value="0x071F" > + <config offset="0x0" name="FOSC" wmask="0xC71F" bvalue="0xC71F" > + <mask name="FOSFPR" value="0x071F" > <value value="default" name="invalid" /> <value value="0x001F" name="TMR1" cname="LP" /> <value value="0x011F" name="INTRC_F" cname="FRC" /> @@ -53,16 +53,16 @@ <value value="0x0715" name="HS3_4" cname="HS3_PLL4" /> <value value="0x0716" name="HS3_8" cname="HS3_PLL8" /> <value value="0x0717" name="HS3_16" cname="HS3_PLL16" /> - </tqmask> - <tqmask name="FCKSM" value="0xC000" > + </mask> + <mask name="FCKSM" value="0xC000" > <value value="0x0000" name="Switching on, monitor on" cname="CSW_FSCM_ON" /> <value value="0x4000" name="Switching on, monitor off" cname="CSW_ON_FSCM_OFF" /> <value value="default" name="Switching off, monitor off" cname="CSW_FSCM_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="FWDT" wtqmask="0x803F" bvalue="0x803F" > - <tqmask name="FWPSB" value="0x000F" > + <config offset="0x2" name="FWDT" wmask="0x803F" bvalue="0x803F" > + <mask name="FWPSB" value="0x000F" > <value value="0x0000" name="1:1" cname="WDTPSB_1" /> <value value="0x0001" name="1:2" cname="WDTPSB_2" /> <value value="0x0002" name="1:3" cname="WDTPSB_3" /> @@ -79,72 +79,72 @@ <value value="0x000D" name="1:14" cname="WDTPSB_14" /> <value value="0x000E" name="1:15" cname="WDTPSB_15" /> <value value="0x000F" name="1:16" cname="WDTPSB_16" /> - </tqmask> - <tqmask name="FWPSA" value="0x0030" > + </mask> + <mask name="FWPSA" value="0x0030" > <value value="0x0000" name="1:1" cname="WDTPSA_1" /> <value value="0x0010" name="1:8" cname="WDTPSA_8" /> <value value="0x0020" name="1:64" cname="WDTPSA_64" /> <value value="0x0030" name="1:512" cname="WDTPSA_512" /> - </tqmask> - <tqmask name="FWDTEN" value="0x8000" > + </mask> + <mask name="FWDTEN" value="0x8000" > <value value="0x0000" name="Off" cname="WDT_OFF" /> <value value="0x8000" name="On" cname="WDT_ON" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="FBORPOR" wtqmask="0x87B3" bvalue="0x80B3" ctqmask="0x87B3" > - <tqmask name="FPWRT" value="0x0003" > + <config offset="0x4" name="FBORPOR" wmask="0x87B3" bvalue="0x80B3" cmask="0x87B3" > + <mask name="FPWRT" value="0x0003" > <value value="0x0000" name="0" cname="PWRT_OFF" /> <value value="0x0001" name="4" cname="PWRT_4" /> <value value="0x0002" name="16" cname="PWRT_16" /> <value value="0x0003" name="64" cname="PWRT_64" /> - </tqmask> - <tqmask name="BORV" value="0x0030" > + </mask> + <mask name="BORV" value="0x0030" > <value value="0x0000" name="4.5" cname="BORV_45" /> <value value="0x0010" name="4.2" cname="BORV_42" /> <value value="0x0020" name="2.7" cname="BORV_27" /> <value value="0x0030" name="2.0" cname="BORV_20" /> - </tqmask> - <tqmask name="BODEN" value="0x0080" > + </mask> + <mask name="BODEN" value="0x0080" > <value value="0x0000" name="Off" cname="PBOR_OFF" /> <value value="0x0080" name="On" cname="PBOR_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x8000" > + </mask> + <mask name="MCLRE" value="0x8000" > <value value="0x0000" name="Internal" cname="MCLR_DIS" /> <value value="0x8000" name="External" cname="MCLR_EN" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x0000" ctqmask="0x310F" /> + <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x0000" cmask="0x310F" /> - <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x0000" ctqmask="0x330F" /> + <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x0000" cmask="0x330F" /> - <config offset="0xA" name="FGS" wtqmask="0x0007" bvalue="0x0003" ctqmask="0x0007" > - <tqmask name="GWRP" value="0x0001" > + <config offset="0xA" name="FGS" wmask="0x0007" bvalue="0x0003" cmask="0x0007" > + <mask name="GWRP" value="0x0001" > <value value="0x0000" name="All" cname="0xFFFE" /> <value value="0x0001" name="Off" cname="_" /> - </tqmask> - <tqmask name="GCP" value="0x0002" > + </mask> + <mask name="GCP" value="0x0002" > <value value="0x0000" name="All" cname="CODE_PROT_ON" /> <value value="0x0002" name="Off" cname="CODE_PROT_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="ICD" wtqmask="0xC003" bvalue="0xC003" > - <tqmask name="ICS" value="0x0003" > + <config offset="0xC" name="ICD" wmask="0xC003" bvalue="0xC003" > + <mask name="ICS" value="0x0003" > <value value="0x0000" name="EMUC3, EMUD3" cname="0xFFFC" /> <value value="0x0001" name="EMUC2, EMUD2" cname="0xFFFD" /> <value value="0x0002" name="EMUC1, EMUD1" cname="0xFFFE" /> <value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" /> - </tqmask> - <tqmask name="COE" value="0x4000" > + </mask> + <mask name="COE" value="0x4000" > <value value="0x0000" name="On" cname="0xBFFF" /> <value value="0x4000" name="Off" cname="_" /> - </tqmask> - <tqmask name="DEBUG" value="0x8000" > + </mask> + <mask name="DEBUG" value="0x8000" > <value value="0x0000" name="On" cname="0x7FFF" /> <value value="0x8000" name="Off" cname="_" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/30F2020.xml b/src/devices/pic/xml_data/30F2020.xml index cad9c22..3aa30e9 100644 --- a/src/devices/pic/xml_data/30F2020.xml +++ b/src/devices/pic/xml_data/30F2020.xml @@ -27,77 +27,77 @@ <memory name="code" start="0x000000" end="0x001FFF" /> <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0xF80000" end="0xF8000F" /> - <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" /> + <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" /> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x80053F" /> <!--* Configuration bits ***************************************************--> -<config offset="0x0" name="FBS" wtqmask="0xFFFF" bvalue="0x000F" > - <tqmask name="WRTBS" value="0x0001" > +<config offset="0x0" name="FBS" wmask="0xFFFF" bvalue="0x000F" > + <mask name="WRTBS" value="0x0001" > <value value="0x0000" name="All" /> <value value="0x0001" name="Off" /> - </tqmask> - <tqmask name="BSSIZ" value="0x0006" > + </mask> + <mask name="BSSIZ" value="0x0006" > <value value="0x0000" name="0" /> <value value="0x0002" name="4096" /> <value value="0x0004" name="1024" /> <value value="0x0006" name="0" /> - </tqmask> - <tqmask name="BSSEC" value="0x0008" > + </mask> + <mask name="BSSEC" value="0x0008" > <value value="0x0000" name="High Security" /> <value value="0x0008" name="Standard Security" /> - </tqmask> + </mask> </config> -<config offset="0x2" name="reserved" wtqmask="0xFFFF" bvalue="0x0000" ></config> +<config offset="0x2" name="reserved" wmask="0xFFFF" bvalue="0x0000" ></config> -<config offset="0x4" name="FGS" wtqmask="0xFFFF" bvalue="0x0007" > - <tqmask name="WRTGS" value="0x0001" > +<config offset="0x4" name="FGS" wmask="0xFFFF" bvalue="0x0007" > + <mask name="WRTGS" value="0x0001" > <value value="0x0000" name="All" /> <value value="0x0001" name="Off" /> - </tqmask> - <tqmask name="GSSEC" value="0x0006" > + </mask> + <mask name="GSSEC" value="0x0006" > <value value="0x0000" name="High Security" /> <value value="0x0002" name="High Security" /> <value value="0x0004" name="Standard Security" /> <value value="0x0006" name="Off" /> - </tqmask> + </mask> </config> -<config offset="0x6" name="FOSCSEL" wtqmask="0xFFFF" bvalue="0x0003" > - <tqmask name="FNOSC" value="0x0003" > +<config offset="0x6" name="FOSCSEL" wmask="0xFFFF" bvalue="0x0003" > + <mask name="FNOSC" value="0x0003" > <value value="0x0000" name="INTRC_F" /> <value value="0x0001" name="INTRC_F_PLL" /> <value value="0x0002" name="PRIM" /> <value value="0x0003" name="PRIM_PLL" /> - </tqmask> + </mask> </config> -<config offset="0x8" name="FOSC" wtqmask="0xFFFF" bvalue="0x00E7" > - <tqmask name="POSCMD" value="0x0003" > +<config offset="0x8" name="FOSC" wmask="0xFFFF" bvalue="0x00E7" > + <mask name="POSCMD" value="0x0003" > <value value="0x0000" name="EC" /> <value value="0x0001" name="invalid" /> <value value="0x0002" name="HS" /> <value value="0x0003" name="Off" /> - </tqmask> - <tqmask name="OSCIOFNC" value="0x0004" > + </mask> + <mask name="OSCIOFNC" value="0x0004" > <value value="0x0000" name="IO" /> <value value="0x0004" name="Clock" /> - </tqmask> - <tqmask name="FRANGE" value="0x0020" > + </mask> + <mask name="FRANGE" value="0x0020" > <value value="0x0000" name="Low range" /> <value value="0x0020" name="High range" /> - </tqmask> - <tqmask name="FCKSM" value="0x00C0" > + </mask> + <mask name="FCKSM" value="0x00C0" > <value value="0x0000" name="Switching on, monitor on" /> <value value="0x0040" name="Switching on, monitor off" /> <value value="0x0080" name="Switching off, monitor off" /> <value value="0x00C0" name="Switching off, monitor off" /> - </tqmask> + </mask> </config> -<config offset="0xA" name="FWDT" wtqmask="0xFFFF" bvalue="0x00DF"> - <tqmask name="WDTPOST" value="0x000F" > +<config offset="0xA" name="FWDT" wmask="0xFFFF" bvalue="0x00DF"> + <mask name="WDTPOST" value="0x000F" > <value value="0x0000" name="1:1" /> <value value="0x0001" name="1:2" /> <value value="0x0002" name="1:4" /> @@ -114,23 +114,23 @@ <value value="0x000D" name="1:8192" /> <value value="0x000E" name="1:16384" /> <value value="0x000F" name="1:32768" /> - </tqmask> - <tqmask name="WDTPRE" value="0x0010" > + </mask> + <mask name="WDTPRE" value="0x0010" > <value value="0x0000" name="1:32" /> <value value="0x0010" name="1:128" /> - </tqmask> - <tqmask name="WINDIS" value="0x0040" > + </mask> + <mask name="WINDIS" value="0x0040" > <value value="0x0000" name="On" /> <value value="0x0040" name="Off" /> - </tqmask> - <tqmask name="FWDTEN" value="0x0080" > + </mask> + <mask name="FWDTEN" value="0x0080" > <value value="0x0000" name="Software" /> <value value="0x0080" name="On" /> - </tqmask> + </mask> </config> -<config offset="0xC" name="FPOR" wtqmask="0xFFFF" bvalue="0x0007" > - <tqmask name="FPWRT" value="0x0007" > +<config offset="0xC" name="FPOR" wmask="0xFFFF" bvalue="0x0007" > + <mask name="FPWRT" value="0x0007" > <value value="0x0000" name="0" /> <value value="0x0001" name="2" /> <value value="0x0002" name="4" /> @@ -139,20 +139,20 @@ <value value="0x0005" name="32" /> <value value="0x0006" name="64" /> <value value="0x0007" name="128" /> - </tqmask> + </mask> </config> -<config offset="0xE" name="FICD" wtqmask="0xFFFF" bvalue="0x0083" > - <tqmask name="ICS" value="0x0003" > +<config offset="0xE" name="FICD" wmask="0xFFFF" bvalue="0x0083" > + <mask name="ICS" value="0x0003" > <value value="0x0000" name="invalid" /> <value value="0x0001" name="EMUC2, EMUD2" /> <value value="0x0002" name="EMUC1, EMUD1" /> <value value="0x0003" name="PGC/EMUC, PGD/EMUD" /> - </tqmask> - <tqmask name="DEBUG" value="0x0080" > + </mask> + <mask name="DEBUG" value="0x0080" > <value value="0x0000" name="On" /> <value value="0x0080" name="Off" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/30F2023.xml b/src/devices/pic/xml_data/30F2023.xml index 6871678..8241600 100644 --- a/src/devices/pic/xml_data/30F2023.xml +++ b/src/devices/pic/xml_data/30F2023.xml @@ -27,77 +27,77 @@ <memory name="code" start="0x000000" end="0x001FFF" /> <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0xF80000" end="0xF8000F" /> - <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" /> + <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" /> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x80053F" /> <!--* Configuration bits ***************************************************--> -<config offset="0x0" name="FBS" wtqmask="0xFFFF" bvalue="0x000F" > - <tqmask name="WRTBS" value="0x0001" > +<config offset="0x0" name="FBS" wmask="0xFFFF" bvalue="0x000F" > + <mask name="WRTBS" value="0x0001" > <value value="0x0000" name="All" /> <value value="0x0001" name="Off" /> - </tqmask> - <tqmask name="BSSIZ" value="0x0006" > + </mask> + <mask name="BSSIZ" value="0x0006" > <value value="0x0000" name="0" /> <value value="0x0002" name="4096" /> <value value="0x0004" name="1024" /> <value value="0x0006" name="0" /> - </tqmask> - <tqmask name="BSSEC" value="0x0008" > + </mask> + <mask name="BSSEC" value="0x0008" > <value value="0x0000" name="High Security" /> <value value="0x0008" name="Standard Security" /> - </tqmask> + </mask> </config> -<config offset="0x2" name="reserved" wtqmask="0xFFFF" bvalue="0x0000" ></config> +<config offset="0x2" name="reserved" wmask="0xFFFF" bvalue="0x0000" ></config> -<config offset="0x4" name="FGS" wtqmask="0xFFFF" bvalue="0x0007" > - <tqmask name="WRTGS" value="0x0001" > +<config offset="0x4" name="FGS" wmask="0xFFFF" bvalue="0x0007" > + <mask name="WRTGS" value="0x0001" > <value value="0x0000" name="All" /> <value value="0x0001" name="Off" /> - </tqmask> - <tqmask name="GSSEC" value="0x0006" > + </mask> + <mask name="GSSEC" value="0x0006" > <value value="0x0000" name="High Security" /> <value value="0x0002" name="High Security" /> <value value="0x0004" name="Standard Security" /> <value value="0x0006" name="Off" /> - </tqmask> + </mask> </config> -<config offset="0x6" name="FOSCSEL" wtqmask="0xFFFF" bvalue="0x0003" > - <tqmask name="FNOSC" value="0x0003" > +<config offset="0x6" name="FOSCSEL" wmask="0xFFFF" bvalue="0x0003" > + <mask name="FNOSC" value="0x0003" > <value value="0x0000" name="INTRC_F" /> <value value="0x0001" name="INTRC_F_PLL" /> <value value="0x0002" name="PRIM" /> <value value="0x0003" name="PRIM_PLL" /> - </tqmask> + </mask> </config> -<config offset="0x8" name="FOSC" wtqmask="0xFFFF" bvalue="0x00E7" > - <tqmask name="POSCMD" value="0x0003" > +<config offset="0x8" name="FOSC" wmask="0xFFFF" bvalue="0x00E7" > + <mask name="POSCMD" value="0x0003" > <value value="0x0000" name="EC" /> <value value="0x0001" name="invalid" /> <value value="0x0002" name="HS" /> <value value="0x0003" name="Off" /> - </tqmask> - <tqmask name="OSCIOFNC" value="0x0004" > + </mask> + <mask name="OSCIOFNC" value="0x0004" > <value value="0x0000" name="IO" /> <value value="0x0004" name="Clock" /> - </tqmask> - <tqmask name="FRANGE" value="0x0020" > + </mask> + <mask name="FRANGE" value="0x0020" > <value value="0x0000" name="Low range" /> <value value="0x0020" name="High range" /> - </tqmask> - <tqmask name="FCKSM" value="0x00C0" > + </mask> + <mask name="FCKSM" value="0x00C0" > <value value="0x0000" name="Switching on, monitor on" /> <value value="0x0040" name="Switching on, monitor off" /> <value value="0x0080" name="Switching off, monitor off" /> <value value="0x00C0" name="Switching off, monitor off" /> - </tqmask> + </mask> </config> -<config offset="0xA" name="FWDT" wtqmask="0xFFFF" bvalue="0x00DF"> - <tqmask name="WDTPOST" value="0x000F" > +<config offset="0xA" name="FWDT" wmask="0xFFFF" bvalue="0x00DF"> + <mask name="WDTPOST" value="0x000F" > <value value="0x0000" name="1:1" /> <value value="0x0001" name="1:2" /> <value value="0x0002" name="1:4" /> @@ -114,23 +114,23 @@ <value value="0x000D" name="1:8192" /> <value value="0x000E" name="1:16384" /> <value value="0x000F" name="1:32768" /> - </tqmask> - <tqmask name="WDTPRE" value="0x0010" > + </mask> + <mask name="WDTPRE" value="0x0010" > <value value="0x0000" name="1:32" /> <value value="0x0010" name="1:128" /> - </tqmask> - <tqmask name="WINDIS" value="0x0040" > + </mask> + <mask name="WINDIS" value="0x0040" > <value value="0x0000" name="On" /> <value value="0x0040" name="Off" /> - </tqmask> - <tqmask name="FWDTEN" value="0x0080" > + </mask> + <mask name="FWDTEN" value="0x0080" > <value value="0x0000" name="Software" /> <value value="0x0080" name="On" /> - </tqmask> + </mask> </config> -<config offset="0xC" name="FPOR" wtqmask="0xFFFF" bvalue="0x0007" > - <tqmask name="FPWRT" value="0x0007" > +<config offset="0xC" name="FPOR" wmask="0xFFFF" bvalue="0x0007" > + <mask name="FPWRT" value="0x0007" > <value value="0x0000" name="0" /> <value value="0x0001" name="2" /> <value value="0x0002" name="4" /> @@ -139,20 +139,20 @@ <value value="0x0005" name="32" /> <value value="0x0006" name="64" /> <value value="0x0007" name="128" /> - </tqmask> + </mask> </config> -<config offset="0xE" name="FICD" wtqmask="0xFFFF" bvalue="0x0083" > - <tqmask name="ICS" value="0x0003" > +<config offset="0xE" name="FICD" wmask="0xFFFF" bvalue="0x0083" > + <mask name="ICS" value="0x0003" > <value value="0x0000" name="invalid" /> <value value="0x0001" name="EMUC2, EMUD2" /> <value value="0x0002" name="EMUC1, EMUD1" /> <value value="0x0003" name="PGC/EMUC, PGD/EMUD" /> - </tqmask> - <tqmask name="DEBUG" value="0x0080" > + </mask> + <mask name="DEBUG" value="0x0080" > <value value="0x0000" name="On" /> <value value="0x0080" name="Off" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/30F3010.xml b/src/devices/pic/xml_data/30F3010.xml index 2d4170d..1041c86 100644 --- a/src/devices/pic/xml_data/30F3010.xml +++ b/src/devices/pic/xml_data/30F3010.xml @@ -28,13 +28,13 @@ <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0xF80000" end="0xF8000D" /> <memory name="eeprom" start="0x7FFC00" end="0x7FFFFF" /> - <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" /> + <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" /> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x80053F" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="FOSC" wtqmask="0xC71F" bvalue="0xC71F" > - <tqmask name="FOSFPR" value="0x071F" > + <config offset="0x0" name="FOSC" wmask="0xC71F" bvalue="0xC71F" > + <mask name="FOSFPR" value="0x071F" > <value value="default" name="invalid" /> <value value="0x001F" name="TMR1" cname="LP" /> <value value="0x011F" name="INTRC_F" cname="FRC" /> @@ -54,16 +54,16 @@ <value value="0x0715" name="HS3_4" cname="HS3_PLL4" /> <value value="0x0716" name="HS3_8" cname="HS3_PLL8" /> <value value="0x0717" name="HS3_16" cname="HS3_PLL16" /> - </tqmask> - <tqmask name="FCKSM" value="0xC000" > + </mask> + <mask name="FCKSM" value="0xC000" > <value value="0x0000" name="Switching on, monitor on" cname="CSW_FSCM_ON" /> <value value="0x4000" name="Switching on, monitor off" cname="CSW_ON_FSCM_OFF" /> <value value="default" name="Switching off, monitor off" cname="CSW_FSCM_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="FWDT" wtqmask="0x803F" bvalue="0x803F" > - <tqmask name="FWPSB" value="0x000F" > + <config offset="0x2" name="FWDT" wmask="0x803F" bvalue="0x803F" > + <mask name="FWPSB" value="0x000F" > <value value="0x0000" name="1:1" cname="WDTPSB_1" /> <value value="0x0001" name="1:2" cname="WDTPSB_2" /> <value value="0x0002" name="1:3" cname="WDTPSB_3" /> @@ -80,84 +80,84 @@ <value value="0x000D" name="1:14" cname="WDTPSB_14" /> <value value="0x000E" name="1:15" cname="WDTPSB_15" /> <value value="0x000F" name="1:16" cname="WDTPSB_16" /> - </tqmask> - <tqmask name="FWPSA" value="0x0030" > + </mask> + <mask name="FWPSA" value="0x0030" > <value value="0x0000" name="1:1" cname="WDTPSA_1" /> <value value="0x0010" name="1:8" cname="WDTPSA_8" /> <value value="0x0020" name="1:64" cname="WDTPSA_64" /> <value value="0x0030" name="1:512" cname="WDTPSA_512" /> - </tqmask> - <tqmask name="FWDTEN" value="0x8000" > + </mask> + <mask name="FWDTEN" value="0x8000" > <value value="0x0000" name="Off" cname="WDT_OFF" /> <value value="0x8000" name="On" cname="WDT_ON" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="FBORPOR" wtqmask="0x87B3" bvalue="0x87B3" > - <tqmask name="FPWRT" value="0x0003" > + <config offset="0x4" name="FBORPOR" wmask="0x87B3" bvalue="0x87B3" > + <mask name="FPWRT" value="0x0003" > <value value="0x0000" name="0" cname="PWRT_OFF" /> <value value="0x0001" name="4" cname="PWRT_4" /> <value value="0x0002" name="16" cname="PWRT_16" /> <value value="0x0003" name="64" cname="PWRT_64" /> - </tqmask> - <tqmask name="BORV" value="0x0030" > + </mask> + <mask name="BORV" value="0x0030" > <value value="0x0000" name="4.5" cname="BORV_45" /> <value value="0x0010" name="4.2" cname="BORV_42" /> <value value="0x0020" name="2.7" cname="BORV_27" /> <value value="0x0030" name="2.0" cname="BORV_20" /> - </tqmask> - <tqmask name="BODEN" value="0x0080" > + </mask> + <mask name="BODEN" value="0x0080" > <value value="0x0000" name="Off" cname="PBOR_OFF" /> <value value="0x0080" name="On" cname="PBOR_ON" /> - </tqmask> - <tqmask name="LPOL" value="0x0100" > + </mask> + <mask name="LPOL" value="0x0100" > <value value="0x0000" name="low" cname="PWMxL_ACT_LO" /> <value value="0x0100" name="high" cname="PWMxL_ACT_HI" /> - </tqmask> - <tqmask name="HPOL" value="0x0200" > + </mask> + <mask name="HPOL" value="0x0200" > <value value="0x0000" name="low" cname="PWMxH_ACT_LO" /> <value value="0x0200" name="high" cname="PWMxH_ACT_HI" /> - </tqmask> - <tqmask name="PWMPIN" value="0x0400" > + </mask> + <mask name="PWMPIN" value="0x0400" > <value value="0x0000" name="On" cname="RST_PWMPIN" /> <value value="0x0400" name="Off" cname="RST_IOPIN" /> - </tqmask> - <tqmask name="MCLRE" value="0x8000" > + </mask> + <mask name="MCLRE" value="0x8000" > <value value="0x0000" name="Internal" cname="MCLR_DIS" /> <value value="0x8000" name="External" cname="MCLR_EN" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x0000" ctqmask="0x310F" /> + <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x0000" cmask="0x310F" /> - <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x0000" ctqmask="0x330F" /> + <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x0000" cmask="0x330F" /> - <config offset="0xA" name="FGS" wtqmask="0x0007" bvalue="0x0003" ctqmask="0x0007" > - <tqmask name="GWRP" value="0x0001" > + <config offset="0xA" name="FGS" wmask="0x0007" bvalue="0x0003" cmask="0x0007" > + <mask name="GWRP" value="0x0001" > <value value="0x0000" name="All" cname="0xFFFE" /> <value value="0x0001" name="Off" cname="_" /> - </tqmask> - <tqmask name="GCP" value="0x0002" > + </mask> + <mask name="GCP" value="0x0002" > <value value="0x0000" name="All" cname="CODE_PROT_ON" /> <value value="0x0002" name="Off" cname="CODE_PROT_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="ICD" wtqmask="0xC003" bvalue="0xC003" > - <tqmask name="ICS" value="0x0003" > + <config offset="0xC" name="ICD" wmask="0xC003" bvalue="0xC003" > + <mask name="ICS" value="0x0003" > <value value="0x0000" name="EMUC3, EMUD3" cname="0xFFFC" /> <value value="0x0001" name="EMUC2, EMUD2" cname="0xFFFD" /> <value value="0x0002" name="EMUC1, EMUD1" cname="0xFFFE" /> <value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" /> - </tqmask> - <tqmask name="COE" value="0x4000" > + </mask> + <mask name="COE" value="0x4000" > <value value="0x0000" name="On" cname="0xBFFF" /> <value value="0x4000" name="Off" cname="_" /> - </tqmask> - <tqmask name="DEBUG" value="0x8000" > + </mask> + <mask name="DEBUG" value="0x8000" > <value value="0x0000" name="On" cname="0x7FFF" /> <value value="0x8000" name="Off" cname="_" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/30F3011.xml b/src/devices/pic/xml_data/30F3011.xml index 6f84490..b092d8b 100644 --- a/src/devices/pic/xml_data/30F3011.xml +++ b/src/devices/pic/xml_data/30F3011.xml @@ -28,13 +28,13 @@ <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0xF80000" end="0xF8000D" /> <memory name="eeprom" start="0x7FFC00" end="0x7FFFFF" /> - <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" /> + <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" /> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x80053F" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="FOSC" wtqmask="0xC71F" bvalue="0xC71F" > - <tqmask name="FOSFPR" value="0x071F" > + <config offset="0x0" name="FOSC" wmask="0xC71F" bvalue="0xC71F" > + <mask name="FOSFPR" value="0x071F" > <value value="default" name="invalid" /> <value value="0x001F" name="TMR1" cname="LP" /> <value value="0x011F" name="INTRC_F" cname="FRC" /> @@ -54,17 +54,17 @@ <value value="0x0715" name="HS3_4" cname="HS3_PLL4" /> <value value="0x0716" name="HS3_8" cname="HS3_PLL8" /> <value value="0x0717" name="HS3_16" cname="HS3_PLL16" /> - </tqmask> - <tqmask name="FCKSM" value="0xC000" > + </mask> + <mask name="FCKSM" value="0xC000" > <value value="0x0000" name="Switching on, monitor on" cname="CSW_FSCM_ON" /> <value value="0x4000" name="Switching on, monitor off" cname="CSW_ON_FSCM_OFF" /> <value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" /> <value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="FWDT" wtqmask="0x803F" bvalue="0x803F" > - <tqmask name="FWPSB" value="0x000F" > + <config offset="0x2" name="FWDT" wmask="0x803F" bvalue="0x803F" > + <mask name="FWPSB" value="0x000F" > <value value="0x0000" name="1:1" cname="WDTPSB_1" /> <value value="0x0001" name="1:2" cname="WDTPSB_2" /> <value value="0x0002" name="1:3" cname="WDTPSB_3" /> @@ -81,84 +81,84 @@ <value value="0x000D" name="1:14" cname="WDTPSB_14" /> <value value="0x000E" name="1:15" cname="WDTPSB_15" /> <value value="0x000F" name="1:16" cname="WDTPSB_16" /> - </tqmask> - <tqmask name="FWPSA" value="0x0030" > + </mask> + <mask name="FWPSA" value="0x0030" > <value value="0x0000" name="1:1" cname="WDTPSA_1" /> <value value="0x0010" name="1:8" cname="WDTPSA_8" /> <value value="0x0020" name="1:64" cname="WDTPSA_64" /> <value value="0x0030" name="1:512" cname="WDTPSA_512" /> - </tqmask> - <tqmask name="FWDTEN" value="0x8000" > + </mask> + <mask name="FWDTEN" value="0x8000" > <value value="0x0000" name="Off" cname="WDT_OFF" /> <value value="0x8000" name="On" cname="WDT_ON" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="FBORPOR" wtqmask="0x87B3" bvalue="0x87B3" > - <tqmask name="FPWRT" value="0x0003" > + <config offset="0x4" name="FBORPOR" wmask="0x87B3" bvalue="0x87B3" > + <mask name="FPWRT" value="0x0003" > <value value="0x0000" name="0" cname="PWRT_OFF" /> <value value="0x0001" name="4" cname="PWRT_4" /> <value value="0x0002" name="16" cname="PWRT_16" /> <value value="0x0003" name="64" cname="PWRT_64" /> - </tqmask> - <tqmask name="BORV" value="0x0030" > + </mask> + <mask name="BORV" value="0x0030" > <value value="0x0000" name="4.5" cname="BORV_45" /> <value value="0x0010" name="4.2" cname="BORV_42" /> <value value="0x0020" name="2.7" cname="BORV_27" /> <value value="0x0030" name="2.0" cname="BORV_20" /> - </tqmask> - <tqmask name="BODEN" value="0x0080" > + </mask> + <mask name="BODEN" value="0x0080" > <value value="0x0000" name="Off" cname="PBOR_OFF" /> <value value="0x0080" name="On" cname="PBOR_ON" /> - </tqmask> - <tqmask name="LPOL" value="0x0100" > + </mask> + <mask name="LPOL" value="0x0100" > <value value="0x0000" name="low" cname="PWMxL_ACT_LO" /> <value value="0x0100" name="high" cname="PWMxL_ACT_HI" /> - </tqmask> - <tqmask name="HPOL" value="0x0200" > + </mask> + <mask name="HPOL" value="0x0200" > <value value="0x0000" name="low" cname="PWMxH_ACT_LO" /> <value value="0x0200" name="high" cname="PWMxH_ACT_HI" /> - </tqmask> - <tqmask name="PWMPIN" value="0x0400" > + </mask> + <mask name="PWMPIN" value="0x0400" > <value value="0x0000" name="On" cname="RST_PWMPIN" /> <value value="0x0400" name="Off" cname="RST_IOPIN" /> - </tqmask> - <tqmask name="MCLRE" value="0x8000" > + </mask> + <mask name="MCLRE" value="0x8000" > <value value="0x0000" name="Internal" cname="MCLR_DIS" /> <value value="0x8000" name="External" cname="MCLR_EN" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x0000" ctqmask="0x310F" /> + <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x0000" cmask="0x310F" /> - <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x0000" ctqmask="0x330F" /> + <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x0000" cmask="0x330F" /> - <config offset="0xA" name="FGS" wtqmask="0x0007" bvalue="0x0003" ctqmask="0x0007" > - <tqmask name="GWRP" value="0x0001" > + <config offset="0xA" name="FGS" wmask="0x0007" bvalue="0x0003" cmask="0x0007" > + <mask name="GWRP" value="0x0001" > <value value="0x0000" name="All" cname="0xFFFE" /> <value value="0x0001" name="Off" cname="_" /> - </tqmask> - <tqmask name="GCP" value="0x0002" > + </mask> + <mask name="GCP" value="0x0002" > <value value="0x0000" name="All" cname="CODE_PROT_ON" /> <value value="0x0002" name="Off" cname="CODE_PROT_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="ICD" wtqmask="0xC003" bvalue="0xC003" > - <tqmask name="ICS" value="0x0003" > + <config offset="0xC" name="ICD" wmask="0xC003" bvalue="0xC003" > + <mask name="ICS" value="0x0003" > <value value="0x0000" name="EMUC3, EMUD3" cname="0xFFFC" /> <value value="0x0001" name="EMUC2, EMUD2" cname="0xFFFD" /> <value value="0x0002" name="EMUC1, EMUD1" cname="0xFFFE" /> <value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" /> - </tqmask> - <tqmask name="COE" value="0x4000" > + </mask> + <mask name="COE" value="0x4000" > <value value="0x0000" name="On" cname="0xBFFF" /> <value value="0x4000" name="Off" cname="_" /> - </tqmask> - <tqmask name="DEBUG" value="0x8000" > + </mask> + <mask name="DEBUG" value="0x8000" > <value value="0x0000" name="On" cname="0x7FFF" /> <value value="0x8000" name="Off" cname="_" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/30F3012.xml b/src/devices/pic/xml_data/30F3012.xml index 4ecc5d3..b87d96a 100644 --- a/src/devices/pic/xml_data/30F3012.xml +++ b/src/devices/pic/xml_data/30F3012.xml @@ -28,13 +28,13 @@ <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0xF80000" end="0xF8000D" /> <memory name="eeprom" start="0x7FFC00" end="0x7FFFFF" /> - <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" /> + <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" /> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x80053F" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="FOSC" wtqmask="0xC71F" bvalue="0xC71F" > - <tqmask name="FOSFPR" value="0x071F" > + <config offset="0x0" name="FOSC" wmask="0xC71F" bvalue="0xC71F" > + <mask name="FOSFPR" value="0x071F" > <value value="default" name="invalid" /> <value value="0x001F" name="TMR1" cname="LP" /> <value value="0x011F" name="INTRC_F" cname="FRC" /> @@ -54,16 +54,16 @@ <value value="0x0715" name="HS3_4" cname="HS3_PLL4" /> <value value="0x0716" name="HS3_8" cname="HS3_PLL8" /> <value value="0x0717" name="HS3_16" cname="HS3_PLL16" /> - </tqmask> - <tqmask name="FCKSM" value="0xC000" > + </mask> + <mask name="FCKSM" value="0xC000" > <value value="0x0000" name="Switching on, monitor on" cname="CSW_FSCM_ON" /> <value value="0x4000" name="Switching on, monitor off" cname="CSW_ON_FSCM_OFF" /> <value value="default" name="Switching off, monitor off" cname="CSW_FSCM_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="FWDT" wtqmask="0x803F" bvalue="0x803F" > - <tqmask name="FWPSB" value="0x000F" > + <config offset="0x2" name="FWDT" wmask="0x803F" bvalue="0x803F" > + <mask name="FWPSB" value="0x000F" > <value value="0x0000" name="1:1" cname="WDTPSB_1" /> <value value="0x0001" name="1:2" cname="WDTPSB_2" /> <value value="0x0002" name="1:3" cname="WDTPSB_3" /> @@ -80,72 +80,72 @@ <value value="0x000D" name="1:14" cname="WDTPSB_14" /> <value value="0x000E" name="1:15" cname="WDTPSB_15" /> <value value="0x000F" name="1:16" cname="WDTPSB_16" /> - </tqmask> - <tqmask name="FWPSA" value="0x0030" > + </mask> + <mask name="FWPSA" value="0x0030" > <value value="0x0000" name="1:1" cname="WDTPSA_1" /> <value value="0x0010" name="1:8" cname="WDTPSA_8" /> <value value="0x0020" name="1:64" cname="WDTPSA_64" /> <value value="0x0030" name="1:512" cname="WDTPSA_512" /> - </tqmask> - <tqmask name="FWDTEN" value="0x8000" > + </mask> + <mask name="FWDTEN" value="0x8000" > <value value="0x0000" name="Off" cname="WDT_OFF" /> <value value="0x8000" name="On" cname="WDT_ON" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="FBORPOR" wtqmask="0x87B3" bvalue="0x80B3" ctqmask="0x87B3" > - <tqmask name="FPWRT" value="0x0003" > + <config offset="0x4" name="FBORPOR" wmask="0x87B3" bvalue="0x80B3" cmask="0x87B3" > + <mask name="FPWRT" value="0x0003" > <value value="0x0000" name="0" cname="PWRT_OFF" /> <value value="0x0001" name="4" cname="PWRT_4" /> <value value="0x0002" name="16" cname="PWRT_16" /> <value value="0x0003" name="64" cname="PWRT_64" /> - </tqmask> - <tqmask name="BORV" value="0x0030" > + </mask> + <mask name="BORV" value="0x0030" > <value value="0x0000" name="4.5" cname="BORV_45" /> <value value="0x0010" name="4.2" cname="BORV_42" /> <value value="0x0020" name="2.7" cname="BORV_27" /> <value value="0x0030" name="2.0" cname="BORV_20" /> - </tqmask> - <tqmask name="BODEN" value="0x0080" > + </mask> + <mask name="BODEN" value="0x0080" > <value value="0x0000" name="Off" cname="PBOR_OFF" /> <value value="0x0080" name="On" cname="PBOR_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x8000" > + </mask> + <mask name="MCLRE" value="0x8000" > <value value="0x0000" name="Internal" cname="MCLR_DIS" /> <value value="0x8000" name="External" cname="MCLR_EN" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x0000" ctqmask="0x310F" /> + <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x0000" cmask="0x310F" /> - <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x0000" ctqmask="0x330F" /> + <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x0000" cmask="0x330F" /> - <config offset="0xA" name="FGS" wtqmask="0x0007" bvalue="0x0003" ctqmask="0x0007" > - <tqmask name="GWRP" value="0x0001" > + <config offset="0xA" name="FGS" wmask="0x0007" bvalue="0x0003" cmask="0x0007" > + <mask name="GWRP" value="0x0001" > <value value="0x0000" name="All" cname="0xFFFE" /> <value value="0x0001" name="Off" cname="_" /> - </tqmask> - <tqmask name="GCP" value="0x0002" > + </mask> + <mask name="GCP" value="0x0002" > <value value="0x0000" name="All" cname="CODE_PROT_ON" /> <value value="0x0002" name="Off" cname="CODE_PROT_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="ICD" wtqmask="0xC003" bvalue="0xC003" > - <tqmask name="ICS" value="0x0003" > + <config offset="0xC" name="ICD" wmask="0xC003" bvalue="0xC003" > + <mask name="ICS" value="0x0003" > <value value="0x0000" name="EMUC3, EMUD3" cname="0xFFFC" /> <value value="0x0001" name="EMUC2, EMUD2" cname="0xFFFD" /> <value value="0x0002" name="EMUC1, EMUD1" cname="0xFFFE" /> <value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" /> - </tqmask> - <tqmask name="COE" value="0x4000" > + </mask> + <mask name="COE" value="0x4000" > <value value="0x0000" name="On" cname="0xBFFF" /> <value value="0x4000" name="Off" cname="_" /> - </tqmask> - <tqmask name="DEBUG" value="0x8000" > + </mask> + <mask name="DEBUG" value="0x8000" > <value value="0x0000" name="On" cname="0x7FFF" /> <value value="0x8000" name="Off" cname="_" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/30F3013.xml b/src/devices/pic/xml_data/30F3013.xml index 337316c..702e415 100644 --- a/src/devices/pic/xml_data/30F3013.xml +++ b/src/devices/pic/xml_data/30F3013.xml @@ -28,13 +28,13 @@ <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0xF80000" end="0xF8000D" /> <memory name="eeprom" start="0x7FFC00" end="0x7FFFFF" /> - <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" /> + <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" /> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x80053F" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="FOSC" wtqmask="0xC71F" bvalue="0xC71F" > - <tqmask name="FOSFPR" value="0x071F" > + <config offset="0x0" name="FOSC" wmask="0xC71F" bvalue="0xC71F" > + <mask name="FOSFPR" value="0x071F" > <value value="default" name="invalid" /> <value value="0x001F" name="TMR1" cname="LP" /> <value value="0x011F" name="INTRC_F" cname="FRC" /> @@ -54,16 +54,16 @@ <value value="0x0715" name="HS3_4" cname="HS3_PLL4" /> <value value="0x0716" name="HS3_8" cname="HS3_PLL8" /> <value value="0x0717" name="HS3_16" cname="HS3_PLL16" /> - </tqmask> - <tqmask name="FCKSM" value="0xC000" > + </mask> + <mask name="FCKSM" value="0xC000" > <value value="0x0000" name="Switching on, monitor on" cname="CSW_FSCM_ON" /> <value value="0x4000" name="Switching on, monitor off" cname="CSW_ON_FSCM_OFF" /> <value value="default" name="Switching off, monitor off" cname="CSW_FSCM_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="FWDT" wtqmask="0x803F" bvalue="0x803F" > - <tqmask name="FWPSB" value="0x000F" > + <config offset="0x2" name="FWDT" wmask="0x803F" bvalue="0x803F" > + <mask name="FWPSB" value="0x000F" > <value value="0x0000" name="1:1" cname="WDTPSB_1" /> <value value="0x0001" name="1:2" cname="WDTPSB_2" /> <value value="0x0002" name="1:3" cname="WDTPSB_3" /> @@ -80,72 +80,72 @@ <value value="0x000D" name="1:14" cname="WDTPSB_14" /> <value value="0x000E" name="1:15" cname="WDTPSB_15" /> <value value="0x000F" name="1:16" cname="WDTPSB_16" /> - </tqmask> - <tqmask name="FWPSA" value="0x0030" > + </mask> + <mask name="FWPSA" value="0x0030" > <value value="0x0000" name="1:1" cname="WDTPSA_1" /> <value value="0x0010" name="1:8" cname="WDTPSA_8" /> <value value="0x0020" name="1:64" cname="WDTPSA_64" /> <value value="0x0030" name="1:512" cname="WDTPSA_512" /> - </tqmask> - <tqmask name="FWDTEN" value="0x8000" > + </mask> + <mask name="FWDTEN" value="0x8000" > <value value="0x0000" name="Off" cname="WDT_OFF" /> <value value="0x8000" name="On" cname="WDT_ON" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="FBORPOR" wtqmask="0x87B3" bvalue="0x80B3" ctqmask="0x87B3" > - <tqmask name="FPWRT" value="0x0003" > + <config offset="0x4" name="FBORPOR" wmask="0x87B3" bvalue="0x80B3" cmask="0x87B3" > + <mask name="FPWRT" value="0x0003" > <value value="0x0000" name="0" cname="PWRT_OFF" /> <value value="0x0001" name="4" cname="PWRT_4" /> <value value="0x0002" name="16" cname="PWRT_16" /> <value value="0x0003" name="64" cname="PWRT_64" /> - </tqmask> - <tqmask name="BORV" value="0x0030" > + </mask> + <mask name="BORV" value="0x0030" > <value value="0x0000" name="4.5" cname="BORV_45" /> <value value="0x0010" name="4.2" cname="BORV_42" /> <value value="0x0020" name="2.7" cname="BORV_27" /> <value value="0x0030" name="2.0" cname="BORV_20" /> - </tqmask> - <tqmask name="BODEN" value="0x0080" > + </mask> + <mask name="BODEN" value="0x0080" > <value value="0x0000" name="Off" cname="PBOR_OFF" /> <value value="0x0080" name="On" cname="PBOR_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x8000" > + </mask> + <mask name="MCLRE" value="0x8000" > <value value="0x0000" name="Internal" cname="MCLR_DIS" /> <value value="0x8000" name="External" cname="MCLR_EN" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x0000" ctqmask="0x310F" /> + <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x0000" cmask="0x310F" /> - <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x0000" ctqmask="0x330F" /> + <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x0000" cmask="0x330F" /> - <config offset="0xA" name="FGS" wtqmask="0x0007" bvalue="0x0003" ctqmask="0x0007" > - <tqmask name="GWRP" value="0x0001" > + <config offset="0xA" name="FGS" wmask="0x0007" bvalue="0x0003" cmask="0x0007" > + <mask name="GWRP" value="0x0001" > <value value="0x0000" name="All" cname="0xFFFE" /> <value value="0x0001" name="Off" cname="_" /> - </tqmask> - <tqmask name="GCP" value="0x0002" > + </mask> + <mask name="GCP" value="0x0002" > <value value="0x0000" name="All" cname="CODE_PROT_ON" /> <value value="0x0002" name="Off" cname="CODE_PROT_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="ICD" wtqmask="0xC003" bvalue="0xC003" > - <tqmask name="ICS" value="0x0003" > + <config offset="0xC" name="ICD" wmask="0xC003" bvalue="0xC003" > + <mask name="ICS" value="0x0003" > <value value="0x0000" name="EMUC3, EMUD3" cname="0xFFFC" /> <value value="0x0001" name="EMUC2, EMUD2" cname="0xFFFD" /> <value value="0x0002" name="EMUC1, EMUD1" cname="0xFFFE" /> <value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" /> - </tqmask> - <tqmask name="COE" value="0x4000" > + </mask> + <mask name="COE" value="0x4000" > <value value="0x0000" name="On" cname="0xBFFF" /> <value value="0x4000" name="Off" cname="_" /> - </tqmask> - <tqmask name="DEBUG" value="0x8000" > + </mask> + <mask name="DEBUG" value="0x8000" > <value value="0x0000" name="On" cname="0x7FFF" /> <value value="0x8000" name="Off" cname="_" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/30F3014.xml b/src/devices/pic/xml_data/30F3014.xml index 870b30b..13bd387 100644 --- a/src/devices/pic/xml_data/30F3014.xml +++ b/src/devices/pic/xml_data/30F3014.xml @@ -28,13 +28,13 @@ <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0xF80000" end="0xF8000D" /> <memory name="eeprom" start="0x7FFC00" end="0x7FFFFF" /> - <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" /> + <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" /> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x80053F" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="FOSC" wtqmask="0xC71F" bvalue="0xC71F" > - <tqmask name="FOSFPR" value="0x071F" > + <config offset="0x0" name="FOSC" wmask="0xC71F" bvalue="0xC71F" > + <mask name="FOSFPR" value="0x071F" > <value value="default" name="invalid" /> <value value="0x001F" name="TMR1" cname="LP" /> <value value="0x011F" name="INTRC_F" cname="FRC" /> @@ -54,16 +54,16 @@ <value value="0x0715" name="HS3_4" cname="HS3_PLL4" /> <value value="0x0716" name="HS3_8" cname="HS3_PLL8" /> <value value="0x0717" name="HS3_16" cname="HS3_PLL16" /> - </tqmask> - <tqmask name="FCKSM" value="0xC000" > + </mask> + <mask name="FCKSM" value="0xC000" > <value value="0x0000" name="Switching on, monitor on" cname="CSW_FSCM_ON" /> <value value="0x4000" name="Switching on, monitor off" cname="CSW_ON_FSCM_OFF" /> <value value="default" name="Switching off, monitor off" cname="CSW_FSCM_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="FWDT" wtqmask="0x803F" bvalue="0x803F" > - <tqmask name="FWPSB" value="0x000F" > + <config offset="0x2" name="FWDT" wmask="0x803F" bvalue="0x803F" > + <mask name="FWPSB" value="0x000F" > <value value="0x0000" name="1:1" cname="WDTPSB_1" /> <value value="0x0001" name="1:2" cname="WDTPSB_2" /> <value value="0x0002" name="1:3" cname="WDTPSB_3" /> @@ -80,72 +80,72 @@ <value value="0x000D" name="1:14" cname="WDTPSB_14" /> <value value="0x000E" name="1:15" cname="WDTPSB_15" /> <value value="0x000F" name="1:16" cname="WDTPSB_16" /> - </tqmask> - <tqmask name="FWPSA" value="0x0030" > + </mask> + <mask name="FWPSA" value="0x0030" > <value value="0x0000" name="1:1" cname="WDTPSA_1" /> <value value="0x0010" name="1:8" cname="WDTPSA_8" /> <value value="0x0020" name="1:64" cname="WDTPSA_64" /> <value value="0x0030" name="1:512" cname="WDTPSA_512" /> - </tqmask> - <tqmask name="FWDTEN" value="0x8000" > + </mask> + <mask name="FWDTEN" value="0x8000" > <value value="0x0000" name="Off" cname="WDT_OFF" /> <value value="0x8000" name="On" cname="WDT_ON" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="FBORPOR" wtqmask="0x87B3" bvalue="0x80B3" ctqmask="0x87B3" > - <tqmask name="FPWRT" value="0x0003" > + <config offset="0x4" name="FBORPOR" wmask="0x87B3" bvalue="0x80B3" cmask="0x87B3" > + <mask name="FPWRT" value="0x0003" > <value value="0x0000" name="0" cname="PWRT_OFF" /> <value value="0x0001" name="4" cname="PWRT_4" /> <value value="0x0002" name="16" cname="PWRT_16" /> <value value="0x0003" name="64" cname="PWRT_64" /> - </tqmask> - <tqmask name="BORV" value="0x0030" > + </mask> + <mask name="BORV" value="0x0030" > <value value="0x0000" name="4.5" cname="BORV_45" /> <value value="0x0010" name="4.2" cname="BORV_42" /> <value value="0x0020" name="2.7" cname="BORV_27" /> <value value="0x0030" name="2.0" cname="BORV_20" /> - </tqmask> - <tqmask name="BODEN" value="0x0080" > + </mask> + <mask name="BODEN" value="0x0080" > <value value="0x0000" name="Off" cname="PBOR_OFF" /> <value value="0x0080" name="On" cname="PBOR_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x8000" > + </mask> + <mask name="MCLRE" value="0x8000" > <value value="0x0000" name="Internal" cname="MCLR_DIS" /> <value value="0x8000" name="External" cname="MCLR_EN" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x0000" ctqmask="0x310F" /> + <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x0000" cmask="0x310F" /> - <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x0000" ctqmask="0x330F" /> + <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x0000" cmask="0x330F" /> - <config offset="0xA" name="FGS" wtqmask="0x0007" bvalue="0x0003" ctqmask="0x0007" > - <tqmask name="GWRP" value="0x0001" > + <config offset="0xA" name="FGS" wmask="0x0007" bvalue="0x0003" cmask="0x0007" > + <mask name="GWRP" value="0x0001" > <value value="0x0000" name="All" cname="0xFFFE" /> <value value="0x0001" name="Off" cname="_" /> - </tqmask> - <tqmask name="GCP" value="0x0002" > + </mask> + <mask name="GCP" value="0x0002" > <value value="0x0000" name="All" cname="CODE_PROT_ON" /> <value value="0x0002" name="Off" cname="CODE_PROT_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="ICD" wtqmask="0xC003" bvalue="0xC003" > - <tqmask name="ICS" value="0x0003" > + <config offset="0xC" name="ICD" wmask="0xC003" bvalue="0xC003" > + <mask name="ICS" value="0x0003" > <value value="0x0000" name="EMUC3, EMUD3" cname="0xFFFC" /> <value value="0x0001" name="EMUC2, EMUD2" cname="0xFFFD" /> <value value="0x0002" name="EMUC1, EMUD1" cname="0xFFFE" /> <value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" /> - </tqmask> - <tqmask name="COE" value="0x4000" > + </mask> + <mask name="COE" value="0x4000" > <value value="0x0000" name="On" cname="0xBFFF" /> <value value="0x4000" name="Off" cname="_" /> - </tqmask> - <tqmask name="DEBUG" value="0x8000" > + </mask> + <mask name="DEBUG" value="0x8000" > <value value="0x0000" name="On" cname="0x7FFF" /> <value value="0x8000" name="Off" cname="_" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/30F4011.xml b/src/devices/pic/xml_data/30F4011.xml index 91f6d83..89791c2 100644 --- a/src/devices/pic/xml_data/30F4011.xml +++ b/src/devices/pic/xml_data/30F4011.xml @@ -28,13 +28,13 @@ <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0xF80000" end="0xF8000D" /> <memory name="eeprom" start="0x7FFC00" end="0x7FFFFF" /> - <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" /> + <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" /> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x80053F" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="FOSC" wtqmask="0xC30F" bvalue="0xC30F" ctqmask="0xC10F" > - <tqmask name="FPR" value="0x000F" > + <config offset="0x0" name="FOSC" wmask="0xC30F" bvalue="0xC30F" cmask="0xC10F" > + <mask name="FPR" value="0x000F" > <value value="0x0000" name="XTL" cname="XTL" /> <value value="0x0001" name="XTL" cname="XTL" /> <value value="0x0002" name="HS" cname="HS" /> @@ -51,23 +51,23 @@ <value value="0x000D" name="EC4" cname="EC_PLL4" /> <value value="0x000E" name="EC8" cname="EC_PLL8" /> <value value="0x000F" name="EC16" cname="EC_PLL16" /> - </tqmask> - <tqmask name="FOS" value="0x0300" > + </mask> + <mask name="FOS" value="0x0300" > <value value="0x0000" name="TMR1" cname="EXT" /> <value value="0x0100" name="INTRC_F" cname="FRC" /> <value value="0x0200" name="INTRC_LP" cname="LP" /> <value value="0x0300" name="PRIM" cname="_" /> - </tqmask> - <tqmask name="FCKSM" value="0xC000" > + </mask> + <mask name="FCKSM" value="0xC000" > <value value="0x0000" name="Switching on, monitor on" cname="CSW_FSCM_ON" /> <value value="0x4000" name="Switching on, monitor off" cname="CSW_ON_FSCM_OFF" /> <value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" /> <value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="FWDT" wtqmask="0x803F" bvalue="0x803F" > - <tqmask name="FWPSB" value="0x000F" > + <config offset="0x2" name="FWDT" wmask="0x803F" bvalue="0x803F" > + <mask name="FWPSB" value="0x000F" > <value value="0x0000" name="1:1" cname="WDTPSB_1" /> <value value="0x0001" name="1:2" cname="WDTPSB_2" /> <value value="0x0002" name="1:3" cname="WDTPSB_3" /> @@ -84,84 +84,84 @@ <value value="0x000D" name="1:14" cname="WDTPSB_14" /> <value value="0x000E" name="1:15" cname="WDTPSB_15" /> <value value="0x000F" name="1:16" cname="WDTPSB_16" /> - </tqmask> - <tqmask name="FWPSA" value="0x0030" > + </mask> + <mask name="FWPSA" value="0x0030" > <value value="0x0000" name="1:1" cname="WDTPSA_1" /> <value value="0x0010" name="1:8" cname="WDTPSA_8" /> <value value="0x0020" name="1:64" cname="WDTPSA_64" /> <value value="0x0030" name="1:512" cname="WDTPSA_512" /> - </tqmask> - <tqmask name="FWDTEN" value="0x8000" > + </mask> + <mask name="FWDTEN" value="0x8000" > <value value="0x0000" name="Off" cname="WDT_OFF" /> <value value="0x8000" name="On" cname="WDT_ON" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="FBORPOR" wtqmask="0x87B3" bvalue="0x87B3" > - <tqmask name="FPWRT" value="0x0003" > + <config offset="0x4" name="FBORPOR" wmask="0x87B3" bvalue="0x87B3" > + <mask name="FPWRT" value="0x0003" > <value value="0x0000" name="0" cname="PWRT_OFF" /> <value value="0x0001" name="4" cname="PWRT_4" /> <value value="0x0002" name="16" cname="PWRT_16" /> <value value="0x0003" name="64" cname="PWRT_64" /> - </tqmask> - <tqmask name="BORV" value="0x0030" > + </mask> + <mask name="BORV" value="0x0030" > <value value="0x0000" name="4.5" cname="BORV_45" /> <value value="0x0010" name="4.2" cname="BORV_42" /> <value value="0x0020" name="2.7" cname="BORV_27" /> <value value="0x0030" name="2.0" cname="BORV_20" /> - </tqmask> - <tqmask name="BODEN" value="0x0080" > + </mask> + <mask name="BODEN" value="0x0080" > <value value="0x0000" name="Off" cname="PBOR_OFF" /> <value value="0x0080" name="On" cname="PBOR_ON" /> - </tqmask> - <tqmask name="LPOL" value="0x0100" > + </mask> + <mask name="LPOL" value="0x0100" > <value value="0x0000" name="low" cname="PWMxL_ACT_LO" /> <value value="0x0100" name="high" cname="PWMxL_ACT_HI" /> - </tqmask> - <tqmask name="HPOL" value="0x0200" > + </mask> + <mask name="HPOL" value="0x0200" > <value value="0x0000" name="low" cname="PWMxH_ACT_LO" /> <value value="0x0200" name="high" cname="PWMxH_ACT_HI" /> - </tqmask> - <tqmask name="PWMPIN" value="0x0400" > + </mask> + <mask name="PWMPIN" value="0x0400" > <value value="0x0000" name="On" cname="RST_PWMPIN" /> <value value="0x0400" name="Off" cname="RST_IOPIN" /> - </tqmask> - <tqmask name="MCLRE" value="0x8000" > + </mask> + <mask name="MCLRE" value="0x8000" > <value value="0x0000" name="Internal" cname="MCLR_DIS" /> <value value="0x8000" name="External" cname="MCLR_EN" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x0000" ctqmask="0x310F" /> + <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x0000" cmask="0x310F" /> - <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x0000" ctqmask="0x330F" /> + <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x0000" cmask="0x330F" /> - <config offset="0xA" name="FGS" wtqmask="0x0007" bvalue="0x0003" ctqmask="0x0007" > - <tqmask name="GWRP" value="0x0001" > + <config offset="0xA" name="FGS" wmask="0x0007" bvalue="0x0003" cmask="0x0007" > + <mask name="GWRP" value="0x0001" > <value value="0x0000" name="All" cname="0xFFFE" /> <value value="0x0001" name="Off" cname="_" /> - </tqmask> - <tqmask name="GCP" value="0x0002" > + </mask> + <mask name="GCP" value="0x0002" > <value value="0x0000" name="All" cname="CODE_PROT_ON" /> <value value="0x0002" name="Off" cname="CODE_PROT_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="ICD" wtqmask="0xC003" bvalue="0xC003" > - <tqmask name="ICS" value="0x0003" > + <config offset="0xC" name="ICD" wmask="0xC003" bvalue="0xC003" > + <mask name="ICS" value="0x0003" > <value value="0x0000" name="EMUC3, EMUD3" cname="0xFFFC" /> <value value="0x0001" name="EMUC2, EMUD2" cname="0xFFFD" /> <value value="0x0002" name="EMUC1, EMUD1" cname="0xFFFE" /> <value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" /> - </tqmask> - <tqmask name="COE" value="0x4000" > + </mask> + <mask name="COE" value="0x4000" > <value value="0x0000" name="On" cname="0xBFFF" /> <value value="0x4000" name="Off" cname="_" /> - </tqmask> - <tqmask name="DEBUG" value="0x8000" > + </mask> + <mask name="DEBUG" value="0x8000" > <value value="0x0000" name="On" cname="0x7FFF" /> <value value="0x8000" name="Off" cname="_" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/30F4012.xml b/src/devices/pic/xml_data/30F4012.xml index 3bc430b..e42b34c 100644 --- a/src/devices/pic/xml_data/30F4012.xml +++ b/src/devices/pic/xml_data/30F4012.xml @@ -28,13 +28,13 @@ <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0xF80000" end="0xF8000D" /> <memory name="eeprom" start="0x7FFC00" end="0x7FFFFF" /> - <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" /> + <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" /> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x80053F" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="FOSC" wtqmask="0xC30F" bvalue="0xC30F" ctqmask="0xC10F" > - <tqmask name="FPR" value="0x000F" > + <config offset="0x0" name="FOSC" wmask="0xC30F" bvalue="0xC30F" cmask="0xC10F" > + <mask name="FPR" value="0x000F" > <value value="0x0000" name="XTL" cname="XTL" /> <value value="0x0001" name="XTL" cname="XTL" /> <value value="0x0002" name="HS" cname="HS" /> @@ -51,23 +51,23 @@ <value value="0x000D" name="EC4" cname="EC_PLL4" /> <value value="0x000E" name="EC8" cname="EC_PLL8" /> <value value="0x000F" name="EC16" cname="EC_PLL16" /> - </tqmask> - <tqmask name="FOS" value="0x0300" > + </mask> + <mask name="FOS" value="0x0300" > <value value="0x0000" name="TMR1" cname="EXT" /> <value value="0x0100" name="INTRC_F" cname="FRC" /> <value value="0x0200" name="INTRC_LP" cname="LP" /> <value value="0x0300" name="PRIM" cname="_" /> - </tqmask> - <tqmask name="FCKSM" value="0xC000" > + </mask> + <mask name="FCKSM" value="0xC000" > <value value="0x0000" name="Switching on, monitor on" cname="CSW_FSCM_ON" /> <value value="0x4000" name="Switching on, monitor off" cname="CSW_ON_FSCM_OFF" /> <value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" /> <value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="FWDT" wtqmask="0x803F" bvalue="0x803F" > - <tqmask name="FWPSB" value="0x000F" > + <config offset="0x2" name="FWDT" wmask="0x803F" bvalue="0x803F" > + <mask name="FWPSB" value="0x000F" > <value value="0x0000" name="1:1" cname="WDTPSB_1" /> <value value="0x0001" name="1:2" cname="WDTPSB_2" /> <value value="0x0002" name="1:3" cname="WDTPSB_3" /> @@ -84,84 +84,84 @@ <value value="0x000D" name="1:14" cname="WDTPSB_14" /> <value value="0x000E" name="1:15" cname="WDTPSB_15" /> <value value="0x000F" name="1:16" cname="WDTPSB_16" /> - </tqmask> - <tqmask name="FWPSA" value="0x0030" > + </mask> + <mask name="FWPSA" value="0x0030" > <value value="0x0000" name="1:1" cname="WDTPSA_1" /> <value value="0x0010" name="1:8" cname="WDTPSA_8" /> <value value="0x0020" name="1:64" cname="WDTPSA_64" /> <value value="0x0030" name="1:512" cname="WDTPSA_512" /> - </tqmask> - <tqmask name="FWDTEN" value="0x8000" > + </mask> + <mask name="FWDTEN" value="0x8000" > <value value="0x0000" name="Off" cname="WDT_OFF" /> <value value="0x8000" name="On" cname="WDT_ON" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="FBORPOR" wtqmask="0x87B3" bvalue="0x87B3" > - <tqmask name="FPWRT" value="0x0003" > + <config offset="0x4" name="FBORPOR" wmask="0x87B3" bvalue="0x87B3" > + <mask name="FPWRT" value="0x0003" > <value value="0x0000" name="0" cname="PWRT_OFF" /> <value value="0x0001" name="4" cname="PWRT_4" /> <value value="0x0002" name="16" cname="PWRT_16" /> <value value="0x0003" name="64" cname="PWRT_64" /> - </tqmask> - <tqmask name="BORV" value="0x0030" > + </mask> + <mask name="BORV" value="0x0030" > <value value="0x0000" name="4.5" cname="BORV_45" /> <value value="0x0010" name="4.2" cname="BORV_42" /> <value value="0x0020" name="2.7" cname="BORV_27" /> <value value="0x0030" name="2.0" cname="BORV_20" /> - </tqmask> - <tqmask name="BODEN" value="0x0080" > + </mask> + <mask name="BODEN" value="0x0080" > <value value="0x0000" name="Off" cname="PBOR_OFF" /> <value value="0x0080" name="On" cname="PBOR_ON" /> - </tqmask> - <tqmask name="LPOL" value="0x0100" > + </mask> + <mask name="LPOL" value="0x0100" > <value value="0x0000" name="low" cname="PWMxL_ACT_LO" /> <value value="0x0100" name="high" cname="PWMxL_ACT_HI" /> - </tqmask> - <tqmask name="HPOL" value="0x0200" > + </mask> + <mask name="HPOL" value="0x0200" > <value value="0x0000" name="low" cname="PWMxH_ACT_LO" /> <value value="0x0200" name="high" cname="PWMxH_ACT_HI" /> - </tqmask> - <tqmask name="PWMPIN" value="0x0400" > + </mask> + <mask name="PWMPIN" value="0x0400" > <value value="0x0000" name="On" cname="RST_PWMPIN" /> <value value="0x0400" name="Off" cname="RST_IOPIN" /> - </tqmask> - <tqmask name="MCLRE" value="0x8000" > + </mask> + <mask name="MCLRE" value="0x8000" > <value value="0x0000" name="Internal" cname="MCLR_DIS" /> <value value="0x8000" name="External" cname="MCLR_EN" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x0000" ctqmask="0x310F" /> + <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x0000" cmask="0x310F" /> - <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x0000" ctqmask="0x330F" /> + <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x0000" cmask="0x330F" /> - <config offset="0xA" name="FGS" wtqmask="0x0007" bvalue="0x0003" ctqmask="0x0007" > - <tqmask name="GWRP" value="0x0001" > + <config offset="0xA" name="FGS" wmask="0x0007" bvalue="0x0003" cmask="0x0007" > + <mask name="GWRP" value="0x0001" > <value value="0x0000" name="All" cname="0xFFFE" /> <value value="0x0001" name="Off" cname="_" /> - </tqmask> - <tqmask name="GCP" value="0x0002" > + </mask> + <mask name="GCP" value="0x0002" > <value value="0x0000" name="All" cname="CODE_PROT_ON" /> <value value="0x0002" name="Off" cname="CODE_PROT_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="ICD" wtqmask="0xC003" bvalue="0xC003" > - <tqmask name="ICS" value="0x0003" > + <config offset="0xC" name="ICD" wmask="0xC003" bvalue="0xC003" > + <mask name="ICS" value="0x0003" > <value value="0x0000" name="EMUC3, EMUD3" cname="0xFFFC" /> <value value="0x0001" name="EMUC2, EMUD2" cname="0xFFFD" /> <value value="0x0002" name="EMUC1, EMUD1" cname="0xFFFE" /> <value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" /> - </tqmask> - <tqmask name="COE" value="0x4000" > + </mask> + <mask name="COE" value="0x4000" > <value value="0x0000" name="On" cname="0xBFFF" /> <value value="0x4000" name="Off" cname="_" /> - </tqmask> - <tqmask name="DEBUG" value="0x8000" > + </mask> + <mask name="DEBUG" value="0x8000" > <value value="0x0000" name="On" cname="0x7FFF" /> <value value="0x8000" name="Off" cname="_" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/30F4013.xml b/src/devices/pic/xml_data/30F4013.xml index 6177a81..1732e6e 100644 --- a/src/devices/pic/xml_data/30F4013.xml +++ b/src/devices/pic/xml_data/30F4013.xml @@ -28,13 +28,13 @@ <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0xF80000" end="0xF8000D" /> <memory name="eeprom" start="0x7FFC00" end="0x7FFFFF" /> - <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" /> + <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" /> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x80053F" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="FOSC" wtqmask="0xC71F" bvalue="0xC71F" > - <tqmask name="FOSFPR" value="0x071F" > + <config offset="0x0" name="FOSC" wmask="0xC71F" bvalue="0xC71F" > + <mask name="FOSFPR" value="0x071F" > <value value="default" name="invalid" /> <value value="0x001F" name="TMR1" cname="LP" /> <value value="0x011F" name="INTRC_F" cname="FRC" /> @@ -54,17 +54,17 @@ <value value="0x0715" name="HS3_4" cname="HS3_PLL4" /> <value value="0x0716" name="HS3_8" cname="HS3_PLL8" /> <value value="0x0717" name="HS3_16" cname="HS3_PLL16" /> - </tqmask> - <tqmask name="FCKSM" value="0xC000" > + </mask> + <mask name="FCKSM" value="0xC000" > <value value="0x0000" name="Switching on, monitor on" cname="CSW_FSCM_ON" /> <value value="0x4000" name="Switching on, monitor off" cname="CSW_ON_FSCM_OFF" /> <value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" /> <value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="FWDT" wtqmask="0x803F" bvalue="0x803F" > - <tqmask name="FWPSB" value="0x000F" > + <config offset="0x2" name="FWDT" wmask="0x803F" bvalue="0x803F" > + <mask name="FWPSB" value="0x000F" > <value value="0x0000" name="1:1" cname="WDTPSB_1" /> <value value="0x0001" name="1:2" cname="WDTPSB_2" /> <value value="0x0002" name="1:3" cname="WDTPSB_3" /> @@ -81,72 +81,72 @@ <value value="0x000D" name="1:14" cname="WDTPSB_14" /> <value value="0x000E" name="1:15" cname="WDTPSB_15" /> <value value="0x000F" name="1:16" cname="WDTPSB_16" /> - </tqmask> - <tqmask name="FWPSA" value="0x0030" > + </mask> + <mask name="FWPSA" value="0x0030" > <value value="0x0000" name="1:1" cname="WDTPSA_1" /> <value value="0x0010" name="1:8" cname="WDTPSA_8" /> <value value="0x0020" name="1:64" cname="WDTPSA_64" /> <value value="0x0030" name="1:512" cname="WDTPSA_512" /> - </tqmask> - <tqmask name="FWDTEN" value="0x8000" > + </mask> + <mask name="FWDTEN" value="0x8000" > <value value="0x0000" name="Off" cname="WDT_OFF" /> <value value="0x8000" name="On" cname="WDT_ON" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="FBORPOR" wtqmask="0x87B3" bvalue="0x80B3" ctqmask="0x87B3" > - <tqmask name="FPWRT" value="0x0003" > + <config offset="0x4" name="FBORPOR" wmask="0x87B3" bvalue="0x80B3" cmask="0x87B3" > + <mask name="FPWRT" value="0x0003" > <value value="0x0000" name="0" cname="PWRT_OFF" /> <value value="0x0001" name="4" cname="PWRT_4" /> <value value="0x0002" name="16" cname="PWRT_16" /> <value value="0x0003" name="64" cname="PWRT_64" /> - </tqmask> - <tqmask name="BORV" value="0x0030" > + </mask> + <mask name="BORV" value="0x0030" > <value value="0x0000" name="4.5" cname="BORV_45" /> <value value="0x0010" name="4.2" cname="BORV_42" /> <value value="0x0020" name="2.7" cname="BORV_27" /> <value value="0x0030" name="2.0" cname="BORV_20" /> - </tqmask> - <tqmask name="BODEN" value="0x0080" > + </mask> + <mask name="BODEN" value="0x0080" > <value value="0x0000" name="Off" cname="PBOR_OFF" /> <value value="0x0080" name="On" cname="PBOR_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x8000" > + </mask> + <mask name="MCLRE" value="0x8000" > <value value="0x0000" name="Internal" cname="MCLR_DIS" /> <value value="0x8000" name="External" cname="MCLR_EN" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x0000" ctqmask="0x310F" /> + <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x0000" cmask="0x310F" /> - <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x0000" ctqmask="0x330F" /> + <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x0000" cmask="0x330F" /> - <config offset="0xA" name="FGS" wtqmask="0x0007" bvalue="0x0003" ctqmask="0x0007" > - <tqmask name="GWRP" value="0x0001" > + <config offset="0xA" name="FGS" wmask="0x0007" bvalue="0x0003" cmask="0x0007" > + <mask name="GWRP" value="0x0001" > <value value="0x0000" name="All" cname="0xFFFE" /> <value value="0x0001" name="Off" cname="_" /> - </tqmask> - <tqmask name="GCP" value="0x0002" > + </mask> + <mask name="GCP" value="0x0002" > <value value="0x0000" name="All" cname="CODE_PROT_ON" /> <value value="0x0002" name="Off" cname="CODE_PROT_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="ICD" wtqmask="0xC003" bvalue="0xC003" > - <tqmask name="ICS" value="0x0003" > + <config offset="0xC" name="ICD" wmask="0xC003" bvalue="0xC003" > + <mask name="ICS" value="0x0003" > <value value="0x0000" name="EMUC3, EMUD3" cname="0xFFFC" /> <value value="0x0001" name="EMUC2, EMUD2" cname="0xFFFD" /> <value value="0x0002" name="EMUC1, EMUD1" cname="0xFFFE" /> <value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" /> - </tqmask> - <tqmask name="COE" value="0x4000" > + </mask> + <mask name="COE" value="0x4000" > <value value="0x0000" name="On" cname="0xBFFF" /> <value value="0x4000" name="Off" cname="_" /> - </tqmask> - <tqmask name="DEBUG" value="0x8000" > + </mask> + <mask name="DEBUG" value="0x8000" > <value value="0x0000" name="On" cname="0x7FFF" /> <value value="0x8000" name="Off" cname="_" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/30F5011.xml b/src/devices/pic/xml_data/30F5011.xml index dfd9f6f..a1f311d 100644 --- a/src/devices/pic/xml_data/30F5011.xml +++ b/src/devices/pic/xml_data/30F5011.xml @@ -28,13 +28,13 @@ <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0xF80000" end="0xF8000D" /> <memory name="eeprom" start="0x7FFC00" end="0x7FFFFF" /> - <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" /> + <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" /> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x80053F" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="FOSC" wtqmask="0xC30F" bvalue="0xC30F" ctqmask="0xC10F" > - <tqmask name="FPR" value="0x000F" > + <config offset="0x0" name="FOSC" wmask="0xC30F" bvalue="0xC30F" cmask="0xC10F" > + <mask name="FPR" value="0x000F" > <value value="0x0000" name="XTL" cname="XTL" /> <value value="0x0001" name="XTL" cname="XTL" /> <value value="0x0002" name="HS" cname="HS" /> @@ -51,23 +51,23 @@ <value value="0x000D" name="EC4" cname="EC_PLL4" /> <value value="0x000E" name="EC8" cname="EC_PLL8" /> <value value="0x000F" name="EC16" cname="EC_PLL16" /> - </tqmask> - <tqmask name="FOS" value="0x0300" > + </mask> + <mask name="FOS" value="0x0300" > <value value="0x0000" name="TMR1" cname="EXT" /> <value value="0x0100" name="INTRC_F" cname="FRC" /> <value value="0x0200" name="INTRC_LP" cname="LP" /> <value value="0x0300" name="PRIM" cname="_" /> - </tqmask> - <tqmask name="FCKSM" value="0xC000" > + </mask> + <mask name="FCKSM" value="0xC000" > <value value="0x0000" name="Switching on, monitor on" cname="CSW_FSCM_ON" /> <value value="0x4000" name="Switching on, monitor off" cname="CSW_ON_FSCM_OFF" /> <value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" /> <value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="FWDT" wtqmask="0x803F" bvalue="0x803F" > - <tqmask name="FWPSB" value="0x000F" > + <config offset="0x2" name="FWDT" wmask="0x803F" bvalue="0x803F" > + <mask name="FWPSB" value="0x000F" > <value value="0x0000" name="1:1" cname="WDTPSB_1" /> <value value="0x0001" name="1:2" cname="WDTPSB_2" /> <value value="0x0002" name="1:3" cname="WDTPSB_3" /> @@ -84,125 +84,125 @@ <value value="0x000D" name="1:14" cname="WDTPSB_14" /> <value value="0x000E" name="1:15" cname="WDTPSB_15" /> <value value="0x000F" name="1:16" cname="WDTPSB_16" /> - </tqmask> - <tqmask name="FWPSA" value="0x0030" > + </mask> + <mask name="FWPSA" value="0x0030" > <value value="0x0000" name="1:1" cname="WDTPSA_1" /> <value value="0x0010" name="1:8" cname="WDTPSA_8" /> <value value="0x0020" name="1:64" cname="WDTPSA_64" /> <value value="0x0030" name="1:512" cname="WDTPSA_512" /> - </tqmask> - <tqmask name="FWDTEN" value="0x8000" > + </mask> + <mask name="FWDTEN" value="0x8000" > <value value="0x0000" name="Off" cname="WDT_OFF" /> <value value="0x8000" name="On" cname="WDT_ON" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="FBORPOR" wtqmask="0x87B3" bvalue="0x80B3" ctqmask="0x87B3" > - <tqmask name="FPWRT" value="0x0003" > + <config offset="0x4" name="FBORPOR" wmask="0x87B3" bvalue="0x80B3" cmask="0x87B3" > + <mask name="FPWRT" value="0x0003" > <value value="0x0000" name="0" cname="PWRT_OFF" /> <value value="0x0001" name="4" cname="PWRT_4" /> <value value="0x0002" name="16" cname="PWRT_16" /> <value value="0x0003" name="64" cname="PWRT_64" /> - </tqmask> - <tqmask name="BORV" value="0x0030" > + </mask> + <mask name="BORV" value="0x0030" > <value value="0x0000" name="4.5" cname="BORV_45" /> <value value="0x0010" name="4.2" cname="BORV_42" /> <value value="0x0020" name="2.7" cname="BORV_27" /> <value value="0x0030" name="2.0" cname="BORV_20" /> - </tqmask> - <tqmask name="BODEN" value="0x0080" > + </mask> + <mask name="BODEN" value="0x0080" > <value value="0x0000" name="Off" cname="PBOR_OFF" /> <value value="0x0080" name="On" cname="PBOR_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x8000" > + </mask> + <mask name="MCLRE" value="0x8000" > <value value="0x0000" name="Internal" cname="MCLR_DIS" /> <value value="0x8000" name="External" cname="MCLR_EN" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="FBS" wtqmask="0x310F" bvalue="0x310F" > - <tqmask name="WRTBS" value="0x0001" > + <config offset="0x6" name="FBS" wmask="0x310F" bvalue="0x310F" > + <mask name="WRTBS" value="0x0001" > <value value="0x0000" name="All" cname="WR_PROT_BOOT_ON" /> <value value="0x0001" name="Off" cname="WR_PROT_BOOT_OFF" /> - </tqmask> - <tqmask name="BSSEC" value="0x0008" > + </mask> + <mask name="BSSEC" value="0x0008" > <value value="0x0000" name="High Security" cname="" /> <value value="0x0008" name="Standard Security" cname="" /> - </tqmask> - <tqmask name="BSSIZ" value="0x0006" > + </mask> + <mask name="BSSIZ" value="0x0006" > <value value="0x0000" name="4196" cname="" /> <value value="0x0002" name="2048" cname="" /> <value value="0x0004" name="512" cname="" /> <value value="0x0006" name="0" cname="" /> - </tqmask> - <tqmask name="EBSSIZ" value="0x0100" > + </mask> + <mask name="EBSSIZ" value="0x0100" > <value value="0x0000" name="128" cname="SMALL_BOOT_EEPROM" /> <value value="0x0100" name="0" cname="NO_BOOT_EEPROM" /> - </tqmask> - <tqmask name="RBSSIZ" value="0x3000" > + </mask> + <mask name="RBSSIZ" value="0x3000" > <value value="0x0000" name="512" cname="LAR_BOOT_RAM" /> <value value="0x1000" name="256" cname="MED_BOOT_RAM" /> <value value="0x2000" name="128" cname="SMALL_BOOT_RAM" /> <value value="0x3000" name="0" cname="NO_BOOT_RAM" /> - </tqmask> + </mask> </config> - <config offset="0x8" name="FSS" wtqmask="0x330F" bvalue="0x330F" > - <tqmask name="WRTSS" value="0x0001" > + <config offset="0x8" name="FSS" wmask="0x330F" bvalue="0x330F" > + <mask name="WRTSS" value="0x0001" > <value value="0x0000" name="All" cname="WR_PROT_SEC_ON" /> <value value="0x0001" name="Off" cname="WR_PROT_SEC_OFF" /> - </tqmask> - <tqmask name="SSSEC" value="0x0008" > + </mask> + <mask name="SSSEC" value="0x0008" > <value value="0x0000" name="High Security" cname="" /> <value value="0x0008" name="Standard Security" cname="" /> - </tqmask> - <tqmask name="SSSIZ" value="0x0006" > + </mask> + <mask name="SSSIZ" value="0x0006" > <value value="0x0000" name="16384" cname="" /> <value value="0x0002" name="8192" cname="" /> <value value="0x0004" name="4096" cname="" /> <value value="0x0006" name="0" cname="" /> - </tqmask> - <tqmask name="ESSSIZ" value="0x0300" > + </mask> + <mask name="ESSSIZ" value="0x0300" > <value value="0x0000" name="512" cname="LAR_SEC_EEPROM" /> <value value="0x0100" name="256" cname="MED_SEC_EEPROM" /> <value value="0x0200" name="128" cname="SMALL_SEC_EEPROM" /> <value value="0x0300" name="0" cname="NO_SEC_EEPROM" /> - </tqmask> - <tqmask name="RSSSIZ" value="0x3000" > + </mask> + <mask name="RSSSIZ" value="0x3000" > <value value="0x0000" name="1024" cname="LAR_SEC_RAM" /> <value value="0x1000" name="768" cname="MED_SEC_RAM" /> <value value="0x2000" name="256" cname="SMALL_SEC_RAM" /> <value value="0x3000" name="0" cname="NO_SEC_RAM" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="FGS" wtqmask="0x0007" bvalue="0x0007" > - <tqmask name="WRTGS" value="0x0001" > + <config offset="0xA" name="FGS" wmask="0x0007" bvalue="0x0007" > + <mask name="WRTGS" value="0x0001" > <value value="0x0000" name="All" cname="WR_PROT_GEN_ON" /> <value value="0x0001" name="Off" cname="WR_PROT_GEN_OFF" /> - </tqmask> - <tqmask name="GSSEC" value="0x0006" > + </mask> + <mask name="GSSEC" value="0x0006" > <value value="default" name="High Security" cname="HIGH_PROT" /> <value value="0x0004" name="Standard Security" cname="STAND_PROT" /> <value value="0x0006" name="Off" cname="GEN_PROT" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="ICD" wtqmask="0xC003" bvalue="0xC003" > - <tqmask name="ICS" value="0x0003" > + <config offset="0xC" name="ICD" wmask="0xC003" bvalue="0xC003" > + <mask name="ICS" value="0x0003" > <value value="0x0000" name="EMUC3, EMUD3" cname="0xFFFC" /> <value value="0x0001" name="EMUC2, EMUD2" cname="0xFFFD" /> <value value="0x0002" name="EMUC1, EMUD1" cname="0xFFFE" /> <value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" /> - </tqmask> - <tqmask name="COE" value="0x4000" > + </mask> + <mask name="COE" value="0x4000" > <value value="0x0000" name="On" cname="0xBFFF" /> <value value="0x4000" name="Off" cname="_" /> - </tqmask> - <tqmask name="DEBUG" value="0x8000" > + </mask> + <mask name="DEBUG" value="0x8000" > <value value="0x0000" name="On" cname="0x7FFF" /> <value value="0x8000" name="Off" cname="_" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/30F5013.xml b/src/devices/pic/xml_data/30F5013.xml index 2017b70..debd97f 100644 --- a/src/devices/pic/xml_data/30F5013.xml +++ b/src/devices/pic/xml_data/30F5013.xml @@ -28,13 +28,13 @@ <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0xF80000" end="0xF8000D" /> <memory name="eeprom" start="0x7FFC00" end="0x7FFFFF" /> - <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" /> + <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" /> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x80053F" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="FOSC" wtqmask="0xC30F" bvalue="0xC30F" ctqmask="0xC10F" > - <tqmask name="FPR" value="0x000F" > + <config offset="0x0" name="FOSC" wmask="0xC30F" bvalue="0xC30F" cmask="0xC10F" > + <mask name="FPR" value="0x000F" > <value value="0x0000" name="XTL" cname="XTL" /> <value value="0x0001" name="XTL" cname="XTL" /> <value value="0x0002" name="HS" cname="HS" /> @@ -51,23 +51,23 @@ <value value="0x000D" name="EC4" cname="EC_PLL4" /> <value value="0x000E" name="EC8" cname="EC_PLL8" /> <value value="0x000F" name="EC16" cname="EC_PLL16" /> - </tqmask> - <tqmask name="FOS" value="0x0300" > + </mask> + <mask name="FOS" value="0x0300" > <value value="0x0000" name="TMR1" cname="EXT" /> <value value="0x0100" name="INTRC_F" cname="FRC" /> <value value="0x0200" name="INTRC_LP" cname="LP" /> <value value="0x0300" name="PRIM" cname="_" /> - </tqmask> - <tqmask name="FCKSM" value="0xC000" > + </mask> + <mask name="FCKSM" value="0xC000" > <value value="0x0000" name="Switching on, monitor on" cname="CSW_FSCM_ON" /> <value value="0x4000" name="Switching on, monitor off" cname="CSW_ON_FSCM_OFF" /> <value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" /> <value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="FWDT" wtqmask="0x803F" bvalue="0x803F" > - <tqmask name="FWPSB" value="0x000F" > + <config offset="0x2" name="FWDT" wmask="0x803F" bvalue="0x803F" > + <mask name="FWPSB" value="0x000F" > <value value="0x0000" name="1:1" cname="WDTPSB_1" /> <value value="0x0001" name="1:2" cname="WDTPSB_2" /> <value value="0x0002" name="1:3" cname="WDTPSB_3" /> @@ -84,125 +84,125 @@ <value value="0x000D" name="1:14" cname="WDTPSB_14" /> <value value="0x000E" name="1:15" cname="WDTPSB_15" /> <value value="0x000F" name="1:16" cname="WDTPSB_16" /> - </tqmask> - <tqmask name="FWPSA" value="0x0030" > + </mask> + <mask name="FWPSA" value="0x0030" > <value value="0x0000" name="1:1" cname="WDTPSA_1" /> <value value="0x0010" name="1:8" cname="WDTPSA_8" /> <value value="0x0020" name="1:64" cname="WDTPSA_64" /> <value value="0x0030" name="1:512" cname="WDTPSA_512" /> - </tqmask> - <tqmask name="FWDTEN" value="0x8000" > + </mask> + <mask name="FWDTEN" value="0x8000" > <value value="0x0000" name="Off" cname="WDT_OFF" /> <value value="0x8000" name="On" cname="WDT_ON" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="FBORPOR" wtqmask="0x87B3" bvalue="0x80B3" ctqmask="0x87B3" > - <tqmask name="FPWRT" value="0x0003" > + <config offset="0x4" name="FBORPOR" wmask="0x87B3" bvalue="0x80B3" cmask="0x87B3" > + <mask name="FPWRT" value="0x0003" > <value value="0x0000" name="0" cname="PWRT_OFF" /> <value value="0x0001" name="4" cname="PWRT_4" /> <value value="0x0002" name="16" cname="PWRT_16" /> <value value="0x0003" name="64" cname="PWRT_64" /> - </tqmask> - <tqmask name="BORV" value="0x0030" > + </mask> + <mask name="BORV" value="0x0030" > <value value="0x0000" name="4.5" cname="BORV_45" /> <value value="0x0010" name="4.2" cname="BORV_42" /> <value value="0x0020" name="2.7" cname="BORV_27" /> <value value="0x0030" name="2.0" cname="BORV_20" /> - </tqmask> - <tqmask name="BODEN" value="0x0080" > + </mask> + <mask name="BODEN" value="0x0080" > <value value="0x0000" name="Off" cname="PBOR_OFF" /> <value value="0x0080" name="On" cname="PBOR_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x8000" > + </mask> + <mask name="MCLRE" value="0x8000" > <value value="0x0000" name="Internal" cname="MCLR_DIS" /> <value value="0x8000" name="External" cname="MCLR_EN" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="FBS" wtqmask="0x310F" bvalue="0x310F" > - <tqmask name="WRTBS" value="0x0001" > + <config offset="0x6" name="FBS" wmask="0x310F" bvalue="0x310F" > + <mask name="WRTBS" value="0x0001" > <value value="0x0000" name="All" cname="WR_PROT_BOOT_ON" /> <value value="0x0001" name="Off" cname="WR_PROT_BOOT_OFF" /> - </tqmask> - <tqmask name="BSSEC" value="0x0008" > + </mask> + <mask name="BSSEC" value="0x0008" > <value value="0x0000" name="High Security" cname="" /> <value value="0x0008" name="Standard Security" cname="" /> - </tqmask> - <tqmask name="BSSIZ" value="0x0006" > + </mask> + <mask name="BSSIZ" value="0x0006" > <value value="0x0000" name="4096" cname="" /> <value value="0x0002" name="2048" cname="" /> <value value="0x0004" name="512" cname="" /> <value value="0x0006" name="0" cname="" /> - </tqmask> - <tqmask name="EBSSIZ" value="0x0100" > + </mask> + <mask name="EBSSIZ" value="0x0100" > <value value="0x0000" name="128" cname="SMALL_BOOT_EEPROM" /> <value value="0x0100" name="0" cname="NO_BOOT_EEPROM" /> - </tqmask> - <tqmask name="RBSSIZ" value="0x3000" > + </mask> + <mask name="RBSSIZ" value="0x3000" > <value value="0x0000" name="512" cname="LAR_BOOT_RAM" /> <value value="0x1000" name="256" cname="MED_BOOT_RAM" /> <value value="0x2000" name="128" cname="SMALL_BOOT_RAM" /> <value value="0x3000" name="0" cname="NO_BOOT_RAM" /> - </tqmask> + </mask> </config> - <config offset="0x8" name="FSS" wtqmask="0x330F" bvalue="0x330F" > - <tqmask name="WRTSS" value="0x0001" > + <config offset="0x8" name="FSS" wmask="0x330F" bvalue="0x330F" > + <mask name="WRTSS" value="0x0001" > <value value="0x0000" name="All" cname="WR_PROT_SEC_ON" /> <value value="0x0001" name="Off" cname="WR_PROT_SEC_OFF" /> - </tqmask> - <tqmask name="SSSEC" value="0x0008" > + </mask> + <mask name="SSSEC" value="0x0008" > <value value="0x0000" name="High Security" cname="" /> <value value="0x0008" name="Standard Security" cname="" /> - </tqmask> - <tqmask name="SSSIZ" value="0x0006" > + </mask> + <mask name="SSSIZ" value="0x0006" > <value value="0x0000" name="16384" cname="" /> <value value="0x0002" name="8192" cname="" /> <value value="0x0004" name="4096" cname="" /> <value value="0x0006" name="0" cname="" /> - </tqmask> - <tqmask name="ESSSIZ" value="0x0300" > + </mask> + <mask name="ESSSIZ" value="0x0300" > <value value="0x0000" name="512" cname="LAR_SEC_EEPROM" /> <value value="0x0100" name="256" cname="MED_SEC_EEPROM" /> <value value="0x0200" name="128" cname="SMALL_SEC_EEPROM" /> <value value="0x0300" name="0" cname="NO_SEC_EEPROM" /> - </tqmask> - <tqmask name="RSSSIZ" value="0x3000" > + </mask> + <mask name="RSSSIZ" value="0x3000" > <value value="0x0000" name="1024" cname="LAR_SEC_RAM" /> <value value="0x1000" name="768" cname="MED_SEC_RAM" /> <value value="0x2000" name="256" cname="SMALL_SEC_RAM" /> <value value="0x3000" name="0" cname="NO_SEC_RAM" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="FGS" wtqmask="0x0007" bvalue="0x0007" > - <tqmask name="WRTGS" value="0x0001" > + <config offset="0xA" name="FGS" wmask="0x0007" bvalue="0x0007" > + <mask name="WRTGS" value="0x0001" > <value value="0x0000" name="All" cname="WR_PROT_GEN_ON" /> <value value="0x0001" name="Off" cname="WR_PROT_GEN_OFF" /> - </tqmask> - <tqmask name="GSSEC" value="0x0006" > + </mask> + <mask name="GSSEC" value="0x0006" > <value value="default" name="High Security" cname="HIGH_PROT" /> <value value="0x0004" name="Standard Security" cname="STAND_PROT" /> <value value="0x0006" name="Off" cname="GEN_PROT" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="ICD" wtqmask="0xC003" bvalue="0xC003" > - <tqmask name="ICS" value="0x0003" > + <config offset="0xC" name="ICD" wmask="0xC003" bvalue="0xC003" > + <mask name="ICS" value="0x0003" > <value value="0x0000" name="EMUC3, EMUD3" cname="0xFFFC" /> <value value="0x0001" name="EMUC2, EMUD2" cname="0xFFFD" /> <value value="0x0002" name="EMUC1, EMUD1" cname="0xFFFE" /> <value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" /> - </tqmask> - <tqmask name="COE" value="0x4000" > + </mask> + <mask name="COE" value="0x4000" > <value value="0x0000" name="On" cname="0xBFFF" /> <value value="0x4000" name="Off" cname="_" /> - </tqmask> - <tqmask name="DEBUG" value="0x8000" > + </mask> + <mask name="DEBUG" value="0x8000" > <value value="0x0000" name="On" cname="0x7FFF" /> <value value="0x8000" name="Off" cname="_" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/30F5015.xml b/src/devices/pic/xml_data/30F5015.xml index 489bed2..af7c20a 100644 --- a/src/devices/pic/xml_data/30F5015.xml +++ b/src/devices/pic/xml_data/30F5015.xml @@ -28,13 +28,13 @@ <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0xF80000" end="0xF8000D" /> <memory name="eeprom" start="0x7FFC00" end="0x7FFFFF" /> - <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" /> + <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" /> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x80053F" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="FOSC" wtqmask="0xC71F" bvalue="0xC71F" > - <tqmask name="FOSFPR" value="0x071F" > + <config offset="0x0" name="FOSC" wmask="0xC71F" bvalue="0xC71F" > + <mask name="FOSFPR" value="0x071F" > <value value="default" name="invalid" /> <value value="0x001F" name="TMR1" cname="LP" /> <value value="0x011F" name="INTRC_F" cname="FRC" /> @@ -54,17 +54,17 @@ <value value="0x0715" name="HS3_4" cname="HS3_PLL4" /> <value value="0x0716" name="HS3_8" cname="HS3_PLL8" /> <value value="0x0717" name="HS3_16" cname="HS3_PLL16" /> - </tqmask> - <tqmask name="FCKSM" value="0xC000" > + </mask> + <mask name="FCKSM" value="0xC000" > <value value="0x0000" name="Switching on, monitor on" cname="CSW_FSCM_ON" /> <value value="0x4000" name="Switching on, monitor off" cname="CSW_ON_FSCM_OFF" /> <value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" /> <value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="FWDT" wtqmask="0x803F" bvalue="0x803F" > - <tqmask name="FWPSB" value="0x000F" > + <config offset="0x2" name="FWDT" wmask="0x803F" bvalue="0x803F" > + <mask name="FWPSB" value="0x000F" > <value value="0x0000" name="1:1" cname="WDTPSB_1" /> <value value="0x0001" name="1:2" cname="WDTPSB_2" /> <value value="0x0002" name="1:3" cname="WDTPSB_3" /> @@ -81,84 +81,84 @@ <value value="0x000D" name="1:14" cname="WDTPSB_14" /> <value value="0x000E" name="1:15" cname="WDTPSB_15" /> <value value="0x000F" name="1:16" cname="WDTPSB_16" /> - </tqmask> - <tqmask name="FWPSA" value="0x0030" > + </mask> + <mask name="FWPSA" value="0x0030" > <value value="0x0000" name="1:1" cname="WDTPSA_1" /> <value value="0x0010" name="1:8" cname="WDTPSA_8" /> <value value="0x0020" name="1:64" cname="WDTPSA_64" /> <value value="0x0030" name="1:512" cname="WDTPSA_512" /> - </tqmask> - <tqmask name="FWDTEN" value="0x8000" > + </mask> + <mask name="FWDTEN" value="0x8000" > <value value="0x0000" name="Off" cname="WDT_OFF" /> <value value="0x8000" name="On" cname="WDT_ON" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="FBORPOR" wtqmask="0x87B3" bvalue="0x87B3" > - <tqmask name="FPWRT" value="0x0003" > + <config offset="0x4" name="FBORPOR" wmask="0x87B3" bvalue="0x87B3" > + <mask name="FPWRT" value="0x0003" > <value value="0x0000" name="0" cname="PWRT_OFF" /> <value value="0x0001" name="4" cname="PWRT_4" /> <value value="0x0002" name="16" cname="PWRT_16" /> <value value="0x0003" name="64" cname="PWRT_64" /> - </tqmask> - <tqmask name="BORV" value="0x0030" > + </mask> + <mask name="BORV" value="0x0030" > <value value="0x0000" name="4.5" cname="BORV_45" /> <value value="0x0010" name="4.2" cname="BORV_42" /> <value value="0x0020" name="2.7" cname="BORV_27" /> <value value="0x0030" name="2.0" cname="BORV_20" /> - </tqmask> - <tqmask name="BODEN" value="0x0080" > + </mask> + <mask name="BODEN" value="0x0080" > <value value="0x0000" name="Off" cname="PBOR_OFF" /> <value value="0x0080" name="On" cname="PBOR_ON" /> - </tqmask> - <tqmask name="LPOL" value="0x0100" > + </mask> + <mask name="LPOL" value="0x0100" > <value value="0x0000" name="low" cname="PWMxL_ACT_LO" /> <value value="0x0100" name="high" cname="PWMxL_ACT_HI" /> - </tqmask> - <tqmask name="HPOL" value="0x0200" > + </mask> + <mask name="HPOL" value="0x0200" > <value value="0x0000" name="low" cname="PWMxH_ACT_LO" /> <value value="0x0200" name="high" cname="PWMxH_ACT_HI" /> - </tqmask> - <tqmask name="PWMPIN" value="0x0400" > + </mask> + <mask name="PWMPIN" value="0x0400" > <value value="0x0000" name="On" cname="RST_PWMPIN" /> <value value="0x0400" name="Off" cname="RST_IOPIN" /> - </tqmask> - <tqmask name="MCLRE" value="0x8000" > + </mask> + <mask name="MCLRE" value="0x8000" > <value value="0x0000" name="Internal" cname="MCLR_DIS" /> <value value="0x8000" name="External" cname="MCLR_EN" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x0000" ctqmask="0x310F" /> + <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x0000" cmask="0x310F" /> - <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x0000" ctqmask="0x330F" /> + <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x0000" cmask="0x330F" /> - <config offset="0xA" name="FGS" wtqmask="0x0007" bvalue="0x0003" ctqmask="0x0007" > - <tqmask name="GWRP" value="0x0001" > + <config offset="0xA" name="FGS" wmask="0x0007" bvalue="0x0003" cmask="0x0007" > + <mask name="GWRP" value="0x0001" > <value value="0x0000" name="All" cname="0xFFFE" /> <value value="0x0001" name="Off" cname="_" /> - </tqmask> - <tqmask name="GCP" value="0x0002" > + </mask> + <mask name="GCP" value="0x0002" > <value value="0x0000" name="All" cname="CODE_PROT_ON" /> <value value="0x0002" name="Off" cname="CODE_PROT_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="ICD" wtqmask="0xC003" bvalue="0xC003" > - <tqmask name="ICS" value="0x0003" > + <config offset="0xC" name="ICD" wmask="0xC003" bvalue="0xC003" > + <mask name="ICS" value="0x0003" > <value value="0x0000" name="EMUC3, EMUD3" cname="0xFFFC" /> <value value="0x0001" name="EMUC2, EMUD2" cname="0xFFFD" /> <value value="0x0002" name="EMUC1, EMUD1" cname="0xFFFE" /> <value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" /> - </tqmask> - <tqmask name="COE" value="0x4000" > + </mask> + <mask name="COE" value="0x4000" > <value value="0x0000" name="On" cname="0xBFFF" /> <value value="0x4000" name="Off" cname="_" /> - </tqmask> - <tqmask name="DEBUG" value="0x8000" > + </mask> + <mask name="DEBUG" value="0x8000" > <value value="0x0000" name="On" cname="0x7FFF" /> <value value="0x8000" name="Off" cname="_" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/30F5016.xml b/src/devices/pic/xml_data/30F5016.xml index 6aa3e0e..aa2e7e1 100644 --- a/src/devices/pic/xml_data/30F5016.xml +++ b/src/devices/pic/xml_data/30F5016.xml @@ -28,13 +28,13 @@ <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0xF80000" end="0xF8000D" /> <memory name="eeprom" start="0x7FFC00" end="0x7FFFFF" /> - <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" /> + <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" /> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x80053F" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="FOSC" wtqmask="0xC71F" bvalue="0xC71F" > - <tqmask name="FOSFPR" value="0x071F" > + <config offset="0x0" name="FOSC" wmask="0xC71F" bvalue="0xC71F" > + <mask name="FOSFPR" value="0x071F" > <value value="default" name="invalid" /> <value value="0x001F" name="TMR1" cname="LP" /> <value value="0x011F" name="INTRC_F" cname="FRC" /> @@ -54,17 +54,17 @@ <value value="0x0715" name="HS3_4" cname="HS3_PLL4" /> <value value="0x0716" name="HS3_8" cname="HS3_PLL8" /> <value value="0x0717" name="HS3_16" cname="HS3_PLL16" /> - </tqmask> - <tqmask name="FCKSM" value="0xC000" > + </mask> + <mask name="FCKSM" value="0xC000" > <value value="0x0000" name="Switching on, monitor on" cname="CSW_FSCM_ON" /> <value value="0x4000" name="Switching on, monitor off" cname="CSW_ON_FSCM_OFF" /> <value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" /> <value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="FWDT" wtqmask="0x803F" bvalue="0x803F" > - <tqmask name="FWPSB" value="0x000F" > + <config offset="0x2" name="FWDT" wmask="0x803F" bvalue="0x803F" > + <mask name="FWPSB" value="0x000F" > <value value="0x0000" name="1:1" cname="WDTPSB_1" /> <value value="0x0001" name="1:2" cname="WDTPSB_2" /> <value value="0x0002" name="1:3" cname="WDTPSB_3" /> @@ -81,84 +81,84 @@ <value value="0x000D" name="1:14" cname="WDTPSB_14" /> <value value="0x000E" name="1:15" cname="WDTPSB_15" /> <value value="0x000F" name="1:16" cname="WDTPSB_16" /> - </tqmask> - <tqmask name="FWPSA" value="0x0030" > + </mask> + <mask name="FWPSA" value="0x0030" > <value value="0x0000" name="1:1" cname="WDTPSA_1" /> <value value="0x0010" name="1:8" cname="WDTPSA_8" /> <value value="0x0020" name="1:64" cname="WDTPSA_64" /> <value value="0x0030" name="1:512" cname="WDTPSA_512" /> - </tqmask> - <tqmask name="FWDTEN" value="0x8000" > + </mask> + <mask name="FWDTEN" value="0x8000" > <value value="0x0000" name="Off" cname="WDT_OFF" /> <value value="0x8000" name="On" cname="WDT_ON" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="FBORPOR" wtqmask="0x87B3" bvalue="0x87B3" > - <tqmask name="FPWRT" value="0x0003" > + <config offset="0x4" name="FBORPOR" wmask="0x87B3" bvalue="0x87B3" > + <mask name="FPWRT" value="0x0003" > <value value="0x0000" name="0" cname="PWRT_OFF" /> <value value="0x0001" name="4" cname="PWRT_4" /> <value value="0x0002" name="16" cname="PWRT_16" /> <value value="0x0003" name="64" cname="PWRT_64" /> - </tqmask> - <tqmask name="BORV" value="0x0030" > + </mask> + <mask name="BORV" value="0x0030" > <value value="0x0000" name="4.5" cname="BORV_45" /> <value value="0x0010" name="4.2" cname="BORV_42" /> <value value="0x0020" name="2.7" cname="BORV_27" /> <value value="0x0030" name="2.0" cname="BORV_20" /> - </tqmask> - <tqmask name="BODEN" value="0x0080" > + </mask> + <mask name="BODEN" value="0x0080" > <value value="0x0000" name="Off" cname="PBOR_OFF" /> <value value="0x0080" name="On" cname="PBOR_ON" /> - </tqmask> - <tqmask name="LPOL" value="0x0100" > + </mask> + <mask name="LPOL" value="0x0100" > <value value="0x0000" name="low" cname="PWMxL_ACT_LO" /> <value value="0x0100" name="high" cname="PWMxL_ACT_HI" /> - </tqmask> - <tqmask name="HPOL" value="0x0200" > + </mask> + <mask name="HPOL" value="0x0200" > <value value="0x0000" name="low" cname="PWMxH_ACT_LO" /> <value value="0x0200" name="high" cname="PWMxH_ACT_HI" /> - </tqmask> - <tqmask name="PWMPIN" value="0x0400" > + </mask> + <mask name="PWMPIN" value="0x0400" > <value value="0x0000" name="On" cname="RST_PWMPIN" /> <value value="0x0400" name="Off" cname="RST_IOPIN" /> - </tqmask> - <tqmask name="MCLRE" value="0x8000" > + </mask> + <mask name="MCLRE" value="0x8000" > <value value="0x0000" name="Internal" cname="MCLR_DIS" /> <value value="0x8000" name="External" cname="MCLR_EN" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x0000" ctqmask="0x310F" /> + <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x0000" cmask="0x310F" /> - <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x0000" ctqmask="0x330F" /> + <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x0000" cmask="0x330F" /> - <config offset="0xA" name="FGS" wtqmask="0x0007" bvalue="0x0003" ctqmask="0x0007" > - <tqmask name="GWRP" value="0x0001" > + <config offset="0xA" name="FGS" wmask="0x0007" bvalue="0x0003" cmask="0x0007" > + <mask name="GWRP" value="0x0001" > <value value="0x0000" name="All" cname="0xFFFE" /> <value value="0x0001" name="Off" cname="_" /> - </tqmask> - <tqmask name="GCP" value="0x0002" > + </mask> + <mask name="GCP" value="0x0002" > <value value="0x0000" name="All" cname="CODE_PROT_ON" /> <value value="0x0002" name="Off" cname="CODE_PROT_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="ICD" wtqmask="0xC003" bvalue="0xC003" > - <tqmask name="ICS" value="0x0003" > + <config offset="0xC" name="ICD" wmask="0xC003" bvalue="0xC003" > + <mask name="ICS" value="0x0003" > <value value="0x0000" name="EMUC3, EMUD3" cname="0xFFFC" /> <value value="0x0001" name="EMUC2, EMUD2" cname="0xFFFD" /> <value value="0x0002" name="EMUC1, EMUD1" cname="0xFFFE" /> <value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" /> - </tqmask> - <tqmask name="COE" value="0x4000" > + </mask> + <mask name="COE" value="0x4000" > <value value="0x0000" name="On" cname="0xBFFF" /> <value value="0x4000" name="Off" cname="_" /> - </tqmask> - <tqmask name="DEBUG" value="0x8000" > + </mask> + <mask name="DEBUG" value="0x8000" > <value value="0x0000" name="On" cname="0x7FFF" /> <value value="0x8000" name="Off" cname="_" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/30F6010.xml b/src/devices/pic/xml_data/30F6010.xml index 1038327..8b26c7c 100644 --- a/src/devices/pic/xml_data/30F6010.xml +++ b/src/devices/pic/xml_data/30F6010.xml @@ -29,13 +29,13 @@ <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0xF80000" end="0xF8000D" /> <memory name="eeprom" start="0x7FF000" end="0x7FFFFF" /> - <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" /> + <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" /> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x80053F" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="FOSC" wtqmask="0xC30F" bvalue="0xC30F" ctqmask="0xC10F" > - <tqmask name="FPR" value="0x000F" > + <config offset="0x0" name="FOSC" wmask="0xC30F" bvalue="0xC30F" cmask="0xC10F" > + <mask name="FPR" value="0x000F" > <value value="0x0000" name="XTL" cname="XTL" /> <value value="0x0001" name="XTL" cname="XTL" /> <value value="0x0002" name="HS" cname="HS" /> @@ -52,23 +52,23 @@ <value value="0x000D" name="EC4" cname="ECIO_PLL4" /> <value value="0x000E" name="EC8" cname="ECIO_PLL8" /> <value value="0x000F" name="EC16" cname="ECIO_PLL16" /> - </tqmask> - <tqmask name="FOS" value="0x0300" > + </mask> + <mask name="FOS" value="0x0300" > <value value="0x0000" name="TMR1" cname="EXT" /> <value value="0x0100" name="INTRC_F" cname="FRC" /> <value value="0x0200" name="INTRC_LP" cname="LP" /> <value value="0x0300" name="PRIM" cname="_" /> - </tqmask> - <tqmask name="FCKSM" value="0xC000" > + </mask> + <mask name="FCKSM" value="0xC000" > <value value="0x0000" name="Switching on, monitor on" cname="CSW_FSCM_ON" /> <value value="0x4000" name="Switching on, monitor off" cname="CSW_ON_FSCM_OFF" /> <value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" /> <value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="FWDT" wtqmask="0x803F" bvalue="0x803F" > - <tqmask name="FWPSB" value="0x000F" > + <config offset="0x2" name="FWDT" wmask="0x803F" bvalue="0x803F" > + <mask name="FWPSB" value="0x000F" > <value value="0x0000" name="1:1" cname="WDTPSB_1" /> <value value="0x0001" name="1:2" cname="WDTPSB_2" /> <value value="0x0002" name="1:3" cname="WDTPSB_3" /> @@ -85,84 +85,84 @@ <value value="0x000D" name="1:14" cname="WDTPSB_14" /> <value value="0x000E" name="1:15" cname="WDTPSB_15" /> <value value="0x000F" name="1:16" cname="WDTPSB_16" /> - </tqmask> - <tqmask name="FWPSA" value="0x0030" > + </mask> + <mask name="FWPSA" value="0x0030" > <value value="0x0000" name="1:1" cname="WDTPSA_1" /> <value value="0x0010" name="1:8" cname="WDTPSA_8" /> <value value="0x0020" name="1:64" cname="WDTPSA_64" /> <value value="0x0030" name="1:512" cname="WDTPSA_512" /> - </tqmask> - <tqmask name="FWDTEN" value="0x8000" > + </mask> + <mask name="FWDTEN" value="0x8000" > <value value="0x0000" name="Off" cname="WDT_OFF" /> <value value="0x8000" name="On" cname="WDT_ON" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="FBORPOR" wtqmask="0x87B3" bvalue="0x87B3" > - <tqmask name="FPWRT" value="0x0003" > + <config offset="0x4" name="FBORPOR" wmask="0x87B3" bvalue="0x87B3" > + <mask name="FPWRT" value="0x0003" > <value value="0x0000" name="0" cname="PWRT_OFF" /> <value value="0x0001" name="4" cname="PWRT_4" /> <value value="0x0002" name="16" cname="PWRT_16" /> <value value="0x0003" name="64" cname="PWRT_64" /> - </tqmask> - <tqmask name="BORV" value="0x0030" > + </mask> + <mask name="BORV" value="0x0030" > <value value="0x0000" name="4.5" cname="BORV_45" /> <value value="0x0010" name="4.2" cname="BORV_42" /> <value value="0x0020" name="2.7" cname="BORV_27" /> <value value="0x0030" name="2.0" cname="BORV_20" /> - </tqmask> - <tqmask name="BODEN" value="0x0080" > + </mask> + <mask name="BODEN" value="0x0080" > <value value="0x0000" name="Off" cname="PBOR_OFF" /> <value value="0x0080" name="On" cname="PBOR_ON" /> - </tqmask> - <tqmask name="LPOL" value="0x0100" > + </mask> + <mask name="LPOL" value="0x0100" > <value value="0x0000" name="low" cname="PWMxL_ACT_LO" /> <value value="0x0100" name="high" cname="PWMxL_ACT_HI" /> - </tqmask> - <tqmask name="HPOL" value="0x0200" > + </mask> + <mask name="HPOL" value="0x0200" > <value value="0x0000" name="low" cname="PWMxH_ACT_LO" /> <value value="0x0200" name="high" cname="PWMxH_ACT_HI" /> - </tqmask> - <tqmask name="PWMPIN" value="0x0400" > + </mask> + <mask name="PWMPIN" value="0x0400" > <value value="0x0000" name="On" cname="RST_PWMPIN" /> <value value="0x0400" name="Off" cname="RST_IO" /> - </tqmask> - <tqmask name="MCLRE" value="0x8000" > + </mask> + <mask name="MCLRE" value="0x8000" > <value value="0x0000" name="Internal" cname="MCLR_DIS" /> <value value="0x8000" name="External" cname="MCLR_EN" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x0000" ctqmask="0x310F" /> + <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x0000" cmask="0x310F" /> - <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x0000" ctqmask="0x330F" /> + <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x0000" cmask="0x330F" /> - <config offset="0xA" name="FGS" wtqmask="0x0007" bvalue="0x0003" ctqmask="0x0007" > - <tqmask name="GWRP" value="0x0001" > + <config offset="0xA" name="FGS" wmask="0x0007" bvalue="0x0003" cmask="0x0007" > + <mask name="GWRP" value="0x0001" > <value value="0x0000" name="All" cname="0xFFFE" /> <value value="0x0001" name="Off" cname="_" /> - </tqmask> - <tqmask name="GCP" value="0x0002" > + </mask> + <mask name="GCP" value="0x0002" > <value value="0x0000" name="All" cname="CODE_PROT_ON" /> <value value="0x0002" name="Off" cname="CODE_PROT_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="ICD" wtqmask="0xC003" bvalue="0xC003" > - <tqmask name="ICS" value="0x0003" > + <config offset="0xC" name="ICD" wmask="0xC003" bvalue="0xC003" > + <mask name="ICS" value="0x0003" > <value value="0x0000" name="EMUC3, EMUD3" cname="0xFFFC" /> <value value="0x0001" name="EMUC2, EMUD2" cname="0xFFFD" /> <value value="0x0002" name="EMUC1, EMUD1" cname="0xFFFE" /> <value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" /> - </tqmask> - <tqmask name="COE" value="0x4000" > + </mask> + <mask name="COE" value="0x4000" > <value value="0x0000" name="On" cname="0xBFFF" /> <value value="0x4000" name="Off" cname="_" /> - </tqmask> - <tqmask name="DEBUG" value="0x8000" > + </mask> + <mask name="DEBUG" value="0x8000" > <value value="0x0000" name="On" cname="0x7FFF" /> <value value="0x8000" name="Off" cname="_" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/30F6010A.xml b/src/devices/pic/xml_data/30F6010A.xml index 4f477d2..2f5e976 100644 --- a/src/devices/pic/xml_data/30F6010A.xml +++ b/src/devices/pic/xml_data/30F6010A.xml @@ -35,13 +35,13 @@ <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0xF80000" end="0xF8000D" /> <memory name="eeprom" start="0x7FF000" end="0x7FFFFF" /> - <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" /> + <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" /> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x80053F" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="FOSC" wtqmask="0xC71F" bvalue="0xC71F" ctqmask="0xC10F"> - <tqmask name="FOSFPR" value="0x071F" > + <config offset="0x0" name="FOSC" wmask="0xC71F" bvalue="0xC71F" cmask="0xC10F"> + <mask name="FOSFPR" value="0x071F" > <value value="default" name="invalid" /> <value value="0x001F" name="TMR1" cname="LP" /> <value value="0x011F" name="INTRC_F" cname="FRC" /> @@ -61,17 +61,17 @@ <value value="0x0715" name="HS3_4" cname="HS3_PLL4" /> <value value="0x0716" name="HS3_8" cname="HS3_PLL8" /> <value value="0x0717" name="HS3_16" cname="HS3_PLL16" /> - </tqmask> - <tqmask name="FCKSM" value="0xC000" > + </mask> + <mask name="FCKSM" value="0xC000" > <value value="0x0000" name="Switching on, monitor on" cname="CSW_FSCM_ON" /> <value value="0x4000" name="Switching on, monitor off" cname="CSW_ON_FSCM_OFF" /> <value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" /> <value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="FWDT" wtqmask="0x803F" bvalue="0x803F" > - <tqmask name="FWPSB" value="0x000F" > + <config offset="0x2" name="FWDT" wmask="0x803F" bvalue="0x803F" > + <mask name="FWPSB" value="0x000F" > <value value="0x0000" name="1:1" cname="WDTPSB_1" /> <value value="0x0001" name="1:2" cname="WDTPSB_2" /> <value value="0x0002" name="1:3" cname="WDTPSB_3" /> @@ -88,137 +88,137 @@ <value value="0x000D" name="1:14" cname="WDTPSB_14" /> <value value="0x000E" name="1:15" cname="WDTPSB_15" /> <value value="0x000F" name="1:16" cname="WDTPSB_16" /> - </tqmask> - <tqmask name="FWPSA" value="0x0030" > + </mask> + <mask name="FWPSA" value="0x0030" > <value value="0x0000" name="1:1" cname="WDTPSA_1" /> <value value="0x0010" name="1:8" cname="WDTPSA_8" /> <value value="0x0020" name="1:64" cname="WDTPSA_64" /> <value value="0x0030" name="1:512" cname="WDTPSA_512" /> - </tqmask> - <tqmask name="FWDTEN" value="0x8000" > + </mask> + <mask name="FWDTEN" value="0x8000" > <value value="0x0000" name="Off" cname="WDT_OFF" /> <value value="0x8000" name="On" cname="WDT_ON" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="FBORPOR" wtqmask="0x87B3" bvalue="0x87B3" > - <tqmask name="FPWRT" value="0x0003" > + <config offset="0x4" name="FBORPOR" wmask="0x87B3" bvalue="0x87B3" > + <mask name="FPWRT" value="0x0003" > <value value="0x0000" name="0" cname="PWRT_OFF" /> <value value="0x0001" name="4" cname="PWRT_4" /> <value value="0x0002" name="16" cname="PWRT_16" /> <value value="0x0003" name="64" cname="PWRT_64" /> - </tqmask> - <tqmask name="BORV" value="0x0030" > + </mask> + <mask name="BORV" value="0x0030" > <value value="0x0000" name="4.5" cname="BORV_45" /> <value value="0x0010" name="4.2" cname="BORV_42" /> <value value="0x0020" name="2.7" cname="BORV_27" /> <value value="0x0030" name="2.0" cname="BORV_20" /> - </tqmask> - <tqmask name="BODEN" value="0x0080" > + </mask> + <mask name="BODEN" value="0x0080" > <value value="0x0000" name="Off" cname="PBOR_OFF" /> <value value="0x0080" name="On" cname="PBOR_ON" /> - </tqmask> - <tqmask name="LPOL" value="0x0100" > + </mask> + <mask name="LPOL" value="0x0100" > <value value="0x0000" name="low" cname="PWMxL_ACT_LO" /> <value value="0x0100" name="high" cname="PWMxL_ACT_HI" /> - </tqmask> - <tqmask name="HPOL" value="0x0200" > + </mask> + <mask name="HPOL" value="0x0200" > <value value="0x0000" name="low" cname="PWMxH_ACT_LO" /> <value value="0x0200" name="high" cname="PWMxH_ACT_HI" /> - </tqmask> - <tqmask name="PWMPIN" value="0x0400" > + </mask> + <mask name="PWMPIN" value="0x0400" > <value value="0x0000" name="On" cname="RST_PWMPIN" /> <value value="0x0400" name="Off" cname="RST_IOPIN" /> - </tqmask> - <tqmask name="MCLRE" value="0x8000" > + </mask> + <mask name="MCLRE" value="0x8000" > <value value="0x0000" name="Internal" cname="MCLR_DIS" /> <value value="0x8000" name="External" cname="MCLR_EN" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="FBS" wtqmask="0x310F" bvalue="0x310F" > - <tqmask name="WRTBS" value="0x0001" > + <config offset="0x6" name="FBS" wmask="0x310F" bvalue="0x310F" > + <mask name="WRTBS" value="0x0001" > <value value="0x0000" name="All" cname="WR_PROT_BOOT_ON" /> <value value="0x0001" name="Off" cname="WR_PROT_BOOT_OFF" /> - </tqmask> - <tqmask name="BSSEC" value="0x0008" > + </mask> + <mask name="BSSEC" value="0x0008" > <value value="0x0000" name="High Security" cname="" /> <value value="0x0008" name="Standard Security" cname="" /> - </tqmask> - <tqmask name="BSSIZ" value="0x0006" > + </mask> + <mask name="BSSIZ" value="0x0006" > <value value="0x0000" name="4096" cname="" /> <value value="0x0002" name="2048" cname="" /> <value value="0x0004" name="512" cname="" /> <value value="0x0006" name="0" cname="" /> - </tqmask> - <tqmask name="EBSSIZ" value="0x0100" > + </mask> + <mask name="EBSSIZ" value="0x0100" > <value value="0x0000" name="256" cname="SMALL_BOOT_EEPROM" /> <value value="0x0100" name="0" cname="NO_BOOT_EEPROM" /> - </tqmask> - <tqmask name="RBSSIZ" value="0x3000" > + </mask> + <mask name="RBSSIZ" value="0x3000" > <value value="0x0000" name="1024" cname="LAR_BOOT_RAM" /> <value value="0x1000" name="256" cname="MED_BOOT_RAM" /> <value value="0x2000" name="128" cname="SMALL_BOOT_RAM" /> <value value="0x3000" name="0" cname="NO_BOOT_RAM" /> - </tqmask> + </mask> </config> - <config offset="0x8" name="FSS" wtqmask="0x330F" bvalue="0x330F" > - <tqmask name="WRTSS" value="0x0001" > + <config offset="0x8" name="FSS" wmask="0x330F" bvalue="0x330F" > + <mask name="WRTSS" value="0x0001" > <value value="0x0000" name="All" cname="WR_PROT_SEC_ON" /> <value value="0x0001" name="Off" cname="WR_PROT_SEC_OFF" /> - </tqmask> - <tqmask name="SSSEC" value="0x0008" > + </mask> + <mask name="SSSEC" value="0x0008" > <value value="0x0000" name="High Security" cname="" /> <value value="0x0008" name="Standard Security" cname="" /> - </tqmask> - <tqmask name="SSSIZ" value="0x0006" > + </mask> + <mask name="SSSIZ" value="0x0006" > <value value="0x0000" name="16384" cname="" /> <value value="0x0002" name="8192" cname="" /> <value value="0x0004" name="4096" cname="" /> <value value="0x0006" name="0" cname="" /> - </tqmask> - <tqmask name="ESSSIZ" value="0x0300" > + </mask> + <mask name="ESSSIZ" value="0x0300" > <value value="0x0000" name="1024" cname="LAR_SEC_EEPROM" /> <value value="0x0100" name="512" cname="MED_SEC_EEPROM" /> <value value="0x0200" name="256" cname="SMALL_SEC_EEPROM" /> <value value="0x0300" name="0" cname="NO_SEC_EEPROM" /> - </tqmask> - <tqmask name="RSSSIZ" value="0x3000" > + </mask> + <mask name="RSSSIZ" value="0x3000" > <value value="0x0000" name="4096" cname="LAR_SEC_RAM" /> <value value="0x1000" name="2048" cname="MED_SEC_RAM" /> <value value="0x2000" name="256" cname="SMALL_SEC_RAM" /> <value value="0x3000" name="0" cname="NO_SEC_RAM" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="FGS" wtqmask="0x0007" bvalue="0x0007" > - <tqmask name="WRTGS" value="0x0001" > + <config offset="0xA" name="FGS" wmask="0x0007" bvalue="0x0007" > + <mask name="WRTGS" value="0x0001" > <value value="0x0000" name="All" cname="WR_PROT_GEN_ON" /> <value value="0x0001" name="Off" cname="WR_PROT_GEN_OFF" /> - </tqmask> - <tqmask name="GSSEC" value="0x0006" > + </mask> + <mask name="GSSEC" value="0x0006" > <value value="default" name="High Security" cname="HIGH_PROT" /> <value value="0x0004" name="Standard Security" cname="STAND_PROT" /> <value value="0x0006" name="Off" cname="GEN_PROT" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="ICD" wtqmask="0xC003" bvalue="0xC003" > - <tqmask name="ICS" value="0x0003" > + <config offset="0xC" name="ICD" wmask="0xC003" bvalue="0xC003" > + <mask name="ICS" value="0x0003" > <value value="0x0000" name="EMUC3, EMUD3" cname="0xFFFC" /> <value value="0x0001" name="EMUC2, EMUD2" cname="0xFFFD" /> <value value="0x0002" name="EMUC1, EMUD1" cname="0xFFFE" /> <value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" /> - </tqmask> - <tqmask name="COE" value="0x4000" > + </mask> + <mask name="COE" value="0x4000" > <value value="0x0000" name="On" cname="0xBFFF" /> <value value="0x4000" name="Off" cname="_" /> - </tqmask> - <tqmask name="DEBUG" value="0x8000" > + </mask> + <mask name="DEBUG" value="0x8000" > <value value="0x0000" name="On" cname="0x7FFF" /> <value value="0x8000" name="Off" cname="_" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/30F6011.xml b/src/devices/pic/xml_data/30F6011.xml index 94a1ba1..60e6f5f 100644 --- a/src/devices/pic/xml_data/30F6011.xml +++ b/src/devices/pic/xml_data/30F6011.xml @@ -29,13 +29,13 @@ <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0xF80000" end="0xF8000D" /> <memory name="eeprom" start="0x7FF800" end="0x7FFFFF" /> - <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" /> + <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" /> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x8005BF" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="FOSC" wtqmask="0xC30F" bvalue="0xC30F" ctqmask="0xC10F" > - <tqmask name="FPR" value="0x000F" > + <config offset="0x0" name="FOSC" wmask="0xC30F" bvalue="0xC30F" cmask="0xC10F" > + <mask name="FPR" value="0x000F" > <value value="0x0000" name="XTL" cname="XTL" /> <value value="0x0001" name="XTL" cname="XTL" /> <value value="0x0002" name="HS" cname="HS" /> @@ -52,23 +52,23 @@ <value value="0x000D" name="EC4" cname="ECIO_PLL4" /> <value value="0x000E" name="EC8" cname="ECIO_PLL8" /> <value value="0x000F" name="EC16" cname="ECIO_PLL16" /> - </tqmask> - <tqmask name="FOS" value="0x0300" > + </mask> + <mask name="FOS" value="0x0300" > <value value="0x0000" name="TMR1" cname="EXT" /> <value value="0x0100" name="INTRC_F" cname="FRC" /> <value value="0x0200" name="INTRC_LP" cname="LP" /> <value value="0x0300" name="PRIM" cname="_" /> - </tqmask> - <tqmask name="FCKSM" value="0xC000" > + </mask> + <mask name="FCKSM" value="0xC000" > <value value="0x0000" name="Switching on, monitor on" cname="CSW_FSCM_ON" /> <value value="0x4000" name="Switching on, monitor off" cname="CSW_ON_FSCM_OFF" /> <value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" /> <value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="FWDT" wtqmask="0x803F" bvalue="0x803F" > - <tqmask name="FWPSB" value="0x000F" > + <config offset="0x2" name="FWDT" wmask="0x803F" bvalue="0x803F" > + <mask name="FWPSB" value="0x000F" > <value value="0x0000" name="1:1" cname="WDTPSB_1" /> <value value="0x0001" name="1:2" cname="WDTPSB_2" /> <value value="0x0002" name="1:3" cname="WDTPSB_3" /> @@ -85,72 +85,72 @@ <value value="0x000D" name="1:14" cname="WDTPSB_14" /> <value value="0x000E" name="1:15" cname="WDTPSB_15" /> <value value="0x000F" name="1:16" cname="WDTPSB_16" /> - </tqmask> - <tqmask name="FWPSA" value="0x0030" > + </mask> + <mask name="FWPSA" value="0x0030" > <value value="0x0000" name="1:1" cname="WDTPSA_1" /> <value value="0x0010" name="1:8" cname="WDTPSA_8" /> <value value="0x0020" name="1:64" cname="WDTPSA_64" /> <value value="0x0030" name="1:512" cname="WDTPSA_512" /> - </tqmask> - <tqmask name="FWDTEN" value="0x8000" > + </mask> + <mask name="FWDTEN" value="0x8000" > <value value="0x0000" name="Off" cname="WDT_OFF" /> <value value="0x8000" name="On" cname="WDT_ON" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="FBORPOR" wtqmask="0x87B3" bvalue="0x80B3" ctqmask="0x87B3" > - <tqmask name="FPWRT" value="0x0003" > + <config offset="0x4" name="FBORPOR" wmask="0x87B3" bvalue="0x80B3" cmask="0x87B3" > + <mask name="FPWRT" value="0x0003" > <value value="0x0000" name="0" cname="PWRT_OFF" /> <value value="0x0001" name="4" cname="PWRT_4" /> <value value="0x0002" name="16" cname="PWRT_16" /> <value value="0x0003" name="64" cname="PWRT_64" /> - </tqmask> - <tqmask name="BORV" value="0x0030" > + </mask> + <mask name="BORV" value="0x0030" > <value value="0x0000" name="4.5" cname="BORV_45" /> <value value="0x0010" name="4.2" cname="BORV_42" /> <value value="0x0020" name="2.7" cname="BORV_27" /> <value value="0x0030" name="2.0" cname="BORV_20" /> - </tqmask> - <tqmask name="BODEN" value="0x0080" > + </mask> + <mask name="BODEN" value="0x0080" > <value value="0x0000" name="Off" cname="PBOR_OFF" /> <value value="0x0080" name="On" cname="PBOR_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x8000" > + </mask> + <mask name="MCLRE" value="0x8000" > <value value="0x0000" name="Internal" cname="MCLR_DIS" /> <value value="0x8000" name="External" cname="MCLR_EN" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x0000" ctqmask="0x310F" /> + <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x0000" cmask="0x310F" /> - <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x0000" ctqmask="0x330F" /> + <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x0000" cmask="0x330F" /> - <config offset="0xA" name="FGS" wtqmask="0x0007" bvalue="0x0003" ctqmask="0x0007" > - <tqmask name="GWRP" value="0x0001" > + <config offset="0xA" name="FGS" wmask="0x0007" bvalue="0x0003" cmask="0x0007" > + <mask name="GWRP" value="0x0001" > <value value="0x0000" name="All" cname="0xFFFE" /> <value value="0x0001" name="Off" cname="_" /> - </tqmask> - <tqmask name="GCP" value="0x0002" > + </mask> + <mask name="GCP" value="0x0002" > <value value="0x0000" name="All" cname="CODE_PROT_ON" /> <value value="0x0002" name="Off" cname="CODE_PROT_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="ICD" wtqmask="0xC003" bvalue="0xC003" > - <tqmask name="ICS" value="0x0003" > + <config offset="0xC" name="ICD" wmask="0xC003" bvalue="0xC003" > + <mask name="ICS" value="0x0003" > <value value="0x0000" name="EMUC3, EMUD3" cname="0xFFFC" /> <value value="0x0001" name="EMUC2, EMUD2" cname="0xFFFD" /> <value value="0x0002" name="EMUC1, EMUD1" cname="0xFFFE" /> <value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" /> - </tqmask> - <tqmask name="COE" value="0x4000" > + </mask> + <mask name="COE" value="0x4000" > <value value="0x0000" name="On" cname="0xBFFF" /> <value value="0x4000" name="Off" cname="_" /> - </tqmask> - <tqmask name="DEBUG" value="0x8000" > + </mask> + <mask name="DEBUG" value="0x8000" > <value value="0x0000" name="On" cname="0x7FFF" /> <value value="0x8000" name="Off" cname="_" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/30F6011A.xml b/src/devices/pic/xml_data/30F6011A.xml index 752f62b..bb499b1 100644 --- a/src/devices/pic/xml_data/30F6011A.xml +++ b/src/devices/pic/xml_data/30F6011A.xml @@ -28,13 +28,13 @@ <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0xF80000" end="0xF8000D" /> <memory name="eeprom" start="0x7FF800" end="0x7FFFFF" /> - <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" /> + <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" /> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x80053F" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="FOSC" wtqmask="0xC71F" bvalue="0xC71F" > - <tqmask name="FOSFPR" value="0x071F" > + <config offset="0x0" name="FOSC" wmask="0xC71F" bvalue="0xC71F" > + <mask name="FOSFPR" value="0x071F" > <value value="default" name="invalid" /> <value value="0x001F" name="TMR1" cname="LP" /> <value value="0x011F" name="INTRC_F" cname="FRC" /> @@ -54,17 +54,17 @@ <value value="0x0715" name="HS3_4" cname="HS3_PLL4" /> <value value="0x0716" name="HS3_8" cname="HS3_PLL8" /> <value value="0x0717" name="HS3_16" cname="HS3_PLL16" /> - </tqmask> - <tqmask name="FCKSM" value="0xC000" > + </mask> + <mask name="FCKSM" value="0xC000" > <value value="0x0000" name="Switching on, monitor on" cname="CSW_FSCM_ON" /> <value value="0x4000" name="Switching on, monitor off" cname="CSW_ON_FSCM_OFF" /> <value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" /> <value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="FWDT" wtqmask="0x803F" bvalue="0x803F" > - <tqmask name="FWPSB" value="0x000F" > + <config offset="0x2" name="FWDT" wmask="0x803F" bvalue="0x803F" > + <mask name="FWPSB" value="0x000F" > <value value="0x0000" name="1:1" cname="WDTPSB_1" /> <value value="0x0001" name="1:2" cname="WDTPSB_2" /> <value value="0x0002" name="1:3" cname="WDTPSB_3" /> @@ -81,125 +81,125 @@ <value value="0x000D" name="1:14" cname="WDTPSB_14" /> <value value="0x000E" name="1:15" cname="WDTPSB_15" /> <value value="0x000F" name="1:16" cname="WDTPSB_16" /> - </tqmask> - <tqmask name="FWPSA" value="0x0030" > + </mask> + <mask name="FWPSA" value="0x0030" > <value value="0x0000" name="1:1" cname="WDTPSA_1" /> <value value="0x0010" name="1:8" cname="WDTPSA_8" /> <value value="0x0020" name="1:64" cname="WDTPSA_64" /> <value value="0x0030" name="1:512" cname="WDTPSA_512" /> - </tqmask> - <tqmask name="FWDTEN" value="0x8000" > + </mask> + <mask name="FWDTEN" value="0x8000" > <value value="0x0000" name="Off" cname="WDT_OFF" /> <value value="0x8000" name="On" cname="WDT_ON" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="FBORPOR" wtqmask="0x87B3" bvalue="0x80B3" ctqmask="0x87B3" > - <tqmask name="FPWRT" value="0x0003" > + <config offset="0x4" name="FBORPOR" wmask="0x87B3" bvalue="0x80B3" cmask="0x87B3" > + <mask name="FPWRT" value="0x0003" > <value value="0x0000" name="0" cname="PWRT_OFF" /> <value value="0x0001" name="4" cname="PWRT_4" /> <value value="0x0002" name="16" cname="PWRT_16" /> <value value="0x0003" name="64" cname="PWRT_64" /> - </tqmask> - <tqmask name="BORV" value="0x0030" > + </mask> + <mask name="BORV" value="0x0030" > <value value="0x0000" name="4.5" cname="BORV_45" /> <value value="0x0010" name="4.2" cname="BORV_42" /> <value value="0x0020" name="2.7" cname="BORV_27" /> <value value="0x0030" name="2.0" cname="BORV_20" /> - </tqmask> - <tqmask name="BODEN" value="0x0080" > + </mask> + <mask name="BODEN" value="0x0080" > <value value="0x0000" name="Off" cname="PBOR_OFF" /> <value value="0x0080" name="On" cname="PBOR_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x8000" > + </mask> + <mask name="MCLRE" value="0x8000" > <value value="0x0000" name="Internal" cname="MCLR_DIS" /> <value value="0x8000" name="External" cname="MCLR_EN" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="FBS" wtqmask="0x310F" bvalue="0x310F" > - <tqmask name="WRTBS" value="0x0001" > + <config offset="0x6" name="FBS" wmask="0x310F" bvalue="0x310F" > + <mask name="WRTBS" value="0x0001" > <value value="0x0000" name="All" cname="WR_PROT_BOOT_ON" /> <value value="0x0001" name="Off" cname="WR_PROT_BOOT_OFF" /> - </tqmask> - <tqmask name="BSSEC" value="0x0008" > + </mask> + <mask name="BSSEC" value="0x0008" > <value value="0x0000" name="High Security" cname="" /> <value value="0x0008" name="Standard Security" cname="" /> - </tqmask> - <tqmask name="BSSIZ" value="0x0006" > + </mask> + <mask name="BSSIZ" value="0x0006" > <value value="0x0000" name="4096" cname="" /> <value value="0x0002" name="2048" cname="" /> <value value="0x0004" name="512" cname="" /> <value value="0x0006" name="0" cname="" /> - </tqmask> - <tqmask name="EBSSIZ" value="0x0100" > + </mask> + <mask name="EBSSIZ" value="0x0100" > <value value="0x0000" name="256" cname="SMALL_BOOT_EEPROM" /> <value value="0x0100" name="0" cname="NO_BOOT_EEPROM" /> - </tqmask> - <tqmask name="RBSSIZ" value="0x3000" > + </mask> + <mask name="RBSSIZ" value="0x3000" > <value value="0x0000" name="1024" cname="LAR_BOOT_RAM" /> <value value="0x1000" name="256" cname="MED_BOOT_RAM" /> <value value="0x2000" name="128" cname="SMALL_BOOT_RAM" /> <value value="0x3000" name="0" cname="NO_BOOT_RAM" /> - </tqmask> + </mask> </config> - <config offset="0x8" name="FSS" wtqmask="0x330F" bvalue="0x330F" > - <tqmask name="WRTSS" value="0x0001" > + <config offset="0x8" name="FSS" wmask="0x330F" bvalue="0x330F" > + <mask name="WRTSS" value="0x0001" > <value value="0x0000" name="All" cname="WR_PROT_SEC_ON" /> <value value="0x0001" name="Off" cname="WR_PROT_SEC_OFF" /> - </tqmask> - <tqmask name="SSSEC" value="0x0008" > + </mask> + <mask name="SSSEC" value="0x0008" > <value value="0x0000" name="High Security" cname="" /> <value value="0x0008" name="Standard Security" cname="" /> - </tqmask> - <tqmask name="SSSIZ" value="0x0006" > + </mask> + <mask name="SSSIZ" value="0x0006" > <value value="0x0000" name="16384" cname="" /> <value value="0x0002" name="8192" cname="" /> <value value="0x0004" name="4096" cname="" /> <value value="0x0006" name="0" cname="" /> - </tqmask> - <tqmask name="ESSSIZ" value="0x0300" > + </mask> + <mask name="ESSSIZ" value="0x0300" > <value value="0x0000" name="1024" cname="LAR_SEC_EEPROM" /> <value value="0x0100" name="512" cname="MED_SEC_EEPROM" /> <value value="0x0200" name="256" cname="SMALL_SEC_EEPROM" /> <value value="0x0300" name="0" cname="NO_SEC_EEPROM" /> - </tqmask> - <tqmask name="RSSSIZ" value="0x3000" > + </mask> + <mask name="RSSSIZ" value="0x3000" > <value value="0x0000" name="4096" cname="LAR_SEC_RAM" /> <value value="0x1000" name="2048" cname="MED_SEC_RAM" /> <value value="0x2000" name="256" cname="SMALL_SEC_RAM" /> <value value="0x3000" name="0" cname="NO_SEC_RAM" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="FGS" wtqmask="0x0007" bvalue="0x0007" > - <tqmask name="WRTGS" value="0x0001" > + <config offset="0xA" name="FGS" wmask="0x0007" bvalue="0x0007" > + <mask name="WRTGS" value="0x0001" > <value value="0x0000" name="All" cname="WR_PROT_GEN_ON" /> <value value="0x0001" name="Off" cname="WR_PROT_GEN_OFF" /> - </tqmask> - <tqmask name="GSSEC" value="0x0006" > + </mask> + <mask name="GSSEC" value="0x0006" > <value value="default" name="High Security" cname="HIGH_PROT" /> <value value="0x0004" name="Standard Security" cname="STAND_PROT" /> <value value="0x0006" name="Off" cname="GEN_PROT" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="ICD" wtqmask="0xC003" bvalue="0xC003" > - <tqmask name="ICS" value="0x0003" > + <config offset="0xC" name="ICD" wmask="0xC003" bvalue="0xC003" > + <mask name="ICS" value="0x0003" > <value value="0x0000" name="EMUC3, EMUD3" cname="0xFFFC" /> <value value="0x0001" name="EMUC2, EMUD2" cname="0xFFFD" /> <value value="0x0002" name="EMUC1, EMUD1" cname="0xFFFE" /> <value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" /> - </tqmask> - <tqmask name="COE" value="0x4000" > + </mask> + <mask name="COE" value="0x4000" > <value value="0x0000" name="On" cname="0xBFFF" /> <value value="0x4000" name="Off" cname="_" /> - </tqmask> - <tqmask name="DEBUG" value="0x8000" > + </mask> + <mask name="DEBUG" value="0x8000" > <value value="0x0000" name="On" cname="0x7FFF" /> <value value="0x8000" name="Off" cname="_" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/30F6012.xml b/src/devices/pic/xml_data/30F6012.xml index 7d5f9b5..e7c1797 100644 --- a/src/devices/pic/xml_data/30F6012.xml +++ b/src/devices/pic/xml_data/30F6012.xml @@ -29,13 +29,13 @@ <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0xF80000" end="0xF8000D" /> <memory name="eeprom" start="0x7FF000" end="0x7FFFFF" /> - <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" /> + <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" /> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x80053F" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="FOSC" wtqmask="0xC30F" bvalue="0xC30F" ctqmask="0xC10F" > - <tqmask name="FPR" value="0x000F" > + <config offset="0x0" name="FOSC" wmask="0xC30F" bvalue="0xC30F" cmask="0xC10F" > + <mask name="FPR" value="0x000F" > <value value="0x0000" name="XTL" cname="XTL" /> <value value="0x0001" name="XTL" cname="XTL" /> <value value="0x0002" name="HS" cname="HS" /> @@ -52,23 +52,23 @@ <value value="0x000D" name="EC4" cname="ECIO_PLL4" /> <value value="0x000E" name="EC8" cname="ECIO_PLL8" /> <value value="0x000F" name="EC16" cname="ECIO_PLL16" /> - </tqmask> - <tqmask name="FOS" value="0x0300" > + </mask> + <mask name="FOS" value="0x0300" > <value value="0x0000" name="TMR1" cname="EXT" /> <value value="0x0100" name="INTRC_F" cname="FRC" /> <value value="0x0200" name="INTRC_LP" cname="LP" /> <value value="0x0300" name="PRIM" cname="_" /> - </tqmask> - <tqmask name="FCKSM" value="0xC000" > + </mask> + <mask name="FCKSM" value="0xC000" > <value value="0x0000" name="Switching on, monitor on" cname="CSW_FSCM_ON" /> <value value="0x4000" name="Switching on, monitor off" cname="CSW_ON_FSCM_OFF" /> <value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" /> <value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="FWDT" wtqmask="0x803F" bvalue="0x803F" > - <tqmask name="FWPSB" value="0x000F" > + <config offset="0x2" name="FWDT" wmask="0x803F" bvalue="0x803F" > + <mask name="FWPSB" value="0x000F" > <value value="0x0000" name="1:1" cname="WDTPSB_1" /> <value value="0x0001" name="1:2" cname="WDTPSB_2" /> <value value="0x0002" name="1:3" cname="WDTPSB_3" /> @@ -85,72 +85,72 @@ <value value="0x000D" name="1:14" cname="WDTPSB_14" /> <value value="0x000E" name="1:15" cname="WDTPSB_15" /> <value value="0x000F" name="1:16" cname="WDTPSB_16" /> - </tqmask> - <tqmask name="FWPSA" value="0x0030" > + </mask> + <mask name="FWPSA" value="0x0030" > <value value="0x0000" name="1:1" cname="WDTPSA_1" /> <value value="0x0010" name="1:8" cname="WDTPSA_8" /> <value value="0x0020" name="1:64" cname="WDTPSA_64" /> <value value="0x0030" name="1:512" cname="WDTPSA_512" /> - </tqmask> - <tqmask name="FWDTEN" value="0x8000" > + </mask> + <mask name="FWDTEN" value="0x8000" > <value value="0x0000" name="Off" cname="WDT_OFF" /> <value value="0x8000" name="On" cname="WDT_ON" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="FBORPOR" wtqmask="0x87B3" bvalue="0x80B3" ctqmask="0x87B3" > - <tqmask name="FPWRT" value="0x0003" > + <config offset="0x4" name="FBORPOR" wmask="0x87B3" bvalue="0x80B3" cmask="0x87B3" > + <mask name="FPWRT" value="0x0003" > <value value="0x0000" name="0" cname="PWRT_OFF" /> <value value="0x0001" name="4" cname="PWRT_4" /> <value value="0x0002" name="16" cname="PWRT_16" /> <value value="0x0003" name="64" cname="PWRT_64" /> - </tqmask> - <tqmask name="BORV" value="0x0030" > + </mask> + <mask name="BORV" value="0x0030" > <value value="0x0000" name="4.5" cname="BORV_45" /> <value value="0x0010" name="4.2" cname="BORV_42" /> <value value="0x0020" name="2.7" cname="BORV_27" /> <value value="0x0030" name="2.0" cname="BORV_20" /> - </tqmask> - <tqmask name="BODEN" value="0x0080" > + </mask> + <mask name="BODEN" value="0x0080" > <value value="0x0000" name="Off" cname="PBOR_OFF" /> <value value="0x0080" name="On" cname="PBOR_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x8000" > + </mask> + <mask name="MCLRE" value="0x8000" > <value value="0x0000" name="Internal" cname="MCLR_DIS" /> <value value="0x8000" name="External" cname="MCLR_EN" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x0000" ctqmask="0x310F" /> + <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x0000" cmask="0x310F" /> - <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x0000" ctqmask="0x330F" /> + <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x0000" cmask="0x330F" /> - <config offset="0xA" name="FGS" wtqmask="0x0007" bvalue="0x0003" ctqmask="0x0007" > - <tqmask name="GWRP" value="0x0001" > + <config offset="0xA" name="FGS" wmask="0x0007" bvalue="0x0003" cmask="0x0007" > + <mask name="GWRP" value="0x0001" > <value value="0x0000" name="All" cname="0xFFFE" /> <value value="0x0001" name="Off" cname="_" /> - </tqmask> - <tqmask name="GCP" value="0x0002" > + </mask> + <mask name="GCP" value="0x0002" > <value value="0x0000" name="All" cname="CODE_PROT_ON" /> <value value="0x0002" name="Off" cname="CODE_PROT_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="ICD" wtqmask="0xC003" bvalue="0xC003" > - <tqmask name="ICS" value="0x0003" > + <config offset="0xC" name="ICD" wmask="0xC003" bvalue="0xC003" > + <mask name="ICS" value="0x0003" > <value value="0x0000" name="EMUC3, EMUD3" cname="0xFFFC" /> <value value="0x0001" name="EMUC2, EMUD2" cname="0xFFFD" /> <value value="0x0002" name="EMUC1, EMUD1" cname="0xFFFE" /> <value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" /> - </tqmask> - <tqmask name="COE" value="0x4000" > + </mask> + <mask name="COE" value="0x4000" > <value value="0x0000" name="On" cname="0xBFFF" /> <value value="0x4000" name="Off" cname="_" /> - </tqmask> - <tqmask name="DEBUG" value="0x8000" > + </mask> + <mask name="DEBUG" value="0x8000" > <value value="0x0000" name="On" cname="0x7FFF" /> <value value="0x8000" name="Off" cname="_" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/30F6012A.xml b/src/devices/pic/xml_data/30F6012A.xml index c2a0e42..6dd84fb 100644 --- a/src/devices/pic/xml_data/30F6012A.xml +++ b/src/devices/pic/xml_data/30F6012A.xml @@ -28,13 +28,13 @@ <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0xF80000" end="0xF8000D" /> <memory name="eeprom" start="0x7FF000" end="0x7FFFFF" /> - <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" /> + <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" /> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x80053F" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="FOSC" wtqmask="0xC71F" bvalue="0xC71F" > - <tqmask name="FOSFPR" value="0x071F" > + <config offset="0x0" name="FOSC" wmask="0xC71F" bvalue="0xC71F" > + <mask name="FOSFPR" value="0x071F" > <value value="default" name="invalid" /> <value value="0x001F" name="TMR1" cname="LP" /> <value value="0x011F" name="INTRC_F" cname="FRC" /> @@ -54,17 +54,17 @@ <value value="0x0715" name="HS3_4" cname="HS3_PLL4" /> <value value="0x0716" name="HS3_8" cname="HS3_PLL8" /> <value value="0x0717" name="HS3_16" cname="HS3_PLL16" /> - </tqmask> - <tqmask name="FCKSM" value="0xC000" > + </mask> + <mask name="FCKSM" value="0xC000" > <value value="0x0000" name="Switching on, monitor on" cname="CSW_FSCM_ON" /> <value value="0x4000" name="Switching on, monitor off" cname="CSW_ON_FSCM_OFF" /> <value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" /> <value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="FWDT" wtqmask="0x803F" bvalue="0x803F" > - <tqmask name="FWPSB" value="0x000F" > + <config offset="0x2" name="FWDT" wmask="0x803F" bvalue="0x803F" > + <mask name="FWPSB" value="0x000F" > <value value="0x0000" name="1:1" cname="WDTPSB_1" /> <value value="0x0001" name="1:2" cname="WDTPSB_2" /> <value value="0x0002" name="1:3" cname="WDTPSB_3" /> @@ -81,125 +81,125 @@ <value value="0x000D" name="1:14" cname="WDTPSB_14" /> <value value="0x000E" name="1:15" cname="WDTPSB_15" /> <value value="0x000F" name="1:16" cname="WDTPSB_16" /> - </tqmask> - <tqmask name="FWPSA" value="0x0030" > + </mask> + <mask name="FWPSA" value="0x0030" > <value value="0x0000" name="1:1" cname="WDTPSA_1" /> <value value="0x0010" name="1:8" cname="WDTPSA_8" /> <value value="0x0020" name="1:64" cname="WDTPSA_64" /> <value value="0x0030" name="1:512" cname="WDTPSA_512" /> - </tqmask> - <tqmask name="FWDTEN" value="0x8000" > + </mask> + <mask name="FWDTEN" value="0x8000" > <value value="0x0000" name="Off" cname="WDT_OFF" /> <value value="0x8000" name="On" cname="WDT_ON" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="FBORPOR" wtqmask="0x87B3" bvalue="0x80B3" ctqmask="0x87B3" > - <tqmask name="FPWRT" value="0x0003" > + <config offset="0x4" name="FBORPOR" wmask="0x87B3" bvalue="0x80B3" cmask="0x87B3" > + <mask name="FPWRT" value="0x0003" > <value value="0x0000" name="0" cname="PWRT_OFF" /> <value value="0x0001" name="4" cname="PWRT_4" /> <value value="0x0002" name="16" cname="PWRT_16" /> <value value="0x0003" name="64" cname="PWRT_64" /> - </tqmask> - <tqmask name="BORV" value="0x0030" > + </mask> + <mask name="BORV" value="0x0030" > <value value="0x0000" name="4.5" cname="BORV_45" /> <value value="0x0010" name="4.2" cname="BORV_42" /> <value value="0x0020" name="2.7" cname="BORV_27" /> <value value="0x0030" name="2.0" cname="BORV_20" /> - </tqmask> - <tqmask name="BODEN" value="0x0080" > + </mask> + <mask name="BODEN" value="0x0080" > <value value="0x0000" name="Off" cname="PBOR_OFF" /> <value value="0x0080" name="On" cname="PBOR_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x8000" > + </mask> + <mask name="MCLRE" value="0x8000" > <value value="0x0000" name="Internal" cname="MCLR_DIS" /> <value value="0x8000" name="External" cname="MCLR_EN" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="FBS" wtqmask="0x310F" bvalue="0x310F" > - <tqmask name="WRTBS" value="0x0001" > + <config offset="0x6" name="FBS" wmask="0x310F" bvalue="0x310F" > + <mask name="WRTBS" value="0x0001" > <value value="0x0000" name="All" cname="WR_PROT_BOOT_ON" /> <value value="0x0001" name="Off" cname="WR_PROT_BOOT_OFF" /> - </tqmask> - <tqmask name="BSSEC" value="0x0008" > + </mask> + <mask name="BSSEC" value="0x0008" > <value value="0x0000" name="High Security" cname="" /> <value value="0x0008" name="Standard Security" cname="" /> - </tqmask> - <tqmask name="BSSIZ" value="0x0006" > + </mask> + <mask name="BSSIZ" value="0x0006" > <value value="0x0000" name="4096" cname="" /> <value value="0x0002" name="2048" cname="" /> <value value="0x0004" name="512" cname="" /> <value value="0x0006" name="0" cname="" /> - </tqmask> - <tqmask name="EBSSIZ" value="0x0100" > + </mask> + <mask name="EBSSIZ" value="0x0100" > <value value="0x0000" name="256" cname="SMALL_BOOT_EEPROM" /> <value value="0x0100" name="0" cname="NO_BOOT_EEPROM" /> - </tqmask> - <tqmask name="RBSSIZ" value="0x3000" > + </mask> + <mask name="RBSSIZ" value="0x3000" > <value value="0x0000" name="1024" cname="LAR_BOOT_RAM" /> <value value="0x1000" name="256" cname="MED_BOOT_RAM" /> <value value="0x2000" name="128" cname="SMALL_BOOT_RAM" /> <value value="0x3000" name="0" cname="NO_BOOT_RAM" /> - </tqmask> + </mask> </config> - <config offset="0x8" name="FSS" wtqmask="0x330F" bvalue="0x330F" > - <tqmask name="WRTSS" value="0x0001" > + <config offset="0x8" name="FSS" wmask="0x330F" bvalue="0x330F" > + <mask name="WRTSS" value="0x0001" > <value value="0x0000" name="All" cname="WR_PROT_SEC_ON" /> <value value="0x0001" name="Off" cname="WR_PROT_SEC_OFF" /> - </tqmask> - <tqmask name="SSSEC" value="0x0008" > + </mask> + <mask name="SSSEC" value="0x0008" > <value value="0x0000" name="High Security" cname="" /> <value value="0x0008" name="Standard Security" cname="" /> - </tqmask> - <tqmask name="SSSIZ" value="0x0006" > + </mask> + <mask name="SSSIZ" value="0x0006" > <value value="0x0000" name="16384" cname="" /> <value value="0x0002" name="8192" cname="" /> <value value="0x0004" name="4096" cname="" /> <value value="0x0006" name="0" cname="" /> - </tqmask> - <tqmask name="ESSSIZ" value="0x0300" > + </mask> + <mask name="ESSSIZ" value="0x0300" > <value value="0x0000" name="1024" cname="LAR_SEC_EEPROM" /> <value value="0x0100" name="512" cname="MED_SEC_EEPROM" /> <value value="0x0200" name="256" cname="SMALL_SEC_EEPROM" /> <value value="0x0300" name="0" cname="NO_SEC_EEPROM" /> - </tqmask> - <tqmask name="RSSSIZ" value="0x3000" > + </mask> + <mask name="RSSSIZ" value="0x3000" > <value value="0x0000" name="4096" cname="LAR_SEC_RAM" /> <value value="0x1000" name="2048" cname="MED_SEC_RAM" /> <value value="0x2000" name="256" cname="SMALL_SEC_RAM" /> <value value="0x3000" name="0" cname="NO_SEC_RAM" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="FGS" wtqmask="0x0007" bvalue="0x0007" > - <tqmask name="WRTGS" value="0x0001" > + <config offset="0xA" name="FGS" wmask="0x0007" bvalue="0x0007" > + <mask name="WRTGS" value="0x0001" > <value value="0x0000" name="All" cname="WR_PROT_GEN_ON" /> <value value="0x0001" name="Off" cname="WR_PROT_GEN_OFF" /> - </tqmask> - <tqmask name="GSSEC" value="0x0006" > + </mask> + <mask name="GSSEC" value="0x0006" > <value value="default" name="High Security" cname="HIGH_PROT" /> <value value="0x0004" name="Standard Security" cname="STAND_PROT" /> <value value="0x0006" name="Off" cname="GEN_PROT" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="ICD" wtqmask="0xC003" bvalue="0xC003" > - <tqmask name="ICS" value="0x0003" > + <config offset="0xC" name="ICD" wmask="0xC003" bvalue="0xC003" > + <mask name="ICS" value="0x0003" > <value value="0x0000" name="EMUC3, EMUD3" cname="0xFFFC" /> <value value="0x0001" name="EMUC2, EMUD2" cname="0xFFFD" /> <value value="0x0002" name="EMUC1, EMUD1" cname="0xFFFE" /> <value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" /> - </tqmask> - <tqmask name="COE" value="0x4000" > + </mask> + <mask name="COE" value="0x4000" > <value value="0x0000" name="On" cname="0xBFFF" /> <value value="0x4000" name="Off" cname="_" /> - </tqmask> - <tqmask name="DEBUG" value="0x8000" > + </mask> + <mask name="DEBUG" value="0x8000" > <value value="0x0000" name="On" cname="0x7FFF" /> <value value="0x8000" name="Off" cname="_" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/30F6013.xml b/src/devices/pic/xml_data/30F6013.xml index 81451a6..34b66cf 100644 --- a/src/devices/pic/xml_data/30F6013.xml +++ b/src/devices/pic/xml_data/30F6013.xml @@ -29,13 +29,13 @@ <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0xF80000" end="0xF8000D" /> <memory name="eeprom" start="0x7FF800" end="0x7FFFFF" /> - <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" /> + <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" /> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x80053F" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="FOSC" wtqmask="0xC30F" bvalue="0xC30F" ctqmask="0xC10F" > - <tqmask name="FPR" value="0x000F" > + <config offset="0x0" name="FOSC" wmask="0xC30F" bvalue="0xC30F" cmask="0xC10F" > + <mask name="FPR" value="0x000F" > <value value="0x0000" name="XTL" cname="XTL" /> <value value="0x0001" name="XTL" cname="XTL" /> <value value="0x0002" name="HS" cname="HS" /> @@ -52,23 +52,23 @@ <value value="0x000D" name="EC4" cname="ECIO_PLL4" /> <value value="0x000E" name="EC8" cname="ECIO_PLL8" /> <value value="0x000F" name="EC16" cname="ECIO_PLL16" /> - </tqmask> - <tqmask name="FOS" value="0x0300" > + </mask> + <mask name="FOS" value="0x0300" > <value value="0x0000" name="TMR1" cname="EXT" /> <value value="0x0100" name="INTRC_F" cname="FRC" /> <value value="0x0200" name="INTRC_LP" cname="LP" /> <value value="0x0300" name="PRIM" cname="_" /> - </tqmask> - <tqmask name="FCKSM" value="0xC000" > + </mask> + <mask name="FCKSM" value="0xC000" > <value value="0x0000" name="Switching on, monitor on" cname="CSW_FSCM_ON" /> <value value="0x4000" name="Switching on, monitor off" cname="CSW_ON_FSCM_OFF" /> <value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" /> <value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="FWDT" wtqmask="0x803F" bvalue="0x803F" > - <tqmask name="FWPSB" value="0x000F" > + <config offset="0x2" name="FWDT" wmask="0x803F" bvalue="0x803F" > + <mask name="FWPSB" value="0x000F" > <value value="0x0000" name="1:1" cname="WDTPSB_1" /> <value value="0x0001" name="1:2" cname="WDTPSB_2" /> <value value="0x0002" name="1:3" cname="WDTPSB_3" /> @@ -85,72 +85,72 @@ <value value="0x000D" name="1:14" cname="WDTPSB_14" /> <value value="0x000E" name="1:15" cname="WDTPSB_15" /> <value value="0x000F" name="1:16" cname="WDTPSB_16" /> - </tqmask> - <tqmask name="FWPSA" value="0x0030" > + </mask> + <mask name="FWPSA" value="0x0030" > <value value="0x0000" name="1:1" cname="WDTPSA_1" /> <value value="0x0010" name="1:8" cname="WDTPSA_8" /> <value value="0x0020" name="1:64" cname="WDTPSA_64" /> <value value="0x0030" name="1:512" cname="WDTPSA_512" /> - </tqmask> - <tqmask name="FWDTEN" value="0x8000" > + </mask> + <mask name="FWDTEN" value="0x8000" > <value value="0x0000" name="Off" cname="WDT_OFF" /> <value value="0x8000" name="On" cname="WDT_ON" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="FBORPOR" wtqmask="0x87B3" bvalue="0x80B3" ctqmask="0x87B3" > - <tqmask name="FPWRT" value="0x0003" > + <config offset="0x4" name="FBORPOR" wmask="0x87B3" bvalue="0x80B3" cmask="0x87B3" > + <mask name="FPWRT" value="0x0003" > <value value="0x0000" name="0" cname="PWRT_OFF" /> <value value="0x0001" name="4" cname="PWRT_4" /> <value value="0x0002" name="16" cname="PWRT_16" /> <value value="0x0003" name="64" cname="PWRT_64" /> - </tqmask> - <tqmask name="BORV" value="0x0030" > + </mask> + <mask name="BORV" value="0x0030" > <value value="0x0000" name="4.5" cname="BORV_45" /> <value value="0x0010" name="4.2" cname="BORV_42" /> <value value="0x0020" name="2.7" cname="BORV_27" /> <value value="0x0030" name="2.0" cname="BORV_20" /> - </tqmask> - <tqmask name="BODEN" value="0x0080" > + </mask> + <mask name="BODEN" value="0x0080" > <value value="0x0000" name="Off" cname="PBOR_OFF" /> <value value="0x0080" name="On" cname="PBOR_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x8000" > + </mask> + <mask name="MCLRE" value="0x8000" > <value value="0x0000" name="Internal" cname="MCLR_DIS" /> <value value="0x8000" name="External" cname="MCLR_EN" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x0000" ctqmask="0x310F" /> + <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x0000" cmask="0x310F" /> - <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x0000" ctqmask="0x330F" /> + <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x0000" cmask="0x330F" /> - <config offset="0xA" name="FGS" wtqmask="0x0007" bvalue="0x0003" ctqmask="0x0007" > - <tqmask name="GWRP" value="0x0001" > + <config offset="0xA" name="FGS" wmask="0x0007" bvalue="0x0003" cmask="0x0007" > + <mask name="GWRP" value="0x0001" > <value value="0x0000" name="All" cname="0xFFFE" /> <value value="0x0001" name="Off" cname="_" /> - </tqmask> - <tqmask name="GCP" value="0x0002" > + </mask> + <mask name="GCP" value="0x0002" > <value value="0x0000" name="All" cname="CODE_PROT_ON" /> <value value="0x0002" name="Off" cname="CODE_PROT_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="ICD" wtqmask="0xC003" bvalue="0xC003" > - <tqmask name="ICS" value="0x0003" > + <config offset="0xC" name="ICD" wmask="0xC003" bvalue="0xC003" > + <mask name="ICS" value="0x0003" > <value value="0x0000" name="EMUC3, EMUD3" cname="0xFFFC" /> <value value="0x0001" name="EMUC2, EMUD2" cname="0xFFFD" /> <value value="0x0002" name="EMUC1, EMUD1" cname="0xFFFE" /> <value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" /> - </tqmask> - <tqmask name="COE" value="0x4000" > + </mask> + <mask name="COE" value="0x4000" > <value value="0x0000" name="On" cname="0xBFFF" /> <value value="0x4000" name="Off" cname="_" /> - </tqmask> - <tqmask name="DEBUG" value="0x8000" > + </mask> + <mask name="DEBUG" value="0x8000" > <value value="0x0000" name="On" cname="0x7FFF" /> <value value="0x8000" name="Off" cname="_" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/30F6013A.xml b/src/devices/pic/xml_data/30F6013A.xml index ff382ea..e0a5758 100644 --- a/src/devices/pic/xml_data/30F6013A.xml +++ b/src/devices/pic/xml_data/30F6013A.xml @@ -28,13 +28,13 @@ <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0xF80000" end="0xF8000D" /> <memory name="eeprom" start="0x7FF800" end="0x7FFFFF" /> - <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" /> + <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" /> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x80053F" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="FOSC" wtqmask="0xC71F" bvalue="0xC71F" > - <tqmask name="FOSFPR" value="0x071F" > + <config offset="0x0" name="FOSC" wmask="0xC71F" bvalue="0xC71F" > + <mask name="FOSFPR" value="0x071F" > <value value="default" name="invalid" /> <value value="0x001F" name="TMR1" cname="LP" /> <value value="0x011F" name="INTRC_F" cname="FRC" /> @@ -54,17 +54,17 @@ <value value="0x0715" name="HS3_4" cname="HS3_PLL4" /> <value value="0x0716" name="HS3_8" cname="HS3_PLL8" /> <value value="0x0717" name="HS3_16" cname="HS3_PLL16" /> - </tqmask> - <tqmask name="FCKSM" value="0xC000" > + </mask> + <mask name="FCKSM" value="0xC000" > <value value="0x0000" name="Switching on, monitor on" cname="CSW_FSCM_ON" /> <value value="0x4000" name="Switching on, monitor off" cname="CSW_ON_FSCM_OFF" /> <value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" /> <value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="FWDT" wtqmask="0x803F" bvalue="0x803F" > - <tqmask name="FWPSB" value="0x000F" > + <config offset="0x2" name="FWDT" wmask="0x803F" bvalue="0x803F" > + <mask name="FWPSB" value="0x000F" > <value value="0x0000" name="1:1" cname="WDTPSB_1" /> <value value="0x0001" name="1:2" cname="WDTPSB_2" /> <value value="0x0002" name="1:3" cname="WDTPSB_3" /> @@ -81,125 +81,125 @@ <value value="0x000D" name="1:14" cname="WDTPSB_14" /> <value value="0x000E" name="1:15" cname="WDTPSB_15" /> <value value="0x000F" name="1:16" cname="WDTPSB_16" /> - </tqmask> - <tqmask name="FWPSA" value="0x0030" > + </mask> + <mask name="FWPSA" value="0x0030" > <value value="0x0000" name="1:1" cname="WDTPSA_1" /> <value value="0x0010" name="1:8" cname="WDTPSA_8" /> <value value="0x0020" name="1:64" cname="WDTPSA_64" /> <value value="0x0030" name="1:512" cname="WDTPSA_512" /> - </tqmask> - <tqmask name="FWDTEN" value="0x8000" > + </mask> + <mask name="FWDTEN" value="0x8000" > <value value="0x0000" name="Off" cname="WDT_OFF" /> <value value="0x8000" name="On" cname="WDT_ON" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="FBORPOR" wtqmask="0x87B3" bvalue="0x80B3" ctqmask="0x87B3" > - <tqmask name="FPWRT" value="0x0003" > + <config offset="0x4" name="FBORPOR" wmask="0x87B3" bvalue="0x80B3" cmask="0x87B3" > + <mask name="FPWRT" value="0x0003" > <value value="0x0000" name="0" cname="PWRT_OFF" /> <value value="0x0001" name="4" cname="PWRT_4" /> <value value="0x0002" name="16" cname="PWRT_16" /> <value value="0x0003" name="64" cname="PWRT_64" /> - </tqmask> - <tqmask name="BORV" value="0x0030" > + </mask> + <mask name="BORV" value="0x0030" > <value value="0x0000" name="4.5" cname="BORV_45" /> <value value="0x0010" name="4.2" cname="BORV_42" /> <value value="0x0020" name="2.7" cname="BORV_27" /> <value value="0x0030" name="2.0" cname="BORV_20" /> - </tqmask> - <tqmask name="BODEN" value="0x0080" > + </mask> + <mask name="BODEN" value="0x0080" > <value value="0x0000" name="Off" cname="PBOR_OFF" /> <value value="0x0080" name="On" cname="PBOR_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x8000" > + </mask> + <mask name="MCLRE" value="0x8000" > <value value="0x0000" name="Internal" cname="MCLR_DIS" /> <value value="0x8000" name="External" cname="MCLR_EN" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="FBS" wtqmask="0x310F" bvalue="0x310F" > - <tqmask name="WRTBS" value="0x0001" > + <config offset="0x6" name="FBS" wmask="0x310F" bvalue="0x310F" > + <mask name="WRTBS" value="0x0001" > <value value="0x0000" name="All" cname="WR_PROT_BOOT_ON" /> <value value="0x0001" name="Off" cname="WR_PROT_BOOT_OFF" /> - </tqmask> - <tqmask name="BSSEC" value="0x0008" > + </mask> + <mask name="BSSEC" value="0x0008" > <value value="0x0000" name="High Security" cname="" /> <value value="0x0008" name="Standard Security" cname="" /> - </tqmask> - <tqmask name="BSSIZ" value="0x0006" > + </mask> + <mask name="BSSIZ" value="0x0006" > <value value="0x0000" name="4096" cname="" /> <value value="0x0002" name="2048" cname="" /> <value value="0x0004" name="512" cname="" /> <value value="0x0006" name="0" cname="" /> - </tqmask> - <tqmask name="EBSSIZ" value="0x0100" > + </mask> + <mask name="EBSSIZ" value="0x0100" > <value value="0x0000" name="256" cname="SMALL_BOOT_EEPROM" /> <value value="0x0100" name="0" cname="NO_BOOT_EEPROM" /> - </tqmask> - <tqmask name="RBSSIZ" value="0x3000" > + </mask> + <mask name="RBSSIZ" value="0x3000" > <value value="0x0000" name="1024" cname="LAR_BOOT_RAM" /> <value value="0x1000" name="256" cname="MED_BOOT_RAM" /> <value value="0x2000" name="128" cname="SMALL_BOOT_RAM" /> <value value="0x3000" name="0" cname="NO_BOOT_RAM" /> - </tqmask> + </mask> </config> - <config offset="0x8" name="FSS" wtqmask="0x330F" bvalue="0x330F" > - <tqmask name="WRTSS" value="0x0001" > + <config offset="0x8" name="FSS" wmask="0x330F" bvalue="0x330F" > + <mask name="WRTSS" value="0x0001" > <value value="0x0000" name="All" cname="WR_PROT_SEC_ON" /> <value value="0x0001" name="Off" cname="WR_PROT_SEC_OFF" /> - </tqmask> - <tqmask name="SSSEC" value="0x0008" > + </mask> + <mask name="SSSEC" value="0x0008" > <value value="0x0000" name="High Security" cname="" /> <value value="0x0008" name="Standard Security" cname="" /> - </tqmask> - <tqmask name="SSSIZ" value="0x0006" > + </mask> + <mask name="SSSIZ" value="0x0006" > <value value="0x0000" name="16384" cname="" /> <value value="0x0002" name="8192" cname="" /> <value value="0x0004" name="4096" cname="" /> <value value="0x0006" name="0" cname="" /> - </tqmask> - <tqmask name="ESSSIZ" value="0x0300" > + </mask> + <mask name="ESSSIZ" value="0x0300" > <value value="0x0000" name="1024" cname="LAR_SEC_EEPROM" /> <value value="0x0100" name="512" cname="MED_SEC_EEPROM" /> <value value="0x0200" name="256" cname="SMALL_SEC_EEPROM" /> <value value="0x0300" name="0" cname="NO_SEC_EEPROM" /> - </tqmask> - <tqmask name="RSSSIZ" value="0x3000" > + </mask> + <mask name="RSSSIZ" value="0x3000" > <value value="0x0000" name="4096" cname="LAR_SEC_RAM" /> <value value="0x1000" name="2048" cname="MED_SEC_RAM" /> <value value="0x2000" name="256" cname="SMALL_SEC_RAM" /> <value value="0x3000" name="0" cname="NO_SEC_RAM" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="FGS" wtqmask="0x0007" bvalue="0x0007" > - <tqmask name="WRTGS" value="0x0001" > + <config offset="0xA" name="FGS" wmask="0x0007" bvalue="0x0007" > + <mask name="WRTGS" value="0x0001" > <value value="0x0000" name="All" cname="WR_PROT_GEN_ON" /> <value value="0x0001" name="Off" cname="WR_PROT_GEN_OFF" /> - </tqmask> - <tqmask name="GSSEC" value="0x0006" > + </mask> + <mask name="GSSEC" value="0x0006" > <value value="default" name="High Security" cname="HIGH_PROT" /> <value value="0x0004" name="Standard Security" cname="STAND_PROT" /> <value value="0x0006" name="Off" cname="GEN_PROT" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="ICD" wtqmask="0xC003" bvalue="0xC003" > - <tqmask name="ICS" value="0x0003" > + <config offset="0xC" name="ICD" wmask="0xC003" bvalue="0xC003" > + <mask name="ICS" value="0x0003" > <value value="0x0000" name="EMUC3, EMUD3" cname="0xFFFC" /> <value value="0x0001" name="EMUC2, EMUD2" cname="0xFFFD" /> <value value="0x0002" name="EMUC1, EMUD1" cname="0xFFFE" /> <value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" /> - </tqmask> - <tqmask name="COE" value="0x4000" > + </mask> + <mask name="COE" value="0x4000" > <value value="0x0000" name="On" cname="0xBFFF" /> <value value="0x4000" name="Off" cname="_" /> - </tqmask> - <tqmask name="DEBUG" value="0x8000" > + </mask> + <mask name="DEBUG" value="0x8000" > <value value="0x0000" name="On" cname="0x7FFF" /> <value value="0x8000" name="Off" cname="_" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/30F6014.xml b/src/devices/pic/xml_data/30F6014.xml index 2e5353e..8cf7766 100644 --- a/src/devices/pic/xml_data/30F6014.xml +++ b/src/devices/pic/xml_data/30F6014.xml @@ -29,13 +29,13 @@ <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0xF80000" end="0xF8000D" /> <memory name="eeprom" start="0x7FF000" end="0x7FFFFF" /> - <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" /> + <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" /> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x80053F" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="FOSC" wtqmask="0xC30F" bvalue="0xC30F" ctqmask="0xC10F" > - <tqmask name="FPR" value="0x000F" > + <config offset="0x0" name="FOSC" wmask="0xC30F" bvalue="0xC30F" cmask="0xC10F" > + <mask name="FPR" value="0x000F" > <value value="0x0000" name="XTL" cname="XTL" /> <value value="0x0001" name="XTL" cname="XTL" /> <value value="0x0002" name="HS" cname="HS" /> @@ -52,23 +52,23 @@ <value value="0x000D" name="EC4" cname="ECIO_PLL4" /> <value value="0x000E" name="EC8" cname="ECIO_PLL8" /> <value value="0x000F" name="EC16" cname="ECIO_PLL16" /> - </tqmask> - <tqmask name="FOS" value="0x0300" > + </mask> + <mask name="FOS" value="0x0300" > <value value="0x0000" name="TMR1" cname="EXT" /> <value value="0x0100" name="INTRC_F" cname="FRC" /> <value value="0x0200" name="INTRC_LP" cname="LP" /> <value value="0x0300" name="PRIM" cname="_" /> - </tqmask> - <tqmask name="FCKSM" value="0xC000" > + </mask> + <mask name="FCKSM" value="0xC000" > <value value="0x0000" name="Switching on, monitor on" cname="CSW_FSCM_ON" /> <value value="0x4000" name="Switching on, monitor off" cname="CSW_ON_FSCM_OFF" /> <value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" /> <value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="FWDT" wtqmask="0x803F" bvalue="0x803F" > - <tqmask name="FWPSB" value="0x000F" > + <config offset="0x2" name="FWDT" wmask="0x803F" bvalue="0x803F" > + <mask name="FWPSB" value="0x000F" > <value value="0x0000" name="1:1" cname="WDTPSB_1" /> <value value="0x0001" name="1:2" cname="WDTPSB_2" /> <value value="0x0002" name="1:3" cname="WDTPSB_3" /> @@ -85,72 +85,72 @@ <value value="0x000D" name="1:14" cname="WDTPSB_14" /> <value value="0x000E" name="1:15" cname="WDTPSB_15" /> <value value="0x000F" name="1:16" cname="WDTPSB_16" /> - </tqmask> - <tqmask name="FWPSA" value="0x0030" > + </mask> + <mask name="FWPSA" value="0x0030" > <value value="0x0000" name="1:1" cname="WDTPSA_1" /> <value value="0x0010" name="1:8" cname="WDTPSA_8" /> <value value="0x0020" name="1:64" cname="WDTPSA_64" /> <value value="0x0030" name="1:512" cname="WDTPSA_512" /> - </tqmask> - <tqmask name="FWDTEN" value="0x8000" > + </mask> + <mask name="FWDTEN" value="0x8000" > <value value="0x0000" name="Off" cname="WDT_OFF" /> <value value="0x8000" name="On" cname="WDT_ON" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="FBORPOR" wtqmask="0x87B3" bvalue="0x80B3" ctqmask="0x87B3" > - <tqmask name="FPWRT" value="0x0003" > + <config offset="0x4" name="FBORPOR" wmask="0x87B3" bvalue="0x80B3" cmask="0x87B3" > + <mask name="FPWRT" value="0x0003" > <value value="0x0000" name="0" cname="PWRT_OFF" /> <value value="0x0001" name="4" cname="PWRT_4" /> <value value="0x0002" name="16" cname="PWRT_16" /> <value value="0x0003" name="64" cname="PWRT_64" /> - </tqmask> - <tqmask name="BORV" value="0x0030" > + </mask> + <mask name="BORV" value="0x0030" > <value value="0x0000" name="4.5" cname="BORV_45" /> <value value="0x0010" name="4.2" cname="BORV_42" /> <value value="0x0020" name="2.7" cname="BORV_27" /> <value value="0x0030" name="2.0" cname="BORV_20" /> - </tqmask> - <tqmask name="BODEN" value="0x0080" > + </mask> + <mask name="BODEN" value="0x0080" > <value value="0x0000" name="Off" cname="PBOR_OFF" /> <value value="0x0080" name="On" cname="PBOR_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x8000" > + </mask> + <mask name="MCLRE" value="0x8000" > <value value="0x0000" name="Internal" cname="MCLR_DIS" /> <value value="0x8000" name="External" cname="MCLR_EN" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x0000" ctqmask="0x310F" /> + <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x0000" cmask="0x310F" /> - <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x0000" ctqmask="0x330F" /> + <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x0000" cmask="0x330F" /> - <config offset="0xA" name="FGS" wtqmask="0x0007" bvalue="0x0003" ctqmask="0x0007" > - <tqmask name="GWRP" value="0x0001" > + <config offset="0xA" name="FGS" wmask="0x0007" bvalue="0x0003" cmask="0x0007" > + <mask name="GWRP" value="0x0001" > <value value="0x0000" name="All" cname="0xFFFE" /> <value value="0x0001" name="Off" cname="_" /> - </tqmask> - <tqmask name="GCP" value="0x0002" > + </mask> + <mask name="GCP" value="0x0002" > <value value="0x0000" name="All" cname="CODE_PROT_ON" /> <value value="0x0002" name="Off" cname="CODE_PROT_OFF" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="ICD" wtqmask="0xC003" bvalue="0xC003" > - <tqmask name="ICS" value="0x0003" > + <config offset="0xC" name="ICD" wmask="0xC003" bvalue="0xC003" > + <mask name="ICS" value="0x0003" > <value value="0x0000" name="EMUC3, EMUD3" cname="0xFFFC" /> <value value="0x0001" name="EMUC2, EMUD2" cname="0xFFFD" /> <value value="0x0002" name="EMUC1, EMUD1" cname="0xFFFE" /> <value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" /> - </tqmask> - <tqmask name="COE" value="0x4000" > + </mask> + <mask name="COE" value="0x4000" > <value value="0x0000" name="On" cname="0xBFFF" /> <value value="0x4000" name="Off" cname="_" /> - </tqmask> - <tqmask name="DEBUG" value="0x8000" > + </mask> + <mask name="DEBUG" value="0x8000" > <value value="0x0000" name="On" cname="0x7FFF" /> <value value="0x8000" name="Off" cname="_" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/30F6014A.xml b/src/devices/pic/xml_data/30F6014A.xml index 6396aed..c6a6efe 100644 --- a/src/devices/pic/xml_data/30F6014A.xml +++ b/src/devices/pic/xml_data/30F6014A.xml @@ -28,13 +28,13 @@ <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0xF80000" end="0xF8000D" /> <memory name="eeprom" start="0x7FF000" end="0x7FFFFF" /> - <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" /> + <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" /> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x80053F" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="FOSC" wtqmask="0xC71F" bvalue="0xC71F" > - <tqmask name="FOSFPR" value="0x071F" > + <config offset="0x0" name="FOSC" wmask="0xC71F" bvalue="0xC71F" > + <mask name="FOSFPR" value="0x071F" > <value value="default" name="invalid" /> <value value="0x001F" name="TMR1" cname="LP" /> <value value="0x011F" name="INTRC_F" cname="FRC" /> @@ -54,17 +54,17 @@ <value value="0x0715" name="HS3_4" cname="HS3_PLL4" /> <value value="0x0716" name="HS3_8" cname="HS3_PLL8" /> <value value="0x0717" name="HS3_16" cname="HS3_PLL16" /> - </tqmask> - <tqmask name="FCKSM" value="0xC000" > + </mask> + <mask name="FCKSM" value="0xC000" > <value value="0x0000" name="Switching on, monitor on" cname="CSW_FSCM_ON" /> <value value="0x4000" name="Switching on, monitor off" cname="CSW_ON_FSCM_OFF" /> <value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" /> <value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="FWDT" wtqmask="0x803F" bvalue="0x803F" > - <tqmask name="FWPSB" value="0x000F" > + <config offset="0x2" name="FWDT" wmask="0x803F" bvalue="0x803F" > + <mask name="FWPSB" value="0x000F" > <value value="0x0000" name="1:1" cname="WDTPSB_1" /> <value value="0x0001" name="1:2" cname="WDTPSB_2" /> <value value="0x0002" name="1:3" cname="WDTPSB_3" /> @@ -81,125 +81,125 @@ <value value="0x000D" name="1:14" cname="WDTPSB_14" /> <value value="0x000E" name="1:15" cname="WDTPSB_15" /> <value value="0x000F" name="1:16" cname="WDTPSB_16" /> - </tqmask> - <tqmask name="FWPSA" value="0x0030" > + </mask> + <mask name="FWPSA" value="0x0030" > <value value="0x0000" name="1:1" cname="WDTPSA_1" /> <value value="0x0010" name="1:8" cname="WDTPSA_8" /> <value value="0x0020" name="1:64" cname="WDTPSA_64" /> <value value="0x0030" name="1:512" cname="WDTPSA_512" /> - </tqmask> - <tqmask name="FWDTEN" value="0x8000" > + </mask> + <mask name="FWDTEN" value="0x8000" > <value value="0x0000" name="Off" cname="WDT_OFF" /> <value value="0x8000" name="On" cname="WDT_ON" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="FBORPOR" wtqmask="0x87B3" bvalue="0x80B3" ctqmask="0x87B3" > - <tqmask name="FPWRT" value="0x0003" > + <config offset="0x4" name="FBORPOR" wmask="0x87B3" bvalue="0x80B3" cmask="0x87B3" > + <mask name="FPWRT" value="0x0003" > <value value="0x0000" name="0" cname="PWRT_OFF" /> <value value="0x0001" name="4" cname="PWRT_4" /> <value value="0x0002" name="16" cname="PWRT_16" /> <value value="0x0003" name="64" cname="PWRT_64" /> - </tqmask> - <tqmask name="BORV" value="0x0030" > + </mask> + <mask name="BORV" value="0x0030" > <value value="0x0000" name="4.5" cname="BORV_45" /> <value value="0x0010" name="4.2" cname="BORV_42" /> <value value="0x0020" name="2.7" cname="BORV_27" /> <value value="0x0030" name="2.0" cname="BORV_20" /> - </tqmask> - <tqmask name="BODEN" value="0x0080" > + </mask> + <mask name="BODEN" value="0x0080" > <value value="0x0000" name="Off" cname="PBOR_OFF" /> <value value="0x0080" name="On" cname="PBOR_ON" /> - </tqmask> - <tqmask name="MCLRE" value="0x8000" > + </mask> + <mask name="MCLRE" value="0x8000" > <value value="0x0000" name="Internal" cname="MCLR_DIS" /> <value value="0x8000" name="External" cname="MCLR_EN" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="FBS" wtqmask="0x310F" bvalue="0x310F" > - <tqmask name="WRTBS" value="0x0001" > + <config offset="0x6" name="FBS" wmask="0x310F" bvalue="0x310F" > + <mask name="WRTBS" value="0x0001" > <value value="0x0000" name="All" cname="WR_PROT_BOOT_ON" /> <value value="0x0001" name="Off" cname="WR_PROT_BOOT_OFF" /> - </tqmask> - <tqmask name="BSSEC" value="0x0008" > + </mask> + <mask name="BSSEC" value="0x0008" > <value value="0x0000" name="High Security" cname="" /> <value value="0x0008" name="Standard Security" cname="" /> - </tqmask> - <tqmask name="BSSIZ" value="0x0006" > + </mask> + <mask name="BSSIZ" value="0x0006" > <value value="0x0000" name="4096" cname="" /> <value value="0x0002" name="2048" cname="" /> <value value="0x0004" name="512" cname="" /> <value value="0x0006" name="0" cname="" /> - </tqmask> - <tqmask name="EBSSIZ" value="0x0100" > + </mask> + <mask name="EBSSIZ" value="0x0100" > <value value="0x0000" name="256" cname="SMALL_BOOT_EEPROM" /> <value value="0x0100" name="0" cname="NO_BOOT_EEPROM" /> - </tqmask> - <tqmask name="RBSSIZ" value="0x3000" > + </mask> + <mask name="RBSSIZ" value="0x3000" > <value value="0x0000" name="1024" cname="LAR_BOOT_RAM" /> <value value="0x1000" name="256" cname="MED_BOOT_RAM" /> <value value="0x2000" name="128" cname="SMALL_BOOT_RAM" /> <value value="0x3000" name="0" cname="NO_BOOT_RAM" /> - </tqmask> + </mask> </config> - <config offset="0x8" name="FSS" wtqmask="0x330F" bvalue="0x330F" > - <tqmask name="WRTSS" value="0x0001" > + <config offset="0x8" name="FSS" wmask="0x330F" bvalue="0x330F" > + <mask name="WRTSS" value="0x0001" > <value value="0x0000" name="All" cname="WR_PROT_SEC_ON" /> <value value="0x0001" name="Off" cname="WR_PROT_SEC_OFF" /> - </tqmask> - <tqmask name="SSSEC" value="0x0008" > + </mask> + <mask name="SSSEC" value="0x0008" > <value value="0x0000" name="High Security" cname="" /> <value value="0x0008" name="Standard Security" cname="" /> - </tqmask> - <tqmask name="SSSIZ" value="0x0006" > + </mask> + <mask name="SSSIZ" value="0x0006" > <value value="0x0000" name="16384" cname="" /> <value value="0x0002" name="8192" cname="" /> <value value="0x0004" name="4096" cname="" /> <value value="0x0006" name="0" cname="" /> - </tqmask> - <tqmask name="ESSSIZ" value="0x0300" > + </mask> + <mask name="ESSSIZ" value="0x0300" > <value value="0x0000" name="1024" cname="LAR_SEC_EEPROM" /> <value value="0x0100" name="512" cname="MED_SEC_EEPROM" /> <value value="0x0200" name="256" cname="SMALL_SEC_EEPROM" /> <value value="0x0300" name="0" cname="NO_SEC_EEPROM" /> - </tqmask> - <tqmask name="RSSSIZ" value="0x3000" > + </mask> + <mask name="RSSSIZ" value="0x3000" > <value value="0x0000" name="4096" cname="LAR_SEC_RAM" /> <value value="0x1000" name="2048" cname="MED_SEC_RAM" /> <value value="0x2000" name="256" cname="SMALL_SEC_RAM" /> <value value="0x3000" name="0" cname="NO_SEC_RAM" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="FGS" wtqmask="0x0007" bvalue="0x0007" > - <tqmask name="WRTGS" value="0x0001" > + <config offset="0xA" name="FGS" wmask="0x0007" bvalue="0x0007" > + <mask name="WRTGS" value="0x0001" > <value value="0x0000" name="All" cname="WR_PROT_GEN_ON" /> <value value="0x0001" name="Off" cname="WR_PROT_GEN_OFF" /> - </tqmask> - <tqmask name="GSSEC" value="0x0006" > + </mask> + <mask name="GSSEC" value="0x0006" > <value value="default" name="High Security" cname="HIGH_PROT" /> <value value="0x0004" name="Standard Security" cname="STAND_PROT" /> <value value="0x0006" name="Off" cname="GEN_PROT" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="ICD" wtqmask="0xC003" bvalue="0xC003" > - <tqmask name="ICS" value="0x0003" > + <config offset="0xC" name="ICD" wmask="0xC003" bvalue="0xC003" > + <mask name="ICS" value="0x0003" > <value value="0x0000" name="EMUC3, EMUD3" cname="0xFFFC" /> <value value="0x0001" name="EMUC2, EMUD2" cname="0xFFFD" /> <value value="0x0002" name="EMUC1, EMUD1" cname="0xFFFE" /> <value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" /> - </tqmask> - <tqmask name="COE" value="0x4000" > + </mask> + <mask name="COE" value="0x4000" > <value value="0x0000" name="On" cname="0xBFFF" /> <value value="0x4000" name="Off" cname="_" /> - </tqmask> - <tqmask name="DEBUG" value="0x8000" > + </mask> + <mask name="DEBUG" value="0x8000" > <value value="0x0000" name="On" cname="0x7FFF" /> <value value="0x8000" name="Off" cname="_" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/30F6015.xml b/src/devices/pic/xml_data/30F6015.xml index 4b5b5bd..784f38d 100644 --- a/src/devices/pic/xml_data/30F6015.xml +++ b/src/devices/pic/xml_data/30F6015.xml @@ -28,13 +28,13 @@ <memory name="device_id" start="0xFF0000" end="0xFF0004" /> <memory name="config" start="0xF80000" end="0xF8000D" /> <memory name="eeprom" start="0x7FF000" end="0x7FFFFF" /> - <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" /> + <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" /> <memory name="debug_vector" start="0x800000" end="0x800007" /> <memory name="program_executive" start="0x800000" end="0x80053F" /> <!--* Configuration bits ***************************************************--> - <config offset="0x0" name="FOSC" wtqmask="0xC71F" bvalue="0xC71F" > - <tqmask name="FOSFPR" value="0x071F" > + <config offset="0x0" name="FOSC" wmask="0xC71F" bvalue="0xC71F" > + <mask name="FOSFPR" value="0x071F" > <value value="default" name="invalid" /> <value value="0x001F" name="TMR1" cname="LP" /> <value value="0x011F" name="INTRC_F" cname="FRC" /> @@ -54,17 +54,17 @@ <value value="0x0715" name="HS3_4" cname="HS3_PLL4" /> <value value="0x0716" name="HS3_8" cname="HS3_PLL8" /> <value value="0x0717" name="HS3_16" cname="HS3_PLL16" /> - </tqmask> - <tqmask name="FCKSM" value="0xC000" > + </mask> + <mask name="FCKSM" value="0xC000" > <value value="0x0000" name="Switching on, monitor on" cname="CSW_FSCM_ON" /> <value value="0x4000" name="Switching on, monitor off" cname="CSW_ON_FSCM_OFF" /> <value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" /> <value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" /> - </tqmask> + </mask> </config> - <config offset="0x2" name="FWDT" wtqmask="0x803F" bvalue="0x803F" > - <tqmask name="FWPSB" value="0x000F" > + <config offset="0x2" name="FWDT" wmask="0x803F" bvalue="0x803F" > + <mask name="FWPSB" value="0x000F" > <value value="0x0000" name="1:1" cname="WDTPSB_1" /> <value value="0x0001" name="1:2" cname="WDTPSB_2" /> <value value="0x0002" name="1:3" cname="WDTPSB_3" /> @@ -81,137 +81,137 @@ <value value="0x000D" name="1:14" cname="WDTPSB_14" /> <value value="0x000E" name="1:15" cname="WDTPSB_15" /> <value value="0x000F" name="1:16" cname="WDTPSB_16" /> - </tqmask> - <tqmask name="FWPSA" value="0x0030" > + </mask> + <mask name="FWPSA" value="0x0030" > <value value="0x0000" name="1:1" cname="WDTPSA_1" /> <value value="0x0010" name="1:8" cname="WDTPSA_8" /> <value value="0x0020" name="1:64" cname="WDTPSA_64" /> <value value="0x0030" name="1:512" cname="WDTPSA_512" /> - </tqmask> - <tqmask name="FWDTEN" value="0x8000" > + </mask> + <mask name="FWDTEN" value="0x8000" > <value value="0x0000" name="Off" cname="WDT_OFF" /> <value value="0x8000" name="On" cname="WDT_ON" /> - </tqmask> + </mask> </config> - <config offset="0x4" name="FBORPOR" wtqmask="0x87B3" bvalue="0x87B3" > - <tqmask name="FPWRT" value="0x0003" > + <config offset="0x4" name="FBORPOR" wmask="0x87B3" bvalue="0x87B3" > + <mask name="FPWRT" value="0x0003" > <value value="0x0000" name="0" cname="PWRT_OFF" /> <value value="0x0001" name="4" cname="PWRT_4" /> <value value="0x0002" name="16" cname="PWRT_16" /> <value value="0x0003" name="64" cname="PWRT_64" /> - </tqmask> - <tqmask name="BORV" value="0x0030" > + </mask> + <mask name="BORV" value="0x0030" > <value value="0x0000" name="4.5" cname="BORV_45" /> <value value="0x0010" name="4.2" cname="BORV_42" /> <value value="0x0020" name="2.7" cname="BORV_27" /> <value value="0x0030" name="2.0" cname="BORV_20" /> - </tqmask> - <tqmask name="BODEN" value="0x0080" > + </mask> + <mask name="BODEN" value="0x0080" > <value value="0x0000" name="Off" cname="PBOR_OFF" /> <value value="0x0080" name="On" cname="PBOR_ON" /> - </tqmask> - <tqmask name="LPOL" value="0x0100" > + </mask> + <mask name="LPOL" value="0x0100" > <value value="0x0000" name="low" cname="PWMxL_ACT_LO" /> <value value="0x0100" name="high" cname="PWMxL_ACT_HI" /> - </tqmask> - <tqmask name="HPOL" value="0x0200" > + </mask> + <mask name="HPOL" value="0x0200" > <value value="0x0000" name="low" cname="PWMxH_ACT_LO" /> <value value="0x0200" name="high" cname="PWMxH_ACT_HI" /> - </tqmask> - <tqmask name="PWMPIN" value="0x0400" > + </mask> + <mask name="PWMPIN" value="0x0400" > <value value="0x0000" name="On" cname="RST_PWMPIN" /> <value value="0x0400" name="Off" cname="RST_IOPIN" /> - </tqmask> - <tqmask name="MCLRE" value="0x8000" > + </mask> + <mask name="MCLRE" value="0x8000" > <value value="0x0000" name="Internal" cname="MCLR_DIS" /> <value value="0x8000" name="External" cname="MCLR_EN" /> - </tqmask> + </mask> </config> - <config offset="0x6" name="FBS" wtqmask="0x310F" bvalue="0x310F" > - <tqmask name="WRTBS" value="0x0001" > + <config offset="0x6" name="FBS" wmask="0x310F" bvalue="0x310F" > + <mask name="WRTBS" value="0x0001" > <value value="0x0000" name="All" cname="WR_PROT_BOOT_ON" /> <value value="0x0001" name="Off" cname="WR_PROT_BOOT_OFF" /> - </tqmask> - <tqmask name="BSSEC" value="0x0008" > + </mask> + <mask name="BSSEC" value="0x0008" > <value value="0x0000" name="High Security" cname="" /> <value value="0x0008" name="Standard Security" cname="" /> - </tqmask> - <tqmask name="BSSIZ" value="0x0006" > + </mask> + <mask name="BSSIZ" value="0x0006" > <value value="0x0000" name="4096" cname="" /> <value value="0x0002" name="2048" cname="" /> <value value="0x0004" name="512" cname="" /> <value value="0x0006" name="0" cname="" /> - </tqmask> - <tqmask name="EBSSIZ" value="0x0100" > + </mask> + <mask name="EBSSIZ" value="0x0100" > <value value="0x0000" name="256" cname="SMALL_BOOT_EEPROM" /> <value value="0x0100" name="0" cname="NO_BOOT_EEPROM" /> - </tqmask> - <tqmask name="RBSSIZ" value="0x3000" > + </mask> + <mask name="RBSSIZ" value="0x3000" > <value value="0x0000" name="1024" cname="LAR_BOOT_RAM" /> <value value="0x1000" name="256" cname="MED_BOOT_RAM" /> <value value="0x2000" name="128" cname="SMALL_BOOT_RAM" /> <value value="0x3000" name="0" cname="NO_BOOT_RAM" /> - </tqmask> + </mask> </config> - <config offset="0x8" name="FSS" wtqmask="0x330F" bvalue="0x330F" > - <tqmask name="WRTSS" value="0x0001" > + <config offset="0x8" name="FSS" wmask="0x330F" bvalue="0x330F" > + <mask name="WRTSS" value="0x0001" > <value value="0x0000" name="All" cname="WR_PROT_SEC_ON" /> <value value="0x0001" name="Off" cname="WR_PROT_SEC_OFF" /> - </tqmask> - <tqmask name="SSSEC" value="0x0008" > + </mask> + <mask name="SSSEC" value="0x0008" > <value value="0x0000" name="High Security" cname="" /> <value value="0x0008" name="Standard Security" cname="" /> - </tqmask> - <tqmask name="SSSIZ" value="0x0006" > + </mask> + <mask name="SSSIZ" value="0x0006" > <value value="0x0000" name="16384" cname="" /> <value value="0x0002" name="8192" cname="" /> <value value="0x0004" name="4096" cname="" /> <value value="0x0006" name="0" cname="" /> - </tqmask> - <tqmask name="ESSSIZ" value="0x0300" > + </mask> + <mask name="ESSSIZ" value="0x0300" > <value value="0x0000" name="1024" cname="LAR_SEC_EEPROM" /> <value value="0x0100" name="512" cname="MED_SEC_EEPROM" /> <value value="0x0200" name="256" cname="SMALL_SEC_EEPROM" /> <value value="0x0300" name="0" cname="NO_SEC_EEPROM" /> - </tqmask> - <tqmask name="RSSSIZ" value="0x3000" > + </mask> + <mask name="RSSSIZ" value="0x3000" > <value value="0x0000" name="4096" cname="LAR_SEC_RAM" /> <value value="0x1000" name="2048" cname="MED_SEC_RAM" /> <value value="0x2000" name="256" cname="SMALL_SEC_RAM" /> <value value="0x3000" name="0" cname="NO_SEC_RAM" /> - </tqmask> + </mask> </config> - <config offset="0xA" name="FGS" wtqmask="0x0007" bvalue="0x0007" > - <tqmask name="WRTGS" value="0x0001" > + <config offset="0xA" name="FGS" wmask="0x0007" bvalue="0x0007" > + <mask name="WRTGS" value="0x0001" > <value value="0x0000" name="All" cname="WR_PROT_GEN_ON" /> <value value="0x0001" name="Off" cname="WR_PROT_GEN_OFF" /> - </tqmask> - <tqmask name="GSSEC" value="0x0006" > + </mask> + <mask name="GSSEC" value="0x0006" > <value value="default" name="High Security" cname="HIGH_PROT" /> <value value="0x0004" name="Standard Security" cname="STAND_PROT" /> <value value="0x0006" name="Off" cname="GEN_PROT" /> - </tqmask> + </mask> </config> - <config offset="0xC" name="ICD" wtqmask="0xC003" bvalue="0xC003" > - <tqmask name="ICS" value="0x0003" > + <config offset="0xC" name="ICD" wmask="0xC003" bvalue="0xC003" > + <mask name="ICS" value="0x0003" > <value value="0x0000" name="EMUC3, EMUD3" cname="0xFFFC" /> <value value="0x0001" name="EMUC2, EMUD2" cname="0xFFFD" /> <value value="0x0002" name="EMUC1, EMUD1" cname="0xFFFE" /> <value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" /> - </tqmask> - <tqmask name="COE" value="0x4000" > + </mask> + <mask name="COE" value="0x4000" > <value value="0x0000" name="On" cname="0xBFFF" /> <value value="0x4000" name="Off" cname="_" /> - </tqmask> - <tqmask name="DEBUG" value="0x8000" > + </mask> + <mask name="DEBUG" value="0x8000" > <value value="0x0000" name="On" cname="0x7FFF" /> <value value="0x8000" name="Off" cname="_" /> - </tqmask> + </mask> </config> <!--* Packages *************************************************************--> diff --git a/src/devices/pic/xml_data/pic.xsd b/src/devices/pic/xml_data/pic.xsd index 52d1bb2..f358f68 100644 --- a/src/devices/pic/xml_data/pic.xsd +++ b/src/devices/pic/xml_data/pic.xsd @@ -225,9 +225,9 @@ <xs:attribute name="name" type="memory_type" use="required"/> <xs:attribute name="start" type="hex" use="required"/> <xs:attribute name="end" type="hex" use="required"/> - <xs:attribute name="cal_optqmask" type="hex" /> + <xs:attribute name="cal_opmask" type="hex" /> <xs:attribute name="cal_opcode" type="hex" /> - <xs:attribute name="rtqmask" type="hex" /> + <xs:attribute name="rmask" type="hex" /> <xs:attribute name="hexfile_offset" type="hexfile_offset" /> </xs:complexType> @@ -246,14 +246,14 @@ </xs:complexType> <xs:complexType name="ConfigType"> <xs:sequence> - <xs:element name="tqmask" type="MaskType" maxOccurs="unbounded"/> + <xs:element name="mask" type="MaskType" maxOccurs="unbounded"/> </xs:sequence> <xs:attribute name="name" type="xs:string" use="required"/> <xs:attribute name="offset" type="hex" use="required"/> - <xs:attribute name="wtqmask" type="hex" use="required"/> + <xs:attribute name="wmask" type="hex" use="required"/> <xs:attribute name="bvalue" type="hex" use="required"/> - <xs:attribute name="ctqmask" type="hex" /> - <xs:attribute name="ptqmask" type="hex" /> + <xs:attribute name="cmask" type="hex" /> + <xs:attribute name="pmask" type="hex" /> <xs:attribute name="icnames" type="cnames" /> </xs:complexType> diff --git a/src/devices/pic/xml_data/registers/registers.xml b/src/devices/pic/xml_data/registers/registers.xml index 509e4ff..d7c0884 100644 --- a/src/devices/pic/xml_data/registers/registers.xml +++ b/src/devices/pic/xml_data/registers/registers.xml @@ -20769,7 +20769,7 @@ <sfr address="0x0018" access="11111111" name="PRODL" mclr="33333333" por="00000000" /> <sfr address="0x0019" access="11111111" name="PRODH" mclr="33333333" por="00000000" /> </device> - <device nb_banks="16" access_bank_split_offset="0x80" name="18C242" unused_bank_tqmask="0x7FFC" > + <device nb_banks="16" access_bank_split_offset="0x80" name="18C242" unused_bank_mask="0x7FFC" > <unused end="0x0F7F" start="0x0F00" /> <unused end="0x0F88" start="0x0F83" /> <unused end="0x0F91" start="0x0F8C" /> @@ -20885,7 +20885,7 @@ <sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" /> <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x80" name="18C252" unused_bank_tqmask="0x7FC0" > + <device nb_banks="16" access_bank_split_offset="0x80" name="18C252" unused_bank_mask="0x7FC0" > <unused end="0x0F7F" start="0x0F00" /> <unused end="0x0F88" start="0x0F83" /> <unused end="0x0F91" start="0x0F8C" /> @@ -21001,7 +21001,7 @@ <sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" /> <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x80" name="18C442" unused_bank_tqmask="0x7FFC" > + <device nb_banks="16" access_bank_split_offset="0x80" name="18C442" unused_bank_mask="0x7FFC" > <unused end="0x0F7F" start="0x0F00" /> <unused end="0x0F88" start="0x0F85" /> <unused end="0x0F91" start="0x0F8E" /> @@ -21123,7 +21123,7 @@ <sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" /> <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x80" name="18C452" unused_bank_tqmask="0x7FC0" > + <device nb_banks="16" access_bank_split_offset="0x80" name="18C452" unused_bank_mask="0x7FC0" > <unused end="0x0F7F" start="0x0F00" /> <unused end="0x0F88" start="0x0F85" /> <unused end="0x0F91" start="0x0F8E" /> @@ -21245,7 +21245,7 @@ <sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" /> <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x80" name="18C601" unused_bank_tqmask="0x7FC0" > + <device nb_banks="16" access_bank_split_offset="0x80" name="18C601" unused_bank_mask="0x7FC0" > <unused end="0x0F7F" start="0x0F00" /> <unused end="0x0F88" start="0x0F87" /> <unused end="0x0F91" start="0x0F90" /> @@ -21376,7 +21376,7 @@ <sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" /> <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18C658" unused_bank_tqmask="0x7FC0" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18C658" unused_bank_mask="0x7FC0" > <unused end="0x0F2F" start="0x0F2F" /> <unused end="0x0F3F" start="0x0F3F" /> <unused end="0x0F4F" start="0x0F4F" /> @@ -21628,7 +21628,7 @@ <sfr address="0x0F01" access="33303033" name="RXF0SIDL" mclr="33303033" por="00000000" /> <sfr address="0x0F00" access="33333333" name="RXF0SIDH" mclr="33333333" por="00000000" /> </device> - <device nb_banks="16" access_bank_split_offset="0x80" name="18C801" unused_bank_tqmask="0x7FC0" > + <device nb_banks="16" access_bank_split_offset="0x80" name="18C801" unused_bank_mask="0x7FC0" > <unused end="0x0F7F" start="0x0F00" /> <unused end="0x0F9B" start="0x0F9B" /> <unused end="0x0FA5" start="0x0FA3" /> @@ -21763,7 +21763,7 @@ <sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" /> <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18C858" unused_bank_tqmask="0x7FC0" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18C858" unused_bank_mask="0x7FC0" > <unused end="0x0F2F" start="0x0F2F" /> <unused end="0x0F3F" start="0x0F3F" /> <unused end="0x0F4F" start="0x0F4F" /> @@ -22021,7 +22021,7 @@ <sfr address="0x0F01" access="33303033" name="RXF0SIDL" mclr="33303033" por="00000000" /> <sfr address="0x0F00" access="33333333" name="RXF0SIDH" mclr="33333333" por="00000000" /> </device> - <device nb_banks="16" access_bank_split_offset="0x80" name="18F1220" unused_bank_tqmask="0x7FFE" > + <device nb_banks="16" access_bank_split_offset="0x80" name="18F1220" unused_bank_mask="0x7FFE" > <unused end="0x0F7F" start="0x0F00" /> <unused end="0x0F88" start="0x0F82" /> <unused end="0x0F91" start="0x0F8B" /> @@ -22135,7 +22135,7 @@ <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" /> <sfr address="0x0FAA" access="01033033" name="BAUDCTL" mclr="02021011" por="02021011" /> </device> - <device nb_banks="16" access_bank_split_offset="0x80" name="18F1230" unused_bank_tqmask="0x7FFE" > + <device nb_banks="16" access_bank_split_offset="0x80" name="18F1230" unused_bank_mask="0x7FFE" > <unused end="0x0F7F" start="0x0F00" /> <unused end="0x0FBF" start="0x0FBA" /> <unused end="0x0FCC" start="0x0FC5" /> @@ -22254,7 +22254,7 @@ <sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" /> <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x80" name="18F1320" unused_bank_tqmask="0x7FFE" > + <device nb_banks="16" access_bank_split_offset="0x80" name="18F1320" unused_bank_mask="0x7FFE" > <unused end="0x0F7F" start="0x0F00" /> <unused end="0x0F88" start="0x0F82" /> <unused end="0x0F91" start="0x0F8B" /> @@ -22368,7 +22368,7 @@ <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" /> <sfr address="0x0FAA" access="01033033" name="BAUDCTL" mclr="02021011" por="02021011" /> </device> - <device nb_banks="16" access_bank_split_offset="0x80" name="18F1330" unused_bank_tqmask="0x7FFE" > + <device nb_banks="16" access_bank_split_offset="0x80" name="18F1330" unused_bank_mask="0x7FFE" > <unused end="0x0F7F" start="0x0F00" /> <unused end="0x0FBF" start="0x0FBA" /> <unused end="0x0FCC" start="0x0FC5" /> @@ -22487,7 +22487,7 @@ <sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" /> <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x80" name="18F2220" unused_bank_tqmask="0x7FFC" > + <device nb_banks="16" access_bank_split_offset="0x80" name="18F2220" unused_bank_mask="0x7FFC" > <unused end="0x0F7F" start="0x0F00" /> <unused end="0x0F83" start="0x0F83" /> <unused end="0x0F88" start="0x0F85" /> @@ -22612,7 +22612,7 @@ <sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" /> <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x80" name="18F2221" unused_bank_tqmask="0x7FFC" > + <device nb_banks="16" access_bank_split_offset="0x80" name="18F2221" unused_bank_mask="0x7FFC" > <unused end="0x0F7F" start="0x0F00" /> <unused end="0x0F88" start="0x0F85" /> <unused end="0x0F91" start="0x0F8E" /> @@ -22740,7 +22740,7 @@ <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" /> <sfr address="0x0FB8" access="31333033" name="BAUDCON" mclr="12111011" por="12111011" /> </device> - <device nb_banks="16" access_bank_split_offset="0x80" name="18F2320" unused_bank_tqmask="0x7FFC" > + <device nb_banks="16" access_bank_split_offset="0x80" name="18F2320" unused_bank_mask="0x7FFC" > <unused end="0x0F7F" start="0x0F00" /> <unused end="0x0F83" start="0x0F83" /> <unused end="0x0F88" start="0x0F85" /> @@ -22865,7 +22865,7 @@ <sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" /> <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x80" name="18F2321" unused_bank_tqmask="0x7FFC" > + <device nb_banks="16" access_bank_split_offset="0x80" name="18F2321" unused_bank_mask="0x7FFC" > <unused end="0x0F7F" start="0x0F00" /> <unused end="0x0F88" start="0x0F85" /> <unused end="0x0F91" start="0x0F8E" /> @@ -22993,7 +22993,7 @@ <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" /> <sfr address="0x0FB8" access="31333033" name="BAUDCON" mclr="12111011" por="12111011" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F2331" unused_bank_tqmask="0x7FF8" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F2331" unused_bank_mask="0x7FF8" > <unused end="0x0F5F" start="0x0F00" /> <unused end="0x0F86" start="0x0F84" /> <unused end="0x0F8F" start="0x0F8E" /> @@ -23163,7 +23163,7 @@ <sfr address="0x0F64" access="33333333" name="CAP3BUFL" mclr="33333333" por="00000000" /> <sfr address="0x0F64" access="33333333" name="MAXCNTL" mclr="33333333" por="00000000" /> </device> - <device nb_banks="16" access_bank_split_offset="0x80" name="18F2410" unused_bank_tqmask="0x7FF8" > + <device nb_banks="16" access_bank_split_offset="0x80" name="18F2410" unused_bank_mask="0x7FF8" > <unused end="0x0F88" start="0x0F85" /> <unused end="0x0F91" start="0x0F8E" /> <unused end="0x0F9A" start="0x0F97" /> @@ -23286,7 +23286,7 @@ <sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" /> <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x80" name="18F242" unused_bank_tqmask="0x7FF8" > + <device nb_banks="16" access_bank_split_offset="0x80" name="18F242" unused_bank_mask="0x7FF8" > <unused end="0x0F7F" start="0x0F00" /> <unused end="0x0F88" start="0x0F83" /> <unused end="0x0F91" start="0x0F8C" /> @@ -23406,7 +23406,7 @@ <sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" /> <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x80" name="18F2420" unused_bank_tqmask="0x7FF8" > + <device nb_banks="16" access_bank_split_offset="0x80" name="18F2420" unused_bank_mask="0x7FF8" > <unused end="0x0F7F" start="0x0F00" /> <unused end="0x0F88" start="0x0F85" /> <unused end="0x0F91" start="0x0F8E" /> @@ -23534,7 +23534,7 @@ <sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" /> <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x80" name="18F2423" unused_bank_tqmask="0x7FF8" > + <device nb_banks="16" access_bank_split_offset="0x80" name="18F2423" unused_bank_mask="0x7FF8" > <unused end="0x0F7F" start="0x0F00" /> <unused end="0x0F88" start="0x0F85" /> <unused end="0x0F91" start="0x0F8E" /> @@ -23662,7 +23662,7 @@ <sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" /> <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F2431" unused_bank_tqmask="0x7FF8" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F2431" unused_bank_mask="0x7FF8" > <unused end="0x0F5F" start="0x0F00" /> <unused end="0x0F86" start="0x0F84" /> <unused end="0x0F8F" start="0x0F8E" /> @@ -23832,7 +23832,7 @@ <sfr address="0x0F64" access="33333333" name="CAP3BUFL" mclr="33333333" por="00000000" /> <sfr address="0x0F64" access="33333333" name="MAXCNTL" mclr="33333333" por="00000000" /> </device> - <device nb_banks="16" access_bank_split_offset="0x80" name="18F2439" unused_bank_tqmask="0x7FF8" > + <device nb_banks="16" access_bank_split_offset="0x80" name="18F2439" unused_bank_mask="0x7FF8" > <unused end="0x0F7F" start="0x0F00" /> <unused end="0x0F88" start="0x0F83" /> <unused end="0x0F91" start="0x0F8C" /> @@ -23944,7 +23944,7 @@ <sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" /> <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x80" name="18F2450" unused_bank_tqmask="0x7FEC" > + <device nb_banks="16" access_bank_split_offset="0x80" name="18F2450" unused_bank_mask="0x7FEC" > <unused end="0x0F5F" start="0x0F00" /> <unused end="0x0F88" start="0x0F83" /> <unused end="0x0F91" start="0x0F8C" /> @@ -24078,7 +24078,7 @@ <sfr address="0x0FA7" access="22222222" name="EECON2" mclr="00000000" por="00000000" /> <sfr address="0x0FA6" access="03033390" name="EECON1" mclr="03013110" por="00010110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F2455" unused_bank_tqmask="0x7F00" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F2455" unused_bank_mask="0x7F00" > <unused end="0x0F5F" start="0x0F00" /> <unused end="0x0F61" start="0x0F60" /> <unused end="0x0F83" start="0x0F83" /> @@ -24241,7 +24241,7 @@ <sfr address="0x0F67" access="00000111" name="UFRMH" mclr="00000000" por="00000000" /> <sfr address="0x0F66" access="11111111" name="UFRML" mclr="00000000" por="00000000" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F248" unused_bank_tqmask="0x7FF8" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F248" unused_bank_mask="0x7FF8" > <mirror> <range end="0x0F2E" start="0x0F2E" /> <range end="0x0F3E" start="0x0F3E" /> @@ -24484,7 +24484,7 @@ <sfr address="0x0F01" access="33303033" name="RXF0SIDL" mclr="33303033" por="00000000" /> <sfr address="0x0F00" access="33333333" name="RXF0SIDH" mclr="33333333" por="00000000" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F2480" unused_bank_tqmask="0x1FF8" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F2480" unused_bank_mask="0x1FF8" > <unused end="0x0D6F" start="0x0D6C" /> <unused end="0x0D7F" start="0x0D7C" /> <unused end="0x0D8F" start="0x0D8C" /> @@ -24902,7 +24902,7 @@ <sfr address="0x0D61" access="33303033" name="RXF6SIDL" mclr="33333033" por="00000000" /> <sfr address="0x0D60" access="33333333" name="RXF6SIDH" mclr="33333333" por="00000000" /> </device> - <device nb_banks="16" access_bank_split_offset="0x80" name="18F24J10" unused_bank_tqmask="0x7FF0" > + <device nb_banks="16" access_bank_split_offset="0x80" name="18F24J10" unused_bank_mask="0x7FF0" > <unused end="0x0F7F" start="0x0F00" /> <unused end="0x0F88" start="0x0F85" /> <unused end="0x0F91" start="0x0F8E" /> @@ -25025,7 +25025,7 @@ <sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" /> <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x80" name="18F2510" unused_bank_tqmask="0x7FC0" > + <device nb_banks="16" access_bank_split_offset="0x80" name="18F2510" unused_bank_mask="0x7FC0" > <unused end="0x0F7F" start="0x0F00" /> <unused end="0x0F83" start="0x0F83" /> <unused end="0x0F88" start="0x0F85" /> @@ -25153,7 +25153,7 @@ <sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" /> <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x80" name="18F2515" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x80" name="18F2515" unused_bank_mask="0x0000" > <unused end="0x0F83" start="0x0F83" /> <unused end="0x0F88" start="0x0F85" /> <unused end="0x0F91" start="0x0F8C" /> @@ -25276,7 +25276,7 @@ <sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" /> <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x80" name="18F252" unused_bank_tqmask="0x7FC0" > + <device nb_banks="16" access_bank_split_offset="0x80" name="18F252" unused_bank_mask="0x7FC0" > <unused end="0x0F7F" start="0x0F00" /> <unused end="0x0F88" start="0x0F83" /> <unused end="0x0F91" start="0x0F8C" /> @@ -25396,7 +25396,7 @@ <sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" /> <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x80" name="18F2520" unused_bank_tqmask="0x7FC0" > + <device nb_banks="16" access_bank_split_offset="0x80" name="18F2520" unused_bank_mask="0x7FC0" > <unused end="0x0F83" start="0x0F83" /> <unused end="0x0F88" start="0x0F85" /> <unused end="0x0F8D" start="0x0F8C" /> @@ -25526,7 +25526,7 @@ <sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" /> <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x80" name="18F2523" unused_bank_tqmask="0x7FC0" > + <device nb_banks="16" access_bank_split_offset="0x80" name="18F2523" unused_bank_mask="0x7FC0" > <unused end="0x0F83" start="0x0F83" /> <unused end="0x0F88" start="0x0F85" /> <unused end="0x0F8D" start="0x0F8C" /> @@ -25656,7 +25656,7 @@ <sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" /> <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x80" name="18F2525" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x80" name="18F2525" unused_bank_mask="0x0000" > <unused end="0x0F83" start="0x0F83" /> <unused end="0x0F88" start="0x0F85" /> <unused end="0x0F91" start="0x0F8C" /> @@ -25784,7 +25784,7 @@ <sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" /> <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x80" name="18F2539" unused_bank_tqmask="0x7FC0" > + <device nb_banks="16" access_bank_split_offset="0x80" name="18F2539" unused_bank_mask="0x7FC0" > <unused end="0x0F7F" start="0x0F00" /> <unused end="0x0F88" start="0x0F83" /> <unused end="0x0F91" start="0x0F8C" /> @@ -25896,7 +25896,7 @@ <sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" /> <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F2550" unused_bank_tqmask="0x7F00" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F2550" unused_bank_mask="0x7F00" > <unused end="0x0F5F" start="0x0F00" /> <unused end="0x0F61" start="0x0F60" /> <unused end="0x0F83" start="0x0F83" /> @@ -26059,7 +26059,7 @@ <sfr address="0x0F67" access="00000111" name="UFRMH" mclr="00000000" por="00000000" /> <sfr address="0x0F66" access="11111111" name="UFRML" mclr="00000000" por="00000000" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F258" unused_bank_tqmask="0x7FC0" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F258" unused_bank_mask="0x7FC0" > <mirror> <range end="0x0F2E" start="0x0F2E" /> <range end="0x0F3E" start="0x0F3E" /> @@ -26302,7 +26302,7 @@ <sfr address="0x0F01" access="33303033" name="RXF0SIDL" mclr="33303033" por="00000000" /> <sfr address="0x0F00" access="33333333" name="RXF0SIDH" mclr="33333333" por="00000000" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F2580" unused_bank_tqmask="0x1FC0" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F2580" unused_bank_mask="0x1FC0" > <unused end="0x0D6F" start="0x0D6C" /> <unused end="0x0D7F" start="0x0D7C" /> <unused end="0x0D8F" start="0x0D8C" /> @@ -26720,7 +26720,7 @@ <sfr address="0x0D61" access="33303033" name="RXF6SIDL" mclr="33333033" por="00000000" /> <sfr address="0x0D60" access="33333333" name="RXF6SIDH" mclr="33333333" por="00000000" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F2585" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F2585" unused_bank_mask="0x0000" > <unused end="0x0D59" start="0x0D00" /> <unused end="0x0D6F" start="0x0D6C" /> <unused end="0x0D7F" start="0x0D7C" /> @@ -27133,7 +27133,7 @@ <sfr address="0x0D61" access="33303033" name="RXF6SIDL" mclr="33303033" por="00000000" /> <sfr address="0x0D60" access="33333333" name="RXF6SIDH" mclr="33333333" por="00000000" /> </device> - <device nb_banks="16" access_bank_split_offset="0x80" name="18F25J10" unused_bank_tqmask="0x7FF0" > + <device nb_banks="16" access_bank_split_offset="0x80" name="18F25J10" unused_bank_mask="0x7FF0" > <unused end="0x0F7F" start="0x0F00" /> <unused end="0x0F88" start="0x0F85" /> <unused end="0x0F91" start="0x0F8E" /> @@ -27256,7 +27256,7 @@ <sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" /> <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x80" name="18F2610" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x80" name="18F2610" unused_bank_mask="0x0000" > <unused end="0x0F83" start="0x0F83" /> <unused end="0x0F88" start="0x0F85" /> <unused end="0x0F91" start="0x0F8C" /> @@ -27379,7 +27379,7 @@ <sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" /> <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x80" name="18F2620" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x80" name="18F2620" unused_bank_mask="0x0000" > <unused end="0x0F83" start="0x0F83" /> <unused end="0x0F88" start="0x0F85" /> <unused end="0x0F91" start="0x0F8C" /> @@ -27507,7 +27507,7 @@ <sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" /> <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F2680" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F2680" unused_bank_mask="0x0000" > <unused end="0x0D59" start="0x0D00" /> <unused end="0x0D6F" start="0x0D6C" /> <unused end="0x0D7F" start="0x0D7C" /> @@ -27920,7 +27920,7 @@ <sfr address="0x0D61" access="33303033" name="RXF6SIDL" mclr="33303033" por="00000000" /> <sfr address="0x0D60" access="33333333" name="RXF6SIDH" mclr="33333333" por="00000000" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F2682" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F2682" unused_bank_mask="0x0000" > <unused end="0x0D59" start="0x0D00" /> <unused end="0x0D6F" start="0x0D6C" /> <unused end="0x0D7F" start="0x0D7C" /> @@ -28333,7 +28333,7 @@ <sfr address="0x0D61" access="33303033" name="RXF6SIDL" mclr="33303033" por="00000000" /> <sfr address="0x0D60" access="33333333" name="RXF6SIDH" mclr="33333333" por="00000000" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F2685" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F2685" unused_bank_mask="0x0000" > <unused end="0x0D59" start="0x0D00" /> <unused end="0x0D6F" start="0x0D6C" /> <unused end="0x0D7F" start="0x0D7C" /> @@ -28746,7 +28746,7 @@ <sfr address="0x0D61" access="33303033" name="RXF6SIDL" mclr="33303033" por="00000000" /> <sfr address="0x0D60" access="33333333" name="RXF6SIDH" mclr="33333333" por="00000000" /> </device> - <device nb_banks="16" access_bank_split_offset="0x80" name="18F4220" unused_bank_tqmask="0x7FFC" > + <device nb_banks="16" access_bank_split_offset="0x80" name="18F4220" unused_bank_mask="0x7FFC" > <unused end="0x0F7F" start="0x0F00" /> <unused end="0x0F88" start="0x0F85" /> <unused end="0x0F91" start="0x0F8E" /> @@ -28878,7 +28878,7 @@ <sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" /> <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x80" name="18F4221" unused_bank_tqmask="0x7FFC" > + <device nb_banks="16" access_bank_split_offset="0x80" name="18F4221" unused_bank_mask="0x7FFC" > <unused end="0x0F7F" start="0x0F00" /> <unused end="0x0F88" start="0x0F85" /> <unused end="0x0F91" start="0x0F8E" /> @@ -29012,7 +29012,7 @@ <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" /> <sfr address="0x0FB8" access="31333033" name="BAUDCON" mclr="12111011" por="12111011" /> </device> - <device nb_banks="16" access_bank_split_offset="0x80" name="18F4320" unused_bank_tqmask="0x7FFC" > + <device nb_banks="16" access_bank_split_offset="0x80" name="18F4320" unused_bank_mask="0x7FFC" > <unused end="0x0F7F" start="0x0F00" /> <unused end="0x0F88" start="0x0F85" /> <unused end="0x0F91" start="0x0F8E" /> @@ -29144,7 +29144,7 @@ <sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" /> <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x80" name="18F4321" unused_bank_tqmask="0x7FFC" > + <device nb_banks="16" access_bank_split_offset="0x80" name="18F4321" unused_bank_mask="0x7FFC" > <unused end="0x0F7F" start="0x0F00" /> <unused end="0x0F88" start="0x0F85" /> <unused end="0x0F91" start="0x0F8E" /> @@ -29278,7 +29278,7 @@ <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" /> <sfr address="0x0FB8" access="31333033" name="BAUDCON" mclr="12111011" por="12111011" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F4331" unused_bank_tqmask="0x7FF8" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F4331" unused_bank_mask="0x7FF8" > <unused end="0x0F5F" start="0x0F00" /> <unused end="0x0F86" start="0x0F85" /> <unused end="0x0F8F" start="0x0F8E" /> @@ -29454,7 +29454,7 @@ <sfr address="0x0F64" access="33333333" name="CAP3BUFL" mclr="33333333" por="00000000" /> <sfr address="0x0F64" access="33333333" name="MAXCNTL" mclr="33333333" por="00000000" /> </device> - <device nb_banks="16" access_bank_split_offset="0x80" name="18F4410" unused_bank_tqmask="0x7FF8" > + <device nb_banks="16" access_bank_split_offset="0x80" name="18F4410" unused_bank_mask="0x7FF8" > <unused end="0x0F88" start="0x0F85" /> <unused end="0x0F91" start="0x0F8E" /> <unused end="0x0F9A" start="0x0F97" /> @@ -29582,7 +29582,7 @@ <sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" /> <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x80" name="18F442" unused_bank_tqmask="0x7FF8" > + <device nb_banks="16" access_bank_split_offset="0x80" name="18F442" unused_bank_mask="0x7FF8" > <unused end="0x0F7F" start="0x0F00" /> <unused end="0x0F88" start="0x0F85" /> <unused end="0x0F91" start="0x0F8E" /> @@ -29708,7 +29708,7 @@ <sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" /> <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x80" name="18F4420" unused_bank_tqmask="0x7FF8" > + <device nb_banks="16" access_bank_split_offset="0x80" name="18F4420" unused_bank_mask="0x7FF8" > <unused end="0x0F88" start="0x0F85" /> <unused end="0x0F91" start="0x0F8E" /> <unused end="0x0F9A" start="0x0F97" /> @@ -29840,7 +29840,7 @@ <sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" /> <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x80" name="18F4423" unused_bank_tqmask="0x7FF8" > + <device nb_banks="16" access_bank_split_offset="0x80" name="18F4423" unused_bank_mask="0x7FF8" > <unused end="0x0F88" start="0x0F85" /> <unused end="0x0F91" start="0x0F8E" /> <unused end="0x0F9A" start="0x0F97" /> @@ -29972,7 +29972,7 @@ <sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" /> <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F4431" unused_bank_tqmask="0x7FF8" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F4431" unused_bank_mask="0x7FF8" > <unused end="0x0F5F" start="0x0F00" /> <unused end="0x0F86" start="0x0F85" /> <unused end="0x0F8F" start="0x0F8E" /> @@ -30148,7 +30148,7 @@ <sfr address="0x0F64" access="33333333" name="CAP3BUFL" mclr="33333333" por="00000000" /> <sfr address="0x0F64" access="33333333" name="MAXCNTL" mclr="33333333" por="00000000" /> </device> - <device nb_banks="16" access_bank_split_offset="0x80" name="18F4439" unused_bank_tqmask="0x7FF8" > + <device nb_banks="16" access_bank_split_offset="0x80" name="18F4439" unused_bank_mask="0x7FF8" > <unused end="0x0F7F" start="0x0F00" /> <unused end="0x0F88" start="0x0F85" /> <unused end="0x0F91" start="0x0F8E" /> @@ -30266,7 +30266,7 @@ <sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" /> <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x80" name="18F4450" unused_bank_tqmask="0x7FEC" > + <device nb_banks="16" access_bank_split_offset="0x80" name="18F4450" unused_bank_mask="0x7FEC" > <unused end="0x0F5F" start="0x0F00" /> <unused end="0x0F88" start="0x0F85" /> <unused end="0x0F91" start="0x0F8E" /> @@ -30406,7 +30406,7 @@ <sfr address="0x0FA7" access="22222222" name="EECON2" mclr="00000000" por="00000000" /> <sfr address="0x0FA6" access="03033390" name="EECON1" mclr="03013110" por="00010110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F4455" unused_bank_tqmask="0x7F00" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F4455" unused_bank_mask="0x7F00" > <unused end="0x0F5F" start="0x0F00" /> <unused end="0x0F61" start="0x0F60" /> <unused end="0x0F88" start="0x0F85" /> @@ -30571,7 +30571,7 @@ <sfr address="0x0F67" access="00000111" name="UFRMH" mclr="00000000" por="00000000" /> <sfr address="0x0F66" access="11111111" name="UFRML" mclr="00000000" por="00000000" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F448" unused_bank_tqmask="0x7FF8" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F448" unused_bank_mask="0x7FF8" > <mirror> <range end="0x0F2E" start="0x0F2E" /> <range end="0x0F3E" start="0x0F3E" /> @@ -30828,7 +30828,7 @@ <sfr address="0x0F01" access="33303033" name="RXF0SIDL" mclr="33303033" por="00000000" /> <sfr address="0x0F00" access="33333333" name="RXF0SIDH" mclr="33333333" por="00000000" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F4480" unused_bank_tqmask="0x1FF8" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F4480" unused_bank_mask="0x1FF8" > <unused end="0x0D6F" start="0x0D6C" /> <unused end="0x0D7F" start="0x0D7C" /> <unused end="0x0D8F" start="0x0D8C" /> @@ -31260,7 +31260,7 @@ <sfr address="0x0D61" access="33303033" name="RXF6SIDL" mclr="33333033" por="00000000" /> <sfr address="0x0D60" access="33333333" name="RXF6SIDH" mclr="33333333" por="00000000" /> </device> - <device nb_banks="16" access_bank_split_offset="0x80" name="18F44J10" unused_bank_tqmask="0x7FF0" > + <device nb_banks="16" access_bank_split_offset="0x80" name="18F44J10" unused_bank_mask="0x7FF0" > <unused end="0x0F7F" start="0x0F00" /> <unused end="0x0F91" start="0x0F8F" /> <unused end="0x0F9A" start="0x0F97" /> @@ -31393,7 +31393,7 @@ <sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" /> <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x80" name="18F4510" unused_bank_tqmask="0x7FC0" > + <device nb_banks="16" access_bank_split_offset="0x80" name="18F4510" unused_bank_mask="0x7FC0" > <unused end="0x0F7F" start="0x0F00" /> <unused end="0x0F88" start="0x0F85" /> <unused end="0x0F91" start="0x0F8E" /> @@ -31523,7 +31523,7 @@ <sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" /> <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x80" name="18F4515" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x80" name="18F4515" unused_bank_mask="0x0000" > <unused end="0x0F88" start="0x0F85" /> <unused end="0x0F91" start="0x0F8E" /> <unused end="0x0F9A" start="0x0F97" /> @@ -31650,7 +31650,7 @@ <sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" /> <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x80" name="18F452" unused_bank_tqmask="0x7FC0" > + <device nb_banks="16" access_bank_split_offset="0x80" name="18F452" unused_bank_mask="0x7FC0" > <unused end="0x0F7F" start="0x0F00" /> <unused end="0x0F88" start="0x0F85" /> <unused end="0x0F91" start="0x0F8E" /> @@ -31776,7 +31776,7 @@ <sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" /> <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x80" name="18F4520" unused_bank_tqmask="0x7FC0" > + <device nb_banks="16" access_bank_split_offset="0x80" name="18F4520" unused_bank_mask="0x7FC0" > <unused end="0x0F88" start="0x0F85" /> <unused end="0x0F91" start="0x0F8E" /> <unused end="0x0F9A" start="0x0F97" /> @@ -31908,7 +31908,7 @@ <sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" /> <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x80" name="18F4523" unused_bank_tqmask="0x7FC0" > + <device nb_banks="16" access_bank_split_offset="0x80" name="18F4523" unused_bank_mask="0x7FC0" > <unused end="0x0F88" start="0x0F85" /> <unused end="0x0F91" start="0x0F8E" /> <unused end="0x0F9A" start="0x0F97" /> @@ -32040,7 +32040,7 @@ <sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" /> <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x80" name="18F4525" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x80" name="18F4525" unused_bank_mask="0x0000" > <unused end="0x0F88" start="0x0F85" /> <unused end="0x0F91" start="0x0F8E" /> <unused end="0x0F9A" start="0x0F97" /> @@ -32172,7 +32172,7 @@ <sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" /> <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x80" name="18F4539" unused_bank_tqmask="0x7FC0" > + <device nb_banks="16" access_bank_split_offset="0x80" name="18F4539" unused_bank_mask="0x7FC0" > <unused end="0x0F7F" start="0x0F00" /> <unused end="0x0F88" start="0x0F85" /> <unused end="0x0F91" start="0x0F8E" /> @@ -32290,7 +32290,7 @@ <sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" /> <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F4550" unused_bank_tqmask="0x7F00" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F4550" unused_bank_mask="0x7F00" > <unused end="0x0F5F" start="0x0F00" /> <unused end="0x0F61" start="0x0F60" /> <unused end="0x0F88" start="0x0F85" /> @@ -32455,7 +32455,7 @@ <sfr address="0x0F67" access="00000111" name="UFRMH" mclr="00000000" por="00000000" /> <sfr address="0x0F66" access="11111111" name="UFRML" mclr="00000000" por="00000000" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F458" unused_bank_tqmask="0x7FC0" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F458" unused_bank_mask="0x7FC0" > <mirror> <range end="0x0F2E" start="0x0F2E" /> <range end="0x0F3E" start="0x0F3E" /> @@ -32712,7 +32712,7 @@ <sfr address="0x0F01" access="33303033" name="RXF0SIDL" mclr="33303033" por="00000000" /> <sfr address="0x0F00" access="33333333" name="RXF0SIDH" mclr="33333333" por="00000000" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F4580" unused_bank_tqmask="0x1FC0" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F4580" unused_bank_mask="0x1FC0" > <unused end="0x0D6F" start="0x0D6C" /> <unused end="0x0D7F" start="0x0D7C" /> <unused end="0x0D8F" start="0x0D8C" /> @@ -33144,7 +33144,7 @@ <sfr address="0x0D61" access="33303033" name="RXF6SIDL" mclr="33333033" por="00000000" /> <sfr address="0x0D60" access="33333333" name="RXF6SIDH" mclr="33333333" por="00000000" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F4585" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F4585" unused_bank_mask="0x0000" > <unused end="0x0D59" start="0x0D00" /> <unused end="0x0D6F" start="0x0D6C" /> <unused end="0x0D7F" start="0x0D7C" /> @@ -33568,7 +33568,7 @@ <sfr address="0x0D61" access="33303033" name="RXF6SIDL" mclr="33303033" por="00000000" /> <sfr address="0x0D60" access="33333333" name="RXF6SIDH" mclr="33333333" por="00000000" /> </device> - <device nb_banks="16" access_bank_split_offset="0x80" name="18F45J10" unused_bank_tqmask="0x7FF0" > + <device nb_banks="16" access_bank_split_offset="0x80" name="18F45J10" unused_bank_mask="0x7FF0" > <unused end="0x0F7F" start="0x0F00" /> <unused end="0x0F91" start="0x0F8F" /> <unused end="0x0F9A" start="0x0F97" /> @@ -33701,7 +33701,7 @@ <sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" /> <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x80" name="18F4610" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x80" name="18F4610" unused_bank_mask="0x0000" > <unused end="0x0F88" start="0x0F85" /> <unused end="0x0F91" start="0x0F8E" /> <unused end="0x0F9A" start="0x0F97" /> @@ -33828,7 +33828,7 @@ <sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" /> <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x80" name="18F4620" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x80" name="18F4620" unused_bank_mask="0x0000" > <unused end="0x0F88" start="0x0F85" /> <unused end="0x0F91" start="0x0F8E" /> <unused end="0x0F9A" start="0x0F97" /> @@ -33960,7 +33960,7 @@ <sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" /> <sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F4680" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F4680" unused_bank_mask="0x0000" > <unused end="0x0D59" start="0x0D00" /> <unused end="0x0D6F" start="0x0D6C" /> <unused end="0x0D7F" start="0x0D7C" /> @@ -34384,7 +34384,7 @@ <sfr address="0x0D61" access="33303033" name="RXF6SIDL" mclr="33303033" por="00000000" /> <sfr address="0x0D60" access="33333333" name="RXF6SIDH" mclr="33333333" por="00000000" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F4682" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F4682" unused_bank_mask="0x0000" > <unused end="0x0D59" start="0x0D00" /> <unused end="0x0D6F" start="0x0D6C" /> <unused end="0x0D7F" start="0x0D7C" /> @@ -34808,7 +34808,7 @@ <sfr address="0x0D61" access="33303033" name="RXF6SIDL" mclr="33303033" por="00000000" /> <sfr address="0x0D60" access="33333333" name="RXF6SIDH" mclr="33333333" por="00000000" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F4685" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F4685" unused_bank_mask="0x0000" > <unused end="0x0D59" start="0x0D00" /> <unused end="0x0D6F" start="0x0D6C" /> <unused end="0x0D7F" start="0x0D7C" /> @@ -35232,7 +35232,7 @@ <sfr address="0x0D61" access="33303033" name="RXF6SIDL" mclr="33303033" por="00000000" /> <sfr address="0x0D60" access="33333333" name="RXF6SIDH" mclr="33333333" por="00000000" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F6310" unused_bank_tqmask="0x7FF8" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F6310" unused_bank_mask="0x7FF8" > <unused end="0x0F6A" start="0x0F40" /> <unused end="0x0F7C" start="0x0F70" /> <unused end="0x0F7D" start="0x0F7D" /> @@ -35379,7 +35379,7 @@ <sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" /> <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F6390" unused_bank_tqmask="0x7FF8" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F6390" unused_bank_mask="0x7FF8" > <unused end="0x0F57" start="0x0F40" /> <unused end="0x0F5F" start="0x0F5E" /> <unused end="0x0F7D" start="0x0F7D" /> @@ -35552,7 +35552,7 @@ <sfr address="0x0F59" access="33303333" name="LCDCON" mclr="11101111" por="11101111" /> <sfr address="0x0F58" access="33333333" name="LCDPS" mclr="11111111" por="11111111" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F63J11" unused_bank_tqmask="0x7FF0" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F63J11" unused_bank_mask="0x7FF0" > <unused end="0x0FD4" start="0x0FD4" /> <unused end="0x0F88" start="0x0F87" /> <unused end="0x0F9A" start="0x0F99" /> @@ -35689,7 +35689,7 @@ <sfr address="0x0F61" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" /> <sfr address="0x0F60" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F63J90" unused_bank_tqmask="0x7FF0" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F63J90" unused_bank_mask="0x7FF0" > <unused end="0x0FD4" start="0x0FD4" /> <unused end="0x0F88" start="0x0F87" /> <unused end="0x0F9A" start="0x0F99" /> @@ -35857,7 +35857,7 @@ <sfr address="0x0F6C" access="33333333" name="LCDD6" mclr="33333333" por="00000000" /> <sfr address="0x0F6B" access="33333333" name="LCDD5" mclr="33333333" por="00000000" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F6410" unused_bank_tqmask="0x7FF8" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F6410" unused_bank_mask="0x7FF8" > <unused end="0x0F6A" start="0x0F00" /> <unused end="0x0F7C" start="0x0F70" /> <unused end="0x0F7D" start="0x0F7D" /> @@ -36004,7 +36004,7 @@ <sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" /> <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F6490" unused_bank_tqmask="0x7FF8" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F6490" unused_bank_mask="0x7FF8" > <unused end="0x0F57" start="0x0F40" /> <unused end="0x0F5F" start="0x0F5E" /> <unused end="0x0F7D" start="0x0F7D" /> @@ -36177,7 +36177,7 @@ <sfr address="0x0F59" access="33303333" name="LCDCON" mclr="11101111" por="11101111" /> <sfr address="0x0F58" access="33333333" name="LCDPS" mclr="11111111" por="11111111" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F64J11" unused_bank_tqmask="0x7FF0" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F64J11" unused_bank_mask="0x7FF0" > <unused end="0x0FD4" start="0x0FD4" /> <unused end="0x0F88" start="0x0F87" /> <unused end="0x0F9A" start="0x0F99" /> @@ -36314,7 +36314,7 @@ <sfr address="0x0F61" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" /> <sfr address="0x0F60" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F64J90" unused_bank_tqmask="0x7FF0" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F64J90" unused_bank_mask="0x7FF0" > <unused end="0x0FD4" start="0x0FD4" /> <unused end="0x0F88" start="0x0F87" /> <unused end="0x0F9A" start="0x0F99" /> @@ -36482,7 +36482,7 @@ <sfr address="0x0F6C" access="33333333" name="LCDD6" mclr="33333333" por="00000000" /> <sfr address="0x0F6B" access="33333333" name="LCDD5" mclr="33333333" por="00000000" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F6520" unused_bank_tqmask="0x7F00" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F6520" unused_bank_mask="0x7F00" > <unused end="0x0F6A" start="0x0F00" /> <unused end="0x0F7F" start="0x0F79" /> <unused end="0x0F88" start="0x0F87" /> @@ -36641,7 +36641,7 @@ <sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" /> <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F6525" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F6525" unused_bank_mask="0x0000" > <unused end="0x0F66" start="0x0F00" /> <unused end="0x0F7B" start="0x0F7A" /> <unused end="0x0F88" start="0x0F87" /> @@ -36807,7 +36807,7 @@ <sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" /> <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F6527" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F6527" unused_bank_mask="0x0000" > <unused end="0x0F61" start="0x0F60" /> <unused end="0x0F7B" start="0x0F7A" /> <unused end="0x0F88" start="0x0F87" /> @@ -36981,7 +36981,7 @@ <sfr address="0x0F6C" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" /> <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F6585" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F6585" unused_bank_mask="0x0000" > <unused end="0x0D5F" start="0x0D00" /> <unused end="0x0D6F" start="0x0D6C" /> <unused end="0x0D7F" start="0x0D7C" /> @@ -37409,7 +37409,7 @@ <sfr address="0x0D61" access="33333033" name="RXF6SIDL" mclr="33333033" por="00000000" /> <sfr address="0x0D60" access="33333333" name="RXF6SIDH" mclr="33333333" por="00000000" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F65J10" unused_bank_tqmask="0x7F00" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F65J10" unused_bank_mask="0x7F00" > <unused end="0x0F5F" start="0x0F00" /> <unused end="0x0F61" start="0x0F60" /> <unused end="0x0F7B" start="0x0F7A" /> @@ -37581,7 +37581,7 @@ <sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" /> <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F65J11" unused_bank_tqmask="0x7F00" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F65J11" unused_bank_mask="0x7F00" > <unused end="0x0FD4" start="0x0FD4" /> <unused end="0x0F88" start="0x0F87" /> <unused end="0x0F9A" start="0x0F99" /> @@ -37718,7 +37718,7 @@ <sfr address="0x0F61" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" /> <sfr address="0x0F60" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F65J15" unused_bank_tqmask="0x7F00" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F65J15" unused_bank_mask="0x7F00" > <unused end="0x0F5F" start="0x0F00" /> <unused end="0x0F61" start="0x0F60" /> <unused end="0x0F7B" start="0x0F7A" /> @@ -37890,7 +37890,7 @@ <sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" /> <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F65J50" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F65J50" unused_bank_mask="0x0000" > <unused end="0x0F59" start="0x0F40" /> <combined address="0x0FFD" size="3" name="TOS" /> <sfr address="0x0FFF" access="00033333" name="TOSU" mclr="00011111" por="00011111" /> @@ -38076,7 +38076,7 @@ <sfr address="0x0FA8" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" /> <sfr address="0x0F9C" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F65J90" unused_bank_tqmask="0x7F00" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F65J90" unused_bank_mask="0x7F00" > <unused end="0x0FD4" start="0x0FD4" /> <unused end="0x0F88" start="0x0F87" /> <unused end="0x0F9A" start="0x0F99" /> @@ -38244,7 +38244,7 @@ <sfr address="0x0F6C" access="33333333" name="LCDD6" mclr="33333333" por="00000000" /> <sfr address="0x0F6B" access="33333333" name="LCDD5" mclr="33333333" por="00000000" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F6620" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F6620" unused_bank_mask="0x0000" > <unused end="0x0F6A" start="0x0F00" /> <unused end="0x0F7F" start="0x0F79" /> <unused end="0x0F88" start="0x0F87" /> @@ -38403,7 +38403,7 @@ <sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" /> <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F6621" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F6621" unused_bank_mask="0x0000" > <unused end="0x0F66" start="0x0F00" /> <unused end="0x0F7B" start="0x0F7A" /> <unused end="0x0F88" start="0x0F87" /> @@ -38569,7 +38569,7 @@ <sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" /> <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F6622" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F6622" unused_bank_mask="0x0000" > <unused end="0x0F61" start="0x0F60" /> <unused end="0x0F7B" start="0x0F7A" /> <unused end="0x0F88" start="0x0F87" /> @@ -38743,7 +38743,7 @@ <sfr address="0x0F6C" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" /> <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F6627" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F6627" unused_bank_mask="0x0000" > <unused end="0x0F61" start="0x0F60" /> <unused end="0x0F7B" start="0x0F7A" /> <unused end="0x0F88" start="0x0F87" /> @@ -38917,7 +38917,7 @@ <sfr address="0x0F6C" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" /> <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F6680" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F6680" unused_bank_mask="0x0000" > <unused end="0x0D5F" start="0x0D00" /> <unused end="0x0D6F" start="0x0D6C" /> <unused end="0x0D7F" start="0x0D7C" /> @@ -39345,7 +39345,7 @@ <sfr address="0x0D61" access="33333033" name="RXF6SIDL" mclr="33333033" por="00000000" /> <sfr address="0x0D60" access="33333333" name="RXF6SIDH" mclr="33333333" por="00000000" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F66J10" unused_bank_tqmask="0x7F00" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F66J10" unused_bank_mask="0x7F00" > <unused end="0x0F5F" start="0x0F00" /> <unused end="0x0F61" start="0x0F60" /> <unused end="0x0F7B" start="0x0F7A" /> @@ -39517,7 +39517,7 @@ <sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" /> <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F66J11" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F66J11" unused_bank_mask="0x0000" > <unused end="0x0F59" start="0x0F40" /> <combined address="0x0FFD" size="3" name="TOS" /> <sfr address="0x0FFF" access="00033333" name="TOSU" mclr="00011111" por="00011111" /> @@ -39704,7 +39704,7 @@ <sfr address="0x0FA8" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" /> <sfr address="0x0F9C" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F66J15" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F66J15" unused_bank_mask="0x0000" > <unused end="0x0F61" start="0x0F60" /> <unused end="0x0F7B" start="0x0F7A" /> <unused end="0x0FAA" start="0x0FA8" /> @@ -39875,7 +39875,7 @@ <sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" /> <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F66J16" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F66J16" unused_bank_mask="0x0000" > <unused end="0x0F59" start="0x0F40" /> <combined address="0x0FFD" size="3" name="TOS" /> <sfr address="0x0FFF" access="00033333" name="TOSU" mclr="00011111" por="00011111" /> @@ -40062,7 +40062,7 @@ <sfr address="0x0FA8" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" /> <sfr address="0x0F9C" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F66J50" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F66J50" unused_bank_mask="0x0000" > <unused end="0x0F59" start="0x0F40" /> <combined address="0x0FFD" size="3" name="TOS" /> <sfr address="0x0FFF" access="00033333" name="TOSU" mclr="00011111" por="00011111" /> @@ -40249,7 +40249,7 @@ <sfr address="0x0FA8" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" /> <sfr address="0x0F9C" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F66J55" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F66J55" unused_bank_mask="0x0000" > <unused end="0x0F59" start="0x0F40" /> <combined address="0x0FFD" size="3" name="TOS" /> <sfr address="0x0FFF" access="00033333" name="TOSU" mclr="00011111" por="00011111" /> @@ -40436,7 +40436,7 @@ <sfr address="0x0FA8" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" /> <sfr address="0x0F9C" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F66J60" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F66J60" unused_bank_mask="0x0000" > <unused end="0x0FD4" start="0x0FD4" /> <unused end="0x0FAA" start="0x0FA8" /> <unused end="0x0EFF" start="0x0EFF" /> @@ -40689,7 +40689,7 @@ <sfr address="0x0E81" access="33333333" name="MAADR6" mclr="11111111" por="11111111" /> <sfr address="0x0E80" access="33333333" name="MAADR5" mclr="11111111" por="11111111" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F66J65" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F66J65" unused_bank_mask="0x0000" > <unused end="0x0FD4" start="0x0FD4" /> <unused end="0x0FAA" start="0x0FA8" /> <unused end="0x0EFF" start="0x0EFF" /> @@ -40942,7 +40942,7 @@ <sfr address="0x0E81" access="33333333" name="MAADR6" mclr="11111111" por="11111111" /> <sfr address="0x0E80" access="33333333" name="MAADR5" mclr="11111111" por="11111111" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F6720" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F6720" unused_bank_mask="0x0000" > <unused end="0x0F6A" start="0x0F00" /> <unused end="0x0F7F" start="0x0F79" /> <unused end="0x0F88" start="0x0F87" /> @@ -41101,7 +41101,7 @@ <sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" /> <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F6722" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F6722" unused_bank_mask="0x0000" > <unused end="0x0F61" start="0x0F60" /> <unused end="0x0F7B" start="0x0F7A" /> <unused end="0x0F88" start="0x0F87" /> @@ -41275,7 +41275,7 @@ <sfr address="0x0F6C" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" /> <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F67J10" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F67J10" unused_bank_mask="0x0000" > <unused end="0x0F61" start="0x0F60" /> <unused end="0x0F7B" start="0x0F7A" /> <unused end="0x0F88" start="0x0F87" /> @@ -41446,7 +41446,7 @@ <sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" /> <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F67J11" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F67J11" unused_bank_mask="0x0000" > <unused end="0x0F59" start="0x0F40" /> <combined address="0x0FFD" size="3" name="TOS" /> <sfr address="0x0FFF" access="00033333" name="TOSU" mclr="00011111" por="00011111" /> @@ -41633,7 +41633,7 @@ <sfr address="0x0FA8" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" /> <sfr address="0x0F9C" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F67J50" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F67J50" unused_bank_mask="0x0000" > <unused end="0x0F59" start="0x0F40" /> <combined address="0x0FFD" size="3" name="TOS" /> <sfr address="0x0FFF" access="00033333" name="TOSU" mclr="00011111" por="00011111" /> @@ -41820,7 +41820,7 @@ <sfr address="0x0FA8" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" /> <sfr address="0x0F9C" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F67J60" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F67J60" unused_bank_mask="0x0000" > <unused end="0x0FD4" start="0x0FD4" /> <unused end="0x0FAA" start="0x0FA8" /> <unused end="0x0EFF" start="0x0EFF" /> @@ -42073,7 +42073,7 @@ <sfr address="0x0E81" access="33333333" name="MAADR6" mclr="11111111" por="11111111" /> <sfr address="0x0E80" access="33333333" name="MAADR5" mclr="11111111" por="11111111" /> </device> - <device nb_banks="16" access_bank_split_offset="0x40" name="18F8310" unused_bank_tqmask="0x7FF8" > + <device nb_banks="16" access_bank_split_offset="0x40" name="18F8310" unused_bank_mask="0x7FF8" > <unused end="0x0F57" start="0x0F00" /> <unused end="0x0F7C" start="0x0F70" /> <unused end="0x0F7D" start="0x0F7D" /> @@ -42223,7 +42223,7 @@ <sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" /> <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F8390" unused_bank_tqmask="0x7FF8" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F8390" unused_bank_mask="0x7FF8" > <unused end="0x0F57" start="0x0F40" /> <unused end="0x0F7D" start="0x0F7D" /> <unused end="0x0FAA" start="0x0FA6" /> @@ -42400,7 +42400,7 @@ <sfr address="0x0F59" access="33303333" name="LCDCON" mclr="11101111" por="11101111" /> <sfr address="0x0F58" access="33333333" name="LCDPS" mclr="11111111" por="11111111" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F83J11" unused_bank_tqmask="0x7FF0" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F83J11" unused_bank_mask="0x7FF0" > <unused end="0x0FD4" start="0x0FD4" /> <unused end="0x0FBF" start="0x0F6B" /> <combined address="0x0FFD" size="3" name="TOS" /> @@ -42540,7 +42540,7 @@ <sfr address="0x0F61" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" /> <sfr address="0x0F60" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F83J90" unused_bank_tqmask="0x7FF0" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F83J90" unused_bank_mask="0x7FF0" > <unused end="0x0FD4" start="0x0FD4" /> <unused end="0x0FB0" start="0x0FB0" /> <combined address="0x0FFD" size="3" name="TOS" /> @@ -42711,7 +42711,7 @@ <sfr address="0x0F6C" access="33333333" name="LCDD6" mclr="33333333" por="00000000" /> <sfr address="0x0F6B" access="33333333" name="LCDD5" mclr="33333333" por="00000000" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F8410" unused_bank_tqmask="0x7FF8" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F8410" unused_bank_mask="0x7FF8" > <unused end="0x0F6A" start="0x0F00" /> <unused end="0x0F7C" start="0x0F70" /> <unused end="0x0F7D" start="0x0F7D" /> @@ -42861,7 +42861,7 @@ <sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" /> <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F8490" unused_bank_tqmask="0x7FF8" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F8490" unused_bank_mask="0x7FF8" > <unused end="0x0F57" start="0x0F40" /> <unused end="0x0F7D" start="0x0F7D" /> <unused end="0x0FAA" start="0x0FA6" /> @@ -43038,7 +43038,7 @@ <sfr address="0x0F59" access="33303333" name="LCDCON" mclr="11101111" por="11101111" /> <sfr address="0x0F58" access="33333333" name="LCDPS" mclr="11111111" por="11111111" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F84J11" unused_bank_tqmask="0x7FF0" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F84J11" unused_bank_mask="0x7FF0" > <unused end="0x0FD4" start="0x0FD4" /> <unused end="0x0FBF" start="0x0F6B" /> <combined address="0x0FFD" size="3" name="TOS" /> @@ -43178,7 +43178,7 @@ <sfr address="0x0F61" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" /> <sfr address="0x0F60" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F84J90" unused_bank_tqmask="0x7FF0" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F84J90" unused_bank_mask="0x7FF0" > <unused end="0x0FD4" start="0x0FD4" /> <unused end="0x0FB0" start="0x0FB0" /> <combined address="0x0FFD" size="3" name="TOS" /> @@ -43349,7 +43349,7 @@ <sfr address="0x0F6C" access="33333333" name="LCDD6" mclr="33333333" por="00000000" /> <sfr address="0x0F6B" access="33333333" name="LCDD5" mclr="33333333" por="00000000" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F8520" unused_bank_tqmask="0x7F00" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F8520" unused_bank_mask="0x7F00" > <unused end="0x0F6A" start="0x0F00" /> <unused end="0x0F7F" start="0x0F79" /> <unused end="0x0F9B" start="0x0F9B" /> @@ -43511,7 +43511,7 @@ <sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" /> <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F8525" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F8525" unused_bank_mask="0x0000" > <unused end="0x0F66" start="0x0F00" /> <unused end="0x0F7B" start="0x0F7A" /> <unused end="0x0F9B" start="0x0F9B" /> @@ -43682,7 +43682,7 @@ <sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" /> <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F8527" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F8527" unused_bank_mask="0x0000" > <unused end="0x0F61" start="0x0F60" /> <unused end="0x0F7B" start="0x0F7A" /> <unused end="0x0F9C" start="0x0F9C" /> @@ -43859,7 +43859,7 @@ <sfr address="0x0F6C" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" /> <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F8585" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F8585" unused_bank_mask="0x0000" > <unused end="0x0D5F" start="0x0D00" /> <unused end="0x0D6F" start="0x0D6C" /> <unused end="0x0D7F" start="0x0D7C" /> @@ -44292,7 +44292,7 @@ <sfr address="0x0D61" access="33333033" name="RXF6SIDL" mclr="33333033" por="00000000" /> <sfr address="0x0D60" access="33333333" name="RXF6SIDH" mclr="33333333" por="00000000" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F85J10" unused_bank_tqmask="0x7F00" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F85J10" unused_bank_mask="0x7F00" > <unused end="0x0F5F" start="0x0F00" /> <unused end="0x0F61" start="0x0F60" /> <unused end="0x0F7B" start="0x0F7A" /> @@ -44467,7 +44467,7 @@ <sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" /> <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F85J11" unused_bank_tqmask="0x7F00" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F85J11" unused_bank_mask="0x7F00" > <unused end="0x0FD4" start="0x0FD4" /> <unused end="0x0FBF" start="0x0F6B" /> <combined address="0x0FFD" size="3" name="TOS" /> @@ -44607,7 +44607,7 @@ <sfr address="0x0F61" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" /> <sfr address="0x0F60" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F85J15" unused_bank_tqmask="0x7F00" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F85J15" unused_bank_mask="0x7F00" > <unused end="0x0F5F" start="0x0F00" /> <unused end="0x0F61" start="0x0F60" /> <unused end="0x0F7B" start="0x0F7A" /> @@ -44782,7 +44782,7 @@ <sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" /> <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F85J50" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F85J50" unused_bank_mask="0x0000" > <unused end="0x0F59" start="0x0F40" /> <combined address="0x0FFD" size="3" name="TOS" /> <sfr address="0x0FFF" access="00033333" name="TOSU" mclr="00011111" por="00011111" /> @@ -44975,7 +44975,7 @@ <sfr address="0x0FA8" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" /> <sfr address="0x0F9C" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F85J90" unused_bank_tqmask="0x7F00" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F85J90" unused_bank_mask="0x7F00" > <unused end="0x0FD4" start="0x0FD4" /> <unused end="0x0FB0" start="0x0FB0" /> <combined address="0x0FFD" size="3" name="TOS" /> @@ -45147,7 +45147,7 @@ <sfr address="0x0F6C" access="33333333" name="LCDDATA6" mclr="33333333" por="00000000" /> <sfr address="0x0F6B" access="33333333" name="LCDDATA5" mclr="33333333" por="00000000" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F8620" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F8620" unused_bank_mask="0x0000" > <unused end="0x0F6A" start="0x0F00" /> <unused end="0x0F7F" start="0x0F79" /> <unused end="0x0F9B" start="0x0F9B" /> @@ -45309,7 +45309,7 @@ <sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" /> <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F8621" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F8621" unused_bank_mask="0x0000" > <unused end="0x0F66" start="0x0F00" /> <unused end="0x0F7B" start="0x0F7A" /> <unused end="0x0F9B" start="0x0F9B" /> @@ -45480,7 +45480,7 @@ <sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" /> <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F8622" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F8622" unused_bank_mask="0x0000" > <unused end="0x0F61" start="0x0F60" /> <unused end="0x0F7B" start="0x0F7A" /> <unused end="0x0F9C" start="0x0F9C" /> @@ -45657,7 +45657,7 @@ <sfr address="0x0F6C" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" /> <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F8627" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F8627" unused_bank_mask="0x0000" > <unused end="0x0F61" start="0x0F60" /> <unused end="0x0F7B" start="0x0F7A" /> <unused end="0x0F9C" start="0x0F9C" /> @@ -45834,7 +45834,7 @@ <sfr address="0x0F6C" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" /> <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F8680" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F8680" unused_bank_mask="0x0000" > <unused end="0x0D5F" start="0x0D00" /> <unused end="0x0D6F" start="0x0D6C" /> <unused end="0x0D7F" start="0x0D7C" /> @@ -46267,7 +46267,7 @@ <sfr address="0x0D61" access="33333033" name="RXF6SIDL" mclr="33333033" por="00000000" /> <sfr address="0x0D60" access="33333333" name="RXF6SIDH" mclr="33333333" por="00000000" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F86J10" unused_bank_tqmask="0x7F00" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F86J10" unused_bank_mask="0x7F00" > <unused end="0x0F5F" start="0x0F00" /> <unused end="0x0F61" start="0x0F60" /> <unused end="0x0F7B" start="0x0F7A" /> @@ -46442,7 +46442,7 @@ <sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" /> <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F86J11" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F86J11" unused_bank_mask="0x0000" > <unused end="0x0F59" start="0x0F40" /> <combined address="0x0FFD" size="3" name="TOS" /> <sfr address="0x0FFF" access="00033333" name="TOSU" mclr="00011111" por="00011111" /> @@ -46635,7 +46635,7 @@ <sfr address="0x0FA8" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" /> <sfr address="0x0F9C" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F86J15" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F86J15" unused_bank_mask="0x0000" > <unused end="0x0F61" start="0x0F60" /> <unused end="0x0F7B" start="0x0F7A" /> <unused end="0x0FAA" start="0x0FA8" /> @@ -46809,7 +46809,7 @@ <sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" /> <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F86J16" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F86J16" unused_bank_mask="0x0000" > <unused end="0x0F59" start="0x0F40" /> <combined address="0x0FFD" size="3" name="TOS" /> <sfr address="0x0FFF" access="00033333" name="TOSU" mclr="00011111" por="00011111" /> @@ -47002,7 +47002,7 @@ <sfr address="0x0FA8" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" /> <sfr address="0x0F9C" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F86J50" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F86J50" unused_bank_mask="0x0000" > <unused end="0x0F59" start="0x0F40" /> <combined address="0x0FFD" size="3" name="TOS" /> <sfr address="0x0FFF" access="00033333" name="TOSU" mclr="00011111" por="00011111" /> @@ -47195,7 +47195,7 @@ <sfr address="0x0FA8" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" /> <sfr address="0x0F9C" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F86J55" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F86J55" unused_bank_mask="0x0000" > <unused end="0x0F59" start="0x0F40" /> <combined address="0x0FFD" size="3" name="TOS" /> <sfr address="0x0FFF" access="00033333" name="TOSU" mclr="00011111" por="00011111" /> @@ -47388,7 +47388,7 @@ <sfr address="0x0FA8" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" /> <sfr address="0x0F9C" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F86J60" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F86J60" unused_bank_mask="0x0000" > <unused end="0x0FD4" start="0x0FD4" /> <unused end="0x0FAA" start="0x0FA8" /> <unused end="0x0EFF" start="0x0EFF" /> @@ -47649,7 +47649,7 @@ <sfr address="0x0E81" access="33333333" name="MAADR6" mclr="11111111" por="11111111" /> <sfr address="0x0E80" access="33333333" name="MAADR5" mclr="11111111" por="11111111" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F86J65" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F86J65" unused_bank_mask="0x0000" > <unused end="0x0FD4" start="0x0FD4" /> <unused end="0x0FAA" start="0x0FA8" /> <unused end="0x0EFF" start="0x0EFF" /> @@ -47910,7 +47910,7 @@ <sfr address="0x0E81" access="33333333" name="MAADR6" mclr="11111111" por="11111111" /> <sfr address="0x0E80" access="33333333" name="MAADR5" mclr="11111111" por="11111111" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F8720" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F8720" unused_bank_mask="0x0000" > <unused end="0x0F6A" start="0x0F00" /> <unused end="0x0F7F" start="0x0F79" /> <unused end="0x0F9B" start="0x0F9B" /> @@ -48072,7 +48072,7 @@ <sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" /> <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F8722" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F8722" unused_bank_mask="0x0000" > <unused end="0x0F61" start="0x0F60" /> <unused end="0x0F7B" start="0x0F7A" /> <unused end="0x0F9C" start="0x0F9C" /> @@ -48249,7 +48249,7 @@ <sfr address="0x0F6C" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" /> <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F87J10" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F87J10" unused_bank_mask="0x0000" > <unused end="0x0F61" start="0x0F60" /> <unused end="0x0F7B" start="0x0F7A" /> <unused end="0x0FAA" start="0x0FA8" /> @@ -48423,7 +48423,7 @@ <sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" /> <sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F87J11" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F87J11" unused_bank_mask="0x0000" > <unused end="0x0F59" start="0x0F40" /> <combined address="0x0FFD" size="3" name="TOS" /> <sfr address="0x0FFF" access="00033333" name="TOSU" mclr="00011111" por="00011111" /> @@ -48616,7 +48616,7 @@ <sfr address="0x0FA8" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" /> <sfr address="0x0F9C" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F87J50" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F87J50" unused_bank_mask="0x0000" > <unused end="0x0F59" start="0x0F40" /> <combined address="0x0FFD" size="3" name="TOS" /> <sfr address="0x0FFF" access="00033333" name="TOSU" mclr="00011111" por="00011111" /> @@ -48809,7 +48809,7 @@ <sfr address="0x0FA8" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" /> <sfr address="0x0F9C" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F87J60" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F87J60" unused_bank_mask="0x0000" > <unused end="0x0FD4" start="0x0FD4" /> <unused end="0x0FAA" start="0x0FA8" /> <unused end="0x0EFF" start="0x0EFF" /> @@ -49070,7 +49070,7 @@ <sfr address="0x0E81" access="33333333" name="MAADR6" mclr="11111111" por="11111111" /> <sfr address="0x0E80" access="33333333" name="MAADR5" mclr="11111111" por="11111111" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F96J60" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F96J60" unused_bank_mask="0x0000" > <unused end="0x0FD4" start="0x0FD4" /> <unused end="0x0FAA" start="0x0FA8" /> <unused end="0x0EFF" start="0x0EFF" /> @@ -49335,7 +49335,7 @@ <sfr address="0x0E81" access="33333333" name="MAADR6" mclr="11111111" por="11111111" /> <sfr address="0x0E80" access="33333333" name="MAADR5" mclr="11111111" por="11111111" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F96J65" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F96J65" unused_bank_mask="0x0000" > <unused end="0x0FD4" start="0x0FD4" /> <unused end="0x0FAA" start="0x0FA8" /> <unused end="0x0EFF" start="0x0EFF" /> @@ -49600,7 +49600,7 @@ <sfr address="0x0E81" access="33333333" name="MAADR6" mclr="11111111" por="11111111" /> <sfr address="0x0E80" access="33333333" name="MAADR5" mclr="11111111" por="11111111" /> </device> - <device nb_banks="16" access_bank_split_offset="0x60" name="18F97J60" unused_bank_tqmask="0x0000" > + <device nb_banks="16" access_bank_split_offset="0x60" name="18F97J60" unused_bank_mask="0x0000" > <unused end="0x0FD4" start="0x0FD4" /> <unused end="0x0FAA" start="0x0FA8" /> <unused end="0x0EFF" start="0x0EFF" /> diff --git a/src/libgui/breakpoint_view.cpp b/src/libgui/breakpoint_view.cpp index 3a8394f..b3950fa 100644 --- a/src/libgui/breakpoint_view.cpp +++ b/src/libgui/breakpoint_view.cpp @@ -29,13 +29,13 @@ void Breakpoint::updateActions(const Data *data) } //---------------------------------------------------------------------------- -Breakpoint::ListViewItem::ListViewItem(ListView *tqparent, const Data &data) - : KListViewItem(tqparent), _data(data) +Breakpoint::ListViewItem::ListViewItem(ListView *parent, const Data &data) + : KListViewItem(parent), _data(data) {} //---------------------------------------------------------------------------- -Breakpoint::View::View(TQWidget *tqparent) - : TQWidget(tqparent, "breakpoints_view"), GenericView(Breakpoint::list()), +Breakpoint::View::View(TQWidget *parent) + : TQWidget(parent, "breakpoints_view"), GenericView(Breakpoint::list()), _currentData(0) { TQVBoxLayout *top = new TQVBoxLayout(this); diff --git a/src/libgui/breakpoint_view.h b/src/libgui/breakpoint_view.h index 1f3543e..1545afa 100644 --- a/src/libgui/breakpoint_view.h +++ b/src/libgui/breakpoint_view.h @@ -18,7 +18,7 @@ namespace Breakpoint class ListViewItem : public KListViewItem { public: - ListViewItem(ListView *tqparent, const Data &data); + ListViewItem(ListView *parent, const Data &data); const Data &data() const { return _data; } private: @@ -31,7 +31,7 @@ class View : public TQWidget, public GenericView Q_OBJECT TQ_OBJECT public: - View(TQWidget *tqparent); + View(TQWidget *parent); virtual void updateView(); const Data *currentData() const { return _currentData; } diff --git a/src/libgui/config_center.cpp b/src/libgui/config_center.cpp index 237a89d..e91a956 100644 --- a/src/libgui/config_center.cpp +++ b/src/libgui/config_center.cpp @@ -106,8 +106,8 @@ ConfigWidget *ConfigCenter::factory(Type type) return 0; } -ConfigCenter::ConfigCenter(Type showType, TQWidget *tqparent) - : Dialog(IconList, i18n("Configure Piklab"), Ok|Cancel, Cancel, tqparent, "configure_piklab_dialog", true, false) +ConfigCenter::ConfigCenter(Type showType, TQWidget *parent) + : Dialog(IconList, i18n("Configure Piklab"), Ok|Cancel, Cancel, parent, "configure_piklab_dialog", true, false) { for (uint i=0; i<Nb_Types; i++) { _configWidgets[i] = factory(Type(i)); diff --git a/src/libgui/config_center.h b/src/libgui/config_center.h index 9f50056..88ed12c 100644 --- a/src/libgui/config_center.h +++ b/src/libgui/config_center.h @@ -72,7 +72,7 @@ Q_OBJECT public: enum Type { General = 0, ProgSelect, ProgOptions, DebugOptions, Standalone, Nb_Types }; - ConfigCenter(Type showType, TQWidget *tqparent); + ConfigCenter(Type showType, TQWidget *parent); public slots: virtual void slotOk(); diff --git a/src/libgui/config_gen.cpp b/src/libgui/config_gen.cpp index 8ef334d..01dc06b 100644 --- a/src/libgui/config_gen.cpp +++ b/src/libgui/config_gen.cpp @@ -23,8 +23,8 @@ #include "tools/list/tool_list.h" //----------------------------------------------------------------------------- -GeneratorDialog::GeneratorDialog(const TQString &title, TQWidget *tqparent, const char *name) - : Dialog(tqparent, name, true, title, Close|User1, Close, false, TQSize(400, 300)) +GeneratorDialog::GeneratorDialog(const TQString &title, TQWidget *parent, const char *name) + : Dialog(parent, name, true, title, Close|User1, Close, false, TQSize(400, 300)) { TQVBoxLayout *top = new TQVBoxLayout(mainWidget(), 10, 10); @@ -141,8 +141,8 @@ void GeneratorDialog::slotUser1() } //----------------------------------------------------------------------------- -ConfigGenerator::ConfigGenerator(TQWidget *tqparent) - : GeneratorDialog(i18n("Config Generator"), tqparent, "config_generator"), _memory(0), _configEditor(0) +ConfigGenerator::ConfigGenerator(TQWidget *parent) + : GeneratorDialog(i18n("Config Generator"), parent, "config_generator"), _memory(0), _configEditor(0) {} ConfigGenerator::~ConfigGenerator() @@ -175,8 +175,8 @@ SourceLine::List ConfigGenerator::generateLines(bool &ok) const } //----------------------------------------------------------------------------- -TemplateGenerator::TemplateGenerator(TQWidget *tqparent) - : GeneratorDialog(i18n("Template Generator"), tqparent, "template_generator") +TemplateGenerator::TemplateGenerator(TQWidget *parent) + : GeneratorDialog(i18n("Template Generator"), parent, "template_generator") {} SourceLine::List TemplateGenerator::generateLines(bool &ok) const diff --git a/src/libgui/config_gen.h b/src/libgui/config_gen.h index 412e75c..b281de0 100644 --- a/src/libgui/config_gen.h +++ b/src/libgui/config_gen.h @@ -28,7 +28,7 @@ class GeneratorDialog : public Dialog Q_OBJECT TQ_OBJECT public: - GeneratorDialog(const TQString &title, TQWidget *tqparent, const char *name); + GeneratorDialog(const TQString &title, TQWidget *parent, const char *name); void set(const Device::Data *data, const Tool::Group &group, PURL::ToolType stype); protected slots: @@ -56,7 +56,7 @@ class ConfigGenerator : public GeneratorDialog Q_OBJECT TQ_OBJECT public: - ConfigGenerator(TQWidget *tqparent); + ConfigGenerator(TQWidget *parent); virtual ~ConfigGenerator(); private slots: @@ -76,7 +76,7 @@ class TemplateGenerator : public GeneratorDialog Q_OBJECT TQ_OBJECT public: - TemplateGenerator(TQWidget *tqparent); + TemplateGenerator(TQWidget *parent); private: virtual SourceLine::List generateLines(bool &ok) const; diff --git a/src/libgui/console.cpp b/src/libgui/console.cpp index f090319..6adf44a 100644 --- a/src/libgui/console.cpp +++ b/src/libgui/console.cpp @@ -16,8 +16,8 @@ #include <kparts/part.h> #include <kde_terminal_interface.h> -ConsoleView::ConsoleView(TQWidget *tqparent) - : TQWidget(tqparent, "console_view"), _initialized(false) +ConsoleView::ConsoleView(TQWidget *parent) + : TQWidget(parent, "console_view"), _initialized(false) {} void ConsoleView::showEvent(TQShowEvent *e) diff --git a/src/libgui/console.h b/src/libgui/console.h index ca86fd1..304c793 100644 --- a/src/libgui/console.h +++ b/src/libgui/console.h @@ -16,7 +16,7 @@ class ConsoleView : public TQWidget Q_OBJECT TQ_OBJECT public: - ConsoleView(TQWidget *tqparent); + ConsoleView(TQWidget *parent); protected: virtual void showEvent(TQShowEvent *e); diff --git a/src/libgui/device_editor.cpp b/src/libgui/device_editor.cpp index d3c2158..9b3b852 100644 --- a/src/libgui/device_editor.cpp +++ b/src/libgui/device_editor.cpp @@ -19,14 +19,14 @@ #include "common/global/pfile.h" #include "main_global.h" -DeviceEditor::DeviceEditor(const TQString &title, const TQString &tag, TQWidget *tqparent, const char *name) - : Editor(title, tag, tqparent, name), _view(0) +DeviceEditor::DeviceEditor(const TQString &title, const TQString &tag, TQWidget *parent, const char *name) + : Editor(title, tag, parent, name), _view(0) { init(); } -DeviceEditor::DeviceEditor(TQWidget *tqparent, const char *name) - : Editor(tqparent, name), _view(0) +DeviceEditor::DeviceEditor(TQWidget *parent, const char *name) + : Editor(parent, name), _view(0) { init(); } diff --git a/src/libgui/device_editor.h b/src/libgui/device_editor.h index adbd2d0..355ddae 100644 --- a/src/libgui/device_editor.h +++ b/src/libgui/device_editor.h @@ -17,8 +17,8 @@ class DeviceEditor : public Editor Q_OBJECT TQ_OBJECT public: - DeviceEditor(const TQString &title, const TQString &tag, TQWidget *tqparent, const char *name); - DeviceEditor(TQWidget *tqparent, const char *name); + DeviceEditor(const TQString &title, const TQString &tag, TQWidget *parent, const char *name); + DeviceEditor(TQWidget *parent, const char *name); virtual PURL::FileType fileType() const { return PURL::Nb_FileTypes; } virtual PURL::Url url() const { return PURL::Url(); } virtual void setDevice(bool force = false); @@ -38,7 +38,7 @@ protected: TQLabel *_labelDevice, *_labelWarning; void init(); - virtual TQWidget *createView(const Device::Data *data, TQWidget *tqparent) = 0; + virtual TQWidget *createView(const Device::Data *data, TQWidget *parent) = 0; static PURL::Url findAsmFile(const PURL::Url &url); private slots: diff --git a/src/libgui/device_gui.cpp b/src/libgui/device_gui.cpp index fae54f6..f5e7a10 100644 --- a/src/libgui/device_gui.cpp +++ b/src/libgui/device_gui.cpp @@ -83,8 +83,8 @@ const DeviceChooser::ListType::Data DeviceChooser::ListType::DATA[Nb_Types] = { { "flat", I18N_NOOP("Flat List") } }; -DeviceChooser::Dialog::Dialog(const TQString &device, Type type, TQWidget *tqparent) - : ::Dialog(tqparent, "device_chooser_dialog", true, i18n("Select a device"), +DeviceChooser::Dialog::Dialog(const TQString &device, Type type, TQWidget *parent) + : ::Dialog(parent, "device_chooser_dialog", true, i18n("Select a device"), Ok|Close, Close, false, TQSize(400, 300)), _withAuto(type==ChooseWithAuto) { setButtonOK(KGuiItem(i18n( "&Select"), "button_ok")); @@ -305,8 +305,8 @@ void DeviceChooser::Dialog::updateList(const TQString &device) } //----------------------------------------------------------------------------- -DeviceChooser::ComboBox::ComboBox(bool withAuto, TQWidget *tqparent) - : TQComboBox(tqparent, "device_chooser_combo"), _withAuto(withAuto) +DeviceChooser::ComboBox::ComboBox(bool withAuto, TQWidget *parent) + : TQComboBox(parent, "device_chooser_combo"), _withAuto(withAuto) { if (withAuto) insertItem(i18n(Device::AUTO_DATA.label)); Device::Lister::ConstIterator it; @@ -338,8 +338,8 @@ TQString DeviceChooser::ComboBox::device() const } //----------------------------------------------------------------------------- -DeviceChooser::Button::Button(bool withAuto, TQWidget *tqparent) - : TQWidget(tqparent, "device_chooser_button") +DeviceChooser::Button::Button(bool withAuto, TQWidget *parent) + : TQWidget(parent, "device_chooser_button") { TQHBoxLayout *hbox = new TQHBoxLayout(this, 0, 10); _combo = new ComboBox(withAuto, this); @@ -361,8 +361,8 @@ void DeviceChooser::Button::chooseDevice() } //----------------------------------------------------------------------------- -DeviceChooser::Browser::Browser(TQWidget *tqparent) - : KTextBrowser(tqparent, "device_browser") +DeviceChooser::Browser::Browser(TQWidget *parent) + : KTextBrowser(parent, "device_browser") {} PURL::Url findDocumentUrl(const TQString &prefix, const TQString &baseName) @@ -392,8 +392,8 @@ void DeviceChooser::Browser::setSource(const TQString &name) } //----------------------------------------------------------------------------- -DeviceChooser::View::View(TQWidget *tqparent) - : TabWidget(tqparent, "device_view") +DeviceChooser::View::View(TQWidget *parent) + : TabWidget(parent, "device_view") { // Information _info = new Browser(this); @@ -454,9 +454,9 @@ DeviceChooser::Editor::Editor(const TQString &title, const TQString &tag, TQWidg : DeviceEditor(title, tag, widget, "device_view_editor") {} -TQWidget *DeviceChooser::Editor::createView(const Device::Data *, TQWidget *tqparent) +TQWidget *DeviceChooser::Editor::createView(const Device::Data *, TQWidget *parent) { - DeviceChooser::View *view = new DeviceChooser::View(tqparent); + DeviceChooser::View *view = new DeviceChooser::View(parent); connect(view, TQT_SIGNAL(deviceChanged(const TQString &)), TQT_SIGNAL(deviceChanged(const TQString &))); view->setDevice(_device, true); return view; diff --git a/src/libgui/device_gui.h b/src/libgui/device_gui.h index 53ad04f..de28bbf 100644 --- a/src/libgui/device_gui.h +++ b/src/libgui/device_gui.h @@ -50,15 +50,15 @@ template <typename Enum> class EnumComboBox { public: - EnumComboBox(const TQString &key, TQWidget *tqparent) : _key(key) { - _combo = new TQComboBox(tqparent); + EnumComboBox(const TQString &key, TQWidget *parent) : _key(key) { + _combo = new TQComboBox(parent); for (Enum type; type<Enum::Nb_Types; ++type) _combo->insertItem(type.label()); Config config; Enum type = config.readEnumEntry(key, Enum(Enum::Nb_Types)); if ( type!=Enum::Nb_Types ) _combo->setCurrentItem(type.type()); } - EnumComboBox(const TQString &emptyLabel, const TQString &key, TQWidget *tqparent) : _key(key) { - _combo = new TQComboBox(tqparent); + EnumComboBox(const TQString &emptyLabel, const TQString &key, TQWidget *parent) : _key(key) { + _combo = new TQComboBox(parent); _combo->insertItem(emptyLabel); for (Enum type; type<Enum::Nb_Types; ++type) _combo->insertItem(type.label()); Config config; @@ -88,7 +88,7 @@ class Dialog : public ::Dialog Q_OBJECT TQ_OBJECT public: - Dialog(const TQString &device, Type type, TQWidget *tqparent); + Dialog(const TQString &device, Type type, TQWidget *parent); virtual ~Dialog(); TQString device() const; @@ -121,7 +121,7 @@ class ComboBox : public TQComboBox Q_OBJECT TQ_OBJECT public: - ComboBox(bool withAuto, TQWidget *tqparent); + ComboBox(bool withAuto, TQWidget *parent); void setDevice(const TQString &device, const Device::Data *data = 0); TQString device() const; bool withAuto() const { return _withAuto; } @@ -136,7 +136,7 @@ class Button : public TQWidget Q_OBJECT TQ_OBJECT public: - Button(bool withAuto, TQWidget *tqparent); + Button(bool withAuto, TQWidget *parent); void setDevice(const TQString &device) { _combo->setDevice(device); } TQString device() const { return _combo->device(); } @@ -156,7 +156,7 @@ class Browser : public KTextBrowser Q_OBJECT TQ_OBJECT public: - Browser(TQWidget *tqparent); + Browser(TQWidget *parent); signals: void deviceChanged(const TQString &device); @@ -171,7 +171,7 @@ class View : public TabWidget Q_OBJECT TQ_OBJECT public: - View(TQWidget *tqparent); + View(TQWidget *parent); void clear(); void setText(const TQString &text); void setDevice(const TQString &name, bool cannotChangeDevice); @@ -190,7 +190,7 @@ class Editor : public DeviceEditor Q_OBJECT TQ_OBJECT public: - Editor(const TQString &title, const TQString &tag, TQWidget *tqparent); + Editor(const TQString &title, const TQString &tag, TQWidget *parent); virtual bool isModified() const { return false; } virtual bool isReadOnly() const { return true; } virtual void addGui() {} @@ -201,7 +201,7 @@ signals: void deviceChanged(const TQString &device); private: - virtual TQWidget *createView(const Device::Data *data, TQWidget *tqparent); + virtual TQWidget *createView(const Device::Data *data, TQWidget *parent); virtual void setModifiedInternal(bool) {} virtual void setReadOnlyInternal(bool) {} }; diff --git a/src/libgui/editor.cpp b/src/libgui/editor.cpp index 1bbacb2..2999b1e 100644 --- a/src/libgui/editor.cpp +++ b/src/libgui/editor.cpp @@ -13,12 +13,12 @@ #include "common/gui/purl_gui.h" #include "common/gui/misc_gui.h" -Editor::Editor(const TQString &title, const TQString &tag, TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name), _title(title), _tag(tag) +Editor::Editor(const TQString &title, const TQString &tag, TQWidget *parent, const char *name) + : TQWidget(parent, name), _title(title), _tag(tag) {} -Editor::Editor(TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name) +Editor::Editor(TQWidget *parent, const char *name) + : TQWidget(parent, name) {} TQSizePolicy Editor::sizePolicy() const diff --git a/src/libgui/editor.h b/src/libgui/editor.h index 1a4c54d..0c80b07 100644 --- a/src/libgui/editor.h +++ b/src/libgui/editor.h @@ -23,8 +23,8 @@ class Editor : public TQWidget Q_OBJECT TQ_OBJECT public: - Editor(const TQString &title, const TQString &tag, TQWidget *tqparent, const char *name); - Editor(TQWidget *tqparent, const char *name); + Editor(const TQString &title, const TQString &tag, TQWidget *parent, const char *name); + Editor(TQWidget *parent, const char *name); virtual TQSizePolicy sizePolicy() const; virtual PURL::FileType fileType() const = 0; virtual bool isModified() const = 0; diff --git a/src/libgui/editor_manager.cpp b/src/libgui/editor_manager.cpp index a9d6a24..5c9c193 100644 --- a/src/libgui/editor_manager.cpp +++ b/src/libgui/editor_manager.cpp @@ -33,8 +33,8 @@ #include "project.h" //----------------------------------------------------------------------------- -SwitchToDialog::SwitchToDialog(const TQStringList &names, TQWidget *tqparent) - : Dialog(tqparent, "switch_to_dialog", true, i18n("Switch to editor"), Ok | Cancel, Ok, false) +SwitchToDialog::SwitchToDialog(const TQStringList &names, TQWidget *parent) + : Dialog(parent, "switch_to_dialog", true, i18n("Switch to editor"), Ok | Cancel, Ok, false) { TQVBoxLayout *top = new TQVBoxLayout(mainWidget(), 10, 10); _edit = new KLineEdit(mainWidget()); @@ -92,8 +92,8 @@ void EditorHistory::closedLast() //----------------------------------------------------------------------------- const char * const EditorManager::EDITOR_TAGS[Nb_EditorTypes] = { "device", "registers" }; -EditorManager::EditorManager(TQWidget *tqparent) - : TabWidget(tqparent, "editor_manager"), _current(0) +EditorManager::EditorManager(TQWidget *parent) + : TabWidget(parent, "editor_manager"), _current(0) { setTabBar(new EditorTabBar(this)); connect(this, TQT_SIGNAL(currentChanged(TQWidget *)), TQT_SLOT(showEditor(TQWidget *))); diff --git a/src/libgui/editor_manager.h b/src/libgui/editor_manager.h index 8c5f626..c20f520 100644 --- a/src/libgui/editor_manager.h +++ b/src/libgui/editor_manager.h @@ -25,7 +25,7 @@ class SwitchToDialog : public Dialog Q_OBJECT TQ_OBJECT public: - SwitchToDialog(const TQStringList &names, TQWidget *tqparent); + SwitchToDialog(const TQStringList &names, TQWidget *parent); TQString name() const { return _edit->text(); } private: @@ -38,7 +38,7 @@ class EditorTabBar : public TabBar Q_OBJECT TQ_OBJECT public: - EditorTabBar(TQWidget *tqparent) : TabBar(tqparent, "editor_tab_bar") {} + EditorTabBar(TQWidget *parent) : TabBar(parent, "editor_tab_bar") {} void setReadOnly(uint index, bool readOnly) { _readOnly[tabAt(index)] = readOnly; } private: @@ -69,7 +69,7 @@ class EditorManager : public TabWidget Q_OBJECT TQ_OBJECT public: - EditorManager(TQWidget *tqparent); + EditorManager(TQWidget *parent); PURL::UrlList files() const; TQValueList<Editor *> &editors() { return _editors; } diff --git a/src/libgui/gui_prog_manager.h b/src/libgui/gui_prog_manager.h index b4e267d..b747da6 100644 --- a/src/libgui/gui_prog_manager.h +++ b/src/libgui/gui_prog_manager.h @@ -19,7 +19,7 @@ class GuiManager : public Manager Q_OBJECT TQ_OBJECT public: - GuiManager(TQObject *tqparent) : Manager(tqparent) {} + GuiManager(TQObject *parent) : Manager(parent) {} virtual void createProgrammer(const Device::Data *data); virtual void setState(State state) { Main::setState(state==Idle ? Main::Idle : Main::Programming); } diff --git a/src/libgui/hex_editor.cpp b/src/libgui/hex_editor.cpp index 197eb83..c8b2727 100644 --- a/src/libgui/hex_editor.cpp +++ b/src/libgui/hex_editor.cpp @@ -46,14 +46,14 @@ void HexEditorPart::setReadWrite(bool rw) } //----------------------------------------------------------------------------- -HexEditor::HexEditor(const TQString &name, TQWidget *tqparent) - : DeviceEditor(name, TQString(), tqparent, "hex_editor") +HexEditor::HexEditor(const TQString &name, TQWidget *parent) + : DeviceEditor(name, TQString(), parent, "hex_editor") { init(); } -HexEditor::HexEditor(TQWidget *tqparent) - : DeviceEditor(tqparent, "hex_editor") +HexEditor::HexEditor(TQWidget *parent) + : DeviceEditor(parent, "hex_editor") { init(); } @@ -76,15 +76,15 @@ void HexEditor::clear() _originalMemory = 0; } -TQWidget *HexEditor::createView(const Device::Data *data, TQWidget *tqparent) +TQWidget *HexEditor::createView(const Device::Data *data, TQWidget *parent) { clear(); if (data) { _originalMemory = data->group().createMemory(*data); _memory = data->group().createMemory(*data); } - if ( data==0 ) return new TQWidget(tqparent); - Device::HexView *hv = Device::groupui(*data).createHexView(*this, tqparent); + if ( data==0 ) return new TQWidget(parent); + Device::HexView *hv = Device::groupui(*data).createHexView(*this, parent); connect(hv, TQT_SIGNAL(modified()), TQT_SLOT(slotModified())); _dirty = true; TQTimer::singleShot(0, this, TQT_SLOT(simpleLoad())); diff --git a/src/libgui/hex_editor.h b/src/libgui/hex_editor.h index 9418a59..50df57c 100644 --- a/src/libgui/hex_editor.h +++ b/src/libgui/hex_editor.h @@ -38,8 +38,8 @@ class HexEditor : public DeviceEditor Q_OBJECT TQ_OBJECT public: - HexEditor(const TQString &name, TQWidget *tqparent); - HexEditor(TQWidget *tqparent); + HexEditor(const TQString &name, TQWidget *parent); + HexEditor(TQWidget *parent); virtual bool isModified() const { return _modified; } virtual bool isReadOnly() const { return !_part->isReadWrite(); } virtual ~HexEditor() { clear(); } @@ -74,7 +74,7 @@ private: virtual void dropEvent(TQDropEvent *e) { emit dropEventPass(e); } bool save(const PURL::Url &url, const TQString &fileErrorString); bool verifyDeviceType(); - virtual TQWidget *createView(const Device::Data *data, TQWidget *tqparent); + virtual TQWidget *createView(const Device::Data *data, TQWidget *parent); virtual void setModifiedInternal(bool modified) { _modified = modified; } virtual void setReadOnlyInternal(bool readOnly); void display(); diff --git a/src/libgui/likeback.cpp b/src/libgui/likeback.cpp index 11fa9b9..2073f03 100644 --- a/src/libgui/likeback.cpp +++ b/src/libgui/likeback.cpp @@ -328,7 +328,7 @@ TQString LikeBack::activeWindowPath() if (name == "unnamed") name += TQString(":") + window->className(); windowNames.append(name); - window = dynamic_cast<TQWidget*>(window->tqparent()); + window = dynamic_cast<TQWidget*>(window->parent()); } TQString windowName; diff --git a/src/libgui/log_view.cpp b/src/libgui/log_view.cpp index f0a1830..2442bc3 100644 --- a/src/libgui/log_view.cpp +++ b/src/libgui/log_view.cpp @@ -17,8 +17,8 @@ #include "common/gui/purl_gui.h" #include "common/gui/misc_gui.h" -Log::Widget::Widget(TQWidget *tqparent, const char *name) - : TQTextEdit(tqparent, name) +Log::Widget::Widget(TQWidget *parent, const char *name) + : TQTextEdit(parent, name) { setTextFormat(LogText); setMinimumWidth(300); diff --git a/src/libgui/log_view.h b/src/libgui/log_view.h index 75e2481..5f0fa44 100644 --- a/src/libgui/log_view.h +++ b/src/libgui/log_view.h @@ -21,7 +21,7 @@ class Widget : public TQTextEdit, public View Q_OBJECT TQ_OBJECT public: - Widget(TQWidget *tqparent = 0, const char *name = 0); + Widget(TQWidget *parent = 0, const char *name = 0); virtual void appendToLastLine(const TQString &text); virtual void clear(); virtual void sorry(const TQString &message, const TQString &details); diff --git a/src/libgui/new_dialogs.cpp b/src/libgui/new_dialogs.cpp index f5fbc4a..71b6de7 100644 --- a/src/libgui/new_dialogs.cpp +++ b/src/libgui/new_dialogs.cpp @@ -17,8 +17,8 @@ #include "project.h" //---------------------------------------------------------------------------- -NewDialog::NewDialog(const TQString &caption, TQWidget *tqparent) - : Dialog(tqparent, "new_dialog", true, caption, Ok|Cancel, Ok, false) +NewDialog::NewDialog(const TQString &caption, TQWidget *parent) + : Dialog(parent, "new_dialog", true, caption, Ok|Cancel, Ok, false) { _top = new TQGridLayout(mainWidget(), 0, 0, 10, 10); _top->setColStretch(2, 1); @@ -57,8 +57,8 @@ void NewDialog::browse() } //---------------------------------------------------------------------------- -NewFileDialog::NewFileDialog(Project *project, TQWidget *tqparent) - : NewDialog(i18n("Create New File"), tqparent), _project(project) +NewFileDialog::NewFileDialog(Project *project, TQWidget *parent) + : NewDialog(i18n("Create New File"), parent), _project(project) { _fLabel->setText(i18n("File Name:")); diff --git a/src/libgui/new_dialogs.h b/src/libgui/new_dialogs.h index b3d2846..dd71f67 100644 --- a/src/libgui/new_dialogs.h +++ b/src/libgui/new_dialogs.h @@ -27,7 +27,7 @@ class NewDialog : public Dialog Q_OBJECT TQ_OBJECT public: - NewDialog(const TQString &caption, TQWidget *tqparent); + NewDialog(const TQString &caption, TQWidget *parent); protected: TQGridLayout *_top; @@ -47,7 +47,7 @@ class NewFileDialog : public NewDialog Q_OBJECT TQ_OBJECT public: - NewFileDialog(Project *project, TQWidget *tqparent); + NewFileDialog(Project *project, TQWidget *parent); PURL::Url url() const; bool addToProject() const { return (_project ? _add->isChecked() : false); } diff --git a/src/libgui/object_view.cpp b/src/libgui/object_view.cpp index dd606fc..fa5239d 100644 --- a/src/libgui/object_view.cpp +++ b/src/libgui/object_view.cpp @@ -22,8 +22,8 @@ #include "common/gui/misc_gui.h" //----------------------------------------------------------------------------- -Coff::BaseEditor::BaseEditor(const PURL::Url &source, const Device::Data *data, TQWidget *tqparent) - : SimpleTextEditor(true, tqparent), _source(source), _ok(false), _created(0), _device(data) +Coff::BaseEditor::BaseEditor(const PURL::Url &source, const Device::Data *data, TQWidget *parent) + : SimpleTextEditor(true, parent), _source(source), _ok(false), _created(0), _device(data) { setReadOnly(true); _view->setDynWordWrap(false); @@ -36,12 +36,12 @@ Coff::BaseEditor::~BaseEditor() } //----------------------------------------------------------------------------- -Coff::CoffEditor::CoffEditor(const PURL::Url &source, const Device::Data &data, TQWidget *tqparent) - : BaseEditor(source, &data, tqparent), _provided(0) +Coff::CoffEditor::CoffEditor(const PURL::Url &source, const Device::Data &data, TQWidget *parent) + : BaseEditor(source, &data, parent), _provided(0) {} -Coff::CoffEditor::CoffEditor(const TextObject &object, TQWidget *tqparent) - : BaseEditor(PURL::Url(), object.device(), tqparent), _provided(&object) +Coff::CoffEditor::CoffEditor(const TextObject &object, TQWidget *parent) + : BaseEditor(PURL::Url(), object.device(), parent), _provided(&object) {} bool Coff::CoffEditor::open(const PURL::Url &url) @@ -56,8 +56,8 @@ bool Coff::CoffEditor::open(const PURL::Url &url) } //----------------------------------------------------------------------------- -Coff::ObjectEditor::ObjectEditor(const PURL::Url &source, TQWidget *tqparent) - : BaseEditor(source, 0, tqparent) +Coff::ObjectEditor::ObjectEditor(const PURL::Url &source, TQWidget *parent) + : BaseEditor(source, 0, parent) {} bool Coff::ObjectEditor::open(const PURL::Url &url) @@ -73,8 +73,8 @@ bool Coff::ObjectEditor::open(const PURL::Url &url) } //----------------------------------------------------------------------------- -Coff::LibraryEditor::LibraryEditor(const PURL::Url &source, TQWidget *tqparent) - : BaseEditor(source, 0, tqparent) +Coff::LibraryEditor::LibraryEditor(const PURL::Url &source, TQWidget *parent) + : BaseEditor(source, 0, parent) {} bool Coff::LibraryEditor::open(const PURL::Url &url) @@ -92,16 +92,16 @@ bool Coff::LibraryEditor::open(const PURL::Url &url) } //----------------------------------------------------------------------------- -DisassemblyEditor::DisassemblyEditor(const PURL::Url &source, const Device::Data &data, TQWidget *tqparent) - : SimpleTextEditor(true, tqparent), _source(source), _device(data), _editor(0) +DisassemblyEditor::DisassemblyEditor(const PURL::Url &source, const Device::Data &data, TQWidget *parent) + : SimpleTextEditor(true, parent), _source(source), _device(data), _editor(0) { setReadOnly(true); _view->setDynWordWrap(false); setView(&Main::compileLog()); } -DisassemblyEditor::DisassemblyEditor(const HexEditor &e, const Device::Data &data, TQWidget *tqparent) - : SimpleTextEditor(true, tqparent), _device(data), _editor(&e) +DisassemblyEditor::DisassemblyEditor(const HexEditor &e, const Device::Data &data, TQWidget *parent) + : SimpleTextEditor(true, parent), _device(data), _editor(&e) { setReadOnly(true); _view->setDynWordWrap(false); diff --git a/src/libgui/object_view.h b/src/libgui/object_view.h index 9b7ea65..f65ba59 100644 --- a/src/libgui/object_view.h +++ b/src/libgui/object_view.h @@ -26,7 +26,7 @@ class BaseEditor : public SimpleTextEditor, public Log::Base Q_OBJECT TQ_OBJECT public: - BaseEditor(const PURL::Url &source, const Device::Data *data, TQWidget *tqparent); + BaseEditor(const PURL::Url &source, const Device::Data *data, TQWidget *parent); virtual ~BaseEditor(); virtual PURL::Url url() const { return _url; } @@ -43,8 +43,8 @@ class CoffEditor : public BaseEditor Q_OBJECT TQ_OBJECT public: - CoffEditor(const PURL::Url &source, const Device::Data &data, TQWidget *tqparent); - CoffEditor(const TextObject &object, TQWidget *tqparent); + CoffEditor(const PURL::Url &source, const Device::Data &data, TQWidget *parent); + CoffEditor(const TextObject &object, TQWidget *parent); virtual PURL::FileType fileType() const { return PURL::Coff; } virtual bool open(const PURL::Url &url); @@ -58,7 +58,7 @@ class ObjectEditor : public BaseEditor Q_OBJECT TQ_OBJECT public: - ObjectEditor(const PURL::Url &source, TQWidget *tqparent); + ObjectEditor(const PURL::Url &source, TQWidget *parent); virtual PURL::FileType fileType() const { return PURL::Unknown; } virtual bool open(const PURL::Url &url); @@ -72,7 +72,7 @@ class LibraryEditor : public BaseEditor Q_OBJECT TQ_OBJECT public: - LibraryEditor(const PURL::Url &source, TQWidget *tqparent); + LibraryEditor(const PURL::Url &source, TQWidget *parent); virtual PURL::FileType fileType() const { return PURL::Unknown; } virtual bool open(const PURL::Url &url); @@ -88,8 +88,8 @@ class DisassemblyEditor : public SimpleTextEditor, public Log::Base Q_OBJECT TQ_OBJECT public: - DisassemblyEditor(const PURL::Url &hexUrl, const Device::Data &data, TQWidget *tqparent); - DisassemblyEditor(const HexEditor &e, const Device::Data &data, TQWidget *tqparent); + DisassemblyEditor(const PURL::Url &hexUrl, const Device::Data &data, TQWidget *parent); + DisassemblyEditor(const HexEditor &e, const Device::Data &data, TQWidget *parent); virtual PURL::FileType fileType() const { return PURL::AsmGPAsm; } virtual bool open(const PURL::Url &url); virtual PURL::Url url() const { return _url; } diff --git a/src/libgui/project_editor.cpp b/src/libgui/project_editor.cpp index bfb2d8c..331bb55 100644 --- a/src/libgui/project_editor.cpp +++ b/src/libgui/project_editor.cpp @@ -17,8 +17,8 @@ #include "tools/list/compile_config.h" #include "device_gui.h" -ProjectEditor::ProjectEditor(Project &project, TQWidget *tqparent) - : Dialog(tqparent, "project_options", true, i18n("Project Options"), Ok|Cancel, Ok, false), +ProjectEditor::ProjectEditor(Project &project, TQWidget *parent) + : Dialog(parent, "project_options", true, i18n("Project Options"), Ok|Cancel, Ok, false), _project(project) { TQVBoxLayout *top = new TQVBoxLayout(mainWidget(), 0, 10); diff --git a/src/libgui/project_editor.h b/src/libgui/project_editor.h index 8ae4df6..ce08aca 100644 --- a/src/libgui/project_editor.h +++ b/src/libgui/project_editor.h @@ -32,7 +32,7 @@ class ProjectEditor : public Dialog Q_OBJECT TQ_OBJECT public: - ProjectEditor(Project &project, TQWidget *tqparent); + ProjectEditor(Project &project, TQWidget *parent); private slots: virtual void slotOk(); diff --git a/src/libgui/project_manager.cpp b/src/libgui/project_manager.cpp index 931901e..ce58146 100644 --- a/src/libgui/project_manager.cpp +++ b/src/libgui/project_manager.cpp @@ -35,8 +35,8 @@ #include "device_gui.h" //---------------------------------------------------------------------------- -ProjectManager::View::View(TQWidget *tqparent) - : ListView(tqparent, "project_manager"), _project(0), _modified(false) +ProjectManager::View::View(TQWidget *parent) + : ListView(parent, "project_manager"), _project(0), _modified(false) { connect(TQT_TQOBJECT(this), TQT_SIGNAL(mouseButtonClicked(int, TQListViewItem *, const TQPoint &, int)), TQT_SLOT(clicked(int, TQListViewItem *, const TQPoint &, int))); @@ -403,7 +403,7 @@ void ProjectManager::View::removeFile(const PURL::Url &url) if ( _project && !isExternalFile(url) ) _project->removeFile(url); FileItem *item = findFileItem(url); if ( item==0 ) return; - HeaderItem *group = static_cast<HeaderItem *>(item->tqparent()); + HeaderItem *group = static_cast<HeaderItem *>(item->parent()); delete item; if ( group->childCount()==0 ) delete group; _modified = true; @@ -575,7 +575,7 @@ TQDragObject *ProjectManager::View::dragObject() { if ( currentItem()==0 || currentItem()->rtti()!=FileRtti ) return 0; const FileItem *item = static_cast<const FileItem *>(currentItem()); - const HeaderItem *hitem = static_cast<const HeaderItem *>(item->tqparent()); + const HeaderItem *hitem = static_cast<const HeaderItem *>(item->parent()); if ( hitem->group()!=SourceGroup ) return 0; TQStrList uris; uris.append(TQUriDrag::localFileToUri(item->url().filepath())); @@ -587,7 +587,7 @@ bool ProjectManager::View::acceptDrag(TQDropEvent* e) const if ( e->source()!=viewport() ) return false; const TQListViewItem *item = itemAt(e->pos()); if ( item==0 || item->rtti()!=FileRtti ) return false; - const HeaderItem *hitem = static_cast<const HeaderItem *>(item->tqparent()); + const HeaderItem *hitem = static_cast<const HeaderItem *>(item->parent()); return ( hitem->group()==SourceGroup ); } diff --git a/src/libgui/project_manager.h b/src/libgui/project_manager.h index 8c33579..78655b8 100644 --- a/src/libgui/project_manager.h +++ b/src/libgui/project_manager.h @@ -26,7 +26,7 @@ class View : public ListView Q_OBJECT TQ_OBJECT public: - View(TQWidget *tqparent); + View(TQWidget *parent); virtual ~View(); bool editProject(); diff --git a/src/libgui/project_wizard.cpp b/src/libgui/project_wizard.cpp index 72ecefc..78fcd49 100644 --- a/src/libgui/project_wizard.cpp +++ b/src/libgui/project_wizard.cpp @@ -68,8 +68,8 @@ const TQPixmap *FileListItem::pixmap(int column) const } //----------------------------------------------------------------------------- -FileListBox::FileListBox(TQWidget *tqparent) - : EditListBox(2, 0, 0, tqparent, "file_list_box") +FileListBox::FileListBox(TQWidget *parent) + : EditListBox(2, 0, 0, parent, "file_list_box") { _listView->header()->show(); _listView->header()->setClickEnabled(false); @@ -109,8 +109,8 @@ void FileListBox::setToolGroup(const Tool::Group &group) } //----------------------------------------------------------------------------- -ProjectWizard::ProjectWizard(TQWidget *tqparent) - : KWizard(tqparent, "project_wizard"), _project(0) +ProjectWizard::ProjectWizard(TQWidget *parent) + : KWizard(parent, "project_wizard"), _project(0) { // first page _first = new TQWidget(this); diff --git a/src/libgui/project_wizard.h b/src/libgui/project_wizard.h index 4a47e3c..e12ed00 100644 --- a/src/libgui/project_wizard.h +++ b/src/libgui/project_wizard.h @@ -45,7 +45,7 @@ class FileListBox : public EditListBox Q_OBJECT TQ_OBJECT public: - FileListBox(TQWidget *tqparent); + FileListBox(TQWidget *parent); void setDirectory(const PURL::Directory &directory) { _directory = directory; } void setToolGroup(const Tool::Group &group); @@ -66,7 +66,7 @@ class ProjectWizard : public KWizard Q_OBJECT TQ_OBJECT public: - ProjectWizard(TQWidget *tqparent); + ProjectWizard(TQWidget *parent); PURL::Url url() const; Project *project() const { return _project; } diff --git a/src/libgui/register_view.cpp b/src/libgui/register_view.cpp index fe4b4d6..4f2aaff 100644 --- a/src/libgui/register_view.cpp +++ b/src/libgui/register_view.cpp @@ -23,8 +23,8 @@ #include "gui_debug_manager.h" //----------------------------------------------------------------------------- -Register::MainView::MainView(const TQString &title, const TQString &tag, TQWidget *tqparent) - : DeviceEditor(title, tag, tqparent, "register_view"), _debugging(false) +Register::MainView::MainView(const TQString &title, const TQString &tag, TQWidget *parent) + : DeviceEditor(title, tag, parent, "register_view"), _debugging(false) {} void Register::MainView::setDevice(bool force) @@ -34,13 +34,13 @@ void Register::MainView::setDevice(bool force) DeviceEditor::setDevice(force || oldDebugging!=_debugging); } -TQWidget *Register::MainView::createView(const Device::Data *data, TQWidget *tqparent) +TQWidget *Register::MainView::createView(const Device::Data *data, TQWidget *parent) { - if ( data==0 ) return new TQWidget(tqparent); - Register::View *view = Device::groupui(*data).createRegisterView(tqparent); + if ( data==0 ) return new TQWidget(parent); + Register::View *view = Device::groupui(*data).createRegisterView(parent); if (view) view->updateView(); else { - TQWidget *w = new TQWidget(tqparent); + TQWidget *w = new TQWidget(parent); TQVBoxLayout *vbox = new TQVBoxLayout(w, 10, 10); TQLabel *label = new TQLabel(i18n("The selected device has no register."), w); vbox->addWidget(label); diff --git a/src/libgui/register_view.h b/src/libgui/register_view.h index 98868e4..18d9f1b 100644 --- a/src/libgui/register_view.h +++ b/src/libgui/register_view.h @@ -22,7 +22,7 @@ class MainView : public DeviceEditor Q_OBJECT TQ_OBJECT public: - MainView(const TQString &title, const TQString &tag, TQWidget *tqparent = 0); + MainView(const TQString &title, const TQString &tag, TQWidget *parent = 0); virtual bool isModified() const { return false; } virtual bool isReadOnly() const { return true; } virtual void addGui() {} @@ -33,7 +33,7 @@ public: private: bool _debugging; - virtual TQWidget *createView(const Device::Data *, TQWidget *tqparent); + virtual TQWidget *createView(const Device::Data *, TQWidget *parent); virtual void setModifiedInternal(bool) {} virtual void setReadOnlyInternal(bool) {} }; diff --git a/src/libgui/text_editor.cpp b/src/libgui/text_editor.cpp index eb9d16f..e7f0382 100644 --- a/src/libgui/text_editor.cpp +++ b/src/libgui/text_editor.cpp @@ -42,8 +42,8 @@ TQPixmap TextEditor::pixmap(Breakpoint::MarkType type) return SmallIcon(MARK_TYPE_DATA[type].pixmap); } -TextEditor::TextEditor(bool withDebugger, TQWidget *tqparent, const char *name) - : Editor(tqparent, name), _view(0) +TextEditor::TextEditor(bool withDebugger, TQWidget *parent, const char *name) + : Editor(parent, name), _view(0) { KLibFactory *factory = KLibLoader::self()->factory("libkatepart"); if ( factory==0 ) qFatal("Could not find katepart"); @@ -321,12 +321,12 @@ void TextEditor::populateList() #endif //----------------------------------------------------------------------------- -SimpleTextEditor::SimpleTextEditor(bool withDebugger, PURL::FileType type, TQWidget *tqparent, const char *name) - : TextEditor(withDebugger, tqparent, name), _type(type), _file(_sview) +SimpleTextEditor::SimpleTextEditor(bool withDebugger, PURL::FileType type, TQWidget *parent, const char *name) + : TextEditor(withDebugger, parent, name), _type(type), _file(_sview) {} -SimpleTextEditor::SimpleTextEditor(bool withDebugger, TQWidget *tqparent, const char *name) - : TextEditor(withDebugger, tqparent, name), _type(PURL::Nb_FileTypes), _file(_sview) +SimpleTextEditor::SimpleTextEditor(bool withDebugger, TQWidget *parent, const char *name) + : TextEditor(withDebugger, parent, name), _type(PURL::Nb_FileTypes), _file(_sview) {} bool SimpleTextEditor::open(const PURL::Url &url) diff --git a/src/libgui/text_editor.h b/src/libgui/text_editor.h index 5b76734..d5c90c5 100644 --- a/src/libgui/text_editor.h +++ b/src/libgui/text_editor.h @@ -27,7 +27,7 @@ class TextEditor : public Editor Q_OBJECT TQ_OBJECT public: - TextEditor(bool withDebugger, TQWidget *tqparent, const char *name = 0); + TextEditor(bool withDebugger, TQWidget *parent, const char *name = 0); virtual PURL::FileType fileType() const { return url().fileType(); } virtual PURL::Url url() const { return _document->url(); } virtual bool isModified() const; @@ -86,8 +86,8 @@ class SimpleTextEditor : public TextEditor Q_OBJECT TQ_OBJECT public: - SimpleTextEditor(bool withDebugger, PURL::FileType type, TQWidget *tqparent, const char *name = 0); - SimpleTextEditor(bool withDebugger, TQWidget *tqparent, const char *name = 0); + SimpleTextEditor(bool withDebugger, PURL::FileType type, TQWidget *parent, const char *name = 0); + SimpleTextEditor(bool withDebugger, TQWidget *parent, const char *name = 0); void setFileType(PURL::FileType type) { _type = type; } virtual PURL::FileType fileType() const { return _type; } bool setText(const TQString &text); diff --git a/src/libgui/toplevel.cpp b/src/libgui/toplevel.cpp index fa70706..f087a4a 100644 --- a/src/libgui/toplevel.cpp +++ b/src/libgui/toplevel.cpp @@ -688,7 +688,7 @@ void MainWindow::updateToolViewsActions() void MainWindow::initDockPosition(const DockData &ddata) { const DockPosition &pos = ddata.position; - ddata.dock->manualDock(manager()->getDockWidgetFromName(pos.tqparent), pos.pos, pos.space); + ddata.dock->manualDock(manager()->getDockWidgetFromName(pos.parent), pos.pos, pos.space); } void MainWindow::resetDockLayout() diff --git a/src/libgui/toplevel.h b/src/libgui/toplevel.h index ea36c93..f7ef383 100644 --- a/src/libgui/toplevel.h +++ b/src/libgui/toplevel.h @@ -104,9 +104,9 @@ private: class DockPosition { public: DockPosition() {} - DockPosition(const TQString &ptqparent) : tqparent(ptqparent), pos(KDockWidget::DockCenter), space(0) {} - DockPosition(KDockWidget::DockPosition ppos, uint pspace) : tqparent("main_dock_widget"), pos(ppos), space(pspace) {} - TQString tqparent; + DockPosition(const TQString &pparent) : parent(pparent), pos(KDockWidget::DockCenter), space(0) {} + DockPosition(KDockWidget::DockPosition ppos, uint pspace) : parent("main_dock_widget"), pos(ppos), space(pspace) {} + TQString parent; KDockWidget::DockPosition pos; uint space; }; diff --git a/src/libgui/toplevel_ui.cpp b/src/libgui/toplevel_ui.cpp index 2bb50ee..51abeab 100644 --- a/src/libgui/toplevel_ui.cpp +++ b/src/libgui/toplevel_ui.cpp @@ -15,8 +15,8 @@ #include "tools/list/tool_list.h" //---------------------------------------------------------------------------- -ProgrammerStatusWidget::ProgrammerStatusWidget(TQWidget *tqparent) - : TQObject(tqparent), KeyPopupButton<TQString>(tqparent) +ProgrammerStatusWidget::ProgrammerStatusWidget(TQWidget *parent) + : TQObject(parent), KeyPopupButton<TQString>(parent) { connect(widget(), TQT_SIGNAL(activated(int)), TQT_SLOT(activatedSlot(int))); widget()->appendAction(i18n("Configure..."), "configure", this, TQT_SIGNAL(configure())); @@ -32,8 +32,8 @@ void ProgrammerStatusWidget::activatedSlot(int id) } //---------------------------------------------------------------------------- -ToolStatusWidget::ToolStatusWidget(TQWidget *tqparent) - : TQObject(tqparent), KeyPopupButton<TQString>(tqparent) +ToolStatusWidget::ToolStatusWidget(TQWidget *parent) + : TQObject(parent), KeyPopupButton<TQString>(parent) { connect(widget(), TQT_SIGNAL(activated(int)), TQT_SLOT(activatedSlot(int))); widget()->appendAction(i18n("Configure Toolchain..."), "configure", this, TQT_SIGNAL(configureToolchain())); @@ -61,8 +61,8 @@ void ViewMenuAction::slotActivated() } //---------------------------------------------------------------------------- -MenuBarButton::MenuBarButton(const TQString &icon, TQWidget *tqparent) - : TQToolButton(tqparent, "menu_bar_button") +MenuBarButton::MenuBarButton(const TQString &icon, TQWidget *parent) + : TQToolButton(parent, "menu_bar_button") { TQFontMetrics fm(font()); int h = fm.height() + 2*tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth, this); diff --git a/src/libgui/toplevel_ui.h b/src/libgui/toplevel_ui.h index b4e99b8..651809c 100644 --- a/src/libgui/toplevel_ui.h +++ b/src/libgui/toplevel_ui.h @@ -23,7 +23,7 @@ class ProgrammerStatusWidget : public TQObject, public KeyPopupButton<TQString> Q_OBJECT TQ_OBJECT public: - ProgrammerStatusWidget(TQWidget *tqparent); + ProgrammerStatusWidget(TQWidget *parent); signals: void configure(); @@ -39,7 +39,7 @@ class ToolStatusWidget : public TQObject, public KeyPopupButton<TQString> Q_OBJECT TQ_OBJECT public: - ToolStatusWidget(TQWidget *tqparent); + ToolStatusWidget(TQWidget *parent); signals: void configureToolchain(); @@ -74,7 +74,7 @@ class MenuBarButton : public TQToolButton Q_OBJECT TQ_OBJECT public: - MenuBarButton(const TQString &icon, TQWidget *tqparent); + MenuBarButton(const TQString &icon, TQWidget *parent); virtual TQSize tqsizeHint() const; }; diff --git a/src/libgui/watch_view.cpp b/src/libgui/watch_view.cpp index 4f5ef89..789b64a 100644 --- a/src/libgui/watch_view.cpp +++ b/src/libgui/watch_view.cpp @@ -21,8 +21,8 @@ #include "common/gui/list_container.h" //----------------------------------------------------------------------------- -Register::BaseListView::BaseListView(TQWidget *tqparent) - : ListView(tqparent), _root(0) +Register::BaseListView::BaseListView(TQWidget *parent) + : ListView(parent), _root(0) { header()->hide(); setSorting(-1); @@ -36,8 +36,8 @@ Register::BaseListView::BaseListView(TQWidget *tqparent) } //----------------------------------------------------------------------------- -Register::RegisterListView::RegisterListView(TQWidget *tqparent) - : BaseListView(tqparent) +Register::RegisterListView::RegisterListView(TQWidget *parent) + : BaseListView(parent) { addColumn(TQString()); } @@ -76,8 +76,8 @@ void Register::RegisterListView::itemClicked(int button, TQListViewItem *item, c } //----------------------------------------------------------------------------- -Register::WatchedListView::WatchedListView(TQWidget *tqparent) - : BaseListView(tqparent), _popup(0), _base(NumberBase::Hex) +Register::WatchedListView::WatchedListView(TQWidget *parent) + : BaseListView(parent), _popup(0), _base(NumberBase::Hex) { setSorting(0); addColumn(TQString()); @@ -91,14 +91,14 @@ Register::WatchedListView::WatchedListView(TQWidget *tqparent) _root->setOpen(true); } -KPopupMenu *Register::WatchedListView::appendFormatMenu(KPopupMenu *tqparent, uint offset) +KPopupMenu *Register::WatchedListView::appendFormatMenu(KPopupMenu *parent, uint offset) { KIconLoader loader; TQPixmap icon = loader.loadIcon("fonts", KIcon::Small); KPopupMenu *popup = new KPopupMenu; popup->insertTitle(i18n("Format")); FOR_EACH(NumberBase, base) popup->insertItem(base.label(), offset + base.type()); - tqparent->insertItem(icon, i18n("Format"), popup); + parent->insertItem(icon, i18n("Format"), popup); return popup; } @@ -196,8 +196,8 @@ void Register::WatchedListView::contextMenu(TQListViewItem *item, const TQPoint } //----------------------------------------------------------------------------- -Register::WatchView::WatchView(TQWidget *tqparent) - : TQWidget(tqparent, "watch_view"), GenericView(Register::list()), _data(0) +Register::WatchView::WatchView(TQWidget *parent) + : TQWidget(parent, "watch_view"), GenericView(Register::list()), _data(0) { TQVBoxLayout *top = new TQVBoxLayout(this); TQValueList<int> sizes; diff --git a/src/libgui/watch_view.h b/src/libgui/watch_view.h index f5090d1..0a09426 100644 --- a/src/libgui/watch_view.h +++ b/src/libgui/watch_view.h @@ -24,7 +24,7 @@ class BaseListView : public ListView Q_OBJECT TQ_OBJECT public: - BaseListView(TQWidget *tqparent); + BaseListView(TQWidget *parent); virtual void init(const Device::Data *data) = 0; virtual void updateView() = 0; @@ -43,7 +43,7 @@ class RegisterListView : public BaseListView Q_OBJECT TQ_OBJECT public: - RegisterListView(TQWidget *tqparent); + RegisterListView(TQWidget *parent); virtual void init(const Device::Data *data); virtual void updateView(); @@ -58,7 +58,7 @@ class WatchedListView : public BaseListView Q_OBJECT TQ_OBJECT public: - WatchedListView(TQWidget *tqparent); + WatchedListView(TQWidget *parent); virtual TQString tooltip(const TQListViewItem &item, int col) const; virtual void init(const Device::Data *data); virtual void updateView(); @@ -72,7 +72,7 @@ private: KPopupMenu *_formatPopup; NumberBase _base; - static KPopupMenu *appendFormatMenu(KPopupMenu *tqparent, uint offset); + static KPopupMenu *appendFormatMenu(KPopupMenu *parent, uint offset); }; //----------------------------------------------------------------------------- @@ -81,7 +81,7 @@ class WatchView : public TQWidget, public GenericView Q_OBJECT TQ_OBJECT public: - WatchView(TQWidget *tqparent); + WatchView(TQWidget *parent); void init(bool force); public slots: diff --git a/src/piklab-prog/cli_interactive.cpp b/src/piklab-prog/cli_interactive.cpp index c015d04..ae485a1 100644 --- a/src/piklab-prog/cli_interactive.cpp +++ b/src/piklab-prog/cli_interactive.cpp @@ -74,8 +74,8 @@ void CLI::Interactive::signalHandler(int n) _interactive->redisplayPrompt(); } -CLI::Interactive::Interactive(TQObject *tqparent) - : TQObject(tqparent, "interactive") +CLI::Interactive::Interactive(TQObject *parent) + : TQObject(parent, "interactive") { setView(_view); ::signal(SIGINT, signalHandler); diff --git a/src/piklab-prog/cli_interactive.h b/src/piklab-prog/cli_interactive.h index 8509fc0..6028ec2 100644 --- a/src/piklab-prog/cli_interactive.h +++ b/src/piklab-prog/cli_interactive.h @@ -29,7 +29,7 @@ class Interactive : public TQObject, public Log::Base Q_OBJECT TQ_OBJECT public: - Interactive(TQObject *tqparent); + Interactive(TQObject *parent); void redisplayPrompt(); private slots: diff --git a/src/piklab-prog/cli_prog_manager.h b/src/piklab-prog/cli_prog_manager.h index b5b37f2..5881800 100644 --- a/src/piklab-prog/cli_prog_manager.h +++ b/src/piklab-prog/cli_prog_manager.h @@ -20,7 +20,7 @@ class CliManager : public Manager Q_OBJECT TQ_OBJECT public: - CliManager(TQObject *tqparent) : Manager(tqparent), _state(Idle) {} + CliManager(TQObject *parent) : Manager(parent), _state(Idle) {} Port::Description portDescription() const; virtual void createProgrammer(const Device::Data *data); diff --git a/src/piklab-test/base/generator_check.cpp b/src/piklab-test/base/generator_check.cpp index f7ce96f..1df1a9c 100644 --- a/src/piklab-test/base/generator_check.cpp +++ b/src/piklab-test/base/generator_check.cpp @@ -130,10 +130,10 @@ bool ConfigGeneratorCheck::execute(const Device::Data &data) for (uint i=0; i<config._words.count(); i++) { const Pic::Config::Word &cword = config._words[i]; for (uint k=0; k<cword.masks.count(); k++) { - const Pic::Config::Mask &ctqmask = cword.masks[k]; - if ( l<ctqmask.values.count() ) { + const Pic::Config::Mask &cmask = cword.masks[k]; + if ( l<cmask.values.count() ) { ok = true; - if ( !ctqmask.values[l].name.isEmpty() ) _memory2->setConfigValue(ctqmask.name, ctqmask.values[l].name); + if ( !cmask.values[l].name.isEmpty() ) _memory2->setConfigValue(cmask.name, cmask.values[l].name); } } } @@ -158,22 +158,22 @@ bool ConfigGeneratorCheck::execute(const Device::Data &data) BitValue word2 = _memory2->word(Pic::MemoryRangeType::Config, i); if ( word1==word2 ) continue; for (uint k=0; k<cword.masks.count(); k++) { - const Pic::Config::Mask &ctqmask = cword.masks[k]; - if ( ctqmask.value.isInside(cword.ptqmask) ) continue; - BitValue value1 = word1.maskWith(ctqmask.value); - BitValue value2 = word2.maskWith(ctqmask.value); + const Pic::Config::Mask &cmask = cword.masks[k]; + if ( cmask.value.isInside(cword.pmask) ) continue; + BitValue value1 = word1.maskWith(cmask.value); + BitValue value2 = word2.maskWith(cmask.value); if ( value1==value2 ) continue; TQString name1, name2; uint l1, l2; - for (uint l=0; l<ctqmask.values.count(); l++) { - const Pic::Config::Value &value = ctqmask.values[l]; + for (uint l=0; l<cmask.values.count(); l++) { + const Pic::Config::Value &value = cmask.values[l]; if ( value.value==value1 ) { name1 = value.name; l1 = l; } if ( value.value==value2 ) { name2 = value.name; l2 = l; } } if ( name1==name2 ) continue; TEST_FAILED_RETURN(TQString("Config bits are different in %1: set\"%2\"=(%3) != compiled=%4)") - .tqarg(ctqmask.name).tqarg(ctqmask.values[l2].name) - .tqarg(toHexLabel(word2.maskWith(ctqmask.value), nbChars)).tqarg(toHexLabel(word1.maskWith(ctqmask.value), nbChars))) + .tqarg(cmask.name).tqarg(cmask.values[l2].name) + .tqarg(toHexLabel(word2.maskWith(cmask.value), nbChars)).tqarg(toHexLabel(word1.maskWith(cmask.value), nbChars))) } } } diff --git a/src/piklab-test/checksum/checksum_check.cpp b/src/piklab-test/checksum/checksum_check.cpp index 031688b..47873ab 100644 --- a/src/piklab-test/checksum/checksum_check.cpp +++ b/src/piklab-test/checksum/checksum_check.cpp @@ -36,11 +36,11 @@ void ChecksumCheck::setProtection(const Pic::Data &data, const Pic::Checksum::Da if ( !valueName.isEmpty() ) _memory->setUserIdToUnprotectedChecksum(); for (uint i=0; i<cdata.protectedMaskNames.count(); i++) { TQString pmName = cdata.protectedMaskNames[i]; - const Pic::Config::Mask *tqmask = data.config().findMask(pmName, 0); - for (int k=tqmask->values.count()-1; k>=0; k--) { - if ( tqmask->values[k].name.isEmpty() ) continue; - if ( protection.isNoneProtectedValueName(tqmask->values[k].name) ) continue; - _memory->setConfigValue(pmName, tqmask->values[k].name); + const Pic::Config::Mask *mask = data.config().findMask(pmName, 0); + for (int k=mask->values.count()-1; k>=0; k--) { + if ( mask->values[k].name.isEmpty() ) continue; + if ( protection.isNoneProtectedValueName(mask->values[k].name) ) continue; + _memory->setConfigValue(pmName, mask->values[k].name); break; } } @@ -57,8 +57,8 @@ bool ChecksumCheck::checkChecksum(BitValue checksum, const TQString &label) void ChecksumCheck::checkChecksum(const Pic::Data &pdata, const TQString &maskName, const TQString &valueName, bool &ok) { if ( !pdata.checksums().contains(valueName) ) { - const Pic::Config::Mask *tqmask = pdata.config().findMask(maskName); - TQString label = valueName + (tqmask ? "/" + tqmask->name : TQString()); + const Pic::Config::Mask *mask = pdata.config().findMask(maskName); + TQString label = valueName + (mask ? "/" + mask->name : TQString()); printf("Missing checksum for \"%s\"", label.latin1()); return; } @@ -84,10 +84,10 @@ bool ChecksumCheck::execute(const Device::Data &data) break; case Pic::Protection::BasicProtection: { TQString maskName = protection.maskName(Pic::Protection::ProgramProtected, Pic::MemoryRangeType::Code); - const Pic::Config::Mask *tqmask = pdata.config().findMask(maskName); - Q_ASSERT(tqmask); - for (uint i=0; i<tqmask->values.count(); i++) { - TQString valueName = tqmask->values[i].name; + const Pic::Config::Mask *mask = pdata.config().findMask(maskName); + Q_ASSERT(mask); + for (uint i=0; i<mask->values.count(); i++) { + TQString valueName = mask->values[i].name; if ( valueName.isEmpty() ) continue; // invalid value checkChecksum(pdata, maskName, valueName, ok); } diff --git a/src/progs/base/prog_config.cpp b/src/progs/base/prog_config.cpp index 9802fba..b9d88b6 100644 --- a/src/progs/base/prog_config.cpp +++ b/src/progs/base/prog_config.cpp @@ -66,7 +66,7 @@ void Programmer::GroupConfig::writeFirmwareDirectory(const Group &group, const T //---------------------------------------------------------------------------- const Programmer::Config::Data Programmer::Config::DATA[Nb_Types] = { - { "only_program_non_tqmask", I18N_NOOP("Only program what is needed (faster)."), TQVariant(true, 0) }, + { "only_program_non_mask", I18N_NOOP("Only program what is needed (faster)."), TQVariant(true, 0) }, { "verify_after_program", I18N_NOOP("Verify device memory after programming."), TQVariant(true, 0) }, { "only_verify_programmed", I18N_NOOP("Only verify programmed words in code memory (faster)."), TQVariant(true, 0) }, { "power_down_after_programming", I18N_NOOP("Power down target after programming."), TQVariant(true, 0) }, diff --git a/src/progs/direct/base/direct.cpp b/src/progs/direct/base/direct.cpp index c0d7de6..7603ca3 100644 --- a/src/progs/direct/base/direct.cpp +++ b/src/progs/direct/base/direct.cpp @@ -375,7 +375,7 @@ int Direct::Hardware::timing_test() for (long j=0; j<loop; ++j) { int d = 0x2AAA ; - d &= 0x3FFF ; // tqmask unused msb + d &= 0x3FFF ; // mask unused msb d <<= 1; // insert start bit for (uint x = 0; x<16; x++) { diff --git a/src/progs/direct/base/direct_16.cpp b/src/progs/direct/base/direct_16.cpp index 330c037..ef17479 100644 --- a/src/progs/direct/base/direct_16.cpp +++ b/src/progs/direct/base/direct_16.cpp @@ -87,10 +87,10 @@ bool Direct::pic16::doRead(Pic::MemoryRangeType type, Device::Array &data, const const Device::Array wdata = static_cast<const Pic::Memory &>(vdata->memory).arrayForWriting(type); if (only) nbWords = findNonMaskEnd(type, wdata)+1; } - BitValue tqmask = device().tqmask(type); + BitValue mask = device().mask(type); for (uint i = 0; i<nbWords; i++) { - if ( !only || data[i]!=tqmask || type!=Pic::MemoryRangeType::Code ) { - data[i] = readWord(type).maskWith(tqmask); + if ( !only || data[i]!=mask || type!=Pic::MemoryRangeType::Code ) { + data[i] = readWord(type).maskWith(mask); if ( vdata && !hardware().verifyWord(i, data[i], type, *vdata) ) return false; } incrementPC(1); @@ -117,7 +117,7 @@ bool Direct::pic16::skipMaskWords(Pic::MemoryRangeType type, const Device::Array if (force) return false; uint nb = (type==Pic::MemoryRangeType::Code ? nbWordsCodeProg() : 1); for (uint k=0; k<nb; k++) - if ( data[i+k]!=device().tqmask(type) ) return false; + if ( data[i+k]!=device().mask(type) ) return false; incrementPC(nb); i += nb; return true; diff --git a/src/progs/direct/base/direct_18F.cpp b/src/progs/direct/base/direct_18F.cpp index 5760bf8..0ad5533 100644 --- a/src/progs/direct/base/direct_18F.cpp +++ b/src/progs/direct/base/direct_18F.cpp @@ -17,7 +17,7 @@ bool Direct::P18F::skipMaskWords(Pic::MemoryRangeType type, const Device::Array { if (forceProgram) return false; for (uint k=0; k<nb; k++) - if ( data[i+k]!=device().tqmask(type) ) return false; + if ( data[i+k]!=device().mask(type) ) return false; i += nb; return true; } @@ -82,7 +82,7 @@ bool Direct::P18F::doRead(Pic::MemoryRangeType type, Device::Array &data, const nbWords = findNonMaskEnd(type, wdata)+1; } } - BitValue tqmask = device().tqmask(type); + BitValue mask = device().mask(type); //qDebug("read %s %i", Pic::MEMORY_RANGE_TYPE_DATA[type].label, device().nbWords(type)); //pulseEngine("w300000"); // what for ? directAccess(type); @@ -91,7 +91,7 @@ bool Direct::P18F::doRead(Pic::MemoryRangeType type, Device::Array &data, const for (uint i = 0; i<data.count(); i++) { setPointer(type, i); pulseEngine("k0,X80A6,k0,X50A8,k0,X6EF5,k0,X0000"); - data[i] = pulseEngine("r").maskWith(tqmask); + data[i] = pulseEngine("r").maskWith(mask); if ( vdata && !hardware().verifyWord(offset+i, data[i], type, *vdata) ) return false; } _base.progressMonitor().addTaskProgress(data.count()); @@ -100,7 +100,7 @@ bool Direct::P18F::doRead(Pic::MemoryRangeType type, Device::Array &data, const setPointer(type, offset); //pulseEngine("w1000"); ?? for (uint i=0; i<nbWords; i++) { - data[i] = pulseEngine("R").maskWith(tqmask); + data[i] = pulseEngine("R").maskWith(mask); if ( vdata && !hardware().verifyWord(offset+i, data[i], type, *vdata) ) return false; } _base.progressMonitor().addTaskProgress(data.count()); @@ -111,7 +111,7 @@ bool Direct::P18F::doRead(Pic::MemoryRangeType type, Device::Array &data, const setPointer(type, 0); for (uint i = 0; i<data.count(); i+=2) { BitValue w = pulseEngine("R"); - data[i] = w.maskWith(tqmask); + data[i] = w.maskWith(mask); if ( vdata && !hardware().verifyWord(offset+i, data[i], type, *vdata) ) return false; data[i+1] = w >> 8; if ( vdata && !hardware().verifyWord(offset+i+1, data[i+1], type, *vdata) ) return false; diff --git a/src/progs/direct/gui/direct_config_widget.cpp b/src/progs/direct/gui/direct_config_widget.cpp index fc7b867..36a8f11 100644 --- a/src/progs/direct/gui/direct_config_widget.cpp +++ b/src/progs/direct/gui/direct_config_widget.cpp @@ -18,17 +18,17 @@ #include "progs/direct/base/direct_prog.h" //----------------------------------------------------------------------------- -::Programmer::ConfigWidget *Direct::GroupUI::createConfigWidget(TQWidget *tqparent) const +::Programmer::ConfigWidget *Direct::GroupUI::createConfigWidget(TQWidget *parent) const { - return new ConfigWidget(static_cast<const ::Programmer::Group &>(group()), tqparent); + return new ConfigWidget(static_cast<const ::Programmer::Group &>(group()), parent); } //----------------------------------------------------------------------------- const char * const INV_PIN_LABEL = I18N_NOOP("Check this option if your hardware uses negative logic for this pin."); const char * const DELAY_LABEL = I18N_NOOP("Some programming cards need low clock rate:\nadding delay to clock pulses might help."); -Direct::HConfigWidget::HConfigWidget(::Programmer::Base &base, TQWidget *tqparent, bool edit) - : ::Hardware::HConfigWidget(base, tqparent, edit) +Direct::HConfigWidget::HConfigWidget(::Programmer::Base &base, TQWidget *parent, bool edit) + : ::Hardware::HConfigWidget(base, parent, edit) { // pins assignment TQGroupBox *groupb = new TQGroupBox(1,Qt::Horizontal, i18n("Pin assignment"), this); @@ -239,11 +239,11 @@ Hardware::Data *Direct::HConfigWidget::data() const } //----------------------------------------------------------------------------- -Direct::ConfigWidget::ConfigWidget(const ::Programmer::Group &group, TQWidget *tqparent) - : ::Hardware::ConfigWidget(new ::Direct::PicBase(group, 0), new Config, tqparent) +Direct::ConfigWidget::ConfigWidget(const ::Programmer::Group &group, TQWidget *parent) + : ::Hardware::ConfigWidget(new ::Direct::PicBase(group, 0), new Config, parent) {} -Hardware::HConfigWidget *Direct::ConfigWidget::createHardwareConfigWidget(TQWidget *tqparent, bool edit) const +Hardware::HConfigWidget *Direct::ConfigWidget::createHardwareConfigWidget(TQWidget *parent, bool edit) const { - return new HConfigWidget(*_base, tqparent, edit); + return new HConfigWidget(*_base, parent, edit); } diff --git a/src/progs/direct/gui/direct_config_widget.h b/src/progs/direct/gui/direct_config_widget.h index 093e9fa..d61be1a 100644 --- a/src/progs/direct/gui/direct_config_widget.h +++ b/src/progs/direct/gui/direct_config_widget.h @@ -22,7 +22,7 @@ namespace Direct class GroupUI : public ::Programmer::GroupUI { public: - virtual ::Programmer::ConfigWidget *createConfigWidget(TQWidget *tqparent) const; + virtual ::Programmer::ConfigWidget *createConfigWidget(TQWidget *parent) const; virtual bool hasAdvancedDialog() const { return false; } virtual ::Programmer::AdvancedDialog *createAdvancedDialog(::Programmer::Base &, TQWidget *) const { return 0; } }; @@ -33,7 +33,7 @@ class HConfigWidget : public ::Hardware::HConfigWidget Q_OBJECT TQ_OBJECT public: - HConfigWidget(::Programmer::Base &base, TQWidget *tqparent, bool edit); + HConfigWidget(::Programmer::Base &base, TQWidget *parent, bool edit); virtual bool set(const Port::Description &pd, const ::Hardware::Data &data); virtual ::Hardware::Data *data() const; @@ -67,8 +67,8 @@ class ConfigWidget : public ::Hardware::ConfigWidget Q_OBJECT TQ_OBJECT public: - ConfigWidget(const ::Programmer::Group &group, TQWidget *tqparent); - virtual ::Hardware::HConfigWidget *createHardwareConfigWidget(TQWidget *tqparent, bool edit) const; + ConfigWidget(const ::Programmer::Group &group, TQWidget *parent); + virtual ::Hardware::HConfigWidget *createHardwareConfigWidget(TQWidget *parent, bool edit) const; }; } // namespace diff --git a/src/progs/gpsim/gui/gpsim_group_ui.cpp b/src/progs/gpsim/gui/gpsim_group_ui.cpp index f3375cc..74e6edf 100644 --- a/src/progs/gpsim/gui/gpsim_group_ui.cpp +++ b/src/progs/gpsim/gui/gpsim_group_ui.cpp @@ -14,8 +14,8 @@ #include "progs/gpsim/base/gpsim.h" //---------------------------------------------------------------------------- -GPSim::ConfigWidget::ConfigWidget(const ::Programmer::Group &group, TQWidget *tqparent) - : ::Programmer::ConfigWidget(group, tqparent) +GPSim::ConfigWidget::ConfigWidget(const ::Programmer::Group &group, TQWidget *parent) + : ::Programmer::ConfigWidget(group, parent) { uint row = numRows(); TQLabel *label = new TQLabel(i18n("tqStatus:"), this); @@ -36,7 +36,7 @@ void GPSim::ConfigWidget::updatetqStatus() } //---------------------------------------------------------------------------- -::Programmer::ConfigWidget *GPSim::GroupUI::createConfigWidget(TQWidget *tqparent) const +::Programmer::ConfigWidget *GPSim::GroupUI::createConfigWidget(TQWidget *parent) const { - return new ConfigWidget(static_cast<const ::Programmer::Group &>(group()), tqparent); + return new ConfigWidget(static_cast<const ::Programmer::Group &>(group()), parent); } diff --git a/src/progs/gpsim/gui/gpsim_group_ui.h b/src/progs/gpsim/gui/gpsim_group_ui.h index 7916a1d..1978574 100644 --- a/src/progs/gpsim/gui/gpsim_group_ui.h +++ b/src/progs/gpsim/gui/gpsim_group_ui.h @@ -20,7 +20,7 @@ class ConfigWidget : public ::Programmer::ConfigWidget Q_OBJECT TQ_OBJECT public: - ConfigWidget(const ::Programmer::Group &group, TQWidget *tqparent); + ConfigWidget(const ::Programmer::Group &group, TQWidget *parent); private slots: void updatetqStatus(); @@ -33,7 +33,7 @@ private: class GroupUI : public ::Programmer::GroupUI { public: - virtual ::Programmer::ConfigWidget *createConfigWidget(TQWidget *tqparent) const; + virtual ::Programmer::ConfigWidget *createConfigWidget(TQWidget *parent) const; virtual bool hasAdvancedDialog() const { return false; } virtual ::Programmer::AdvancedDialog *createAdvancedDialog(::Programmer::Base &, TQWidget *) const { return 0; } }; diff --git a/src/progs/gui/hardware_config_widget.cpp b/src/progs/gui/hardware_config_widget.cpp index 999a188..193fdfb 100644 --- a/src/progs/gui/hardware_config_widget.cpp +++ b/src/progs/gui/hardware_config_widget.cpp @@ -17,8 +17,8 @@ #include "common/gui/misc_gui.h" //----------------------------------------------------------------------------- -Hardware::HConfigWidget::HConfigWidget(::Programmer::Base &base, TQWidget *tqparent, bool edit) - : TQFrame(tqparent, "hardware_config_widget"), _edit(edit), _connected(false), _base(base) +Hardware::HConfigWidget::HConfigWidget(::Programmer::Base &base, TQWidget *parent, bool edit) + : TQFrame(parent, "hardware_config_widget"), _edit(edit), _connected(false), _base(base) { _hardware = 0; @@ -94,8 +94,8 @@ void Hardware::EditDialog::slotCancel() } //----------------------------------------------------------------------------- -Hardware::ConfigWidget::ConfigWidget(::Programmer::Base *base, Config *config, TQWidget *tqparent) - : ::Programmer::ConfigWidget(base->group(), tqparent), _base(base), _config(config), _hc(0) +Hardware::ConfigWidget::ConfigWidget(::Programmer::Base *base, Config *config, TQWidget *parent) + : ::Programmer::ConfigWidget(base->group(), parent), _base(base), _config(config), _hc(0) { // programmer combo uint row = numRows(); diff --git a/src/progs/gui/hardware_config_widget.h b/src/progs/gui/hardware_config_widget.h index 2f94e81..d6a943f 100644 --- a/src/progs/gui/hardware_config_widget.h +++ b/src/progs/gui/hardware_config_widget.h @@ -29,7 +29,7 @@ class HConfigWidget : public TQFrame Q_OBJECT TQ_OBJECT public: - HConfigWidget(::Programmer::Base &base, TQWidget *tqparent, bool edit); + HConfigWidget(::Programmer::Base &base, TQWidget *parent, bool edit); virtual ~HConfigWidget() { delete _hardware; } virtual bool set(const Port::Description &pd, const Data &data) = 0; virtual Data *data() const = 0; @@ -50,7 +50,7 @@ class EditDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - EditDialog(ConfigWidget *tqparent, const TQString &name, const Port::Description &pd, Data *data); + EditDialog(ConfigWidget *parent, const TQString &name, const Port::Description &pd, Data *data); TQString savedName() const { return _savedName; } private slots: @@ -71,11 +71,11 @@ class ConfigWidget : public ::Programmer::ConfigWidget Q_OBJECT TQ_OBJECT public: - ConfigWidget(::Programmer::Base *base, Config *config, TQWidget *tqparent); + ConfigWidget(::Programmer::Base *base, Config *config, TQWidget *parent); virtual ~ConfigWidget() { delete _base; } virtual void saveConfig(); virtual bool setPort(const ::Programmer::HardwareDescription &hd); - virtual HConfigWidget *createHardwareConfigWidget(TQWidget *tqparent, bool edit) const = 0; + virtual HConfigWidget *createHardwareConfigWidget(TQWidget *parent, bool edit) const = 0; private slots: void editClicked(); diff --git a/src/progs/gui/port_selector.cpp b/src/progs/gui/port_selector.cpp index 644caaf..f34d426 100644 --- a/src/progs/gui/port_selector.cpp +++ b/src/progs/gui/port_selector.cpp @@ -21,8 +21,8 @@ const char * const PortSelector::LABELS[PortType::Nb_Types] = { I18N_NOOP("Serial"), I18N_NOOP("Parallel"), I18N_NOOP("USB") }; -PortSelector::PortSelector(TQWidget *tqparent) - : TQFrame(tqparent, "port_selector"), _group(0), _main(0) +PortSelector::PortSelector(TQWidget *parent) + : TQFrame(parent, "port_selector"), _group(0), _main(0) { _top = new TQGridLayout(this, 1, 1, 0, 10); _top->setRowStretch(1, 1); diff --git a/src/progs/gui/port_selector.h b/src/progs/gui/port_selector.h index 86a0d4d..5127976 100644 --- a/src/progs/gui/port_selector.h +++ b/src/progs/gui/port_selector.h @@ -23,7 +23,7 @@ class PortSelector : public TQFrame Q_OBJECT TQ_OBJECT public: - PortSelector(TQWidget *tqparent); + PortSelector(TQWidget *parent); void setGroup(const Programmer::Group &group); Port::Description portDescription() const { return Port::Description(type(), device(type())); } void saveConfig(); diff --git a/src/progs/gui/prog_config_widget.cpp b/src/progs/gui/prog_config_widget.cpp index 5ff6047..1578e3b 100644 --- a/src/progs/gui/prog_config_widget.cpp +++ b/src/progs/gui/prog_config_widget.cpp @@ -17,8 +17,8 @@ #include "progs/base/prog_config.h" #include "progs/base/prog_group.h" -Programmer::ConfigWidget::ConfigWidget(const Group &group, TQWidget *tqparent) - : ::ConfigWidget(tqparent), _group(group) +Programmer::ConfigWidget::ConfigWidget(const Group &group, TQWidget *parent) + : ::ConfigWidget(parent), _group(group) { if ( group.properties() & NeedDeviceSpecificFirmware ) { uint row = numRows(); diff --git a/src/progs/gui/prog_config_widget.h b/src/progs/gui/prog_config_widget.h index 2dc8b7e..2da2330 100644 --- a/src/progs/gui/prog_config_widget.h +++ b/src/progs/gui/prog_config_widget.h @@ -25,7 +25,7 @@ class ConfigWidget: public ::ConfigWidget Q_OBJECT TQ_OBJECT public: - ConfigWidget(const Group &group, TQWidget *tqparent); + ConfigWidget(const Group &group, TQWidget *parent); virtual void loadConfig(); const Group &group() const { return _group; } virtual void saveConfig(); diff --git a/src/progs/gui/prog_group_ui.cpp b/src/progs/gui/prog_group_ui.cpp index 90643a0..2dd14ea 100644 --- a/src/progs/gui/prog_group_ui.cpp +++ b/src/progs/gui/prog_group_ui.cpp @@ -24,8 +24,8 @@ #include "devices/pic/prog/pic_prog.h" //---------------------------------------------------------------------------- -Programmer::StandaloneMemoryCalibrationEditor::StandaloneMemoryCalibrationEditor(const Pic::Memory &memory, TQWidget *tqparent) - : Pic::MemoryCalibrationEditor(0, const_cast<Pic::Memory &>(memory), tqparent) +Programmer::StandaloneMemoryCalibrationEditor::StandaloneMemoryCalibrationEditor(const Pic::Memory &memory, TQWidget *parent) + : Pic::MemoryCalibrationEditor(0, const_cast<Pic::Memory &>(memory), parent) {} void Programmer::StandaloneMemoryCalibrationEditor::init(bool first) @@ -39,15 +39,15 @@ void Programmer::StandaloneMemoryCalibrationEditor::init(bool first) //---------------------------------------------------------------------------- Programmer::ButtonContainer::ButtonContainer(const TQString &title, - TQObject *receiver, const char *updateSlot, TQWidget *tqparent) - : ::ButtonContainer(title, tqparent) + TQObject *receiver, const char *updateSlot, TQWidget *parent) + : ::ButtonContainer(title, parent) { if (receiver) button().appendAction(i18n("Read"), "reload", receiver, updateSlot); } //---------------------------------------------------------------------------- -Programmer::AdvancedDialog::AdvancedDialog(Base &base, TQWidget *tqparent, const char *name) - : Dialog(IconList, i18n("Advanced Dialog"), Close, Close, tqparent, name, true, false), +Programmer::AdvancedDialog::AdvancedDialog(Base &base, TQWidget *parent, const char *name) + : Dialog(IconList, i18n("Advanced Dialog"), Close, Close, parent, name, true, false), _base(base), _calEditor(0) { // programmer diff --git a/src/progs/gui/prog_group_ui.h b/src/progs/gui/prog_group_ui.h index edc15ee..47ae425 100644 --- a/src/progs/gui/prog_group_ui.h +++ b/src/progs/gui/prog_group_ui.h @@ -29,7 +29,7 @@ class StandaloneMemoryCalibrationEditor : public Pic::MemoryCalibrationEditor Q_OBJECT TQ_OBJECT public: - StandaloneMemoryCalibrationEditor(const Pic::Memory &memory, TQWidget *tqparent); + StandaloneMemoryCalibrationEditor(const Pic::Memory &memory, TQWidget *parent); virtual void init(bool first); virtual bool hasAction(Device::Action) const { return false; } @@ -44,7 +44,7 @@ class ButtonContainer : public ::ButtonContainer Q_OBJECT TQ_OBJECT public: - ButtonContainer(const TQString &title, TQObject *receiver, const char *updateSlot, TQWidget *tqparent); + ButtonContainer(const TQString &title, TQObject *receiver, const char *updateSlot, TQWidget *parent); }; //---------------------------------------------------------------------------- @@ -53,7 +53,7 @@ class AdvancedDialog : public Dialog Q_OBJECT TQ_OBJECT public: - AdvancedDialog(Base &base, TQWidget *tqparent, const char *name); + AdvancedDialog(Base &base, TQWidget *parent, const char *name); virtual void updateDisplay(); protected: @@ -80,9 +80,9 @@ private: class GroupUI : public ::Group::BaseGui { public: - virtual ::Programmer::ConfigWidget *createConfigWidget(TQWidget *tqparent) const = 0; + virtual ::Programmer::ConfigWidget *createConfigWidget(TQWidget *parent) const = 0; virtual bool hasAdvancedDialog() const = 0; - virtual AdvancedDialog *createAdvancedDialog(Base &base, TQWidget *tqparent) const = 0; + virtual AdvancedDialog *createAdvancedDialog(Base &base, TQWidget *parent) const = 0; }; inline const ::Programmer::GroupUI &groupui(const ::Programmer::Base &base) { return static_cast<const ::Programmer::GroupUI &>(*base.group().gui()); } diff --git a/src/progs/icd1/gui/icd1_group_ui.cpp b/src/progs/icd1/gui/icd1_group_ui.cpp index 1ae73a3..a386190 100644 --- a/src/progs/icd1/gui/icd1_group_ui.cpp +++ b/src/progs/icd1/gui/icd1_group_ui.cpp @@ -13,8 +13,8 @@ #include "progs/icd1/base/icd1_prog.h" //---------------------------------------------------------------------------- -Icd1::AdvancedDialog::AdvancedDialog(ProgrammerBase &base, TQWidget *tqparent) - : ::Programmer::PicAdvancedDialog(base, tqparent, "icd1_advanced_dialog") +Icd1::AdvancedDialog::AdvancedDialog(ProgrammerBase &base, TQWidget *parent) + : ::Programmer::PicAdvancedDialog(base, parent, "icd1_advanced_dialog") { uint row = _selfTestContainer->numRows(); TQLabel *label = new TQLabel(i18n("Result:"), _selfTestContainer); @@ -30,12 +30,12 @@ void Icd1::AdvancedDialog::updateDisplay() } //---------------------------------------------------------------------------- -::Programmer::ConfigWidget *Icd1::GroupUI::createConfigWidget(TQWidget *tqparent) const +::Programmer::ConfigWidget *Icd1::GroupUI::createConfigWidget(TQWidget *parent) const { - return new ::Programmer::ConfigWidget(static_cast<const Group &>(group()), tqparent); + return new ::Programmer::ConfigWidget(static_cast<const Group &>(group()), parent); } -::Programmer::AdvancedDialog *Icd1::GroupUI::createAdvancedDialog(::Programmer::Base &base, TQWidget *tqparent) const +::Programmer::AdvancedDialog *Icd1::GroupUI::createAdvancedDialog(::Programmer::Base &base, TQWidget *parent) const { - return new AdvancedDialog(static_cast<ProgrammerBase &>(base), tqparent); + return new AdvancedDialog(static_cast<ProgrammerBase &>(base), parent); } diff --git a/src/progs/icd1/gui/icd1_group_ui.h b/src/progs/icd1/gui/icd1_group_ui.h index c4f1c33..ecfef92 100644 --- a/src/progs/icd1/gui/icd1_group_ui.h +++ b/src/progs/icd1/gui/icd1_group_ui.h @@ -22,7 +22,7 @@ class AdvancedDialog : public ::Programmer::PicAdvancedDialog Q_OBJECT TQ_OBJECT public: - AdvancedDialog(ProgrammerBase &base, TQWidget *tqparent); + AdvancedDialog(ProgrammerBase &base, TQWidget *parent); virtual void updateDisplay(); private: @@ -34,9 +34,9 @@ private: class GroupUI : public ::Programmer::GroupUI { public: - virtual ::Programmer::ConfigWidget *createConfigWidget(TQWidget *tqparent) const; + virtual ::Programmer::ConfigWidget *createConfigWidget(TQWidget *parent) const; virtual bool hasAdvancedDialog() const { return true; } - virtual ::Programmer::AdvancedDialog *createAdvancedDialog(::Programmer::Base &base, TQWidget *tqparent) const; + virtual ::Programmer::AdvancedDialog *createAdvancedDialog(::Programmer::Base &base, TQWidget *parent) const; }; } // namespace diff --git a/src/progs/icd2/base/icd.cpp b/src/progs/icd2/base/icd.cpp index 3fd3de8..18e9574 100644 --- a/src/progs/icd2/base/icd.cpp +++ b/src/progs/icd2/base/icd.cpp @@ -87,7 +87,7 @@ bool Icd::DeviceSpecific::doErase(bool) { if ( device().architecture()==Pic::Architecture::P18J ) { // ### also true for others ? Device::Array data(device().nbWords(Pic::MemoryRangeType::Config)); - for (uint i=0; i<data.size(); i++) data[i] = device().config()._words[i].wtqmask; + for (uint i=0; i<data.size(); i++) data[i] = device().config()._words[i].wmask; if ( !doWrite(Pic::MemoryRangeType::Config, data, true) ) return false; } return hardware().eraseAll(); diff --git a/src/progs/icd2/gui/icd2_group_ui.cpp b/src/progs/icd2/gui/icd2_group_ui.cpp index b8d71df..4fbed5c 100644 --- a/src/progs/icd2/gui/icd2_group_ui.cpp +++ b/src/progs/icd2/gui/icd2_group_ui.cpp @@ -14,8 +14,8 @@ #include "progs/icd2/base/icd2_debug.h" //---------------------------------------------------------------------------- -Icd2::AdvancedDialog::AdvancedDialog(ProgrammerBase &base, TQWidget *tqparent) - : ::Programmer::PicAdvancedDialog(base, tqparent, "icd2_advanced_dialog") +Icd2::AdvancedDialog::AdvancedDialog(ProgrammerBase &base, TQWidget *parent) + : ::Programmer::PicAdvancedDialog(base, parent, "icd2_advanced_dialog") { uint row = _firmwareContainer->numRows(); TQLabel *label = new TQLabel(i18n("Id:"), _firmwareContainer); @@ -70,12 +70,12 @@ void Icd2::AdvancedDialog::updateDisplay() } //---------------------------------------------------------------------------- -::Programmer::ConfigWidget *Icd2::GroupUI::createConfigWidget(TQWidget *tqparent) const +::Programmer::ConfigWidget *Icd2::GroupUI::createConfigWidget(TQWidget *parent) const { - return new ::Programmer::ConfigWidget(static_cast<const Group &>(group()), tqparent); + return new ::Programmer::ConfigWidget(static_cast<const Group &>(group()), parent); } -::Programmer::AdvancedDialog *Icd2::GroupUI::createAdvancedDialog(::Programmer::Base &base, TQWidget *tqparent) const +::Programmer::AdvancedDialog *Icd2::GroupUI::createAdvancedDialog(::Programmer::Base &base, TQWidget *parent) const { - return new AdvancedDialog(static_cast<ProgrammerBase &>(base), tqparent); + return new AdvancedDialog(static_cast<ProgrammerBase &>(base), parent); } diff --git a/src/progs/icd2/gui/icd2_group_ui.h b/src/progs/icd2/gui/icd2_group_ui.h index 14c0fdb..ecb7cc7 100644 --- a/src/progs/icd2/gui/icd2_group_ui.h +++ b/src/progs/icd2/gui/icd2_group_ui.h @@ -23,7 +23,7 @@ class AdvancedDialog : public ::Programmer::PicAdvancedDialog Q_OBJECT TQ_OBJECT public: - AdvancedDialog(ProgrammerBase &base, TQWidget *tqparent); + AdvancedDialog(ProgrammerBase &base, TQWidget *parent); virtual void updateDisplay(); private slots: @@ -39,9 +39,9 @@ private: class GroupUI : public ::Programmer::GroupUI { public: - virtual ::Programmer::ConfigWidget *createConfigWidget(TQWidget *tqparent) const; + virtual ::Programmer::ConfigWidget *createConfigWidget(TQWidget *parent) const; virtual bool hasAdvancedDialog() const { return true; } - virtual ::Programmer::AdvancedDialog *createAdvancedDialog(::Programmer::Base &base, TQWidget *tqparent) const; + virtual ::Programmer::AdvancedDialog *createAdvancedDialog(::Programmer::Base &base, TQWidget *parent) const; }; } // namespace diff --git a/src/progs/manager/prog_manager.cpp b/src/progs/manager/prog_manager.cpp index c39d955..fddd60c 100644 --- a/src/progs/manager/prog_manager.cpp +++ b/src/progs/manager/prog_manager.cpp @@ -18,8 +18,8 @@ //---------------------------------------------------------------------------- Programmer::Manager *Programmer::manager = 0; -Programmer::Manager::Manager(TQObject *tqparent) - : TQObject(tqparent, "programmer_manager"), _programmer(0) +Programmer::Manager::Manager(TQObject *parent) + : TQObject(parent, "programmer_manager"), _programmer(0) {} Programmer::Manager::~Manager() diff --git a/src/progs/manager/prog_manager.h b/src/progs/manager/prog_manager.h index 233013b..0f0fe01 100644 --- a/src/progs/manager/prog_manager.h +++ b/src/progs/manager/prog_manager.h @@ -27,7 +27,7 @@ class Manager : public TQObject, public Log::Base Q_OBJECT TQ_OBJECT public: - Manager(TQObject *tqparent); + Manager(TQObject *parent); virtual ~Manager(); ::Programmer::Base *programmer() { return _programmer; } virtual void createProgrammer(const Device::Data *data) = 0; diff --git a/src/progs/picdem_bootloader/base/picdem_bootloader.cpp b/src/progs/picdem_bootloader/base/picdem_bootloader.cpp index 90fed61..347ec52 100644 --- a/src/progs/picdem_bootloader/base/picdem_bootloader.cpp +++ b/src/progs/picdem_bootloader/base/picdem_bootloader.cpp @@ -106,7 +106,7 @@ bool PicdemBootloader::Hardware::write(Pic::MemoryRangeType type, const Device:: if ( type==Pic::MemoryRangeType::Code ) { // check that there is nothing in bootloader reserved area for (uint i=0; i<data.count(); i++) { if ( i>=0x400 ) continue; - if ( data[i]==device().tqmask(Pic::MemoryRangeType::Code) ) continue; + if ( data[i]==device().mask(Pic::MemoryRangeType::Code) ) continue; uint address = device().addressIncrement(Pic::MemoryRangeType::Code) * i; log(Log::LineType::Warning, " " + i18n("Code is present in bootloader reserved area (at address %1). It will be ignored.").tqarg(toHexLabel(address, device().nbCharsAddress()))); break; diff --git a/src/progs/picdem_bootloader/gui/picdem_bootloader_ui.cpp b/src/progs/picdem_bootloader/gui/picdem_bootloader_ui.cpp index fdfa3d1..3e374da 100644 --- a/src/progs/picdem_bootloader/gui/picdem_bootloader_ui.cpp +++ b/src/progs/picdem_bootloader/gui/picdem_bootloader_ui.cpp @@ -11,8 +11,8 @@ #include "progs/picdem_bootloader/base/picdem_bootloader.h" //----------------------------------------------------------------------------- -PicdemBootloader::ConfigWidget::ConfigWidget(const ::Programmer::Group &group, TQWidget *tqparent) - : ::Programmer::ConfigWidget(group, tqparent) +PicdemBootloader::ConfigWidget::ConfigWidget(const ::Programmer::Group &group, TQWidget *parent) + : ::Programmer::ConfigWidget(group, parent) { uint row = numRows(); @@ -42,7 +42,7 @@ void PicdemBootloader::ConfigWidget::loadConfig() } //----------------------------------------------------------------------------- -::Programmer::ConfigWidget *PicdemBootloader::GroupUI::createConfigWidget(TQWidget *tqparent) const +::Programmer::ConfigWidget *PicdemBootloader::GroupUI::createConfigWidget(TQWidget *parent) const { - return new ConfigWidget(static_cast<const ::Programmer::Group &>(group()), tqparent); + return new ConfigWidget(static_cast<const ::Programmer::Group &>(group()), parent); } diff --git a/src/progs/picdem_bootloader/gui/picdem_bootloader_ui.h b/src/progs/picdem_bootloader/gui/picdem_bootloader_ui.h index 0540625..b23c157 100644 --- a/src/progs/picdem_bootloader/gui/picdem_bootloader_ui.h +++ b/src/progs/picdem_bootloader/gui/picdem_bootloader_ui.h @@ -19,7 +19,7 @@ class ConfigWidget: public ::Programmer::ConfigWidget Q_OBJECT TQ_OBJECT public: - ConfigWidget(const ::Programmer::Group &group, TQWidget *tqparent); + ConfigWidget(const ::Programmer::Group &group, TQWidget *parent); virtual void loadConfig(); virtual void saveConfig(); @@ -31,7 +31,7 @@ private: class GroupUI : public ::Bootloader::GroupUI { public: - virtual ::Programmer::ConfigWidget *createConfigWidget(TQWidget *tqparent) const; + virtual ::Programmer::ConfigWidget *createConfigWidget(TQWidget *parent) const; }; } // namespace diff --git a/src/progs/pickit1/gui/pickit1_group_ui.cpp b/src/progs/pickit1/gui/pickit1_group_ui.cpp index 795533e..e2e3b30 100644 --- a/src/progs/pickit1/gui/pickit1_group_ui.cpp +++ b/src/progs/pickit1/gui/pickit1_group_ui.cpp @@ -12,12 +12,12 @@ #include "progs/pickit2/gui/pickit2_group_ui.h" #include "progs/pickit1/base/pickit1_prog.h" -::Programmer::ConfigWidget *Pickit1::GroupUI::createConfigWidget(TQWidget *tqparent) const +::Programmer::ConfigWidget *Pickit1::GroupUI::createConfigWidget(TQWidget *parent) const { - return new ::Programmer::ConfigWidget(static_cast<const ::Programmer::Group &>(group()), tqparent); + return new ::Programmer::ConfigWidget(static_cast<const ::Programmer::Group &>(group()), parent); } -::Programmer::AdvancedDialog *Pickit1::GroupUI::createAdvancedDialog(::Programmer::Base &base, TQWidget *tqparent) const +::Programmer::AdvancedDialog *Pickit1::GroupUI::createAdvancedDialog(::Programmer::Base &base, TQWidget *parent) const { - return new Pickit::AdvancedDialog(static_cast<Base &>(base), tqparent, "pickit1_advanced_dialog"); + return new Pickit::AdvancedDialog(static_cast<Base &>(base), parent, "pickit1_advanced_dialog"); } diff --git a/src/progs/pickit1/gui/pickit1_group_ui.h b/src/progs/pickit1/gui/pickit1_group_ui.h index 147f99c..95db598 100644 --- a/src/progs/pickit1/gui/pickit1_group_ui.h +++ b/src/progs/pickit1/gui/pickit1_group_ui.h @@ -17,9 +17,9 @@ namespace Pickit1 class GroupUI : public ::Programmer::GroupUI { public: - virtual ::Programmer::ConfigWidget *createConfigWidget(TQWidget *tqparent) const; + virtual ::Programmer::ConfigWidget *createConfigWidget(TQWidget *parent) const; virtual bool hasAdvancedDialog() const { return true; } - virtual ::Programmer::AdvancedDialog *createAdvancedDialog(::Programmer::Base &base, TQWidget *tqparent) const; + virtual ::Programmer::AdvancedDialog *createAdvancedDialog(::Programmer::Base &base, TQWidget *parent) const; }; } // namespace diff --git a/src/progs/pickit2/gui/pickit2_group_ui.cpp b/src/progs/pickit2/gui/pickit2_group_ui.cpp index 473dea7..66f9b67 100644 --- a/src/progs/pickit2/gui/pickit2_group_ui.cpp +++ b/src/progs/pickit2/gui/pickit2_group_ui.cpp @@ -18,8 +18,8 @@ #include "progs/pickit2/base/pickit2.h" //---------------------------------------------------------------------------- -Pickit::AdvancedDialog::AdvancedDialog(Base &base, TQWidget *tqparent, const char *name) - : ::Programmer::PicAdvancedDialog(base, tqparent, name) +Pickit::AdvancedDialog::AdvancedDialog(Base &base, TQWidget *parent, const char *name) + : ::Programmer::PicAdvancedDialog(base, parent, name) {} void Pickit::AdvancedDialog::regenerateCalibration() @@ -41,12 +41,12 @@ void Pickit::AdvancedDialog::regenerateCalibration() } //---------------------------------------------------------------------------- -::Programmer::ConfigWidget *Pickit2::GroupUI::createConfigWidget(TQWidget *tqparent) const +::Programmer::ConfigWidget *Pickit2::GroupUI::createConfigWidget(TQWidget *parent) const { - return new ::Programmer::ConfigWidget(static_cast<const ::Programmer::Group &>(group()), tqparent); + return new ::Programmer::ConfigWidget(static_cast<const ::Programmer::Group &>(group()), parent); } -::Programmer::AdvancedDialog *Pickit2::GroupUI::createAdvancedDialog(::Programmer::Base &base, TQWidget *tqparent) const +::Programmer::AdvancedDialog *Pickit2::GroupUI::createAdvancedDialog(::Programmer::Base &base, TQWidget *parent) const { - return new Pickit::AdvancedDialog(static_cast<Base &>(base), tqparent, "pickit2_advanced_dialog"); + return new Pickit::AdvancedDialog(static_cast<Base &>(base), parent, "pickit2_advanced_dialog"); } diff --git a/src/progs/pickit2/gui/pickit2_group_ui.h b/src/progs/pickit2/gui/pickit2_group_ui.h index 78da904..3c8e34d 100644 --- a/src/progs/pickit2/gui/pickit2_group_ui.h +++ b/src/progs/pickit2/gui/pickit2_group_ui.h @@ -20,7 +20,7 @@ class AdvancedDialog : public ::Programmer::PicAdvancedDialog Q_OBJECT TQ_OBJECT public: - AdvancedDialog(Base &base, TQWidget *tqparent, const char *name); + AdvancedDialog(Base &base, TQWidget *parent, const char *name); Base &base() { return static_cast<Base &>(_base); } public slots: @@ -34,9 +34,9 @@ namespace Pickit2 class GroupUI : public ::Programmer::GroupUI { public: - virtual ::Programmer::ConfigWidget *createConfigWidget(TQWidget *tqparent) const; + virtual ::Programmer::ConfigWidget *createConfigWidget(TQWidget *parent) const; virtual bool hasAdvancedDialog() const { return true; } - virtual ::Programmer::AdvancedDialog *createAdvancedDialog(::Programmer::Base &base, TQWidget *tqparent) const; + virtual ::Programmer::AdvancedDialog *createAdvancedDialog(::Programmer::Base &base, TQWidget *parent) const; }; } // namespace diff --git a/src/progs/pickit2_bootloader/base/pickit2_bootloader.cpp b/src/progs/pickit2_bootloader/base/pickit2_bootloader.cpp index 5a60a28..7620a9b 100644 --- a/src/progs/pickit2_bootloader/base/pickit2_bootloader.cpp +++ b/src/progs/pickit2_bootloader/base/pickit2_bootloader.cpp @@ -48,7 +48,7 @@ bool Pickit2Bootloader::Hardware::write(Pic::MemoryRangeType type, const Device: // check that there is nothing in bootloader reserved area for (uint i=0; i<data.count(); i++) { if ( i>=0x1000 && i<0x3FF0 ) continue; - if ( data[i]==device().tqmask(Pic::MemoryRangeType::Code) ) continue; + if ( data[i]==device().mask(Pic::MemoryRangeType::Code) ) continue; uint address = device().addressIncrement(Pic::MemoryRangeType::Code) * i; log(Log::LineType::Warning, " " + i18n("Code is present in bootloader reserved area (at address %1). It will be ignored.").tqarg(toHexLabel(address, device().nbCharsAddress()))); break; diff --git a/src/progs/pickit2_bootloader/gui/pickit2_bootloader_ui.cpp b/src/progs/pickit2_bootloader/gui/pickit2_bootloader_ui.cpp index f68e39a..be2a348 100644 --- a/src/progs/pickit2_bootloader/gui/pickit2_bootloader_ui.cpp +++ b/src/progs/pickit2_bootloader/gui/pickit2_bootloader_ui.cpp @@ -9,12 +9,12 @@ #include "pickit2_bootloader_ui.h" //----------------------------------------------------------------------------- -Pickit2Bootloader::ConfigWidget::ConfigWidget(const::Programmer::Group &group, TQWidget *tqparent) - : ::Programmer::ConfigWidget(group, tqparent) +Pickit2Bootloader::ConfigWidget::ConfigWidget(const::Programmer::Group &group, TQWidget *parent) + : ::Programmer::ConfigWidget(group, parent) {} //----------------------------------------------------------------------------- -::Programmer::ConfigWidget *Pickit2Bootloader::GroupUI::createConfigWidget(TQWidget *tqparent) const +::Programmer::ConfigWidget *Pickit2Bootloader::GroupUI::createConfigWidget(TQWidget *parent) const { - return new ConfigWidget(static_cast<const ::Programmer::Group &>(group()), tqparent); + return new ConfigWidget(static_cast<const ::Programmer::Group &>(group()), parent); } diff --git a/src/progs/pickit2_bootloader/gui/pickit2_bootloader_ui.h b/src/progs/pickit2_bootloader/gui/pickit2_bootloader_ui.h index e1c88fc..8b72728 100644 --- a/src/progs/pickit2_bootloader/gui/pickit2_bootloader_ui.h +++ b/src/progs/pickit2_bootloader/gui/pickit2_bootloader_ui.h @@ -19,7 +19,7 @@ class ConfigWidget: public ::Programmer::ConfigWidget Q_OBJECT TQ_OBJECT public: - ConfigWidget(const::Programmer::Group &group, TQWidget *tqparent); + ConfigWidget(const::Programmer::Group &group, TQWidget *parent); virtual void loadConfig() {} virtual void saveConfig() {} }; @@ -29,7 +29,7 @@ public: class GroupUI : public ::Bootloader::GroupUI { public: - virtual ::Programmer::ConfigWidget *createConfigWidget(TQWidget *tqparent) const; + virtual ::Programmer::ConfigWidget *createConfigWidget(TQWidget *parent) const; }; } // namespace diff --git a/src/progs/pickit2v2/base/pickit2v2.cpp b/src/progs/pickit2v2/base/pickit2v2.cpp index 8deddc4..478a0f7 100644 --- a/src/progs/pickit2v2/base/pickit2v2.cpp +++ b/src/progs/pickit2v2/base/pickit2v2.cpp @@ -327,7 +327,7 @@ bool Pickit2V2::Hardware::readMemory(Pic::MemoryRangeType otype, Device::Array & if ( i>=nbWords ) break; data[i] = words[k]; if (fdata->progMemShift) data[i] >>= 1; - data[i] = data[i].maskWith(device().tqmask(type)); // ### correct ? + data[i] = data[i].maskWith(device().mask(type)); // ### correct ? if ( vdata && !verifyWord(i, data[i], type, *vdata) ) return false; if ( type==Pic::MemoryRangeType::Code && i!=0x0 && i%0x8000==0 ) setAddress = true; i++; diff --git a/src/progs/pickit2v2/gui/pickit2v2_group_ui.cpp b/src/progs/pickit2v2/gui/pickit2v2_group_ui.cpp index 1deff68..596e239 100644 --- a/src/progs/pickit2v2/gui/pickit2v2_group_ui.cpp +++ b/src/progs/pickit2v2/gui/pickit2v2_group_ui.cpp @@ -11,12 +11,12 @@ #include "progs/gui/prog_config_widget.h" #include "progs/pickit2v2/base/pickit2v2_prog.h" -::Programmer::ConfigWidget *Pickit2V2::GroupUI::createConfigWidget(TQWidget *tqparent) const +::Programmer::ConfigWidget *Pickit2V2::GroupUI::createConfigWidget(TQWidget *parent) const { - return new ::Programmer::ConfigWidget(static_cast<const ::Programmer::Group &>(group()), tqparent); + return new ::Programmer::ConfigWidget(static_cast<const ::Programmer::Group &>(group()), parent); } -::Programmer::AdvancedDialog *Pickit2V2::GroupUI::createAdvancedDialog(::Programmer::Base &base, TQWidget *tqparent) const +::Programmer::AdvancedDialog *Pickit2V2::GroupUI::createAdvancedDialog(::Programmer::Base &base, TQWidget *parent) const { - return new ::Programmer::AdvancedDialog(static_cast<Base &>(base), tqparent, "pickit2v2_advanced_dialog"); + return new ::Programmer::AdvancedDialog(static_cast<Base &>(base), parent, "pickit2v2_advanced_dialog"); } diff --git a/src/progs/pickit2v2/gui/pickit2v2_group_ui.h b/src/progs/pickit2v2/gui/pickit2v2_group_ui.h index 7023367..555913a 100644 --- a/src/progs/pickit2v2/gui/pickit2v2_group_ui.h +++ b/src/progs/pickit2v2/gui/pickit2v2_group_ui.h @@ -16,9 +16,9 @@ namespace Pickit2V2 class GroupUI : public ::Programmer::GroupUI { public: - virtual ::Programmer::ConfigWidget *createConfigWidget(TQWidget *tqparent) const; + virtual ::Programmer::ConfigWidget *createConfigWidget(TQWidget *parent) const; virtual bool hasAdvancedDialog() const { return true; } - virtual ::Programmer::AdvancedDialog *createAdvancedDialog(::Programmer::Base &base, TQWidget *tqparent) const; + virtual ::Programmer::AdvancedDialog *createAdvancedDialog(::Programmer::Base &base, TQWidget *parent) const; }; } // namespace diff --git a/src/progs/psp/base/psp.cpp b/src/progs/psp/base/psp.cpp index 188fbcb..0f86180 100644 --- a/src/progs/psp/base/psp.cpp +++ b/src/progs/psp/base/psp.cpp @@ -46,7 +46,7 @@ TQMemArray<uchar> Psp::createDeviceInfo(const Pic::Data &data) array[0] = v.byte(1); array[1] = v.byte(0); // address word width - v = data.tqmask(Pic::MemoryRangeType::Code); + v = data.mask(Pic::MemoryRangeType::Code); array[2] = v.byte(1); array[3] = v.byte(0); // data word width @@ -59,12 +59,12 @@ TQMemArray<uchar> Psp::createDeviceInfo(const Pic::Data &data) if ( data.nbBytesWord(Pic::MemoryRangeType::UserId)==1 ) v += v << 8; array[6] = v.byte(1); array[7] = v.byte(0); - // user id tqmask + // user id mask array[8] = v.byte(1); array[9] = v.byte(0); } - // memory config tqmask + // memory config mask array[10] = config[0]; array[11] = config[1]; array[12] = config[16]; @@ -72,20 +72,20 @@ TQMemArray<uchar> Psp::createDeviceInfo(const Pic::Data &data) if ( data.isReadable(Pic::MemoryRangeType::Eeprom) ) { // memory eeprom width - v = data.tqmask(Pic::MemoryRangeType::Eeprom); + v = data.mask(Pic::MemoryRangeType::Eeprom); array[14] = v.byte(1); array[15] = v.byte(0); - // memory eeprom tqmask + // memory eeprom mask array[16] = v.byte(1); array[17] = v.byte(0); } if ( data.isReadable(Pic::MemoryRangeType::Cal) ) { // memory calibration width - v = data.tqmask(Pic::MemoryRangeType::Cal); + v = data.mask(Pic::MemoryRangeType::Cal); array[18] = v.byte(1); array[19] = v.byte(0); - // memory calibration tqmask + // memory calibration mask array[20] = v.byte(1); array[21] = v.byte(0); } diff --git a/src/progs/psp/gui/psp_group_ui.cpp b/src/progs/psp/gui/psp_group_ui.cpp index ac9c70c..982c4e9 100644 --- a/src/progs/psp/gui/psp_group_ui.cpp +++ b/src/progs/psp/gui/psp_group_ui.cpp @@ -11,12 +11,12 @@ #include "progs/gui/prog_config_widget.h" #include "devices/pic/gui/pic_prog_group_ui.h" -::Programmer::ConfigWidget *Psp::GroupUI::createConfigWidget(TQWidget *tqparent) const +::Programmer::ConfigWidget *Psp::GroupUI::createConfigWidget(TQWidget *parent) const { - return new ::Programmer::ConfigWidget(static_cast<const ::Programmer::Group &>(group()), tqparent); + return new ::Programmer::ConfigWidget(static_cast<const ::Programmer::Group &>(group()), parent); } -::Programmer::AdvancedDialog *Psp::GroupUI::createAdvancedDialog(::Programmer::Base &base, TQWidget *tqparent) const +::Programmer::AdvancedDialog *Psp::GroupUI::createAdvancedDialog(::Programmer::Base &base, TQWidget *parent) const { - return new ::Programmer::PicAdvancedDialog(static_cast< ::Programmer::PicBase &>(base), tqparent, "psp_advanced_dialog"); + return new ::Programmer::PicAdvancedDialog(static_cast< ::Programmer::PicBase &>(base), parent, "psp_advanced_dialog"); } diff --git a/src/progs/psp/gui/psp_group_ui.h b/src/progs/psp/gui/psp_group_ui.h index be0b4ac..a856bcf 100644 --- a/src/progs/psp/gui/psp_group_ui.h +++ b/src/progs/psp/gui/psp_group_ui.h @@ -18,9 +18,9 @@ class Group; class GroupUI : public ::Programmer::GroupUI { public: - virtual ::Programmer::ConfigWidget *createConfigWidget(TQWidget *tqparent) const; + virtual ::Programmer::ConfigWidget *createConfigWidget(TQWidget *parent) const; virtual bool hasAdvancedDialog() const { return true; } - virtual ::Programmer::AdvancedDialog *createAdvancedDialog(::Programmer::Base &base, TQWidget *tqparent) const; + virtual ::Programmer::AdvancedDialog *createAdvancedDialog(::Programmer::Base &base, TQWidget *parent) const; }; } // namespace diff --git a/src/progs/tbl_bootloader/base/tbl_bootloader.cpp b/src/progs/tbl_bootloader/base/tbl_bootloader.cpp index 9c52fb7..3b8c324 100644 --- a/src/progs/tbl_bootloader/base/tbl_bootloader.cpp +++ b/src/progs/tbl_bootloader/base/tbl_bootloader.cpp @@ -158,7 +158,7 @@ bool TinyBootloader::Hardware::writeCode(const Device::Array &data, bool erase) // check that there is nothing on top of bootloader for (uint i=nb; i<data.size(); i++) { - if ( data[i]==device().tqmask(Pic::MemoryRangeType::Code) ) continue; + if ( data[i]==device().mask(Pic::MemoryRangeType::Code) ) continue; uint address = device().addressIncrement(Pic::MemoryRangeType::Code) * i; log(Log::LineType::Warning, " " + i18n("Code is present in bootloader reserved area (at address %1). It will be ignored.").tqarg(toHexLabel(address, device().nbCharsAddress()))); break; @@ -194,7 +194,7 @@ bool TinyBootloader::Hardware::writeCode(const Device::Array &data, bool erase) if ( !erase ) { bool write = false; for (uint k=0; k<nbWords; k++) { - if ( wdata[i+k]==device().tqmask(Pic::MemoryRangeType::Code) ) continue; + if ( wdata[i+k]==device().mask(Pic::MemoryRangeType::Code) ) continue; write = true; break; } diff --git a/src/progs/tbl_bootloader/gui/tbl_bootloader_ui.cpp b/src/progs/tbl_bootloader/gui/tbl_bootloader_ui.cpp index f0c1725..7328aa5 100644 --- a/src/progs/tbl_bootloader/gui/tbl_bootloader_ui.cpp +++ b/src/progs/tbl_bootloader/gui/tbl_bootloader_ui.cpp @@ -12,8 +12,8 @@ #include "common/port/serial.h" //----------------------------------------------------------------------------- -TinyBootloader::ConfigWidget::ConfigWidget(const::Programmer::Group &group, TQWidget *tqparent) - : ::Programmer::ConfigWidget(group, tqparent) +TinyBootloader::ConfigWidget::ConfigWidget(const::Programmer::Group &group, TQWidget *parent) + : ::Programmer::ConfigWidget(group, parent) { uint row = numRows(); @@ -74,7 +74,7 @@ void TinyBootloader::ConfigWidget::loadConfig() } //----------------------------------------------------------------------------- -::Programmer::ConfigWidget *TinyBootloader::GroupUI::createConfigWidget(TQWidget *tqparent) const +::Programmer::ConfigWidget *TinyBootloader::GroupUI::createConfigWidget(TQWidget *parent) const { - return new ConfigWidget(static_cast<const ::Programmer::Group &>(group()), tqparent); + return new ConfigWidget(static_cast<const ::Programmer::Group &>(group()), parent); } diff --git a/src/progs/tbl_bootloader/gui/tbl_bootloader_ui.h b/src/progs/tbl_bootloader/gui/tbl_bootloader_ui.h index 442b879..fb85c0f 100644 --- a/src/progs/tbl_bootloader/gui/tbl_bootloader_ui.h +++ b/src/progs/tbl_bootloader/gui/tbl_bootloader_ui.h @@ -22,7 +22,7 @@ class ConfigWidget: public ::Programmer::ConfigWidget Q_OBJECT TQ_OBJECT public: - ConfigWidget(const ::Programmer::Group &group, TQWidget *tqparent); + ConfigWidget(const ::Programmer::Group &group, TQWidget *parent); virtual void loadConfig(); virtual void saveConfig(); @@ -35,7 +35,7 @@ private: class GroupUI : public ::Bootloader::GroupUI { public: - virtual ::Programmer::ConfigWidget *createConfigWidget(TQWidget *tqparent) const; + virtual ::Programmer::ConfigWidget *createConfigWidget(TQWidget *parent) const; }; } // namespace diff --git a/src/tools/gui/tool_group_ui.cpp b/src/tools/gui/tool_group_ui.cpp index 118b8c7..5564ed5 100644 --- a/src/tools/gui/tool_group_ui.cpp +++ b/src/tools/gui/tool_group_ui.cpp @@ -11,9 +11,9 @@ #include "tool_config_widget.h" #include "toolchain_config_widget.h" -ToolchainConfigWidget *Tool::GroupUI::toolchainConfigWidgetFactory(TQWidget *tqparent) const +ToolchainConfigWidget *Tool::GroupUI::toolchainConfigWidgetFactory(TQWidget *parent) const { - return new ToolchainConfigWidget(static_cast<const Group &>(group()), tqparent); + return new ToolchainConfigWidget(static_cast<const Group &>(group()), parent); } ToolConfigWidget *Tool::GroupUI::createConfigWidget(Category category, ::Project *project) const diff --git a/src/tools/gui/tool_group_ui.h b/src/tools/gui/tool_group_ui.h index f03d633..54f20c8 100644 --- a/src/tools/gui/tool_group_ui.h +++ b/src/tools/gui/tool_group_ui.h @@ -22,7 +22,7 @@ class GroupUI : public ::Group::BaseGui public: ToolConfigWidget *createConfigWidget(Category category, ::Project *project) const; virtual ToolConfigWidget *configWidgetFactory(Category category, ::Project *project) const = 0; - virtual ToolchainConfigWidget *toolchainConfigWidgetFactory(TQWidget *tqparent) const; + virtual ToolchainConfigWidget *toolchainConfigWidgetFactory(TQWidget *parent) const; }; inline const GroupUI &groupui(const Base &base) { return static_cast<const GroupUI &>(*base.group().gui()); } diff --git a/src/tools/gui/toolchain_config_center.cpp b/src/tools/gui/toolchain_config_center.cpp index 909c1f4..6948c3a 100644 --- a/src/tools/gui/toolchain_config_center.cpp +++ b/src/tools/gui/toolchain_config_center.cpp @@ -19,8 +19,8 @@ #include "toolchain_config_widget.h" #include "tool_group_ui.h" -ToolchainsConfigCenter::ToolchainsConfigCenter(const Tool::Group &sgroup, TQWidget *tqparent) - : TreeListDialog(tqparent, "configure_toolchains_dialog", true, +ToolchainsConfigCenter::ToolchainsConfigCenter(const Tool::Group &sgroup, TQWidget *parent) + : TreeListDialog(parent, "configure_toolchains_dialog", true, i18n("Configure Toolchains"), Ok|User1|User2|Cancel, Cancel, false) { setButtonGuiItem(User1, KStdGuiItem::reset()); diff --git a/src/tools/gui/toolchain_config_center.h b/src/tools/gui/toolchain_config_center.h index 6b02f91..ee5db0a 100644 --- a/src/tools/gui/toolchain_config_center.h +++ b/src/tools/gui/toolchain_config_center.h @@ -24,7 +24,7 @@ class ToolchainsConfigCenter : public TreeListDialog Q_OBJECT TQ_OBJECT public: - ToolchainsConfigCenter(const Tool::Group &group, TQWidget *tqparent); + ToolchainsConfigCenter(const Tool::Group &group, TQWidget *parent); public slots: virtual void slotOk(); diff --git a/src/tools/gui/toolchain_config_widget.cpp b/src/tools/gui/toolchain_config_widget.cpp index d735f09..1b92cc2 100644 --- a/src/tools/gui/toolchain_config_widget.cpp +++ b/src/tools/gui/toolchain_config_widget.cpp @@ -22,8 +22,8 @@ #include "common/gui/container.h" //---------------------------------------------------------------------------- -ToolchainConfigWidget::ToolchainConfigWidget(const Tool::Group &group, TQWidget *tqparent) - : ::ConfigWidget(tqparent), +ToolchainConfigWidget::ToolchainConfigWidget(const Tool::Group &group, TQWidget *parent) + : ::ConfigWidget(parent), _group(group), _dirty(false), _outputType(0), _devicesData(group.nbCheckDevices()) { _config = group.createConfig(0); diff --git a/src/tools/gui/toolchain_config_widget.h b/src/tools/gui/toolchain_config_widget.h index b1e795d..681fd98 100644 --- a/src/tools/gui/toolchain_config_widget.h +++ b/src/tools/gui/toolchain_config_widget.h @@ -28,7 +28,7 @@ class ToolchainConfigWidget : public ::ConfigWidget Q_OBJECT TQ_OBJECT public: - ToolchainConfigWidget(const Tool::Group &group, TQWidget *tqparent); + ToolchainConfigWidget(const Tool::Group &group, TQWidget *parent); virtual ~ToolchainConfigWidget(); const Tool::Group &group() const { return _group; } void init(); diff --git a/src/tools/list/compile_manager.cpp b/src/tools/list/compile_manager.cpp index 92f33a5..db71eaf 100644 --- a/src/tools/list/compile_manager.cpp +++ b/src/tools/list/compile_manager.cpp @@ -15,8 +15,8 @@ #include "common/gui/misc_gui.h" #include "compile_config.h" -Compile::Manager::Manager(TQObject *tqparent) - : TQObject(tqparent, "compile_manager"), _base(0) +Compile::Manager::Manager(TQObject *parent) + : TQObject(parent, "compile_manager"), _base(0) {} void Compile::Manager::cleanFile(const PURL::Url &url) diff --git a/src/tools/list/compile_manager.h b/src/tools/list/compile_manager.h index 0d144e6..e7b4383 100644 --- a/src/tools/list/compile_manager.h +++ b/src/tools/list/compile_manager.h @@ -23,7 +23,7 @@ public: TQ_DECLARE_FLAGS(Operations, Operation) public: - Manager(TQObject *tqparent); + Manager(TQObject *parent); TQString label() const { return _label; } bool compileFile(const TodoItem &item); void cleanFile(const PURL::Url &url); diff --git a/src/tools/list/compile_process.cpp b/src/tools/list/compile_process.cpp index 6ac5d26..a22f47d 100644 --- a/src/tools/list/compile_process.cpp +++ b/src/tools/list/compile_process.cpp @@ -67,8 +67,8 @@ void Compile::FileData::List::cleanGenerated() const } //----------------------------------------------------------------------------- -Compile::LogWidget::LogWidget(TQWidget *tqparent) - : Log::Widget(tqparent, "compile_log") +Compile::LogWidget::LogWidget(TQWidget *parent) + : Log::Widget(parent, "compile_log") { connect(this, TQT_SIGNAL(clicked(int, int)), TQT_SLOT(lineClicked(int))); } diff --git a/src/tools/list/compile_process.h b/src/tools/list/compile_process.h index dd5ce3b..2c71af0 100644 --- a/src/tools/list/compile_process.h +++ b/src/tools/list/compile_process.h @@ -65,7 +65,7 @@ class LogWidget : public Log::Widget Q_OBJECT TQ_OBJECT public: - LogWidget(TQWidget *tqparent); + LogWidget(TQWidget *parent); void appendLine(Log::LineType type, const TQString &message, const TQString &filepath, uint line); void appendLine(Log::DebugLevel debug, const TQString &message, const TQString &filepath, uint line); virtual void clear(); diff --git a/src/tools/list/tools_config_widget.cpp b/src/tools/list/tools_config_widget.cpp index 3ec6235..1ced475 100644 --- a/src/tools/list/tools_config_widget.cpp +++ b/src/tools/list/tools_config_widget.cpp @@ -20,8 +20,8 @@ #include "libgui/project.h" //---------------------------------------------------------------------------- -HelpDialog::HelpDialog(TQWidget *tqparent) - : Dialog(tqparent, "help_dialog", false, i18n("Help Dialog"), Close, Close, false) +HelpDialog::HelpDialog(TQWidget *parent) + : Dialog(parent, "help_dialog", false, i18n("Help Dialog"), Close, Close, false) { TQGridLayout *top = new TQGridLayout(mainWidget(), 1, 1, 10, 10); uint k = 0; @@ -36,8 +36,8 @@ HelpDialog::HelpDialog(TQWidget *tqparent) } //---------------------------------------------------------------------------- -ToolsConfigWidget::ToolsConfigWidget(Project *project, TQWidget *tqparent) - : ::ConfigWidget(tqparent), _project(project), _helpDialog(0) +ToolsConfigWidget::ToolsConfigWidget(Project *project, TQWidget *parent) + : ::ConfigWidget(parent), _project(project), _helpDialog(0) { uint row = 0; diff --git a/src/tools/list/tools_config_widget.h b/src/tools/list/tools_config_widget.h index bd4561a..525aff0 100644 --- a/src/tools/list/tools_config_widget.h +++ b/src/tools/list/tools_config_widget.h @@ -28,7 +28,7 @@ class HelpDialog : public Dialog Q_OBJECT TQ_OBJECT public: - HelpDialog(TQWidget *tqparent); + HelpDialog(TQWidget *parent); }; //---------------------------------------------------------------------------- @@ -37,7 +37,7 @@ class ToolsConfigWidget : public ConfigWidget Q_OBJECT TQ_OBJECT public: - ToolsConfigWidget(Project *project, TQWidget *tqparent); + ToolsConfigWidget(Project *project, TQWidget *parent); virtual void loadConfig(); public slots: diff --git a/src/xml_to_data/xml_to_data.cpp b/src/xml_to_data/xml_to_data.cpp index 39eba60..8e14d81 100644 --- a/src/xml_to_data/xml_to_data.cpp +++ b/src/xml_to_data/xml_to_data.cpp @@ -11,11 +11,11 @@ #include <tqfile.h> #include <tqtextstream.h> -TQDomElement XmlToData::findUniqueElement(TQDomElement tqparent, const TQString &tag, +TQDomElement XmlToData::findUniqueElement(TQDomElement parent, const TQString &tag, const TQString &attribute, const TQString &value) const { TQDomElement element; - TQDomNode child = tqparent.firstChild(); + TQDomNode child = parent.firstChild(); while ( !child.isNull() ) { if ( child.nodeName()==tag && child.isElement() && (attribute.isEmpty() || child.toElement().attribute(attribute)==value) ) { diff --git a/src/xml_to_data/xml_to_data.h b/src/xml_to_data/xml_to_data.h index 5ba4290..5630f1b 100644 --- a/src/xml_to_data/xml_to_data.h +++ b/src/xml_to_data/xml_to_data.h @@ -26,7 +26,7 @@ protected: virtual TQString currentDevice() const = 0; virtual void warning(const TQString &message) const; virtual void qFatal(const TQString &message) const; - TQDomElement findUniqueElement(TQDomElement tqparent, const TQString &nodeName, + TQDomElement findUniqueElement(TQDomElement parent, const TQString &nodeName, const TQString &attribute, const TQString &value) const; void checkTagNames(TQDomElement element, const TQString &tag, const TQStringList &names) const; TQDomDocument parseFile(const TQString &filename) const; |