 @@ -1,14 +1,14 @@
-/*	$NetBSD: ds1307.c,v 1.18 2014/07/25 08:10:37 dholland Exp $	*/
+/*	$NetBSD: ds1307.c,v 1.18.2.1 2015/04/14 04:24:58 snj Exp $	*/
 /*
  * Copyright (c) 2003 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Steve C. Woodford and Jason R. Thorpe for Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -26,92 +26,106 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ds1307.c,v 1.18 2014/07/25 08:10:37 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ds1307.c,v 1.18.2.1 2015/04/14 04:24:58 snj Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/fcntl.h>
 #include <sys/uio.h>
 #include <sys/conf.h>
 #include <sys/event.h>
 #include <dev/clock_subr.h>
 #include <dev/i2c/i2cvar.h>
 #include <dev/i2c/ds1307reg.h>
 #include <dev/sysmon/sysmonvar.h>
 struct dsrtc_model {
 	uint16_t dm_model;
 	uint8_t dm_ch_reg;
 	uint8_t dm_ch_value;
 	uint8_t dm_rtc_start;
 	uint8_t dm_rtc_size;
 	uint8_t dm_nvram_start;
 	uint8_t dm_nvram_size;
 	uint8_t dm_flags;
 #define	DSRTC_FLAG_CLOCK_HOLD	1
 #define	DSRTC_FLAG_BCD		2
 #define	DSRTC_FLAG_TEMP		4
 };
 static const struct dsrtc_model dsrtc_models[] = {
+	{
 		.dm_model = 1307,
 		.dm_ch_reg = DSXXXX_SECONDS,
 		.dm_ch_value = DS1307_SECONDS_CH,
 		.dm_rtc_start = DS1307_RTC_START,
 		.dm_rtc_size = DS1307_RTC_SIZE,
 		.dm_nvram_start = DS1307_NVRAM_START,
 		.dm_nvram_size = DS1307_NVRAM_SIZE,
 		.dm_flags = DSRTC_FLAG_BCD | DSRTC_FLAG_CLOCK_HOLD,
 	}, {
 		.dm_model = 1339,
 		.dm_rtc_start = DS1339_RTC_START,
 		.dm_rtc_size = DS1339_RTC_SIZE,
 		.dm_flags = DSRTC_FLAG_BCD,
 	}, {
 		.dm_model = 1672,
 		.dm_rtc_start = DS1672_RTC_START,
 		.dm_rtc_size = DS1672_RTC_SIZE,
 		.dm_flags = 0,
 	}, {
 		.dm_model = 3231,
 		.dm_rtc_start = DS3232_RTC_START,
 		.dm_rtc_size = DS3232_RTC_SIZE,
 		/*
 		 * XXX
 		 * the DS3232 likely has the temperature sensor too but I can't
 		 * easily verify or test that right now
 		 */
 		.dm_flags = DSRTC_FLAG_BCD | DSRTC_FLAG_TEMP,
 	}, {
 		.dm_model = 3232,
 		.dm_rtc_start = DS3232_RTC_START,
 		.dm_rtc_size = DS3232_RTC_SIZE,
 		.dm_nvram_start = DS3232_NVRAM_START,
 		.dm_nvram_size = DS3232_NVRAM_SIZE,
 		.dm_flags = DSRTC_FLAG_BCD,
 	},
 };
 struct dsrtc_softc {
 	device_t sc_dev;
 	i2c_tag_t sc_tag;
 	uint8_t sc_address;
 	bool sc_open;
 	struct dsrtc_model sc_model;
 	struct todr_chip_handle sc_todr;
 	struct sysmon_envsys *sc_sme;
 	envsys_data_t sc_sensor;
 };
 static void	dsrtc_attach(device_t, device_t, void *);
 static int	dsrtc_match(device_t, cfdata_t, void *);
 CFATTACH_DECL_NEW(dsrtc, sizeof(struct dsrtc_softc),
     dsrtc_match, dsrtc_attach, NULL, NULL);
 extern struct cfdriver dsrtc_cd;
 dev_type_open(dsrtc_open);
 dev_type_close(dsrtc_close);
 dev_type_read(dsrtc_read);
 dev_type_write(dsrtc_write);
 @@ -131,26 +145,29 @@ const struct cdevsw dsrtc_cdevsw = {
 	.d_flag = D_OTHER
 };
 static int dsrtc_gettime_ymdhms(struct todr_chip_handle *, struct clock_ymdhms *);
 static int dsrtc_settime_ymdhms(struct todr_chip_handle *, struct clock_ymdhms *);
 static int dsrtc_clock_read_ymdhms(struct dsrtc_softc *, struct clock_ymdhms *);
 static int dsrtc_clock_write_ymdhms(struct dsrtc_softc *, struct clock_ymdhms *);
 static int dsrtc_gettime_timeval(struct todr_chip_handle *, struct timeval *);
 static int dsrtc_settime_timeval(struct todr_chip_handle *, struct timeval *);
 static int dsrtc_clock_read_timeval(struct dsrtc_softc *, time_t *);
 static int dsrtc_clock_write_timeval(struct dsrtc_softc *, time_t);
 static int dsrtc_read_temp(struct dsrtc_softc *, uint32_t *);
 static void dsrtc_refresh(struct sysmon_envsys *, envsys_data_t *);
 static const struct dsrtc_model *
 dsrtc_model(u_int model)
