lib/intel_chipset: intel_ prefix for pch global

Just a bit better namespacing.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Daniel Vetter
2014-03-22 14:59:58 +01:00
parent aed95c390a
commit 266b26b3ed
4 changed files with 16 additions and 16 deletions
+2 -2
View File
@@ -367,7 +367,7 @@ static void dump_port_info(int hdmi_port_index)
if (gen == 4)
transcoder = (val & HDMI_PORT_TRANSCODER_GEN4) >> 30;
else if (pch >= PCH_CPT)
else if (intel_pch >= PCH_CPT)
transcoder = (val & HDMI_PORT_TRANSCODER_CPT) >> 29;
else
transcoder = (val & HDMI_PORT_TRANSCODER_IBX) >> 30;
@@ -1187,7 +1187,7 @@ int main(int argc, char *argv[])
transcoder = TRANSC_A;
else if (!strcmp(optarg, "B"))
transcoder = TRANSC_B;
else if (pch >= PCH_CPT && !strcmp(optarg, "C")) {
else if (intel_pch >= PCH_CPT && !strcmp(optarg, "C")) {
transcoder = TRANSC_C;
} else {
printf("Invalid transcoder.\n");
+5 -5
View File
@@ -2931,18 +2931,18 @@ int main(int argc, char** argv)
intel_map_file(file);
if (devid) {
if (IS_GEN5(devid))
pch = PCH_IBX;
intel_pch = PCH_IBX;
else if (IS_GEN6(devid) || IS_IVYBRIDGE(devid))
pch = PCH_CPT;
intel_pch = PCH_CPT;
else if (IS_HASWELL(devid))
pch = PCH_LPT;
intel_pch = PCH_LPT;
else
pch = PCH_NONE;
intel_pch = PCH_NONE;
} else {
printf("Dumping from file without -d argument. "
"Assuming Ironlake machine.\n");
devid = 0x0042;
pch = PCH_IBX;
intel_pch = PCH_IBX;
}
} else {
pci_dev = intel_get_pci_device();