Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/i2c - Use todr_gettime_ymdhms / todr_settime_ymdhms.



details:   https://anonhg.NetBSD.org/src/rev/317e8a59ab4f
branches:  trunk
changeset: 968107:317e8a59ab4f
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Thu Jan 02 19:11:12 2020 +0000

description:
- Use todr_gettime_ymdhms / todr_settime_ymdhms.
- Correctly propagate errors up the stack.

diffstat:

 sys/dev/i2c/m41t00.c |  100 +++++++++++++++++++-------------------------------
 1 files changed, 38 insertions(+), 62 deletions(-)

diffs (223 lines):

diff -r 8dab97caf33d -r 317e8a59ab4f sys/dev/i2c/m41t00.c
--- a/sys/dev/i2c/m41t00.c      Thu Jan 02 19:05:03 2020 +0000
+++ b/sys/dev/i2c/m41t00.c      Thu Jan 02 19:11:12 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: m41t00.c,v 1.22 2020/01/02 16:31:09 thorpej Exp $      */
+/*     $NetBSD: m41t00.c,v 1.23 2020/01/02 19:11:12 thorpej Exp $      */
 
 /*
  * Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: m41t00.c,v 1.22 2020/01/02 16:31:09 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: m41t00.c,v 1.23 2020/01/02 19:11:12 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -91,10 +91,10 @@
        .d_flag = D_OTHER
 };
 
-static int m41t00_clock_read(struct m41t00_softc *, struct clock_ymdhms *);
-static int m41t00_clock_write(struct m41t00_softc *, struct clock_ymdhms *);
-static int m41t00_gettime(struct todr_chip_handle *, struct timeval *);
-static int m41t00_settime(struct todr_chip_handle *, struct timeval *);
+static int m41t00_gettime_ymdhms(struct todr_chip_handle *,
+                                struct clock_ymdhms *);
+static int m41t00_settime_ymdhms(struct todr_chip_handle *,
+                                struct clock_ymdhms *);
 
 int
 m41t00_match(device_t parent, cfdata_t cf, void *aux)
@@ -123,8 +123,10 @@
 
        sc->sc_open = 0;
        sc->sc_todr.cookie = sc;
-       sc->sc_todr.todr_gettime = m41t00_gettime;
-       sc->sc_todr.todr_settime = m41t00_settime;
+       sc->sc_todr.todr_gettime = NULL;
+       sc->sc_todr.todr_settime = NULL;
+       sc->sc_todr.todr_gettime_ymdhms = m41t00_gettime_ymdhms;
+       sc->sc_todr.todr_settime_ymdhms = m41t00_settime_ymdhms;
        sc->sc_todr.todr_setwen = NULL;
 
        todr_attach(&sc->sc_todr);
@@ -238,35 +240,6 @@
        return error;
 }
 
-static int
-m41t00_gettime(struct todr_chip_handle *ch, struct timeval *tv)
-{
-       struct m41t00_softc *sc = ch->cookie;
-       struct clock_ymdhms dt;
-
-       if (m41t00_clock_read(sc, &dt) == 0)
-               return -1;
-
-       tv->tv_sec = clock_ymdhms_to_secs(&dt);
-       tv->tv_usec = 0;
-
-       return 0;
-}
-
-static int
-m41t00_settime(struct todr_chip_handle *ch, struct timeval *tv)
-{
-       struct m41t00_softc *sc = ch->cookie;
-       struct clock_ymdhms dt;
-
-       clock_secs_to_ymdhms(tv->tv_sec, &dt);
-
-       if (m41t00_clock_write(sc, &dt) == 0)
-               return -1;
-
-       return 0;
-}
-
 static int m41t00_rtc_offset[] = {
        M41T00_SEC,
        M41T00_MIN,
@@ -278,15 +251,16 @@
 };
 
 static int
-m41t00_clock_read(struct m41t00_softc *sc, struct clock_ymdhms *dt)
+m41t00_gettime_ymdhms(struct todr_chip_handle *ch, struct clock_ymdhms *dt)
 {
+       struct m41t00_softc *sc = ch->cookie;
        u_int8_t bcd[M41T00_NBYTES], cmdbuf[1];
-       int i, n;
+       int i, n, error;
 
-       if (iic_acquire_bus(sc->sc_tag, 0)) {
+       if ((error = iic_acquire_bus(sc->sc_tag, 0)) != 0) {
                aprint_error_dev(sc->sc_dev,
                    "m41t00_clock_read: failed to acquire I2C bus\n");
-               return 0;
+               return error;
        }
 
        /* Read each timekeeping register in order. */
