[src/kqueue]: src/sys/arch/mac68k/dev g/c prototypes from aedvar.h, use cdev_...

[jdolecek <jdolecek%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2c19cd7afff6
branches:  kqueue
changeset: 512476:2c19cd7afff6
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Tue Jun 18 19:35:06 2002 +0000

description:
g/c prototypes from aedvar.h, use cdev_decl(), compile fixes

diffstat:

 sys/arch/mac68k/dev/aed.c    |  11 +++++++----
 sys/arch/mac68k/dev/aedvar.h |   8 +-------
 2 files changed, 8 insertions(+), 11 deletions(-)

diffs (69 lines):

diff -r 5885f99123b5 -r 2c19cd7afff6 sys/arch/mac68k/dev/aed.c
--- a/sys/arch/mac68k/dev/aed.c Tue Jun 18 19:29:11 2002 +0000
+++ b/sys/arch/mac68k/dev/aed.c Tue Jun 18 19:35:06 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: aed.c,v 1.10.8.1 2001/09/09 05:40:03 thorpej Exp $     */
+/*     $NetBSD: aed.c,v 1.10.8.2 2002/06/18 19:35:06 jdolecek Exp $    */
 
 /*
  * Copyright (C) 1994  Bradley A. Grantham
@@ -40,6 +40,7 @@
 #include <sys/proc.h>
 #include <sys/signalvar.h>
 #include <sys/systm.h>
+#include <sys/conf.h>
 
 #include <machine/autoconf.h>
 #include <machine/cpu.h>
@@ -61,6 +62,8 @@
 static void    aed_handoff __P((adb_event_t *event));
 static void    aed_enqevent __P((adb_event_t *event));
 
+cdev_decl(aed);
+
 /*
  * Local variables.
  */
@@ -512,7 +515,7 @@
 int 
 aedioctl(dev, cmd, data, flag, p)
     dev_t dev;
-    int cmd;
+    u_long cmd;
     caddr_t data;
     int flag;
     struct proc *p;
@@ -633,12 +636,12 @@
 
        switch (kn->kn_filter) {
        case EVFILT_READ:
-               klist = &sc->sc_selinfo.si_klist;
+               klist = &aed_sc->sc_selinfo.si_klist;
                kn->kn_fop = &aedread_filtops;
                break;
 
        case EVFILT_WRITE:
-               klist = &sc->sc_selinfo.si_klist;
+               klist = &aed_sc->sc_selinfo.si_klist;
                kn->kn_fop = &aed_seltrue_filtops;
                break;
 
diff -r 5885f99123b5 -r 2c19cd7afff6 sys/arch/mac68k/dev/aedvar.h
--- a/sys/arch/mac68k/dev/aedvar.h      Tue Jun 18 19:29:11 2002 +0000
+++ b/sys/arch/mac68k/dev/aedvar.h      Tue Jun 18 19:35:06 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: aedvar.h,v 1.4 2000/03/23 06:39:56 thorpej Exp $       */
+/*     $NetBSD: aedvar.h,v 1.4.8.1 2002/06/18 19:35:07 jdolecek Exp $  */
 
 /*
  * Copyright (C) 1994  Bradley A. Grantham
@@ -73,9 +73,3 @@
 #define AED_MSEMUL     0x1             /* emulate mouse buttons */
 
 int    aed_input __P((adb_event_t *event));
-int    aedopen __P((dev_t dev, int flag, int mode, struct proc *p));
-int    aedclose __P((dev_t dev, int flag, int mode, struct proc *p));
-int    aedread __P((dev_t dev, struct uio *uio, int flag));
-int    aedwrite __P((dev_t dev, struct uio *uio, int flag));
-int    aedioctl __P((dev_t , int , caddr_t , int , struct proc *));
-int    aedpoll __P((dev_t dev, int events, struct proc *p));