Wed Jun 8 16:14:57 2011 UTC ()

Restrict limit monitoring for Indicator sensors as well as for
Battery-charge sensors.


(pgoyette)

diff -r1.97 -r1.98 src/sys/dev/sysmon/sysmon_envsys_events.c

--- src/sys/dev/sysmon/sysmon_envsys_events.c 2010/12/30 03:59:59	1.97
+++ src/sys/dev/sysmon/sysmon_envsys_events.c 2011/06/08 16:14:57	1.98

 @@ -1,14 +1,14 @@
-/* $NetBSD: sysmon_envsys_events.c,v 1.97 2010/12/30 03:59:59 pgoyette Exp $ */
+/* $NetBSD: sysmon_envsys_events.c,v 1.98 2011/06/08 16:14:57 pgoyette Exp $ */
 /*-
  * Copyright (c) 2007, 2008 Juan Romero Pardines.
  * 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.
 @@ -20,27 +20,27 @@
  * 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.
  */
 /*
  * sysmon_envsys(9) events framework.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys_events.c,v 1.97 2010/12/30 03:59:59 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys_events.c,v 1.98 2011/06/08 16:14:57 pgoyette Exp $");
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/conf.h>
 #include <sys/errno.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/mutex.h>
 #include <sys/kmem.h>
 #include <sys/callout.h>
 /* #define ENVSYS_DEBUG */
 @@ -91,44 +91,47 @@ sme_event_register(prop_dictionary_t sdi
 	sme_event_t *see = NULL, *osee = NULL;
 	prop_object_t obj;
 	int error = 0;
 	const char *objkey;
 	KASSERT(sdict != NULL);
 	KASSERT(edata != NULL);
 	KASSERT(sme != NULL);
 	KASSERT(lims != NULL);
 	/*
 	 * Some validation first for limit-checking events
+	 *
-	 * 1. Limits are not permitted if the units is ENVSYS_INDICATOR.
+	 * 1. Limits are not permitted if the units is ENVSYS_INDICATOR
 	 *    or ENVSYS_BATTERY_CHARGE.
+	 *
 	 * 2. Capacity limits are permitted only if the sensor has the
 	 *    ENVSYS_FPERCENT flag set and value_max is set.
+	 *
 	 * 3. It is not permissible for both capacity and value limits
 	 *    to coexist.
+	 *
 	 * Note that it permissible for a sensor to have value limits
 	 * even if its ENVSYS_FPERCENT flag and value_max are set.
 	 */
 	DPRINTF(("%s: units %d props 0x%04x upropset 0x%04x max_val %d"
 		" edata-flags 0x%04x\n", __func__, edata->units, props,
 		edata->upropset, edata->value_max, edata->flags));
-	if (props && edata->units == ENVSYS_INDICATOR)
+	if (props)
-		return ENOTSUP;
+		if (edata->units == ENVSYS_INDICATOR ||
 		    edata->units == ENVSYS_BATTERY_CHARGE)
 			return ENOTSUP;
 	if ((props & PROP_CAP_LIMITS) &&
 	    ((edata->value_max == 0) ||
 	     !(edata->flags & ENVSYS_FPERCENT) ||
 	     (props & PROP_VAL_LIMITS) ||
 	     (edata->upropset & PROP_VAL_LIMITS)))
 		props = 0;
 	if ((props & PROP_VAL_LIMITS) && (edata->upropset & PROP_CAP_LIMITS))
 		props = 0;
 	/*
 	 * check if the event is already on the list and return