diff options
Diffstat (limited to 'driver/xf86-video-r128/src/r128.h')
| -rw-r--r-- | driver/xf86-video-r128/src/r128.h | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/driver/xf86-video-r128/src/r128.h b/driver/xf86-video-r128/src/r128.h index fcef00c3d..bee156288 100644 --- a/driver/xf86-video-r128/src/r128.h +++ b/driver/xf86-video-r128/src/r128.h @@ -44,7 +44,10 @@ #include "xf86Pci.h" /* XAA and Cursor Support */ +#ifdef HAVE_XAA_H #include "xaa.h" +#endif +#include "xf86fbman.h" #include "xf86Cursor.h" /* DDC support */ @@ -53,8 +56,6 @@ /* Xv support */ #include "xf86xv.h" -#include "r128_probe.h" - /* DRI support */ #ifndef XF86DRI #undef R128DRI @@ -67,8 +68,13 @@ #include "GL/glxint.h" #endif +#include "fb.h" + +#include "compat-api.h" #include "atipcirename.h" +#include "r128_probe.h" + #define R128_DEBUG 0 /* Turn off debugging output */ #define R128_IDLE_RETRY 32 /* Fall out of idle loops after this count */ #define R128_TIMEOUT 2000000 /* Fall out of wait loops after this count */ @@ -270,12 +276,14 @@ typedef struct { R128SaveRec SavedReg; /* Original (text) mode */ R128SaveRec ModeReg; /* Current mode */ - Bool (*CloseScreen)(int, ScreenPtr); - void (*BlockHandler)(int, pointer, pointer, pointer); + Bool (*CloseScreen)(CLOSE_SCREEN_ARGS_DECL); + void (*BlockHandler)(BLOCKHANDLER_ARGS_DECL); Bool PaletteSavedOnVT; /* Palette saved on last VT switch */ +#ifdef HAVE_XAA_H XAAInfoRecPtr accel; +#endif Bool accelOn; xf86CursorInfoPtr cursor; unsigned long cursor_start; |