 @@ -1,14 +1,14 @@
-/* $NetBSD: edid.c,v 1.12 2013/02/08 16:35:10 skrll Exp $ */
+/* $NetBSD: edid.c,v 1.13 2014/11/17 00:46:04 jmcneill Exp $ */
 /*-
  * Copyright (c) 2006 Itronix Inc.
  * All rights reserved.
+ *
  * Written by Garrett D'Amore for Itronix Inc.
+ *
  * 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
 @@ -22,27 +22,27 @@
  * 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 ITRONIX INC. 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: edid.c,v 1.12 2013/02/08 16:35:10 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: edid.c,v 1.13 2014/11/17 00:46:04 jmcneill Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <dev/videomode/videomode.h>
 #include <dev/videomode/ediddevs.h>
 #include <dev/videomode/edidreg.h>
 #include <dev/videomode/edidvar.h>
 #include <dev/videomode/vesagtf.h>
 #define	EDIDVERBOSE	1
 @@ -276,26 +276,28 @@ edid_print(struct edid_info *edid)
 		printf(" %s%sH %s%sV)\n",
 		    edid->edid_modes[i].flags & VID_PHSYNC ? "+" : "",
 		    edid->edid_modes[i].flags & VID_NHSYNC ? "-" : "",
 		    edid->edid_modes[i].flags & VID_PVSYNC ? "+" : "",
 		    edid->edid_modes[i].flags & VID_NVSYNC ? "-" : "");
+	}
 	if (edid->edid_preferred_mode)
 		printf("Preferred mode: %dx%d @ %dHz\n",
 		    edid->edid_preferred_mode->hdisplay,
 		    edid->edid_preferred_mode->vdisplay,
 		    DIVIDE(DIVIDE(edid->edid_preferred_mode->dot_clock * 1000,
 		    edid->edid_preferred_mode->htotal),
 		    edid->edid_preferred_mode->vtotal));
 	printf("Number of extension blocks: %d\n", edid->edid_ext_block_count);
+}
 static const struct videomode *
 edid_mode_lookup_list(const char *name)
+{
 	int	i;
 	for (i = 0; i < videomode_count; i++)
 		if (strcmp(name, videomode_list[i].name) == 0)
 			return &videomode_list[i];
 	return NULL;
+}
 @@ -559,26 +561,28 @@ edid_parse(uint8_t *data, struct edid_in
 	edid->edid_gamma = EDID_GAMMA(data);
 	edid->edid_features = EDID_FEATURES(data);
 	edid->edid_chroma.ec_redx = EDID_CHROMA_REDX(data);
 	edid->edid_chroma.ec_redy = EDID_CHROMA_REDX(data);
 	edid->edid_chroma.ec_greenx = EDID_CHROMA_GREENX(data);
 	edid->edid_chroma.ec_greeny = EDID_CHROMA_GREENY(data);
 	edid->edid_chroma.ec_bluex = EDID_CHROMA_BLUEX(data);
 	edid->edid_chroma.ec_bluey = EDID_CHROMA_BLUEY(data);
 	edid->edid_chroma.ec_whitex = EDID_CHROMA_WHITEX(data);
 	edid->edid_chroma.ec_whitey = EDID_CHROMA_WHITEY(data);
 	edid->edid_ext_block_count = EDID_EXT_BLOCK_COUNT(data);
 	/* lookup established modes */
 	edid->edid_nmodes = 0;
 	edid->edid_preferred_mode = NULL;
 	estmodes = EDID_EST_TIMING(data);
 	/* Iterate in esztablished timing order */
 	for (i = 15; i >= 0; i--) {
 		if (estmodes & (1 << i)) {
 			vmp = edid_mode_lookup_list(_edid_modes[i]);
 			if (vmp != NULL) {
 				edid->edid_modes[edid->edid_nmodes] = *vmp;
 				edid->edid_nmodes++;
+			}
 #ifdef DIAGNOSTIC

 @@ -1,14 +1,14 @@
-/*	$NetBSD: edidreg.h,v 1.3 2011/03/30 18:49:56 jdc Exp $	*/
+/*	$NetBSD: edidreg.h,v 1.4 2014/11/17 00:46:04 jmcneill Exp $	*/
 /*-
  * Copyright (c) 2006 Itronix Inc.
  * All rights reserved.
+ *
  * Written by Garrett D'Amore for Itronix Inc.
+ *
  * 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
 @@ -240,14 +240,16 @@
 #define	EDID_DESC_COLOR_WHITEX(ptr)
 #define	EDID_DESC_COLOR_WHITE_INDEX_1(ptr)	((ptr)[5])
 #define	EDID_DESC_COLOR_WHITEX_1(ptr)		_CHROMA(ptr, 6, 2, 7)
 #define	EDID_DESC_COLOR_WHITEY_1(ptr)		_CHROMA(ptr, 6, 0, 8)
 #define	EDID_DESC_COLOR_GAMMA_1(ptr)		_GAMMA(ptr[9])
 #define	EDID_DESC_COLOR_WHITE_INDEX_2(ptr)	((ptr)[10])
 #define	EDID_DESC_COLOR_WHITEX_2(ptr)		_CHROMA(ptr, 11, 2, 12)
 #define	EDID_DESC_COLOR_WHITEY_2(ptr)		_CHROMA(ptr, 11, 0, 13)
 #define	EDID_DESC_COLOR_GAMMA_2(ptr)		_GAMMA(ptr[14])
 #define	EDID_DESC_STD_TIMING_START		5
 #define	EDID_DESC_STD_TIMING_COUNT		6
 #define	EDID_EXT_BLOCK_COUNT(ptr)		((ptr)[126])
 #endif /* _DEV_VIDEOMODE_EDIDREG_H */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: edidvar.h,v 1.2 2006/05/11 19:05:41 gdamore Exp $	*/
+/*	$NetBSD: edidvar.h,v 1.3 2014/11/17 00:46:04 jmcneill Exp $	*/
 /*-
  * Copyright (c) 2006 Itronix Inc.
  * All rights reserved.
+ *
  * Written by Garrett D'Amore for Itronix Inc.
+ *
  * 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
 @@ -65,26 +65,27 @@ struct edid_info {
 	char		edid_productname[16];
 	char		edid_comment[16];
 	char		edid_serial[16];
 	uint16_t	edid_product;
 	uint8_t		edid_version;
 	uint8_t		edid_revision;
 	int		edid_year;
 	int		edid_week;
 	uint8_t		edid_video_input;	/* see edidregs.h */
 	uint8_t		edid_max_hsize;		/* in cm */
 	uint8_t		edid_max_vsize;		/* in cm */
 	uint8_t		edid_gamma;
 	uint8_t		edid_features;
 	uint8_t		edid_ext_block_count;
 	int			edid_have_range;
 	struct edid_range	edid_range;
 	struct edid_chroma	edid_chroma;
 	/* parsed modes */
 	struct videomode	*edid_preferred_mode;
 	int			edid_nmodes;
 	struct videomode	edid_modes[64];
 };
 int edid_is_valid(uint8_t *);