 @@ -1,14 +1,14 @@
-/* $NetBSD: adadc.c,v 1.1 2018/03/09 20:16:54 macallan Exp $ */
+/* $NetBSD: adadc.c,v 1.2 2018/03/09 22:27:15 macallan Exp $ */
 /*-
  * Copyright (c) 2018 Michael Lorenz
  * All rights reserved.
+ *
  * 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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -16,30 +16,35 @@
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND 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 THE FOUNDATION OR CONTRIBUTORS
  * 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.
  */
-/* a driver for Analog Devices AD7417 temperature sensors / ADCs */
+/*
  * a driver for Analog Devices AD7417 temperature sensors / ADCs
  * very much macppc only for now since we need calibaration data to make sense
  * of the ADC inputs
  * info on how to get these from FreeBSD and Linux
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adadc.c,v 1.1 2018/03/09 20:16:54 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adadc.c,v 1.2 2018/03/09 22:27:15 macallan Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/bus.h>
 #include <dev/i2c/i2cvar.h>
 #include <dev/sysmon/sysmonvar.h>
 #include <dev/ofw/openfirm.h>
 @@ -83,79 +88,88 @@ struct adadc_softc {
 static int	adadc_match(device_t, cfdata_t, void *);
 static void	adadc_attach(device_t, device_t, void *);
 static void	adadc_sensors_refresh(struct sysmon_envsys *, envsys_data_t *);
 CFATTACH_DECL_NEW(adadc, sizeof(struct adadc_softc),
     adadc_match, adadc_attach, NULL, NULL);
 static const char * dstemp_compats[] = {
 	"ad7417",
 	NULL
 };
 /* calibaration table from Darwin via Linux */
 static int slope[5] = {0, 0, 0x0320, 0x00a0, 0x1f40};
 static int
 adadc_match(device_t parent, cfdata_t match, void *aux)
+{
 	struct i2c_attach_args *ia = aux;
 	if (ia->ia_name == NULL) {
-		/* no ID registers on this chip */
+		/*
 		 * XXX
 		 * this driver is pretty much useless without OF, should
 		 * probably remove this
 		 */
 		if ((ia->ia_addr & 0x2b) == 0x2b)
 			return 1;
 		return 0;
 	} else {
 		return iic_compat_match(ia, dstemp_compats);
+	}
+}
 static void
 adadc_attach(device_t parent, device_t self, void *aux)
+{
 	struct adadc_softc *sc = device_private(self);
 	struct i2c_attach_args *ia = aux;
 	envsys_data_t *s;
 	int error, ch, cpuid;
 	uint32_t eeprom[40];
 	uint8_t cmd, data;
 	char loc[256];
 	int which_cpu;
 	sc->sc_dev = self;
 	sc->sc_i2c = ia->ia_tag;
 	sc->sc_addr = ia->ia_addr;
 	aprint_naive("\n");
 	aprint_normal(": AD7417\n");
 	cmd = ADADC_CONFIG;
 	error = iic_exec(sc->sc_i2c, I2C_OP_READ_WITH_STOP,
 	    sc->sc_addr, &cmd, 1, &data, 1, 0);
 	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 = adadc_sensors_refresh;
 	sc->sc_nsensors = 0;
 	/*
 	 * XXX
 	 * without OpenFirmware telling us how to interpret the ADC inputs we
 	 * should probably just expose the temperature and four ENVSYS_INTEGERs
 	 */
 	which_cpu = 0;
 	ch = OF_child(ia->ia_cookie);
 	while (ch != 0) {
 		if (OF_getprop(ch, "location", loc, 32) > 0) {
 			int reg = 0;
 			OF_getprop(ch, "reg", &reg, sizeof(reg));
 			s = &sc->sc_sensors[sc->sc_nsensors];
 			/*
 			 * this setup matches my 2x 2.5GHz PCI-X G5, Linux and
 			 * FreeBSD hardcode these as well so we should be safe
 			 */
 			switch (reg) {
 			case 0:
 				if (strstr(loc, "CPU B") != NULL)
 					which_cpu = 1;
 				/* FALLTHROUGH */
 			case 1:
 				s->units = ENVSYS_STEMP;
 				break;
 			case 2:
 			case 4:
 				s->units = ENVSYS_SAMPS;
 				break;
 			case 3:
 @@ -210,31 +224,36 @@ adadc_sensors_refresh(struct sysmon_envs
+		}
 		cmd = ADADC_ADC;
 		/* now read the ADC register */
 		error = iic_exec(sc->sc_i2c, I2C_OP_READ_WITH_STOP,
 		    sc->sc_addr, &cmd, 1, &rdata, 2, 0);
 		rdata = be16toh(rdata) >> 6;
 		if (edata->private == 1) {
 			int temp;
 			temp = (rdata * sc->sc_diode_slope +
 				sc->sc_diode_offset) >> 2;
 			/* 16.16 fixed point */
 			edata->value_cur = (temp >> 12) * 62500 + 273150000;
 		} else {
 			/*
 			 * the input is 10bit, so converting to 8.4 fixed point
 			 * is more than enough
 			 */
 			int temp = rdata * slope[edata->private];
 			edata->value_cur = (temp >> 12) * 62500;
+		}
 	} else {
 		cmd = ADADC_TEMP;
 		/* just read the temperature register */
 		error = iic_exec(sc->sc_i2c, I2C_OP_READ_WITH_STOP,
 		    sc->sc_addr, &cmd, 1, &data, 2, 0);
 		/* 8.2 bit fixed point Celsius -> microkelvin */
 		edata->value_cur = ((data >> 6) * 250000) + 273150000;
+	}
 	iic_release_bus(sc->sc_i2c, 0);
 	if (error) {
 		edata->state = ENVSYS_SINVALID;
 	} else {
 		edata->state = ENVSYS_SVALID;
+	}
+}