diff options
Diffstat (limited to 'include/ntp_fp.h')
| -rw-r--r-- | include/ntp_fp.h | 102 |
1 files changed, 47 insertions, 55 deletions
diff --git a/include/ntp_fp.h b/include/ntp_fp.h index 307ab102dd4b7..99d4df37025fe 100644 --- a/include/ntp_fp.h +++ b/include/ntp_fp.h @@ -5,12 +5,6 @@ #ifndef NTP_FP_H #define NTP_FP_H -#include <sys/types.h> -#include <sys/socket.h> -#include <netinet/in.h> - -#include "ntp_rfc2553.h" - #include "ntp_types.h" /* @@ -76,7 +70,7 @@ typedef int32 s_fp; typedef u_int32 u_fp; /* - * A unit second in fp format. Actually 2**(half_the_bits_in_a_long) + * A unit second in fp format. Actually 2**(half_the_bits_in_a_long) */ #define FP_SECOND (0x10000) @@ -92,9 +86,9 @@ typedef u_int32 u_fp; #define NTOHL_MFP(ni, nf, hi, hf) \ do { (hi) = ntohl(ni); (hf) = ntohl(nf); } while (0) #define HTONL_MFP(hi, hf, ni, nf) \ - do { (ni) = ntohl(hi); (nf) = ntohl(hf); } while (0) + do { (ni) = htonl(hi); (nf) = htonl(hf); } while (0) -/* funny ones. Converts ts fractions to net order ts */ +/* funny ones. Converts ts fractions to net order ts */ #define HTONL_UF(uf, nts) \ do { (nts)->l_ui = 0; (nts)->l_uf = htonl(uf); } while (0) #define HTONL_F(f, nts) do { (nts)->l_uf = htonl(f); \ @@ -124,7 +118,7 @@ typedef u_int32 u_fp; * be replaced by inline assembler for particular machines someday. * These are the (kind of inefficient) run-anywhere versions. */ -#define M_NEG(v_i, v_f) /* v = -v */ \ +#define M_NEG(v_i, v_f) /* v = -v */ \ do { \ if ((v_f) == 0) \ (v_i) = -((s_fp)(v_i)); \ @@ -134,7 +128,7 @@ typedef u_int32 u_fp; } \ } while(0) -#define M_NEGM(r_i, r_f, a_i, a_f) /* r = -a */ \ +#define M_NEGM(r_i, r_f, a_i, a_f) /* r = -a */ \ do { \ if ((a_f) == 0) { \ (r_f) = 0; \ @@ -145,7 +139,7 @@ typedef u_int32 u_fp; } \ } while(0) -#define M_ADD(r_i, r_f, a_i, a_f) /* r += a */ \ +#define M_ADD(r_i, r_f, a_i, a_f) /* r += a */ \ do { \ register u_int32 lo_tmp; \ register u_int32 hi_tmp; \ @@ -244,7 +238,7 @@ typedef u_int32 u_fp; (v_f) <<= 1; \ } while (0) -#define M_ADDUF(r_i, r_f, uf) /* r += uf, uf is u_int32 fraction */ \ +#define M_ADDUF(r_i, r_f, uf) /* r += uf, uf is u_int32 fraction */ \ M_ADD((r_i), (r_f), 0, (uf)) /* let optimizer worry about it */ #define M_SUBUF(r_i, r_f, uf) /* r -= uf, uf is u_int32 fraction */ \ @@ -258,7 +252,7 @@ typedef u_int32 u_fp; M_ADD((r_i), (r_f), (-1), (f));\ } while(0) -#define M_ISNEG(v_i, v_f) /* v < 0 */ \ +#define M_ISNEG(v_i, v_f) /* v < 0 */ \ (((v_i) & 0x80000000) != 0) #define M_ISHIS(a_i, a_f, b_i, b_f) /* a >= b unsigned */ \ @@ -297,7 +291,7 @@ typedef u_int32 u_fp; /* * s_fp/double and u_fp/double conversions */ -#define FRIC 65536. /* 2^16 as a double */ +#define FRIC 65536. /* 2^16 as a double */ #define DTOFP(r) ((s_fp)((r) * FRIC)) #define DTOUFP(r) ((u_fp)((r) * FRIC)) #define FPTOD(r) ((double)(r) / FRIC) @@ -305,8 +299,8 @@ typedef u_int32 u_fp; /* * l_fp/double conversions */ -#define FRAC 4294967296. /* 2^32 as a double */ -#define M_DTOLFP(d, r_i, r_uf) /* double to l_fp */ \ +#define FRAC 4294967296. /* 2^32 as a double */ +#define M_DTOLFP(d, r_i, r_uf) /* double to l_fp */ \ do { \ register double d_tmp; \ \ @@ -321,7 +315,7 @@ typedef u_int32 u_fp; (r_uf) = (u_int32)(((d_tmp) - (double)(r_i)) * FRAC); \ } \ } while (0) -#define M_LFPTOD(r_i, r_uf, d) /* l_fp to double */ \ +#define M_LFPTOD(r_i, r_uf, d) /* l_fp to double */ \ do { \ register l_fp l_tmp; \ \ @@ -334,46 +328,44 @@ typedef u_int32 u_fp; (d) = (double)l_tmp.l_i + ((double)l_tmp.l_uf) / FRAC; \ } \ } while (0) -#define DTOLFP(d, v) M_DTOLFP((d), (v)->l_ui, (v)->l_uf) -#define LFPTOD(v, d) M_LFPTOD((v)->l_ui, (v)->l_uf, (d)) +#define DTOLFP(d, v) M_DTOLFP((d), (v)->l_ui, (v)->l_uf) +#define LFPTOD(v, d) M_LFPTOD((v)->l_ui, (v)->l_uf, (d)) /* * Prototypes */ -extern char * dofptoa P((u_fp, int, short, int)); -extern char * dolfptoa P((u_long, u_long, int, short, int)); - -extern int atolfp P((const char *, l_fp *)); -extern int buftvtots P((const char *, l_fp *)); -extern char * fptoa P((s_fp, short)); -extern char * fptoms P((s_fp, short)); -extern int hextolfp P((const char *, l_fp *)); -extern void gpstolfp P((int, int, unsigned long, l_fp *)); -extern int mstolfp P((const char *, l_fp *)); -extern char * prettydate P((l_fp *)); -extern char * gmprettydate P((l_fp *)); -extern char * uglydate P((l_fp *)); -extern void mfp_mul P((int32 *, u_int32 *, int32, u_int32, int32, u_int32)); - -extern void get_systime P((l_fp *)); -extern int step_systime P((double)); -extern int adj_systime P((double)); - -extern struct tm * ntp2unix_tm P((u_long ntp, int local)); - -#define lfptoa(_fpv, _ndec) mfptoa((_fpv)->l_ui, (_fpv)->l_uf, (_ndec)) -#define lfptoms(_fpv, _ndec) mfptoms((_fpv)->l_ui, (_fpv)->l_uf, (_ndec)) - -#define stoa(_sin) socktoa((_sin)) -#define stohost(_sin) socktohost((_sin)) - -#define ntoa(_sin) stoa(_sin) -#define ntohost(_sin) stohost(_sin) - -#define ufptoa(_fpv, _ndec) dofptoa((_fpv), 0, (_ndec), 0) -#define ufptoms(_fpv, _ndec) dofptoa((_fpv), 0, (_ndec), 1) -#define ulfptoa(_fpv, _ndec) dolfptoa((_fpv)->l_ui, (_fpv)->l_uf, 0, (_ndec), 0) -#define ulfptoms(_fpv, _ndec) dolfptoa((_fpv)->l_ui, (_fpv)->l_uf, 0, (_ndec), 1) -#define umfptoa(_fpi, _fpf, _ndec) dolfptoa((_fpi), (_fpf), 0, (_ndec), 0) +extern char * dofptoa (u_fp, int, short, int); +extern char * dolfptoa (u_long, u_long, int, short, int); + +extern int atolfp (const char *, l_fp *); +extern int buftvtots (const char *, l_fp *); +extern char * fptoa (s_fp, short); +extern char * fptoms (s_fp, short); +extern int hextolfp (const char *, l_fp *); +extern void gpstolfp (int, int, unsigned long, l_fp *); +extern int mstolfp (const char *, l_fp *); +extern char * prettydate (l_fp *); +extern char * gmprettydate (l_fp *); +extern char * uglydate (l_fp *); +extern void mfp_mul (int32 *, u_int32 *, int32, u_int32, int32, u_int32); + +extern void get_systime (l_fp *); +extern int step_systime (double); +extern int adj_systime (double); + +extern struct tm * ntp2unix_tm (u_long ntp, int local); + +#define lfptoa(fpv, ndec) mfptoa((fpv)->l_ui, (fpv)->l_uf, (ndec)) +#define lfptoms(fpv, ndec) mfptoms((fpv)->l_ui, (fpv)->l_uf, (ndec)) + +#define stoa(addr) socktoa(addr) +#define ntoa(addr) stoa(addr) +#define stohost(addr) socktohost(addr) + +#define ufptoa(fpv, ndec) dofptoa((fpv), 0, (ndec), 0) +#define ufptoms(fpv, ndec) dofptoa((fpv), 0, (ndec), 1) +#define ulfptoa(fpv, ndec) dolfptoa((fpv)->l_ui, (fpv)->l_uf, 0, (ndec), 0) +#define ulfptoms(fpv, ndec) dolfptoa((fpv)->l_ui, (fpv)->l_uf, 0, (ndec), 1) +#define umfptoa(fpi, fpf, ndec) dolfptoa((fpi), (fpf), 0, (ndec), 0) #endif /* NTP_FP_H */ |