@@ -294,15 +268,15 @@
        for (i = 0; i < n ; i++) {
                cmdbuf[0] = m41t00_rtc_offset[i];
 
-               if (iic_exec(sc->sc_tag, I2C_OP_READ_WITH_STOP,
+               if ((error = iic_exec(sc->sc_tag, I2C_OP_READ_WITH_STOP,
                             sc->sc_address, cmdbuf, 1,
-                            &bcd[i], 1, 0)) {
+                            &bcd[i], 1, 0)) != 0) {
                        iic_release_bus(sc->sc_tag, 0);
                        aprint_error_dev(sc->sc_dev,
                            "m41t00_clock_read: failed to read rtc "
                            "at 0x%x\n",
                            m41t00_rtc_offset[i]);
-                       return 0;
+                       return error;
                }
        }
 
@@ -326,15 +300,16 @@
         */
        dt->dt_year += 2000;
 
-       return 1;
+       return 0;
 }
 
 static int
-m41t00_clock_write(struct m41t00_softc *sc, struct clock_ymdhms *dt)
+m41t00_settime_ymdhms(struct todr_chip_handle *ch, struct clock_ymdhms *dt)
 {
+       struct m41t00_softc *sc = ch->cookie;
        uint8_t bcd[M41T00_DATE_BYTES], cmdbuf[2];
        uint8_t init_seconds, final_seconds;
-       int i;
+       int i, error;
 
        /*
         * Convert our time representation into something the MAX6900
@@ -348,10 +323,10 @@
        bcd[M41T00_MONTH] = bintobcd(dt->dt_mon);
        bcd[M41T00_YEAR] = bintobcd(dt->dt_year % 100);
 
-       if (iic_acquire_bus(sc->sc_tag, 0)) {
+       if ((error = iic_acquire_bus(sc->sc_tag, 0)) != 0) {
                aprint_error_dev(sc->sc_dev,
                    "m41t00_clock_write: failed to acquire I2C bus\n");
-               return 0;
+               return error;
        }
 
        /*
@@ -370,47 +345,48 @@
         */
  again:
        cmdbuf[0] = M41T00_SEC;
-       if (iic_exec(sc->sc_tag, I2C_OP_WRITE_WITH_STOP, sc->sc_address,
-                    cmdbuf, 1, &bcd[M41T00_SEC], 1, 0)) {
+       if ((error = iic_exec(sc->sc_tag, I2C_OP_WRITE_WITH_STOP,
+                             sc->sc_address, cmdbuf, 1, &bcd[M41T00_SEC], 1,
+                             0)) != 0) {
                iic_release_bus(sc->sc_tag, 0);
                aprint_error_dev(sc->sc_dev,
                    "m41t00_clock_write: failed to write SECONDS\n");
-               return 0;
+               return error;
        }
 
        cmdbuf[0] = M41T00_SEC;
-       if (iic_exec(sc->sc_tag, I2C_OP_READ_WITH_STOP, sc->sc_address,
-                    cmdbuf, 1, &init_seconds, 1, 0)) {
+       if ((error = iic_exec(sc->sc_tag, I2C_OP_READ_WITH_STOP, sc->sc_address,
+                    cmdbuf, 1, &init_seconds, 1, 0)) != 0) {
                iic_release_bus(sc->sc_tag, 0);
                aprint_error_dev(sc->sc_dev,
                    "m41t00_clock_write: failed to read "
                    "INITIAL SECONDS\n");
-               return 0;
+               return error;
        }
        init_seconds = bcdtobin(init_seconds & M41T00_SEC_MASK);
 
        for (i = 1; i < M41T00_DATE_BYTES; i++) {
                cmdbuf[0] = m41t00_rtc_offset[i];
-               if (iic_exec(sc->sc_tag,
+               if ((error = iic_exec(sc->sc_tag,
                             I2C_OP_WRITE_WITH_STOP, sc->sc_address,
-                            cmdbuf, 1, &bcd[i], 1, 0)) {
+                            cmdbuf, 1, &bcd[i], 1, 0)) != 0) {
                        iic_release_bus(sc->sc_tag, 0);
                        aprint_error_dev(sc->sc_dev,
                            "m41t00_clock_write: failed to write rtc "
                            " at 0x%x\n",
                            m41t00_rtc_offset[i]);
-                       return 0;
+                       return error;
                }
        }
 
        cmdbuf[0] = M41T00_SEC;
-       if (iic_exec(sc->sc_tag, I2C_OP_READ_WITH_STOP, sc->sc_address,
-                    cmdbuf, 1, &final_seconds, 1, 0)) {
+       if ((error = iic_exec(sc->sc_tag, I2C_OP_READ_WITH_STOP, sc->sc_address,
+                    cmdbuf, 1, &final_seconds, 1, 0)) != 0) {
                iic_release_bus(sc->sc_tag, 0);
                aprint_error_dev(sc->sc_dev,
                    "m41t00_clock_write: failed to read "
                    "FINAL SECONDS\n");
-               return 0;
+               return error;
        }
        final_seconds = bcdtobin(final_seconds & M41T00_SEC_MASK);
 
@@ -425,5 +401,5 @@
 
        iic_release_bus(sc->sc_tag, 0);
 
-       return 1;
+       return 0;
 }



Home | Main Index | Thread Index | Old Index