1 files changed, 6 insertions, 35 deletions
diff --git a/src/geode.h b/src/geode.h
index 3dd3e15..5e6d422 100644
--- a/src/geode.h
+++ b/src/geode.h
@@ -32,9 +32,6 @@
 #endif
 #include "geode_pcirename.h"
 
-#ifdef HAVE_XAA_H
-#include "xaa.h"
-#endif
 #include "exa.h"
 #include "xf86Cursor.h"
 
@@ -57,12 +54,6 @@
 #undef XF86EXA
 #endif
 
-#ifdef HAVE_XAA_H
-#define XF86XAA 1
-#else
-#undef XF86XAA
-#endif
-
 #define CFB 0
 #define INT10_SUPPORT 1
 
@@ -83,21 +74,6 @@
 
 #define GFX_CPU_GEODELX   4
 
-#if defined(HAVE_GX) && XF86XAA
-#define GX_FILL_RECT_SUPPORT 1
-#define GX_BRES_LINE_SUPPORT 1
-#define GX_DASH_LINE_SUPPORT 0  /* does not do dashed lines */
-#define GX_MONO_8X8_PAT_SUPPORT 1
-#define GX_CLREXP_8X8_PAT_SUPPORT 1
-#define GX_SCR2SCREXP_SUPPORT 1
-#define GX_SCR2SCRCPY_SUPPORT 1
-#define GX_CPU2SCREXP_SUPPORT 1
-#define GX_SCANLINE_SUPPORT 1
-#define GX_USE_OFFSCRN_MEM 0
-#define GX_ONE_LINE_AT_A_TIME 1
-#define GX_WRITE_PIXMAP_SUPPORT 1
-#endif
-
 #define GFX(func) gfx_##func
 #define GFX2(func) gfx2_##func
 
@@ -252,7 +228,7 @@ typedef struct _geodeRec {
 
     /* Hooks */
 
-    void (*PointerMoved) (POINTER_MOVED_ARGS_DECL);
+    void (*PointerMoved) (ScrnInfoPtr pScrn, int x, int y);
     CloseScreenProcPtr CloseScreen;
     Bool (*CreateScreenResources) (ScreenPtr);
 
@@ -297,8 +273,6 @@ typedef struct _geodeRec {
 
     xf86CursorInfoPtr CursorInfo;
 
-    /* XAA structures */
-
     unsigned int cpySrcOffset;
     int cpySrcPitch, cpySrcBpp;
     int cpyDx, cpyDy;
@@ -311,9 +285,6 @@ typedef struct _geodeRec {
     int NoOfImgBuffers;
     unsigned char **AccelColorExpandBuffers;
     int NoOfColorExpandLines;
-#if XF86XAA
-    XAAInfoRecPtr AccelInfoRec;
-#endif
 
     /* Save state */
     unsigned long FBCompressionOffset;
@@ -407,11 +378,11 @@ Bool RegionsEqual(RegionPtr A, RegionPtr B);
 
 void GeodeProbeDDC(ScrnInfoPtr pScrni, int index);
 xf86MonPtr GeodeDoDDC(ScrnInfoPtr pScrni, int index);
-Bool GeodeI2CInit(ScrnInfoPtr pScrni, I2CBusPtr * ptr, char *name);
+Bool GeodeI2CInit(ScrnInfoPtr pScrni, I2CBusPtr * ptr, const char *name);
 
 int GeodeGetFPGeometry(const char *str, int *width, int *height);
-void GeodePointerMoved(POINTER_MOVED_ARGS_DECL);
-void GeodeFreeScreen(FREE_SCREEN_ARGS_DECL);
+void GeodePointerMoved(ScrnInfoPtr pScrn, int x, int y);
+void GeodeFreeScreen(ScrnInfoPtr pScrn);
 int GeodeCalculatePitchBytes(unsigned int width, unsigned int bpp);
 void GXSetupChipsetFPtr(ScrnInfoPtr pScrn);
 
@@ -465,9 +436,9 @@ void LXSetupOutput(ScrnInfoPtr);
 
 /* lx_panel.c */
 DisplayModePtr LXGetLegacyPanelMode(ScrnInfoPtr pScrni);
-DisplayModePtr LXGetManualPanelMode(char *modestr);
+DisplayModePtr LXGetManualPanelMode(const char *modestr);
 
-void LXAdjustFrame(ADJUST_FRAME_ARGS_DECL);
+void LXAdjustFrame(ScrnInfoPtr pScrni, int x, int y);
 
 /* lx_display.c */
 void LXSetupCrtc(ScrnInfoPtr pScrni);