diff options
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/i386/conf.c | 8 | ||||
| -rw-r--r-- | sys/arch/i386/isa/pccons.c | 6 | ||||
| -rw-r--r-- | sys/arch/i386/isa/pcvt/pcvt_kbd.c | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c index 53d4b57cc9d..5ef2a3dbe7e 100644 --- a/sys/arch/i386/i386/conf.c +++ b/sys/arch/i386/i386/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.21 1996/08/08 18:47:10 dm Exp $ */ +/* $OpenBSD: conf.c,v 1.22 1996/08/29 09:26:04 deraadt Exp $ */ /* $NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $ */ /* @@ -185,8 +185,8 @@ cdev_decl(ccd); cdev_decl(joy); #include "apm.h" cdev_decl(apm); -#include "rnd.h" -cdev_decl(rnd); +#include "random.h" +cdev_decl(random); #include "pctr.h" cdev_decl(pctr); @@ -257,7 +257,7 @@ struct cdevsw cdevsw[] = cdev_notdef(), /* 43 */ #endif cdev_gen_ipf(NIPF,ipl), /* 44 ip filtering */ - cdev_rnd_init(NRND,rnd), /* 45 random data source */ + cdev_random_init(NRANDOM,random), /* 45 random data source */ cdev_uk_init(NPCTR,pctr), /* 46: pentium performance counters */ }; int nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]); diff --git a/sys/arch/i386/isa/pccons.c b/sys/arch/i386/isa/pccons.c index 2e1a377e748..b01bc94d848 100644 --- a/sys/arch/i386/isa/pccons.c +++ b/sys/arch/i386/isa/pccons.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pccons.c,v 1.24 1996/08/28 11:21:06 deraadt Exp $ */ +/* $OpenBSD: pccons.c,v 1.25 1996/08/29 09:26:08 deraadt Exp $ */ /* $NetBSD: pccons.c,v 1.99.4.1 1996/06/04 20:03:53 cgd Exp $ */ /*- @@ -71,8 +71,8 @@ #include <i386/isa/isa_machdep.h> #include <i386/isa/kbdreg.h> -#include "rnd.h" -#if NRND > 0 +#include "random.h" +#if NRANDOM > 0 #include <dev/rndvar.h> #endif diff --git a/sys/arch/i386/isa/pcvt/pcvt_kbd.c b/sys/arch/i386/isa/pcvt/pcvt_kbd.c index 9e2b907293e..9a45e2a421d 100644 --- a/sys/arch/i386/isa/pcvt/pcvt_kbd.c +++ b/sys/arch/i386/isa/pcvt/pcvt_kbd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pcvt_kbd.c,v 1.7 1996/06/16 13:54:02 deraadt Exp $ */ +/* $OpenBSD: pcvt_kbd.c,v 1.8 1996/08/29 09:26:10 deraadt Exp $ */ /* * Copyright (c) 1992, 1995 Hellmuth Michaelis and Joerg Wunsch. @@ -77,8 +77,8 @@ #if NVT > 0 #include "pcvt_hdr.h" /* global include */ -#include "rnd.h" -#if NRND +#include "random.h" +#if NRANDOM > 0 #include <dev/rndvar.h> #endif @@ -1023,7 +1023,7 @@ loop: PCVT_KBD_DELAY(); /* 7 us delay */ dt = inb(CONTROLLER_DATA); /* yes, get data */ -#if NRND +#if NRANDOM > 0 add_keyboard_randomness(dt) #endif #endif /* !PCVT_KBD_FIFO */ |