From d6a1cbbf61a5735f55c3cc923bb6fd52ca1d0581 Mon Sep 17 00:00:00 2001
From: Miod Vallat <miod@cvs.openbsd.org>
Date: Wed, 5 Jan 2005 23:04:26 +0000
Subject: 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.

---
 sys/arch/arm/xscale/pxa2x0_lcd.c | 10 ++++++----
 sys/arch/luna88k/dev/lunafb.c    |  4 +++-
 sys/arch/macppc/pci/vgafb.c      | 14 +++++---------
 sys/arch/sparc/dev/agten.c       |  4 +++-
 sys/arch/sparc/dev/bwtwo.c       |  4 +++-
 sys/arch/sparc/dev/cgeight.c     |  4 +++-
 sys/arch/sparc/dev/cgfour.c      |  4 +++-
 sys/arch/sparc/dev/cgsix.c       |  4 +++-
 sys/arch/sparc/dev/cgthree.c     |  4 +++-
 sys/arch/sparc/dev/cgtwo.c       |  4 +++-
 sys/arch/sparc/dev/p9000.c       |  4 +++-
 sys/arch/sparc/dev/p9100.c       |  4 +++-
 sys/arch/sparc/dev/tvtwo.c       |  4 +++-
 sys/arch/sparc/dev/vigra.c       |  4 +++-
 sys/arch/sparc64/dev/creator.c   |  4 +++-
 sys/arch/sparc64/dev/vgafb.c     |  4 +++-
 sys/dev/ic/sti.c                 |  4 +++-
 sys/dev/ic/vga.c                 | 12 +++++++-----
 sys/dev/pci/tga.c                | 28 ++++++++++++----------------
 sys/dev/sbus/agten.c             |  4 +++-
 sys/dev/sbus/bwtwo.c             |  4 +++-
 sys/dev/sbus/cgsix.c             |  3 ++-
 sys/dev/sbus/cgthree.c           |  4 +++-
 sys/dev/sbus/tvtwo.c             |  4 +++-
 sys/dev/sbus/vigra.c             |  4 +++-
 25 files changed, 92 insertions(+), 55 deletions(-)

(limited to 'sys')

diff --git a/sys/arch/arm/xscale/pxa2x0_lcd.c b/sys/arch/arm/xscale/pxa2x0_lcd.c
index 5eab0ab878f..77284933022 100644
--- a/sys/arch/arm/xscale/pxa2x0_lcd.c
+++ b/sys/arch/arm/xscale/pxa2x0_lcd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pxa2x0_lcd.c,v 1.6 2005/01/05 19:12:47 miod Exp $ */
+/*	$OpenBSD: pxa2x0_lcd.c,v 1.7 2005/01/05 23:04:23 miod Exp $ */
 /* $NetBSD: pxa2x0_lcd.c,v 1.8 2003/10/03 07:24:05 bsh Exp $ */
 
 /*
@@ -605,7 +605,7 @@ pxa2x0_lcd_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct proc *p)
 	switch (cmd) {
 	case WSDISPLAYIO_GTYPE:
 		*(u_int *)data = WSDISPLAY_TYPE_UNKNOWN; /* XXX */
-		return 0;
+		break;
 
 	case WSDISPLAYIO_GINFO:
 		wsdisp_info = (struct wsdisplay_fbinfo *)data;
@@ -614,7 +614,7 @@ pxa2x0_lcd_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct proc *p)
 		wsdisp_info->width = sc->geometry->panel_width;
 		wsdisp_info->depth = 16; /* XXX */
 		wsdisp_info->cmsize = 0;
-		return 0;
+		break;
 
 	case WSDISPLAYIO_GETCMAP:
 	case WSDISPLAYIO_PUTCMAP:
@@ -622,6 +622,8 @@ pxa2x0_lcd_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct proc *p)
 
 	case WSDISPLAYIO_SVIDEO:
 	case WSDISPLAYIO_GVIDEO:
+		break;
+
 	case WSDISPLAYIO_GCURPOS:
 	case WSDISPLAYIO_SCURPOS:
 	case WSDISPLAYIO_GCURMAX:
@@ -630,7 +632,7 @@ pxa2x0_lcd_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct proc *p)
 		return -1;	/* not implemented */
 	}
 
-	return -1;
+	return (0);
 }
 
 paddr_t
