Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76a5899b authored by Peter Huewe's avatar Peter Huewe Committed by Greg Kroah-Hartman
Browse files

staging/xgifb: Simplify XGI_SetSeqRegs 



Since SR[0] in the (readonly) XGI330_StandTable is always 0x01 we can
skip or'ing with 0x01 and make the code simpler by removing the if
statements.

Since this function is the only user of the XGI330_StandTable we can
also include the unconditional |= 0x20 into the input data and move the
assignment to SR1 into the loop, which I prefer to start at 0.

Signed-off-by: default avatarPeter Huewe <peterhuewe@gmx.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fd1bbbb7

drivers/staging/xgifb/vb_setmode.c

+6 −17
Original line number Original line Diff line number Diff line
@@ -64,26 +64,15 @@ static void XGI_SetSeqRegs(unsigned short ModeNo, 
			   unsigned short ModeIdIndex,

			   unsigned short ModeIdIndex,

			   struct vb_device_info *pVBInfo)

			   struct vb_device_info *pVBInfo)

{

{

	unsigned char tempah, SRdata;

	unsigned char SRdata, i;

	unsigned short i;





	xgifb_reg_set(pVBInfo->P3c4, 0x00, 0x03); /* Set SR0 */

	xgifb_reg_set(pVBInfo->P3c4, 0x00, 0x03); /* Set SR0 */

	tempah = XGI330_StandTable.SR[0];





	if (pVBInfo->VBInfo & XGI_SetCRT2ToLCDA) {

	for (i = 0; i < 4; i++) {

		tempah |= 0x01;

		/* Get SR1,2,3,4 from file */

	} else if (pVBInfo->VBInfo & (SetCRT2ToTV | SetCRT2ToLCD)) {

		/* SR1 is with screen off 0x20 */

		if (pVBInfo->VBInfo & SetInSlaveMode)

		SRdata = XGI330_StandTable.SR[i];

			tempah |= 0x01;

		xgifb_reg_set(pVBInfo->P3c4, i+1, SRdata); /* Set SR 1 2 3 4 */

	}



	tempah |= 0x20; /* screen off */

	xgifb_reg_set(pVBInfo->P3c4, 0x01, tempah); /* Set SR1 */



	for (i = 02; i <= 04; i++) {

		/* Get SR2,3,4 from file */

		SRdata = XGI330_StandTable.SR[i - 1];

		xgifb_reg_set(pVBInfo->P3c4, i, SRdata); /* Set SR2 3 4 */

	}

	}

}

}

drivers/staging/xgifb/vb_table.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -195,7 +195,7 @@ const struct XGI_ExtStruct XGI330_EModeIDTable[] = { 
static const struct SiS_StandTable_S XGI330_StandTable = {

static const struct SiS_StandTable_S XGI330_StandTable = {

/* ExtVGATable */

/* ExtVGATable */

	0x00, 0x00, 0x00, 0x0000,

	0x00, 0x00, 0x00, 0x0000,

	{0x01, 0x0f, 0x00, 0x0e},

	{0x21, 0x0f, 0x00, 0x0e}, /* 0x21 = 0x01 | (0x20 = screen off) */

	 0x23,

	 0x23,

	{0x5f, 0x4f, 0x50, 0x82, 0x54, 0x80, 0x0b, 0x3e,

	{0x5f, 0x4f, 0x50, 0x82, 0x54, 0x80, 0x0b, 0x3e,

	 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

	 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,