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

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

staging/xgifb: Use TVCLKBASE_315 as a base address 



Since the defines TVVCLKDIV2, TVVCLK, HiTVVCLKDIV2, HiTVVCLK,
HiTVSimuVCLK and HiTVTextVCLK are now defined as relative values, we
have to use TVCLKBASE_315 (0x31) as a base address to get the same values
as before the merge.

The old and now duplicated defines were removed

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

drivers/staging/xgifb/vb_def.h

+0 −6
Original line number Diff line number Diff line
@@ -288,12 +288,6 @@ 
#define VCLK217_325          0x55

#define XGI_YPbPr750pVCLK    0x57



#define TVVCLKDIV2           0x3A

#define TVVCLK               0x3B

#define HiTVVCLKDIV2         0x3C

#define HiTVVCLK             0x3D

#define HiTVSimuVCLK         0x3E

#define HiTVTextVCLK         0x3F

#define VCLK39_77            0x40

#define YPbPr525pVCLK           0x3A

#define NTSC1024VCLK         0x41

drivers/staging/xgifb/vb_setmode.c

+12 −12
Original line number Diff line number Diff line
@@ -1273,19 +1273,19 @@ static unsigned short XGI_GetVCLK2Ptr(unsigned short ModeNo, 
				VCLKIndex = LCDXlat1VCLK[CRT2Index];

		} else if (pVBInfo->VBInfo & SetCRT2ToHiVision) {

			if (pVBInfo->SetFlag & RPLLDIV2XO) {

				VCLKIndex = HiTVVCLKDIV2;

				VCLKIndex = TVCLKBASE_315 + HiTVVCLKDIV2;

				VCLKIndex += 25;

			} else {

				VCLKIndex = HiTVVCLK;

				VCLKIndex = TVCLKBASE_315 + HiTVVCLK;

				VCLKIndex += 25;

			}



			if (pVBInfo->SetFlag & TVSimuMode) {

				if (modeflag & Charx8Dot) {

					VCLKIndex = HiTVSimuVCLK;

					VCLKIndex = TVCLKBASE_315 + HiTVSimuVCLK;

					VCLKIndex += 25;

				} else {

					VCLKIndex = HiTVTextVCLK;

					VCLKIndex = TVCLKBASE_315 + HiTVTextVCLK;

					VCLKIndex += 25;

				}

			}
@@ -1304,10 +1304,10 @@ static unsigned short XGI_GetVCLK2Ptr(unsigned short ModeNo, 
			}

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

			if (pVBInfo->SetFlag & RPLLDIV2XO) {

				VCLKIndex = TVVCLKDIV2;

				VCLKIndex = TVCLKBASE_315 + TVVCLKDIV2;

				VCLKIndex += 25;

			} else {

				VCLKIndex = TVVCLK;

				VCLKIndex = TVCLKBASE_315 + TVVCLK;

				VCLKIndex += 25;

			}

		} else { /* for CRT2 */
@@ -2845,13 +2845,13 @@ static unsigned char XGI_GetVCLKPtr(unsigned short RefreshRateTableIndex, 
		     VB_SIS302LV |

		     VB_XGI301C)) {

			if (pVBInfo->VBInfo & SetCRT2ToHiVision) {

				tempal = HiTVVCLKDIV2;

				tempal = TVCLKBASE_315 + HiTVVCLKDIV2;

				if (!(pVBInfo->TVInfo & RPLLDIV2XO))

					tempal = HiTVVCLK;

					tempal = TVCLKBASE_315 + HiTVVCLK;

				if (pVBInfo->TVInfo & TVSimuMode) {

					tempal = HiTVSimuVCLK;

					tempal = TVCLKBASE_315 + HiTVSimuVCLK;

					if (!(modeflag & Charx8Dot))

						tempal = HiTVTextVCLK;

						tempal = TVCLKBASE_315 + HiTVTextVCLK;



				}

				return tempal;
@@ -2870,9 +2870,9 @@ static unsigned char XGI_GetVCLKPtr(unsigned short RefreshRateTableIndex, 
			tempal = NTSC1024VCLK;



			if (!(pVBInfo->TVInfo & NTSC1024x768)) {

				tempal = TVVCLKDIV2;

				tempal = TVCLKBASE_315 + TVVCLKDIV2;

				if (!(pVBInfo->TVInfo & RPLLDIV2XO))

					tempal = TVVCLK;

					tempal = TVCLKBASE_315 + TVVCLK;

			}



			if (pVBInfo->VBInfo & SetCRT2ToTV)