diff options
Diffstat (limited to 'src/i830_xf86Modes.h')
| -rw-r--r-- | src/i830_xf86Modes.h | 69 |
1 files changed, 28 insertions, 41 deletions
diff --git a/src/i830_xf86Modes.h b/src/i830_xf86Modes.h index a7d0839d..d032199d 100644 --- a/src/i830_xf86Modes.h +++ b/src/i830_xf86Modes.h @@ -29,67 +29,54 @@ #define _I830_XF86MODES_H_ #include "xorgVersion.h" #include "xf86Parser.h" +#include "i830_xf86Rename.h" -#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,2,99,2,0) -double i830_xf86ModeHSync(DisplayModePtr mode); -double i830_xf86ModeVRefresh(DisplayModePtr mode); -DisplayModePtr i830_xf86DuplicateMode(DisplayModePtr pMode); -DisplayModePtr i830_xf86DuplicateModes(ScrnInfoPtr pScrn, +double xf86ModeHSync(DisplayModePtr mode); +double xf86ModeVRefresh(DisplayModePtr mode); +DisplayModePtr xf86DuplicateMode(DisplayModePtr pMode); +DisplayModePtr xf86DuplicateModes(ScrnInfoPtr pScrn, DisplayModePtr modeList); -void i830_xf86SetModeDefaultName(DisplayModePtr mode); -void i830_xf86SetModeCrtc(DisplayModePtr p, int adjustFlags); -Bool i830_xf86ModesEqual(DisplayModePtr pMode1, DisplayModePtr pMode2); -void i830_xf86PrintModeline(int scrnIndex,DisplayModePtr mode); -DisplayModePtr i830_xf86ModesAdd(DisplayModePtr modes, DisplayModePtr new); +void xf86SetModeDefaultName(DisplayModePtr mode); +void xf86SetModeCrtc(DisplayModePtr p, int adjustFlags); +Bool xf86ModesEqual(DisplayModePtr pMode1, DisplayModePtr pMode2); +void xf86PrintModeline(int scrnIndex,DisplayModePtr mode); +DisplayModePtr xf86ModesAdd(DisplayModePtr modes, DisplayModePtr new); -DisplayModePtr i830_xf86DDCGetModes(int scrnIndex, xf86MonPtr DDC); -DisplayModePtr i830_xf86CVTMode(int HDisplay, int VDisplay, float VRefresh, - Bool Reduced, Bool Interlaced); - -#define xf86ModeHSync i830_xf86ModeHSync -#define xf86ModeVRefresh i830_xf86ModeVRefresh -#define xf86DuplicateMode i830_xf86DuplicateMode -#define xf86DuplicateModes i830_xf86DuplicateModes -#define xf86SetModeDefaultName i830_xf86SetModeDefaultName -#define xf86SetModeCrtc i830_xf86SetModeCrtc -#define xf86ModesEqual i830_xf86ModesEqual -#define xf86PrintModeline i830_xf86PrintModeline -#define xf86ModesAdd i830_xf86ModesAdd -#define xf86DDCGetModes i830_xf86DDCGetModes -#define xf86CVTMode i830_xf86CVTMode -#endif /* XORG_VERSION_CURRENT <= 7.2.99.2 */ +DisplayModePtr xf86DDCGetModes(int scrnIndex, xf86MonPtr DDC); +DisplayModePtr xf86CVTMode(int HDisplay, int VDisplay, float VRefresh, + Bool Reduced, Bool Interlaced); void -i830xf86ValidateModesFlags(ScrnInfoPtr pScrn, DisplayModePtr modeList, - int flags); +xf86ValidateModesFlags(ScrnInfoPtr pScrn, DisplayModePtr modeList, + int flags); void -i830xf86ValidateModesClocks(ScrnInfoPtr pScrn, DisplayModePtr modeList, - int *min, int *max, int n_ranges); +xf86ValidateModesClocks(ScrnInfoPtr pScrn, DisplayModePtr modeList, + int *min, int *max, int n_ranges); void -i830xf86ValidateModesSize(ScrnInfoPtr pScrn, DisplayModePtr modeList, - int maxX, int maxY, int maxPitch); +xf86ValidateModesSize(ScrnInfoPtr pScrn, DisplayModePtr modeList, + int maxX, int maxY, int maxPitch); void -i830xf86ValidateModesSync(ScrnInfoPtr pScrn, DisplayModePtr modeList, - MonPtr mon); +xf86ValidateModesSync(ScrnInfoPtr pScrn, DisplayModePtr modeList, + MonPtr mon); void -i830xf86PruneInvalidModes(ScrnInfoPtr pScrn, DisplayModePtr *modeList, - Bool verbose); +xf86PruneInvalidModes(ScrnInfoPtr pScrn, DisplayModePtr *modeList, + Bool verbose); void -i830xf86ValidateModesFlags(ScrnInfoPtr pScrn, DisplayModePtr modeList, - int flags); +xf86ValidateModesFlags(ScrnInfoPtr pScrn, DisplayModePtr modeList, + int flags); void -i830xf86ValidateModesUserConfig(ScrnInfoPtr pScrn, DisplayModePtr modeList); +xf86ValidateModesUserConfig(ScrnInfoPtr pScrn, DisplayModePtr modeList); DisplayModePtr -i830xf86GetMonitorModes (ScrnInfoPtr pScrn, XF86ConfMonitorPtr conf_monitor); +xf86GetMonitorModes (ScrnInfoPtr pScrn, XF86ConfMonitorPtr conf_monitor); DisplayModePtr -i830xf86GetDefaultModes (Bool interlaceAllowed, Bool doubleScanAllowed); +xf86GetDefaultModes (Bool interlaceAllowed, Bool doubleScanAllowed); #endif /* _I830_XF86MODES_H_ */ |