summaryrefslogtreecommitdiff
path: root/sys/arch/arm/xscale
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/arch/arm/xscale
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/arch/arm/xscale')
-rw-r--r--sys/arch/arm/xscale/pxa2x0_lcd.c10
1 files changed, 6 insertions, 4 deletions
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