Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

Merge pull request #80 from VILLASframework/refactorCard

Browse source 
Remove duplicate inherited members and functions in PcieCard class
This commit is contained in:
Niklas Eiling 2023-02-10 14:19:59 +01:00 • committed by GitHub
commit dbd496c2c6
3 changed files with 5 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
fpga/include/villas/fpga/card.hpp
View file

@ -21,6 +21,8 @@ class Card
{
public:
bool polling;
std::shared_ptr<kernel::vfio::Container> vfioContainer;
std::shared_ptr<kernel::vfio::Device> vfioDevice;
// Slave address space ID to access the PCIe address space from the
@ -32,13 +34,12 @@ public:
// card.
MemoryManager::AddressSpaceId addrSpaceIdHostToDevice;
std::list<std::shared_ptr<ip::Core> > ips;
std::list<std::shared_ptr<ip::Core>> ips;
virtual ~Card();
bool mapMemoryBlock(const std::shared_ptr<MemoryBlock> block);
bool unmapMemoryBlock(const MemoryBlock &block);
std::shared_ptr<kernel::vfio::Container> vfioContainer;
virtual bool mapMemoryBlock(const std::shared_ptr<MemoryBlock> block);
virtual bool unmapMemoryBlock(const MemoryBlock &block);
std::shared_ptr<ip::Core> lookupIp(const std::string &name) const;
std::shared_ptr<ip::Core> lookupIp(const Vlnv &vlnv) const;

19
fpga/include/villas/fpga/pcie_card.hpp
View file

@ -59,18 +59,6 @@ public:
void dump()
{ }
std::shared_ptr<ip::Core>
lookupIp(const std::string &name) const;
std::shared_ptr<ip::Core>
lookupIp(const Vlnv &vlnv) const;
std::shared_ptr<ip::Core>
lookupIp(const ip::IpIdentifier &id) const;
bool mapMemoryBlock(const MemoryBlock &block);
bool unmapMemoryBlock(const MemoryBlock &block);
public: // TODO: make this private
bool doReset; // Reset VILLASfpga during startup?
int affinity; // Affinity for MSI interrupts
@ -79,13 +67,6 @@ public: // TODO: make this private
std::shared_ptr<kernel::pci::Device> pdev; // PCI device handle
// Slave address space ID to access the PCIe address space from the FPGA
MemoryManager::AddressSpaceId addrSpaceIdDeviceToHost;
// Address space identifier of the master address space of this FPGA card.
// This will be used for address resolution of all IPs on this card.
MemoryManager::AddressSpaceId addrSpaceIdHostToDevice;
protected:
Logger
getLogger() const

33
fpga/lib/pcie_card.cpp
View file

@ -155,39 +155,6 @@ PCIeCard::~PCIeCard()
}
std::shared_ptr<ip::Core> PCIeCard::lookupIp(const std::string &name) const
{
for (auto &ip : ips) {
if (*ip == name) {
return ip;
}
}
return nullptr;
}
std::shared_ptr<ip::Core> PCIeCard::lookupIp(const Vlnv &vlnv) const
{
for (auto &ip : ips) {
if (*ip == vlnv) {
return ip;
}
}
return nullptr;
}
std::shared_ptr<ip::Core> PCIeCard::lookupIp(const ip::IpIdentifier &id) const
{
for (auto &ip : ips) {
if (*ip == id) {
return ip;
}
}
return nullptr;
}
bool PCIeCard::init()
{
logger = getLogger();