summaryrefslogtreecommitdiff
path: root/hw/xfree86/ddc/print_edid.c
diff options
context:
space:
mode:
authorJoel Bosveld <joel.bosveld@gmail.com>2009-09-08 23:06:00 +0800
committerJoel Bosveld <joel.bosveld@gmail.com>2009-09-08 23:55:13 +0800
commit1ba17340a98a34b40f78442963aa4132e6cfae5c (patch)
treed11d814844e4ad037d146133250b73f28cdb3e31 /hw/xfree86/ddc/print_edid.c
parent5e38708c3466129c3e5af40a915c044bb26e083f (diff)
parent1bdc9ec617d357b076c9e69296018bc212d91c7d (diff)
Merge branch 'upstream' (one day I will rebase rather than merge)HEADmaster
Conflicts: test/Makefile.am
Diffstat (limited to 'hw/xfree86/ddc/print_edid.c')
-rw-r--r--hw/xfree86/ddc/print_edid.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/hw/xfree86/ddc/print_edid.c b/hw/xfree86/ddc/print_edid.c
index c2723da68..ff0b39cc1 100644
--- a/hw/xfree86/ddc/print_edid.c
+++ b/hw/xfree86/ddc/print_edid.c
@@ -231,7 +231,7 @@ print_established_timings(int scrnIndex, struct established_timings *t)
unsigned char c;
if (t->t1 || t->t2 || t->t_manu)
- xf86DrvMsg(scrnIndex,X_INFO,"Supported VESA Video Modes:\n");
+ xf86DrvMsg(scrnIndex,X_INFO,"Supported established timings:\n");
c=t->t1;
if (c&0x80) xf86DrvMsg(scrnIndex,X_INFO,"720x400@70Hz\n");
if (c&0x40) xf86DrvMsg(scrnIndex,X_INFO,"720x400@88Hz\n");
@@ -251,7 +251,7 @@ print_established_timings(int scrnIndex, struct established_timings *t)
if (c&0x02) xf86DrvMsg(scrnIndex,X_INFO,"1024x768@75Hz\n");
if (c&0x01) xf86DrvMsg(scrnIndex,X_INFO,"1280x1024@75Hz\n");
c=t->t_manu;
- if (c&0x80) xf86DrvMsg(scrnIndex,X_INFO,"1152x870@75Hz\n");
+ if (c&0x80) xf86DrvMsg(scrnIndex,X_INFO,"1152x864@75Hz\n");
xf86DrvMsg(scrnIndex,X_INFO,"Manufacturer's mask: %X\n",c&0x7F);
}
@@ -263,7 +263,7 @@ print_std_timings(int scrnIndex, struct std_timings *t)
for (i=0;i<STD_TIMINGS;i++) {
if (t[i].hsize > 256) { /* sanity check */
if (!done) {
- xf86DrvMsg(scrnIndex,X_INFO,"Supported Future Video Modes:\n");
+ xf86DrvMsg(scrnIndex,X_INFO,"Supported standard timings:\n");
done = 1;
}
xf86DrvMsg(scrnIndex,X_INFO,
@@ -296,7 +296,7 @@ print_detailed_timings(int scrnIndex, struct detailed_timings *t)
{
if (t->clock > 15000000) { /* sanity check */
- xf86DrvMsg(scrnIndex,X_INFO,"Supported additional Video Mode:\n");
+ xf86DrvMsg(scrnIndex,X_INFO,"Supported detailed timing:\n");
xf86DrvMsg(scrnIndex,X_INFO,"clock: %.1f MHz ",t->clock/1000000.0);
xf86ErrorF("Image Size: %i x %i mm\n",t->h_size,t->v_size);
xf86DrvMsg(scrnIndex,X_INFO,
@@ -450,7 +450,7 @@ print_detailed_monitor_section(int scrnIndex,
break;
}
if (m[i].type >= DS_VENDOR && m[i].type <= DS_VENDOR_MAX) {
- xf86DrvMsg(scrnIndex, X_WARNING,
+ xf86DrvMsg(scrnIndex, X_INFO,
"Unknown vendor-specific block %hx\n",
m[i].type - DS_VENDOR);
}