From 6846511ce1591ae101c22fc69e4b5b09689317cd Mon Sep 17 00:00:00 2001
From: donker <donker@astron.nl>
Date: Thu, 29 Jul 2021 15:11:38 +0200
Subject: [PATCH] L2SDP-349, backup before review
---
src/node.cpp | 10 +++++-----
src/periph/fpga.cpp | 5 +++--
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/node.cpp b/src/node.cpp
index bc8c1fbb..c2856b53 100644
--- a/src/node.cpp
+++ b/src/node.cpp
@@ -297,9 +297,9 @@ bool Node::exec_cmd(const char cmd, const string relative_addr,
} else {
memcpy((void *)p.data, (void *)data, nvalues*sizeof(unsigned int));
}
- // cout << " p.relative_addr=" << p.relative_addr << endl;
- // cout << " p.nvalues=" << p.nvalues << endl;
- // cout << " p.format=" << p.format << endl;
+ // cout << " p.relative_addr=" << p.relative_addr
+ // << " p.nvalues=" << p.nvalues
+ // << " p.format=" << p.format;
}
array<unsigned char, cmd_buf_size> outbuf;
@@ -322,8 +322,8 @@ bool Node::exec_reply(TermOutput& termout)
termout.nof_vals = r->nof_vals;
termout.datatype = r->datatype;
- // cout << "received " << r->nof_vals << " bytes from worker node=" << GlobalNr << " retval=" << r->retval
- // << " datatype=" << r->datatype << endl;
+ // cout << "received " << r->nof_vals << " bytes from worker node=" << GlobalNr
+ // << " retval=" << r->retval << " datatype=" << r->datatype << endl;
if (GetEnabled() && !r->retval) {
//cout << "no retval" << endl;
diff --git a/src/periph/fpga.cpp b/src/periph/fpga.cpp
index 1a8741dc..979d63c9 100644
--- a/src/periph/fpga.cpp
+++ b/src/periph/fpga.cpp
@@ -1142,10 +1142,11 @@ bool Periph_fpga::read_bst_offload_enable(TermOutput& termout, int format)
bool *_ptr = (bool *)termout.val;
for (uint32_t i=0; i<C_N_beamsets; i++) {
memset((void *)data, 0, sizeof(data));
- regname = "mm/" + to_string(i) + "/REG_STAT_HDR_DAT_BST/0/enable";
+ regname = "mm/" + to_string(i) + "/REG_STAT_ENABLE_BST/0/enable";
if (Read(regname, data) == false) {
retval = false;
}
+
bool select = (bool)data[0];
*_ptr = select;
_ptr++;
@@ -1160,7 +1161,7 @@ bool Periph_fpga::write_bst_offload_enable(uint32_t *data)
bool retval = true;
string regname;
for (uint32_t i=0; i<C_N_beamsets; i++) {
- regname = "mm/" + to_string(i) + "/REG_STAT_HDR_DAT_BST/0/enable";
+ regname = "mm/" + to_string(i) + "/REG_STAT_ENABLE_BST/0/enable";
if (Write(regname, &data[i]) == false) {
retval = false;
}
--
GitLab