summaryrefslogtreecommitdiff
path: root/sys/arch/sun3/dev/fb.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/sun3/dev/fb.c')
-rw-r--r--sys/arch/sun3/dev/fb.c52
1 files changed, 17 insertions, 35 deletions
diff --git a/sys/arch/sun3/dev/fb.c b/sys/arch/sun3/dev/fb.c
index afa12f78f52..dea031c9798 100644
--- a/sys/arch/sun3/dev/fb.c
+++ b/sys/arch/sun3/dev/fb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fb.c,v 1.4 1996/12/17 21:10:41 gwr Exp $ */
+/* $NetBSD: fb.c,v 1.3 1995/04/10 05:45:56 mycroft Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -49,7 +49,6 @@
*/
#include <sys/param.h>
-#include <sys/systm.h>
#include <sys/conf.h>
#include <sys/device.h>
#include <sys/ioctl.h>
@@ -59,8 +58,6 @@
#include "fbvar.h"
-cdev_decl(fb);
-
static struct fbdevice *devfb;
static int fbpriority;
@@ -120,6 +117,16 @@ fbmmap(dev, off, prot)
return ((*devfb->fb_driver->fbd_mmap)(dev, off, prot));
}
+void
+fb_unblank()
+{
+ int on = 1;
+
+ if (devfb) {
+ (void) fbioctlfb(devfb, FBIOSVIDEO, (caddr_t)&on);
+ }
+}
+
/*
* Common fb ioctl function
*/
@@ -130,34 +137,33 @@ fbioctlfb(fb, cmd, data)
caddr_t data;
{
struct fbdriver *fbd = fb->fb_driver;
- void *vp = (void *)data;
int error;
switch (cmd) {
case FBIOGTYPE:
- *(struct fbtype *)vp = fb->fb_fbtype;
+ *(struct fbtype *)data = fb->fb_fbtype;
error = 0;
break;
case FBIOGATTR:
- error = (*fbd->fbd_gattr)(fb, vp);
+ error = (*fbd->fbd_gattr)(fb, (struct fbgattr *)data);
break;
case FBIOGVIDEO:
- error = (*fbd->fbd_gvideo)(fb, vp);
+ error = (*fbd->fbd_gvideo)(fb, (int *)data);
break;
case FBIOSVIDEO:
- error = (*fbd->fbd_svideo)(fb, vp);
+ error = (*fbd->fbd_svideo)(fb, (int *)data);
break;
case FBIOGETCMAP:
- error = (*fbd->fbd_getcmap)(fb, vp);
+ error = (*fbd->fbd_getcmap)(fb, (struct fbcmap *)data);
break;
case FBIOPUTCMAP:
- error = (*fbd->fbd_putcmap)(fb, vp);
+ error = (*fbd->fbd_putcmap)(fb, (struct fbcmap *)data);
break;
default:
@@ -165,27 +171,3 @@ fbioctlfb(fb, cmd, data)
}
return (error);
}
-
-void
-fb_unblank()
-{
- int on = 1;
-
- if (devfb == NULL)
- return;
-
- (*devfb->fb_driver->fbd_svideo)(devfb, (void *)&on);
-}
-
-/*
- * Default ioctl function to put in struct fbdriver
- * for functions that are not supported.
- */
-int
-fb_noioctl(fbd, vp)
- struct fbdevice *fbd;
- void *vp;
-{
- return ENOTTY;
-}
-