summaryrefslogtreecommitdiff
path: root/sys/arch/sun3/dev/bw2.c
diff options
context:
space:
mode:
authorkstailey <kstailey@cvs.openbsd.org>1997-01-07 23:36:38 +0000
committerkstailey <kstailey@cvs.openbsd.org>1997-01-07 23:36:38 +0000
commit1a190ef5412cf740c35f6e234ede308c9745b639 (patch)
tree73ba393da5a081446a8d47c9e1e21b4684bda58e /sys/arch/sun3/dev/bw2.c
parent5e87748eb0e9353770bea311de7b4d88a3fe8cdd (diff)
backed out prev. netbsd merge except for smaller proc table
Diffstat (limited to 'sys/arch/sun3/dev/bw2.c')
-rw-r--r--sys/arch/sun3/dev/bw2.c34
1 files changed, 16 insertions, 18 deletions
diff --git a/sys/arch/sun3/dev/bw2.c b/sys/arch/sun3/dev/bw2.c
index 63f28bc5bbc..3ce58a1061b 100644
--- a/sys/arch/sun3/dev/bw2.c
+++ b/sys/arch/sun3/dev/bw2.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bw2.c,v 1.9 1996/12/17 21:10:37 gwr Exp $ */
+/* $NetBSD: bw2.c,v 1.8 1996/10/13 03:47:25 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -51,28 +51,24 @@
*/
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/conf.h>
#include <sys/device.h>
#include <sys/ioctl.h>
#include <sys/malloc.h>
#include <sys/mman.h>
-#include <sys/proc.h>
#include <sys/tty.h>
#include <vm/vm.h>
-#include <machine/autoconf.h>
-#include <machine/control.h>
#include <machine/cpu.h>
#include <machine/fbio.h>
-#include <machine/idprom.h>
+#include <machine/autoconf.h>
#include <machine/pmap.h>
+#include <machine/control.h>
#include "fbvar.h"
#include "bw2reg.h"
-cdev_decl(bw2);
+extern unsigned char cpu_machine_id;
/* per-display variables */
struct bw2_softc {
@@ -95,14 +91,17 @@ struct cfdriver bwtwo_cd = {
/* XXX we do not handle frame buffer interrupts */
-static int bw2gvideo __P((struct fbdevice *, void *));
-static int bw2svideo __P((struct fbdevice *, void *));
+/* frame buffer generic driver */
+int bw2open(), bw2close(), bw2ioctl(), bw2mmap();
+
+static int bw2gvideo __P((struct fbdevice *, int *));
+static int bw2svideo __P((struct fbdevice *, int *));
static struct fbdriver bw2fbdriver = {
bw2open, bw2close, bw2mmap,
- fb_noioctl,
+ enoioctl, /* gattr */
bw2gvideo, bw2svideo,
- fb_noioctl, fb_noioctl, };
+ enoioctl, enoioctl };
static int
bw2match(parent, vcf, args)
@@ -146,6 +145,7 @@ bw2attach(parent, self, args)
struct fbdevice *fb = &sc->sc_fb;
struct confargs *ca = args;
struct fbtype *fbt;
+ int ramsize;
sc->sc_phys = ca->ca_paddr;
@@ -239,11 +239,10 @@ bw2mmap(dev, off, prot)
}
/* FBIOGVIDEO: */
-static int bw2gvideo(fb, data)
+static int bw2gvideo(fb, on)
struct fbdevice *fb;
- void *data;
+ int *on;
{
- int *on = data;
int s, ena;
s = splhigh();
@@ -255,11 +254,10 @@ static int bw2gvideo(fb, data)
}
/* FBIOSVIDEO */
-static int bw2svideo(fb, data)
+static int bw2svideo(fb, on)
struct fbdevice *fb;
- void *data;
+ int *on;
{
- int *on = data;
int s, ena;
s = splhigh();