Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

staging: xgifb: eliminate #ifdef Tap4

Browse source 
Eliminate #define Tap4 and related checks.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Aaro Koskinen 2011-08-31 21:46:03 +03:00 committed by Greg Kroah-Hartman
parent c071906146
commit 800d67cf9f
2 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/staging/xgifb/vb_setmode.c
View file

@ -5688,10 +5688,6 @@ static void XGI_SetTap4Regs(struct vb_device_info *pVBInfo)
if (!(pVBInfo->VBType & VB_XGI301C)) if (!(pVBInfo->VBType & VB_XGI301C))
return; return;
#ifndef Tap4
xgifb_reg_and(pVBInfo->Part2Port, 0x4E, 0xEB); /* Disable Tap4 */
#else /* Tap4 Setting */
Tap4TimingPtr = XGI_GetTap4Ptr(0, pVBInfo); /* Set Horizontal Scaling */ Tap4TimingPtr = XGI_GetTap4Ptr(0, pVBInfo); /* Set Horizontal Scaling */
for (i = 0x80, j = 0; i <= 0xBF; i++, j++) for (i = 0x80, j = 0; i <= 0xBF; i++, j++)
xgifb_reg_set(pVBInfo->Part2Port, i, Tap4TimingPtr->Reg[j]); xgifb_reg_set(pVBInfo->Part2Port, i, Tap4TimingPtr->Reg[j]);
@ -5713,7 +5709,6 @@ static void XGI_SetTap4Regs(struct vb_device_info *pVBInfo)
else else
/* Enable H.Scaling */ /* Enable H.Scaling */
xgifb_reg_and_or(pVBInfo->Part2Port, 0x4E, ~0x14, 0x10); xgifb_reg_and_or(pVBInfo->Part2Port, 0x4E, ~0x14, 0x10);
#endif
} }
static void XGI_SetGroup3(unsigned short ModeNo, unsigned short ModeIdIndex, static void XGI_SetGroup3(unsigned short ModeNo, unsigned short ModeIdIndex,

2
drivers/staging/xgifb/vb_table.h
View file

@ -1,5 +1,3 @@
#define Tap4
/* yilin modify for xgi20 */ /* yilin modify for xgi20 */
static struct XGI_MCLKDataStruct XGI340New_MCLKData[] = { static struct XGI_MCLKDataStruct XGI340New_MCLKData[] = {
{0x16, 0x01, 0x01, 166}, {0x16, 0x01, 0x01, 166},