sven
/
libicsneo
mirror of https://github.com/intrepidcs/libicsneo.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Removed cancellation of error downgrading after closing, was causing read access violations.

checksum-failure-logging
EricLiu2000 2019-08-01 14:07:42 -04:00
parent 055cae1232
commit f41b5c4a79
7 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
communication/communication.cpp
View File

@ -168,6 +168,4 @@ void Communication::readTask() {
} }
} }
} }
EventManager::GetInstance().cancelErrorDowngradingOnCurrentThread();
} }

1
communication/multichannelcommunication.cpp
View File

@ -129,5 +129,4 @@ void MultiChannelCommunication::readTask() {
} }
} }
EventManager::GetInstance().cancelErrorDowngradingOnCurrentThread();
} }

2
platform/posix/ftdi.cpp
View File

@ -185,7 +185,6 @@ void FTDI::readTask() {
if(readBytes > 0) if(readBytes > 0)
readQueue.enqueue_bulk(readbuf, readBytes); readQueue.enqueue_bulk(readbuf, readBytes);
} }
EventManager::GetInstance().cancelErrorDowngradingOnCurrentThread();
} }
void FTDI::writeTask() { void FTDI::writeTask() {
@ -198,5 +197,4 @@ void FTDI::writeTask() {
ftdi.write(writeOp.bytes.data(), (int)writeOp.bytes.size()); ftdi.write(writeOp.bytes.data(), (int)writeOp.bytes.size());
onWrite(); onWrite();
} }
EventManager::GetInstance().cancelErrorDowngradingOnCurrentThread();
} }

2
platform/posix/pcap.cpp
View File

@ -257,7 +257,6 @@ void PCAP::readTask() {
readQueue.enqueue_bulk(packet.payload.data(), packet.payload.size()); readQueue.enqueue_bulk(packet.payload.data(), packet.payload.size());
} }
EventManager::GetInstance().cancelErrorDowngradingOnCurrentThread();
} }
void PCAP::writeTask() { void PCAP::writeTask() {
@ -281,7 +280,6 @@ void PCAP::writeTask() {
pcap_sendpacket(interface.fp, bs.data(), (int)bs.size()); pcap_sendpacket(interface.fp, bs.data(), (int)bs.size());
// TODO Handle packet send errors // TODO Handle packet send errors
} }
EventManager::GetInstance().cancelErrorDowngradingOnCurrentThread();
} }
PCAP::EthernetPacket::EthernetPacket(const std::vector<uint8_t>& bytestream) { PCAP::EthernetPacket::EthernetPacket(const std::vector<uint8_t>& bytestream) {

1
platform/posix/stm32.cpp
View File

@ -309,5 +309,4 @@ void STM32::writeTask() {
report(APIEvent::Type::FailedToWrite, APIEvent::Severity::Error); report(APIEvent::Type::FailedToWrite, APIEvent::Severity::Error);
onWrite(); onWrite();
} }
EventManager::GetInstance().cancelErrorDowngradingOnCurrentThread();
} }

2
platform/windows/pcap.cpp
View File

@ -276,7 +276,6 @@ void PCAP::readTask() {
readQueue.enqueue_bulk(packet.payload.data(), packet.payload.size()); readQueue.enqueue_bulk(packet.payload.data(), packet.payload.size());
} }
EventManager::GetInstance().cancelErrorDowngradingOnCurrentThread();
} }
void PCAP::writeTask() { void PCAP::writeTask() {
@ -301,7 +300,6 @@ void PCAP::writeTask() {
onWrite(); onWrite();
// TODO Handle packet send errors // TODO Handle packet send errors
} }
EventManager::GetInstance().cancelErrorDowngradingOnCurrentThread();
} }
PCAP::EthernetPacket::EthernetPacket(const std::vector<uint8_t>& bytestream) { PCAP::EthernetPacket::EthernetPacket(const std::vector<uint8_t>& bytestream) {

2
platform/windows/vcp.cpp
View File

@ -385,7 +385,6 @@ void VCP::readTask() {
} }
} }
} }
EventManager::GetInstance().cancelErrorDowngradingOnCurrentThread();
} }
void VCP::writeTask() { void VCP::writeTask() {
@ -428,5 +427,4 @@ void VCP::writeTask() {
} }
} }
} }
EventManager::GetInstance().cancelErrorDowngradingOnCurrentThread();
} }