diff options
| author | gdamore <gdamore@NetBSD.org> | 2006-05-13 00:39:19 +0000 |
|---|---|---|
| committer | gdamore <gdamore@NetBSD.org> | 2006-05-13 00:39:19 +0000 |
| commit | d92bd53f93f0c6df62eabcafdf77884a910fb98e (patch) | |
| tree | 77b7bb487eb87172366dafef7421eb3d6aeacd6d /sys/dev | |
| parent | 285f68c11469cf8c0f642320fa6f6ec7f520b3e4 (diff) | |
Correct two problems with established timings. First, the wrong hex value
was being read due to using the same byte twice.
Second, the ordered list of names was *backwards* in the _edid_modes list.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/videomode/edid.c | 34 | ||||
| -rw-r--r-- | sys/dev/videomode/edidreg.h | 4 |
2 files changed, 19 insertions, 19 deletions
diff --git a/sys/dev/videomode/edid.c b/sys/dev/videomode/edid.c index a73b4392e01..c51fd1637bd 100644 --- a/sys/dev/videomode/edid.c +++ b/sys/dev/videomode/edid.c @@ -1,4 +1,4 @@ -/* $NetBSD: edid.c,v 1.2 2006/05/11 19:05:41 gdamore Exp $ */ +/* $NetBSD: edid.c,v 1.3 2006/05/13 00:39:19 gdamore Exp $ */ /*- * Copyright (c) 2006 Itronix Inc. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: edid.c,v 1.2 2006/05/11 19:05:41 gdamore Exp $"); +__KERNEL_RCSID(0, "$NetBSD: edid.c,v 1.3 2006/05/13 00:39:19 gdamore Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -49,22 +49,22 @@ __KERNEL_RCSID(0, "$NetBSD: edid.c,v 1.2 2006/05/11 19:05:41 gdamore Exp $"); #define DIVIDE(x,y) (((x) + ((y) / 2)) / (y)) static const char *_edid_modes[] = { - "720x400x70", /* hmm... videmode.c doesn't have this one */ - "720x400x85", /* should this really be "720x400x88" ? */ - "640x480x60", - "640x480x67", - "640x480x72", - "640x480x75", - "800x600x56", - "800x600x60", - "800x600x72", - "800x600x75", - "832x768x74", /* rounding error, 74.55 Hz aka "832x624x75" */ - "1024x768x87i", - "1024x768x60", - "1024x768x70", - "1024x768x75", "1280x1024x75", + "1024x768x75", + "1024x768x70", + "1024x768x60", + "1024x768x87i", + "832x768x74", /* rounding error, 74.55 Hz aka "832x624x75" */ + "800x600x75", + "800x600x72", + "800x600x60", + "800x600x56", + "640x480x75", + "640x480x72", + "640x480x67", + "640x480x60", + "720x400x85", /* should this really be "720x400x88" ? */ + "720x400x70", /* hmm... videmode.c doesn't have this one */ }; #ifdef EDIDVERBOSE diff --git a/sys/dev/videomode/edidreg.h b/sys/dev/videomode/edidreg.h index 9110c360c5d..473c728e812 100644 --- a/sys/dev/videomode/edidreg.h +++ b/sys/dev/videomode/edidreg.h @@ -1,4 +1,4 @@ -/* $NetBSD: edidreg.h,v 1.1 2006/05/11 01:49:53 gdamore Exp $ */ +/* $NetBSD: edidreg.h,v 1.2 2006/05/13 00:39:19 gdamore Exp $ */ /*- * Copyright (c) 2006 Itronix Inc. @@ -126,7 +126,7 @@ #define EDID_CHROMA_WHITEY(ptr) (_CHROMA(ptr, 26, 0, 34)) /* relative to edid block */ -#define EDID_EST_TIMING(ptr) (((ptr)[35] << 8) | (ptr)[35]) +#define EDID_EST_TIMING(ptr) (((ptr)[35] << 8) | (ptr)[36]) #define EDID_EST_TIMING_720_400_70 0x8000 /* 720x400 @ 70Hz */ #define EDID_EST_TIMING_720_400_88 0x4000 /* 720x400 @ 88Hz */ #define EDID_EST_TIMING_640_480_60 0x2000 /* 640x480 @ 60Hz */ |
