OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Staging: xgifb: Refactor XGI_GetVBType(). 

Refactor XGI_GetVBType() to reduce indentation and fix style warnings.

Signed-off-by: Miguel Gómez <magomez@igalia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Miguel Gómez 2012-07-06 12:40:47 +02:00 committed by Greg Kroah-Hartman
parent 3b175621a2
commit 7eec23a7b3
1 changed files with 36 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
drivers/staging/xgifb/vb_setmode.c
View File

@ -2559,42 +2559,45 @@ void XGI_GetVBType(struct vb_device_info *pVBInfo)
{
unsigned short flag, tempbx, tempah;
if (pVBInfo->IF_DEF_LVDS == 0) {
tempbx = VB_SIS302B;
flag = xgifb_reg_get(pVBInfo->Part4Port, 0x00);
if (flag != 0x02) {
tempbx = VB_SIS301;
flag = xgifb_reg_get(pVBInfo->Part4Port, 0x01);
if (flag >= 0xB0) {
tempbx = VB_SIS301B;
if (flag >= 0xC0) {
tempbx = VB_XGI301C;
if (flag >= 0xD0) {
tempbx = VB_SIS301LV;
if (flag >= 0xE0) {
tempbx = VB_SIS302LV;
tempah = xgifb_reg_get(
pVBInfo->Part4Port,
0x39);
if (tempah != 0xFF)
tempbx =
VB_XGI301C;
}
}
}
if (pVBInfo->IF_DEF_LVDS != 0)
return;
if (tempbx & (VB_SIS301B | VB_SIS302B)) {
flag = xgifb_reg_get(
pVBInfo->Part4Port,
0x23);
tempbx = VB_SIS302B;
flag = xgifb_reg_get(pVBInfo->Part4Port, 0x00);
if (flag == 0x02)
goto finish;
if (!(flag & 0x02))
tempbx = tempbx | VB_NoLCD;
}
}
}
pVBInfo->VBType = tempbx;
tempbx = VB_SIS301;
flag = xgifb_reg_get(pVBInfo->Part4Port, 0x01);
if (flag < 0xB0)
goto finish;
tempbx = VB_SIS301B;
if (flag < 0xC0)
goto bigger_than_0xB0;
tempbx = VB_XGI301C;
if (flag < 0xD0)
goto bigger_than_0xB0;
tempbx = VB_SIS301LV;
if (flag < 0xE0)
goto bigger_than_0xB0;
tempbx = VB_SIS302LV;
tempah = xgifb_reg_get(pVBInfo->Part4Port, 0x39);
if (tempah != 0xFF)
tempbx = VB_XGI301C;
bigger_than_0xB0:
if (tempbx & (VB_SIS301B | VB_SIS302B)) {
flag = xgifb_reg_get(pVBInfo->Part4Port, 0x23);
if (!(flag & 0x02))
tempbx = tempbx | VB_NoLCD;
}
finish:
pVBInfo->VBType = tempbx;
}
static void XGI_GetVBInfo(unsigned short ModeNo, unsigned short ModeIdIndex,