 @@ -1,14 +1,14 @@
-/*	$NetBSD: rnd.h,v 1.26 2011/11/29 03:50:32 tls Exp $	*/
+/*	$NetBSD: rnd.h,v 1.27 2011/12/17 12:59:21 apb Exp $	*/
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Michael Graff <explorer@flame.org>.  This code uses ideas and
  * algorithms from the Linux driver written by Ted Ts'o.
+ *
  * 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
 @@ -53,26 +53,27 @@
 /*
  * Exposed "size" of entropy pool, for convenience in load/save
  * from userspace.  Do not assume this is the same as the actual in-kernel
  * pool size!
  */
 #define RND_SAVEWORDS	128
 typedef struct {
 	uint32_t entropy;
 	uint8_t data[RND_SAVEWORDS * sizeof(uint32_t)];
 	uint8_t digest[SHA1_DIGEST_LENGTH];
 } rndsave_t;
 /* Statistics exposed by RNDGETPOOLSTAT */
 typedef struct
+{
 	uint32_t	poolsize;
 	uint32_t 	threshold;
 	uint32_t	maxentropy;
 	uint32_t	added;
 	uint32_t	curentropy;
 	uint32_t	removed;
 	uint32_t	discarded;
 	uint32_t	generated;
 } rndpoolstat_t;
 @@ -108,27 +109,27 @@ typedef struct {
 #define RND_POOLWORDS	128
 #endif
 #define RND_POOLBITS	(RND_POOLWORDS * 32)
 typedef struct krndsource {
 	LIST_ENTRY(krndsource) list;	/* the linked list */
         char            name[16];       /* device name */
         uint32_t        last_time;      /* last time recorded */
         uint32_t        last_delta;     /* last delta value */
         uint32_t        last_delta2;    /* last delta2 value */
         uint32_t        total;          /* entropy from this source */
         uint32_t        type;           /* type */
         uint32_t        flags;          /* flags */
-        void            *state;         /* state informaiton */
+        void            *state;         /* state information */
         size_t          test_cnt;       /* how much test data accumulated? */
         rngtest_t	*test;          /* test data for RNG type sources */
 } krndsource_t;
 typedef struct rndsink {
         TAILQ_ENTRY(rndsink) tailq;     /* the queue */
         void            (*cb)(void *);  /* callback function when ready */
         void            *arg;           /* callback function argument */
         char            name[16];       /* sink name */
         size_t          len;            /* how many bytes wanted/supplied */
         uint8_t         data[64];       /* random data returned here */
 } rndsink_t;
 @@ -187,27 +188,31 @@ typedef struct {
 /*
  * set/clear device flags.  If type is set to 0xff, the name is used
  * instead.  Otherwise, the flags set/cleared apply to all devices of
  * the specified type, and the name is ignored.
  */
 typedef struct {
 	char		name[16];	/* the name we are adjusting */
 	uint32_t	type;		/* the type of device we want */
 	uint32_t	flags;		/* flags to set or clear */
 	uint32_t	mask;		/* mask for the flags we are setting */
 } rndctl_t;
 /*
  * Add entropy to the pool.  len is the data length, in bytes.
  * entropy is the number of bits of estimated entropy in the data.
  */
 typedef struct {
 	uint32_t	len;
 	uint32_t	entropy;
 	u_char		data[RND_SAVEWORDS * sizeof(uint32_t)];
 } rnddata_t;
 #define	RNDGETENTCNT	_IOR('R',  101, uint32_t) /* get entropy count */
 #define	RNDGETSRCNUM	_IOWR('R', 102, rndstat_t) /* get rnd source info */
 #define	RNDGETSRCNAME	_IOWR('R', 103, rndstat_name_t) /* get src by name */
 #define	RNDCTL		_IOW('R',  104, rndctl_t)  /* set/clear source flags */
 #define	RNDADDDATA	_IOW('R',  105, rnddata_t) /* add data to the pool */
-#define	RNDGETPOOLSTAT	_IOR('R',  106, rndpoolstat_t)
+#define	RNDGETPOOLSTAT	_IOR('R',  106, rndpoolstat_t) /* get statistics */
 #endif /* !_SYS_RND_H_ */