Commit 3b175621 authored by Miguel Gómez's avatar Miguel Gómez Committed by Greg Kroah-Hartman

Staging: xgifb: Refactor XGI_AjustCRT2Rate().

Refactor some conditions to reduce indentation and fix style warnings.
Signed-off-by: default avatarMiguel Gómez <magomez@igalia.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 661a6384
...@@ -250,48 +250,30 @@ static unsigned char XGI_AjustCRT2Rate(unsigned short ModeNo, ...@@ -250,48 +250,30 @@ static unsigned char XGI_AjustCRT2Rate(unsigned short ModeNo,
if (pVBInfo->VBInfo & (SetCRT2ToLCD | XGI_SetCRT2ToLCDA)) { if (pVBInfo->VBInfo & (SetCRT2ToLCD | XGI_SetCRT2ToLCDA)) {
tempax |= SupportLCD; tempax |= SupportLCD;
if (pVBInfo->LCDResInfo != Panel_1280x1024) { if (pVBInfo->LCDResInfo != Panel_1280x1024 &&
if (pVBInfo->LCDResInfo != Panel_1280x960) { pVBInfo->LCDResInfo != Panel_1280x960 &&
if (pVBInfo->LCDInfo & (pVBInfo->LCDInfo & LCDNonExpanding) &&
LCDNonExpanding) { resinfo >= 9)
if (resinfo >= 9) { return 0;
tempax = 0;
return 0;
}
}
}
}
} }
if (pVBInfo->VBInfo & SetCRT2ToHiVision) { /* for HiTV */ if (pVBInfo->VBInfo & SetCRT2ToHiVision) { /* for HiTV */
if ((pVBInfo->VBType & VB_SIS301LV) && if ((pVBInfo->VBType & VB_SIS301LV) &&
(pVBInfo->VBExtInfo == VB_YPbPr1080i)) { (pVBInfo->VBExtInfo == VB_YPbPr1080i)) {
tempax |= SupportYPbPr750p; tempax |= SupportYPbPr750p;
if (pVBInfo->VBInfo & SetInSlaveMode) { if ((pVBInfo->VBInfo & SetInSlaveMode) &&
if (resinfo == 4) ((resinfo == 3) ||
return 0; (resinfo == 4) ||
(resinfo > 7)))
if (resinfo == 3) return 0;
return 0;
if (resinfo > 7)
return 0;
}
} else { } else {
tempax |= SupportHiVision; tempax |= SupportHiVision;
if (pVBInfo->VBInfo & SetInSlaveMode) { if ((pVBInfo->VBInfo & SetInSlaveMode) &&
if (resinfo == 4) ((resinfo == 4) ||
(resinfo == 3 &&
(pVBInfo->SetFlag & TVSimuMode)) ||
(resinfo > 7)))
return 0; return 0;
if (resinfo == 3) {
if (pVBInfo->SetFlag
& TVSimuMode)
return 0;
}
if (resinfo > 7)
return 0;
}
} }
} else { } else {
if (pVBInfo->VBInfo & (SetCRT2ToAVIDEO | if (pVBInfo->VBInfo & (SetCRT2ToAVIDEO |
...@@ -301,23 +283,18 @@ static unsigned char XGI_AjustCRT2Rate(unsigned short ModeNo, ...@@ -301,23 +283,18 @@ static unsigned char XGI_AjustCRT2Rate(unsigned short ModeNo,
SetCRT2ToHiVision)) { SetCRT2ToHiVision)) {
tempax |= SupportTV; tempax |= SupportTV;
if (pVBInfo->VBType & (VB_SIS301B | VB_SIS302B if (pVBInfo->VBType & (VB_SIS301B |
| VB_SIS301LV | VB_SIS302LV VB_SIS302B |
| VB_XGI301C)) { VB_SIS301LV |
VB_SIS302LV |
VB_XGI301C))
tempax |= SupportTV1024; tempax |= SupportTV1024;
}
if (!(pVBInfo->VBInfo & TVSetPAL)) { if (!(pVBInfo->VBInfo & TVSetPAL) &&
if (modeflag & NoSupportSimuTV) { (modeflag & NoSupportSimuTV) &&
if (pVBInfo->VBInfo & (pVBInfo->VBInfo & SetInSlaveMode) &&
SetInSlaveMode) { (!(pVBInfo->VBInfo & SetNotSimuMode)))
if (!(pVBInfo->VBInfo & return 0;
SetNotSimuMode)) {
return 0;
}
}
}
}
} }
} }
} else { /* for LVDS */ } else { /* for LVDS */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment