summaryrefslogtreecommitdiff
path: root/src/glamo.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/glamo.c')
-rw-r--r--src/glamo.c28
1 files changed, 2 insertions, 26 deletions
diff --git a/src/glamo.c b/src/glamo.c
index 7848096..6bc4c15 100644
--- a/src/glamo.c
+++ b/src/glamo.c
@@ -23,9 +23,6 @@
/* for visuals */
#include "fb.h"
-#ifdef USE_AFB
-#include "afb.h"
-#endif
#include "xf86Resources.h"
#include "xf86RAC.h"
@@ -38,6 +35,8 @@
#include <pciaccess.h>
#endif
+#include "glamo.h"
+
static Bool debug = 0;
#define TRACE_ENTER(str) \
@@ -236,29 +235,6 @@ GlamoSetup(pointer module, pointer opts, int *errmaj, int *errmin)
#endif /* XFree86LOADER */
-/* -------------------------------------------------------------------- */
-/* our private data, and two functions to allocate/free this */
-
-typedef struct {
- unsigned char* fbstart;
- unsigned char* fbmem;
- int fboff;
- int lineLength;
- int rotate;
- Bool shadowFB;
- void *shadow;
- CloseScreenProcPtr CloseScreen;
- CreateScreenResourcesProcPtr CreateScreenResources;
- void (*PointerMoved)(int index, int x, int y);
- EntityInfoPtr pEnt;
- /* DGA info */
- DGAModePtr pDGAMode;
- int nDGAMode;
- OptionInfoPtr Options;
-} GlamoRec, *GlamoPtr;
-
-#define GlamoPTR(p) ((GlamoPtr)((p)->driverPrivate))
-
static Bool
GlamoGetRec(ScrnInfoPtr pScrn)
{