faraphel/chrony
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'vm'

Browse source
This commit is contained in:
Richard P. Curnow 2007-06-26 22:13:40 +01:00
commit 084efe606f
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
configure vendored
View file

@ -133,6 +133,7 @@ For better control, use the options below.
--readline-inc-dir=DIR Specify where readline include directory is --readline-inc-dir=DIR Specify where readline include directory is
--readline-lib-dir=DIR Specify where readline lib directory is --readline-lib-dir=DIR Specify where readline lib directory is
--with-ncurses-library=DIR Specify where ncurses lib directory is --with-ncurses-library=DIR Specify where ncurses lib directory is
--disable-rtc Don't include RTC even on Linux
Fine tuning of the installation directories: Fine tuning of the installation directories:
--infodir=DIR info documentation [PREFIX/info] --infodir=DIR info documentation [PREFIX/info]
@ -172,6 +173,7 @@ SYSDEFS=""
# Support for readline (on by default) # Support for readline (on by default)
feat_readline=1 feat_readline=1
feat_rtc=1
readline_lib="" readline_lib=""
readline_inc="" readline_inc=""
ncurses_lib="" ncurses_lib=""
@ -206,6 +208,9 @@ do
--mandir=* ) --mandir=* )
SETMANDIR=`echo $option | sed -e 's/^.*=//;'` SETMANDIR=`echo $option | sed -e 's/^.*=//;'`
;; ;;
--disable-rtc)
feat_rtc=0
;;
--help | -h ) --help | -h )
usage usage
exit 0 exit 0
@ -238,7 +243,11 @@ case $SYSTEM in
esac esac
;; ;;
Linux* ) Linux* )
EXTRA_OBJECTS="sys_linux.o wrap_adjtimex.o rtc_linux.o" EXTRA_OBJECTS="sys_linux.o wrap_adjtimex.o"
if [ $feat_rtc -eq 1 ] ; then
EXTRA_OBJECTS+=" rtc_linux.o"
EXTRA_DEFS+=" -DFEAT_RTC=1"
fi
SYSDEFS="-DLINUX" SYSDEFS="-DLINUX"
echo "Configuring for " $SYSTEM echo "Configuring for " $SYSTEM
if [ "${MACHINE}" = "alpha" ]; then if [ "${MACHINE}" = "alpha" ]; then

2
io_linux.h
View file

@ -6,7 +6,7 @@
/* Hmm. These constants vary a bit between systems. */ /* Hmm. These constants vary a bit between systems. */
/* (__sh__ includes both sh and sh64) */ /* (__sh__ includes both sh and sh64) */
#if defined(__i386__) || defined(__sh__) #if defined(__i386__) || defined(__sh__) || defined(__arm__)
#define CHRONY_IOC_NRBITS 8 #define CHRONY_IOC_NRBITS 8
#define CHRONY_IOC_TYPEBITS 8 #define CHRONY_IOC_TYPEBITS 8
#define CHRONY_IOC_SIZEBITS 14 #define CHRONY_IOC_SIZEBITS 14

4
rtc.c
View file

@ -33,7 +33,7 @@
#include "logging.h" #include "logging.h"
#include "conf.h" #include "conf.h"
#if defined LINUX #if defined LINUX && defined FEAT_RTC
#include "rtc_linux.h" #include "rtc_linux.h"
#endif /* defined LINUX */ #endif /* defined LINUX */
@ -53,7 +53,7 @@ static struct {
void (*cycle_logfile)(void); void (*cycle_logfile)(void);
} driver = } driver =
{ {
#if defined LINUX #if defined LINUX && defined FEAT_RTC
RTC_Linux_Initialise, RTC_Linux_Initialise,
RTC_Linux_Finalise, RTC_Linux_Finalise,
RTC_Linux_TimePreInit, RTC_Linux_TimePreInit,