Skip to content
Snippets Groups Projects
Commit 7481bba5 authored by Anders Blomdell's avatar Anders Blomdell
Browse files

Before implementing transmit retries

parent ee967b18
No related branches found
No related tags found
No related merge requests found
...@@ -5,7 +5,8 @@ TARGETS=lth_fixes.mc \ ...@@ -5,7 +5,8 @@ TARGETS=lth_fixes.mc \
hijacknet_lth_net.mc \ hijacknet_lth_net.mc \
fei82557End.mc \ fei82557End.mc \
hijacknet_test.mc \ hijacknet_test.mc \
extctrl2014_lc.mc extctrl2014_lc.mc \
hijacknet_extctrl2014.mc
AUTO_GEN=extctrl2014_lc.c \ AUTO_GEN=extctrl2014_lc.c \
extctrl2014_lc.h \ extctrl2014_lc.h \
mc.globalize.c mc.globalize.c
...@@ -19,6 +20,10 @@ EXTRA_CFLAGS_hijacknet_lth_net=-I/opt/robot/include ...@@ -19,6 +20,10 @@ EXTRA_CFLAGS_hijacknet_lth_net=-I/opt/robot/include
EXTRA_CFLAGS_fei82557End=-Wno-error -Wno-all -Wno-endif-labels EXTRA_CFLAGS_fei82557End=-Wno-error -Wno-all -Wno-endif-labels
EXTRA_CFLAGS_extctrl2014_lc=-I/usr/include/labcomm \ EXTRA_CFLAGS_extctrl2014_lc=-I/usr/include/labcomm \
-DLABCOMM_COMPAT="<labcomm_compat.h>" -DLABCOMM_COMPAT="<labcomm_compat.h>"
EXTRA_CFLAGS_hijacknet_extctrl2014=-I/usr/include/labcomm \
-DLABCOMM_COMPAT="<labcomm_compat.h>"
EXTRA_LDFLAGS_hijacknet_extctrl2014=extctrl2014_lc.mc -Wl,-r,-llabcomm2014
HIDE_hijacknet_extctrl2014=labcomm2014_
ROBOT= ROBOT=
ROBOTWARE=$(shell [ -n "$(ROBOT)" ] && \ ROBOTWARE=$(shell [ -n "$(ROBOT)" ] && \
../tools/abb_extctrl_setup.py --robot "$(ROBOT)" --robotware) ../tools/abb_extctrl_setup.py --robot "$(ROBOT)" --robotware)
...@@ -32,7 +37,7 @@ all: $(TARGETS) ...@@ -32,7 +37,7 @@ all: $(TARGETS)
mc_test_load: hijack_fei.mc.load spray_test.mc.load mc_test_load: hijack_fei.mc.load spray_test.mc.load
%.mc: %.mc.c %.mc: %.mc.c Makefile
WIND_BASE=/opt/robot/include/vxworks/5.5.1/ \ WIND_BASE=/opt/robot/include/vxworks/5.5.1/ \
i586-wrs-vxworks-gcc \ i586-wrs-vxworks-gcc \
-O3 -Wall -Wno-unused-but-set-variable -Werror \ -O3 -Wall -Wno-unused-but-set-variable -Werror \
...@@ -44,9 +49,9 @@ mc_test_load: hijack_fei.mc.load spray_test.mc.load ...@@ -44,9 +49,9 @@ mc_test_load: hijack_fei.mc.load spray_test.mc.load
-I. \ -I. \
-I../common \ -I../common \
-o $@ \ -o $@ \
-c $< $< $(EXTRA_LDFLAGS_$*)
%.mc: %.c %.mc: %.c Makefile
WIND_BASE=/opt/robot/include/vxworks/5.5.1/ \ WIND_BASE=/opt/robot/include/vxworks/5.5.1/ \
i586-wrs-vxworks-gcc \ i586-wrs-vxworks-gcc \
-O3 -Wall -Wno-unused-but-set-variable -Werror \ -O3 -Wall -Wno-unused-but-set-variable -Werror \
...@@ -56,7 +61,14 @@ mc_test_load: hijack_fei.mc.load spray_test.mc.load ...@@ -56,7 +61,14 @@ mc_test_load: hijack_fei.mc.load spray_test.mc.load
-I. \ -I. \
-I../common \ -I../common \
-o $@ \ -o $@ \
-c $< $< $(EXTRA_LDFLAGS_$*)
for h in $(HIDE_$*) ; do \
nm $@ | sed -e "s/.*[DTB] \($$h.*\)/\1/gp;d" > $@.hide || exit 1; \
echo "Hiding: $$h ($$(cat $@.hide | wc -l) symbols)" ; \
i586-wrs-vxworks-objcopy --localize-symbols=$@.hide $@ $@.tmp && \
mv $@.tmp $@ || echo "Hiding failed for $$h" || exit 1 ; \
rm $@.hide ; \
done
%_lc.c %_lc.h: %.lc %_lc.c %_lc.h: %.lc
labcomm2014 --c=$*_lc.c --h=$*_lc.h $< labcomm2014 --c=$*_lc.c --h=$*_lc.h $<
...@@ -92,7 +104,10 @@ host_commands: ...@@ -92,7 +104,10 @@ host_commands:
@echo "ncftpput -uu -pp $(ROBOT) /hd0a/$(DESTDIR) hijacknet_hpnet.mc" @echo "ncftpput -uu -pp $(ROBOT) /hd0a/$(DESTDIR) hijacknet_hpnet.mc"
@echo "ncftpput -uu -pp $(ROBOT) /hd0a/$(DESTDIR) hijacknet_fei.mc" @echo "ncftpput -uu -pp $(ROBOT) /hd0a/$(DESTDIR) hijacknet_fei.mc"
@echo "ncftpput -uu -pp $(ROBOT) /hd0a/$(DESTDIR) hijacknet.mc" @echo "ncftpput -uu -pp $(ROBOT) /hd0a/$(DESTDIR) hijacknet.mc"
@echo
@echo "ncftpput -uu -pp $(ROBOT) /hd0a/$(DESTDIR) hijacknet_test.mc" @echo "ncftpput -uu -pp $(ROBOT) /hd0a/$(DESTDIR) hijacknet_test.mc"
@echo
@echo "ncftpput -uu -pp $(ROBOT) /hd0a/$(DESTDIR) hijacknet_extctrl2014.mc"
.PHONY: robot_commands .PHONY: robot_commands
robot_commands: robot_commands:
...@@ -101,8 +116,11 @@ robot_commands: ...@@ -101,8 +116,11 @@ robot_commands:
@echo "ld < /hd0a/$(DESTDIR)/hijacknet_hpnet.mc" @echo "ld < /hd0a/$(DESTDIR)/hijacknet_hpnet.mc"
@echo "ld < /hd0a/$(DESTDIR)/hijacknet_fei.mc" @echo "ld < /hd0a/$(DESTDIR)/hijacknet_fei.mc"
@echo "ld < /hd0a/$(DESTDIR)/hijacknet.mc" @echo "ld < /hd0a/$(DESTDIR)/hijacknet.mc"
@echo
@echo "ld < /hd0a/$(DESTDIR)/hijacknet_test.mc" @echo "ld < /hd0a/$(DESTDIR)/hijacknet_test.mc"
@echo
@echo "ld < /hd0a/$(DESTDIR)/hijacknet_extctrl2014.mc"
@echo "hijacknet_extctrl2014_connect \"fei0\",\"38:60:77:b5:0e:cf\""
.PHONY: clean .PHONY: clean
clean: clean:
...@@ -114,3 +132,4 @@ distclean: clean ...@@ -114,3 +132,4 @@ distclean: clean
hijacknet_fei.mc: fei82557.mc.h hijacknet_private.h hijacknet_fei.mc: fei82557.mc.h hijacknet_private.h
hijacknet.mc: hijacknet.h hijacknet.mc: hijacknet.h
hijacknet_extctrl2014.mc: extctrl2014_lc.mc
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment