git-svn-id: http://www.frescor.org/private/svn/frescor/fna/trunk@1253
35b4ef3e-fd22-0410-ab77-
dab3279adceb
-.PHONY: none clean libfna libfrsh
+.PHONY: none clean libfna libfrsh libfosa libfsa libutils
none:
@exec echo -e "\nPlease introduce a target, i.e: 'make test_dtm_xxx.exe'";
none:
@exec echo -e "\nPlease introduce a target, i.e: 'make test_dtm_xxx.exe'";
-%.exe: %.c libfna libfosa libfrsh
+%.exe: %.c libfna libfosa libfrsh libfosa libfsa libutils
@exec echo -e "\n>> Building $@: ";
@if [ -f $< ]; \
then \
@exec echo -e "\n>> Building $@: ";
@if [ -f $< ]; \
then \
libutils:
make -C $(UTILS_PATH) libutils
libutils:
make -C $(UTILS_PATH) libutils
+libfsa:
+ make -C $(FSA_PATH) libfsa
+
clean:
@exec echo -e "\n>> Cleaning... ";
@find \( -name '*.[oa]' -or -name '*~*' -or -name 'lib*.a' \
clean:
@exec echo -e "\n>> Cleaning... ";
@find \( -name '*.[oa]' -or -name '*~*' -or -name 'lib*.a' \
sa_contract->final_values.server_prio = sa_contract->contract.prio;
budget = (double)sa_contract->contract.min_values.budget *
sa_contract->final_values.server_prio = sa_contract->contract.prio;
budget = (double)sa_contract->contract.min_values.budget *
- (double)FRESCAN_FRAME_TX_TIME;
+ (double)FRESCAN_FRAME_TX_TIME_US;
period = timespec_to_double
(&sa_contract->contract.min_values.period);
period = timespec_to_double
(&sa_contract->contract.min_values.period);
#define FRESCAN_MX_NODES 2
#define FRESCAN_MX_CONTRACTS (FRESCAN_MX_NODES*FRESCAN_MX_IDS)
#define FRESCAN_MX_REPL_OPS FRESCAN_MX_IDS*10
#define FRESCAN_MX_NODES 2
#define FRESCAN_MX_CONTRACTS (FRESCAN_MX_NODES*FRESCAN_MX_IDS)
#define FRESCAN_MX_REPL_OPS FRESCAN_MX_IDS*10
-#define FRESCAN_FRAME_TX_TIME 0.000200 // measured transmission time of an 8byte frame
+
+#define FRESCAN_FRAME_TX_TIME_US 200 // measured transmission time of an 8byte frame
#define FRESCAN_MLOCK_T unsigned
#define FRESCAN_CREATE_LOCK(l)
#define FRESCAN_MLOCK_T unsigned
#define FRESCAN_CREATE_LOCK(l)
librtepfna.a: objs
@exec echo -e "\n>> Building RTEP FNA:";
@make -C $(PLATFORM_PATH)/drivers/rt-ep librtep
librtepfna.a: objs
@exec echo -e "\n>> Building RTEP FNA:";
@make -C $(PLATFORM_PATH)/drivers/rt-ep librtep
- @ar -rc librtepfna.a *.o
- @mv librtepfna.a $(FNA_PATH)/lib
+ ld -r -o librtepfna.o *.o
+ @mv librtepfna.o $(FNA_PATH)/lib
@exec echo ">> end Building RTEP FNA [OK]"
@exec echo ">> end Building RTEP FNA [OK]"
include ../../rules.mk
CFLAGS += -I$(FNA_PATH)/src_frescan/
include ../../rules.mk
CFLAGS += -I$(FNA_PATH)/src_frescan/
-LDFLAGS += $(FNA_PATH)/lib/libfrescan.o -L$(FOSA_PATH)/lib -lfosa_$(PLATFORM) -lm
+LDFLAGS += $(FNA_PATH)/lib/libfrescan.o
EXES := $(patsubst %.c,%.exe,$(wildcard *.c))
EXES := $(patsubst %.c,%.exe,$(wildcard *.c))
CFLAGS += -I$(FNA_PATH)/src_rtep/ -I$(PLATFORM_PATH)/drivers/rt-ep/ \
$(PLATFORM_PATH)/misc/logger.o $(PLATFORM_PATH)/misc/time_measurement_hwtime.o
CFLAGS += -I$(FNA_PATH)/src_rtep/ -I$(PLATFORM_PATH)/drivers/rt-ep/ \
$(PLATFORM_PATH)/misc/logger.o $(PLATFORM_PATH)/misc/time_measurement_hwtime.o
-LDFLAGS += -L$(FNA_PATH)/lib -lrtepfna -L$(PLATFORM_PATH)/drivers/rt-ep -lrtep \
- -L$(FRSH_PATH)/lib -lfrsh -L$(FOSA_PATH)/lib -lfosa_$(PLATFORM) \
- -L$(UTILS_PATH)/lib -lutils -lm -lfna
+LDFLAGS += -L$(PLATFORM_PATH)/drivers/rt-ep -lrtep
+