Skip to content

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

all: move all folders under src/hal/ to src/ for simplicity

parent 1ebcd80a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 131 additions and 137 deletions
Makefile
View file @ d3553c03
......@@ -161,14 +161,25 @@ OBJS_PLATFORM =
SRC_DIR = src
# Include other Makefiles as needed here
include $(SRC_DIR)/hal/hal.mk
include $(SRC_DIR)/ll_io/ll_io.mk
include $(SRC_DIR)/sm_io/sm_io.mk
include $(SRC_DIR)/sdb/sdb.mk
include $(SRC_DIR)/dev_mngr/dev_mngr.mk
include $(SRC_DIR)/dev_io/dev_io.mk
include $(SRC_DIR)/msg/msg.mk
include $(SRC_DIR)/revision/revision.mk
# Project boards
boards_INCLUDE_DIRS = -Iinclude/boards/$(BOARD)
# Include directories
INCLUDE_DIRS = $(hal_INCLUDE_DIRS) \
INCLUDE_DIRS = \
$(sdb_INCLUDE_DIRS) \
$(ll_io_INCLUDE_DIRS) \
$(sm_io_INCLUDE_DIRS) \
$(msg_INCLUDE_DIRS) \
$(dev_mngr_INCLUDE_DIRS) \
$(dev_io_INCLUDE_DIRS) \
$(revision_INCLUDE_DIRS) \
$(boards_INCLUDE_DIRS) \
-I$(PCIE_DRIVER_DIR)/include/pcie \
......@@ -186,10 +197,31 @@ CFLAGS += $(CFLAGS_PLATFORM) $(CFLAGS_DEBUG)
LDFLAGS = $(LDFLAGS_PLATFORM)
# Output modules
OUT = $(hal_OUT)
OUT = $(dev_mngr_OUT) $(dev_io_OUT)
# All possible output modules
ALL_OUT = $(hal_all_OUT)
ALL_OUT = $(dev_mngr_all_OUT) $(dev_io_all_OUT)
# Out objects
dev_mngr_OBJS += $(dev_mngr_core_OBJS) $(debug_OBJS) \
$(exp_ops_OBJS) $(thsafe_msg_zmq_OBJS) \
$(ll_io_utils_OBJS) $(dev_io_core_utils_OBJS)
dev_io_OBJS += $(dev_io_core_OBJS) $(ll_io_OBJS) \
$(sm_io_OBJS) $(msg_OBJS)
dev_io_cfg_OBJS += $(dev_io_core_OBJS) $(ll_io_OBJS) \
$(sm_io_OBJS) $(msg_OBJS)
# Specific libraries for OUT targets
dev_mngr_LIBS =
dev_mngr_STATIC_LIBS =
dev_io_LIBS = -lbsmp
dev_io_STATIC_LIBS =
dev_io_cfg_LIBS = -lbsmp
dev_io_cfg_STATIC_LIBS =
.SECONDEXPANSION:
......@@ -198,7 +230,13 @@ GIT_REVISION = $(shell git describe --dirty --always)
GIT_USER_NAME = $(shell git config --get user.name)
GIT_USER_EMAIL = $(shell git config --get user.email)
OBJS_all = $(hal_OBJS) $(revision_OBJS)
OBJS_all = $(ll_io_OBJS) \
$(sm_io_OBJS) \
$(msg_OBJS) \
$(dev_mngr_OBJS) \
$(dev_io_OBJS) \
$(dev_io_cfg_OBJS) \
$(revision_OBJS)
# Sources
all_SRCS = $(patsubst %.o,%.c,$(OBJS_all))
......
src/hal/dev_io/dev_io.mk → src/dev_io/dev_io.mk
View file @ d3553c03
dev_io_DIR = $(SRC_DIR)/hal/dev_io
dev_io_DIR = $(SRC_DIR)/dev_io
dev_io_core_utils_OBJS = $(dev_io_DIR)/dev_io_utils.o
......@@ -11,24 +11,22 @@ dev_io_core_OBJS = $(dev_io_DIR)/dev_io_core.o \
dev_io_OBJS = $(dev_io_DIR)/dev_io.o
dev_io_INCLUDE_DIRS = $(dev_io_DIR) \
dev_io_ALL_DIRS = $(dev_io_DIR) \
$(LIBBPMCLIENT_DIR)
dev_io_OUT = dev_io
ifeq ($(WITH_DEVIO_CFG),y)
dev_io_cfg_OBJS = $(dev_io_DIR)/dev_io_cfg.o
dev_io_cfg_INCLUDE_DIRS = $(dev_io_DIR) \
$(dev_io_utils_INCLUDE_DIRS) \
$(LIBBPMCLIENT_DIR)
dev_io_cfg_OUT = dev_io_cfg
else
dev_io_cfg_OBJS =
dev_io_cfg_INCLUDE_DIRS =
dev_io_cfg_OUT =
endif
# Add -I prefix to all include directories
dev_io_INCLUDE_DIRS = $(addprefix -I, $(dev_io_ALL_DIRS))
dev_io_OUT += $(dev_io_cfg_OUT)
dev_io_all_OUT = dev_io dev_io_cfg
src/hal/dev_mngr/dev_mngr.mk → src/dev_mngr/dev_mngr.mk
View file @ d3553c03
dev_mngr_DIR = $(SRC_DIR)/hal/dev_mngr
dev_mngr_DIR = $(SRC_DIR)/dev_mngr
# Here we call <output_name>_core_OBJS as we need to add
# more objects to this target. This is done in the hal.mk
......@@ -16,7 +16,9 @@ dev_mngr_OBJS =
dev_mngr_OUT =
endif
dev_mngr_INCLUDE_DIRS = $(dev_mngr_DIR)
dev_mngr_ALL_DIRS = $(dev_mngr_DIR)
dev_mngr_all_OUT = dev_mngr
# Add -I prefix to all include directories
dev_mngr_INCLUDE_DIRS = $(addprefix -I, $(dev_mngr_ALL_DIRS))
dev_mngr_all_OUT = dev_mngr
src/hal/hal.mk deleted 100644 → 0
View file @ 1ebcd80a
include $(SRC_DIR)/hal/ll_io/ll_io.mk
include $(SRC_DIR)/hal/sm_io/sm_io.mk
include $(SRC_DIR)/hal/sdb/sdb.mk
include $(SRC_DIR)/hal/dev_mngr/dev_mngr.mk
include $(SRC_DIR)/hal/dev_io/dev_io.mk
include $(SRC_DIR)/hal/msg/msg.mk
hal_OUT += $(dev_mngr_OUT) $(dev_io_OUT)
# All possible objects. Used for cleaning
hal_all_OUT += $(dev_mngr_all_OUT) $(dev_io_all_OUT)
# For each target in hal_OUT we add the necessary objects
# We need exp_ops_OBJS for hal_utils_OBJS, so we include it here.
dev_mngr_OBJS += $(dev_mngr_core_OBJS) $(debug_OBJS) \
$(exp_ops_OBJS) $(thsafe_msg_zmq_OBJS) $(ll_io_utils_OBJS) \
$(dev_io_core_utils_OBJS)
# msg_OBJS already contains exp_ops_OBJS. So, there is no need to include
# it here twice
dev_io_OBJS += $(dev_io_core_OBJS) $(ll_io_OBJS) $(sm_io_OBJS) \
$(msg_OBJS) $(debug_OBJS)
dev_io_cfg_OBJS += $(dev_io_core_OBJS) $(ll_io_OBJS) $(sm_io_OBJS) \
$(msg_OBJS) $(debug_OBJS)
dev_mngr_LIBS =
dev_mngr_STATIC_LIBS =
dev_io_LIBS = -lbsmp
dev_io_STATIC_LIBS =
dev_io_cfg_LIBS = -lbsmp
dev_io_cfg_STATIC_LIBS =
# Merge all hal objects together
hal_OBJS = $(debug_OBJS) \
$(ll_io_OBJS) \
$(sm_io_OBJS) \
$(msg_OBJS) \
$(dev_mngr_core_OBJS) \
$(dev_io_core_OBJS) \
$(dev_io_OBJS) \
$(dev_io_cfg_OBJS)
# Merge all include directories together
hal_all_INCLUDE_DIRS += $(debug_INCLUDE_DIRS) \
$(sdb_INCLUDE_DIRS) \
$(ll_io_INCLUDE_DIRS) \
$(sm_io_INCLUDE_DIRS) \
$(msg_INCLUDE_DIRS) \
$(dev_mngr_INCLUDE_DIRS) \
$(dev_io_INCLUDE_DIRS)
# Change the include dirs into flags
hal_INCLUDE_DIRS = $(addprefix -I, $(hal_all_INCLUDE_DIRS))
src/libs/libbpmclient/Makefile
View file @ d3553c03
......@@ -73,18 +73,18 @@ LIBS = -lzmq -lczmq -lmdp
LFLAGS =
# Specific board objects
OBJS_BOARD = ../../hal/sm_io/modules/acq/ddr3_map.o
OBJS_BOARD = ../../sm_io/modules/acq/ddr3_map.o
# Specific platform objects
OBJS_PLATFORM =
# Objects that are not specificaly related to the bpm_client, but composes
# our library, as it eases some tasks for us
OBJS_EXTERNAL = ../../hal/sm_io/modules/sm_io_codes.o \
../../hal/sm_io/modules/acq/sm_io_acq_exports.o \
../../hal/sm_io/modules/dsp/sm_io_dsp_exports.o \
../../hal/sm_io/modules/fmc130m_4ch/sm_io_fmc130m_4ch_exports.o \
../../hal/sm_io/modules/swap/sm_io_swap_exports.o \
../../hal/sm_io/modules/rffe/sm_io_rffe_exports.o \
../../hal/sm_io/modules/afc_diag/sm_io_afc_diag_exports.o
OBJS_EXTERNAL = ../../sm_io/modules/sm_io_codes.o \
../../sm_io/modules/acq/sm_io_acq_exports.o \
../../sm_io/modules/dsp/sm_io_dsp_exports.o \
../../sm_io/modules/fmc130m_4ch/sm_io_fmc130m_4ch_exports.o \
../../sm_io/modules/swap/sm_io_swap_exports.o \
../../sm_io/modules/rffe/sm_io_rffe_exports.o \
../../sm_io/modules/afc_diag/sm_io_afc_diag_exports.o
# Project boards
boards_INCLUDE_DIRS = -I../../../include/boards/$(BOARD)
......@@ -92,13 +92,13 @@ boards_INCLUDE_DIRS = -I../../../include/boards/$(BOARD)
# Include directories
INCLUDE_DIRS = -I. -I../../../include -I../liberrhand -I../libhutils -I../libdisptable \
$(boards_INCLUDE_DIRS) \
-I../../hal/sm_io/modules \
-I../../hal/sm_io/modules/fmc130m_4ch \
-I../../hal/sm_io/modules/acq \
-I../../hal/sm_io/modules/swap \
-I../../hal/sm_io/modules/dsp \
-I../../hal/sm_io/modules/rffe \
-I../../hal/sm_io/modules/afc_diag \
-I../../sm_io/modules \
-I../../sm_io/modules/fmc130m_4ch \
-I../../sm_io/modules/acq \
-I../../sm_io/modules/swap \
-I../../sm_io/modules/dsp \
-I../../sm_io/modules/rffe \
-I../../sm_io/modules/afc_diag \
-I/usr/local/include
# Merge all flags. Optimize for size (-Os)
......@@ -119,13 +119,13 @@ common_OBJS = $(OBJS_BOARD) $(OBJS_PLATFORM) $(OBJS_EXTERNAL)
# Objects for each version of library
$(LIBBPMCLIENT)_OBJS = $(common_OBJS) $($(LIBBPMCLIENT)_OBJS_LIB)
$(LIBBPMCLIENT)_CODE_HEADERS = ../../hal/sm_io/modules/fmc130m_4ch/sm_io_fmc130m_4ch_codes.h \
../../hal/sm_io/modules/acq/sm_io_acq_codes.h \
../../hal/sm_io/modules/dsp/sm_io_dsp_codes.h \
../../hal/sm_io/modules/swap/sm_io_swap_codes.h \
../../hal/sm_io/modules/rffe/sm_io_rffe_codes.h \
../../hal/sm_io/modules/afc_diag/sm_io_afc_diag_codes.h \
../../hal/sm_io/modules/sm_io_codes.h \
$(LIBBPMCLIENT)_CODE_HEADERS = ../../sm_io/modules/fmc130m_4ch/sm_io_fmc130m_4ch_codes.h \
../../sm_io/modules/acq/sm_io_acq_codes.h \
../../sm_io/modules/dsp/sm_io_dsp_codes.h \
../../sm_io/modules/swap/sm_io_swap_codes.h \
../../sm_io/modules/rffe/sm_io_rffe_codes.h \
../../sm_io/modules/afc_diag/sm_io_afc_diag_codes.h \
../../sm_io/modules/sm_io_codes.h \
../../../include/acq_chan_gen_defs.h \
../libdisptable/disp_table.h \
../libdisptable/disp_table_err.h \
......@@ -135,12 +135,12 @@ $(LIBBPMCLIENT)_CODE_HEADERS = ../../hal/sm_io/modules/fmc130m_4ch/sm_io_fmc130m
../libhutils/hutils_utils.h \
bpm_client_codes.h
$(LIBBPMCLIENT)_FUNC_EXPORTS = ../../hal/sm_io/modules/fmc130m_4ch/sm_io_fmc130m_4ch_exports.h \
../../hal/sm_io/modules/acq/sm_io_acq_exports.h \
../../hal/sm_io/modules/dsp/sm_io_dsp_exports.h \
../../hal/sm_io/modules/swap/sm_io_swap_exports.h \
../../hal/sm_io/modules/rffe/sm_io_rffe_exports.h \
../../hal/sm_io/modules/afc_diag/sm_io_afc_diag_exports.h
$(LIBBPMCLIENT)_FUNC_EXPORTS = ../../sm_io/modules/fmc130m_4ch/sm_io_fmc130m_4ch_exports.h \
../../sm_io/modules/acq/sm_io_acq_exports.h \
../../sm_io/modules/dsp/sm_io_dsp_exports.h \
../../sm_io/modules/swap/sm_io_swap_exports.h \
../../sm_io/modules/rffe/sm_io_rffe_exports.h \
../../sm_io/modules/afc_diag/sm_io_afc_diag_exports.h
$(LIBBPMCLIENT)_ACQ_HEADERS += ../../../include/acq_chan.h
......
src/hal/ll_io/ll_io.mk → src/ll_io/ll_io.mk
View file @ d3553c03
include $(SRC_DIR)/hal/ll_io/ops/ops.mk
include $(SRC_DIR)/ll_io/ops/ops.mk
ll_io_DIR = $(SRC_DIR)/hal/ll_io
ll_io_DIR = $(SRC_DIR)/ll_io
ll_io_utils_OBJS = $(ll_io_DIR)/ll_io_utils.o
......@@ -14,4 +14,7 @@ ll_io_OBJS = $(ll_io_DIR)/ll_io.o \
$(ll_io_utils_OBJS) \
$(ll_io_ops_OBJS)
ll_io_INCLUDE_DIRS = $(ll_io_DIR) $(ll_io_ops_DIR)
ll_io_ALL_DIRS = $(ll_io_DIR) $(ll_io_ops_DIR)
# Add -I prefix to all include directories
ll_io_INCLUDE_DIRS = $(addprefix -I, $(ll_io_ALL_DIRS))
src/hal/ll_io/ops/ops.mk → src/ll_io/ops/ops.mk
View file @ d3553c03
ll_io_ops_DIR = $(SRC_DIR)/hal/ll_io/ops
ll_io_ops_DIR = $(SRC_DIR)/ll_io/ops
ll_io_ops_OBJS = $(ll_io_ops_DIR)/ll_io_pcie.o \
$(ll_io_ops_DIR)/ll_io_eth.o \
......
src/hal/msg/exp_ops/ops.mk → src/msg/exp_ops/ops.mk
View file @ d3553c03
exp_ops_DIR = $(SRC_DIR)/hal/msg/exp_ops
exp_ops_DIR = $(SRC_DIR)/msg/exp_ops
exp_ops_OBJS = $(exp_ops_DIR)/exp_msg_zmq.o
......
src/hal/msg/msg.mk → src/msg/msg.mk
View file @ d3553c03
include $(SRC_DIR)/hal/msg/exp_ops/ops.mk
include $(SRC_DIR)/hal/msg/smio_thsafe_ops/ops.mk
include $(SRC_DIR)/msg/exp_ops/ops.mk
include $(SRC_DIR)/msg/smio_thsafe_ops/ops.mk
msg_DIR = $(SRC_DIR)/hal/msg
msg_DIR = $(SRC_DIR)/msg
msg_OBJS = $(msg_DIR)/msg.o \
$(msg_DIR)/msg_err.o \
$(exp_ops_OBJS) \
$(smio_thsafe_ops_OBJS)
msg_INCLUDE_DIRS = $(msg_DIR) \
msg_ALL_DIRS = $(msg_DIR) \
$(exp_ops_INCLUDE_DIRS) \
$(smio_thsafe_ops_INCLUDE_DIRS)
# Add -I prefix to all include directories
msg_INCLUDE_DIRS = $(addprefix -I, $(msg_ALL_DIRS))
# FIXME: For use in hal.mk with dev_mngr_OBJS
thsafe_msg_zmq_OBJS = $(smio_thsafe_ops_DIR)/thsafe_msg_zmq.o \
$(msg_DIR)/msg_err.o
src/hal/msg/smio_thsafe_ops/ops.mk → src/msg/smio_thsafe_ops/ops.mk
View file @ d3553c03
smio_thsafe_ops_DIR = $(SRC_DIR)/hal/msg/smio_thsafe_ops
smio_thsafe_ops_DIR = $(SRC_DIR)/msg/smio_thsafe_ops
smio_thsafe_ops_OBJS = $(smio_thsafe_ops_DIR)/smio_thsafe_zmq_client.o \
$(smio_thsafe_ops_DIR)/smio_thsafe_zmq_server.o \
......
src/revision/revision.mk
View file @ d3553c03
......@@ -2,5 +2,7 @@ revision_DIR = $(SRC_DIR)/revision
revision_OBJS = $(revision_DIR)/revision.o
revision_INCLUDE_DIRS = $(addprefix -I, $(revision_DIR))
revision_ALL_DIRS = $(revision_DIR)
# Add -I prefix to all include directories
revision_INCLUDE_DIRS = $(addprefix -I, $(revision_ALL_DIRS))
src/hal/sdb/sdb.mk → src/sdb/sdb.mk
View file @ d3553c03
sdb_DIR = $(SRC_DIR)/hal/sdb
sdb_DIR = $(SRC_DIR)/sdb
# Here we call <output_name>_core_OBJS as we need to add
# more objects to this target. This is done in the hal.mk
# makefile
#sdb_core_OBJS = $(sdb_DIR)/sdb.o
sdb_INCLUDE_DIRS = $(sdb_DIR)
sdb_ALL_DIRS = $(sdb_DIR)
sdb_OUT = sdb
# Add -I prefix to all include directories
sdb_INCLUDE_DIRS = $(addprefix -I, $(sdb_ALL_DIRS))
src/hal/sm_io/chips/chips.mk → src/sm_io/chips/chips.mk
View file @ d3553c03
sm_io_chips_DIR = $(SRC_DIR)/hal/sm_io/chips
sm_io_chips_DIR = $(SRC_DIR)/sm_io/chips
# Here we call <output_name>_core_OBJS as we need to add
# more objects to this target. This is done in the hal.mk
......
src/hal/sm_io/modules/acq/acq.mk → src/sm_io/modules/acq/acq.mk
View file @ d3553c03
sm_io_acq_DIR = $(SRC_DIR)/hal/sm_io/modules/acq
sm_io_acq_DIR = $(SRC_DIR)/sm_io/modules/acq
sm_io_acq_OBJS = $(sm_io_acq_DIR)/sm_io_acq_core.o \
$(sm_io_acq_DIR)/sm_io_acq_exp.o \
......
src/hal/sm_io/modules/afc_diag/afc_diag.mk → src/sm_io/modules/afc_diag/afc_diag.mk
View file @ d3553c03
sm_io_afc_diag_DIR = $(SRC_DIR)/hal/sm_io/modules/afc_diag
sm_io_afc_diag_DIR = $(SRC_DIR)/sm_io/modules/afc_diag
sm_io_afc_diag_OBJS = $(sm_io_afc_diag_DIR)/sm_io_afc_diag_core.o \
$(sm_io_afc_diag_DIR)/sm_io_afc_diag_exp.o \
......
src/hal/sm_io/modules/dsp/dsp.mk → src/sm_io/modules/dsp/dsp.mk
View file @ d3553c03
sm_io_dsp_DIR = $(SRC_DIR)/hal/sm_io/modules/dsp
sm_io_dsp_DIR = $(SRC_DIR)/sm_io/modules/dsp
sm_io_dsp_OBJS = $(sm_io_dsp_DIR)/sm_io_dsp_core.o \
$(sm_io_dsp_DIR)/sm_io_dsp_exp.o \
......
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