X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmain%2Fmm.h;h=df340808ac9f81df9050f52a0aab0917cd7f7463;hb=f0c32629276a0bf33eed5ba519e3536061e239ad;hp=33c986b4c7d5cab5012a9641c183d5df761ee797;hpb=1c236fd5c734b7388d7625ce8c3d4b2d6da9fcfb;p=mesa.git

diff --git a/src/mesa/main/mm.h b/src/mesa/main/mm.h
index 33c986b4c7d..df340808ac9 100644
--- a/src/mesa/main/mm.h
+++ b/src/mesa/main/mm.h
@@ -1,6 +1,6 @@
 /*
  * GLX Hardware Device Driver common code
- * Copyright (C) 1999 Keith Whitwell
+ * Copyright (C) 1999 Wittawat Yamwong
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -35,45 +35,23 @@
 #include "imports.h"
 
 
-struct mem_block_t {
-  struct mem_block_t *next;
-  struct mem_block_t *heap;
-  int ofs,size;
-  int align;
-  unsigned int free:1;
-  unsigned int reserved:1;
+struct mem_block {
+   struct mem_block *next, *prev;
+   struct mem_block *next_free, *prev_free;
+   struct mem_block *heap;
+   unsigned ofs;
+   unsigned size;
+   unsigned free:1;
+   unsigned reserved:1;
 };
 
-typedef struct mem_block_t TMemBlock;
-
-typedef struct mem_block_t *PMemBlock;
-
-/* a heap is just the first block in a chain */
-typedef struct mem_block_t memHeap_t;
-
-
-/* XXX are these needed? */
-#if 0
-static INLINE int
-mmBlockSize(PMemBlock b)
-{
-   return b->size;
-}
-
-static INLINE int
-mmOffset(PMemBlock b)
-{
-   return b->ofs;
-}
-#endif
-
 
 
 /** 
  * input: total size in bytes
  * return: a heap pointer if OK, NULL if error
  */
-extern memHeap_t *mmInit(int ofs, int size);
+extern struct mem_block *mmInit(unsigned ofs, unsigned size);
 
 /**
  * Allocate 'size' bytes with 2^align2 bytes alignment,
@@ -85,31 +63,31 @@ extern memHeap_t *mmInit(int ofs, int size);
  *		startSearch = linear offset from start of heap to begin search
  * return: pointer to the allocated block, 0 if error
  */
-extern PMemBlock mmAllocMem(memHeap_t *heap, int size, int align2, 
-                            int startSearch);
+extern struct mem_block *mmAllocMem(struct mem_block *heap, unsigned size, 
+                                    unsigned align2, unsigned startSearch);
 
 /**
  * Free block starts at offset
  * input: pointer to a block
  * return: 0 if OK, -1 if error
  */
-extern int mmFreeMem(PMemBlock b);
+extern int mmFreeMem(struct mem_block *b);
 
 /**
  * Free block starts at offset
  * input: pointer to a heap, start offset
  * return: pointer to a block
  */
-extern PMemBlock mmFindBlock(memHeap_t *heap, int start);
+extern struct mem_block *mmFindBlock(struct mem_block *heap, unsigned start);
 
 /**
  * destroy MM
  */
-extern void mmDestroy(memHeap_t *mmInit);
+extern void mmDestroy(struct mem_block *mmInit);
 
 /**
  * For debuging purpose.
  */
-extern void mmDumpMemInfo(const memHeap_t *mmInit);
+extern void mmDumpMemInfo(const struct mem_block *mmInit);
 
 #endif