Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys support WSDISPLAYIO_GET_FBINFO
details: https://anonhg.NetBSD.org/src/rev/97dcac4fc1df
branches: trunk
changeset: 790437:97dcac4fc1df
user: macallan <macallan%NetBSD.org@localhost>
date: Wed Oct 09 17:18:23 2013 +0000
description:
support WSDISPLAYIO_GET_FBINFO
diffstat:
sys/arch/sparc64/dev/ffb.c | 12 ++++++++++--
sys/dev/ic/ct65550.c | 10 ++++++++--
sys/dev/pci/gffb.c | 9 +++++++--
sys/dev/pci/machfb.c | 9 +++++++--
sys/dev/pci/pm2fb.c | 9 +++++++--
sys/dev/pci/r128fb.c | 10 ++++++++--
sys/dev/pci/radeonfb.c | 11 +++++++++--
sys/dev/pci/voodoofb.c | 10 ++++++++--
sys/dev/wsfb/genfb.c | 12 ++++++++++--
9 files changed, 74 insertions(+), 18 deletions(-)
diffs (truncated from 316 to 300 lines):
diff -r a6fe634b83fc -r 97dcac4fc1df sys/arch/sparc64/dev/ffb.c
--- a/sys/arch/sparc64/dev/ffb.c Wed Oct 09 12:03:29 2013 +0000
+++ b/sys/arch/sparc64/dev/ffb.c Wed Oct 09 17:18:23 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ffb.c,v 1.54 2013/09/12 19:57:43 martin Exp $ */
+/* $NetBSD: ffb.c,v 1.55 2013/10/09 17:21:39 macallan Exp $ */
/* $OpenBSD: creator.c,v 1.20 2002/07/30 19:48:15 jason Exp $ */
/*
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffb.c,v 1.54 2013/09/12 19:57:43 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffb.c,v 1.55 2013/10/09 17:21:39 macallan Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -494,6 +494,7 @@
case WSDISPLAYIO_GVIDEO:
return(ffb_blank(sc, cmd, (u_int *)data));
break;
+
case WSDISPLAYIO_GCURPOS:
case WSDISPLAYIO_SCURPOS:
case WSDISPLAYIO_GCURMAX:
@@ -501,10 +502,17 @@
case WSDISPLAYIO_SCURSOR:
return EIO; /* not supported yet */
break;
+
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:
return EPASSTHROUGH;
}
diff -r a6fe634b83fc -r 97dcac4fc1df sys/dev/ic/ct65550.c
--- a/sys/dev/ic/ct65550.c Wed Oct 09 12:03:29 2013 +0000
+++ b/sys/dev/ic/ct65550.c Wed Oct 09 17:18:23 2013 +0000
@@ -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 @@
}
}
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);
diff -r a6fe634b83fc -r 97dcac4fc1df sys/dev/pci/gffb.c
--- a/sys/dev/pci/gffb.c Wed Oct 09 12:03:29 2013 +0000
+++ b/sys/dev/pci/gffb.c Wed Oct 09 17:18:23 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: gffb.c,v 1.4 2013/10/09 12:03:29 macallan Exp $ */
+/* $NetBSD: gffb.c,v 1.5 2013/10/09 17:18:23 macallan Exp $ */
/*
* Copyright (c) 2007, 2012 Michael Lorenz
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gffb.c,v 1.4 2013/10/09 12:03:29 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gffb.c,v 1.5 2013/10/09 17:18:23 macallan Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -434,6 +434,11 @@
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);
+ }
}
return EPASSTHROUGH;
}
diff -r a6fe634b83fc -r 97dcac4fc1df sys/dev/pci/machfb.c
--- a/sys/dev/pci/machfb.c Wed Oct 09 12:03:29 2013 +0000
+++ b/sys/dev/pci/machfb.c Wed Oct 09 17:18:23 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machfb.c,v 1.88 2013/07/30 19:21:50 macallan Exp $ */
+/* $NetBSD: machfb.c,v 1.89 2013/10/09 17:18:23 macallan Exp $ */
/*
* Copyright (c) 2002 Bang Jun-Young
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
__KERNEL_RCSID(0,
- "$NetBSD: machfb.c,v 1.88 2013/07/30 19:21:50 macallan Exp $");
+ "$NetBSD: machfb.c,v 1.89 2013/10/09 17:18:23 macallan Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1913,6 +1913,11 @@
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);
+ }
}
return EPASSTHROUGH;
}
diff -r a6fe634b83fc -r 97dcac4fc1df sys/dev/pci/pm2fb.c
--- a/sys/dev/pci/pm2fb.c Wed Oct 09 12:03:29 2013 +0000
+++ b/sys/dev/pci/pm2fb.c Wed Oct 09 17:18:23 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pm2fb.c,v 1.24 2013/09/15 09:34:07 martin Exp $ */
+/* $NetBSD: pm2fb.c,v 1.25 2013/10/09 17:18:23 macallan Exp $ */
/*
* Copyright (c) 2009, 2012 Michael Lorenz
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pm2fb.c,v 1.24 2013/09/15 09:34:07 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pm2fb.c,v 1.25 2013/10/09 17:18:23 macallan Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -526,6 +526,11 @@
return EAGAIN;
return copyout(sc->sc_edid_data, d->edid_data, 128);
}
+
+ case WSDISPLAYIO_GET_FBINFO: {
+ struct wsdisplayio_fbinfo *fbi = data;
+ return wsdisplayio_get_fbinfo(&ms->scr_ri, fbi);
+ }
}
return EPASSTHROUGH;
}
diff -r a6fe634b83fc -r 97dcac4fc1df sys/dev/pci/r128fb.c
--- a/sys/dev/pci/r128fb.c Wed Oct 09 12:03:29 2013 +0000
+++ b/sys/dev/pci/r128fb.c Wed Oct 09 17:18:23 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: r128fb.c,v 1.37 2013/07/30 19:21:50 macallan Exp $ */
+/* $NetBSD: r128fb.c,v 1.38 2013/10/09 17:18:23 macallan Exp $ */
/*
* Copyright (c) 2007, 2012 Michael Lorenz
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: r128fb.c,v 1.37 2013/07/30 19:21:50 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: r128fb.c,v 1.38 2013/10/09 17:18:23 macallan Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -453,10 +453,16 @@
return 0;
}
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);
+ }
}
return EPASSTHROUGH;
}
diff -r a6fe634b83fc -r 97dcac4fc1df sys/dev/pci/radeonfb.c
--- a/sys/dev/pci/radeonfb.c Wed Oct 09 12:03:29 2013 +0000
+++ b/sys/dev/pci/radeonfb.c Wed Oct 09 17:18:23 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: radeonfb.c,v 1.78 2013/09/15 09:37:14 martin Exp $ */
+/* $NetBSD: radeonfb.c,v 1.79 2013/10/09 17:18:23 macallan Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.78 2013/09/15 09:37:14 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.79 2013/10/09 17:18:23 macallan Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1062,8 +1062,10 @@
struct radeonfb_display *dp;
struct radeonfb_softc *sc;
struct wsdisplay_param *param;
+ struct vcons_screen *ms;
vd = (struct vcons_data *)v;
+ ms = vd->active;
dp = (struct radeonfb_display *)vd->cookie;
sc = dp->rd_softc;
@@ -1207,6 +1209,11 @@
return wsdisplayio_get_edid(sc->sc_dev, ei);
}
+ case WSDISPLAYIO_GET_FBINFO: {
+ struct wsdisplayio_fbinfo *fbi = d;
+ return wsdisplayio_get_fbinfo(&ms->scr_ri, fbi);
+ }
+
default:
return EPASSTHROUGH;
}
diff -r a6fe634b83fc -r 97dcac4fc1df sys/dev/pci/voodoofb.c
--- a/sys/dev/pci/voodoofb.c Wed Oct 09 12:03:29 2013 +0000
+++ b/sys/dev/pci/voodoofb.c Wed Oct 09 17:18:23 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: voodoofb.c,v 1.45 2013/07/30 19:21:50 macallan Exp $ */
+/* $NetBSD: voodoofb.c,v 1.46 2013/10/09 17:18:23 macallan Exp $ */
/*
* Copyright (c) 2005, 2006, 2012 Michael Lorenz
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: voodoofb.c,v 1.45 2013/07/30 19:21:50 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: voodoofb.c,v 1.46 2013/10/09 17:18:23 macallan Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1196,6 +1196,12 @@
}
}
return 0;
+ /* XXX WSDISPLAYIO_GET_EDID */
+
+ case WSDISPLAYIO_GET_FBINFO: {
+ struct wsdisplayio_fbinfo *fbi = data;
+ return wsdisplayio_get_fbinfo(&ms->scr_ri, fbi);
+ }
}
return EPASSTHROUGH;
}
diff -r a6fe634b83fc -r 97dcac4fc1df sys/dev/wsfb/genfb.c
--- a/sys/dev/wsfb/genfb.c Wed Oct 09 12:03:29 2013 +0000
+++ b/sys/dev/wsfb/genfb.c Wed Oct 09 17:18:23 2013 +0000
@@ -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 @@
}
}
return 0;
+
case WSDISPLAYIO_SSPLASH:
#if defined(SPLASHSCREEN)
if(*(int *)data == 1) {
@@ -452,10 +453,17 @@
sc->sc_backlight->gpc_cookie, val);
Home |
Main Index |
Thread Index |
Old Index