frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vidmode: Hide implementation details 

Also remove vidmodeproc.h from the SDK since no drivers are using it.

Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Adam Jackson 2014-07-08 14:27:02 -04:00
parent 49d7bae7f4
commit 4da66d9e03
4 changed files with 39 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/xfree86/common/Makefile.am
View File

@ -16,7 +16,6 @@ endif
if XF86VIDMODE if XF86VIDMODE
XF86VMODESOURCES = xf86vmode.c XF86VMODESOURCES = xf86vmode.c
XF86VMODE_SDK = vidmodeproc.h
endif endif
if DGA if DGA

57
hw/xfree86/common/vidmodeproc.h
View File

@ -41,44 +41,43 @@ typedef union {
extern Bool VidModeExtensionInit(ScreenPtr pScreen); extern Bool VidModeExtensionInit(ScreenPtr pScreen);
extern _X_EXPORT Bool VidModeAvailable(int scrnIndex); extern Bool VidModeGetCurrentModeline(int scrnIndex, void **mode,
extern _X_EXPORT Bool VidModeGetCurrentModeline(int scrnIndex, void **mode,
int *dotClock); int *dotClock);
extern _X_EXPORT Bool VidModeGetFirstModeline(int scrnIndex, void **mode, extern Bool VidModeGetFirstModeline(int scrnIndex, void **mode,
int *dotClock); int *dotClock);
extern _X_EXPORT Bool VidModeGetNextModeline(int scrnIndex, void **mode, extern Bool VidModeGetNextModeline(int scrnIndex, void **mode,
int *dotClock); int *dotClock);
extern _X_EXPORT Bool VidModeDeleteModeline(int scrnIndex, void *mode); extern Bool VidModeDeleteModeline(int scrnIndex, void *mode);
extern _X_EXPORT Bool VidModeZoomViewport(int scrnIndex, int zoom); extern Bool VidModeZoomViewport(int scrnIndex, int zoom);
extern _X_EXPORT Bool VidModeGetViewPort(int scrnIndex, int *x, int *y); extern Bool VidModeGetViewPort(int scrnIndex, int *x, int *y);
extern _X_EXPORT Bool VidModeSetViewPort(int scrnIndex, int x, int y); extern Bool VidModeSetViewPort(int scrnIndex, int x, int y);
extern _X_EXPORT Bool VidModeSwitchMode(int scrnIndex, void *mode); extern Bool VidModeSwitchMode(int scrnIndex, void *mode);
extern _X_EXPORT Bool VidModeLockZoom(int scrnIndex, Bool lock); extern Bool VidModeLockZoom(int scrnIndex, Bool lock);
extern _X_EXPORT Bool VidModeGetMonitor(int scrnIndex, void **monitor); extern Bool VidModeGetMonitor(int scrnIndex, void **monitor);
extern _X_EXPORT int VidModeGetNumOfClocks(int scrnIndex, Bool *progClock); extern int VidModeGetNumOfClocks(int scrnIndex, Bool *progClock);
extern _X_EXPORT Bool VidModeGetClocks(int scrnIndex, int *Clocks); extern Bool VidModeGetClocks(int scrnIndex, int *Clocks);
extern _X_EXPORT ModeStatus VidModeCheckModeForMonitor(int scrnIndex, extern ModeStatus VidModeCheckModeForMonitor(int scrnIndex,
void *mode); void *mode);
extern _X_EXPORT ModeStatus VidModeCheckModeForDriver(int scrnIndex, extern ModeStatus VidModeCheckModeForDriver(int scrnIndex,
void *mode); void *mode);
extern _X_EXPORT void VidModeSetCrtcForMode(int scrnIndex, void *mode); extern void VidModeSetCrtcForMode(int scrnIndex, void *mode);
extern _X_EXPORT Bool VidModeAddModeline(int scrnIndex, void *mode); extern Bool VidModeAddModeline(int scrnIndex, void *mode);
extern _X_EXPORT int VidModeGetDotClock(int scrnIndex, int Clock); extern int VidModeGetDotClock(int scrnIndex, int Clock);
extern _X_EXPORT int VidModeGetNumOfModes(int scrnIndex); extern int VidModeGetNumOfModes(int scrnIndex);
extern _X_EXPORT Bool VidModeSetGamma(int scrnIndex, float red, float green, extern Bool VidModeSetGamma(int scrnIndex, float red, float green,
float blue); float blue);
extern _X_EXPORT Bool VidModeGetGamma(int scrnIndex, float *red, float *green, extern Bool VidModeGetGamma(int scrnIndex, float *red, float *green,
float *blue); float *blue);
extern _X_EXPORT void *VidModeCreateMode(void); extern void *VidModeCreateMode(void);
extern _X_EXPORT void VidModeCopyMode(void *modefrom, void *modeto); extern void VidModeCopyMode(void *modefrom, void *modeto);
extern _X_EXPORT int VidModeGetModeValue(void *mode, int valtyp); extern int VidModeGetModeValue(void *mode, int valtyp);
extern _X_EXPORT void VidModeSetModeValue(void *mode, int valtyp, int val); extern void VidModeSetModeValue(void *mode, int valtyp, int val);
extern _X_EXPORT vidMonitorValue VidModeGetMonitorValue(void *monitor, extern vidMonitorValue VidModeGetMonitorValue(void *monitor,
int valtyp, int indx); int valtyp, int indx);
extern _X_EXPORT Bool VidModeSetGammaRamp(int, int, CARD16 *, CARD16 *, extern Bool VidModeSetGammaRamp(int, int, CARD16 *, CARD16 *,
CARD16 *); CARD16 *);
extern _X_EXPORT Bool VidModeGetGammaRamp(int, int, CARD16 *, CARD16 *, extern Bool VidModeGetGammaRamp(int, int, CARD16 *, CARD16 *,
CARD16 *); CARD16 *);
extern _X_EXPORT int VidModeGetGammaRampSize(int scrnIndex); extern int VidModeGetGammaRampSize(int scrnIndex);
#endif #endif

2
hw/xfree86/common/xf86VidMode.c
View File

@ -111,7 +111,7 @@ VidModeClose(ScreenPtr pScreen)
return pScreen->CloseScreen(pScreen); return pScreen->CloseScreen(pScreen);
} }
Bool static Bool
VidModeAvailable(int scrnIndex) VidModeAvailable(int scrnIndex)
{ {
ScrnInfoPtr pScrn; ScrnInfoPtr pScrn;

3
hw/xfree86/sdksyms.sh
View File

@ -136,9 +136,6 @@ cat > sdksyms.c << EOF
# include "xf86xvmc.h" # include "xf86xvmc.h"
# include "xf86xvpriv.h" # include "xf86xvpriv.h"
#endif #endif
#if XF86VIDMODE
# include "vidmodeproc.h"
#endif
#include "xorgVersion.h" #include "xorgVersion.h"
#if defined(__sparc__) || defined(__sparc) #if defined(__sparc__) || defined(__sparc)
# include "xf86sbusBus.h" # include "xf86sbusBus.h"