From 934be726b007072359d987aa9ca6e79f8062a3b7 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Tue, 27 Jan 2009 00:17:15 +0100 Subject: Remove lots of unused stuff. --- src/glamo.h | 62 ------------------------------------------------------------- 1 file changed, 62 deletions(-) (limited to 'src/glamo.h') diff --git a/src/glamo.h b/src/glamo.h index 7fa4c04..735d99c 100644 --- a/src/glamo.h +++ b/src/glamo.h @@ -161,50 +161,6 @@ typedef struct { #define GlamoPTR(p) ((GlamoPtr)((p)->driverPrivate)) -#if 0 -typedef struct _GLAMOScreenInfo { - - GLAMOCardInfo *glamoc; - KdScreenInfo *screen; - - int scratch_offset; - int scratch_next; - KdOffscreenArea *scratch_area; - - KdVideoAdaptorPtr pAdaptor; - int num_texture_ports; - - KdOffscreenArea *cmd_queue; /* mmapped on-device cmd queue. */ - ExaOffscreenArea *exa_cmd_queue; - CARD16 *ring_addr; /* Beginning of ring buffer. */ - int ring_write; /* Index of write ptr in ring. */ - int ring_read; /* Index of read ptr in ring. */ - int ring_len; - /* - * cmd queue cache in system memory - * It is to be flushed to cmd_queue_space - * "at once", when we are happy with it. - */ - MemBuf *cmd_queue_cache; - 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 */ -static inline CARD32 -GLAMOFloatAsInt(float val) -{ - fi_type fi; - - fi.f = val; - return fi.i; -} - -#define GET_FLOAT_BITS(x) GLAMOFloatAsInt(x) - static inline void MMIOSetBitMask(char *mmio, CARD32 reg, CARD16 mask, CARD16 val) { @@ -219,21 +175,6 @@ MMIOSetBitMask(char *mmio, CARD32 reg, CARD16 mask, CARD16 val) MMIO_OUT16(mmio, reg, tmp); } -#if 0 -/* glamo.c */ -Bool -GLAMOMapReg(KdCardInfo *card, GLAMOCardInfo *glamoc); - -void -GLAMOUnmapReg(KdCardInfo *card, GLAMOCardInfo *glamoc); - -void -GLAMODumpRegs(GlamoPtr pGlamo, - CARD16 from, - CARD16 to) - -#endif - /* glamo_draw.c */ Bool GLAMODrawInit(ScreenPtr pScreen); @@ -253,9 +194,6 @@ GLAMODrawFini(ScreenPtr pScreen); void GLAMORecolorCursor(ScreenPtr pScreen, int ndef, xColorItem *pdef); -int -GLAMOLog2(int val); - Bool GLAMODrawExaInit(ScreenPtr pScreen, ScrnInfoPtr pScrn); -- cgit v1.2.3