diff options
Diffstat (limited to 'sys/arch/pmax/dev/dtop.c')
| -rw-r--r-- | sys/arch/pmax/dev/dtop.c | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/sys/arch/pmax/dev/dtop.c b/sys/arch/pmax/dev/dtop.c index df0e35c2021..784f03ddea2 100644 --- a/sys/arch/pmax/dev/dtop.c +++ b/sys/arch/pmax/dev/dtop.c @@ -1,4 +1,4 @@ -/* $NetBSD: dtop.c,v 1.20 1996/10/13 13:13:55 jonathan Exp $ */ +/* $NetBSD: dtop.c,v 1.23 1997/05/25 04:58:36 jonathan Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -93,8 +93,6 @@ SOFTWARE. ********************************************************/ -#include "dtop.h" -#if NDTOP > 0 #include <sys/param.h> #include <sys/systm.h> #include <sys/ioctl.h> @@ -115,8 +113,11 @@ SOFTWARE. #include <dev/cons.h> #include <pmax/cpuregs.h> /* mips cached->uncached */ +#include <machine/dc7085cons.h> /* mdmctl bits same on dtop and dc? */ #include <machine/pmioctl.h> -#include <machine/dc7085cons.h> +#include <machine/fbio.h> +#include <machine/fbvar.h> +#include <pmax/dev/fbreg.h> #include <pmax/pmax/asic.h> #include <pmax/pmax/maxine.h> @@ -128,12 +129,6 @@ SOFTWARE. #include <pmax/dev/lk201var.h> #include <pmax/dev/dtopvar.h> -#include <machine/fbio.h> -#include <machine/fbvar.h> -#include <pmax/dev/fbreg.h> - -extern int pmax_boardtype; - #define DTOP_MAX_POLL 0x7fff /* about half a sec */ @@ -160,7 +155,8 @@ struct dtop_softc { short bad_pkts; struct dtop_ds { - int (*handler)(); + int (*handler) + __P((dtop_device_t, dtop_message_t, int, int)); dtop_device status; } device[(DTOP_ADDR_DEFAULT - DTOP_ADDR_FIRST) >> 1]; @@ -184,13 +180,6 @@ int dtop_keyboard_handler __P((dtop_device_t, dtop_message_t, int, int)); int dtopparam __P((struct tty *, struct termios *)); void dtopstart __P((struct tty *)); -void dtopKBDPutc __P((dev_t, int)); -int dtopKBDGetc __P((dev_t)); - - -void (*dtopDivertXInput)(); /* X windows keyboard input routine */ -void (*dtopMouseEvent)(); /* X windows mouse motion event routine */ -void (*dtopMouseButtons)(); /* X windows mouse buttons event routine */ /* @@ -940,4 +929,3 @@ dtop_keyboard_repeat(arg) dev->keyboard.k_ar_state = K_AR_IDLE; splx(s); } -#endif |