Module Name: src
Committed By: riastradh
Date: Wed Jul 24 02:58:09 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/dist/drm [riastradh-drm2]: drm_edid.c
Log Message:
Avoid shadowing global edid_vendor in drm_edid.c.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.6 -r1.1.1.1.2.7 \
src/sys/external/bsd/drm2/dist/drm/drm_edid.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/drm_edid.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_edid.c:1.1.1.1.2.6 src/sys/external/bsd/drm2/dist/drm/drm_edid.c:1.1.1.1.2.7
--- src/sys/external/bsd/drm2/dist/drm/drm_edid.c:1.1.1.1.2.6 Wed Jul 24 02:57:54 2013
+++ src/sys/external/bsd/drm2/dist/drm/drm_edid.c Wed Jul 24 02:58:09 2013
@@ -453,6 +453,16 @@ EXPORT_SYMBOL(drm_get_edid);
*/
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) + '@';
@@ -461,6 +471,7 @@ static bool edid_vendor(struct edid *edi
edid_vendor[2] = (edid->mfg_id[1] & 0x1f) + '@';
return !strncmp(edid_vendor, vendor, 3);
+#endif
}
/**
