[Midnightbsd-cvs] src [10072] trunk/sys/dev/safe: sync safe

[laffer1 at midnightbsd.org]

Revision: 10072
          http://svnweb.midnightbsd.org/src/?rev=10072
Author:   laffer1
Date:     2018-05-27 19:14:46 -0400 (Sun, 27 May 2018)
Log Message:
-----------
sync safe

Modified Paths:
--------------
    trunk/sys/dev/safe/safe.c
    trunk/sys/dev/safe/safereg.h
    trunk/sys/dev/safe/safevar.h

Modified: trunk/sys/dev/safe/safe.c
===================================================================
--- trunk/sys/dev/safe/safe.c	2018-05-27 23:14:32 UTC (rev 10071)
+++ trunk/sys/dev/safe/safe.c	2018-05-27 23:14:46 UTC (rev 10072)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2003 Sam Leffler, Errno Consulting
  * Copyright (c) 2003 Global Technology Associates, Inc.
@@ -26,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/dev/safe/safe.c 314667 2017-03-04 13:03:31Z avg $");
 
 /*
  * SafeNet SafeXcel-1141 hardware crypto accelerator
@@ -211,7 +212,7 @@
 static void
 default_harvest(struct rndtest_state *rsp, void *buf, u_int count)
 {
-	random_harvest(buf, count, count*NBBY, 0, RANDOM_PURE);
+	random_harvest(buf, count, count*NBBY/2, RANDOM_PURE_SAFE);
 }
 #endif /* SAFE_NO_RNG */
 
@@ -425,7 +426,7 @@
 #endif
 		safe_rng_init(sc);
 
-		callout_init(&sc->sc_rngto, CALLOUT_MPSAFE);
+		callout_init(&sc->sc_rngto, 1);
 		callout_reset(&sc->sc_rngto, hz*safe_rnginterval, safe_rng, sc);
 	}
 #endif /* SAFE_NO_RNG */

Modified: trunk/sys/dev/safe/safereg.h
===================================================================
--- trunk/sys/dev/safe/safereg.h	2018-05-27 23:14:32 UTC (rev 10071)
+++ trunk/sys/dev/safe/safereg.h	2018-05-27 23:14:46 UTC (rev 10072)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2003 Sam Leffler, Errno Consulting
  * Copyright (c) 2003 Global Technology Associates, Inc.
@@ -24,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/safe/safereg.h 117845 2003-07-21 21:46:07Z sam $
  */
 #ifndef _SAFE_SAFEREG_H_
 #define	_SAFE_SAFEREG_H_

Modified: trunk/sys/dev/safe/safevar.h
===================================================================
--- trunk/sys/dev/safe/safevar.h	2018-05-27 23:14:32 UTC (rev 10071)
+++ trunk/sys/dev/safe/safevar.h	2018-05-27 23:14:46 UTC (rev 10072)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2003 Sam Leffler, Errno Consulting
  * Copyright (c) 2003 Global Technology Associates, Inc.
@@ -24,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/dev/safe/safevar.h 158705 2006-05-17 18:34:26Z pjd $
  */
 #ifndef _SAFE_SAFEVAR_H_
 #define	_SAFE_SAFEVAR_H_