frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Un-cut-and-paste the mode rejection message.

This commit is contained in:
Adam Jackson 2006-08-17 17:29:32 -04:00
parent 43e42eef1f
commit ee5e2cbd2b
1 changed files with 22 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
hw/xfree86/common/xf86Mode.c
View File

@ -47,6 +47,22 @@
#include "xf86Priv.h" #include "xf86Priv.h"
#include "xf86DDC.h" #include "xf86DDC.h"
static void
printModeRejectMessage(int index, DisplayModePtr p, int status)
{
char *type;
if (p->type & M_T_BUILTIN)
type = "built-in ";
else if (p->type & M_T_DEFAULT)
type = "default ";
else
type = "";
xf86DrvMsg(index, X_INFO, "Not using %smode \"%s\" (%s)\n", type, p->name,
xf86ModeStatusToString(status));
}
/* /*
* xf86GetNearestClock -- * xf86GetNearestClock --
* Find closest clock to given frequency (in kHz). This assumes the * Find closest clock to given frequency (in kHz). This assumes the
@ -1644,18 +1660,7 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
q->name = xnfstrdup(p->name); q->name = xnfstrdup(p->name);
q->status = MODE_OK; q->status = MODE_OK;
} else { } else {
if (p->type & M_T_BUILTIN) printModeRejectMessage(scrp->scrnIndex, p, status);
xf86DrvMsg(scrp->scrnIndex, X_INFO,
"Not using built-in mode \"%s\" (%s)\n",
p->name, xf86ModeStatusToString(status));
else if (p->type & M_T_DEFAULT)
xf86DrvMsg(scrp->scrnIndex, X_INFO,
"Not using default mode \"%s\" (%s)\n", p->name,
xf86ModeStatusToString(status));
else
xf86DrvMsg(scrp->scrnIndex, X_INFO,
"Not using mode \"%s\" (%s)\n", p->name,
xf86ModeStatusToString(status));
} }
} }
@ -1796,39 +1801,14 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
repeat = FALSE; repeat = FALSE;
lookupNext: lookupNext:
if (repeat && ((status = p->status) != MODE_OK)) { if (repeat && ((status = p->status) != MODE_OK))
if (p->type & M_T_BUILTIN) printModeRejectMessage(scrp->scrnIndex, p, status);
xf86DrvMsg(scrp->scrnIndex, X_INFO,
"Not using built-in mode \"%s\" (%s)\n",
p->name, xf86ModeStatusToString(status));
else if (p->type & M_T_DEFAULT)
xf86DrvMsg(scrp->scrnIndex, X_INFO,
"Not using default mode \"%s\" (%s)\n", p->name,
xf86ModeStatusToString(status));
else
xf86DrvMsg(scrp->scrnIndex, X_INFO,
"Not using mode \"%s\" (%s)\n", p->name,
xf86ModeStatusToString(status));
}
saveType = p->type; saveType = p->type;
status = xf86LookupMode(scrp, p, clockRanges, strategy); status = xf86LookupMode(scrp, p, clockRanges, strategy);
if (repeat && status == MODE_NOMODE) { if (repeat && status == MODE_NOMODE)
continue; continue;
} if (status != MODE_OK)
if (status != MODE_OK) { printModeRejectMessage(scrp->scrnIndex, p, status);
if (p->type & M_T_BUILTIN)
xf86DrvMsg(scrp->scrnIndex, X_INFO,
"Not using built-in mode \"%s\" (%s)\n",
p->name, xf86ModeStatusToString(status));
else if (p->type & M_T_DEFAULT)
xf86DrvMsg(scrp->scrnIndex, X_INFO,
"Not using default mode \"%s\" (%s)\n", p->name,
xf86ModeStatusToString(status));
else
xf86DrvMsg(scrp->scrnIndex, X_INFO,
"Not using mode \"%s\" (%s)\n", p->name,
xf86ModeStatusToString(status));
}
if (status == MODE_ERROR) { if (status == MODE_ERROR) {
ErrorF("xf86ValidateModes: " ErrorF("xf86ValidateModes: "
"unexpected result from xf86LookupMode()\n"); "unexpected result from xf86LookupMode()\n");
@ -2023,20 +2003,6 @@ xf86PruneDriverModes(ScrnInfoPtr scrp)
return; return;
n = p->next; n = p->next;
if (p->status != MODE_OK) { if (p->status != MODE_OK) {
#if 0
if (p->type & M_T_BUILTIN)
xf86DrvMsg(scrp->scrnIndex, X_INFO,
"Not using built-in mode \"%s\" (%s)\n", p->name,
xf86ModeStatusToString(p->status));
else if (p->type & M_T_DEFAULT)
xf86DrvMsg(scrp->scrnIndex, X_INFO,
"Not using default mode \"%s\" (%s)\n", p->name,
xf86ModeStatusToString(p->status));
else
xf86DrvMsg(scrp->scrnIndex, X_INFO,
"Not using mode \"%s\" (%s)\n", p->name,
xf86ModeStatusToString(p->status));
#endif
xf86DeleteMode(&(scrp->modes), p); xf86DeleteMode(&(scrp->modes), p);
} }
p = n; p = n;