summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Romanick <idr@us.ibm.com>2008-04-30 09:45:36 -0700
committerIan Romanick <idr@us.ibm.com>2008-04-30 09:45:36 -0700
commitfbcbf2c9c92d20598a9363868844e3a838846d8b (patch)
treeadd6e2d3b4c0a39ccbb22b1c4d07689f50d33e33
parente20644c9671be68a5f9b9e227db923166052174c (diff)
Remove several pieces of '#if 0' code
-rw-r--r--src/xg47_native_mode.c13
-rw-r--r--src/xgi_driver.c4
2 files changed, 0 insertions, 17 deletions
diff --git a/src/xg47_native_mode.c b/src/xg47_native_mode.c
index e725985..d71f926 100644
--- a/src/xg47_native_mode.c
+++ b/src/xg47_native_mode.c
@@ -395,12 +395,6 @@ void xg47_mode_restore(ScrnInfoPtr pScrn, vgaRegPtr pVgaReg, XGIRegPtr regs)
uint8_t v3x5_5a;
uint8_t v3x5_2f;
-#if 0
- /* DAC power off
- */
- OUT3C5B(0x24, IN3C5B(0x24) & ~0x01);
- OUT3CFB(0x23, IN3CFB(0x23) | 0x03);
-#endif
vgaHWRestore(pScrn, pVgaReg, VGA_SR_ALL);
@@ -501,13 +495,6 @@ void xg47_mode_restore(ScrnInfoPtr pScrn, vgaRegPtr pVgaReg, XGIRegPtr regs)
/* setup 1st timing
*/
OUT3CFB(0x2c, IN3CFB(0x2c) & ~0x40);
-
-#if 0
- /* DAC power on
- */
- OUT3C5B(0x24, IN3C5B(0x24) | 0x01);
- OUT3CFB(0x23, IN3CFB(0x23) & ~0x03);
-#endif
}
diff --git a/src/xgi_driver.c b/src/xgi_driver.c
index 60760cc..0df529d 100644
--- a/src/xgi_driver.c
+++ b/src/xgi_driver.c
@@ -2593,13 +2593,9 @@ static int XGIValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int fl
static Bool XGIModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
{
-#if 0
- return XG47_NativeModeInit(pScrn, mode);
-#else
xf86SetSingleMode(pScrn, mode, RR_Rotate_0);
vgaHWProtect(pScrn, FALSE);
return TRUE;
-#endif
}