diff --git a/sys/arch/luna88k/dev/lunafb.c b/sys/arch/luna88k/dev/lunafb.c
index b85377cf91b..036977ad527 100644
--- a/sys/arch/luna88k/dev/lunafb.c
+++ b/sys/arch/luna88k/dev/lunafb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lunafb.c,v 1.3 2004/05/10 10:30:23 aoyama Exp $ */
+/* $OpenBSD: lunafb.c,v 1.4 2005/01/05 23:04:24 miod Exp $ */
 /* $NetBSD: lunafb.c,v 1.7.6.1 2002/08/07 01:48:34 lukem Exp $ */
 
 /*-
@@ -265,6 +265,8 @@ omfbioctl(v, cmd, data, flag, p)
 
 	case WSDISPLAYIO_SVIDEO:
 	case WSDISPLAYIO_GVIDEO:
+		break;
+
 	case WSDISPLAYIO_GCURPOS:
 	case WSDISPLAYIO_SCURPOS:
 	case WSDISPLAYIO_GCURMAX:
diff --git a/sys/arch/macppc/pci/vgafb.c b/sys/arch/macppc/pci/vgafb.c
index bd8b957b9aa..5843485eea5 100644
--- a/sys/arch/macppc/pci/vgafb.c
+++ b/sys/arch/macppc/pci/vgafb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vgafb.c,v 1.23 2004/03/17 15:47:59 drahn Exp $	*/
+/*	$OpenBSD: vgafb.c,v 1.24 2005/01/05 23:04:24 miod Exp $	*/
 /*	$NetBSD: vga.c,v 1.3 1996/12/02 22:24:54 cgd Exp $	*/
 
 /*
@@ -263,14 +263,9 @@ vgafb_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct proc *p)
 		 * bad accellerated X servers that does not restore
 		 * the correct palette.
 		 */
-
 		if (cons_depth == 8)
 			vgafb_restore_default_colors(vc);
-
-		/* now that we have done our work, let the wscons
-		 * layer handle this ioctl
-		 */
-		return -1;
+		break;
 
 	case WSDISPLAYIO_GETPARAM:
 	{
@@ -322,6 +317,8 @@ vgafb_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct proc *p)
 
 	case WSDISPLAYIO_SVIDEO:
 	case WSDISPLAYIO_GVIDEO:
+		break;
+
 	case WSDISPLAYIO_GCURPOS:
 	case WSDISPLAYIO_SCURPOS:
 	case WSDISPLAYIO_GCURMAX:
@@ -331,8 +328,7 @@ vgafb_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct proc *p)
 		return -1; /* not supported yet */
 	}
 	
-        /* XXX */
-        return -1;
+        return (0);
 }
 
 paddr_t
