diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:14:26 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:14:26 -0600 |
| commit | 9d9fe02a944fe0719c2475739411727a729251ad (patch) | |
| tree | 5b05f738dd8631ae2c2e2ed46f4a7785fad410f7 /src/devices/pic/prog | |
| parent | ad1fc5fc8eadb9b63e8767e57ac41cbac84f7eb7 (diff) | |
| download | piklab-9d9fe02a944fe0719c2475739411727a729251ad.tar.gz piklab-9d9fe02a944fe0719c2475739411727a729251ad.zip | |
Rename old tq methods that no longer need a unique name
Diffstat (limited to 'src/devices/pic/prog')
| -rw-r--r-- | src/devices/pic/prog/pic_debug.cpp | 8 | ||||
| -rw-r--r-- | src/devices/pic/prog/pic_debug.h | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/devices/pic/prog/pic_debug.cpp b/src/devices/pic/prog/pic_debug.cpp index 9434a74..7dda5c2 100644 --- a/src/devices/pic/prog/pic_debug.cpp +++ b/src/devices/pic/prog/pic_debug.cpp @@ -20,7 +20,7 @@ Register::TypeData Debugger::PicBase::registerTypeData(const TQString &name) con return Register::TypeData(rdata.sfrs[name].address, rdata.nbChars()); } -bool Debugger::PicBase::updatePorttqStatus(uint index, TQMap<uint, Device::PortBitData> &bits) +bool Debugger::PicBase::updatePortStatus(uint index, TQMap<uint, Device::PortBitData> &bits) { const Pic::RegistersData &rdata = device()->registersData(); BitValue tris; @@ -65,7 +65,7 @@ const Debugger::PicBase &Debugger::PicSpecific::base() const return static_cast<PicBase &>(_base); } -bool Debugger::PicSpecific::updatetqStatus() +bool Debugger::PicSpecific::updateStatus() { if ( !Debugger::manager->readRegister(base().pcTypeData()) ) return false; if ( !Debugger::manager->readRegister(base().registerTypeData("STATUS")) ) return false; @@ -92,9 +92,9 @@ TQString Debugger::P16FSpecific::statusString() const } //---------------------------------------------------------------------------- -bool Debugger::P18FSpecific::updatetqStatus() +bool Debugger::P18FSpecific::updateStatus() { - if ( !PicSpecific::updatetqStatus() ) return false; + if ( !PicSpecific::updateStatus() ) return false; if ( !Debugger::manager->readRegister(base().registerTypeData("BSR")) ) return false; return true; } diff --git a/src/devices/pic/prog/pic_debug.h b/src/devices/pic/prog/pic_debug.h index ce08387..d73aeee 100644 --- a/src/devices/pic/prog/pic_debug.h +++ b/src/devices/pic/prog/pic_debug.h @@ -25,7 +25,7 @@ public: const Pic::Data &device() const { return static_cast<const Pic::Data &>(*_base.device()); } PicBase &base(); const PicBase &base() const; - virtual bool updatetqStatus(); + virtual bool updateStatus(); virtual Register::TypeData wregTypeData() const = 0; }; @@ -44,7 +44,7 @@ class P18FSpecific : public PicSpecific public: P18FSpecific(Debugger::Base &base) : PicSpecific(base) {} virtual TQString statusString() const; - virtual bool updatetqStatus(); + virtual bool updateStatus(); virtual Register::TypeData wregTypeData() const; }; @@ -57,7 +57,7 @@ public: const PicSpecific *deviceSpecific() const { return static_cast<const PicSpecific *>(_deviceSpecific); } const Pic::Data *device() const { return static_cast<const Pic::Data *>(Debugger::Base::device()); } Register::TypeData registerTypeData(const TQString &name) const; - virtual bool updatePorttqStatus(uint index, TQMap<uint, Device::PortBitData> &bits); + virtual bool updatePortStatus(uint index, TQMap<uint, Device::PortBitData> &bits); }; } // namespace |