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

Device: Extend open() API for long-running tasks

Browse Source
This commit is contained in:
Paul Hollinsky
2021-04-29 19:08:31 -04:00
parent 3d4e0a27e3
commit b7c7d4349a
3 changed files with 56 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
device/device.cpp
+6 -5
View File
@@ -2,6 +2,7 @@
#include "icsneo/communication/message/callback/messagecallback.h"
#include "icsneo/api/eventmanager.h"
#include "icsneo/communication/command.h"
#include "icsneo/device/extensions/deviceextension.h"
#include <string.h>
#include <iostream>
#include <sstream>
@@ -164,7 +165,7 @@ void Device::enforcePollingMessageLimit() {
}
}
bool Device::open() {
bool Device::open(OpenFlags flags, OpenStatusHandler handler) {
if(!com) {
report(APIEvent::Type::Unknown, APIEvent::Severity::Error);
return false;
@@ -178,8 +179,8 @@ bool Device::open() {
if(attemptErr != APIEvent::Type::NoErrorFound) {
// We could not communicate with the device, let's see if an extension can
bool tryAgain = false;
forEachExtension([&tryAgain](const std::shared_ptr<DeviceExtension>& ext) -> bool {
if(ext->onDeviceCommunicationDead())
forEachExtension([&tryAgain, &flags, &handler](const std::shared_ptr<DeviceExtension>& ext) -> bool {
if(ext->onDeviceCommunicationDead(flags, handler))
tryAgain = true;
return true;
});
@@ -197,8 +198,8 @@ bool Device::open() {
}
bool block = false;
forEachExtension([&block](const std::shared_ptr<DeviceExtension>& ext) {
if(ext->onDeviceOpen())
forEachExtension([&block, &flags, &handler](const std::shared_ptr<DeviceExtension>& ext) {
if(ext->onDeviceOpen(flags, handler))
return true;
block = true;
return false;