From: Aaro Koskinen <aaro.koskinen@iki.fi>
To: apatard@mandriva.com, gregkh@suse.de, devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 01/12] staging: xgifb: eliminate #ifdef NewScratch
Date: Fri, 19 Aug 2011 22:40:19 +0300 [thread overview]
Message-ID: <1313782830-31461-2-git-send-email-aaro.koskinen@iki.fi> (raw)
In-Reply-To: <1313782830-31461-1-git-send-email-aaro.koskinen@iki.fi>
NewScratch is always defined so all checks can be eliminated.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
---
drivers/staging/xgifb/vb_def.h | 77 ----------------------------------------
1 files changed, 0 insertions(+), 77 deletions(-)
diff --git a/drivers/staging/xgifb/vb_def.h b/drivers/staging/xgifb/vb_def.h
index 339c071..d7358d8 100644
--- a/drivers/staging/xgifb/vb_def.h
+++ b/drivers/staging/xgifb/vb_def.h
@@ -3,11 +3,6 @@
#ifndef _INITDEF_
#define _INITDEF_
-#ifndef NewScratch
-#define NewScratch
-#endif
-/* shampoo */
-
#define SEQ_ADDRESS_PORT 0x0014
#define SEQ_DATA_PORT 0x0015
#define MISC_OUTPUT_REG_READ_PORT 0x001C
@@ -616,16 +611,13 @@
#define Monitor1Sense 0x20
#define HiTVSense 0x40
-#ifdef NewScratch
#define YPbPrSense 0x80 /* NEW SCRATCH */
-#endif
#define TVSense 0xc7
#define TVOverScan 0x10 /* CR35 */
#define TVOverScanShift 4
-#ifdef NewScratch
#define NTSCMode 0x00
#define PALMode 0x00
#define NTSCJMode 0x02
@@ -635,9 +627,6 @@
#define YPbPrMode525p 0x20
#define YPbPrMode750p 0x40
#define YPbPrMode1080i 0x60
-#else /* Old Scratch */
-#define ClearBufferFlag 0x20
-#endif
#define LCDRGB18Bit 0x01 /* CR37 */
@@ -647,19 +636,10 @@
#define LCDSyncBit 0xe0 /* H/V polarity & sync ID */
#define LCDSyncShift 6
-#ifdef NewScratch
#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 SetToLCDA 0x02
-#ifdef NewScratch
#define SetYPbPr 0x04
#define DisableChannelA 0x08
#define DisableChannelB 0x10
@@ -667,16 +647,6 @@
#define ExtChip301 0x20
#define ExtChipLVDS 0x40
#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 Win9xforJap 0x40
@@ -694,7 +664,6 @@
#define EnableForceMDinBIOS 0x40
#define EnableForceMDinDrv 0x80
-#ifdef NewScratch /* New Scratch */
/* ---------------------- VUMA Information */
#define LCDSettingFromCMOS 0x04 /* CR3C */
#define TVSettingFromCMOS 0x08
@@ -730,52 +699,6 @@
#define StartOSDEvent 0x04
#define IgnoreHKEvent 0x08
#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 */
#define SelectCRT1Rate 00h
--
1.7.2.5
next prev parent reply other threads:[~2011-08-19 19:40 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-19 19:40 [PATCH 00/12] staging: xgifb: misc cleanups Aaro Koskinen
2011-08-19 19:40 ` Aaro Koskinen [this message]
2011-08-20 16:50 ` [PATCH 01/12] staging: xgifb: eliminate #ifdef NewScratch Dan Carpenter
2011-08-19 19:40 ` [PATCH 02/12] staging: xgifb: eliminate XGIINITSTATIC Aaro Koskinen
2011-08-19 19:40 ` [PATCH 03/12] staging: xgifb: delete duplicate #defines Aaro Koskinen
2011-08-19 19:40 ` [PATCH 04/12] staging: xgifb: delete unused definitions Aaro Koskinen
2011-08-19 19:40 ` [PATCH 05/12] staging: xgifb: vb_table: delete unused data Aaro Koskinen
2011-08-19 19:40 ` [PATCH 06/12] staging: xgifb: delete unused structs Aaro Koskinen
2011-08-19 19:40 ` [PATCH 07/12] staging: xgifb: eliminate #ifdef XGIFB_PAN Aaro Koskinen
2011-08-19 19:40 ` [PATCH 08/12] staging: xgifb: probe: delete checks for mode "none" Aaro Koskinen
2011-08-19 19:40 ` [PATCH 09/12] staging: xgifb: replace video_type with FB_TYPE_PACKED_PIXELS Aaro Koskinen
2011-08-19 19:40 ` [PATCH 10/12] staging: xgifb: delete write-only variables Aaro Koskinen
2011-08-19 19:40 ` [PATCH 11/12] staging: xgifb: delete driver version information Aaro Koskinen
2011-08-19 19:40 ` [PATCH 12/12] staging: xgifb: delete an empty string Aaro Koskinen
2011-08-23 21:24 ` Greg KH
2011-08-20 16:51 ` [PATCH 00/12] staging: xgifb: misc cleanups Dan Carpenter
2011-08-23 21:20 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1313782830-31461-2-git-send-email-aaro.koskinen@iki.fi \
--to=aaro.koskinen@iki.fi \
--cc=apatard@mandriva.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@suse.de \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®