Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/dev/isa/ug_isa.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/dev/isa/ug_isa.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.2.12.4
retrieving revision 1.3
diff -u -p -r1.2.12.4 -r1.3
--- src/sys/dev/isa/ug_isa.c	2007/12/07 17:30:19	1.2.12.4
+++ src/sys/dev/isa/ug_isa.c	2007/09/09 05:39:10	1.3
@@ -1,4 +1,4 @@
-/* $NetBSD: ug_isa.c,v 1.2.12.4 2007/12/07 17:30:19 yamt Exp $ */
+/* $NetBSD: ug_isa.c,v 1.3 2007/09/09 05:39:10 xtraeme Exp $ */
 
 /*
  * Copyright (c) 2007 Mihai Chelaru <kefren@netbsd.ro>
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ug_isa.c,v 1.2.12.4 2007/12/07 17:30:19 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ug_isa.c,v 1.3 2007/09/09 05:39:10 xtraeme Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -45,8 +45,8 @@ __KERNEL_RCSID(0, "$NetBSD: ug_isa.c,v 1
 #include <sys/envsys.h>
 #include <sys/time.h>
 
-#include <sys/bus.h>
-#include <sys/intr.h>
+#include <machine/bus.h>
+#include <machine/intr.h>
 
 #include <dev/isa/isareg.h>
 #include <dev/isa/isavar.h>
@@ -147,24 +147,20 @@ ug_isa_attach(struct device *parent, str
 		aprint_error("%s: reset failed.\n", sc->sc_dev.dv_xname);
 
 	ug_setup_sensors(sc);
-	sc->sc_sme = sysmon_envsys_create();
 
 	for (i = 0; i < UG_NUM_SENSORS; i++) {
-		if (sysmon_envsys_sensor_attach(sc->sc_sme,
-						&sc->sc_sensor[i])) {
-			sysmon_envsys_destroy(sc->sc_sme);
-			return;
-		}
+		sc->sc_data[i].sensor = i;
+		sc->sc_data[i].state = ENVSYS_SVALID;
 	}
 
-	sc->sc_sme->sme_cookie = sc;
-	sc->sc_sme->sme_refresh = ug_refresh;
+	sc->sc_sysmon.sme_sensor_data = sc->sc_data;
+	sc->sc_sysmon.sme_cookie = sc;
+	sc->sc_sysmon.sme_gtredata = ug_gtredata;
+	sc->sc_sysmon.sme_nsensors = UG_NUM_SENSORS;
 
-	if (sysmon_envsys_register(sc->sc_sme)) {
+	if (sysmon_envsys_register(&sc->sc_sysmon))
 		aprint_error("%s: unable to register with sysmon\n",
 		    sc->sc_dev.dv_xname);
-		sysmon_envsys_destroy(sc->sc_sme);
-	}
 
 }
 
@@ -173,7 +169,7 @@ ug_isa_detach(struct device *self, int f
 {
 	struct ug_softc *sc = device_private(self);
 
-	sysmon_envsys_unregister(sc->sc_sme);
+	sysmon_envsys_unregister(&sc->sc_sysmon);
 	bus_space_unmap(sc->sc_iot, sc->sc_ioh, 8);
 	return 0;
 }