vserver 1.9.5.x5

[linux-2.6.git] / drivers / char / drm / sis_ds.c

diff --git a/drivers/char/drm/sis_ds.c b/drivers/char/drm/sis_ds.c
index 0839155..1b471be 100644 (file)
--- a/drivers/char/drm/sis_ds.c
+++ b/drivers/char/drm/sis_ds.c
@@ -28,7 +28,6 @@
  * 
  */
 
-#include "sis.h"
 #include "drmP.h"
 #include "drm.h"
 #include "sis_ds.h"
@@ -42,7 +41,7 @@ set_t *setInit(void)
        int i;
        set_t *set;
 
-       set = (set_t *)DRM(alloc)(sizeof(set_t), DRM_MEM_DRIVER);
+       set = (set_t *)drm_alloc(sizeof(set_t), DRM_MEM_DRIVER);
        if (set != NULL) {
                for (i = 0; i < SET_SIZE; i++) {
                        set->list[i].free_next = i + 1;    
@@ -128,14 +127,14 @@ int setNext(set_t *set, ITEM_TYPE *item)
 
 int setDestroy(set_t *set)
 {
-       DRM(free)(set, sizeof(set_t), DRM_MEM_DRIVER);
+       drm_free(set, sizeof(set_t), DRM_MEM_DRIVER);
 
        return 1;
 }
 
 /*
  * 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"),
@@ -150,7 +149,7 @@ int setDestroy(set_t *set)
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * KEITH WHITWELL, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, 
+ * WITTAWAT YAMWONG, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, 
  * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
  * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE 
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -167,7 +166,7 @@ memHeap_t *mmInit(int ofs,
        if (size <= 0)
                return NULL;
 
-       blocks = (TMemBlock *)DRM(calloc)(1, sizeof(TMemBlock), DRM_MEM_DRIVER);
+       blocks = (TMemBlock *)drm_calloc(1, sizeof(TMemBlock), DRM_MEM_DRIVER);
        if (blocks != NULL) {
                blocks->ofs = ofs;
                blocks->size = size;
@@ -202,7 +201,7 @@ memHeap_t *mmAddRange( memHeap_t *heap,
                       int size )
 {
        PMemBlock blocks;
-       blocks = (TMemBlock *)DRM(calloc)(2, sizeof(TMemBlock), DRM_MEM_DRIVER);
+       blocks = (TMemBlock *)drm_calloc(2, sizeof(TMemBlock), DRM_MEM_DRIVER);
        if (blocks != NULL) {
                blocks[0].size = size;
                blocks[0].free = 1;
@@ -229,7 +228,7 @@ static TMemBlock* SliceBlock(TMemBlock *p,
 
        /* break left */
        if (startofs > p->ofs) {
-               newblock = (TMemBlock*) DRM(calloc)(1, sizeof(TMemBlock),
+               newblock = (TMemBlock*) drm_calloc(1, sizeof(TMemBlock),
                    DRM_MEM_DRIVER);
                newblock->ofs = startofs;
                newblock->size = p->size - (startofs - p->ofs);
@@ -242,7 +241,7 @@ static TMemBlock* SliceBlock(TMemBlock *p,
 
        /* break right */
        if (size < p->size) {
-               newblock = (TMemBlock*) DRM(calloc)(1, sizeof(TMemBlock),
+               newblock = (TMemBlock*) drm_calloc(1, sizeof(TMemBlock),
                    DRM_MEM_DRIVER);
                newblock->ofs = startofs + size;
                newblock->size = p->size - size;
@@ -295,7 +294,7 @@ static __inline__ int Join2Blocks(TMemBlock *p)
                TMemBlock *q = p->next;
                p->size += q->size;
                p->next = q->next;
-               DRM(free)(q, sizeof(TMemBlock), DRM_MEM_DRIVER);
+               drm_free(q, sizeof(TMemBlock), DRM_MEM_DRIVER);
                return 1;
        }
        return 0;
@@ -380,7 +379,7 @@ void mmDestroy(memHeap_t *heap)
        p = (TMemBlock *)heap;
        while (p != NULL) {
                q = p->next;
-               DRM(free)(p, sizeof(TMemBlock), DRM_MEM_DRIVER);
+               drm_free(p, sizeof(TMemBlock), DRM_MEM_DRIVER);
                p = q;
        }
 }