mirror of
https://github.com/intrepidcs/libicsneo.git
synced 2026-08-05 01:18:36 +02:00
Device: Add disk read driver framework
Allow access to the device's logical disk. At the moment, no drivers are implemented, so all devices have Access::None.
This commit is contained in:
@@ -16,6 +16,8 @@
|
||||
#include "icsneo/device/nullsettings.h"
|
||||
#include "icsneo/device/devicetype.h"
|
||||
#include "icsneo/device/deviceversion.h"
|
||||
#include "icsneo/disk/diskreaddriver.h"
|
||||
#include "icsneo/disk/nulldiskreaddriver.h"
|
||||
#include "icsneo/communication/communication.h"
|
||||
#include "icsneo/communication/packetizer.h"
|
||||
#include "icsneo/communication/encoder.h"
|
||||
@@ -139,6 +141,23 @@ public:
|
||||
virtual size_t getNetworkCountByType(Network::Type) const;
|
||||
virtual Network getNetworkByNumber(Network::Type, size_t) const;
|
||||
|
||||
/**
|
||||
* Read from the logical disk in this device, starting from byte `pos`
|
||||
* and reading up to `amount` bytes.
|
||||
*
|
||||
* The number of bytes read will be returned in case of success.
|
||||
*
|
||||
* If the number of bytes read is less than the amount requested,
|
||||
* an error will be set in icsneo::GetLastError() explaining why.
|
||||
* Likely, either the end of the logical disk has been reached, or
|
||||
* the timeout was reached while the read had only partially completed.
|
||||
*
|
||||
* Upon failure, icsneo::nullopt will be returned and an error will be
|
||||
* set in icsneo::GetLastError().
|
||||
*/
|
||||
optional<uint64_t> readLogicalDisk(uint64_t pos, uint8_t* into, uint64_t amount,
|
||||
std::chrono::milliseconds timeout = DiskReadDriver::DefaultTimeout);
|
||||
|
||||
/**
|
||||
* Retrieve the number of Ethernet (DoIP) Activation lines present
|
||||
* on this device.
|
||||
@@ -257,7 +276,7 @@ protected:
|
||||
data.device = this;
|
||||
}
|
||||
|
||||
template<typename Driver, typename Settings = NullSettings>
|
||||
template<typename Driver, typename Settings = NullSettings, typename DiskRead = NullDiskReadDriver>
|
||||
void initialize() {
|
||||
report = makeEventHandler();
|
||||
auto driver = makeDriver<Driver>();
|
||||
@@ -270,6 +289,7 @@ protected:
|
||||
setupCommunication(*com);
|
||||
settings = makeSettings<Settings>(com);
|
||||
setupSettings(*settings);
|
||||
diskReadDriver = std::make_unique<DiskRead>();
|
||||
setupSupportedRXNetworks(supportedRXNetworks);
|
||||
setupSupportedTXNetworks(supportedTXNetworks);
|
||||
setupExtensions();
|
||||
@@ -345,6 +365,7 @@ private:
|
||||
neodevice_t data;
|
||||
std::shared_ptr<ResetStatusMessage> latestResetStatus;
|
||||
std::vector<optional<DeviceAppVersion>> versions;
|
||||
std::unique_ptr<DiskReadDriver> diskReadDriver;
|
||||
|
||||
mutable std::mutex extensionsLock;
|
||||
std::vector<std::shared_ptr<DeviceExtension>> extensions;
|
||||
|
||||
Reference in New Issue
Block a user