qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update. 

1998-12-01 09:47 -0500  Zack Weinberg  <zack@rabi.phys.columbia.edu>

	* sysdeps/unix/sysv/linux/sys/timex.h: Copy out
	user-space-relevant definitions from linux/timex.h of kernel
	2.1.130 and remove include of kernel header.

	* sysdeps/unix/sysv/linux/adjtime.c: Remove portability crud.
This commit is contained in:
Ulrich Drepper 1998-12-08 13:31:40 +00:00
parent 5c2a0669c1
commit c3c95a7b02
3 changed files with 97 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
1998-12-01 09:47 -0500 Zack Weinberg <zack@rabi.phys.columbia.edu>
* sysdeps/unix/sysv/linux/sys/timex.h: Copy out
user-space-relevant definitions from linux/timex.h of kernel
2.1.130 and remove include of kernel header.
* sysdeps/unix/sysv/linux/adjtime.c: Remove portability crud.
1998-12-08 Andreas Jaeger <aj@arthur.rhein-neckar.de> 1998-12-08 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* posix/regex.c: Get regex.h from system path, not from local * posix/regex.c: Get regex.h from system path, not from local

41
sysdeps/unix/sysv/linux/adjtime.c
View File

@ -24,41 +24,16 @@
#define MAX_SEC (INT_MAX / 1000000L - 2) #define MAX_SEC (INT_MAX / 1000000L - 2)
#define MIN_SEC (INT_MIN / 1000000L + 2) #define MIN_SEC (INT_MIN / 1000000L + 2)
#ifndef MOD_OFFSET int
#define modes mode __adjtime (itv, otv)
#endif const struct timeval *itv;
struct timeval *otv;
#ifndef TIMEVAL
#define TIMEVAL timeval
#endif
#ifndef TIMEX
#define TIMEX timex
#endif
#ifndef ADJTIME
#define ADJTIME __adjtime
#endif
#ifndef ADJTIMEX
#define NO_LOCAL_ADJTIME
#define ADJTIMEX(x) __adjtimex (x)
#endif
#ifndef LINKAGE
#define LINKAGE
#endif
LINKAGE int
ADJTIME (itv, otv)
const struct TIMEVAL *itv;
struct TIMEVAL *otv;
{ {
struct TIMEX tntx; struct timex tntx;
if (itv) if (itv)
{ {
struct TIMEVAL tmp; struct timeval tmp;
/* We will do some check here. */ /* We will do some check here. */
tmp.tv_sec = itv->tv_sec + itv->tv_usec / 1000000L; tmp.tv_sec = itv->tv_sec + itv->tv_usec / 1000000L;
@ -74,7 +49,7 @@ ADJTIME (itv, otv)
else else
tntx.modes = 0; tntx.modes = 0;
if (ADJTIMEX (&tntx) < 0) return -1; if (__adjtimex (&tntx) < 0) return -1;
if (otv) if (otv)
{ {
@ -92,6 +67,4 @@ ADJTIME (itv, otv)
return 0; return 0;
} }
#ifdef NO_LOCAL_ADJTIME
weak_alias (__adjtime, adjtime) weak_alias (__adjtime, adjtime)
#endif

83
sysdeps/unix/sysv/linux/sys/timex.h
View File

@ -21,7 +21,88 @@
#include <features.h> #include <features.h>
#include <sys/time.h> #include <sys/time.h>
#include <linux/timex.h>
/* These definitions from linux/timex.h as of 2.1.130. */
struct timex
{
unsigned int modes; /* mode selector */
long offset; /* time offset (usec) */
long freq; /* frequency offset (scaled ppm) */
long maxerror; /* maximum error (usec) */
long esterror; /* estimated error (usec) */
int status; /* clock command/status */
long constant; /* pll time constant */
long precision; /* clock precision (usec) (read only) */
long tolerance; /* clock frequency tolerance (ppm) (read only) */
struct timeval time; /* (read only) */
long tick; /* (modified) usecs between clock ticks */
long ppsfreq; /* pps frequency (scaled ppm) (ro) */
long jitter; /* pps jitter (us) (ro) */
int shift; /* interval duration (s) (shift) (ro) */
long stabil; /* pps stability (scaled ppm) (ro) */
long jitcnt; /* jitter limit exceeded (ro) */
long calcnt; /* calibration intervals (ro) */
long errcnt; /* calibration errors (ro) */
long stbcnt; /* stability limit exceeded (ro) */
/* ??? */
int :32; int :32; int :32; int :32;
int :32; int :32; int :32; int :32;
int :32; int :32; int :32; int :32;
};
/* Mode codes (timex.mode) */
#define ADJ_OFFSET 0x0001 /* time offset */
#define ADJ_FREQUENCY 0x0002 /* frequency offset */
#define ADJ_MAXERROR 0x0004 /* maximum time error */
#define ADJ_ESTERROR 0x0008 /* estimated time error */
#define ADJ_STATUS 0x0010 /* clock status */
#define ADJ_TIMECONST 0x0020 /* pll time constant */
#define ADJ_TICK 0x4000 /* tick value */
#define ADJ_OFFSET_SINGLESHOT 0x8001 /* old-fashioned adjtime */
/* xntp 3.4 compatibility names */
#define MOD_OFFSET ADJ_OFFSET
#define MOD_FREQUENCY ADJ_FREQUENCY
#define MOD_MAXERROR ADJ_MAXERROR
#define MOD_ESTERROR ADJ_ESTERROR
#define MOD_STATUS ADJ_STATUS
#define MOD_TIMECONST ADJ_TIMECONST
#define MOD_CLKB ADJ_TICK
#define MOD_CLKA ADJ_OFFSET_SINGLESHOT /* 0x8000 in original */
/* Status codes (timex.status) */
#define STA_PLL 0x0001 /* enable PLL updates (rw) */
#define STA_PPSFREQ 0x0002 /* enable PPS freq discipline (rw) */
#define STA_PPSTIME 0x0004 /* enable PPS time discipline (rw) */
#define STA_FLL 0x0008 /* select frequency-lock mode (rw) */
#define STA_INS 0x0010 /* insert leap (rw) */
#define STA_DEL 0x0020 /* delete leap (rw) */
#define STA_UNSYNC 0x0040 /* clock unsynchronized (rw) */
#define STA_FREQHOLD 0x0080 /* hold frequency (rw) */
#define STA_PPSSIGNAL 0x0100 /* PPS signal present (ro) */
#define STA_PPSJITTER 0x0200 /* PPS signal jitter exceeded (ro) */
#define STA_PPSWANDER 0x0400 /* PPS signal wander exceeded (ro) */
#define STA_PPSERROR 0x0800 /* PPS signal calibration error (ro) */
#define STA_CLOCKERR 0x1000 /* clock hardware fault (ro) */
#define STA_RONLY (STA_PPSSIGNAL | STA_PPSJITTER | STA_PPSWANDER | \
STA_PPSERROR | STA_CLOCKERR) /* read-only bits */
/* Clock states (time_state) */
#define TIME_OK 0 /* clock synchronized, no leap second */
#define TIME_INS 1 /* insert leap second */
#define TIME_DEL 2 /* delete leap second */
#define TIME_OOP 3 /* leap second in progress */
#define TIME_WAIT 4 /* leap second has occurred */
#define TIME_ERROR 5 /* clock not synchronized */
#define TIME_BAD TIME_ERROR /* bw compat */
__BEGIN_DECLS __BEGIN_DECLS