leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: xgifb: eliminate #ifdef NewScratch

Browse Source 
NewScratch is always defined so all checks can be eliminated.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Reviewed-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Aaro Koskinen 2011-08-19 22:40:19 +03:00 committed by Greg Kroah-Hartman
parent 032abf7bf9
commit 5c167b30c1
1 changed files with 0 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
drivers/staging/xgifb/vb_def.h
View File

@ -3,11 +3,6 @@
#ifndef _INITDEF_ #ifndef _INITDEF_
#define _INITDEF_ #define _INITDEF_
#ifndef NewScratch
#define NewScratch
#endif
/* shampoo */
#define SEQ_ADDRESS_PORT 0x0014 #define SEQ_ADDRESS_PORT 0x0014
#define SEQ_DATA_PORT 0x0015 #define SEQ_DATA_PORT 0x0015
#define MISC_OUTPUT_REG_READ_PORT 0x001C #define MISC_OUTPUT_REG_READ_PORT 0x001C
@ -616,16 +611,13 @@
#define Monitor1Sense 0x20 #define Monitor1Sense 0x20
#define HiTVSense 0x40 #define HiTVSense 0x40
#ifdef NewScratch
#define YPbPrSense 0x80 /* NEW SCRATCH */ #define YPbPrSense 0x80 /* NEW SCRATCH */
#endif
#define TVSense 0xc7 #define TVSense 0xc7
#define TVOverScan 0x10 /* CR35 */ #define TVOverScan 0x10 /* CR35 */
#define TVOverScanShift 4 #define TVOverScanShift 4
#ifdef NewScratch
#define NTSCMode 0x00 #define NTSCMode 0x00
#define PALMode 0x00 #define PALMode 0x00
#define NTSCJMode 0x02 #define NTSCJMode 0x02
@ -635,9 +627,6 @@
#define YPbPrMode525p 0x20 #define YPbPrMode525p 0x20
#define YPbPrMode750p 0x40 #define YPbPrMode750p 0x40
#define YPbPrMode1080i 0x60 #define YPbPrMode1080i 0x60
#else /* Old Scratch */
#define ClearBufferFlag 0x20
#endif
#define LCDRGB18Bit 0x01 /* CR37 */ #define LCDRGB18Bit 0x01 /* CR37 */
@ -647,19 +636,10 @@
#define LCDSyncBit 0xe0 /* H/V polarity & sync ID */ #define LCDSyncBit 0xe0 /* H/V polarity & sync ID */
#define LCDSyncShift 6 #define LCDSyncShift 6
#ifdef NewScratch
#define ScalingLCD 0x08 #define ScalingLCD 0x08
#else /* Old Scratch */
#define ExtChipType 0x0e
#define ExtChip301 0x02
#define ExtChipLVDS 0x04
#define ExtChipCH7019 0x06
#define ScalingLCD 0x10
#endif
#define EnableDualEdge 0x01 /* CR38 */ #define EnableDualEdge 0x01 /* CR38 */
#define SetToLCDA 0x02 #define SetToLCDA 0x02
#ifdef NewScratch
#define SetYPbPr 0x04 #define SetYPbPr 0x04
#define DisableChannelA 0x08 #define DisableChannelA 0x08
#define DisableChannelB 0x10 #define DisableChannelB 0x10
@ -667,16 +647,6 @@
#define ExtChip301 0x20 #define ExtChip301 0x20
#define ExtChipLVDS 0x40 #define ExtChipLVDS 0x40
#define ExtChipCH7019 0x60 #define ExtChipCH7019 0x60
#else /* Old Scratch */
#define YPbPrSense 0x04
#define SetYPbPr 0x08
#define YPbPrMode 0x30
#define YPbPrMode525i 0x00
#define YPbPrMode525p 0x10
#define YPbPrMode750p 0x20
#define YPbPrMode1080i 0x30
#define PALMNMode 0xc0
#endif
#define BacklightControlBit 0x01 /* CR3A */ #define BacklightControlBit 0x01 /* CR3A */
#define Win9xforJap 0x40 #define Win9xforJap 0x40
@ -694,7 +664,6 @@
#define EnableForceMDinBIOS 0x40 #define EnableForceMDinBIOS 0x40
#define EnableForceMDinDrv 0x80 #define EnableForceMDinDrv 0x80
#ifdef NewScratch /* New Scratch */
/* ---------------------- VUMA Information */ /* ---------------------- VUMA Information */
#define LCDSettingFromCMOS 0x04 /* CR3C */ #define LCDSettingFromCMOS 0x04 /* CR3C */
#define TVSettingFromCMOS 0x08 #define TVSettingFromCMOS 0x08
@ -730,52 +699,6 @@
#define StartOSDEvent 0x04 #define StartOSDEvent 0x04
#define IgnoreHKEvent 0x08 #define IgnoreHKEvent 0x08
#define IgnoreOSDEvent 0x10 #define IgnoreOSDEvent 0x10
#else /* Old Scratch */
#define OSD_SBIOS 0x02 /* SR17 */
#define DisableLogo 0x04
#define SelectKDOS 0x08
#define KorWinMode 0x10
#define KorMode3Bit 0x0020
#define PSCCtrlBit 0x40
#define NPSCCtrlBitShift 6
#define BlueScreenBit 0x80
#define HKEvent 0x0f /* CR79 */
#define HK_ModeSwitch 0x01
#define HK_Expanding 0x02
#define HK_OverScan 0x03
#define HK_Brightness 0x04
#define HK_Contrast 0x05
#define HK_Mute 0x06
#define HK_Volume 0x07
#define ActivePAL 0x0020
#define ActivePALShift 5
#define ActiveNonExpanding 0x40
#define ActiveNonExpandingShift 6
#define ActiveOverScan 0x80
#define ActiveOverScanShift 7
#define ModeSwitchStatus 0x0b /* SR15 */
#define ActiveCRT1 0x01
#define ActiveLCD 0x02
#define ActiveCRT2 0x08
#define TVSwitchStatus 0xf0 /* SR16 */
#define TVConfigShift 3
#define ActiveTV 0x01
#define ActiveYPbPr 0x04
#define ActiveAVideo 0x10
#define ActiveSVideo 0x0020
#define ActiveSCART 0x40
#define ActiveHiTV 0x80
#define EnableHKEvent 0x01 /* CR7A */
#define EnableOSDEvent 0x02
#define StartOSDEvent 0x04
#define CMOSSupport 0x08
#define HotKeySupport 0x10
#define IngoreHKOSDEvent 0x20
#endif
/* //------------- Misc. Definition */ /* //------------- Misc. Definition */
#define SelectCRT1Rate 00h #define SelectCRT1Rate 00h