2c2
< * Copyright (c) 2000, 2001, 2002, 2003 Mark R V Murray
---
> * Copyright (c) 2000-2004 Mark R V Murray
29c29
< __FBSDID("$FreeBSD: head/sys/dev/random/harvest.c 126674 2004-03-05 22:42:17Z jhb $");
---
> __FBSDID("$FreeBSD: head/sys/dev/random/harvest.c 128059 2004-04-09 15:47:10Z markm $");
40d39
< #include <sys/sysctl.h>
41a41
> #include <sys/sysctl.h>
45c45
< #include <dev/random/randomdev.h>
---
> #include <dev/random/randomdev_soft.h>
50c50
< struct harvest_select harvest = { 0, 0, 0 };
---
> struct harvest_select harvest = { 0, 0, 0, 0 };
55,56c55,56
< static void (*reap_func)(u_int64_t, void *, u_int, u_int, u_int, enum esource)
< = NULL;
---
> static void (*reap_func)(u_int64_t, const void *, u_int, u_int, u_int,
> enum esource) = NULL;
61,62c61,62
< random_init_harvester(void (*reaper)(u_int64_t, void *, u_int, u_int, u_int,
< enum esource), int (*reader)(void *, int))
---
> random_yarrow_init_harvester(void (*reaper)(u_int64_t, const void *, u_int,
> u_int, u_int, enum esource), int (*reader)(void *, int))
70c70
< random_deinit_harvester(void)
---
> random_yarrow_deinit_harvester(void)
94c94
< return (*read_func)(buf, count);
---
> return ((*read_func)(buf, count));
112,114c112
< size = (count - i) < (int)sizeof(u_long)
< ? (count - i)
< : sizeof(u_long);
---
> size = MIN(count - i, sizeof(u_long));
118c116
< return count;
---
> return (count);