diff --git a/sys/arch/sparc/dev/agten.c b/sys/arch/sparc/dev/agten.c
index 675a3578da3..12a7187cdd6 100644
--- a/sys/arch/sparc/dev/agten.c
+++ b/sys/arch/sparc/dev/agten.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: agten.c,v 1.6 2004/11/29 22:07:36 miod Exp $	*/
+/*	$OpenBSD: agten.c,v 1.7 2005/01/05 23:04:24 miod Exp $	*/
 /*
  * Copyright (c) 2002, 2003, Miodrag Vallat.
  * All rights reserved.
@@ -271,6 +271,8 @@ agten_ioctl(dev, cmd, data, flags, p)
 
 	case WSDISPLAYIO_SVIDEO:
 	case WSDISPLAYIO_GVIDEO:
+		break;
+
 	case WSDISPLAYIO_GCURPOS:
 	case WSDISPLAYIO_SCURPOS:
 	case WSDISPLAYIO_GCURMAX:
diff --git a/sys/arch/sparc/dev/bwtwo.c b/sys/arch/sparc/dev/bwtwo.c
index 98cc95679bc..786bfa84df8 100644
--- a/sys/arch/sparc/dev/bwtwo.c
+++ b/sys/arch/sparc/dev/bwtwo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bwtwo.c,v 1.28 2004/11/29 22:07:36 miod Exp $	*/
+/*	$OpenBSD: bwtwo.c,v 1.29 2005/01/05 23:04:24 miod Exp $	*/
 /*	$NetBSD: bwtwo.c,v 1.33 1997/05/24 20:16:02 pk Exp $ */
 
 /*
@@ -338,6 +338,8 @@ bwtwo_ioctl(v, cmd, data, flags, p)
 
 	case WSDISPLAYIO_SVIDEO:
 	case WSDISPLAYIO_GVIDEO:
+		break;
+
 	case WSDISPLAYIO_GCURPOS:
 	case WSDISPLAYIO_SCURPOS:
 	case WSDISPLAYIO_GCURMAX:
diff --git a/sys/arch/sparc/dev/cgeight.c b/sys/arch/sparc/dev/cgeight.c
index b46207911da..6fc94c2f09b 100644
--- a/sys/arch/sparc/dev/cgeight.c
+++ b/sys/arch/sparc/dev/cgeight.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cgeight.c,v 1.22 2004/11/29 22:07:36 miod Exp $	*/
+/*	$OpenBSD: cgeight.c,v 1.23 2005/01/05 23:04:24 miod Exp $	*/
 /*	$NetBSD: cgeight.c,v 1.13 1997/05/24 20:16:04 pk Exp $	*/
 
 /*
@@ -266,6 +266,8 @@ cgeight_ioctl(v, cmd, data, flags, p)
 
 	case WSDISPLAYIO_SVIDEO:
 	case WSDISPLAYIO_GVIDEO:
+		break;
+
 	case WSDISPLAYIO_GCURPOS:
 	case WSDISPLAYIO_SCURPOS:
 	case WSDISPLAYIO_GCURMAX:
diff --git a/sys/arch/sparc/dev/cgfour.c b/sys/arch/sparc/dev/cgfour.c
index e1e13cf87f9..dd7b6982820 100644
--- a/sys/arch/sparc/dev/cgfour.c
+++ b/sys/arch/sparc/dev/cgfour.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cgfour.c,v 1.22 2004/11/29 22:07:36 miod Exp $	*/
+/*	$OpenBSD: cgfour.c,v 1.23 2005/01/05 23:04:24 miod Exp $	*/
 /*	$NetBSD: cgfour.c,v 1.13 1997/05/24 20:16:06 pk Exp $	*/
 
 /*
@@ -281,6 +281,8 @@ cgfour_ioctl(v, cmd, data, flags, p)
 
 	case WSDISPLAYIO_SVIDEO:
 	case WSDISPLAYIO_GVIDEO:
+		break;
+
 	case WSDISPLAYIO_GCURPOS:
 	case WSDISPLAYIO_SCURPOS:
 	case WSDISPLAYIO_GCURMAX:
diff --git a/sys/arch/sparc/dev/cgsix.c b/sys/arch/sparc/dev/cgsix.c
index 962799e3cb0..653d085b51c 100644
--- a/sys/arch/sparc/dev/cgsix.c
+++ b/sys/arch/sparc/dev/cgsix.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cgsix.c,v 1.30 2004/11/29 22:07:36 miod Exp $	*/
+/*	$OpenBSD: cgsix.c,v 1.31 2005/01/05 23:04:24 miod Exp $	*/
 /*	$NetBSD: cgsix.c,v 1.33 1997/08/07 19:12:30 pk Exp $ */
 
 /*
@@ -416,6 +416,8 @@ cgsix_ioctl(dev, cmd, data, flags, p)
 
 	case WSDISPLAYIO_SVIDEO:
 	case WSDISPLAYIO_GVIDEO:
+		break;
+
 	case WSDISPLAYIO_GCURPOS:
 	case WSDISPLAYIO_SCURPOS:
 	case WSDISPLAYIO_GCURMAX:
diff --git a/sys/arch/sparc/dev/cgthree.c b/sys/arch/sparc/dev/cgthree.c
index b49e79cf254..387591d6ab5 100644
--- a/sys/arch/sparc/dev/cgthree.c
+++ b/sys/arch/sparc/dev/cgthree.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cgthree.c,v 1.26 2004/11/29 22:07:36 miod Exp $	*/
+/*	$OpenBSD: cgthree.c,v 1.27 2005/01/05 23:04:24 miod Exp $	*/
 /*	$NetBSD: cgthree.c,v 1.33 1997/05/24 20:16:11 pk Exp $ */
 
 /*
@@ -367,6 +367,8 @@ cgthree_ioctl(v, cmd, data, flags, p)
 
 	case WSDISPLAYIO_SVIDEO:
 	case WSDISPLAYIO_GVIDEO:
+		break;
+
 	case WSDISPLAYIO_GCURPOS:
 	case WSDISPLAYIO_SCURPOS:
 	case WSDISPLAYIO_GCURMAX:
diff --git a/sys/arch/sparc/dev/cgtwo.c b/sys/arch/sparc/dev/cgtwo.c
index 5ad1e7c383e..2d243e25d71 100644
--- a/sys/arch/sparc/dev/cgtwo.c
+++ b/sys/arch/sparc/dev/cgtwo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cgtwo.c,v 1.30 2004/11/29 22:07:36 miod Exp $	*/
+/*	$OpenBSD: cgtwo.c,v 1.31 2005/01/05 23:04:25 miod Exp $	*/
 /*	$NetBSD: cgtwo.c,v 1.22 1997/05/24 20:16:12 pk Exp $ */
 
 /*
@@ -294,6 +294,8 @@ cgtwo_ioctl(v, cmd, data, flags, p)
 
 	case WSDISPLAYIO_SVIDEO:
 	case WSDISPLAYIO_GVIDEO:
+		break;
+
 	case WSDISPLAYIO_GCURPOS:
 	case WSDISPLAYIO_SCURPOS:
 	case WSDISPLAYIO_GCURMAX:
diff --git a/sys/arch/sparc/dev/p9000.c b/sys/arch/sparc/dev/p9000.c
index a61fe87e483..d86580e927e 100644
--- a/sys/arch/sparc/dev/p9000.c
+++ b/sys/arch/sparc/dev/p9000.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: p9000.c,v 1.10 2004/11/29 22:07:37 miod Exp $	*/
+/*	$OpenBSD: p9000.c,v 1.11 2005/01/05 23:04:25 miod Exp $	*/
 
 /*
  * Copyright (c) 2003, Miodrag Vallat.
@@ -376,6 +376,8 @@ p9000_ioctl(void *v, u_long cmd, caddr_t data, int flags, struct proc *p)
 
 	case WSDISPLAYIO_SVIDEO:
 	case WSDISPLAYIO_GVIDEO:
+		break;
+
 	case WSDISPLAYIO_GCURPOS:
 	case WSDISPLAYIO_SCURPOS:
 	case WSDISPLAYIO_GCURMAX:
diff --git a/sys/arch/sparc/dev/p9100.c b/sys/arch/sparc/dev/p9100.c
index 1f58ccf3baf..8004709c5f9 100644
--- a/sys/arch/sparc/dev/p9100.c
+++ b/sys/arch/sparc/dev/p9100.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: p9100.c,v 1.31 2004/11/29 22:07:37 miod Exp $	*/
+/*	$OpenBSD: p9100.c,v 1.32 2005/01/05 23:04:25 miod Exp $	*/
 
 /*
  * Copyright (c) 2003, Miodrag Vallat.
@@ -420,6 +420,8 @@ p9100_ioctl(void *v, u_long cmd, caddr_t data, int flags, struct proc *p)
 
 	case WSDISPLAYIO_SVIDEO:
 	case WSDISPLAYIO_GVIDEO:
+		break;
+
 	case WSDISPLAYIO_GCURPOS:
 	case WSDISPLAYIO_SCURPOS:
 	case WSDISPLAYIO_GCURMAX:
diff --git a/sys/arch/sparc/dev/tvtwo.c b/sys/arch/sparc/dev/tvtwo.c
index dd285920315..5f690e0cf00 100644
--- a/sys/arch/sparc/dev/tvtwo.c
+++ b/sys/arch/sparc/dev/tvtwo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tvtwo.c,v 1.4 2004/11/29 22:07:37 miod Exp $	*/
+/*	$OpenBSD: tvtwo.c,v 1.5 2005/01/05 23:04:25 miod Exp $	*/
 /*
  * Copyright (c) 2003, Miodrag Vallat.
  * All rights reserved.
@@ -273,6 +273,8 @@ tvtwo_ioctl(void *dev, u_long cmd, caddr_t data, int flags, struct proc *p)
 
 	case WSDISPLAYIO_SVIDEO:
 	case WSDISPLAYIO_GVIDEO:
+		break;
+
 	case WSDISPLAYIO_GCURPOS:
 	case WSDISPLAYIO_SCURPOS:
 	case WSDISPLAYIO_GCURMAX:
diff --git a/sys/arch/sparc/dev/vigra.c b/sys/arch/sparc/dev/vigra.c
index 45cf21aad94..ffe275e3d1a 100644
--- a/sys/arch/sparc/dev/vigra.c
+++ b/sys/arch/sparc/dev/vigra.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vigra.c,v 1.11 2004/11/29 22:07:37 miod Exp $	*/
+/*	$OpenBSD: vigra.c,v 1.12 2005/01/05 23:04:25 miod Exp $	*/
 
 /*
  * Copyright (c) 2002, 2003, Miodrag Vallat.
@@ -372,6 +372,8 @@ vigra_ioctl(void *v, u_long cmd, caddr_t data, int flags, struct proc *p)
 
 	case WSDISPLAYIO_SVIDEO:
 	case WSDISPLAYIO_GVIDEO:
+		break;
+
 	case WSDISPLAYIO_GCURPOS:
 	case WSDISPLAYIO_SCURPOS:
 	case WSDISPLAYIO_GCURMAX:
diff --git a/sys/arch/sparc64/dev/creator.c b/sys/arch/sparc64/dev/creator.c
index 923aebccffe..46ac93358f0 100644
--- a/sys/arch/sparc64/dev/creator.c
+++ b/sys/arch/sparc64/dev/creator.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: creator.c,v 1.30 2004/11/29 22:07:40 miod Exp $	*/
+/*	$OpenBSD: creator.c,v 1.31 2005/01/05 23:04:25 miod Exp $	*/
 
 /*
  * Copyright (c) 2002 Jason L. Wright (jason@thought.net)
@@ -243,6 +243,8 @@ creator_ioctl(v, cmd, data, flags, p)
 		break;
 	case WSDISPLAYIO_SVIDEO:
 	case WSDISPLAYIO_GVIDEO:
+		break;
+
 	case WSDISPLAYIO_GETCMAP:
 	case WSDISPLAYIO_PUTCMAP:
 	default:
diff --git a/sys/arch/sparc64/dev/vgafb.c b/sys/arch/sparc64/dev/vgafb.c
index efe9dd9ec9c..477c1ea6d18 100644
--- a/sys/arch/sparc64/dev/vgafb.c
+++ b/sys/arch/sparc64/dev/vgafb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vgafb.c,v 1.37 2004/12/02 02:41:02 brad Exp $	*/
+/*	$OpenBSD: vgafb.c,v 1.38 2005/01/05 23:04:25 miod Exp $	*/
 
 /*
  * Copyright (c) 2001 Jason L. Wright (jason@thought.net)
@@ -230,6 +230,8 @@ vgafb_ioctl(v, cmd, data, flags, p)
 
 	case WSDISPLAYIO_SVIDEO:
 	case WSDISPLAYIO_GVIDEO:
+		break;
+
 	case WSDISPLAYIO_GCURPOS:
 	case WSDISPLAYIO_SCURPOS:
 	case WSDISPLAYIO_GCURMAX:
diff --git a/sys/dev/ic/sti.c b/sys/dev/ic/sti.c
index 1427b2e4fad..c31b0544e56 100644
--- a/sys/dev/ic/sti.c
+++ b/sys/dev/ic/sti.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sti.c,v 1.37 2004/11/03 19:18:47 mickey Exp $	*/
+/*	$OpenBSD: sti.c,v 1.38 2005/01/05 23:04:25 miod Exp $	*/
 
 /*
  * Copyright (c) 2000-2003 Michael Shalayeff
@@ -697,6 +697,8 @@ sti_ioctl(v, cmd, data, flag, p)
 
 	case WSDISPLAYIO_SVIDEO:
 	case WSDISPLAYIO_GVIDEO:
+		break;
+
 	case WSDISPLAYIO_GCURPOS:
 	case WSDISPLAYIO_SCURPOS:
 	case WSDISPLAYIO_GCURMAX:
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
diff --git a/sys/dev/pci/tga.c b/sys/dev/pci/tga.c
index 2a15d319a7b..d0b7cde971c 100644
--- a/sys/dev/pci/tga.c
+++ b/sys/dev/pci/tga.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tga.c,v 1.23 2004/02/21 19:38:19 miod Exp $ */
+/* $OpenBSD: tga.c,v 1.24 2005/01/05 23:04:25 miod Exp $ */
 /* $NetBSD: tga.c,v 1.40 2002/03/13 15:05:18 ad Exp $ */
 
 /*
@@ -570,7 +570,7 @@ tga_ioctl(v, cmd, data, flag, p)
 	switch (cmd) {
 	case WSDISPLAYIO_GTYPE:
 		*(u_int *)data = WSDISPLAY_TYPE_TGA;
-		return (0);
+		break;
 
 	case WSDISPLAYIO_SMODE:
 		sc->sc_mode = *(u_int *)data;
@@ -584,7 +584,7 @@ tga_ioctl(v, cmd, data, flag, p)
 			TGAWREG(dc, TGA_REG_VVBR, 1);
 			break;			
 		}
-		return (0);
+		break;
 
 	case WSDISPLAYIO_GINFO:
 #define	wsd_fbip ((struct wsdisplay_fbinfo *)data)
@@ -593,30 +593,22 @@ tga_ioctl(v, cmd, data, flag, p)
 		wsd_fbip->depth = sc->sc_dc->dc_tgaconf->tgac_phys_depth;
 		wsd_fbip->cmsize = 1024;		/* XXX ??? */
 #undef wsd_fbip
