summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorRyan Thomas McBride <mcbride@cvs.openbsd.org>2004-10-08 17:52:09 +0000
committerRyan Thomas McBride <mcbride@cvs.openbsd.org>2004-10-08 17:52:09 +0000
commitab69048b80bb89c78430b2db8f170a4af611c955 (patch)
tree8084ab8df90d27acfc611ff155de5f44a68c289c /sys
parent1351d970bdb685b3c9636725cccf1ae25db024bd (diff)
Enable crypto(4), hifn(4) and create /dev/crypto
ok miod@
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/sgi/conf/GENERIC6
-rw-r--r--sys/arch/sgi/sgi/conf.c6
2 files changed, 9 insertions, 3 deletions
diff --git a/sys/arch/sgi/conf/GENERIC b/sys/arch/sgi/conf/GENERIC
index 9510f9b9c8d..faa3e290ca7 100644
--- a/sys/arch/sgi/conf/GENERIC
+++ b/sys/arch/sgi/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.9 2004/09/16 09:14:04 mickey Exp $
+# $OpenBSD: GENERIC,v 1.10 2004/10/08 17:52:08 mcbride Exp $
#
machine sgi mips64
@@ -109,4 +109,8 @@ ch* at scsibus?
ss* at scsibus?
uk* at scsibus?
+#### crypto devices
+hifn* at pci? # Hi/fn 7751 crypto card
+
#pseudo-device wsmux 2 # mouse & keyboard multiplexor
+pseudo-device crypto 1
diff --git a/sys/arch/sgi/sgi/conf.c b/sys/arch/sgi/sgi/conf.c
index 3f845e53294..d16ff3de708 100644
--- a/sys/arch/sgi/sgi/conf.c
+++ b/sys/arch/sgi/sgi/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.5 2004/09/22 14:39:45 miod Exp $ */
+/* $OpenBSD: conf.c,v 1.6 2004/10/08 17:52:08 mcbride Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -149,6 +149,8 @@ cdev_decl(ksyms);
#include "pci.h"
cdev_decl(pci);
+#include "inet.h"
+
#include "pf.h"
#include "systrace.h"
@@ -205,7 +207,7 @@ cdev_wsdisplay_init(NWSDISPLAY, wsdisplay), /* 25: */
cdev_notdef(), /* 44: */
cdev_notdef(), /* 45: */
cdev_notdef(), /* 46: */
- cdev_notdef(), /* 47: */
+ cdev_crypto_init(NCRYPTO,crypto), /* 47: /dev/crypto */
cdev_notdef(), /* 48: */
cdev_notdef(), /* 49: */
cdev_systrace_init(NSYSTRACE,systrace), /* 50: system call tracing */