lkml.org 
[lkml]   [2012]   [Jul]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 17/19] Staging: xgifb: Rework some conditions in XGI_SetCRT2ModeRegs().
    Date
    Rework some conditions to reduce indentation and fix style warnings.

    Signed-off-by: Miguel Gómez <magomez@igalia.com>
    ---
    drivers/staging/xgifb/vb_setmode.c | 81 ++++++++++++++++--------------------
    1 file changed, 36 insertions(+), 45 deletions(-)

    diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c
    index 3e0d668..f41e595 100644
    --- a/drivers/staging/xgifb/vb_setmode.c
    +++ b/drivers/staging/xgifb/vb_setmode.c
    @@ -5993,59 +5993,50 @@ static void XGI_SetCRT2ModeRegs(unsigned short ModeNo,
    tempah = 0x08;
    tempbl = 0xf0;

    - if (pVBInfo->VBInfo & DisableCRT2Display) {
    - xgifb_reg_and_or(pVBInfo->Part1Port, 0x2e, tempbl, tempah);
    - } else {
    + do {
    + if (pVBInfo->VBInfo & DisableCRT2Display)
    + break;
    +
    tempah = 0x00;
    tempbl = 0xff;

    - if (pVBInfo->VBInfo & (SetCRT2ToRAMDAC | SetCRT2ToTV
    - | SetCRT2ToLCD | XGI_SetCRT2ToLCDA)) {
    - if ((pVBInfo->VBInfo & XGI_SetCRT2ToLCDA) &&
    - (!(pVBInfo->VBInfo & SetSimuScanMode))) {
    - tempbl &= 0xf7;
    - tempah |= 0x01;
    - xgifb_reg_and_or(pVBInfo->Part1Port, 0x2e,
    - tempbl, tempah);
    - } else {
    - if (pVBInfo->VBInfo & XGI_SetCRT2ToLCDA) {
    - tempbl &= 0xf7;
    - tempah |= 0x01;
    - }
    + if (!(pVBInfo->VBInfo & (SetCRT2ToRAMDAC | SetCRT2ToTV |
    + SetCRT2ToLCD | XGI_SetCRT2ToLCDA)))
    + break;

    - if (pVBInfo->VBInfo &
    - (SetCRT2ToRAMDAC |
    - SetCRT2ToTV |
    - SetCRT2ToLCD)) {
    - tempbl &= 0xf8;
    - tempah = 0x01;
    + if ((pVBInfo->VBInfo & XGI_SetCRT2ToLCDA) &&
    + (!(pVBInfo->VBInfo & SetSimuScanMode))) {
    + tempbl &= 0xf7;
    + tempah |= 0x01;
    + break;
    + }

    - if (!(pVBInfo->VBInfo & SetInSlaveMode))
    - tempah |= 0x02;
    + if (pVBInfo->VBInfo & XGI_SetCRT2ToLCDA) {
    + tempbl &= 0xf7;
    + tempah |= 0x01;
    + }

    - if (!(pVBInfo->VBInfo &
    - SetCRT2ToRAMDAC)) {
    - tempah = tempah ^ 0x05;
    - if (!(pVBInfo->VBInfo &
    - SetCRT2ToLCD))
    - tempah = tempah ^ 0x01;
    - }
    + if (!(pVBInfo->VBInfo &
    + (SetCRT2ToRAMDAC | SetCRT2ToTV | SetCRT2ToLCD)))
    + break;

    - if (!(pVBInfo->VBInfo &
    - SetCRT2ToDualEdge))
    - tempah |= 0x08;
    - xgifb_reg_and_or(pVBInfo->Part1Port,
    - 0x2e, tempbl, tempah);
    - } else {
    - xgifb_reg_and_or(pVBInfo->Part1Port,
    - 0x2e, tempbl, tempah);
    - }
    - }
    - } else {
    - xgifb_reg_and_or(pVBInfo->Part1Port, 0x2e, tempbl,
    - tempah);
    + tempbl &= 0xf8;
    + tempah = 0x01;
    +
    + if (!(pVBInfo->VBInfo & SetInSlaveMode))
    + tempah |= 0x02;
    +
    + if (!(pVBInfo->VBInfo & SetCRT2ToRAMDAC)) {
    + tempah = tempah ^ 0x05;
    + if (!(pVBInfo->VBInfo & SetCRT2ToLCD))
    + tempah = tempah ^ 0x01;
    }
    - }
    +
    + if (!(pVBInfo->VBInfo & SetCRT2ToDualEdge))
    + tempah |= 0x08;
    +
    + } while (0);
    + xgifb_reg_and_or(pVBInfo->Part1Port, 0x2e, tempbl, tempah);

    if (pVBInfo->VBInfo & (SetCRT2ToRAMDAC | SetCRT2ToTV | SetCRT2ToLCD
    | XGI_SetCRT2ToLCDA)) {
    --
    1.7.9.5
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2012-07-05 18:01    [W:0.036 / U:0.228 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site