Module Name: src
Committed By: tsutsui
Date: Fri Jan 31 15:43:06 UTC 2014
Modified Files:
src/sys/arch/newsmips/apbus: xafb.c
src/sys/arch/newsmips/dev: fb.c
Log Message:
Add WSDISPLAYIO_LINEBYTES ioctl (for Xorg wsfb driver).
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/newsmips/apbus/xafb.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/newsmips/dev/fb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/newsmips/apbus/xafb.c
diff -u src/sys/arch/newsmips/apbus/xafb.c:1.16 src/sys/arch/newsmips/apbus/xafb.c:1.17
--- src/sys/arch/newsmips/apbus/xafb.c:1.16 Sat May 15 10:01:44 2010
+++ src/sys/arch/newsmips/apbus/xafb.c Fri Jan 31 15:43:06 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: xafb.c,v 1.16 2010/05/15 10:01:44 tsutsui Exp $ */
+/* $NetBSD: xafb.c,v 1.17 2014/01/31 15:43:06 tsutsui Exp $ */
/*-
* Copyright (c) 2000 Tsubai Masanari. All rights reserved.
@@ -29,7 +29,7 @@
/* "xa" frame buffer driver. Currently supports 1280x1024x8 only. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xafb.c,v 1.16 2010/05/15 10:01:44 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xafb.c,v 1.17 2014/01/31 15:43:06 tsutsui Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -268,6 +268,10 @@ xafb_ioctl(void *v, void *vs, u_long cmd
wdf->cmsize = 256;
return 0;
+ case WSDISPLAYIO_LINEBYTES:
+ *(u_int *)data = dc->dc_ri.ri_stride;
+ return 0;
+
case WSDISPLAYIO_GETCMAP:
return xafb_getcmap(sc, (struct wsdisplay_cmap *)data);
Index: src/sys/arch/newsmips/dev/fb.c
diff -u src/sys/arch/newsmips/dev/fb.c:1.25 src/sys/arch/newsmips/dev/fb.c:1.26
--- src/sys/arch/newsmips/dev/fb.c:1.25 Sat May 15 10:01:44 2010
+++ src/sys/arch/newsmips/dev/fb.c Fri Jan 31 15:43:06 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: fb.c,v 1.25 2010/05/15 10:01:44 tsutsui Exp $ */
+/* $NetBSD: fb.c,v 1.26 2014/01/31 15:43:06 tsutsui Exp $ */
/*-
* Copyright (c) 2000 Tsubai Masanari. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fb.c,v 1.25 2010/05/15 10:01:44 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fb.c,v 1.26 2014/01/31 15:43:06 tsutsui Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -255,6 +255,10 @@ fb_ioctl(void *v, void *vs, u_long cmd,
wdf->cmsize = 2;
return 0;
+ case WSDISPLAYIO_LINEBYTES:
+ *(u_int *)data = dc->dc_ri.ri_stride;
+ return 0;
+
case WSDISPLAYIO_SVIDEO:
if (*(int *)data == WSDISPLAYIO_VIDEO_OFF) {
volatile u_short *ctlreg = NWB253_CTLREG;
