diff options
| author | Jason Wright <jason@cvs.openbsd.org> | 2003-10-14 19:38:22 +0000 |
|---|---|---|
| committer | Jason Wright <jason@cvs.openbsd.org> | 2003-10-14 19:38:22 +0000 |
| commit | 0b3532036e862a61862fce1d23334d51db43c6a9 (patch) | |
| tree | 23c5edf5b269cd57e567215d374a0f6eae1ad841 /sys | |
| parent | 9ce025b0f3104121f5775b800f14483512134887 (diff) | |
Ok, now that the via c3 crypto stuff is in the tree, merge the last bit of
my cleanups before starting "real work".
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/i386/i386/autoconf.c | 6 | ||||
| -rw-r--r-- | sys/arch/i386/i386/machdep.c | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/sys/arch/i386/i386/autoconf.c b/sys/arch/i386/i386/autoconf.c index a6808225333..4d199a49829 100644 --- a/sys/arch/i386/i386/autoconf.c +++ b/sys/arch/i386/i386/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.50 2003/09/11 21:48:56 deraadt Exp $ */ +/* $OpenBSD: autoconf.c,v 1.51 2003/10/14 19:38:20 jason Exp $ */ /* $NetBSD: autoconf.c,v 1.20 1996/05/03 19:41:56 christos Exp $ */ /*- @@ -85,7 +85,7 @@ void viac3_rnd(void *); #ifdef CRYPTO extern int viac3_crypto_present; void viac3_crypto_setup(void); -#endif +#endif /* CRYPTO */ #endif /* @@ -130,10 +130,10 @@ cpu_configure() timeout_set(&viac3_rnd_tmo, viac3_rnd, &viac3_rnd_tmo); viac3_rnd(&viac3_rnd_tmo); } +#ifdef CRYPTO /* * Also, if the chip as crypto available, enable it. */ -#ifdef CRYPTO if (viac3_crypto_present) viac3_crypto_setup(); #endif /* CRYPTO */ diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c index 3244ab2ffc9..8d54e89795a 100644 --- a/sys/arch/i386/i386/machdep.c +++ b/sys/arch/i386/i386/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.244 2003/09/11 21:48:56 deraadt Exp $ */ +/* $OpenBSD: machdep.c,v 1.245 2003/10/14 19:38:21 jason Exp $ */ /* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- @@ -1097,6 +1097,7 @@ viac3_rnd(void *v) } #ifdef CRYPTO + struct viac3_session { u_int8_t ses_iv[16]; int ses_klen, ses_used; @@ -1428,6 +1429,7 @@ viac3_crypto(void *cw, void *src, void *dst, void *key, int rep, splx(s); } + #endif /* CRYPTO */ #endif /* defined(I686_CPU) */ @@ -1504,7 +1506,8 @@ cyrix3_cpu_setup(cpu_device, model, step) viac3_crypto_present = 1; printf(" AES"); } -#endif +#endif /* CRYPTO */ + printf("\n"); break; } |