diff options
Diffstat (limited to 'driver/xf86-video-apm/src/apm.h')
| -rw-r--r-- | driver/xf86-video-apm/src/apm.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/driver/xf86-video-apm/src/apm.h b/driver/xf86-video-apm/src/apm.h index 089428997..a3c06f859 100644 --- a/driver/xf86-video-apm/src/apm.h +++ b/driver/xf86-video-apm/src/apm.h @@ -23,8 +23,10 @@ #include "fb.h" /* Drivers using the XAA interface ... */ +#ifdef HAVE_XAA_H #include "xaa.h" #include "xaalocal.h" +#endif #include "xf86Cursor.h" #include "xf86fbman.h" @@ -43,6 +45,7 @@ #include "xf86xv.h" #include <X11/extensions/Xv.h> +#include "compat-api.h" #ifdef TRUE #undef TRUE #endif @@ -121,7 +124,9 @@ typedef struct { int MaxClock; /* Max ramdac clock */ ApmFBLayout CurrentLayout, SavedLayout; EntityInfoPtr pEnt; +#ifdef HAVE_XAA_H XAAInfoRecPtr AccelInfoRec, DGAXAAInfo; +#endif xf86CursorInfoPtr CursorInfoRec; int DGAactive, numDGAModes; DGAModePtr DGAModes; @@ -131,11 +136,13 @@ typedef struct { Bool apmTransparency, apmClip, ShadowFB, I2C; int rop, Bg8x8, Fg8x8; I2CBusPtr I2CPtr; +#ifdef HAVE_XAA_H struct ApmStippleCacheRec { XAACacheInfoRec apmStippleCache; FBAreaPtr area; unsigned int apmStippleCached:1; } apmCache[APM_CACHE_NUMBER]; +#endif int apmCachePtr; unsigned char regcurr[0x54]; ScreenPtr pScreen; @@ -217,10 +224,11 @@ extern Bool ApmI2CInit(ScrnInfoPtr pScrn); extern void XFree86RushExtensionInit(ScreenPtr pScreen); extern void ApmInitVideo(ScreenPtr pScreen); extern void ApmInitVideo_IOP(ScreenPtr pScreen); +#ifdef HAVE_XAA_H extern void ApmSetupXAAInfo(ApmPtr pApm, XAAInfoRecPtr pXAAinfo); -extern Bool ApmSwitchMode(int scrnIndex, DisplayModePtr mode, - int flags); -extern void ApmAdjustFrame(int scrnIndex, int x, int y, int flags); +#endif +extern Bool ApmSwitchMode(SWITCH_MODE_ARGS_DECL); +extern void ApmAdjustFrame(ADJUST_FRAME_ARGS_DECL); extern void ApmHWCursorReserveSpace(ApmPtr pApm); extern void ApmAccelReserveSpace(ApmPtr pApm); |