Module Name: src
Committed By: macallan
Date: Tue May 4 21:17:10 UTC 2010
Modified Files:
src/sys/dev/videomode: files.videomode videomode.h
Added Files:
src/sys/dev/videomode: pickmode.c
Log Message:
add a bunch of small utility functions to pick video modes based on things
like dot clock, resolution etc.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/videomode/files.videomode
cvs rdiff -u -r0 -r1.1 src/sys/dev/videomode/pickmode.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/videomode/videomode.h
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/videomode/files.videomode
diff -u src/sys/dev/videomode/files.videomode:1.3 src/sys/dev/videomode/files.videomode:1.4
--- src/sys/dev/videomode/files.videomode:1.3 Thu May 11 01:49:53 2006
+++ src/sys/dev/videomode/files.videomode Tue May 4 21:17:10 2010
@@ -1,4 +1,4 @@
-# $NetBSD: files.videomode,v 1.3 2006/05/11 01:49:53 gdamore Exp $
+# $NetBSD: files.videomode,v 1.4 2010/05/04 21:17:10 macallan Exp $
define videomode
define edid
@@ -7,5 +7,7 @@
file dev/videomode/videomode.c videomode | edid
file dev/videomode/edid.c edid
+file dev/videomode/pickmode.c videomode
+defflag opt_videomode.h PICKMODE_DEBUG
file dev/videomode/vesagtf.c vesagtf | edid
Index: src/sys/dev/videomode/videomode.h
diff -u src/sys/dev/videomode/videomode.h:1.1 src/sys/dev/videomode/videomode.h:1.2
--- src/sys/dev/videomode/videomode.h:1.1 Sat Mar 4 02:34:27 2006
+++ src/sys/dev/videomode/videomode.h Tue May 4 21:17:10 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: videomode.h,v 1.1 2006/03/04 02:34:27 gdamore Exp $ */
+/* $NetBSD: videomode.h,v 1.2 2010/05/04 21:17:10 macallan Exp $ */
/*
* Copyright (c) 2001, 2002 Bang Jun-Young
@@ -66,4 +66,7 @@
extern const struct videomode videomode_list[];
extern const int videomode_count;
+const struct videomode *pick_mode_by_dotclock(int, int, int);
+const struct videomode *pick_mode_by_ref(int, int, int);
+
#endif /* _DEV_VIDEOMODE_H */
Added files:
Index: src/sys/dev/videomode/pickmode.c
diff -u /dev/null src/sys/dev/videomode/pickmode.c:1.1
--- /dev/null Tue May 4 21:17:10 2010
+++ src/sys/dev/videomode/pickmode.c Tue May 4 21:17:10 2010
@@ -0,0 +1,101 @@
+/* $NetBSD: pickmode.c,v 1.1 2010/05/04 21:17:10 macallan Exp $ */
+
+/*-
+ * Copyright (c) 2006 The NetBSD Foundation
+ * All rights reserved.
+ *
+ * this code was contributed to The NetBSD Foundation by Michael Lorenz
+ *
+ * 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 ``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 NETBSD FOUNDATION 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.
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: pickmode.c,v 1.1 2010/05/04 21:17:10 macallan Exp $");
+
+#include <sys/param.h>
+#include <dev/videomode/videomode.h>
+#include "opt_videomode.h"
+
+#ifdef PICKMODE_DEBUG
+#define DPRINTF printf
+#else
+#define DPRINTF while (0) printf
+#endif
+
+const struct videomode *
+pick_mode_by_dotclock(int width, int height, int dotclock)
+{
+ const struct videomode *this, *best = NULL;
+ int i;
+
+ DPRINTF("%s: looking for %d x %d at up to %d kHz\n", __func__, width,
+ height, dotclock);
+ for (i = 0; i < videomode_count; i++) {
+
+ this = &videomode_list[i];
+ if ((this->hdisplay != width) || (this->vdisplay != height) ||
+ (this->dot_clock > dotclock))
+ continue;
+ if (best != NULL) {
+
+ if (this->dot_clock > best->dot_clock)
+ best = this;
+ } else
+ best = this;
+ }
+ if (best!= NULL)
+ DPRINTF("found %s\n", best->name);
+
+ return best;
+}
+
+const struct videomode *
+pick_mode_by_ref(int width, int height, int refresh)
+{
+ const struct videomode *this, *best = NULL;
+ int mref, closest = 1000, i, diff;
+
+ DPRINTF("%s: looking for %d x %d at up to %d Hz\n", __func__, width,
+ height, refresh);
+ for (i = 0; i < videomode_count; i++) {
+
+ this = &videomode_list[i];
+ mref = this->dot_clock * 1000 / (this->htotal * this->vtotal);
+ diff = abs(mref - refresh);
+ if ((this->hdisplay != width) || (this->vdisplay != height) ||
+ (diff > closest))
+ continue;
+ if (best != NULL) {
+
+ if (diff < closest) {
+
+ best = this;
+ closest = diff;
+ }
+ } else
+ best = this;
+ }
+ if (best!= NULL)
+ DPRINTF("found %s\n", best->name);
+
+ return best;
+}
