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

Refactor ICommunication/Transport => Driver

Browse Source
This commit is contained in:
Paul Hollinsky
2020-03-09 14:09:27 -04:00
parent d8798acaa7
commit 38e24d7641
17 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/icsneo/platform/posix/ftdi.h
+2 -2
View File
@@ -6,13 +6,13 @@
#include <string>
#include <ftdi.h>
#include "icsneo/device/neodevice.h"
#include "icsneo/communication/icommunication.h"
#include "icsneo/communication/driver.h"
#include "icsneo/third-party/concurrentqueue/blockingconcurrentqueue.h"
#include "icsneo/api/eventmanager.h"
namespace icsneo {
class FTDI : public ICommunication {
class FTDI : public Driver {
public:
static std::vector<neodevice_t> FindByProduct(int product);
include/icsneo/platform/posix/pcap.h
+2 -2
View File
@@ -2,14 +2,14 @@
#define __PCAP_POSIX_H_
#include "icsneo/device/neodevice.h"
#include "icsneo/communication/icommunication.h"
#include "icsneo/communication/driver.h"
#include "icsneo/api/eventmanager.h"
#include <string>
#include <pcap.h>
namespace icsneo {
class PCAP : public ICommunication {
class PCAP : public Driver {
public:
class PCAPFoundDevice {
public:
include/icsneo/platform/posix/stm32.h
+3 -3
View File
@@ -1,7 +1,7 @@
#ifndef __STM32_POSIX_H_
#define __STM32_POSIX_H_
#include "icsneo/communication/icommunication.h"
#include "icsneo/communication/driver.h"
#include "icsneo/device/neodevice.h"
#include "icsneo/api/eventmanager.h"
#include <chrono>
@@ -9,7 +9,7 @@
namespace icsneo {
class STM32 : public ICommunication {
class STM32 : public Driver {
public:
/*
* Note: This is a driver for all devices which use CDC_ACM
@@ -21,7 +21,7 @@ public:
* in stm32linux.cpp and stm32darwin.cpp respectively
* Other POSIX systems (BSDs, QNX, etc) will need bespoke code written in the future
*/
STM32(const device_eventhandler_t& err, neodevice_t& forDevice) : ICommunication(err), device(forDevice) {}
STM32(const device_eventhandler_t& err, neodevice_t& forDevice) : Driver(err), device(forDevice) {}
static std::vector<neodevice_t> FindByProduct(int product);
bool open();
include/icsneo/platform/windows/pcap.h
+2 -2
View File
@@ -3,13 +3,13 @@
#include "icsneo/platform/windows/internal/pcapdll.h"
#include "icsneo/device/neodevice.h"
#include "icsneo/communication/icommunication.h"
#include "icsneo/communication/driver.h"
#include "icsneo/api/eventmanager.h"
#include <string>
namespace icsneo {
class PCAP : public ICommunication {
class PCAP : public Driver {
public:
class PCAPFoundDevice {
public:
include/icsneo/platform/windows/vcp.h
+3 -3
View File
@@ -8,19 +8,19 @@
#include <chrono>
#include <Windows.h>
#include "icsneo/device/neodevice.h"
#include "icsneo/communication/icommunication.h"
#include "icsneo/communication/driver.h"
#include "icsneo/api/eventmanager.h"
namespace icsneo {
// Virtual COM Port Communication
class VCP : public ICommunication {
class VCP : public Driver {
public:
static std::vector<neodevice_t> FindByProduct(int product, std::vector<std::wstring> driverName);
static bool IsHandleValid(neodevice_handle_t handle);
typedef void(*fn_boolCallback)(bool success);
VCP(const device_eventhandler_t& err, neodevice_t& forDevice) : ICommunication(err), device(forDevice) {
VCP(const device_eventhandler_t& err, neodevice_t& forDevice) : Driver(err), device(forDevice) {
overlappedRead.hEvent = INVALID_HANDLE_VALUE;
overlappedWrite.hEvent = INVALID_HANDLE_VALUE;
overlappedWait.hEvent = INVALID_HANDLE_VALUE;