[src/netbsd-1-4]: src/sys/dev/ic Pull up revisions 1.61-1.62 (requested by jo...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/deef44ab9dcc
branches:  netbsd-1-4
changeset: 470114:deef44ab9dcc
user:      he <he%NetBSD.org@localhost>
date:      Thu Jan 20 23:24:16 2000 +0000

description:
Pull up revisions 1.61-1.62 (requested by jonathan):
  Fix TIMEVAL/TIMESPEC botches and update to the -05 draft version
  of the PPS-API specification.

diffstat:

 sys/dev/ic/z8530tty.c |  23 +++++++----------------
 1 files changed, 7 insertions(+), 16 deletions(-)

diffs (77 lines):

diff -r b2ba9b7b01f8 -r deef44ab9dcc sys/dev/ic/z8530tty.c
--- a/sys/dev/ic/z8530tty.c     Thu Jan 20 23:23:48 2000 +0000
+++ b/sys/dev/ic/z8530tty.c     Thu Jan 20 23:24:16 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: z8530tty.c,v 1.59.2.1 1999/04/23 15:07:26 perry Exp $  */
+/*     $NetBSD: z8530tty.c,v 1.59.2.2 2000/01/20 23:24:16 he Exp $     */
 
 /*-
  * Copyright (c) 1993, 1994, 1995, 1996, 1997, 1998, 1999
@@ -709,20 +709,20 @@
                *(int *)data = zs_to_tiocm(zst);
                break;
 
-       case PPS_CREATE:
+       case PPS_IOC_CREATE:
                break;
 
-       case PPS_DESTROY:
+       case PPS_IOC_DESTROY:
                break;
 
-       case PPS_GETPARAMS: {
+       case PPS_IOC_GETPARAMS: {
                pps_params_t *pp;
                pp = (pps_params_t *)data;
                *pp = zst->ppsparam;
                break;
        }
 
-       case PPS_SETPARAMS: {
+       case PPS_IOC_SETPARAMS: {
                pps_params_t *pp;
                int mode;
                if (cs->cs_rr0_pps == 0) {
@@ -797,22 +797,17 @@
                break;
        }
 
-       case PPS_GETCAP:
+       case PPS_IOC_GETCAP:
                *(int *)data = zsppscap;
                break;
 
-       case PPS_FETCH: {
+       case PPS_IOC_FETCH: {
                pps_info_t *pi;
                pi = (pps_info_t *)data;
                *pi = zst->ppsinfo;
                break;
        }
 
-       case PPS_WAIT:
-               /* XXX */
-               error = EOPNOTSUPP;
-               break;
-
        case TIOCDCDTIMESTAMP:  /* XXX old, overloaded  API used by xntpd v3 */
                if (cs->cs_rr0_pps == 0) {
                        error = EINVAL;
@@ -1487,8 +1482,6 @@
                                        timespecadd(&zst->ppsinfo.assert_timestamp,
                                            &zst->ppsparam.assert_offset,
                                            &zst->ppsinfo.assert_timestamp);
-                                       TIMESPEC_TO_TIMEVAL(&tv,
-                                           &zst->ppsinfo.assert_timestamp);
                                }
 
 #ifdef PPS_SYNC
@@ -1507,8 +1500,6 @@
                                        timespecadd(&zst->ppsinfo.clear_timestamp,
                                                &zst->ppsparam.clear_offset,
                                                &zst->ppsinfo.clear_timestamp);
-                                       TIMESPEC_TO_TIMEVAL(&tv,
-                                               &zst->ppsinfo.clear_timestamp);
                                }
 
 #ifdef PPS_SYNC