summaryrefslogtreecommitdiff
path: root/sys/arch/macppc
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2002-06-07 07:13:38 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2002-06-07 07:13:38 +0000
commitc03e644d9e92e35a36e27e80f7ac9a15ffde8950 (patch)
treedbfeed4a71594309594ed42f2ddac6c8c25fcbe4 /sys/arch/macppc
parentf446fd9cc4d2affd6b03c36be6378b554979dd8b (diff)
Move more function prototypes to <machine/conf.h> as cdev_decl(foo)
for safety.
Diffstat (limited to 'sys/arch/macppc')
-rw-r--r--sys/arch/macppc/dev/aedvar.h18
-rw-r--r--sys/arch/macppc/include/conf.h5
-rw-r--r--sys/arch/macppc/macppc/conf.c3
3 files changed, 5 insertions, 21 deletions
diff --git a/sys/arch/macppc/dev/aedvar.h b/sys/arch/macppc/dev/aedvar.h
index e27f7394a24..d127ed70ba5 100644
--- a/sys/arch/macppc/dev/aedvar.h
+++ b/sys/arch/macppc/dev/aedvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: aedvar.h,v 1.2 2002/03/14 01:26:36 millert Exp $ */
+/* $OpenBSD: aedvar.h,v 1.3 2002/06/07 07:13:37 miod Exp $ */
/* $NetBSD: aedvar.h,v 1.2 2000/03/23 06:40:33 thorpej Exp $ */
/*
@@ -31,12 +31,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifdef __NetBSD__
-#include <sys/callout.h>
-#endif /* __NetBSD__ */
-#ifdef __OpenBSD__
#include <sys/timeout.h>
-#endif /* __OpenBSD__ */
#include <machine/adbsys.h>
/* Event queue definitions */
@@ -48,12 +43,7 @@
struct aed_softc {
struct device sc_dev;
-#ifdef __NetBSD__
- struct callout sc_repeat_ch;
-#endif /* __NetBSD__ */
-#ifdef __OpenBSD__
struct timeout sc_repeat_ch;
-#endif /* __OpenBSD__ */
/* ADB info */
u_char origaddr; /* ADB device type (ADBADDR_AED) */
@@ -84,9 +74,3 @@ struct aed_softc {
#define AED_MSEMUL 0x1 /* emulate mouse buttons */
void aed_input(adb_event_t *event);
-int aedopen(dev_t dev, int flag, int mode, struct proc *p);
-int aedclose(dev_t dev, int flag, int mode, struct proc *p);
-int aedread(dev_t dev, struct uio *uio, int flag);
-int aedwrite(dev_t dev, struct uio *uio, int flag);
-int aedioctl(dev_t , int , caddr_t , int , struct proc *);
-int aedpoll(dev_t dev, int events, struct proc *p);
diff --git a/sys/arch/macppc/include/conf.h b/sys/arch/macppc/include/conf.h
index 3bd4dac178d..a1029f2b15c 100644
--- a/sys/arch/macppc/include/conf.h
+++ b/sys/arch/macppc/include/conf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.h,v 1.4 2001/12/12 19:19:17 jason Exp $ */
+/* $OpenBSD: conf.h,v 1.5 2002/06/07 07:13:35 miod Exp $ */
/* $NetBSD: conf.h,v 1.2 1996/05/05 19:28:34 christos Exp $ */
/*
@@ -43,7 +43,8 @@ cdev_decl(mm);
(dev_type_stop((*))) enodev, 0, (dev_type_select((*))) enodev, \
(dev_type_mmap((*))) enodev, D_KQFILTER, dev_init(c,n,kqfilter) }
-
+cdev_decl(aed);
+cdev_decl(apm);
cdev_decl(zs);
cdev_decl(crypto);
diff --git a/sys/arch/macppc/macppc/conf.c b/sys/arch/macppc/macppc/conf.c
index 0e9e35e4b8b..2c0a52fad8c 100644
--- a/sys/arch/macppc/macppc/conf.c
+++ b/sys/arch/macppc/macppc/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.10 2002/05/16 21:11:15 miod Exp $ */
+/* $OpenBSD: conf.c,v 1.11 2002/06/07 07:13:31 miod Exp $ */
/*
* Copyright (c) 1997 Per Fogelstrom
@@ -136,7 +136,6 @@ cdev_decl(uscanner);
#include "inet.h"
#include "apm.h"
-cdev_decl(apm);
#include "wsmux.h"