Module Name: src
Committed By: pgoyette
Date: Fri Mar 19 02:19:13 UTC 2010
Modified Files:
src/sys/dev/sysmon: sysmon_envsys_events.c sysmon_envsysvar.h
sysmonvar.h
Log Message:
Modify previous commit. The routine to deliver events is intended to be
exported to device drivers, so rename it and move the declaration to
<dev/sysmon/sysmonvar.h>
To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 src/sys/dev/sysmon/sysmon_envsys_events.c
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/sysmon/sysmon_envsysvar.h \
src/sys/dev/sysmon/sysmonvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/sysmon/sysmon_envsys_events.c
diff -u src/sys/dev/sysmon/sysmon_envsys_events.c:1.86 src/sys/dev/sysmon/sysmon_envsys_events.c:1.87
--- src/sys/dev/sysmon/sysmon_envsys_events.c:1.86 Fri Mar 19 01:16:44 2010
+++ src/sys/dev/sysmon/sysmon_envsys_events.c Fri Mar 19 02:19:13 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_envsys_events.c,v 1.86 2010/03/19 01:16:44 pgoyette Exp $ */
+/* $NetBSD: sysmon_envsys_events.c,v 1.87 2010/03/19 02:19:13 pgoyette Exp $ */
/*-
* Copyright (c) 2007, 2008 Juan Romero Pardines.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys_events.c,v 1.86 2010/03/19 01:16:44 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys_events.c,v 1.87 2010/03/19 02:19:13 pgoyette Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -642,14 +642,14 @@
}
/*
- * sme_deliver_typed_event
+ * sysmon_envsys_sensor_event
*
* + Find the monitor event of a particular type for a given sensor
* on a device and deliver the event if one is required.
*/
void
-sme_deliver_typed_event(struct sysmon_envsys *sme, envsys_data_t *edata,
- int ev_type)
+sysmon_envsys_sensor_event(struct sysmon_envsys *sme, envsys_data_t *edata,
+ int ev_type)
{
sme_event_t *see;
Index: src/sys/dev/sysmon/sysmon_envsysvar.h
diff -u src/sys/dev/sysmon/sysmon_envsysvar.h:1.33 src/sys/dev/sysmon/sysmon_envsysvar.h:1.34
--- src/sys/dev/sysmon/sysmon_envsysvar.h:1.33 Fri Mar 19 01:16:44 2010
+++ src/sys/dev/sysmon/sysmon_envsysvar.h Fri Mar 19 02:19:13 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_envsysvar.h,v 1.33 2010/03/19 01:16:44 pgoyette Exp $ */
+/* $NetBSD: sysmon_envsysvar.h,v 1.34 2010/03/19 02:19:13 pgoyette Exp $ */
/*-
* Copyright (c) 2007, 2008 Juan Romero Pardines.
@@ -131,7 +131,6 @@
void sme_events_check(void *);
void sme_events_worker(struct work *, void *);
void sme_deliver_event(sme_event_t *);
-void sme_deliver_typed_event(struct sysmon_envsys *, envsys_data_t *, int);
/*
* common functions to create/update objects in a dictionary.
Index: src/sys/dev/sysmon/sysmonvar.h
diff -u src/sys/dev/sysmon/sysmonvar.h:1.33 src/sys/dev/sysmon/sysmonvar.h:1.34
--- src/sys/dev/sysmon/sysmonvar.h:1.33 Sun Mar 14 18:03:15 2010
+++ src/sys/dev/sysmon/sysmonvar.h Fri Mar 19 02:19:13 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmonvar.h,v 1.33 2010/03/14 18:03:15 pgoyette Exp $ */
+/* $NetBSD: sysmonvar.h,v 1.34 2010/03/19 02:19:13 pgoyette Exp $ */
/*-
* Copyright (c) 2000 Zembu Labs, Inc.
@@ -205,6 +205,9 @@
uint32_t sysmon_envsys_get_max_value(bool (*)(const envsys_data_t*), bool);
+void sysmon_envsys_sensor_event(struct sysmon_envsys *, envsys_data_t *,
+ int);
+
void sysmon_envsys_init(void);
/*****************************************************************************