summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1997-06-28 07:05:24 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1997-06-28 07:05:24 +0000
commitd8bab38975f44c9672d33f1ebb128547e3b80254 (patch)
treed8045d24808e42261a6a2fe1aa1781be085d72bd /sys
parent63ae58ef024afb87a97004c872bdf535dc78f081 (diff)
fix the types
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/rnd.c8
-rw-r--r--sys/dev/rndvar.h34
2 files changed, 21 insertions, 21 deletions
diff --git a/sys/dev/rnd.c b/sys/dev/rnd.c
index 00d2ae7a34f..7b40c1504b5 100644
--- a/sys/dev/rnd.c
+++ b/sys/dev/rnd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rnd.c,v 1.30 1997/06/24 02:45:00 mickey Exp $ */
+/* $OpenBSD: rnd.c,v 1.31 1997/06/28 07:05:22 deraadt Exp $ */
/*
* random.c -- A strong random number generator
@@ -290,7 +290,7 @@ struct random_bucket {
/* There is one of these per entropy source */
struct timer_rand_state {
- u_long last_time;
+ u_int last_time;
u_int last_delta;
u_char dont_count_entropy:1;
};
@@ -306,7 +306,7 @@ struct rand_event {
struct rand_event *re_next;
struct timer_rand_state *re_state;
u_char re_nbits;
- u_long re_time;
+ u_int re_time;
u_int re_val;
};
@@ -542,7 +542,7 @@ enqueue_randomness(state, val)
struct timeval tv;
register struct rand_event *rep;
int s;
- u_long time;
+ u_int time;
rndstats.rnd_enqs++;
diff --git a/sys/dev/rndvar.h b/sys/dev/rndvar.h
index 8aee82949ab..a624429d779 100644
--- a/sys/dev/rndvar.h
+++ b/sys/dev/rndvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: rndvar.h,v 1.10 1997/06/24 02:45:01 mickey Exp $ */
+/* $OpenBSD: rndvar.h,v 1.11 1997/06/28 07:05:23 deraadt Exp $ */
/*
* Copyright (c) 1996 Michael Shalayeff.
@@ -47,25 +47,25 @@
#define RND_NODEV 5 /* First invalid minor device number */
struct rndstats {
- u_long rnd_total; /* total bits of entropy generated */
- u_long rnd_used; /* strong data bits read so far */
- u_long arc4_reads;/* aRC4 data bytes read so far */
+ u_int32_t rnd_total; /* total bits of entropy generated */
+ u_int32_t rnd_used; /* strong data bits read so far */
+ u_int32_t arc4_reads;/* aRC4 data bytes read so far */
- u_long rnd_timer; /* timer calls */
- u_long rnd_mouse; /* mouse calls */
- u_long rnd_tty; /* tty calls */
- u_long rnd_disk; /* block devices calls */
- u_long rnd_net; /* net calls */
+ u_int32_t rnd_timer; /* timer calls */
+ u_int32_t rnd_mouse; /* mouse calls */
+ u_int32_t rnd_tty; /* tty calls */
+ u_int32_t rnd_disk; /* block devices calls */
+ u_int32_t rnd_net; /* net calls */
- u_long rnd_reads; /* strong read calls */
- u_long rnd_waits; /* sleep for data */
- u_long rnd_enqs; /* enqueue calls */
- u_long rnd_deqs; /* dequeue calls */
- u_long rnd_drops; /* queue-full drops */
- u_long rnd_drople;/* queue low watermark low entropy drops */
+ u_int32_t rnd_reads; /* strong read calls */
+ u_int32_t rnd_waits; /* sleep for data */
+ u_int32_t rnd_enqs; /* enqueue calls */
+ u_int32_t rnd_deqs; /* dequeue calls */
+ u_int32_t rnd_drops; /* queue-full drops */
+ u_int32_t rnd_drople;/* queue low watermark low entropy drops */
- u_int rnd_asleep; /* sleeping for the data */
- u_int rnd_queued; /* queued for processing */
+ u_int32_t rnd_asleep; /* sleeping for the data */
+ u_int32_t rnd_queued; /* queued for processing */
};
#ifdef _KERNEL