summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/amiga/amiga/conf.c7
-rw-r--r--sys/arch/atari/atari/conf.c7
-rw-r--r--sys/arch/hp300/hp300/conf.c7
-rw-r--r--sys/arch/i386/i386/conf.c8
-rw-r--r--sys/arch/mac68k/mac68k/conf.c7
-rw-r--r--sys/arch/mvme68k/mvme68k/conf.c7
-rw-r--r--sys/arch/pc532/pc532/conf.c7
-rw-r--r--sys/arch/pica/pica/conf.c9
-rw-r--r--sys/arch/pmax/pmax/conf.c7
-rw-r--r--sys/arch/sparc/sparc/conf.c7
-rw-r--r--sys/sys/conf.h7
11 files changed, 19 insertions, 61 deletions
diff --git a/sys/arch/amiga/amiga/conf.c b/sys/arch/amiga/amiga/conf.c
index c123bd6e176..f8a77912664 100644
--- a/sys/arch/amiga/amiga/conf.c
+++ b/sys/arch/amiga/amiga/conf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.32 1995/09/30 01:52:37 chopps Exp $ */
+/* $OpenBSD: conf.c,v 1.3 1996/02/21 12:53:41 mickey Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -168,11 +168,6 @@ cdev_decl(lkm);
/* open, close, read, ioctl */
cdev_decl(ipl);
-#define cdev_gen_ipf(c,n) { \
- dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
- (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) nullop, 0, (dev_type_select((*))) enodev, \
- (dev_type_mmap((*))) enodev, 0 }
#ifdef IPFILTER
#define NIPF 1
#else
diff --git a/sys/arch/atari/atari/conf.c b/sys/arch/atari/atari/conf.c
index aec8d98976f..85b2c5287ba 100644
--- a/sys/arch/atari/atari/conf.c
+++ b/sys/arch/atari/atari/conf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.11 1995/11/30 00:57:33 jtc Exp $ */
+/* $OpenBSD: conf.c,v 1.4 1996/02/21 12:53:42 mickey Exp $ */
/*
* Copyright (c) 1991 The Regents of the University of California.
@@ -161,11 +161,6 @@ cdev_decl(lkm);
/* open, close, read, ioctl */
cdev_decl(ipl);
-#define cdev_gen_ipf(c,n) { \
- dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
- (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) nullop, 0, (dev_type_select((*))) enodev, \
- (dev_type_mmap((*))) enodev, 0 }
#ifdef IPFILTER
#define NIPF 1
#else
diff --git a/sys/arch/hp300/hp300/conf.c b/sys/arch/hp300/hp300/conf.c
index 8f169836ab1..1ee7df73428 100644
--- a/sys/arch/hp300/hp300/conf.c
+++ b/sys/arch/hp300/hp300/conf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.29 1995/07/04 07:16:04 mycroft Exp $ */
+/* $OpenBSD: conf.c,v 1.3 1996/02/21 12:53:44 mickey Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -153,11 +153,6 @@ cdev_decl(lkm);
/* open, close, read, ioctl */
cdev_decl(ipl);
-#define cdev_gen_ipf(c,n) { \
- dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
- (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) nullop, 0, (dev_type_select((*))) enodev, \
- (dev_type_mmap((*))) enodev, 0 }
#ifdef IPFILTER
#define NIPF 1
#else
diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c
index 580f60937a2..875e690282f 100644
--- a/sys/arch/i386/i386/conf.c
+++ b/sys/arch/i386/i386/conf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.68 1995/12/09 05:53:00 mycroft Exp $ */
+/* $OpenBSD: conf.c,v 1.6 1996/02/21 12:53:46 mickey Exp $ */
/*
* Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved.
@@ -188,13 +188,7 @@ cdev_decl(ccd);
#include "joy.h"
cdev_decl(joy);
-/* open, close, read, ioctl */
cdev_decl(ipl);
-#define cdev_gen_ipf(c,n) { \
- dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
- (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) nullop, 0, (dev_type_select((*))) enodev, \
- (dev_type_mmap((*))) enodev, 0 }
#ifdef IPFILTER
#define NIPF 1
#else
diff --git a/sys/arch/mac68k/mac68k/conf.c b/sys/arch/mac68k/mac68k/conf.c
index 7b355e7a46f..6dacefeefb4 100644
--- a/sys/arch/mac68k/mac68k/conf.c
+++ b/sys/arch/mac68k/mac68k/conf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.29 1995/11/21 03:39:45 briggs Exp $ */
+/* $OpenBSD: conf.c,v 1.4 1996/02/21 12:53:47 mickey Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -180,11 +180,6 @@ cdev_decl(lkm);
/* open, close, read, ioctl */
cdev_decl(ipl);
-#define cdev_gen_ipf(c,n) { \
- dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
- (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) nullop, 0, (dev_type_select((*))) enodev, \
- (dev_type_mmap((*))) enodev, 0 }
#ifdef IPFILTER
#define NIPF 1
#else
diff --git a/sys/arch/mvme68k/mvme68k/conf.c b/sys/arch/mvme68k/mvme68k/conf.c
index f13dcbfd465..6426ca616e3 100644
--- a/sys/arch/mvme68k/mvme68k/conf.c
+++ b/sys/arch/mvme68k/mvme68k/conf.c
@@ -1,4 +1,4 @@
-/* $Id: conf.c,v 1.3 1996/01/07 07:41:05 dm Exp $ */
+/* $OpenBSD: conf.c,v 1.4 1996/02/21 12:53:48 mickey Exp $ */
/*-
* Copyright (c) 1995 Theo de Raadt
@@ -197,11 +197,6 @@ cdev_decl(lkm);
/* open, close, read, ioctl */
cdev_decl(ipl);
-#define cdev_gen_ipf(c,n) { \
- dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
- (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) nullop, 0, (dev_type_select((*))) enodev, \
- (dev_type_mmap((*))) enodev, 0 }
#ifdef IPFILTER
#define NIPF 1
#else
diff --git a/sys/arch/pc532/pc532/conf.c b/sys/arch/pc532/pc532/conf.c
index 92e8396a845..06753222d19 100644
--- a/sys/arch/pc532/pc532/conf.c
+++ b/sys/arch/pc532/pc532/conf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.26 1995/09/26 20:16:25 phil Exp $ */
+/* $OpenBSD: conf.c,v 1.3 1996/02/21 12:53:49 mickey Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -110,11 +110,6 @@ cdev_decl(lpt);
/* open, close, read, ioctl */
cdev_decl(ipl);
-#define cdev_gen_ipf(c,n) { \
- dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
- (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) nullop, 0, (dev_type_select((*))) enodev, \
- (dev_type_mmap((*))) enodev, 0 }
#ifdef IPFILTER
#define NIPF 1
#else
diff --git a/sys/arch/pica/pica/conf.c b/sys/arch/pica/pica/conf.c
index 34231534836..a2bbb6df944 100644
--- a/sys/arch/pica/pica/conf.c
+++ b/sys/arch/pica/pica/conf.c
@@ -1,3 +1,5 @@
+/* $OpenBSD: conf.c,v 1.3 1996/02/21 12:53:51 mickey Exp $ */
+
/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -34,7 +36,7 @@
* SUCH DAMAGE.
*
* from: @(#)conf.c 8.2 (Berkeley) 11/14/93
- * $Id: conf.c,v 1.2 1996/01/07 07:41:08 dm Exp $
+ * $Id: conf.c,v 1.3 1996/02/21 12:53:51 mickey Exp $
*/
#include <sys/param.h>
@@ -144,11 +146,6 @@ cdev_decl(pms);
/* open, close, read, ioctl */
cdev_decl(ipl);
-#define cdev_gen_ipf(c,n) { \
- dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
- (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) nullop, 0, (dev_type_select((*))) enodev, \
- (dev_type_mmap((*))) enodev, 0 }
#ifdef IPFILTER
#define NIPF 1
#else
diff --git a/sys/arch/pmax/pmax/conf.c b/sys/arch/pmax/pmax/conf.c
index 09dee286401..900a46cb1ea 100644
--- a/sys/arch/pmax/pmax/conf.c
+++ b/sys/arch/pmax/pmax/conf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.20 1995/10/05 01:53:02 jonathan Exp $ */
+/* $OpenBSD: conf.c,v 1.3 1996/02/21 12:53:52 mickey Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -159,11 +159,6 @@ cdev_decl(mfb);
/* open, close, read, ioctl */
cdev_decl(ipl);
-#define cdev_gen_ipf(c,n) { \
- dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
- (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) nullop, 0, (dev_type_select((*))) enodev, \
- (dev_type_mmap((*))) enodev, 0 }
#ifdef IPFILTER
#define NIPF 1
#else
diff --git a/sys/arch/sparc/sparc/conf.c b/sys/arch/sparc/sparc/conf.c
index 5d3b081152a..b603c1127db 100644
--- a/sys/arch/sparc/sparc/conf.c
+++ b/sys/arch/sparc/sparc/conf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.36 1995/09/25 20:27:32 chuck Exp $ */
+/* $OpenBSD: conf.c,v 1.4 1996/02/21 12:53:53 mickey Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -184,11 +184,6 @@ cdev_decl(lkm);
/* open, close, read, ioctl */
cdev_decl(ipl);
-#define cdev_gen_ipf(c,n) { \
- dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
- (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
- (dev_type_stop((*))) nullop, 0, (dev_type_select((*))) enodev, \
- (dev_type_mmap((*))) enodev, 0 }
#ifdef IPFILTER
#define NIPF 1
#else
diff --git a/sys/sys/conf.h b/sys/sys/conf.h
index 3dbe5aee1a3..30b86ad7bde 100644
--- a/sys/sys/conf.h
+++ b/sys/sys/conf.h
@@ -297,6 +297,13 @@ extern struct cdevsw cdevsw[];
(dev_type_ioctl((*))) enodev, (dev_type_stop((*))) nullop, \
0, (dev_type_select((*))) enodev, (dev_type_mmap((*))) enodev }
+/* open, close, read, ioctl */
+#define cdev_gen_ipf(c,n) { \
+ dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
+ (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
+ (dev_type_stop((*))) enodev, 0, (dev_type_select((*))) enodev, \
+ (dev_type_mmap((*))) enodev }
+
/* symbolic sleep message strings */
extern char devopn[], devio[], devwait[], devin[], devout[];
extern char devioc[], devcls[];