summaryrefslogtreecommitdiff
path: root/sys/dev/ic/vga.c
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2005-01-05 23:04:26 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2005-01-05 23:04:26 +0000
commitd6a1cbbf61a5735f55c3cc923bb6fd52ca1d0581 (patch)
treefedfc814b5ccdb10b20e816cd7fdf098b6161bea /sys/dev/ic/vga.c
parenta79d9e271a9c209f60a07ed7852e09374d2eaf69 (diff)
Let wsdisplay drivers return zero for WSDISPLAYIO_[GS]VIDEO ioctls - most
of the work is done in the upper layer, but they get to see the ioctl, so don't always return an error.
Diffstat (limited to 'sys/dev/ic/vga.c')
-rw-r--r--sys/dev/ic/vga.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/sys/dev/ic/vga.c b/sys/dev/ic/vga.c
index 05d5d7b1ff6..f2eb6c2da76 100644
--- a/sys/dev/ic/vga.c
+++ b/sys/dev/ic/vga.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vga.c,v 1.36 2004/12/26 21:22:13 miod Exp $ */
+/* $OpenBSD: vga.c,v 1.37 2005/01/05 23:04:25 miod Exp $ */
/* $NetBSD: vga.c,v 1.28.2.1 2000/06/30 16:27:47 simonb Exp $ */
/*
@@ -599,13 +599,15 @@ vga_ioctl(v, cmd, data, flag, p)
case WSDISPLAYIO_GTYPE:
*(int *)data = vc->vc_type;
/* XXX should get detailed hardware information here */
- return 0;
+ break;
+
+ case WSDISPLAYIO_GVIDEO:
+ case WSDISPLAYIO_SVIDEO:
+ break;
case WSDISPLAYIO_GINFO:
case WSDISPLAYIO_GETCMAP:
case WSDISPLAYIO_PUTCMAP:
- case WSDISPLAYIO_GVIDEO:
- case WSDISPLAYIO_SVIDEO:
case WSDISPLAYIO_GCURPOS:
case WSDISPLAYIO_SCURPOS:
case WSDISPLAYIO_GCURMAX:
@@ -615,7 +617,7 @@ vga_ioctl(v, cmd, data, flag, p)
return ENOTTY;
}
- return -1;
+ return (0);
}
paddr_t