-		return (0);
+		break;
 
 	case WSDISPLAYIO_LINEBYTES:
 		*(u_int *)data = sc->sc_dc->dc_rowbytes;
-		return 0;
+		break;
+
 	case WSDISPLAYIO_GETCMAP:
 		return (*dcrf->ramdac_get_cmap)(dcrc,
 		    (struct wsdisplay_cmap *)data);
-
 	case WSDISPLAYIO_PUTCMAP:
 		return (*dcrf->ramdac_set_cmap)(dcrc,
 		    (struct wsdisplay_cmap *)data);
 
 	case WSDISPLAYIO_SVIDEO:
-		if (*(u_int *)data == WSDISPLAYIO_VIDEO_OFF)
-			tga_blank(sc->sc_dc);
-		else
-			tga_unblank(sc->sc_dc);
-		return (0);
-
 	case WSDISPLAYIO_GVIDEO:
-		*(u_int *)data = dc->dc_blanked ?
-		    WSDISPLAYIO_VIDEO_OFF : WSDISPLAYIO_VIDEO_ON;
-		return (0);
+		break;
 
 	case WSDISPLAYIO_GCURPOS:
 		return (*dcrf->ramdac_get_curpos)(dcrc,
@@ -637,8 +629,12 @@ tga_ioctl(v, cmd, data, flag, p)
 	case WSDISPLAYIO_SCURSOR:
 		return (*dcrf->ramdac_set_cursor)(dcrc,
 		    (struct wsdisplay_cursor *)data);
+
+	default:
+		return (-1);
 	}
