summaryrefslogtreecommitdiffstats
path: root/src/progs
diff options
context:
space:
mode:
Diffstat (limited to 'src/progs')
-rw-r--r--src/progs/direct/base/direct_16.cpp4
-rw-r--r--src/progs/direct/base/direct_16.h2
-rw-r--r--src/progs/direct/base/direct_18F.cpp8
-rw-r--r--src/progs/icd2/base/icd2_debug.cpp6
-rw-r--r--src/progs/icd2/base/icd2_debug_specific.cpp2
-rw-r--r--src/progs/icd2/base/icd2_debug_specific.h6
-rw-r--r--src/progs/pickit2v2/base/pickit2v2.cpp2
7 files changed, 15 insertions, 15 deletions
diff --git a/src/progs/direct/base/direct_16.cpp b/src/progs/direct/base/direct_16.cpp
index a9e33e1..330c037 100644
--- a/src/progs/direct/base/direct_16.cpp
+++ b/src/progs/direct/base/direct_16.cpp
@@ -56,7 +56,7 @@ BitValue Direct::pic16::get_word()
hardware().setPin(Clock, High);
Port::usleep(1+_clockDelay);
if ( hardware().readBit() ) ind |= 0x8000;
- else ind = ind.tqmaskWith(0x7FFF);
+ else ind = ind.maskWith(0x7FFF);
ind >>= 1;
hardware().setPin(Clock, Low);
Port::usleep(1+_clockDelay);
@@ -90,7 +90,7 @@ bool Direct::pic16::doRead(Pic::MemoryRangeType type, Device::Array &data, const
BitValue tqmask = device().tqmask(type);
for (uint i = 0; i<nbWords; i++) {
if ( !only || data[i]!=tqmask || type!=Pic::MemoryRangeType::Code ) {
- data[i] = readWord(type).tqmaskWith(tqmask);
+ data[i] = readWord(type).maskWith(tqmask);
if ( vdata && !hardware().verifyWord(i, data[i], type, *vdata) ) return false;
}
incrementPC(1);
diff --git a/src/progs/direct/base/direct_16.h b/src/progs/direct/base/direct_16.h
index beb6c43..683083e 100644
--- a/src/progs/direct/base/direct_16.h
+++ b/src/progs/direct/base/direct_16.h
@@ -20,7 +20,7 @@ class pic16 : public Pic8DeviceSpecific
public:
pic16(::Programmer::Base &base) : Pic8DeviceSpecific(base) {}
virtual BitValue get_word();
- virtual BitValue get_byte() { return get_word().tqmaskWith(0xFF); }
+ virtual BitValue get_byte() { return get_word().maskWith(0xFF); }
virtual void send_word(BitValue word);
virtual void send_bits(BitValue d, uint nbBits);
virtual void send_cmd(BitValue d) { send_bits(d, 6); }
diff --git a/src/progs/direct/base/direct_18F.cpp b/src/progs/direct/base/direct_18F.cpp
index 75112c2..5760bf8 100644
--- a/src/progs/direct/base/direct_18F.cpp
+++ b/src/progs/direct/base/direct_18F.cpp
@@ -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").tqmaskWith(tqmask);
+ data[i] = pulseEngine("r").maskWith(tqmask);
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").tqmaskWith(tqmask);
+ data[i] = pulseEngine("R").maskWith(tqmask);
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.tqmaskWith(tqmask);
+ data[i] = w.maskWith(tqmask);
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;
@@ -249,7 +249,7 @@ void Direct::P18F242::configureSinglePanel()
//-----------------------------------------------------------------------------
bool Direct::P18F2539::doErase(bool)
{
- // aptqparently there is no chip erase...
+ // apparently there is no chip erase...
return ( doEraseRange(Pic::MemoryRangeType::Code) && doEraseRange(Pic::MemoryRangeType::Eeprom) );
}
diff --git a/src/progs/icd2/base/icd2_debug.cpp b/src/progs/icd2/base/icd2_debug.cpp
index ba10a4d..5d4a35f 100644
--- a/src/progs/icd2/base/icd2_debug.cpp
+++ b/src/progs/icd2/base/icd2_debug.cpp
@@ -97,14 +97,14 @@ bool Icd2::Debugger::readRegister(const Register::TypeData &data, BitValue &valu
{
if ( data.type()==Register::Special ) {
if ( data.name()=="WREG" ) return hardware()->readRegister(specific()->addressWREG(), value, 1);
- if ( data.name()=="PC" ) { value = hardware()->getProgramCounter().tqmaskWith(specific()->tqmaskPC()); return !hasError(); }
+ if ( data.name()=="PC" ) { value = hardware()->getProgramCounter().maskWith(specific()->maskPC()); return !hasError(); }
Q_ASSERT(false);
return true;
}
TQString name = device()->registersData().sfrNames[data.address()];
if ( name=="WREG" ) return hardware()->readRegister(specific()->addressWREG(), value, 1);
- if ( name=="PCL" ) { value = hardware()->getProgramCounter().tqmaskWith(specific()->tqmaskPC()).byte(0); return !hasError(); }
- if ( name=="PCLATH" ) { value = hardware()->getProgramCounter().tqmaskWith(specific()->tqmaskPC()).byte(1); return !hasError(); }
+ if ( name=="PCL" ) { value = hardware()->getProgramCounter().maskWith(specific()->maskPC()).byte(0); return !hasError(); }
+ if ( name=="PCLATH" ) { value = hardware()->getProgramCounter().maskWith(specific()->maskPC()).byte(1); return !hasError(); }
return hardware()->readRegister(specific()->addressRegister(data.address()), value, 1);
}
diff --git a/src/progs/icd2/base/icd2_debug_specific.cpp b/src/progs/icd2/base/icd2_debug_specific.cpp
index 61bc373..cd05d06 100644
--- a/src/progs/icd2/base/icd2_debug_specific.cpp
+++ b/src/progs/icd2/base/icd2_debug_specific.cpp
@@ -41,7 +41,7 @@ bool Icd2::P16FDebuggerSpecific::setBreakpoint(Address address)
bool Icd2::P16FDebuggerSpecific::readBreakpoint(BitValue &value)
{
if ( !hardware()->readRegister(0x18E, value, 2) ) return false;
- value = value.tqmaskWith(0x1FFF);
+ value = value.maskWith(0x1FFF);
return true;
}
diff --git a/src/progs/icd2/base/icd2_debug_specific.h b/src/progs/icd2/base/icd2_debug_specific.h
index 830ab0f..d14887b 100644
--- a/src/progs/icd2/base/icd2_debug_specific.h
+++ b/src/progs/icd2/base/icd2_debug_specific.h
@@ -25,7 +25,7 @@ public:
DebugProgrammer &programmer() { return base().programmer(); }
::Debugger::PicSpecific *deviceSpecific() { return base().deviceSpecific(); }
virtual Address addressWREG() const = 0;
- virtual BitValue tqmaskPC() const = 0;
+ virtual BitValue maskPC() const = 0;
virtual Address addressRegister(Address address) const = 0;
virtual bool setBreakpoint(Address address) = 0;
virtual bool readBreakpoint(BitValue &value) = 0;
@@ -42,7 +42,7 @@ public:
virtual BitValue writeMaskBreakpointRegister() const { return 0x8000; }
virtual BitValue readMaskBreakpointRegister() const { return 0x1FFF; }
virtual Address addressWREG() const;
- virtual BitValue tqmaskPC() const { return 0x1FFF; }
+ virtual BitValue maskPC() const { return 0x1FFF; }
virtual Address addressRegister(Address address) const;
virtual bool setBreakpoint(Address address);
virtual bool readBreakpoint(BitValue &value);
@@ -80,7 +80,7 @@ class P18FDebuggerSpecific : public DebuggerSpecific
public:
P18FDebuggerSpecific(::Debugger::Base &base);
virtual Address addressWREG() const;
- virtual BitValue tqmaskPC() const { return 0xFFFF; }
+ virtual BitValue maskPC() const { return 0xFFFF; }
virtual Address addressRegister(Address address) const;
virtual bool setBreakpoint(Address address);
virtual bool readBreakpoint(BitValue &value);
diff --git a/src/progs/pickit2v2/base/pickit2v2.cpp b/src/progs/pickit2v2/base/pickit2v2.cpp
index d813a52..8deddc4 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].tqmaskWith(device().tqmask(type)); // ### correct ?
+ data[i] = data[i].maskWith(device().tqmask(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++;
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-30 04:47:57 +0000