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

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

staging/xgifb: Rename XGI specific initdef.h defines 



This patch renames some of the defines that exist in the sis initdef.h
but seem to have a different value.
In order to preserve the functionality of the driver, we simply prepend
these defines with XGI_ (for now) to resolve conflicts and review them
later on.

Renames:
SetCRT2ToLCDA -> XGI_SetCRT2ToLCDA
LCDVESATiming -> XGI_LCDVESATiming
EnableLVDSDDA -> XGI_EnableLVDSDDA
LCDDualLink  -> XGI_LCDDualLink
ModeSwitchStatus  -> XGI_ModeSwitchStatus
YPbPr750pVCLK  -> XGI_YPbPr750pVCLK

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

drivers/staging/xgifb/vb_def.h

+6 −6
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ 
#define SetCRT2ToSCART      0x0010

#define SetCRT2ToLCD        0x0020

#define SetCRT2ToRAMDAC     0x0040

#define SetCRT2ToLCDA       0x0100

#define XGI_SetCRT2ToLCDA   0x0100

#define SetInSlaveMode      0x0200

#define SetNotSimuMode      0x0400

#define LoadDACFlag         0x1000
@@ -131,8 +131,8 @@ 
#define NTSC1024x768         0x2000

#define SetTVLockMode        0x4000



#define LCDVESATiming        0x0001 /* LCD Info/CR37 */

#define EnableLVDSDDA        0x0002

#define XGI_LCDVESATiming    0x0001 /* LCD Info/CR37 */

#define XGI_EnableLVDSDDA    0x0002

#define EnableScalingLCD     0x0008

#define SetPWDEnable         0x0004

#define SetLCDtoNonExpanding 0x0010
@@ -145,7 +145,7 @@ 
#define EnableLCD24bpp       0x0004 /* default */

#define DisableLCD24bpp      0x0000

#define LCDPolarity          0x00c0 /* default: SyncNN */

#define LCDDualLink          0x0100

#define XGI_LCDDualLink      0x0100

#define EnableSpectrum       0x0200

#define PWDEnable            0x0400

#define EnableVBCLKDRVLOW    0x4000
@@ -191,7 +191,7 @@ 
#define DisplayDeviceFromCMOS 0x10



/* ---------------------- HK Evnet Definition */

#define ModeSwitchStatus      0xf0

#define XGI_ModeSwitchStatus  0xf0

#define ActiveCRT1            0x10

#define ActiveLCD             0x0020

#define ActiveTV              0x40
@@ -286,7 +286,7 @@ 
#define VCLK125_999          0x51

#define VCLK148_5            0x52

#define VCLK217_325          0x55

#define YPbPr750pVCLK        0x57

#define XGI_YPbPr750pVCLK    0x57



#define TVVCLKDIV2           0x3A

#define TVVCLK               0x3B

drivers/staging/xgifb/vb_setmode.c

+74 −74

File changed.

Preview size limit exceeded, changes collapsed.

drivers/staging/xgifb/vb_table.h

+4 −4
Original line number Diff line number Diff line
@@ -2505,17 +2505,17 @@ static struct XGI330_LCDCapStruct XGI_LCDDLCapList[] = { 
	0x6C, 0xC3, 0x35, 0x62, 0x02, 0x14, 0x0A, 0x02, 0x00,

	0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x28, 0x10},

/* LCDCap1280x1024 */

	{Panel_1280x1024, LCDDualLink+DefaultLCDCap, StLCDBToA,

	{Panel_1280x1024, XGI_LCDDualLink+DefaultLCDCap, StLCDBToA,

	0x012, 0x70, 0x03, VCLK108_2_315,

	0x70, 0x44, 0xF8, 0x2F, 0x02, 0x14, 0x0A, 0x02, 0x00,

	0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x30, 0x10},

/* LCDCap1400x1050 */

	{Panel_1400x1050, LCDDualLink+DefaultLCDCap, StLCDBToA,

	{Panel_1400x1050, XGI_LCDDualLink+DefaultLCDCap, StLCDBToA,

	0x012, 0x70, 0x03, VCLK108_2_315,

	 0x70, 0x44, 0xF8, 0x2F, 0x02, 0x14, 0x0A, 0x02, 0x00,

	 0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x30, 0x10},

/* LCDCap1600x1200 */

	{Panel_1600x1200, LCDDualLink+DefaultLCDCap, LCDToFull,

	{Panel_1600x1200, XGI_LCDDualLink+DefaultLCDCap, LCDToFull,

	0x012, 0xC0, 0x03, VCLK162,

	 0x43, 0x22, 0x70, 0x24, 0x02, 0x14, 0x0A, 0x02, 0x00,

	 0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x30, 0x10},
@@ -2524,7 +2524,7 @@ static struct XGI330_LCDCapStruct XGI_LCDDLCapList[] = { 
	 0x2B, 0x61, 0x2B, 0x61, 0x02, 0x14, 0x0A, 0x02, 0x00,

	 0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x28, 0x10},

/* LCDCap1280x1024x75 */

	{Panel_1280x1024x75, LCDDualLink+DefaultLCDCap, StLCDBToA,

	{Panel_1280x1024x75, XGI_LCDDualLink+DefaultLCDCap, StLCDBToA,

	0x012, 0x90, 0x03, VCLK135_5,

	 0x54, 0x42, 0x4A, 0x61, 0x02, 0x14, 0x0A, 0x02, 0x00,

	 0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x30, 0x10},