-	return (-1);
+
+	return (0);
 }
 
 int
diff --git a/sys/dev/sbus/agten.c b/sys/dev/sbus/agten.c
index e51564daaf6..f7dba9dcf2b 100644
--- a/sys/dev/sbus/agten.c
+++ b/sys/dev/sbus/agten.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: agten.c,v 1.2 2004/11/29 22:07:40 miod Exp $	*/
+/*	$OpenBSD: agten.c,v 1.3 2005/01/05 23:04:25 miod Exp $	*/
 /*
  * Copyright (c) 2002, 2003, Miodrag Vallat.
  * All rights reserved.
@@ -285,6 +285,8 @@ agten_ioctl(dev, cmd, data, flags, p)
 
 	case WSDISPLAYIO_SVIDEO:
 	case WSDISPLAYIO_GVIDEO:
+		break;
+
 	case WSDISPLAYIO_GCURPOS:
 	case WSDISPLAYIO_SCURPOS:
 	case WSDISPLAYIO_GCURMAX:
diff --git a/sys/dev/sbus/bwtwo.c b/sys/dev/sbus/bwtwo.c
index 760b835ab8d..e3e273b7a4b 100644
--- a/sys/dev/sbus/bwtwo.c
+++ b/sys/dev/sbus/bwtwo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bwtwo.c,v 1.11 2004/11/29 22:07:40 miod Exp $	*/
+/*	$OpenBSD: bwtwo.c,v 1.12 2005/01/05 23:04:25 miod Exp $	*/
 
 /*
  * Copyright (c) 2002 Jason L. Wright (jason@thought.net)
@@ -248,6 +248,8 @@ bwtwo_ioctl(v, cmd, data, flags, p)
 
 	case WSDISPLAYIO_SVIDEO:
 	case WSDISPLAYIO_GVIDEO:
+		break;
+
 	case WSDISPLAYIO_GCURPOS:
 	case WSDISPLAYIO_SCURPOS:
 	case WSDISPLAYIO_GCURMAX:
diff --git a/sys/dev/sbus/cgsix.c b/sys/dev/sbus/cgsix.c
index 71d25831129..3448238745a 100644
--- a/sys/dev/sbus/cgsix.c
+++ b/sys/dev/sbus/cgsix.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cgsix.c,v 1.45 2004/11/29 22:07:40 miod Exp $	*/
+/*	$OpenBSD: cgsix.c,v 1.46 2005/01/05 23:04:25 miod Exp $	*/
 
 /*
  * Copyright (c) 2001 Jason L. Wright (jason@thought.net)
@@ -374,6 +374,7 @@ cgsix_ioctl(void *v, u_long cmd, caddr_t data, int flags, struct proc *p)
 		break;
 	case WSDISPLAYIO_SVIDEO:
 	case WSDISPLAYIO_GVIDEO:
+		break;
 	default:
 		return -1; /* not supported */
         }
