Skip to content

B
Beam Positoning Monitor - Software
Commit b442b6c3 authored by Lucas Russo's avatar Lucas Russo
Browse files
Options

libs/libhutils/*: add support for "fmc_board" parameter

parent b56ae507
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 0 deletions
src/libs/libhutils/include/hutils_utils.h
View file @ b442b6c3
...@@ -34,6 +34,7 @@ extern "C" { ...@@ -34,6 +34,7 @@ extern "C" {
typedef struct { typedef struct {
char *bind; /* AFE Endpoint address to bind to */ char *bind; /* AFE Endpoint address to bind to */
char *fmc_board; /* FMC board type */
bool spawn_epics_ioc; /* DBE IOC spawn selection */ bool spawn_epics_ioc; /* DBE IOC spawn selection */
} hutils_hints_t; } hutils_hints_t;
......
src/libs/libhutils/src/hutils_utils.c
View file @ b442b6c3
...@@ -391,6 +391,17 @@ hutils_err_e hutils_get_hints (zconfig_t *root_cfg, zhashx_t *hints_h) ...@@ -391,6 +391,17 @@ hutils_err_e hutils_get_hints (zconfig_t *root_cfg, zhashx_t *hints_h)
item = (hutils_hints_t *) zmalloc (sizeof *item); item = (hutils_hints_t *) zmalloc (sizeof *item);
ASSERT_ALLOC(item, err_hash_item_alloc, HUTILS_ERR_ALLOC); ASSERT_ALLOC(item, err_hash_item_alloc, HUTILS_ERR_ALLOC);
/* We expect to the FMC board type of this bpm/board instance
* in the configuration file */
char *fmc_board = zconfig_resolve (bpm_cfg, "/dbe/fmc_board",
NULL);
ASSERT_TEST (fmc_board != NULL, "[hutils:utils] Could not find "
"FMC Board type (fmc_board = <value>) in configuration file", err_fmc_board,
HUTILS_ERR_CFG);
item->fmc_board = strdup (fmc_board);
ASSERT_ALLOC(item->fmc_board, err_hash_fmc_board, HUTILS_ERR_ALLOC);
/* Now, we expect to find the bind address of this bpm/board instance /* Now, we expect to find the bind address of this bpm/board instance
* in the configuration file */ * in the configuration file */
char *afe_bind = zconfig_resolve (bpm_cfg, "/afe/bind", char *afe_bind = zconfig_resolve (bpm_cfg, "/afe/bind",
...@@ -457,6 +468,9 @@ err_spawn_epics_ioc: ...@@ -457,6 +468,9 @@ err_spawn_epics_ioc:
free (item->bind); free (item->bind);
err_hash_bind_alloc: err_hash_bind_alloc:
err_afe_bind: err_afe_bind:
free (item->fmc_board);
err_hash_fmc_board:
err_fmc_board:
free (item); free (item);
err_hash_item_alloc: err_hash_item_alloc:
err_cfg_exit: err_cfg_exit:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment