glamo* : backup commit

larsclausen · Dec 29, 2008 · bfa7a25 · bfa7a25
1 parent e056e66
commit bfa7a25
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/glamo-draw.h b/src/glamo-draw.h
@@ -1,8 +1,8 @@
 /*
- * Copyright © 2007 OpenMoko, Inc.
+ * Copyright  2007 OpenMoko, Inc.
  *
  * This driver is based on Xati,
- * Copyright © 2004 Eric Anholt
+ * Copyright  2004 Eric Anholt
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -26,7 +26,7 @@
 #ifndef _GLAMO_DRAW_H_
 #define _GLAMO_DRAW_H_
 
-void GLAMOWaitIdle(GLAMOScreenInfo *glamos);
+void GLAMOWaitIdle(GlamoPtr *pGlamo);
 
 #define GLAMO_TRACE_FALL 1
 #define GLAMO_TRACE_DRAW 1

diff --git a/src/glamo.h b/src/glamo.h
@@ -33,6 +33,7 @@
 #include "config.h"
 #endif
 
+#include "xf86.h"
 #include "exa.h"
 
 #define GLAMO_REG_BASE(c)		((c)->attr.address[0])
@@ -119,6 +120,7 @@ typedef struct {
 
 #define GlamoPTR(p) ((GlamoPtr)((p)->driverPrivate))
 
+#if 0
 typedef struct _GLAMOScreenInfo {
 
 	GLAMOCardInfo *glamoc;
@@ -146,6 +148,8 @@ typedef struct _GLAMOScreenInfo {
 	int		cmd_queue_cache_start;
 } GLAMOScreenInfo;
 
+#endif
+
 typedef union { float f; CARD32 i; } fi_type;
 
 /* Surely there's a better way to go about this */