new server APIs are not in server-1.2 (version 7.1.99.2)
This commit is contained in:
parent
a736496114
commit
ffd8aacbe7
|
|
@ -44,11 +44,11 @@ Bool i830PipeInUse(xf86CrtcPtr crtc);
|
|||
|
||||
/** @{
|
||||
*/
|
||||
#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,1,99,2,0)
|
||||
#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,2,99,2,0)
|
||||
DisplayModePtr i830_xf86DDCGetModes(int scrnIndex, xf86MonPtr DDC);
|
||||
DisplayModePtr i830_xf86CVTMode(int HDisplay, int VDisplay, float VRefresh,
|
||||
Bool Reduced, Bool Interlaced);
|
||||
#define xf86DDCGetModes i830_xf86DDCGetModes
|
||||
#define xf86CVTMode i830_xf86CVTMode
|
||||
#endif /* XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,1,99,2) */
|
||||
#endif /* XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,2,99,2) */
|
||||
/** @} */
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@
|
|||
#include "i830.h"
|
||||
#include "i830_display.h"
|
||||
|
||||
#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,1,99,2,0)
|
||||
#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,2,99,2,0)
|
||||
|
||||
/*
|
||||
* TODO:
|
||||
|
|
@ -208,4 +208,4 @@ xf86DDCGetModes(int scrnIndex, xf86MonPtr DDC)
|
|||
return Modes;
|
||||
}
|
||||
|
||||
#endif /* XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,1,99,2,0) */
|
||||
#endif /* XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,2,99,2,0) */
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@
|
|||
* there but we still want to use. We need to come up with better API here.
|
||||
*/
|
||||
|
||||
#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,1,99,2,0)
|
||||
#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,2,99,2,0)
|
||||
/**
|
||||
* Calculates the horizontal sync rate of a mode.
|
||||
*
|
||||
|
|
@ -321,7 +321,7 @@ xf86PrintModeline(int scrnIndex,DisplayModePtr mode)
|
|||
mode->VTotal, flags, xf86ModeHSync(mode));
|
||||
xfree(flags);
|
||||
}
|
||||
#endif /* XORG_VERSION_CURRENT <= 7.1.99.2 */
|
||||
#endif /* XORG_VERSION_CURRENT <= 7.2.99.2 */
|
||||
|
||||
/**
|
||||
* Marks as bad any modes with unsupported flags.
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
#define _I830_XF86MODES_H_
|
||||
#include "xorgVersion.h"
|
||||
|
||||
#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,1,99,2,0)
|
||||
#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);
|
||||
|
|
@ -50,7 +50,7 @@ DisplayModePtr i830_xf86ModesAdd(DisplayModePtr modes, DisplayModePtr new);
|
|||
#define xf86ModesEqual i830_xf86ModesEqual
|
||||
#define xf86PrintModeline i830_xf86PrintModeline
|
||||
#define xf86ModesAdd i830_xf86ModesAdd
|
||||
#endif /* XORG_VERSION_CURRENT <= 7.1.99.2 */
|
||||
#endif /* XORG_VERSION_CURRENT <= 7.2.99.2 */
|
||||
|
||||
void
|
||||
i830xf86ValidateModesFlags(ScrnInfoPtr pScrn, DisplayModePtr modeList,
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@
|
|||
#include "i830.h"
|
||||
#include "i830_display.h"
|
||||
|
||||
#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,1,99,2,0)
|
||||
#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,2,99,2,0)
|
||||
/*
|
||||
* Generate a CVT standard mode from HDisplay, VDisplay and VRefresh.
|
||||
*
|
||||
|
|
@ -303,4 +303,4 @@ xf86CVTMode(int HDisplay, int VDisplay, float VRefresh, Bool Reduced,
|
|||
|
||||
return Mode;
|
||||
}
|
||||
#endif /* XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,1,99,2,0) */
|
||||
#endif /* XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,2,99,2,0) */
|
||||
|
|
|
|||
Loading…
Reference in New Issue