XLibre/xf86-video-trident
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-trident.git synced 2026-03-24 01:25:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

drop ancient READOUT code pathes

Browse Source 
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 <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-12-17 14:09:26 +01:00
parent 086c5f9205
commit fa27a1147d
3 changed files with 0 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/trident.h
View File

@@ -148,9 +148,6 @@ typedef struct {
int lcdMode;
Bool lcdActive;
Bool doInit;
#ifdef READOUT
Bool DontSetClock;
#endif
TRIDENTRegRec SavedReg;
TRIDENTRegRec ModeReg;
I2CBusPtr DDC;

37
src/trident_dac.c
View File

@@ -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]);
}

34
src/trident_pll.c
View File

@@ -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