[src/trunk]: src/sys/dev/sysmon Make sure to re-add the sensor as an entropy ...

[pgoyette <pgoyette%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7081b9ebf440
branches:  trunk
changeset: 780294:7081b9ebf440
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Thu Jul 19 13:31:06 2012 +0000

description:
Make sure to re-add the sensor as an entropy source after user request
to reset (via envstat -S)

diffstat:

 sys/dev/sysmon/sysmon_envsys.c |  27 ++++++++++++++++++---------
 1 files changed, 18 insertions(+), 9 deletions(-)

diffs (63 lines):

diff -r e54c037094b6 -r 7081b9ebf440 sys/dev/sysmon/sysmon_envsys.c
--- a/sys/dev/sysmon/sysmon_envsys.c    Thu Jul 19 13:30:01 2012 +0000
+++ b/sys/dev/sysmon/sysmon_envsys.c    Thu Jul 19 13:31:06 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sysmon_envsys.c,v 1.121 2012/07/16 13:55:01 pgoyette Exp $     */
+/*     $NetBSD: sysmon_envsys.c,v 1.122 2012/07/19 13:31:06 pgoyette Exp $     */
 
 /*-
  * Copyright (c) 2007, 2008 Juan Romero Pardines.
@@ -64,7 +64,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys.c,v 1.121 2012/07/16 13:55:01 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys.c,v 1.122 2012/07/19 13:31:06 pgoyette Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -1062,6 +1062,7 @@
        prop_dictionary_t sdict;
        envsys_data_t *edata = NULL;
        char tmp[ENVSYS_DESCLEN];
+       char rnd_name[sizeof(edata->rnd_src.name)];
        sysmon_envsys_lim_t lims;
        const struct sme_descr_entry *sdt_units;
        uint32_t props;
@@ -1168,21 +1169,29 @@
                        sme_event_unregister(sme, edata->desc,
                            PENVSYS_EVENT_LIMITS);
 
+                       /*
+                        * Find the correct units for this sensor.
+                        */
+                       sdt_units = sme_find_table_entry(SME_DESC_UNITS,
+                           edata->units);
+
                        if (props & PROP_LIMITS) {
                                DPRINTF(("%s: install limits for %s %s\n",
                                        __func__, sme->sme_name, edata->desc));
 
-
-                               /*
-                                * Find the correct units for this sensor.
-                                */
-                               sdt_units = sme_find_table_entry(SME_DESC_UNITS,
-                                   edata->units);
-
                                sme_event_register(sdict, edata, sme,
                                    &lims, props, PENVSYS_EVENT_LIMITS,
                                    sdt_units->crittype);
                        }
+                       if (edata->flags & ENVSYS_FHAS_ENTROPY) {
+                               sme_event_register(sdict, edata, sme,
+                                   &lims, props, PENVSYS_EVENT_NULL,
+                                   sdt_units->crittype);
+                               snprintf(rnd_name, sizeof(rnd_name), "%s-%s",
+                                   sme->sme_name, edata->desc);
+                               rnd_attach_source(&edata->rnd_src, rnd_name,
+                                   RND_TYPE_ENV, 0);
+                       }
                }
 
                /*