mirror of
https://git.rtems.org/rtems-libbsd/
synced 2025-07-26 07:00:39 +08:00
Update due to API changes (timecounters)
This commit is contained in:
Sebastian Huber
parent
f2cb584a61
commit
8eaa39fcef
@ -1,200 +0,0 @@
|
||||
/*-
|
||||
* ----------------------------------------------------------------------------
|
||||
* "THE BEER-WARE LICENSE" (Revision 42):
|
||||
* <phk@FreeBSD.org> wrote this file. As long as you retain this notice you
|
||||
* can do whatever you want with this stuff. If we meet some day, and you think
|
||||
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
|
||||
* ----------------------------------------------------------------------------
|
||||
*
|
||||
* $FreeBSD$
|
||||
*
|
||||
* The is a FreeBSD version of the RFC 2783 API for Pulse Per Second
|
||||
* timing interfaces.
|
||||
*/
|
||||
|
||||
#ifndef _SYS_TIMEPPS_H_
|
||||
#define _SYS_TIMEPPS_H_
|
||||
|
||||
#include <sys/ioccom.h>
|
||||
#include <rtems/bsd/sys/time.h>
|
||||
|
||||
#define PPS_API_VERS_1 1
|
||||
|
||||
typedef int pps_handle_t;
|
||||
|
||||
typedef unsigned pps_seq_t;
|
||||
|
||||
typedef struct ntp_fp {
|
||||
unsigned int integral;
|
||||
unsigned int fractional;
|
||||
} ntp_fp_t;
|
||||
|
||||
typedef union pps_timeu {
|
||||
struct timespec tspec;
|
||||
ntp_fp_t ntpfp;
|
||||
unsigned long longpad[3];
|
||||
} pps_timeu_t;
|
||||
|
||||
typedef struct {
|
||||
pps_seq_t assert_sequence; /* assert event seq # */
|
||||
pps_seq_t clear_sequence; /* clear event seq # */
|
||||
pps_timeu_t assert_tu;
|
||||
pps_timeu_t clear_tu;
|
||||
int current_mode; /* current mode bits */
|
||||
} pps_info_t;
|
||||
|
||||
#define assert_timestamp assert_tu.tspec
|
||||
#define clear_timestamp clear_tu.tspec
|
||||
|
||||
#define assert_timestamp_ntpfp assert_tu.ntpfp
|
||||
#define clear_timestamp_ntpfp clear_tu.ntpfp
|
||||
|
||||
typedef struct {
|
||||
int api_version; /* API version # */
|
||||
int mode; /* mode bits */
|
||||
pps_timeu_t assert_off_tu;
|
||||
pps_timeu_t clear_off_tu;
|
||||
} pps_params_t;
|
||||
|
||||
#define assert_offset assert_off_tu.tspec
|
||||
#define clear_offset clear_off_tu.tspec
|
||||
|
||||
#define assert_offset_ntpfp assert_off_tu.ntpfp
|
||||
#define clear_offset_ntpfp clear_off_tu.ntpfp
|
||||
|
||||
|
||||
#define PPS_CAPTUREASSERT 0x01
|
||||
#define PPS_CAPTURECLEAR 0x02
|
||||
#define PPS_CAPTUREBOTH 0x03
|
||||
|
||||
#define PPS_OFFSETASSERT 0x10
|
||||
#define PPS_OFFSETCLEAR 0x20
|
||||
|
||||
#define PPS_ECHOASSERT 0x40
|
||||
#define PPS_ECHOCLEAR 0x80
|
||||
|
||||
#define PPS_CANWAIT 0x100
|
||||
#define PPS_CANPOLL 0x200
|
||||
|
||||
#define PPS_TSFMT_TSPEC 0x1000
|
||||
#define PPS_TSFMT_NTPFP 0x2000
|
||||
|
||||
#define PPS_KC_HARDPPS 0
|
||||
#define PPS_KC_HARDPPS_PLL 1
|
||||
#define PPS_KC_HARDPPS_FLL 2
|
||||
|
||||
struct pps_fetch_args {
|
||||
int tsformat;
|
||||
pps_info_t pps_info_buf;
|
||||
struct timespec timeout;
|
||||
};
|
||||
|
||||
struct pps_kcbind_args {
|
||||
int kernel_consumer;
|
||||
int edge;
|
||||
int tsformat;
|
||||
};
|
||||
|
||||
#define PPS_IOC_CREATE _IO('1', 1)
|
||||
#define PPS_IOC_DESTROY _IO('1', 2)
|
||||
#define PPS_IOC_SETPARAMS _IOW('1', 3, pps_params_t)
|
||||
#define PPS_IOC_GETPARAMS _IOR('1', 4, pps_params_t)
|
||||
#define PPS_IOC_GETCAP _IOR('1', 5, int)
|
||||
#define PPS_IOC_FETCH _IOWR('1', 6, struct pps_fetch_args)
|
||||
#define PPS_IOC_KCBIND _IOW('1', 7, struct pps_kcbind_args)
|
||||
|
||||
#ifdef _KERNEL
|
||||
|
||||
struct pps_state {
|
||||
/* Capture information. */
|
||||
struct timehands *capth;
|
||||
unsigned capgen;
|
||||
unsigned capcount;
|
||||
|
||||
/* State information. */
|
||||
pps_params_t ppsparam;
|
||||
pps_info_t ppsinfo;
|
||||
int kcmode;
|
||||
int ppscap;
|
||||
struct timecounter *ppstc;
|
||||
unsigned ppscount[3];
|
||||
};
|
||||
|
||||
void pps_capture(struct pps_state *pps);
|
||||
void pps_event(struct pps_state *pps, int event);
|
||||
void pps_init(struct pps_state *pps);
|
||||
int pps_ioctl(unsigned long cmd, caddr_t data, struct pps_state *pps);
|
||||
void hardpps(struct timespec *tsp, long nsec);
|
||||
|
||||
#else /* !_KERNEL */
|
||||
|
||||
static __inline int
|
||||
time_pps_create(int filedes, pps_handle_t *handle)
|
||||
{
|
||||
int error;
|
||||
|
||||
*handle = -1;
|
||||
error = ioctl(filedes, PPS_IOC_CREATE, 0);
|
||||
if (error < 0)
|
||||
return (-1);
|
||||
*handle = filedes;
|
||||
return (0);
|
||||
}
|
||||
|
||||
static __inline int
|
||||
time_pps_destroy(pps_handle_t handle)
|
||||
{
|
||||
return (ioctl(handle, PPS_IOC_DESTROY, 0));
|
||||
}
|
||||
|
||||
static __inline int
|
||||
time_pps_setparams(pps_handle_t handle, const pps_params_t *ppsparams)
|
||||
{
|
||||
return (ioctl(handle, PPS_IOC_SETPARAMS, ppsparams));
|
||||
}
|
||||
|
||||
static __inline int
|
||||
time_pps_getparams(pps_handle_t handle, pps_params_t *ppsparams)
|
||||
{
|
||||
return (ioctl(handle, PPS_IOC_GETPARAMS, ppsparams));
|
||||
}
|
||||
|
||||
static __inline int
|
||||
time_pps_getcap(pps_handle_t handle, int *mode)
|
||||
{
|
||||
return (ioctl(handle, PPS_IOC_GETCAP, mode));
|
||||
}
|
||||
|
||||
static __inline int
|
||||
time_pps_fetch(pps_handle_t handle, const int tsformat,
|
||||
pps_info_t *ppsinfobuf, const struct timespec *timeout)
|
||||
{
|
||||
int error;
|
||||
struct pps_fetch_args arg;
|
||||
|
||||
arg.tsformat = tsformat;
|
||||
if (timeout == NULL) {
|
||||
arg.timeout.tv_sec = -1;
|
||||
arg.timeout.tv_nsec = -1;
|
||||
} else
|
||||
arg.timeout = *timeout;
|
||||
error = ioctl(handle, PPS_IOC_FETCH, &arg);
|
||||
*ppsinfobuf = arg.pps_info_buf;
|
||||
return (error);
|
||||
}
|
||||
|
||||
static __inline int
|
||||
time_pps_kcbind(pps_handle_t handle, const int kernel_consumer,
|
||||
const int edge, const int tsformat)
|
||||
{
|
||||
struct pps_kcbind_args arg;
|
||||
|
||||
arg.kernel_consumer = kernel_consumer;
|
||||
arg.edge = edge;
|
||||
arg.tsformat = tsformat;
|
||||
return (ioctl(handle, PPS_IOC_KCBIND, &arg));
|
||||
}
|
||||
|
||||
#endif /* KERNEL */
|
||||
|
||||
#endif /* !_SYS_TIMEPPS_H_ */
|
||||
@ -1,85 +0,0 @@
|
||||
/*-
|
||||
* ----------------------------------------------------------------------------
|
||||
* "THE BEER-WARE LICENSE" (Revision 42):
|
||||
* <phk@FreeBSD.ORG> wrote this file. As long as you retain this notice you
|
||||
* can do whatever you want with this stuff. If we meet some day, and you think
|
||||
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
|
||||
* ----------------------------------------------------------------------------
|
||||
*
|
||||
* $FreeBSD$
|
||||
*/
|
||||
|
||||
#ifndef _SYS_TIMETC_H_
|
||||
#define _SYS_TIMETC_H_
|
||||
|
||||
#ifndef _KERNEL
|
||||
#error "no user-serviceable parts inside"
|
||||
#endif
|
||||
|
||||
/*-
|
||||
* `struct timecounter' is the interface between the hardware which implements
|
||||
* a timecounter and the MI code which uses this to keep track of time.
|
||||
*
|
||||
* A timecounter is a binary counter which has two properties:
|
||||
* * it runs at a fixed, known frequency.
|
||||
* * it has sufficient bits to not roll over in less than approximately
|
||||
* max(2 msec, 2/HZ seconds). (The value 2 here is really 1 + delta,
|
||||
* for some indeterminate value of delta.)
|
||||
*/
|
||||
|
||||
struct timecounter;
|
||||
typedef u_int timecounter_get_t(struct timecounter *);
|
||||
typedef void timecounter_pps_t(struct timecounter *);
|
||||
|
||||
struct timecounter {
|
||||
timecounter_get_t *tc_get_timecount;
|
||||
/*
|
||||
* This function reads the counter. It is not required to
|
||||
* mask any unimplemented bits out, as long as they are
|
||||
* constant.
|
||||
*/
|
||||
timecounter_pps_t *tc_poll_pps;
|
||||
/*
|
||||
* This function is optional. It will be called whenever the
|
||||
* timecounter is rewound, and is intended to check for PPS
|
||||
* events. Normal hardware does not need it but timecounters
|
||||
* which latch PPS in hardware (like sys/pci/xrpu.c) do.
|
||||
*/
|
||||
u_int tc_counter_mask;
|
||||
/* This mask should mask off any unimplemented bits. */
|
||||
uint64_t tc_frequency;
|
||||
/* Frequency of the counter in Hz. */
|
||||
char *tc_name;
|
||||
/* Name of the timecounter. */
|
||||
int tc_quality;
|
||||
/*
|
||||
* Used to determine if this timecounter is better than
|
||||
* another timecounter higher means better. Negative
|
||||
* means "only use at explicit request".
|
||||
*/
|
||||
u_int tc_flags;
|
||||
#define TC_FLAGS_C2STOP 1 /* Timer dies in C2+. */
|
||||
|
||||
void *tc_priv;
|
||||
/* Pointer to the timecounter's private parts. */
|
||||
struct timecounter *tc_next;
|
||||
/* Pointer to the next timecounter. */
|
||||
};
|
||||
|
||||
extern struct timecounter *timecounter;
|
||||
extern int tc_min_ticktock_freq; /*
|
||||
* Minimal tc_ticktock() call frequency,
|
||||
* required to handle counter wraps.
|
||||
*/
|
||||
|
||||
u_int64_t tc_getfrequency(void);
|
||||
void tc_init(struct timecounter *tc);
|
||||
void tc_setclock(struct timespec *ts);
|
||||
void tc_ticktock(int cnt);
|
||||
void cpu_tick_calibration(void);
|
||||
|
||||
#ifdef SYSCTL_DECL
|
||||
SYSCTL_DECL(_kern_timecounter);
|
||||
#endif
|
||||
|
||||
#endif /* !_SYS_TIMETC_H_ */
|
||||
@ -1,238 +0,0 @@
|
||||
/*-
|
||||
***********************************************************************
|
||||
* *
|
||||
* Copyright (c) David L. Mills 1993-2001 *
|
||||
* *
|
||||
* Permission to use, copy, modify, and distribute this software and *
|
||||
* its documentation for any purpose and without fee is hereby *
|
||||
* granted, provided that the above copyright notice appears in all *
|
||||
* copies and that both the copyright notice and this permission *
|
||||
* notice appear in supporting documentation, and that the name *
|
||||
* University of Delaware not be used in advertising or publicity *
|
||||
* pertaining to distribution of the software without specific, *
|
||||
* written prior permission. The University of Delaware makes no *
|
||||
* representations about the suitability this software for any *
|
||||
* purpose. It is provided "as is" without express or implied *
|
||||
* warranty. *
|
||||
* *
|
||||
**********************************************************************/
|
||||
|
||||
/*
|
||||
* Modification history timex.h
|
||||
*
|
||||
* 16 Aug 00 David L. Mills
|
||||
* API Version 4. Added MOD_TAI and tai member of ntptimeval
|
||||
* structure.
|
||||
*
|
||||
* 17 Nov 98 David L. Mills
|
||||
* Revised for nanosecond kernel and user interface.
|
||||
*
|
||||
* 26 Sep 94 David L. Mills
|
||||
* Added defines for hybrid phase/frequency-lock loop.
|
||||
*
|
||||
* 19 Mar 94 David L. Mills
|
||||
* Moved defines from kernel routines to header file and added new
|
||||
* defines for PPS phase-lock loop.
|
||||
*
|
||||
* 20 Feb 94 David L. Mills
|
||||
* Revised status codes and structures for external clock and PPS
|
||||
* signal discipline.
|
||||
*
|
||||
* 28 Nov 93 David L. Mills
|
||||
* Adjusted parameters to improve stability and increase poll
|
||||
* interval.
|
||||
*
|
||||
* 17 Sep 93 David L. Mills
|
||||
* Created file
|
||||
*
|
||||
* $FreeBSD$
|
||||
*/
|
||||
/*
|
||||
* This header file defines the Network Time Protocol (NTP) interfaces
|
||||
* for user and daemon application programs. These are implemented using
|
||||
* defined syscalls and data structures and require specific kernel
|
||||
* support.
|
||||
*
|
||||
* The original precision time kernels developed from 1993 have an
|
||||
* ultimate resolution of one microsecond; however, the most recent
|
||||
* kernels have an ultimate resolution of one nanosecond. In these
|
||||
* kernels, a ntp_adjtime() syscalls can be used to determine which
|
||||
* resolution is in use and to select either one at any time. The
|
||||
* resolution selected affects the scaling of certain fields in the
|
||||
* ntp_gettime() and ntp_adjtime() syscalls, as described below.
|
||||
*
|
||||
* NAME
|
||||
* ntp_gettime - NTP user application interface
|
||||
*
|
||||
* SYNOPSIS
|
||||
* #include <sys/timex.h>
|
||||
*
|
||||
* int ntp_gettime(struct ntptimeval *ntv);
|
||||
*
|
||||
* DESCRIPTION
|
||||
* The time returned by ntp_gettime() is in a timespec structure,
|
||||
* but may be in either microsecond (seconds and microseconds) or
|
||||
* nanosecond (seconds and nanoseconds) format. The particular
|
||||
* format in use is determined by the STA_NANO bit of the status
|
||||
* word returned by the ntp_adjtime() syscall.
|
||||
*
|
||||
* NAME
|
||||
* ntp_adjtime - NTP daemon application interface
|
||||
*
|
||||
* SYNOPSIS
|
||||
* #include <sys/timex.h>
|
||||
* #include <sys/syscall.h>
|
||||
*
|
||||
* int syscall(SYS_ntp_adjtime, tptr);
|
||||
* int SYS_ntp_adjtime;
|
||||
* struct timex *tptr;
|
||||
*
|
||||
* DESCRIPTION
|
||||
* Certain fields of the timex structure are interpreted in either
|
||||
* microseconds or nanoseconds according to the state of the
|
||||
* STA_NANO bit in the status word. See the description below for
|
||||
* further information.
|
||||
*/
|
||||
#ifndef _SYS_TIMEX_H_
|
||||
#define _SYS_TIMEX_H_ 1
|
||||
#define NTP_API 4 /* NTP API version */
|
||||
|
||||
#ifndef __rtems__
|
||||
#ifndef MSDOS /* Microsoft specific */
|
||||
#include <sys/syscall.h>
|
||||
#endif /* MSDOS */
|
||||
#endif
|
||||
|
||||
/*
|
||||
* The following defines establish the performance envelope of the
|
||||
* kernel discipline loop. Phase or frequency errors greater than
|
||||
* NAXPHASE or MAXFREQ are clamped to these maxima. For update intervals
|
||||
* less than MINSEC, the loop always operates in PLL mode; while, for
|
||||
* update intervals greater than MAXSEC, the loop always operates in FLL
|
||||
* mode. Between these two limits the operating mode is selected by the
|
||||
* STA_FLL bit in the status word.
|
||||
*/
|
||||
#define MAXPHASE 500000000L /* max phase error (ns) */
|
||||
#define MAXFREQ 500000L /* max freq error (ns/s) */
|
||||
#define MINSEC 256 /* min FLL update interval (s) */
|
||||
#define MAXSEC 2048 /* max PLL update interval (s) */
|
||||
#define NANOSECOND 1000000000L /* nanoseconds in one second */
|
||||
#define SCALE_PPM (65536 / 1000) /* crude ns/s to scaled PPM */
|
||||
#define MAXTC 10 /* max time constant */
|
||||
|
||||
/*
|
||||
* The following defines and structures define the user interface for
|
||||
* the ntp_gettime() and ntp_adjtime() syscalls.
|
||||
*
|
||||
* Control mode codes (timex.modes)
|
||||
*/
|
||||
#define MOD_OFFSET 0x0001 /* set time offset */
|
||||
#define MOD_FREQUENCY 0x0002 /* set frequency offset */
|
||||
#define MOD_MAXERROR 0x0004 /* set maximum time error */
|
||||
#define MOD_ESTERROR 0x0008 /* set estimated time error */
|
||||
#define MOD_STATUS 0x0010 /* set clock status bits */
|
||||
#define MOD_TIMECONST 0x0020 /* set PLL time constant */
|
||||
#define MOD_PPSMAX 0x0040 /* set PPS maximum averaging time */
|
||||
#define MOD_TAI 0x0080 /* set TAI offset */
|
||||
#define MOD_MICRO 0x1000 /* select microsecond resolution */
|
||||
#define MOD_NANO 0x2000 /* select nanosecond resolution */
|
||||
#define MOD_CLKB 0x4000 /* select clock B */
|
||||
#define MOD_CLKA 0x8000 /* select clock A */
|
||||
|
||||
/*
|
||||
* 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 /* enable FLL 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_NANO 0x2000 /* resolution (0 = us, 1 = ns) (ro) */
|
||||
#define STA_MODE 0x4000 /* mode (0 = PLL, 1 = FLL) (ro) */
|
||||
#define STA_CLK 0x8000 /* clock source (0 = A, 1 = B) (ro) */
|
||||
|
||||
#define STA_RONLY (STA_PPSSIGNAL | STA_PPSJITTER | STA_PPSWANDER | \
|
||||
STA_PPSERROR | STA_CLOCKERR | STA_NANO | STA_MODE | STA_CLK)
|
||||
|
||||
/*
|
||||
* Clock states (time_state)
|
||||
*/
|
||||
#define TIME_OK 0 /* no leap second warning */
|
||||
#define TIME_INS 1 /* insert leap second warning */
|
||||
#define TIME_DEL 2 /* delete leap second warning */
|
||||
#define TIME_OOP 3 /* leap second in progress */
|
||||
#define TIME_WAIT 4 /* leap second has occured */
|
||||
#define TIME_ERROR 5 /* error (see status word) */
|
||||
|
||||
/*
|
||||
* NTP user interface (ntp_gettime()) - used to read kernel clock values
|
||||
*
|
||||
* Note: The time member is in microseconds if STA_NANO is zero and
|
||||
* nanoseconds if not.
|
||||
*/
|
||||
struct ntptimeval {
|
||||
struct timespec time; /* current time (ns) (ro) */
|
||||
long maxerror; /* maximum error (us) (ro) */
|
||||
long esterror; /* estimated error (us) (ro) */
|
||||
long tai; /* TAI offset */
|
||||
int time_state; /* time status */
|
||||
};
|
||||
|
||||
/*
|
||||
* NTP daemon interface (ntp_adjtime()) - used to discipline CPU clock
|
||||
* oscillator and determine status.
|
||||
*
|
||||
* Note: The offset, precision and jitter members are in microseconds if
|
||||
* STA_NANO is zero and nanoseconds if not.
|
||||
*/
|
||||
struct timex {
|
||||
unsigned int modes; /* clock mode bits (wo) */
|
||||
long offset; /* time offset (ns/us) (rw) */
|
||||
long freq; /* frequency offset (scaled PPM) (rw) */
|
||||
long maxerror; /* maximum error (us) (rw) */
|
||||
long esterror; /* estimated error (us) (rw) */
|
||||
int status; /* clock status bits (rw) */
|
||||
long constant; /* poll interval (log2 s) (rw) */
|
||||
long precision; /* clock precision (ns/us) (ro) */
|
||||
long tolerance; /* clock frequency tolerance (scaled
|
||||
* PPM) (ro) */
|
||||
/*
|
||||
* The following read-only structure members are implemented
|
||||
* only if the PPS signal discipline is configured in the
|
||||
* kernel. They are included in all configurations to insure
|
||||
* portability.
|
||||
*/
|
||||
long ppsfreq; /* PPS frequency (scaled PPM) (ro) */
|
||||
long jitter; /* PPS jitter (ns/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) */
|
||||
};
|
||||
|
||||
#ifdef __FreeBSD__
|
||||
|
||||
#ifdef _KERNEL
|
||||
void ntp_update_second(int64_t *adjustment, time_t *newsec);
|
||||
#else /* !_KERNEL */
|
||||
#include <sys/cdefs.h>
|
||||
|
||||
__BEGIN_DECLS
|
||||
int ntp_adjtime(struct timex *);
|
||||
int ntp_gettime(struct ntptimeval *);
|
||||
__END_DECLS
|
||||
#endif /* _KERNEL */
|
||||
|
||||
#endif /* __FreeBSD__ */
|
||||
|
||||
#endif /* !_SYS_TIMEX_H_ */
|
||||
@ -269,9 +269,6 @@ def base(mm):
|
||||
'sys/sys/taskqueue.h',
|
||||
'sys/sys/nlist_aout.h',
|
||||
'sys/rpc/types.h',
|
||||
'sys/sys/timepps.h',
|
||||
'sys/sys/timetc.h',
|
||||
'sys/sys/timex.h',
|
||||
'sys/sys/tree.h',
|
||||
'sys/sys/ttycom.h',
|
||||
'sys/sys/ucred.h',
|
||||
|
||||
@ -32,21 +32,21 @@
|
||||
#define _RTEMS_BSD_SYS_TIME_H_
|
||||
|
||||
#include <sys/time.h>
|
||||
#include <rtems.h>
|
||||
#include <rtems/timecounter.h>
|
||||
|
||||
static inline time_t
|
||||
rtems_bsd_time_second(void)
|
||||
{
|
||||
return time(NULL);
|
||||
}
|
||||
|
||||
static inline time_t
|
||||
rtems_bsd_time_uptime(void)
|
||||
{
|
||||
return rtems_clock_get_uptime_seconds();
|
||||
}
|
||||
|
||||
#define time_second rtems_bsd_time_second()
|
||||
#define time_uptime rtems_bsd_time_uptime()
|
||||
#define bintime(_x) _Timecounter_Bintime(_x)
|
||||
#define nanotime(_x) _Timecounter_Nanotime(_x)
|
||||
#define microtime(_x) _Timecounter_Microtime(_x)
|
||||
#define binuptime(_x) _Timecounter_Binuptime(_x)
|
||||
#define nanouptime(_x) _Timecounter_Nanouptime(_x)
|
||||
#define microuptime(_x) _Timecounter_Microuptime(_x)
|
||||
#define getbintime(_x) _Timecounter_Getbintime(_x)
|
||||
#define getnanotime(_x) _Timecounter_Getnanotime(_x)
|
||||
#define getmicrotime(_x) _Timecounter_Getmicrotime(_x)
|
||||
#define getbinuptime(_x) _Timecounter_Getbinuptime(_x)
|
||||
#define getnanouptime(_x) _Timecounter_Getnanouptime(_x)
|
||||
#define getmicrouptime(_x) _Timecounter_Getmicrouptime(_x)
|
||||
#define time_second _Timecounter_Time_second
|
||||
#define time_uptime _Timecounter_Time_uptime
|
||||
|
||||
#endif /* _RTEMS_BSD_SYS_TIME_H_ */
|
||||
|
||||
@ -71,9 +71,6 @@ int hz;
|
||||
int tick;
|
||||
int maxusers; /* base tunable */
|
||||
|
||||
struct bintime boottimebin;
|
||||
struct timeval boottime;
|
||||
|
||||
static SYSCTL_NODE(_kern, OID_AUTO, smp, CTLFLAG_RD|CTLFLAG_CAPRD, NULL,
|
||||
"Kernel SMP");
|
||||
|
||||
@ -103,9 +100,6 @@ rtems_bsd_initialize(void)
|
||||
maxusers = 1;
|
||||
maxid_maxcpus = (int) rtems_get_processor_count();
|
||||
|
||||
gettimeofday(&boottime, NULL);
|
||||
timeval2bintime(&boottime, &boottimebin);
|
||||
|
||||
mkdir("/etc", S_IRWXU | S_IRWXG | S_IRWXO);
|
||||
|
||||
sc = rtems_timer_initiate_server(
|
||||
|
||||
@ -52,45 +52,3 @@ tvtohz(struct timeval *tv)
|
||||
|
||||
return (int) _Timespec_To_ticks( &ts );
|
||||
}
|
||||
|
||||
void
|
||||
binuptime(struct bintime *bt)
|
||||
{
|
||||
struct timeval tv;
|
||||
|
||||
rtems_clock_get_uptime_timeval(&tv);
|
||||
timeval2bintime(&tv, bt);
|
||||
}
|
||||
|
||||
void
|
||||
bintime(struct bintime *bt)
|
||||
{
|
||||
struct timeval tv;
|
||||
|
||||
gettimeofday(&tv, NULL);
|
||||
timeval2bintime(&tv, bt);
|
||||
}
|
||||
|
||||
void
|
||||
microtime(struct timeval *tvp)
|
||||
{
|
||||
gettimeofday(tvp, NULL);
|
||||
}
|
||||
|
||||
void
|
||||
getbinuptime(struct bintime *bt)
|
||||
{
|
||||
binuptime(bt);
|
||||
}
|
||||
|
||||
void
|
||||
getmicrouptime(struct timeval *tvp)
|
||||
{
|
||||
rtems_clock_get_uptime_timeval(tvp);
|
||||
}
|
||||
|
||||
void
|
||||
getmicrotime(struct timeval *tvp)
|
||||
{
|
||||
microtime(tvp);
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user