From 74f6e9e801b1c9f87b503327c8002ac09dfc29a8 Mon Sep 17 00:00:00 2001 From: donker <donker@astron.nl> Date: Fri, 30 Jul 2021 00:13:46 +0200 Subject: [PATCH] L2SDP-349, update after processing review comment. --- src/opcua/ua_server.cpp | 5 +---- src/periph/fpga.cpp | 4 ++-- src/tools/mmap.cpp | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/opcua/ua_server.cpp b/src/opcua/ua_server.cpp index a3192b0f..29632ef3 100644 --- a/src/opcua/ua_server.cpp +++ b/src/opcua/ua_server.cpp @@ -326,10 +326,7 @@ static UA_StatusCode ua_write_DataSource(UA_Server *server, if (data->hasValue) { unsigned int array_length = 1; uint32_t *data_sdp = new uint32_t[array_length]; - // unsigned int *data_sdp = new unsigned int[array_length]; - //CMData cm = CMData(array_length); - //cm.clear(); - + switch (ntype.identifier.numeric - 1) { case UA_TYPES_STRING: { retval = false; diff --git a/src/periph/fpga.cpp b/src/periph/fpga.cpp index 979d63c9..a32002de 100644 --- a/src/periph/fpga.cpp +++ b/src/periph/fpga.cpp @@ -985,7 +985,7 @@ bool Periph_fpga::read_sst_offload_weighted_subbands(TermOutput& termout, int fo bool Periph_fpga::write_sst_offload_weighted_subbands(uint32_t *data) { - uint32_t *reg = new uint32_t[2]; + uint32_t *reg = new uint32_t[1]; reg[0] = 0; if (data[0] == 0) reg[0] = 1; bool retval = Write("mm/0/REG_DP_SELECTOR/0/input_select", reg); @@ -1146,7 +1146,7 @@ bool Periph_fpga::read_bst_offload_enable(TermOutput& termout, int format) if (Read(regname, data) == false) { retval = false; } - + bool select = (bool)data[0]; *_ptr = select; _ptr++; diff --git a/src/tools/mmap.cpp b/src/tools/mmap.cpp index 913f5462..eed1055d 100644 --- a/src/tools/mmap.cpp +++ b/src/tools/mmap.cpp @@ -105,7 +105,7 @@ CMMap mmap_to_regmap(istringstream& iss) mm_info_t mm_info; mm_info_t last_mm_info; - unsigned long long start_addr44; + uint64_t start_addr44; // 64bit value, but first 44 bits are used for address. int mm_mask_hi, mm_mask_lo; int user_mask_hi, user_mask_lo; -- GitLab