From fa27a1147d55f79cd57daeef45eb5344181e7db8 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Wed, 17 Dec 2025 14:09:26 +0100 Subject: [PATCH] drop ancient READOUT code pathes The symbol isn't defined anymore for over two decades now, so no need to keep these ancient and never compiled code pathes. Signed-off-by: Enrico Weigelt, metux IT consult --- src/trident.h | 3 --- src/trident_dac.c | 37 ------------------------------------- src/trident_pll.c | 34 ---------------------------------- 3 files changed, 74 deletions(-) diff --git a/src/trident.h b/src/trident.h index 4f34588..1335bd6 100644 --- a/src/trident.h +++ b/src/trident.h @@ -148,9 +148,6 @@ typedef struct { int lcdMode; Bool lcdActive; Bool doInit; -#ifdef READOUT - Bool DontSetClock; -#endif TRIDENTRegRec SavedReg; TRIDENTRegRec ModeReg; I2CBusPtr DDC; diff --git a/src/trident_dac.c b/src/trident_dac.c index 1cf3dd4..23db597 100644 --- a/src/trident_dac.c +++ b/src/trident_dac.c @@ -270,14 +270,7 @@ TridentInit(ScrnInfoPtr pScrn, DisplayModePtr mode) if (pTrident->IsCyber) { Bool LCDActive; -#ifdef READOUT - Bool ShadowModeActive; -#endif int i = pTrident->lcdMode; -#ifdef READOUT - OUTB(0x3CE, CyberControl); - ShadowModeActive = ((INB(0x3CF) & 0x81) == 0x81); -#endif OUTB(0x3CE, FPConfig); pReg->tridentRegs3CE[FPConfig] = INB(0x3CF); if (pTrident->dspOverride) { @@ -321,27 +314,6 @@ TridentInit(ScrnInfoPtr pScrn, DisplayModePtr mode) OUTB(0x3CE,VertStretch); pReg->tridentRegs3CE[VertStretch] = INB(0x3CF); -#ifdef READOUT - if ((!((pReg->tridentRegs3CE[VertStretch] & 1) || - (pReg->tridentRegs3CE[HorStretch] & 1))) - && (!LCDActive || ShadowModeActive)) - { - unsigned char tmp; - - SHADOW_ENABLE(tmp); - OUTB(vgaIOBase + 4,0); - pReg->tridentRegs3x4[0x0] = INB(vgaIOBase + 5); - OUTB(vgaIOBase + 4,3); - pReg->tridentRegs3x4[0x3] = INB(vgaIOBase + 5); - OUTB(vgaIOBase + 4,4); - pReg->tridentRegs3x4[0x4] = INB(vgaIOBase + 5); - OUTB(vgaIOBase + 4,5); - pReg->tridentRegs3x4[0x5] = INB(vgaIOBase + 5); - OUTB(vgaIOBase + 4,0x6); - pReg->tridentRegs3x4[0x6] = INB(vgaIOBase + 5); - SHADOW_RESTORE(tmp); - } else -#endif { if (i != 0xff) { pReg->tridentRegs3x4[0x0] = LCD[i].shadow_0; @@ -867,9 +839,6 @@ TridentRestore(ScrnInfoPtr pScrn, TRIDENTRegPtr tridentReg) } if (Is3Dchip) { -#ifdef READOUT - if (!pTrident->DontSetClock) -#endif { OUTW(0x3C4, (tridentReg->tridentRegsClock[0x01])<<8 | ClockLow); OUTW(0x3C4, (tridentReg->tridentRegsClock[0x02])<<8 | ClockHigh); @@ -879,9 +848,6 @@ TridentRestore(ScrnInfoPtr pScrn, TRIDENTRegPtr tridentReg) OUTW(0x3C4,(tridentReg->tridentRegsClock[0x04])<<8 | MCLKHigh); } } else { -#ifdef READOUT - if (!pTrident->DontSetClock) -#endif { OUTB(0x43C8, tridentReg->tridentRegsClock[0x01]); OUTB(0x43C9, tridentReg->tridentRegsClock[0x02]); @@ -891,9 +857,6 @@ TridentRestore(ScrnInfoPtr pScrn, TRIDENTRegPtr tridentReg) OUTB(0x43C7, tridentReg->tridentRegsClock[0x04]); } } -#ifdef READOUT - if (!pTrident->DontSetClock) -#endif { OUTB(0x3C2, tridentReg->tridentRegsClock[0x00]); } diff --git a/src/trident_pll.c b/src/trident_pll.c index f029b66..cc796c0 100644 --- a/src/trident_pll.c +++ b/src/trident_pll.c @@ -143,44 +143,12 @@ TridentFindClock(ScrnInfoPtr pScrn, int clock) TRIDENTPtr pTrident = TRIDENTPTR(pScrn); pTrident->MUX = FALSE; -#ifdef READOUT - pTrident->DontSetClock = FALSE; -#endif pTrident->currentClock = clock; if (pTrident->IsCyber) { Bool LCDActive; -#ifdef READOUT - Bool ShadowModeActive; - Bool HStretch; - Bool VStretch; -#endif OUTB(0x3CE, FPConfig); LCDActive = (INB(0x3CF) & 0x10); -#ifdef READOUT - OUTB(0x3CE, HorStretch); - HStretch = (INB(0x3CF) & 0x01); - OUTB(0x3CE, VertStretch); - VStretch = (INB(0x3CF) & 0x01); - - if (!(VStretch || HStretch) && LCDActive) { - CARD8 temp; - temp = INB(0x3C8); - temp = INB(0x3C6); - temp = INB(0x3C6); - temp = INB(0x3C6); - temp = INB(0x3C6); - pTrident->MUX = ((INB(0x3C6) & 0x20) == 0x20); - temp = INB(0x3C8); - pTrident->DontSetClock = TRUE; - xf86DrvMsg(pScrn->scrnIndex, X_INFO, - "Keeping Clock for LCD Mode\n"); - xf86DrvMsg(pScrn->scrnIndex, X_INFO, - "MUX is %s\n", - pTrident->MUX ? "on" : "off"); - return; - } else -#endif { if (pTrident->lcdMode != 0xff && LCDActive) pTrident->currentClock = clock = @@ -188,13 +156,11 @@ TridentFindClock(ScrnInfoPtr pScrn, int clock) } } -#ifndef READOUT if (pTrident->Chipset != BLADEXP && clock > pTrident->MUXThreshold) pTrident->MUX = TRUE; else pTrident->MUX = FALSE; -#endif } float