Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix issues areound compilation errors (ntv is a pointer in adjtime1 and needs

Browse Source 
-> rather than . access and adjtime1 needs the syscall args passed in)
This commit is contained in:
jmc 2001-09-16 09:55:26 +00:00
parent 5f4c074523
commit 87a006a7de
1 changed files with 34 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
sys/kern/kern_ntptime.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_ntptime.c,v 1.14 2001/09/16 06:50:06 manu Exp $ */ /* $NetBSD: kern_ntptime.c,v 1.15 2001/09/16 09:55:26 jmc Exp $ */
/****************************************************************************** /******************************************************************************
* * * *
@ -210,14 +210,18 @@ sys_ntp_adjtime(p, v, retval)
if (ntv.modes != 0 && (error = suser(p->p_ucred, &p->p_acflag)) != 0) if (ntv.modes != 0 && (error = suser(p->p_ucred, &p->p_acflag)) != 0)
return (error); return (error);
return (ntp_adjtime1(&ntv, retval)); return (ntp_adjtime1(&ntv, v, retval));
} }
int int
ntp_adjtime1(struct timex *, register_t*) ntp_adjtime1(ntv, v, retval)
struct timex *ntv; struct timex *ntv;
void *v;
register_t *retval; register_t *retval;
{ {
struct sys_ntp_adjtime_args /* {
syscallarg(struct timex *) tp;
} */ *uap = v;
int error = 0; int error = 0;
int modes; int modes;
int s; int s;
@ -227,58 +231,58 @@ ntp_adjtime1(struct timex *, register_t*)
* checking here on the assumption the superuser should know * checking here on the assumption the superuser should know
* what it is doing. * what it is doing.
*/ */
modes = ntv.modes; modes = ntv->modes;
s = splclock(); s = splclock();
if (modes & MOD_FREQUENCY) if (modes & MOD_FREQUENCY)
#ifdef PPS_SYNC #ifdef PPS_SYNC
time_freq = ntv.freq - pps_freq; time_freq = ntv->freq - pps_freq;
#else /* PPS_SYNC */ #else /* PPS_SYNC */
time_freq = ntv.freq; time_freq = ntv->freq;
#endif /* PPS_SYNC */ #endif /* PPS_SYNC */
if (modes & MOD_MAXERROR) if (modes & MOD_MAXERROR)
time_maxerror = ntv.maxerror; time_maxerror = ntv->maxerror;
if (modes & MOD_ESTERROR) if (modes & MOD_ESTERROR)
time_esterror = ntv.esterror; time_esterror = ntv->esterror;
if (modes & MOD_STATUS) { if (modes & MOD_STATUS) {
time_status &= STA_RONLY; time_status &= STA_RONLY;
time_status |= ntv.status & ~STA_RONLY; time_status |= ntv->status & ~STA_RONLY;
} }
if (modes & MOD_TIMECONST) if (modes & MOD_TIMECONST)
time_constant = ntv.constant; time_constant = ntv->constant;
if (modes & MOD_OFFSET) if (modes & MOD_OFFSET)
hardupdate(ntv.offset); hardupdate(ntv->offset);
/* /*
* Retrieve all clock variables * Retrieve all clock variables
*/ */
if (time_offset < 0) if (time_offset < 0)
ntv.offset = -(-time_offset >> SHIFT_UPDATE); ntv->offset = -(-time_offset >> SHIFT_UPDATE);
else else
ntv.offset = time_offset >> SHIFT_UPDATE; ntv->offset = time_offset >> SHIFT_UPDATE;
#ifdef PPS_SYNC #ifdef PPS_SYNC
ntv.freq = time_freq + pps_freq; ntv->freq = time_freq + pps_freq;
#else /* PPS_SYNC */ #else /* PPS_SYNC */
ntv.freq = time_freq; ntv->freq = time_freq;
#endif /* PPS_SYNC */ #endif /* PPS_SYNC */
ntv.maxerror = time_maxerror; ntv->maxerror = time_maxerror;
ntv.esterror = time_esterror; ntv->esterror = time_esterror;
ntv.status = time_status; ntv->status = time_status;
ntv.constant = time_constant; ntv->constant = time_constant;
ntv.precision = time_precision; ntv->precision = time_precision;
ntv.tolerance = time_tolerance; ntv->tolerance = time_tolerance;
#ifdef PPS_SYNC #ifdef PPS_SYNC
ntv.shift = pps_shift; ntv->shift = pps_shift;
ntv.ppsfreq = pps_freq; ntv->ppsfreq = pps_freq;
ntv.jitter = pps_jitter >> PPS_AVG; ntv->jitter = pps_jitter >> PPS_AVG;
ntv.stabil = pps_stabil; ntv->stabil = pps_stabil;
ntv.calcnt = pps_calcnt; ntv->calcnt = pps_calcnt;
ntv.errcnt = pps_errcnt; ntv->errcnt = pps_errcnt;
ntv.jitcnt = pps_jitcnt; ntv->jitcnt = pps_jitcnt;
ntv.stbcnt = pps_stbcnt; ntv->stbcnt = pps_stbcnt;
#endif /* PPS_SYNC */ #endif /* PPS_SYNC */
(void)splx(s); (void)splx(s);
error = copyout((caddr_t)&ntv, (caddr_t)SCARG(uap, tp), sizeof(ntv)); error = copyout((caddr_t)ntv, (caddr_t)SCARG(uap, tp), sizeof(*ntv));
if (!error) { if (!error) {
/* /*