From 9e89ba32c207f211277261f3c75b20010fd586e6 Mon Sep 17 00:00:00 2001 From: Pascal Bauer Date: Tue, 30 Jul 2024 19:21:34 +0200 Subject: [PATCH] make baseaddress optional, remove debug output Signed-off-by: Pascal Bauer --- fpga/lib/core.cpp | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/fpga/lib/core.cpp b/fpga/lib/core.cpp index ed0e3779d..f6ee5c7f2 100644 --- a/fpga/lib/core.cpp +++ b/fpga/lib/core.cpp @@ -132,17 +132,12 @@ CoreFactory::configureIps(std::list orderedIps, json_t *json_ips, // parse ip baseadress json_t *json_parameters = json_object_get(json_ip, "parameters"); - if (!json_is_object(json_parameters)) { - logger->debug("Parameters of ip {} are empty.", ip->id.getName()); - } else { - json_int_t c_baseaddr; - json_error_t err; - int ret = json_unpack_ex(json_parameters, &err, 0, "{ s: I }", - "c_baseaddr", &c_baseaddr); - if (ret != 0) - throw ConfigError(json_parameters, err, "", - "Cannot parse baseaddress from parameters"); - ip->baseaddr = c_baseaddr; + if (json_is_object(json_parameters)) { + json_int_t c_baseaddr = 0; + int baseaddress_found = + json_unpack(json_parameters, "{ s: I }", "c_baseaddr", &c_baseaddr); + if (baseaddress_found == 0) + ip->baseaddr = c_baseaddr; } json_t *json_irqs = json_object_get(json_ip, "irqs");