sven/libicsneo
1
0
Fork 0
mirror of https://github.com/intrepidcs/libicsneo.git synced 2026-08-05 09:28:40 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
EricLiu2000
2019-08-01 14:07:42 -04:00
parent 055cae1232
commit f41b5c4a79
7 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/posix/ftdi.cpp
-2
View File
@@ -185,7 +185,6 @@ void FTDI::readTask() {
if(readBytes > 0)
readQueue.enqueue_bulk(readbuf, readBytes);
}
EventManager::GetInstance().cancelErrorDowngradingOnCurrentThread();
}
void FTDI::writeTask() {
@@ -198,5 +197,4 @@ void FTDI::writeTask() {
ftdi.write(writeOp.bytes.data(), (int)writeOp.bytes.size());
onWrite();
}
EventManager::GetInstance().cancelErrorDowngradingOnCurrentThread();
}
platform/posix/pcap.cpp
-2
View File
@@ -257,7 +257,6 @@ void PCAP::readTask() {
readQueue.enqueue_bulk(packet.payload.data(), packet.payload.size());
}
EventManager::GetInstance().cancelErrorDowngradingOnCurrentThread();
}
void PCAP::writeTask() {
@@ -281,7 +280,6 @@ void PCAP::writeTask() {
pcap_sendpacket(interface.fp, bs.data(), (int)bs.size());
// TODO Handle packet send errors
}
EventManager::GetInstance().cancelErrorDowngradingOnCurrentThread();
}
PCAP::EthernetPacket::EthernetPacket(const std::vector<uint8_t>& bytestream) {
platform/posix/stm32.cpp
-1
View File
@@ -309,5 +309,4 @@ void STM32::writeTask() {
report(APIEvent::Type::FailedToWrite, APIEvent::Severity::Error);
onWrite();
}
EventManager::GetInstance().cancelErrorDowngradingOnCurrentThread();
}
platform/windows/pcap.cpp
-2
View File
@@ -276,7 +276,6 @@ void PCAP::readTask() {
readQueue.enqueue_bulk(packet.payload.data(), packet.payload.size());
}
EventManager::GetInstance().cancelErrorDowngradingOnCurrentThread();
}
void PCAP::writeTask() {
@@ -301,7 +300,6 @@ void PCAP::writeTask() {
onWrite();
// TODO Handle packet send errors
}
EventManager::GetInstance().cancelErrorDowngradingOnCurrentThread();
}
PCAP::EthernetPacket::EthernetPacket(const std::vector<uint8_t>& bytestream) {
platform/windows/vcp.cpp
-2
View File
@@ -385,7 +385,6 @@ void VCP::readTask() {
}
}
}
EventManager::GetInstance().cancelErrorDowngradingOnCurrentThread();
}
void VCP::writeTask() {
@@ -428,5 +427,4 @@ void VCP::writeTask() {
}
}
}
EventManager::GetInstance().cancelErrorDowngradingOnCurrentThread();
}