 @@ -1,14 +1,14 @@
-/* $NetBSD: ug.c,v 1.12 2011/06/20 18:12:06 pgoyette Exp $ */
+/* $NetBSD: ug.c,v 1.13 2018/06/03 10:04:40 maxv Exp $ */
 /*
  * Copyright (c) 2007 Mihai Chelaru <kefren@netbsd.ro>
  * 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,27 +16,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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: ug.c,v 1.12 2011/06/20 18:12:06 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ug.c,v 1.13 2018/06/03 10:04:40 maxv Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/errno.h>
 #include <sys/conf.h>
 #include <sys/envsys.h>
 #include <sys/time.h>
 #include <sys/bus.h>
 @@ -46,27 +46,27 @@ __KERNEL_RCSID(0, "$NetBSD: ug.c,v 1.12
 #include <dev/isa/isavar.h>
 #include <dev/sysmon/sysmonvar.h>
 #include <dev/ic/ugreg.h>
 #include <dev/ic/ugvar.h>
 uint8_t ug_ver;
 /*
  * Imported from linux driver
  */
-struct ug2_motherboard_info ug2_mb[] = {
+static const struct ug2_motherboard_info ug2_mb[] = {
 	{ 0x000C, "unknown. Please send-pr(1)", {
 		{ "CPU Core", 0, 0, 10, 1, 0 },
 		{ "DDR", 1, 0, 10, 1, 0 },
 		{ "DDR VTT", 2, 0, 10, 1, 0 },
 		{ "CPU VTT 1.2V", 3, 0, 10, 1, 0 },
 		{ "MCH & PCIE 1.5V", 4, 0, 10, 1, 0 },
 		{ "MCH 2.5V", 5, 0, 20, 1, 0 },
 		{ "ICH 1.05V", 6, 0, 10, 1, 0 },
 		{ "ATX +12V (24-Pin)", 7, 0, 60, 1, 0 },
 		{ "ATX +12V (4-pin)", 8, 0, 60, 1, 0 },
 		{ "ATX +5V", 9, 0, 30, 1, 0 },
 		{ "+3.3V", 10, 0, 20, 1, 0 },
 		{ "5VSB", 11, 0, 30, 1, 0 },
 @@ -475,51 +475,51 @@ ug_refresh(struct sysmon_envsys *sme, en
 	/* and Fans */
 	if (edata->sensor >= UG_FAN_MIN)
 		edata->value_cur = ug_read(sc, UG_CPUFAN +
 		    edata->sensor - UG_FAN_MIN) * UG_RFACT_FAN;
+}
 void
 ug2_attach(device_t dv)
+{
 	struct ug_softc *sc = device_private(dv);
 	uint8_t buf[2];
 	int i;
-	struct ug2_motherboard_info *ai;
+	const struct ug2_motherboard_info *ai;
-	struct ug2_sensor_info *si;
+	const struct ug2_sensor_info *si;
 	aprint_normal(": Abit uGuru 2005 system monitor\n");
 	if (ug2_read(sc, UG2_MISC_BANK, UG2_BOARD_ID, 2, buf) != 2) {
 		aprint_error_dev(dv, "Cannot detect board ID. Using default\n");
 		buf[0] = UG_MAX_MSB_BOARD;
 		buf[1] = UG_MAX_LSB_BOARD;
+	}
 	if (buf[0] > UG_MAX_MSB_BOARD || buf[1] > UG_MAX_LSB_BOARD ||
 		buf[1] < UG_MIN_LSB_BOARD) {
 		aprint_error_dev(dv, "Invalid board ID(%X,%X). Using default\n",
 			buf[0], buf[1]);
 		buf[0] = UG_MAX_MSB_BOARD;
 		buf[1] = UG_MAX_LSB_BOARD;
+	}
 	ai = &ug2_mb[buf[1] - UG_MIN_LSB_BOARD];
 	aprint_normal_dev(dv, "mainboard %s (%.2X%.2X)\n",
 	    ai->name, buf[0], buf[1]);
-	sc->mbsens = (void*)ai->sensors;
+	sc->mbsens = (const void *)ai->sensors;
 	sc->sc_sme = sysmon_envsys_create();
 	for (i = 0, si = ai->sensors; si && si->name; si++, i++) {
 		COPYDESCR(sc->sc_sensor[i].desc, si->name);
 		sc->sc_sensor[i].rfact = 1;
 		sc->sc_sensor[i].state = ENVSYS_SVALID;
 		switch (si->type) {
 			case UG2_VOLTAGE_SENSOR:
 				sc->sc_sensor[i].units = ENVSYS_SVOLTS_DC;
 				sc->sc_sensor[i].rfact = UG_RFACT;
 				break;
 			case UG2_TEMP_SENSOR:
 				sc->sc_sensor[i].units = ENVSYS_STEMP;
 @@ -542,27 +542,28 @@ ug2_attach(device_t dv)
 	sc->sc_sme->sme_cookie = sc;
 	sc->sc_sme->sme_refresh = ug2_refresh;
 	if (sysmon_envsys_register(sc->sc_sme)) {
 		aprint_error_dev(dv, "unable to register with sysmon\n");
 		sysmon_envsys_destroy(sc->sc_sme);
+	}
+}
 void
 ug2_refresh(struct sysmon_envsys *sme, envsys_data_t *edata)
+{
 	struct ug_softc *sc = sme->sme_cookie;
-	struct ug2_sensor_info *si = (struct ug2_sensor_info *)sc->mbsens;
+	const struct ug2_sensor_info *si =
 	    (const struct ug2_sensor_info *)sc->mbsens;
 	int rfact = 1;
 	uint8_t v;
 	si += edata->sensor;
 #define SENSOR_VALUE (v * si->multiplier * rfact / si->divisor + si->offset)
 	if (ug2_read(sc, UG2_SENSORS_BANK, UG2_VALUES_OFFSET +
 	    si->port, 1, &v) == 1) {
 		switch (si->type) {
 		case UG2_TEMP_SENSOR:
 		    edata->value_cur = SENSOR_VALUE * 1000000
 			+ 273150000;

 @@ -1,14 +1,14 @@
-/* $NetBSD: ugvar.h,v 1.4 2008/03/26 16:09:37 xtraeme Exp $ */
+/* $NetBSD: ugvar.h,v 1.5 2018/06/03 10:04:40 maxv Exp $ */
 /*
  * Copyright (c) 2007 Mihai Chelaru <kefren@netbsd.ro>
  * 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. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
+ *
 @@ -25,27 +25,27 @@
  * SUCH DAMAGE.
  */
 #ifndef _UGVAR_H_
 #define _UGVAR_H_
 struct ug_softc {
 	bus_space_tag_t sc_iot;
 	bus_space_handle_t sc_ioh;
 	struct sysmon_envsys *sc_sme;
 	envsys_data_t sc_sensor[UG_MAX_SENSORS];
 	uint8_t version;
-	void *mbsens;
+	const void *mbsens;
 };
 struct ug2_sensor_info {
 	const char *name;
 	int port;
 	int type;
 	int multiplier;
 	int divisor;
 	int offset;
 };
 struct ug2_motherboard_info {
 	uint16_t id;