summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Shalayeff <mickey@cvs.openbsd.org>2002-07-10 22:21:31 +0000
committerMichael Shalayeff <mickey@cvs.openbsd.org>2002-07-10 22:21:31 +0000
commitdc0c22884389e2e372043102c3e56b52e683adb7 (patch)
tree289025600f64839b385f795b32d459c5437df55f
parente74439ee98c4cc7caf1ed8a059e01977ba8a4036 (diff)
proper cdev_decl(crypto) and no private protos
-rw-r--r--sys/arch/i386/i386/conf.c3
-rw-r--r--sys/arch/macppc/include/conf.h4
-rw-r--r--sys/arch/sparc64/include/conf.h4
-rw-r--r--sys/crypto/cryptodev.c9
-rw-r--r--sys/sys/conf.h4
5 files changed, 7 insertions, 17 deletions
diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c
index ee63bab8db2..dcef344bf75 100644
--- a/sys/arch/i386/i386/conf.c
+++ b/sys/arch/i386/i386/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.98 2002/07/10 22:08:47 mickey Exp $ */
+/* $OpenBSD: conf.c,v 1.99 2002/07/10 22:21:30 mickey Exp $ */
/* $NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $ */
/*
@@ -134,7 +134,6 @@ int nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]);
#define mmwrite mmrw
cdev_decl(mm);
cdev_decl(wd);
-cdev_decl(crypto);
#include "systrace.h"
#include "bio.h"
#include "pty.h"
diff --git a/sys/arch/macppc/include/conf.h b/sys/arch/macppc/include/conf.h
index a1029f2b15c..b8a2c326134 100644
--- a/sys/arch/macppc/include/conf.h
+++ b/sys/arch/macppc/include/conf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.h,v 1.5 2002/06/07 07:13:35 miod Exp $ */
+/* $OpenBSD: conf.h,v 1.6 2002/07/10 22:21:30 mickey Exp $ */
/* $NetBSD: conf.h,v 1.2 1996/05/05 19:28:34 christos Exp $ */
/*
@@ -46,5 +46,3 @@ cdev_decl(mm);
cdev_decl(aed);
cdev_decl(apm);
cdev_decl(zs);
-
-cdev_decl(crypto);
diff --git a/sys/arch/sparc64/include/conf.h b/sys/arch/sparc64/include/conf.h
index fb3c4c8b927..8d36949babd 100644
--- a/sys/arch/sparc64/include/conf.h
+++ b/sys/arch/sparc64/include/conf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.h,v 1.12 2002/07/10 22:08:47 mickey Exp $ */
+/* $OpenBSD: conf.h,v 1.13 2002/07/10 22:21:30 mickey Exp $ */
/* $NetBSD: conf.h,v 1.9 2001/03/26 12:33:26 lukem Exp $ */
/*-
@@ -41,8 +41,6 @@
#define mmwrite mmrw
cdev_decl(mm);
-cdev_decl(crypto);
-
cdev_decl(openprom);
/* open, close, ioctl */
diff --git a/sys/crypto/cryptodev.c b/sys/crypto/cryptodev.c
index 57c74b22351..4647cd836f8 100644
--- a/sys/crypto/cryptodev.c
+++ b/sys/crypto/cryptodev.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cryptodev.c,v 1.52 2002/06/19 07:22:46 deraadt Exp $ */
+/* $OpenBSD: cryptodev.c,v 1.53 2002/07/10 22:21:30 mickey Exp $ */
/*
* Copyright (c) 2001 Theo de Raadt
@@ -82,13 +82,6 @@ struct fcrypt {
void cryptoattach(int);
-int cryptoopen(dev_t, int, int, struct proc *);
-int cryptoclose(dev_t, int, int, struct proc *);
-int cryptoread(dev_t, struct uio *, int);
-int cryptowrite(dev_t, struct uio *, int);
-int cryptoioctl(dev_t, u_long, caddr_t, int, struct proc *);
-int cryptoselect(dev_t, int, struct proc *);
-
int cryptof_read(struct file *, off_t *, struct uio *, struct ucred *);
int cryptof_write(struct file *, off_t *, struct uio *, struct ucred *);
int cryptof_ioctl(struct file *, u_long, caddr_t, struct proc *p);
diff --git a/sys/sys/conf.h b/sys/sys/conf.h
index b74676dec07..0ed86c40af4 100644
--- a/sys/sys/conf.h
+++ b/sys/sys/conf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.h,v 1.65 2002/07/10 22:08:47 mickey Exp $ */
+/* $OpenBSD: conf.h,v 1.66 2002/07/10 22:21:30 mickey Exp $ */
/* $NetBSD: conf.h,v 1.33 1996/05/03 20:03:32 christos Exp $ */
/*-
@@ -580,6 +580,8 @@ cdev_decl(svr4_net);
cdev_decl(ksyms);
+cdev_decl(crypto);
+
cdev_decl(systrace);
cdev_decl(bio);