From 5f110dc4c1c395ef07bd401f0e8abea095a1d22f Mon Sep 17 00:00:00 2001 From: Kevin Brace Date: Fri, 10 May 2019 19:39:45 -0700 Subject: Move IsClearTV function location inside trident_pll.c Signed-off-by: Kevin Brace --- src/trident_pll.c | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/src/trident_pll.c b/src/trident_pll.c index 1301daf..cf32a0a 100644 --- a/src/trident_pll.c +++ b/src/trident_pll.c @@ -37,7 +37,23 @@ #include "trident.h" #include "trident_regs.h" -static void IsClearTV(ScrnInfoPtr pScrn); + +static void +IsClearTV(ScrnInfoPtr pScrn) +{ + int vgaIOBase = VGAHWPTR(pScrn)->IOBase; + TRIDENTPtr pTrident = TRIDENTPTR(pScrn); + CARD8 temp; + + if (pTrident->frequency != 0) return; + + OUTB(vgaIOBase + 4, 0xC0); + temp = INB(vgaIOBase + 5); + if (temp & 0x80) + pTrident->frequency = PAL; + else + pTrident->frequency = NTSC; +} void TGUISetClock(ScrnInfoPtr pScrn, int clock, CARD8 *a, CARD8 *b) @@ -123,23 +139,6 @@ TGUISetClock(ScrnInfoPtr pScrn, int clock, CARD8 *a, CARD8 *b) clock/1000., p, q, r); } -static void -IsClearTV(ScrnInfoPtr pScrn) -{ - int vgaIOBase = VGAHWPTR(pScrn)->IOBase; - TRIDENTPtr pTrident = TRIDENTPTR(pScrn); - CARD8 temp; - - if (pTrident->frequency != 0) return; - - OUTB(vgaIOBase + 4, 0xC0); - temp = INB(vgaIOBase + 5); - if (temp & 0x80) - pTrident->frequency = PAL; - else - pTrident->frequency = NTSC; -} - void TridentFindClock(ScrnInfoPtr pScrn, int clock) { -- cgit v1.2.3