CVS commit: src/sys/dev

[Michael Lorenz]

Module Name:    src
Committed By:   macallan
Date:           Wed Oct  9 17:20:54 UTC 2013

Modified Files:
        src/sys/dev/ic: ct65550.c
        src/sys/dev/wsfb: genfb.c

Log Message:
support WSDISPLAYIO_GET_FBINFO


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/ic/ct65550.c
cvs rdiff -u -r1.50 -r1.51 src/sys/dev/wsfb/genfb.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/dev/ic/ct65550.c
diff -u src/sys/dev/ic/ct65550.c:1.7 src/sys/dev/ic/ct65550.c:1.8
--- src/sys/dev/ic/ct65550.c:1.7	Tue Jul 30 19:24:26 2013
+++ src/sys/dev/ic/ct65550.c	Wed Oct  9 17:20:54 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: ct65550.c,v 1.7 2013/07/30 19:24:26 macallan Exp $	*/
+/*	$NetBSD: ct65550.c,v 1.8 2013/10/09 17:20:54 macallan Exp $	*/
 
 /*
  * Copyright (c) 2006 Michael Lorenz
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ct65550.c,v 1.7 2013/07/30 19:24:26 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ct65550.c,v 1.8 2013/10/09 17:20:54 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -750,6 +750,12 @@ chipsfb_ioctl(void *v, void *vs, u_long 
 		}
 		}
 		return 0;
+	
+	case WSDISPLAYIO_GET_FBINFO: {
+		struct wsdisplayio_fbinfo *fbi = data;
+		return wsdisplayio_get_fbinfo(&ms->scr_ri, fbi);
+	}
+
 	default:
 		if (sc->sc_ioctl != NULL)
 			return sc->sc_ioctl(v, vs, cmd, data, flag, l);

Index: src/sys/dev/wsfb/genfb.c
diff -u src/sys/dev/wsfb/genfb.c:1.50 src/sys/dev/wsfb/genfb.c:1.51
--- src/sys/dev/wsfb/genfb.c:1.50	Thu Jan 10 22:06:59 2013
+++ src/sys/dev/wsfb/genfb.c	Wed Oct  9 17:20:54 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: genfb.c,v 1.50 2013/01/10 22:06:59 jmcneill Exp $ */
+/*	$NetBSD: genfb.c,v 1.51 2013/10/09 17:20:54 macallan Exp $ */
 
 /*-
  * Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.50 2013/01/10 22:06:59 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.51 2013/10/09 17:20:54 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -394,6 +394,7 @@ genfb_ioctl(void *v, void *vs, u_long cm
 				}
 			}
 			return 0;
+		
 		case WSDISPLAYIO_SSPLASH:
 #if defined(SPLASHSCREEN)
 			if(*(int *)data == 1) {
@@ -452,10 +453,17 @@ genfb_ioctl(void *v, void *vs, u_long cm
 				    sc->sc_backlight->gpc_cookie, val);
 			}
 			return EPASSTHROUGH;
+		
 		case WSDISPLAYIO_GET_EDID: {
 			struct wsdisplayio_edid_info *d = data;
 			return wsdisplayio_get_edid(sc->sc_dev, d);
 		}
+	
+		case WSDISPLAYIO_GET_FBINFO: {
+			struct wsdisplayio_fbinfo *fbi = data;
+			return wsdisplayio_get_fbinfo(&ms->scr_ri, fbi);
+		}
+		
 		default:
 			if (sc->sc_ops.genfb_ioctl)
 				return sc->sc_ops.genfb_ioctl(sc, vs, cmd,