svn commit: r330407 - head/sys/dev/iicbus

[Jonathan Looney]

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 <ian at freebsd.org> 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));
>  }
>
>
>