detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-08-03 09:18:10 +02:00
Code Issues Actions Packages Releases Activity

moved memory for Bus communication to BucCommunication class

Browse Source
This commit is contained in:
mazzol_a
2026-05-29 15:55:12 +02:00
parent 7d8a7ade00
commit b9ef4bc615
4 changed files with 53 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
slsDetectorServers/slsDetectorServer_cpp/include/ArmBusCommunication.hpp
+30 -33
View File
@@ -14,26 +14,12 @@
namespace sls {
template <typename IPCoreEnumType, typename MemoryModel>
struct IpCoreRegisterBlock {
template <typename IPCores, typename MemoryModel> class BusCommunication {
const std::map<IPCoreEnumType, MemoryModel> &operator()() const {
return memoryblocks_;
}
std::map<IPCoreEnumType, MemoryModel> &operator()() {
return memoryblocks_;
}
private:
std::map<IPCoreEnumType, MemoryModel> memoryblocks_;
};
template <typename IPCoreEnumType, typename MemoryModel>
class BusCommunication {
using IPCoreEnumType = typename IPCores::ipcore_enum_type;
public:
BusCommunication() = default;
BusCommunication();
void mapToMemory();
@@ -41,48 +27,59 @@ class BusCommunication {
void writeRegister(const Register &register_, const uint32_t data);
private:
/// @brief stores register blocks for each IP core
IpCoreRegisterBlock<IPCoreEnumType, MemoryModel> ipcoreregisterblocks;
void bus_w(const uint32_t offset, IPCoreEnumType baseadress,
const uint32_t data);
uint32_t bus_r(const uint32_t offset, IPCoreEnumType baseadress) const;
/// @brief map from id of IP Core to memory model for the register block of
/// the IP core
std::map<IPCoreEnumType, MemoryModel> ipcoreregisterblocks{};
};
template <typename IPCoreEnumType, typename MemoryModel>
void BusCommunication<IPCoreEnumType, MemoryModel>::mapToMemory() {
template <typename IPCores, typename MemoryModel>
BusCommunication<IPCores, MemoryModel>::BusCommunication() {
for (auto &map_elem : ipcoreregisterblocks()) {
for (const auto &ip_core : IPCores::ipcores) {
ipcoreregisterblocks.emplace(ip_core,
MemoryModel{static_cast<uint32_t>(ip_core),
IPCores::ip_core_block_size});
}
}
template <typename IPCores, typename MemoryModel>
void BusCommunication<IPCores, MemoryModel>::mapToMemory() {
for (auto &map_elem : ipcoreregisterblocks) {
map_elem.second.mapToMemory();
}
}
template <typename IPCoreEnumType, typename MemoryModel>
uint32_t BusCommunication<IPCoreEnumType, MemoryModel>::readRegister(
template <typename IPCores, typename MemoryModel>
uint32_t BusCommunication<IPCores, MemoryModel>::readRegister(
const Register &register_) const {
return bus_r(register_.offset_in_bytes, register_.ip_core);
}
template <typename IPCoreEnumType, typename MemoryModel>
void BusCommunication<IPCoreEnumType, MemoryModel>::writeRegister(
template <typename IPCores, typename MemoryModel>
void BusCommunication<IPCores, MemoryModel>::writeRegister(
const Register &register_, const uint32_t data) {
bus_w(register_.offset_in_bytes, register_.ip_core, data);
}
template <typename IPCoreEnumType, typename MemoryModel>
uint32_t BusCommunication<IPCoreEnumType, MemoryModel>::bus_r(
template <typename IPCores, typename MemoryModel>
uint32_t BusCommunication<IPCores, MemoryModel>::bus_r(
const uint32_t offset, const IPCoreEnumType baseadress) const {
auto ptr1 = ipcoreregisterblocks().at(baseadress).getMappedMemoryPtr() +
auto ptr1 = ipcoreregisterblocks.at(baseadress).getMappedMemoryPtr() +
offset / (sizeof(uint32_t));
return *ptr1;
}
template <typename IPCoreEnumType, typename MemoryModel>
void BusCommunication<IPCoreEnumType, MemoryModel>::bus_w(
template <typename IPCores, typename MemoryModel>
void BusCommunication<IPCores, MemoryModel>::bus_w(
const uint32_t offset, const IPCoreEnumType baseadress,
const uint32_t data) {
auto ptr1 = ipcoreregisterblocks().at(baseadress).getMappedMemoryPtr() +
auto ptr1 = ipcoreregisterblocks.at(baseadress).getMappedMemoryPtr() +
offset / (sizeof(uint32_t));
*ptr1 = data;
}