ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2024-12-18 20:57:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TPROCTE_HOME Being Used In Place Of TPRO_HOME #778

Browse Source 
Needed to make some more fixes to work with modern tsync driver
code.
This commit is contained in:
Alex Lin 2019-06-11 09:48:29 -05:00
parent 731b9b9c1f
commit a394f0d187
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
autoconf/configure.ac
View File

@ -63,9 +63,9 @@ AC_DEFUN([AX_TPRO_HOME],[
AC_ARG_WITH([tpro],
AS_HELP_STRING([--with-tpro@<:@=DIR@:>@], [TPRO root directory]),
[TPRO_HOME="$withval"
AC_CHECK_FILE([$TPRO_HOME/h/tpro.h],
AC_CHECK_FILE([$TPRO_HOME/linux/h/tpro.h],
[],
AC_MSG_ERROR([could not find $TPRO_HOME/h/tpro.h])
AC_MSG_ERROR([could not find $TPRO_HOME/linux/h/tpro.h])
)
],
[TPRO_HOME=""]

10
configure vendored
View File

@ -7221,15 +7221,15 @@ fi
# Check whether --with-tpro was given.
if test "${with_tpro+set}" = set; then :
withval=$with_tpro; TPRO_HOME="$withval"
as_ac_File=`$as_echo "ac_cv_file_$TPRO_HOME/h/tpro.h" | $as_tr_sh`
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $TPRO_HOME/h/tpro.h" >&5
$as_echo_n "checking for $TPRO_HOME/h/tpro.h... " >&6; }
as_ac_File=`$as_echo "ac_cv_file_$TPRO_HOME/linux/h/tpro.h" | $as_tr_sh`
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $TPRO_HOME/linux/h/tpro.h" >&5
$as_echo_n "checking for $TPRO_HOME/linux/h/tpro.h... " >&6; }
if eval \${$as_ac_File+:} false; then :
$as_echo_n "(cached) " >&6
else
test "$cross_compiling" = yes &&
as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
if test -r "$TPRO_HOME/h/tpro.h"; then
if test -r "$TPRO_HOME/linux/h/tpro.h"; then
eval "$as_ac_File=yes"
else
eval "$as_ac_File=no"
@ -7241,7 +7241,7 @@ $as_echo "$ac_res" >&6; }
if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
else
as_fn_error $? "could not find $TPRO_HOME/h/tpro.h" "$LINENO" 5
as_fn_error $? "could not find $TPRO_HOME/linux/h/tpro.h" "$LINENO" 5
fi

2
share/trick/makefiles/Makefile.common
View File

@ -28,8 +28,8 @@ export TRICK_VERSION := $(shell $(TRICK_HOME)/bin/trick-version -v)
export TRICK_MAJOR := $(shell $(TRICK_HOME)/bin/trick-version -y)
export TRICK_MINOR := $(shell $(TRICK_HOME)/bin/trick-version -m)
include $(TRICK_HOME)/share/trick/makefiles/config_${TRICK_HOST_TYPE}.mk
-include $(TRICK_HOME)/share/trick/makefiles/config_user.mk
include $(TRICK_HOME)/share/trick/makefiles/config_${TRICK_HOST_TYPE}.mk
ifndef TRICK_CC
export TRICK_CC := $(CC)

4
share/trick/makefiles/config_Linux.mk
View File

@ -35,8 +35,8 @@ PLATFORM_LIBS += -L$(DMTCP)/dmtcpaware -ldmtcpaware
endif
ifneq ($(TPROCTE),)
TRICK_ADDITIONAL_CXXFLAGS += -D_TPRO_CTE -I$(TPROCTE)/h
PLATFORM_LIBS += $(TPROCTE)/lib/libtpro.a
TRICK_ADDITIONAL_CXXFLAGS += -D_TPRO_CTE -I$(TPROCTE)/linux/h -I$(TPROCTE)/common/h
PLATFORM_LIBS += $(TPROCTE)/linux/tsync/lib/libtsync.a $(TPROCTE)/linux/lib/libtpro.a
endif
ifneq ($(BC635),)

4
trick_source/sim_services/Clock/TPROCTEClock.cpp
View File

@ -17,7 +17,7 @@ PROGRAMMERS:
-# Calls the base Clock constructor
-# Sets the default device name
*/
Trick::TPROCTEClock::TPROCTEClock() : Clock(1000000, "TPROCTE") , dev_name("/dev/tpropci0") { }
Trick::TPROCTEClock::TPROCTEClock() : Clock(1000000, "TPROCTE") , dev_name("/dev/tsyncpci0") { }
/**
@details
@ -102,7 +102,7 @@ long long Trick::TPROCTEClock::wall_clock_time() {
*/
long long Trick::TPROCTEClock::clock_spin(long long req_time) {
#ifdef _TPRO_CTE
Trick::Clock::clock_spin(req_time) ;
return Trick::Clock::clock_spin(req_time) ;
#else
message_publish(MSG_ERROR, "TPRO CTE card was not enabled at compile time\n");
return req_time ;