From owner-svn-src-head@freebsd.org Tue Mar 6 00:05:47 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7549CF367EA; Tue, 6 Mar 2018 00:05:47 +0000 (UTC) (envelope-from jonlooney@gmail.com) Received: from mail-wr0-x22e.google.com (mail-wr0-x22e.google.com [IPv6:2a00:1450:400c:c0c::22e]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D8CDC749B7; Tue, 6 Mar 2018 00:05:46 +0000 (UTC) (envelope-from jonlooney@gmail.com) Received: by mail-wr0-x22e.google.com with SMTP id v18so18478632wrv.0; Mon, 05 Mar 2018 16:05:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=Q28ESpLKjIOc1fbz8i+bgjxnIPkqW8n6jfX21+mnRvs=; b=izECDC++gAA0DcOOiA7eNDMfkVv4b27Za959IK7EwvDuss7cEeBU6eaecWjKkTC4BO zrDgsE2W9ZBthoJRfYYCjsZ9EEyc6xu37VvGsWixQYw+oAsQnXr6Dj/5cWm65ImMeSbx Ps4piBvWbc26NHucOMDSR4ilYSQv92O3kDUNQPQAU5Bo1GlHgPkFrNrcfYtqiYQpr00c j9Nqo6K6tdF5IMXbIIhmaq9AiOtgW++iAIBliFL6diIda8zmzZiw1xQT7W3J5gFb8AG5 H0A6Nt8TN/zSds3oObvb28fR+yWhjizlrOBsy316sZH0vRHR3lmzgRWk1IovjUMxkRMk u+PQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=Q28ESpLKjIOc1fbz8i+bgjxnIPkqW8n6jfX21+mnRvs=; b=IODdplq36Ot0QRYFdxh72LVPaBWtYk3txor2cyk213a3H2qON52jJLCQbC2lGc7bv4 Y4F52TY4Am64eNp5EqQXd3GsVAm8kyss08Kq7mGc5Z5ulsQl32ZmUw7I26iQZ9kk38fg 3ixOUYMWoAZC+2ePOmQClB2XlT58SioudfG/59mFKVmdiedh957B252G//J2TZX4x7JL x4BO3qkqyYSRwBeDMcm8VbB/YaT4Y/uyBcyTVSpIWXEh1iL59ljPcbic2AifKZCkD7ZA NDKyIHjkxWxMG3JS7q0jB4uGqtogIbnmxy2ye9cTX+p3Wi/1AtzLKZaQf0PNJ16gFUf7 s2SA== X-Gm-Message-State: APf1xPA+olWYQcvVT6BMj0NLIby2xRyB/cZ3gFMO/FoxIUJLjKl79X1B vBd3Rur3LcsUNbm2LBbL7C/mtJjd2g0AUNMIyGkucTmZ X-Google-Smtp-Source: AG47ELuNVMvc6wW8fFtVs0O+SxUAR64XaY73g4N/EkDpZHgzYr3nKXN6zlnZjwVqBDH8npPykVkpD4A/1Nz8lJyqjQo= X-Received: by 10.223.209.205 with SMTP id m13mr12930307wri.99.1520294745645; Mon, 05 Mar 2018 16:05:45 -0800 (PST) MIME-Version: 1.0 Received: by 10.223.192.2 with HTTP; Mon, 5 Mar 2018 16:05:45 -0800 (PST) In-Reply-To: <201803041932.w24JWqei028169@repo.freebsd.org> References: <201803041932.w24JWqei028169@repo.freebsd.org> From: Jonathan Looney Date: Mon, 5 Mar 2018 19:05:45 -0500 Message-ID: Subject: Re: svn commit: r330407 - head/sys/dev/iicbus To: Ian Lepore Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.25 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Mar 2018 00:05:47 -0000 It looks like this is causing compilation failures: /home/jtl/head/sys/dev/iicbus/ds1672.c:147:20: error: use of undeclared identifier 'sc' clock_dbgprint_ts(sc->sc_dev, CLOCK_DBG_READ, ts); ^ /home/jtl/head/sys/dev/iicbus/ds1672.c:162:20: error: use of undeclared identifier 'sc' clock_dbgprint_ts(sc->sc_dev, CLOCK_DBG_WRITE, ts); ^ 2 errors generated. Jonathan On Sun, Mar 4, 2018 at 2:32 PM, Ian Lepore wrote: > Author: ian > Date: Sun Mar 4 19:32:52 2018 > New Revision: 330407 > URL: https://svnweb.freebsd.org/changeset/base/330407 > > Log: > Add calls to the new clock_dbgprint_xxx() functions. Also, stop applying > a local .5 second adjustment to the time, since that is now done by the > code in subr_rtc.c. > > Modified: > head/sys/dev/iicbus/ds1672.c > > Modified: head/sys/dev/iicbus/ds1672.c > ============================================================ > ================== > --- head/sys/dev/iicbus/ds1672.c Sun Mar 4 19:26:47 2018 > (r330406) > +++ head/sys/dev/iicbus/ds1672.c Sun Mar 4 19:32:52 2018 > (r330407) > @@ -54,8 +54,6 @@ __FBSDID("$FreeBSD$"); > > #define DS1672_CTRL_EOSC (1 << 7) /* Stop/start > flag. */ > > -#define NANOSEC 1000000000 > - > #define MAX_IIC_DATA_SIZE 4 > > struct ds1672_softc { > @@ -144,8 +142,9 @@ ds1672_gettime(device_t dev, struct timespec *ts) > /* counter has seconds since epoch */ > ts->tv_sec = (secs[3] << 24) | (secs[2] << 16) > | (secs[1] << 8) | (secs[0] << 0); > - ts->tv_nsec = NANOSEC / 2; > + ts->tv_nsec = 0; > } > + clock_dbgprint_ts(sc->sc_dev, CLOCK_DBG_READ, ts); > return (error); > } > > @@ -159,6 +158,8 @@ ds1672_settime(device_t dev, struct timespec *ts) > data[2] = (ts->tv_sec >> 16) & 0xff; > data[3] = (ts->tv_sec >> 24) & 0xff; > > + ts->tv_nsec = 0; > + clock_dbgprint_ts(sc->sc_dev, CLOCK_DBG_WRITE, ts); > return (ds1672_write(dev, DS1672_COUNTER, data, 4)); > } > > >