diff options
author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2024-01-08 15:11:00 -0800 |
---|---|---|
committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2024-01-08 15:11:00 -0800 |
commit | abb15a335ab885b51c91ebbfd28e33db1341239c (patch) | |
tree | 386ed03cd338601a714299bb48d3a8ef1c5212b5 | |
parent | 96a44413d2d3affe3947ae0b861982d69539598c (diff) |
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r-- | src/r128.h | 2 | ||||
-rw-r--r-- | src/r128_accel.c | 2 | ||||
-rw-r--r-- | src/r128_crtc.c | 21 | ||||
-rw-r--r-- | src/r128_output.c | 6 | ||||
-rw-r--r-- | src/r128_video.c | 2 |
5 files changed, 20 insertions, 13 deletions
@@ -508,6 +508,8 @@ static inline int R128Div(int n, int d) return (n + (d / 2)) / d; } +extern int getR128EntityIndex(void); + extern R128EntPtr R128EntPriv(ScrnInfoPtr pScrn); extern void R128WaitForFifoFunction(ScrnInfoPtr pScrn, int entries); extern void R128WaitForIdle(ScrnInfoPtr pScrn); diff --git a/src/r128_accel.c b/src/r128_accel.c index 30d9f70..581be9c 100644 --- a/src/r128_accel.c +++ b/src/r128_accel.c @@ -105,8 +105,6 @@ #include "r128_rop.h" #endif -extern int getR128EntityIndex(void); - /* Flush all dirty data in the Pixel Cache to memory. */ void R128EngineFlush(ScrnInfoPtr pScrn) { diff --git a/src/r128_crtc.c b/src/r128_crtc.c index 09d0860..f03a857 100644 --- a/src/r128_crtc.c +++ b/src/r128_crtc.c @@ -54,7 +54,8 @@ /* Define CRTC registers for requested video mode. */ -Bool R128InitCrtcRegisters(xf86CrtcPtr crtc, R128SavePtr save, DisplayModePtr mode) +static Bool +R128InitCrtcRegisters(xf86CrtcPtr crtc, R128SavePtr save, DisplayModePtr mode) { ScrnInfoPtr pScrn = crtc->scrn; R128InfoPtr info = R128PTR(pScrn); @@ -166,7 +167,8 @@ Bool R128InitCrtcRegisters(xf86CrtcPtr crtc, R128SavePtr save, DisplayModePtr mo } /* Define CRTC2 registers for requested video mode. */ -Bool R128InitCrtc2Registers(xf86CrtcPtr crtc, R128SavePtr save, DisplayModePtr mode) +static Bool +R128InitCrtc2Registers(xf86CrtcPtr crtc, R128SavePtr save, DisplayModePtr mode) { ScrnInfoPtr pScrn = crtc->scrn; R128InfoPtr info = R128PTR(pScrn); @@ -400,8 +402,9 @@ static void R128InitPLLRegisters(xf86CrtcPtr crtc, R128SavePtr save, } /* Define PLL2 registers for requested video mode. */ -void R128InitPLL2Registers(xf86CrtcPtr crtc, R128SavePtr save, - R128PLLPtr pll, double dot_clock) +static void +R128InitPLL2Registers(xf86CrtcPtr crtc, R128SavePtr save, + R128PLLPtr pll, double dot_clock) { #if R128_DEBUG ScrnInfoPtr pScrn = crtc->scrn; @@ -637,8 +640,9 @@ void R128RestorePLL2Registers(ScrnInfoPtr pScrn, R128SavePtr restore) } /* Define DDA registers for requested video mode. */ -Bool R128InitDDARegisters(xf86CrtcPtr crtc, R128SavePtr save, - R128PLLPtr pll, DisplayModePtr mode) +static Bool +R128InitDDARegisters(xf86CrtcPtr crtc, R128SavePtr save, + R128PLLPtr pll, DisplayModePtr mode) { ScrnInfoPtr pScrn = crtc->scrn; R128InfoPtr info = R128PTR(pScrn); @@ -713,8 +717,9 @@ Bool R128InitDDARegisters(xf86CrtcPtr crtc, R128SavePtr save, } /* Define DDA2 registers for requested video mode. */ -Bool R128InitDDA2Registers(xf86CrtcPtr crtc, R128SavePtr save, - R128PLLPtr pll, DisplayModePtr mode) +static Bool +R128InitDDA2Registers(xf86CrtcPtr crtc, R128SavePtr save, + R128PLLPtr pll, DisplayModePtr mode) { ScrnInfoPtr pScrn = crtc->scrn; R128InfoPtr info = R128PTR(pScrn); diff --git a/src/r128_output.c b/src/r128_output.c index 1d98fb9..fd17f30 100644 --- a/src/r128_output.c +++ b/src/r128_output.c @@ -50,7 +50,8 @@ static void R128ConnectorFindMonitor(ScrnInfoPtr pScrn, xf86OutputPtr output); /* Define DAC registers for the requested video mode. */ -void R128InitDACRegisters(R128SavePtr orig, R128SavePtr save, xf86OutputPtr output) +static void +R128InitDACRegisters(R128SavePtr orig, R128SavePtr save, xf86OutputPtr output) { ScrnInfoPtr pScrn = output->scrn; R128InfoPtr info = R128PTR(pScrn); @@ -413,7 +414,8 @@ static Bool R128I2CInit(xf86OutputPtr output, I2CBusPtr *bus_ptr, char *name) return TRUE; } -void R128GetConnectorInfoFromBIOS(ScrnInfoPtr pScrn, R128OutputType *otypes) +static void +R128GetConnectorInfoFromBIOS(ScrnInfoPtr pScrn, R128OutputType *otypes) { R128InfoPtr info = R128PTR(pScrn); uint16_t bios_header, offset; diff --git a/src/r128_video.c b/src/r128_video.c index cac4301..d819e88 100644 --- a/src/r128_video.c +++ b/src/r128_video.c @@ -389,7 +389,7 @@ R128QueryBestSize( * */ -Bool +static Bool R128DMA( R128InfoPtr info, unsigned char *src, |