version 1.0.0-rc.24
This commit is contained in:
@@ -2,17 +2,19 @@
|
||||
|
||||
#include "PCIExpressDevice.h"
|
||||
#include "../common/NetworkAddressConvert.h"
|
||||
#define PCI_EXCEPT(x) try {x;} catch (const std::exception &e) { throw PCIeDeviceException(e.what()); }
|
||||
|
||||
PCIExpressDevice::PCIExpressDevice(uint16_t data_stream, uint16_t pci_slot) :
|
||||
PCIExpressDevice(data_stream, "/dev/jfjoch" + std::to_string(pci_slot)) {}
|
||||
|
||||
PCIExpressDevice::PCIExpressDevice(uint16_t data_stream) :
|
||||
PCIExpressDevice(data_stream, "/dev/jfjoch" + std::to_string(data_stream)) {}
|
||||
PCIExpressDevice(data_stream, "/dev/jfjoch" + std::to_string(data_stream)) {}
|
||||
|
||||
PCIExpressDevice::PCIExpressDevice(uint16_t data_stream, const std::string &device_name)
|
||||
: FPGAAcquisitionDevice(data_stream), dev(device_name, true) {
|
||||
: FPGAAcquisitionDevice(data_stream), dev(device_name, true) {
|
||||
|
||||
DataCollectionStatus status = dev.GetDataCollectionStatus();
|
||||
DataCollectionStatus status;
|
||||
PCI_EXCEPT(status = dev.GetDataCollectionStatus())
|
||||
|
||||
max_modules = status.max_modules;
|
||||
if (max_modules == 0)
|
||||
@@ -31,78 +33,88 @@ PCIExpressDevice::PCIExpressDevice(uint16_t data_stream, const std::string &devi
|
||||
}
|
||||
|
||||
bool PCIExpressDevice::HW_ReadMailbox(uint32_t *values) {
|
||||
return dev.ReadWorkCompletion(values);
|
||||
PCI_EXCEPT(return dev.ReadWorkCompletion(values);)
|
||||
}
|
||||
|
||||
void PCIExpressDevice::Cancel() {
|
||||
dev.Cancel();
|
||||
PCI_EXCEPT(dev.Cancel();)
|
||||
}
|
||||
|
||||
bool PCIExpressDevice::HW_SendWorkRequest(uint32_t handle) {
|
||||
return dev.SendWorkRequest(handle);
|
||||
PCI_EXCEPT(return dev.SendWorkRequest(handle);)
|
||||
}
|
||||
|
||||
void PCIExpressDevice::FPGA_StartAction(const DiffractionExperiment &experiment) {
|
||||
dev.Start();
|
||||
PCI_EXCEPT(dev.Start();)
|
||||
}
|
||||
|
||||
void PCIExpressDevice::HW_RunInternalGenerator(const FrameGeneratorConfig &config) {
|
||||
dev.RunFrameGenerator(config);
|
||||
PCI_EXCEPT(dev.RunFrameGenerator(config);)
|
||||
}
|
||||
|
||||
void PCIExpressDevice::FPGA_EndAction() {
|
||||
dev.End();
|
||||
PCI_EXCEPT(dev.End();)
|
||||
}
|
||||
|
||||
bool PCIExpressDevice::HW_IsIdle() const {
|
||||
return dev.IsIdle();
|
||||
PCI_EXCEPT(return dev.IsIdle();)
|
||||
}
|
||||
|
||||
void PCIExpressDevice::HW_WriteActionRegister(const DataCollectionConfig *config) {
|
||||
dev.SetConfig(*config);
|
||||
PCI_EXCEPT(dev.SetConfig(*config);)
|
||||
}
|
||||
|
||||
void PCIExpressDevice::HW_ReadActionRegister(DataCollectionConfig *config) {
|
||||
*config = dev.GetConfig();
|
||||
PCI_EXCEPT(*config = dev.GetConfig();)
|
||||
}
|
||||
|
||||
std::string PCIExpressDevice::GetMACAddress() const {
|
||||
return MacAddressToStr(dev.GetMACAddress());
|
||||
PCI_EXCEPT(return MacAddressToStr(dev.GetMACAddress());)
|
||||
}
|
||||
|
||||
uint32_t PCIExpressDevice::GetNumKernelBuffers() const {
|
||||
return dev.GetBufferCount();
|
||||
PCI_EXCEPT(return dev.GetBufferCount();)
|
||||
}
|
||||
|
||||
int32_t PCIExpressDevice::GetNUMANode() const {
|
||||
return dev.GetNumaNode();
|
||||
PCI_EXCEPT(return dev.GetNumaNode();)
|
||||
}
|
||||
|
||||
void PCIExpressDevice::SetIPv4Address(uint32_t ipv4_addr_network_order) {
|
||||
PCI_EXCEPT(
|
||||
// Configure all links with the same IPv4 address
|
||||
auto dev_status = dev.GetDeviceStatus();
|
||||
for (int i = 0; i < dev_status.eth_link_count; i++)
|
||||
dev.SetIPv4Address(ipv4_addr_network_order, i);
|
||||
dev.SetIPv4Address(ipv4_addr_network_order, NET_IF_FRAME_GENERATOR);
|
||||
auto dev_status = dev.GetDeviceStatus();
|
||||
for (int i = 0; i < dev_status.eth_link_count; i++)
|
||||
dev.SetIPv4Address(ipv4_addr_network_order, i);
|
||||
dev.SetIPv4Address(ipv4_addr_network_order, NET_IF_FRAME_GENERATOR);
|
||||
)
|
||||
}
|
||||
|
||||
std::string PCIExpressDevice::GetIPv4Address() const {
|
||||
PCI_EXCEPT(
|
||||
return IPv4AddressToStr(dev.GetIPv4Address());
|
||||
)
|
||||
}
|
||||
|
||||
void PCIExpressDevice::HW_SetSpotFinderParameters(const SpotFinderParameters ¶ms) {
|
||||
dev.SetSpotFinderParameters(params);
|
||||
PCI_EXCEPT(
|
||||
dev.SetSpotFinderParameters(params);
|
||||
)
|
||||
}
|
||||
|
||||
DeviceStatus PCIExpressDevice::GetDeviceStatus() const {
|
||||
return dev.GetDeviceStatus();
|
||||
PCI_EXCEPT(
|
||||
return dev.GetDeviceStatus();
|
||||
)
|
||||
}
|
||||
|
||||
DataCollectionStatus PCIExpressDevice::GetDataCollectionStatus() const {
|
||||
return dev.GetDataCollectionStatus();
|
||||
PCI_EXCEPT(
|
||||
return dev.GetDataCollectionStatus();
|
||||
)
|
||||
}
|
||||
|
||||
void PCIExpressDevice::HW_LoadCalibration(const LoadCalibrationConfig &config) {
|
||||
dev.LoadCalibration(config);
|
||||
PCI_EXCEPT(dev.LoadCalibration(config);)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user