diff --git a/sys/dev/sbus/cgthree.c b/sys/dev/sbus/cgthree.c
index 5b5b448d54f..e5ffe5ab0ae 100644
--- a/sys/dev/sbus/cgthree.c
+++ b/sys/dev/sbus/cgthree.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cgthree.c,v 1.36 2004/11/29 22:07:40 miod Exp $	*/
+/*	$OpenBSD: cgthree.c,v 1.37 2005/01/05 23:04:25 miod Exp $	*/
 
 /*
  * Copyright (c) 2001 Jason L. Wright (jason@thought.net)
@@ -336,6 +336,8 @@ cgthree_ioctl(void *v, u_long cmd, caddr_t data, int flags, struct proc *p)
 
 	case WSDISPLAYIO_SVIDEO:
 	case WSDISPLAYIO_GVIDEO:
+		break;
+
 	case WSDISPLAYIO_GCURPOS:
 	case WSDISPLAYIO_SCURPOS:
 	case WSDISPLAYIO_GCURMAX:
diff --git a/sys/dev/sbus/tvtwo.c b/sys/dev/sbus/tvtwo.c
index 8058114d57d..a18dea61718 100644
--- a/sys/dev/sbus/tvtwo.c
+++ b/sys/dev/sbus/tvtwo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tvtwo.c,v 1.2 2004/11/29 22:07:41 miod Exp $	*/
+/*	$OpenBSD: tvtwo.c,v 1.3 2005/01/05 23:04:25 miod Exp $	*/
 /*
  * Copyright (c) 2003, Miodrag Vallat.
  * All rights reserved.
@@ -289,6 +289,8 @@ tvtwo_ioctl(void *dev, u_long cmd, caddr_t data, int flags, struct proc *p)
 
 	case WSDISPLAYIO_SVIDEO:
 	case WSDISPLAYIO_GVIDEO:
+		break;
+
 	case WSDISPLAYIO_GCURPOS:
 	case WSDISPLAYIO_SCURPOS:
 	case WSDISPLAYIO_GCURMAX:
diff --git a/sys/dev/sbus/vigra.c b/sys/dev/sbus/vigra.c
index 9e74a5cc541..32272c6e050 100644
--- a/sys/dev/sbus/vigra.c
+++ b/sys/dev/sbus/vigra.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vigra.c,v 1.2 2004/11/29 22:07:41 miod Exp $	*/
+/*	$OpenBSD: vigra.c,v 1.3 2005/01/05 23:04:25 miod Exp $	*/
 
 /*
  * Copyright (c) 2002, 2003, Miodrag Vallat.
@@ -398,6 +398,8 @@ vigra_ioctl(void *v, u_long cmd, caddr_t data, int flags, struct proc *p)
 
 	case WSDISPLAYIO_SVIDEO:
 	case WSDISPLAYIO_GVIDEO:
+		break;
+
 	case WSDISPLAYIO_GCURPOS:
 	case WSDISPLAYIO_SCURPOS:
 	case WSDISPLAYIO_GCURMAX:
-- 
cgit v1.2.3