fix: FpgaMemBufferOverAxi

Required for cases where one cannot point u-dma-buf at a physical
region, e.g. PL-DDR

Author: patrislav1

example/demo_cpp/src/axi_dma_demo.cpp

@@ -17,6 +17,7 @@
 #include "DataHandlerPrint.hpp"
 #include "UioGpioStatus.hpp"
 #include "UioTrafficGen.hpp"
+#include "udmaio/FpgaMemBufferOverAxi.hpp"
 #include "udmaio/FpgaMemBufferOverXdma.hpp"
 #include "udmaio/Logging.hpp"
 #include "udmaio/UDmaBuf.hpp"
@@ -119,7 +120,10 @@ int main(int argc, char* argv[]) {
 
     std::unique_ptr<DmaBufferAbstract> udmabuf;
     if (mode == DmaMode::UIO) {
-        udmabuf = std::make_unique<UDmaBuf>();
+        UioDeviceLocation plddr_test{"plddr-axi-test", {}};
+
+        // udmabuf = std::make_unique<UDmaBuf>();
+        udmabuf = std::make_unique<FpgaMemBufferOverAxi>(plddr_test);
     } else {
         udmabuf =
             std::make_unique<FpgaMemBufferOverXdma>(dev_path, target_hw_consts::fpga_mem_phys_addr);

pyudmaio/pyudmaio/__init__.py

@@ -1,7 +1,7 @@
 # Copyright (c) 2021 Deutsches Elektronen-Synchrotron DESY
 
 from pyudmaio.binding import UioIf, ConfigUio, ConfigXdma, UioDeviceLocation, UioRegion
-from pyudmaio.binding import FpgaMemBufferOverXdma, UDmaBuf, UioAxiDmaIf, UioMemSgdma, DataHandler
+from pyudmaio.binding import FpgaMemBufferOverXdma, FpgaMemBufferOverAxi, UDmaBuf, UioAxiDmaIf, UioMemSgdma, DataHandler
 from pyudmaio.binding import LogLevel, set_logging_level
 from pyudmaio.binding import FrameFormat
 from pyudmaio._UioReg import UioReg

pyudmaio/src/PythonBinding.cpp

@@ -9,11 +9,13 @@
 
 // Copyright (c) 2021 Deutsches Elektronen-Synchrotron DESY
 
+#include <cstdint>
+
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
 #include "DataHandlerPython.hpp"
-// #include "udmaio/FpgaMemBufferOverAxi.hpp"
+#include "udmaio/FpgaMemBufferOverAxi.hpp"
 #include "udmaio/FpgaMemBufferOverXdma.hpp"
 #include "udmaio/FrameFormat.hpp"
 #include "udmaio/Logging.hpp"
@@ -51,7 +53,7 @@ PYBIND11_MODULE(binding, m) {
     py::class_<udmaio::UioDeviceLocation>(m, "UioDeviceLocation")
         .def(py::init<std::string, udmaio::UioRegion, std::string>(),
              py::arg("uioname"),
-             py::arg("xdmaregion"),
+             py::arg("xdmaregion") = udmaio::UioRegion({0, 0}),
              py::arg("xdmaevtdev") = std::string(""))
         .def_static("set_link_axi", &udmaio::UioDeviceLocation::set_link_axi)
         .def_static("set_link_xdma", &udmaio::UioDeviceLocation::set_link_xdma)
@@ -88,13 +90,11 @@ PYBIND11_MODULE(binding, m) {
         "DmaBufferAbstract")
         .def("get_phys_region", &udmaio::DmaBufferAbstract::get_phys_region);
 
-#if 0  // FIXME
     py::class_<udmaio::FpgaMemBufferOverAxi,
                udmaio::DmaBufferAbstract,
                udmaio::UioIf,
                std::shared_ptr<udmaio::FpgaMemBufferOverAxi>>(m, "FpgaMemBufferOverAxi")
         .def(py::init<udmaio::UioDeviceLocation>());
-#endif
 
     py::class_<udmaio::FpgaMemBufferOverXdma,
                udmaio::DmaBufferAbstract,