diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2008-12-29 17:15:20 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2008-12-29 17:15:20 +0000 |
| commit | bfa7a2503067f28a7811a12548ba3975efeafe45 (patch) | |
| tree | 6b5c5c5da78017ed3fc0a1218cdc46437a90094c | |
| parent | e056e66cfc9de3493e1f3194a06c76f67a8aad0d (diff) | |
glamo* : backup commit
| -rw-r--r-- | src/glamo-draw.h | 6 | ||||
| -rw-r--r-- | src/glamo.h | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/glamo-draw.h b/src/glamo-draw.h index f93ae82..11a8acf 100644 --- 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 index 67d4cd4..7748fd6 100644 --- 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 */ |