Skip to content

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

libs/libbpmclient/*: fix non protocol conformant functions

parent a0f3f992
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 29 deletions
src/libs/libbpmclient/include/bpm_client_core.h
View file @ 9d80fdf5
...@@ -85,12 +85,24 @@ uint32_t bpm_client_get_timeout (bpm_client_t *self); ...@@ -85,12 +85,24 @@ uint32_t bpm_client_get_timeout (bpm_client_t *self);
* purposes. * purposes.
* Returns BPM_CLIENT_SUCCESS if ok and BPM_CLIIENT_ERR_SERVER if * Returns BPM_CLIENT_SUCCESS if ok and BPM_CLIIENT_ERR_SERVER if
* if server could not complete the request */ * if server could not complete the request */
bpm_client_err_e bpm_blink_leds (bpm_client_t *self, char *service, uint32_t leds); bpm_client_err_e bpm_set_fmc_leds (bpm_client_t *self, char *service,
uint32_t fmc_leds);
bpm_client_err_e bpm_get_fmc_leds (bpm_client_t *self, char *service,
uint32_t *fmc_leds);
/* Macros for compatibility */
#define bpm_blink_leds bpm_set_fmc_leds
/* Simple AD9510 Config test. /* Simple AD9510 Config test.
* Returns BPM_CLIENT_SUCCESS if ok and BPM_CLIIENT_ERR_SERVER if * Returns BPM_CLIENT_SUCCESS if ok and BPM_CLIIENT_ERR_SERVER if
* if server could not complete the request */ * if server could not complete the request */
bpm_client_err_e bpm_ad9510_cfg_defaults (bpm_client_t *self, char *service); bpm_client_err_e bpm_set_ad9510_defaults (bpm_client_t *self, char *service,
uint32_t ad9510_defaults);
bpm_client_err_e bpm_get_ad9510_defaults (bpm_client_t *self, char *service,
uint32_t *ad9510_defaults);
/* Macros for compatibility */
#define bpm_ad9510_cfg_defaults bpm_set_ad9510_defaults
/* FMC PLL FUNCTION pin. Sets or clears the FMC PLL FUNCTION pin. This pin /* FMC PLL FUNCTION pin. Sets or clears the FMC PLL FUNCTION pin. This pin
* has a general purpose based on the 0x59 SPI AD9510 register. * has a general purpose based on the 0x59 SPI AD9510 register.
......
src/libs/libbpmclient/src/bpm_client_core.c
View file @ 9d80fdf5
...@@ -350,22 +350,17 @@ mlm_client_t *bpm_get_mlm_client (bpm_client_t *self) ...@@ -350,22 +350,17 @@ mlm_client_t *bpm_get_mlm_client (bpm_client_t *self)
} }
/**************** FMC130M SMIO Functions ****************/ /**************** FMC130M SMIO Functions ****************/
bpm_client_err_e bpm_blink_leds (bpm_client_t *self, char *service, uint32_t leds)
{
assert (self);
assert (service);
bpm_client_err_e err = BPM_CLIENT_SUCCESS;
FMC130M_4CH_REPLY_TYPE operation = FMC130M_4CH_OPCODE_LEDS;
zmsg_t *request = zmsg_new (); PARAM_FUNC_CLIENT_WRITE(fmc_leds)
ASSERT_ALLOC(request, err_send_msg_alloc, BPM_CLIENT_ERR_ALLOC); {
zmsg_addmem (request, &operation, sizeof (operation)); return param_client_write (self, service, FMC130M_4CH_OPCODE_LEDS,
zmsg_addmem (request, &leds, sizeof (leds)); fmc_leds);
mlm_client_sendto (self->mlm_client, service, NULL, NULL, 0, &request); }
err_send_msg_alloc: PARAM_FUNC_CLIENT_READ(fmc_leds)
return err; {
return param_client_read (self, service, FMC130M_4CH_OPCODE_LEDS,
fmc_leds);
} }
/* FUNCTION pin functions */ /* FUNCTION pin functions */
...@@ -407,21 +402,16 @@ PARAM_FUNC_CLIENT_READ(fmc_clk_sel) ...@@ -407,21 +402,16 @@ PARAM_FUNC_CLIENT_READ(fmc_clk_sel)
fmc_clk_sel); fmc_clk_sel);
} }
bpm_client_err_e bpm_ad9510_cfg_defaults (bpm_client_t *self, char *service) PARAM_FUNC_CLIENT_WRITE(ad9510_defaults)
{ {
assert (self); return param_client_write (self, service, FMC130M_4CH_OPCODE_AD9510_CFG_DEFAULTS,
assert (service); ad9510_defaults);
}
bpm_client_err_e err = BPM_CLIENT_SUCCESS;
FMC130M_4CH_REPLY_TYPE operation = FMC130M_4CH_OPCODE_AD9510_CFG_DEFAULTS;
zmsg_t *request = zmsg_new ();
ASSERT_ALLOC(request, err_send_msg_alloc, BPM_CLIENT_ERR_ALLOC);
zmsg_addmem (request, &operation, sizeof (operation));
mlm_client_sendto (self->mlm_client, service, NULL, NULL, 0, &request);
err_send_msg_alloc: PARAM_FUNC_CLIENT_READ(ad9510_defaults)
return err; {
return param_client_read (self, service, FMC130M_4CH_OPCODE_AD9510_CFG_DEFAULTS,
ad9510_defaults);
} }
/* ADC LTC2208 RAND */ /* ADC LTC2208 RAND */
......
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