[src/trunk]: src/sys/dev/wscons dumping ground for generic driver convenience...

[macallan <macallan%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/be8ef3b4e3b8
branches:  trunk
changeset: 766633:be8ef3b4e3b8
user:      macallan <macallan%NetBSD.org@localhost>
date:      Wed Jun 29 03:09:37 2011 +0000

description:
dumping ground for generic driver convenience functions
So far it contains only a generic WSDISPLAYIO_GET_EDID implementation that
relies on EDID data being passed to drivers as a device property.

diffstat:

 sys/dev/wscons/files.wscons     |   3 +-
 sys/dev/wscons/wsdisplay_util.c |  59 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+), 1 deletions(-)

diffs (80 lines):

diff -r 6b33d6cd6856 -r be8ef3b4e3b8 sys/dev/wscons/files.wscons
--- a/sys/dev/wscons/files.wscons       Wed Jun 29 03:06:16 2011 +0000
+++ b/sys/dev/wscons/files.wscons       Wed Jun 29 03:09:37 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.wscons,v 1.44 2011/05/25 06:13:30 macallan Exp $
+# $NetBSD: files.wscons,v 1.45 2011/06/29 03:09:37 macallan Exp $
 
 #
 # "Workstation Console" glue; attaches frame buffer to emulator & keyboard,
@@ -46,6 +46,7 @@
 
 file   dev/wscons/wsdisplay.c          wsdisplay               needs-flag
 file   dev/wscons/wsdisplay_compat_usl.c wsdisplay & wsdisplay_compat_usl
+file   dev/wscons/wsdisplay_util.c     wsdisplay
 file   dev/wscons/wsemulconf.c         wsdisplay
 file   dev/wscons/wsemul_dumb.c        wsdisplay & !wsemul_no_dumb
 file   dev/wscons/wsemul_sun.c         wsdisplay & wsemul_sun
diff -r 6b33d6cd6856 -r be8ef3b4e3b8 sys/dev/wscons/wsdisplay_util.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/dev/wscons/wsdisplay_util.c   Wed Jun 29 03:09:37 2011 +0000
@@ -0,0 +1,59 @@
+/*     $NetBSD: wsdisplay_util.c,v 1.1 2011/06/29 03:09:37 macallan Exp $ */
+
+/*-
+ * Copyright (c) 2009 Michael Lorenz
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* some utility functions for use with wsdisplay */
+#include <sys/param.h>
+#include <sys/stdint.h>
+#include <sys/systm.h>
+#include <sys/buf.h>
+#include <sys/device.h>
+#include <dev/cons.h>
+
+#include <dev/wscons/wsdisplayvar.h>
+#include <dev/wscons/wsconsio.h>
+
+int
+wsdisplayio_get_edid(device_t dev, struct wsdisplayio_edid_info *d)
+{
+       prop_data_t edid_data;
+       int edid_size;
+
+       edid_data = prop_dictionary_get(device_properties(dev), "EDID");
+       if (edid_data != NULL) {
+               edid_size = prop_data_size(edid_data);
+               /* less than 128 bytes is bogus */
+               if (edid_size < 128)
+                       return ENODEV;
+               d->data_size = edid_size;
+               if (d->buffer_size < edid_size)
+                       return EAGAIN;
+               return copyout(prop_data_data_nocopy(edid_data),
+                              d->edid_data, edid_size);
+       }
+       return ENODEV;
+}