diff options
| author | markm <markm@FreeBSD.org> | 1995-12-27 11:19:41 +0000 |
|---|---|---|
| committer | markm <markm@FreeBSD.org> | 1995-12-27 11:19:41 +0000 |
| commit | 74527dd12845a2d0c6244ce3103891e01e17aa3c (patch) | |
| tree | 59408bdc302f60a59a55e4c84f3acf81d32baca9 /sys | |
| parent | 4686e7539f5d0f85b72b1a9ab612733767afad75 (diff) | |
| download | FreeBSD-src-74527dd12845a2d0c6244ce3103891e01e17aa3c.zip FreeBSD-src-74527dd12845a2d0c6244ce3103891e01e17aa3c.tar.gz | |
Clean up and make more universal. Next version of random device.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/i386/include/random.h | 21 | ||||
| -rw-r--r-- | sys/sys/random.h | 21 |
2 files changed, 32 insertions, 10 deletions
diff --git a/sys/i386/include/random.h b/sys/i386/include/random.h index 78a6b06..8e7b359 100644 --- a/sys/i386/include/random.h +++ b/sys/i386/include/random.h @@ -3,7 +3,7 @@ * * $Id$ * - * Version 0.92, last modified 21-Sep-95 + * Version 0.95, last modified 18-Oct-95 * * Copyright Theodore Ts'o, 1994, 1995. All rights reserved. * @@ -50,23 +50,34 @@ #ifndef _MACHINE_RANDOM_H_ #define _MACHINE_RANDOM_H_ 1 +#if defined(KERNEL) +#include <i386/isa/icu.h> +#endif #include <sys/ioctl.h> -#define MEM_SETIRQ _IOW('r', 1, int) /* set interrupt */ -#define MEM_CLEARIRQ _IOW('r', 2, int) /* clear interrupt */ -#define MEM_RETURNIRQ _IOR('r', 3, int) /* return interrupt */ +#define MEM_SETIRQ _IOW('r', 1, u_int16_t) /* set interrupt */ +#define MEM_CLEARIRQ _IOW('r', 2, u_int16_t) /* clear interrupt */ +#define MEM_RETURNIRQ _IOR('r', 3, u_int16_t) /* return interrupt */ + +#if defined(KERNEL) /* Interrupts to be used in the randomising process */ -extern u_int16_t interrupt_allowed; +extern inthand2_t *sec_intr_handler[ICU_LEN]; +extern int sec_intr_unit[ICU_LEN]; /* Exported functions */ void rand_initialize(void); void add_keyboard_randomness(u_char scancode); +void add_interrupt_randomness(int irq); +void add_blkdev_randomness(int major); void get_random_bytes(void *buf, u_int nbytes); u_int read_random(char *buf, u_int size); u_int read_random_unlimited(char *buf, u_int size); +u_int write_random(const char *buf, u_int nbytes); + +#endif #endif diff --git a/sys/sys/random.h b/sys/sys/random.h index 78a6b06..8e7b359 100644 --- a/sys/sys/random.h +++ b/sys/sys/random.h @@ -3,7 +3,7 @@ * * $Id$ * - * Version 0.92, last modified 21-Sep-95 + * Version 0.95, last modified 18-Oct-95 * * Copyright Theodore Ts'o, 1994, 1995. All rights reserved. * @@ -50,23 +50,34 @@ #ifndef _MACHINE_RANDOM_H_ #define _MACHINE_RANDOM_H_ 1 +#if defined(KERNEL) +#include <i386/isa/icu.h> +#endif #include <sys/ioctl.h> -#define MEM_SETIRQ _IOW('r', 1, int) /* set interrupt */ -#define MEM_CLEARIRQ _IOW('r', 2, int) /* clear interrupt */ -#define MEM_RETURNIRQ _IOR('r', 3, int) /* return interrupt */ +#define MEM_SETIRQ _IOW('r', 1, u_int16_t) /* set interrupt */ +#define MEM_CLEARIRQ _IOW('r', 2, u_int16_t) /* clear interrupt */ +#define MEM_RETURNIRQ _IOR('r', 3, u_int16_t) /* return interrupt */ + +#if defined(KERNEL) /* Interrupts to be used in the randomising process */ -extern u_int16_t interrupt_allowed; +extern inthand2_t *sec_intr_handler[ICU_LEN]; +extern int sec_intr_unit[ICU_LEN]; /* Exported functions */ void rand_initialize(void); void add_keyboard_randomness(u_char scancode); +void add_interrupt_randomness(int irq); +void add_blkdev_randomness(int major); void get_random_bytes(void *buf, u_int nbytes); u_int read_random(char *buf, u_int size); u_int read_random_unlimited(char *buf, u_int size); +u_int write_random(const char *buf, u_int nbytes); + +#endif #endif |
