diff options
Diffstat (limited to 'driver/xf86-video-i740/src/i740.h')
| -rw-r--r-- | driver/xf86-video-i740/src/i740.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/driver/xf86-video-i740/src/i740.h b/driver/xf86-video-i740/src/i740.h index 7da7ebc44..3723e57a0 100644 --- a/driver/xf86-video-i740/src/i740.h +++ b/driver/xf86-video-i740/src/i740.h @@ -43,9 +43,12 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "i740_reg.h" #include "i740_macros.h" +#ifdef HAVE_XAA_H #include "xaa.h" +#endif #include "xf86Cursor.h" +#include "compat-api.h" /* Globals */ /* Memory mapped register access macros */ #define INREG8(addr) *(volatile CARD8 *)(pI740->MMIOBase + (addr)) @@ -106,7 +109,9 @@ typedef struct _I740Rec { int HasSGRAM; I740RegRec SavedReg; I740RegRec ModeReg; +#ifdef HAVE_XAA_H XAAInfoRecPtr AccelInfoRec; +#endif xf86CursorInfoPtr CursorInfoRec; FBAreaPtr CursorData; CloseScreenProcPtr CloseScreen; @@ -151,8 +156,8 @@ void I740SetPIOAccess(I740Ptr pI740); void I740SetMMIOAccess(I740Ptr pI740); void I740InitVideo(ScreenPtr pScreen); -Bool I740SwitchMode(int scrnIndex, DisplayModePtr mode, int flags); -void I740AdjustFrame(int scrnIndex, int x, int y, int flags); +Bool I740SwitchMode(SWITCH_MODE_ARGS_DECL); +void I740AdjustFrame(ADJUST_FRAME_ARGS_DECL); Bool I740_I2CInit(ScrnInfoPtr pScrn); |