+{
 	/* no model given, assume it's a DS1307 (the first one) */
 	if (model == 0)
 		return &dsrtc_models[0];
 	for (const struct dsrtc_model *dm = dsrtc_models;
 	     dm < dsrtc_models + __arraycount(dsrtc_models); dm++) {
 		if (dm->dm_model == model)
 			return dm;
+	}
 	return NULL;
 @@ -192,26 +209,55 @@ dsrtc_attach(device_t parent, device_t s
 	sc->sc_dev = self;
 	sc->sc_open = 0;
 	sc->sc_todr.cookie = sc;
 	if (dm->dm_flags & DSRTC_FLAG_BCD) {
 		sc->sc_todr.todr_gettime_ymdhms = dsrtc_gettime_ymdhms;
 		sc->sc_todr.todr_settime_ymdhms = dsrtc_settime_ymdhms;
 	} else {
 		sc->sc_todr.todr_gettime = dsrtc_gettime_timeval;
 		sc->sc_todr.todr_settime = dsrtc_settime_timeval;
+	}
 	sc->sc_todr.todr_setwen = NULL;
 	todr_attach(&sc->sc_todr);
 	if ((sc->sc_model.dm_flags & DSRTC_FLAG_TEMP) != 0) {
 		int error;
 		sc->sc_sme = sysmon_envsys_create();
 		sc->sc_sme->sme_name = device_xname(self);
 		sc->sc_sme->sme_cookie = sc;
 		sc->sc_sme->sme_refresh = dsrtc_refresh;
 		sc->sc_sensor.units =  ENVSYS_STEMP;
 		sc->sc_sensor.state = ENVSYS_SINVALID;
 		sc->sc_sensor.flags = 0;
 		(void)strlcpy(sc->sc_sensor.desc, "temperature",
 		    sizeof(sc->sc_sensor.desc));
 		if (sysmon_envsys_sensor_attach(sc->sc_sme, &sc->sc_sensor)) {
 			aprint_error_dev(self, "unable to attach sensor\n");
 			goto bad;
+		}
 		error = sysmon_envsys_register(sc->sc_sme);
 		if (error) {
 			aprint_error_dev(self,
 			    "error %d registering with sysmon\n", error);
 			goto bad;
+		}
+	}
 	return;
 bad:
 	sysmon_envsys_destroy(sc->sc_sme);
+}
 /*ARGSUSED*/
 int
 dsrtc_open(dev_t dev, int flag, int fmt, struct lwp *l)
+{
 	struct dsrtc_softc *sc;
 	if ((sc = device_lookup_private(&dsrtc_cd, minor(dev))) == NULL)
 		return ENXIO;
 	/* XXX: Locking */
 	if (sc->sc_open)
 @@ -614,13 +660,66 @@ dsrtc_clock_write_timeval(struct dsrtc_s
 	/* Done with I2C */
 	iic_release_bus(sc->sc_tag, I2C_F_POLL);
 	/* send data */
 	if (error != 0) {
 		aprint_error_dev(sc->sc_dev,
 		    "%s: failed to set time: %d\n",
 		    __func__, error);
 		return 0;
+	}
 	return 1;
+}
 static int
 dsrtc_read_temp(struct dsrtc_softc *sc, uint32_t *temp)
+{
 	int error, tc;
 	uint8_t reg = DS3232_TEMP_MSB;
 	uint8_t buf[2];
 	if ((sc->sc_model.dm_flags & DSRTC_FLAG_TEMP) == 0)
 		return ENOTSUP;
 	if ((error = iic_acquire_bus(sc->sc_tag, I2C_F_POLL)) != 0) {
 		aprint_error_dev(sc->sc_dev,
 		    "%s: failed to acquire I2C bus: %d\n",
 		    __func__, error);
 		return 0;
+	}
 	/* read temperature registers: */
 	error = iic_exec(sc->sc_tag, I2C_OP_READ_WITH_STOP, sc->sc_address,
 	     &reg, 1, buf, 2, I2C_F_POLL);
 	/* Done with I2C */
 	iic_release_bus(sc->sc_tag, I2C_F_POLL);
 	if (error != 0) {
 		aprint_error_dev(sc->sc_dev,
 		    "%s: failed to read temperature: %d\n",
 		    __func__, error);
 		return 0;
+	}
 	/* convert to microkelvin */
 	tc = buf[0] * 1000000 + (buf[1] >> 6) * 250000;
 	*temp = tc + 273150000;
 	return 1;
+}
 static void
 dsrtc_refresh(struct sysmon_envsys *sme, envsys_data_t *edata)
+{
 	struct dsrtc_softc *sc = sme->sme_cookie;
 	uint32_t temp = 0;	/* XXX gcc */
 	if (dsrtc_read_temp(sc, &temp) == 0) {
 		edata->state = ENVSYS_SINVALID;
 		return;
+	}
 	edata->value_cur = temp;
 	edata->state = ENVSYS_SVALID;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ds1307reg.h,v 1.4 2012/02/23 20:59:19 matt Exp $	*/
+/*	$NetBSD: ds1307reg.h,v 1.4.14.1 2015/04/14 04:24:58 snj Exp $	*/
 /*
  * Copyright (c) 2003 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Steve C. Woodford for Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -71,26 +71,28 @@
 #define DS1672_CNTR4		0x03
 #define DS1672_CONTROL		0x04
 #define DS1672_TRICKLE		0x05
 #define DS1672_RTC_START	0
 #define DS1672_RTC_SIZE		4
 #define	DS1672_NVRAM_START	0
 #define	DS1672_NVRAM_SIZE	0
 #define DS3232_CONTROL		0x0e
 #define DS3232_CSR		0x0f
 #define	DS3232_RTC_START	0
 #define	DS3232_RTC_SIZE		DSXXXX_RTC_SIZE
 #define DS3232_TEMP_MSB		0x11
 #define DS3232_TEMP_LSB		0x12
 #define	DS3232_NVRAM_START	0x14
 #define	DS3232_NVRAM_SIZE	0xec
 /*
  * Bit definitions.
  */
 #define	DSXXXX_SECONDS_MASK	0x7f
 #define	DSXXXX_MINUTES_MASK	0x7f
 #define	DSXXXX_HOURS_12HRS_MODE	(1u << 6)	/* Set for 12 hour mode */
 #define	DSXXXX_HOURS_12HRS_PM	(1u << 5)	/* If 12 hr mode, set = PM */
 #define	DSXXXX_HOURS_12MASK	0x1f
 #define	DSXXXX_HOURS_24MASK	0x3f