Skip to content

F
FMC TDC 1ns 5cha - Software
Commit 7d3102cf authored by Federico Vaga's avatar Federico Vaga
Browse files
Options

lib: deprecate offset set/get functions 

Signed-off-by: Federico Vaga's avatarFederico Vaga <federico.vaga@cern.ch>
parent 2b72e5b9
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 11 deletions
lib/fmctdc-lib.c
View file @ 7d3102cf
......@@ -1018,8 +1018,8 @@ int fmctdc_flush(struct fmctdc_board *userb, unsigned int channel)
* @param[in] offset the number of pico-seconds to be added
* @return 0 on success, otherwise -1 and errno is set appropriately
*/
int fmctdc_set_offset_user(struct fmctdc_board *userb,
unsigned int channel, int32_t offset)
int fmctdc_offset_set(struct fmctdc_board *userb,
unsigned int channel, int32_t offset)
{
__define_board(b, userb);
uint32_t val = (uint32_t)offset;
......@@ -1043,8 +1043,8 @@ int fmctdc_set_offset_user(struct fmctdc_board *userb,
* @param[out] offset the number of pico-seconds to be added
* @return 0 on success, otherwise -1 and errno is set appropriately
*/
int fmctdc_get_offset_user(struct fmctdc_board *userb,
unsigned int channel, int32_t *offset)
int fmctdc_offset_get(struct fmctdc_board *userb,
unsigned int channel, int32_t *offset)
{
struct __fmctdc_board *b = (void *)(userb);
uint32_t val;
......@@ -1267,3 +1267,17 @@ int fmctdc_check_wr_mode(struct fmctdc_board *userb)
return 0;
return -1;
}
/**
* @copydoc fmctdc_offset_set()
*/
int fmctdc_set_offset_user(struct fmctdc_board *userb,
unsigned int channel, int32_t offset)
__attribute__((alias("fmctdc_offset_set")));
/**
* @copydoc fmctdc_offset_get()
*/
int fmctdc_get_offset_user(struct fmctdc_board *userb,
unsigned int channel, int32_t *offset)
__attribute__((alias("fmctdc_offset_get")));
lib/fmctdc-lib.h
View file @ 7d3102cf
......@@ -132,13 +132,16 @@ extern int fmctdc_ts_mode_set(struct fmctdc_board *userb,
extern int fmctdc_ts_mode_get(struct fmctdc_board *userb,
unsigned int channel,
enum fmctdc_ts_mode *mode);
extern int fmctdc_offset_set(struct fmctdc_board *userb,
unsigned int channel, int32_t offset);
extern int fmctdc_offset_get(struct fmctdc_board *userb,
unsigned int channel, int32_t *offset);
extern int fmctdc_time_set(struct fmctdc_board *b, struct fmctdc_time *t);
extern int fmctdc_time_get(struct fmctdc_board *b, struct fmctdc_time *t);
extern int fmctdc_time_set_host(struct fmctdc_board *userb);
extern int fmctdc_wr_status_set(struct fmctdc_board *userb, int on);
extern int fmctdc_wr_status_get(struct fmctdc_board *userb,
enum fmctdc_wr_status *status);
/* Acquire Time-Stamps */
extern int fmctdc_fread(struct fmctdc_board *b, unsigned int channel,
struct fmctdc_time *t, int n);
......@@ -178,10 +181,6 @@ extern int fmctdc_reference_set(struct fmctdc_board *userb,
extern int fmctdc_reference_get(struct fmctdc_board *userb,
unsigned int ch_target);
extern int fmctdc_reference_clear(struct fmctdc_board *userb, int ch_target);
extern int fmctdc_set_offset_user(struct fmctdc_board *userb,
unsigned int channel, int32_t offset);
extern int fmctdc_get_offset_user(struct fmctdc_board *userb,
unsigned int channel, int32_t *offset);
extern int fmctdc_buffer_mode(struct fmctdc_board *userb,
unsigned int channel,
enum ft_transfer_mode *mode);
......@@ -197,6 +196,12 @@ extern int fmctdc_check_wr_mode(struct fmctdc_board *b)
__attribute__((deprecated));
extern float fmctdc_read_temperature(struct fmctdc_board *b)
__attribute__((deprecated));
extern int fmctdc_set_offset_user(struct fmctdc_board *userb,
unsigned int channel, int32_t offset)
__attribute__((deprecated));
extern int fmctdc_get_offset_user(struct fmctdc_board *userb,
unsigned int channel, int32_t *offset)
__attribute__((deprecated));
/* other */
extern const char * const libfmctdc_version_s;
......
tools/fmc-tdc-offset.c
View file @ 7d3102cf
......@@ -39,7 +39,7 @@ int main(int argc, char **argv)
fprintf(stderr, "%s: invalid command.\n", argv[0]);
return -1;
}
err = fmctdc_set_offset_user(brd, channel, offset);
err = fmctdc_offset_set(brd, channel, offset);
if (err) {
fprintf(stderr, "%s: error setting the user-offset: %s\n",
argv[0], strerror(errno));
......@@ -48,7 +48,7 @@ int main(int argc, char **argv)
}
for (i = ch_start; i <= ch_end; i++) {
err = fmctdc_get_offset_user(brd, i, &offset);
err = fmctdc_offset_get(brd, i, &offset);
if (err)
printf("channel %d: ERROR\n", i);
else
......
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