Module Name: src
Committed By: riastradh
Date: Mon Apr 13 23:21:03 UTC 2015
Modified Files:
src/sys/kern: kern_rndpool.c
src/sys/sys: rndpool.h
Log Message:
Cull some unused rndpool routines.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/kern/kern_rndpool.c
cvs rdiff -u -r1.1 -r1.2 src/sys/sys/rndpool.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/kern/kern_rndpool.c
diff -u src/sys/kern/kern_rndpool.c:1.9 src/sys/kern/kern_rndpool.c:1.10
--- src/sys/kern/kern_rndpool.c:1.9 Mon Apr 13 22:43:41 2015
+++ src/sys/kern/kern_rndpool.c Mon Apr 13 23:21:03 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_rndpool.c,v 1.9 2015/04/13 22:43:41 riastradh Exp $ */
+/* $NetBSD: kern_rndpool.c,v 1.10 2015/04/13 23:21:03 riastradh Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_rndpool.c,v 1.9 2015/04/13 22:43:41 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_rndpool.c,v 1.10 2015/04/13 23:21:03 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -97,8 +97,8 @@ void rndpool_get_stats(rndpool_t *rp, vo
memcpy(rsp, &rp->stats, size);
}
-void
-rndpool_increment_entropy_count(rndpool_t *rp, u_int32_t entropy)
+static void __used /* XXX soon */
+rndpool_increment_entropy_count(rndpool_t *rp, u_int32_t entropy)
{
rp->stats.curentropy += entropy;
@@ -109,20 +109,6 @@ rndpool_increment_entropy_count(rndpool_
}
}
-u_int32_t *
-rndpool_get_pool(rndpool_t *rp)
-{
-
- return (rp->pool);
-}
-
-u_int32_t
-rndpool_get_poolsize(void)
-{
-
- return (RND_POOLWORDS);
-}
-
/*
* The input function treats the contents of the pool as an array of
* 32 LFSR's of length RND_POOLWORDS, one per bit-plane. The LFSR's
Index: src/sys/sys/rndpool.h
diff -u src/sys/sys/rndpool.h:1.1 src/sys/sys/rndpool.h:1.2
--- src/sys/sys/rndpool.h:1.1 Mon Apr 13 15:39:19 2015
+++ src/sys/sys/rndpool.h Mon Apr 13 23:21:03 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rndpool.h,v 1.1 2015/04/13 15:39:19 riastradh Exp $ */
+/* $NetBSD: rndpool.h,v 1.2 2015/04/13 23:21:03 riastradh Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -57,13 +57,9 @@ typedef struct {
} rndpool_t;
void rndpool_init(rndpool_t *);
-void rndpool_init_global(void);
uint32_t rndpool_get_entropy_count(rndpool_t *);
void rndpool_set_entropy_count(rndpool_t *, uint32_t);
void rndpool_get_stats(rndpool_t *, void *, int);
-void rndpool_increment_entropy_count(rndpool_t *, uint32_t);
-uint32_t *rndpool_get_pool(rndpool_t *);
-uint32_t rndpool_get_poolsize(void);
void rndpool_add_data(rndpool_t *,
const void *const , uint32_t, uint32_t);
uint32_t rndpool_extract_data(rndpool_t *, void *, uint32_t, uint32_t);
