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

staging/xgifb: Rename Set* defines and remove duplicated defines 



This patch renames the Set* defines and their usage to the naming
convention of the sis initdef.h and removes the now duplicated defines.

Renames:
SetCRT2ToHiVisionTV -> SetCRT2ToHiVision
SetCRT2ToYPbPr -> SetCRT2ToYPbPr525750

SetNTSCJ -> TVSetNTSCJ
SetPALMTV -> TVSetPALM
SetPALNTV -> TVSetPALN
SetPALTV -> TVSetPAL

SetYPbPrMode1080i -> TVSetHiVision
SetYPbPrMode525i -> TVSetYPbPr525i
SetYPbPrMode525p -> TVSetYPbPr525p
SetYPbPrMode750p -> TVSetYPbPr750p

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

drivers/staging/xgifb/vb_def.h

+0 −10
Original line number Diff line number Diff line
@@ -131,11 +131,9 @@ 
#define SetCRT2ToSCART      0x0010

#define SetCRT2ToLCD        0x0020

#define SetCRT2ToRAMDAC     0x0040

#define SetCRT2ToHiVisionTV 0x0080

#define SetCRT2ToLCDA       0x0100

#define SetInSlaveMode      0x0200

#define SetNotSimuMode      0x0400

#define SetCRT2ToYPbPr      0x0800

#define LoadDACFlag         0x1000

#define DisableCRT2Display  0x2000

#define DriverMode          0x4000
@@ -150,14 +148,6 @@ 
#define EnableChA           0x8000



#define SetNTSCTV           0x0000 /* TV Info */

#define SetPALTV            0x0001

#define SetNTSCJ            0x0002

#define SetPALMTV           0x0004

#define SetPALNTV           0x0008

#define SetYPbPrMode525i     0x0020

#define SetYPbPrMode525p     0x0040

#define SetYPbPrMode750p     0x0080

#define SetYPbPrMode1080i    0x0100

#define SetTVLowResolution   0x0400

#define TVSimuMode           0x0800

#define RPLLDIV2XO           0x1000

drivers/staging/xgifb/vb_init.c

+2 −2
Original line number Diff line number Diff line
@@ -1268,7 +1268,7 @@ static void XGINew_SetModeScratch(struct xgi_hw_device_info *HwDeviceExtension, 


				if (pVBInfo->IF_DEF_HiVision == 1) {

					if ((temp >> 8) & ActiveHiTV)

						tempcl |= SetCRT2ToHiVisionTV;

						tempcl |= SetCRT2ToHiVision;

				}



				if (pVBInfo->IF_DEF_YPbPr == 1) {
@@ -1287,7 +1287,7 @@ static void XGINew_SetModeScratch(struct xgi_hw_device_info *HwDeviceExtension, 


		if (pVBInfo->IF_DEF_HiVision == 1) {

			if ((temp >> 8) & ActiveHiTV)

				tempcl |= SetCRT2ToHiVisionTV;

				tempcl |= SetCRT2ToHiVision;

		}



		if (pVBInfo->IF_DEF_YPbPr == 1) {

drivers/staging/xgifb/vb_setmode.c

+122 −122

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE