Skip to content

A
adc-lib
Commit 684e8877 authored by Federico Vaga's avatar Federico Vaga
Browse files
Options

always provide support for all boards 

Today the FmcAdc100m14b4cha is the only supported board, having it
optional does not make sense.
Signed-off-by: Federico Vaga's avatarFederico Vaga <federico.vaga@cern.ch>
parent 2cd6a86c
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 14 deletions
lib/Makefile
View file @ 684e8877
......@@ -14,8 +14,7 @@ ZIO_ABS ?= $(abspath $(ZIO) )
GIT_VERSION := $(shell git describe --dirty --long --tags)
ZIO_GIT_VERSION := $(shell cd $(ZIO_ABS); git describe --dirty --long --tags)
FMCADC_100MS_4CH_14BIT_GIT_VERSION := $(shell cd $(FMCADC100M); git describe --dirty --long --tags)
LIBS = libadc.so
LIB = libadc.a
......@@ -27,13 +26,9 @@ LOBJ += lib.o
LOBJ += adc-ziofake.o
LOBJ += adc-genericfake.o
LOBJ += adc-zio.o
ifdef FMCADC100M
FMCADC_100MS_4CH_14BIT_GIT_VERSION := $(shell cd $(FMCADC100M); git describe --dirty --long --tags)
LOBJ += fmc-adc-100m14b4cha.o
CFLAGS += -DSUPPORT_FMCADC_100MS_4CH_14BIT
CFLAGS += -I$(FMCADC100M)/kernel
CFLAGS += -DFMCADC_100MS_4CH_14BIT_GIT_VERSION="\"$(FMCADC_100MS_4CH_14BIT_GIT_VERSION)\""
endif
CFLAGS += -Wall -Werror -ggdb -O2 -fPIC
CFLAGS += -I$(ZIO_ABS)/include
CFLAGS += -DGIT_VERSION="\"$(GIT_VERSION)\""
......
lib/init.c
View file @ 684e8877
......@@ -7,17 +7,13 @@
const char * const libadc_version_s = "libadc version: " GIT_VERSION;
const char * const libadc_zio_version_s = "libadc is using zio version: " ZIO_GIT_VERSION;
#ifdef SUPPORT_FMCADC_100MS_4CH_14BIT
const char * const libadc_fmcadc100m14b4cha_version_s = "libadc is using fmc-adc-100m14b4cha version: " FMCADC_100MS_4CH_14BIT_GIT_VERSION;
#endif
void adc_print_version()
{
printf("%s\n", libadc_version_s);
printf("%s\n", libadc_zio_version_s);
#ifdef SUPPORT_FMCADC_100MS_4CH_14BIT
printf("%s\n", libadc_fmcadc100m14b4cha_version_s);
#endif
}
/**
......
lib/route.c
View file @ 684e8877
......@@ -28,9 +28,7 @@
* List of supported board names
*/
const char *adc_board_name[] = {
#ifdef SUPPORT_FMCADC_100MS_4CH_14BIT
[FMCADC_100MS_4CH_14BIT] = ADC_NAME_FMCADC100M,
#endif
[ADC_ZIOFAKE] = ADC_NAME_ZIOFAKE,
[ADC_GENERICFAKE] = ADC_NAME_GENERICFAKE,
};
......@@ -39,9 +37,7 @@ const char *adc_board_name[] = {
* The following array is the main entry point into the boards
*/
static const struct adc_board_type *adc_board_types[] = {
#ifdef SUPPORT_FMCADC_100MS_4CH_14BIT
[FMCADC_100MS_4CH_14BIT] = &fmcadc_100ms_4ch_14bit,
#endif
[ADC_ZIOFAKE] = &adc_ziofake,
[ADC_GENERICFAKE] = &adc_genericfake,
/* add new boards here */
......
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