Wed Jul 24 02:58:09 2013 UTC ()

Avoid shadowing global edid_vendor in drm_edid.c.


(riastradh)

diff -r1.1.1.1.2.6 -r1.1.1.1.2.7 src/sys/external/bsd/drm2/dist/drm/drm_edid.c

--- src/sys/external/bsd/drm2/dist/drm/drm_edid.c 2013/07/24 02:57:54	1.1.1.1.2.6
+++ src/sys/external/bsd/drm2/dist/drm/drm_edid.c 2013/07/24 02:58:09	1.1.1.1.2.7

 @@ -443,34 +443,45 @@ EXPORT_SYMBOL(drm_get_edid);
 #endif	/* !defined(__NetBSD__) */
 /*** EDID parsing ***/
 /**
  * edid_vendor - match a string against EDID's obfuscated vendor field
  * @edid: EDID to match
  * @vendor: vendor string
+ *
  * Returns true if @vendor is in @edid, false otherwise
  */
 static bool edid_vendor(struct edid *edid, char *vendor)
+{
 #ifdef __NetBSD__		/* XXX Avoid shadowing global definition.  */
 	char edidv[3];
 	edidv[0] = ((edid->mfg_id[0] & 0x7c) >> 2) + '@';
 	edidv[1] = (((edid->mfg_id[0] & 0x3) << 3) |
 			  ((edid->mfg_id[1] & 0xe0) >> 5)) + '@';
 	edidv[2] = (edid->mfg_id[1] & 0x1f) + '@';
 	return !strncmp(edidv, vendor, 3);
 #else
 	char edid_vendor[3];
 	edid_vendor[0] = ((edid->mfg_id[0] & 0x7c) >> 2) + '@';
 	edid_vendor[1] = (((edid->mfg_id[0] & 0x3) << 3) |
 			  ((edid->mfg_id[1] & 0xe0) >> 5)) + '@';
 	edid_vendor[2] = (edid->mfg_id[1] & 0x1f) + '@';
 	return !strncmp(edid_vendor, vendor, 3);
 #endif
+}
 /**
  * edid_get_quirks - return quirk flags for a given EDID
  * @edid: EDID to process
+ *
  * This tells subsequent routines what fixes they need to apply.
  */
 static u32 edid_get_quirks(struct edid *edid)
+{
 	struct edid_quirk *quirk;
 	int i;