libX11 xserver pixman mesa git update 16 Apr 2012

1 files changed, 152 insertions, 152 deletions

diff --git a/xorg-server/hw/xfree86/ramdac/xf86RamDac.c b/xorg-server/hw/xfree86/ramdac/xf86RamDac.c
index a170444a9..a67164917 100644
--- a/xorg-server/hw/xfree86/ramdac/xf86RamDac.c
+++ b/xorg-server/hw/xfree86/ramdac/xf86RamDac.c
@@ -1,152 +1,152 @@
-/*

- * Copyright 1998 by Alan Hourihane, Wigan, England.

- *

- * Permission to use, copy, modify, distribute, and sell this software and its

- * documentation for any purpose is hereby granted without fee, provided that

- * the above copyright notice appear in all copies and that both that

- * copyright notice and this permission notice appear in supporting

- * documentation, and that the name of Alan Hourihane not be used in

- * advertising or publicity pertaining to distribution of the software without

- * specific, written prior permission.  Alan Hourihane makes no representations

- * about the suitability of this software for any purpose.  It is provided

- * "as is" without express or implied warranty.

- *

- * ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

- * EVENT SHALL ALAN HOURIHANE BE LIABLE FOR ANY SPECIAL, INDIRECT OR

- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

- * PERFORMANCE OF THIS SOFTWARE.

- *

- * Authors:  Alan Hourihane, <alanh@fairlite.demon.co.uk>

- *

- * Generic RAMDAC access routines.

- */

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "xf86.h"

-#include "xf86_OSproc.h"

-

-#include "xf86RamDacPriv.h"

-

-int RamDacHWPrivateIndex = -1;

-int RamDacScreenPrivateIndex = -1;

-

-RamDacRecPtr

-RamDacCreateInfoRec(void)

-{

-    RamDacRecPtr infoRec;

-

-    infoRec = calloc(1, sizeof(RamDacRec));

-

-    return infoRec;

-}

-

-RamDacHelperRecPtr

-RamDacHelperCreateInfoRec(void)

-{

-    RamDacHelperRecPtr infoRec;

-

-    infoRec = calloc(1, sizeof(RamDacHelperRec));

-

-    return infoRec;

-}

-

-void

-RamDacDestroyInfoRec(RamDacRecPtr infoRec)

-{

-    free(infoRec);

-}

-

-void

-RamDacHelperDestroyInfoRec(RamDacHelperRecPtr infoRec)

-{

-    free(infoRec);

-}

-

-Bool

-RamDacInit(ScrnInfoPtr pScrn, RamDacRecPtr ramdacPriv)

-{

-    RamDacScreenRecPtr ramdacScrPtr;

-

-    /*

-     * make sure the RamDacRec is allocated

-     */

-    if (!RamDacGetRec(pScrn))

-	return FALSE;

-    ramdacScrPtr =

-	((RamDacScreenRecPtr) (pScrn)->privates[RamDacGetScreenIndex()].ptr);

-    ramdacScrPtr->RamDacRec = ramdacPriv;

-

-    return TRUE;

-}

-

-void

-RamDacGetRecPrivate(void)

-{

-    if (RamDacHWPrivateIndex < 0)

-	RamDacHWPrivateIndex = xf86AllocateScrnInfoPrivateIndex();

-    if (RamDacScreenPrivateIndex < 0)

-	RamDacScreenPrivateIndex = xf86AllocateScrnInfoPrivateIndex();

-    return;

-}

-

-Bool

-RamDacGetRec(ScrnInfoPtr scrp)

-{

-    RamDacGetRecPrivate();

-    /*

-     * New privates are always set to NULL, so we can check if the allocation

-     * has already been done.

-     */

-    if (scrp->privates[RamDacHWPrivateIndex].ptr != NULL)

-	return TRUE;

-    if (scrp->privates[RamDacScreenPrivateIndex].ptr != NULL)

-	return TRUE;

-

-    scrp->privates[RamDacHWPrivateIndex].ptr = 

-					xnfcalloc(sizeof(RamDacHWRec), 1);

-    scrp->privates[RamDacScreenPrivateIndex].ptr = 

-					xnfcalloc(sizeof(RamDacScreenRec), 1);

-    

-    return TRUE;

-}

-

-void

-RamDacFreeRec(ScrnInfoPtr pScrn)

-{

-    RamDacHWRecPtr ramdacHWPtr;

-    RamDacScreenRecPtr ramdacScrPtr;

-

-    if (RamDacHWPrivateIndex < 0)

-	return;

-

-    if (RamDacScreenPrivateIndex < 0)

-	return;

-

-    ramdacHWPtr = RAMDACHWPTR(pScrn);

-    ramdacScrPtr = ((RamDacScreenRecPtr)

-				(pScrn)->privates[RamDacGetScreenIndex()].ptr);

-    

-    free(ramdacHWPtr);

-    ramdacHWPtr = NULL;

-

-    free(ramdacScrPtr);

-    ramdacScrPtr = NULL;

-}

-

-int

-RamDacGetHWIndex(void)

-{

-    return RamDacHWPrivateIndex;

-}

-

-int

-RamDacGetScreenIndex(void)

-{

-    return RamDacScreenPrivateIndex;

-}

+/*
+ * Copyright 1998 by Alan Hourihane, Wigan, England.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Alan Hourihane not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Alan Hourihane makes no representations
+ * about the suitability of this software for any purpose.  It is provided
+ * "as is" without express or implied warranty.
+ *
+ * ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL ALAN HOURIHANE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Authors:  Alan Hourihane, <alanh@fairlite.demon.co.uk>
+ *
+ * Generic RAMDAC access routines.
+ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "xf86.h"
+#include "xf86_OSproc.h"
+
+#include "xf86RamDacPriv.h"
+
+int RamDacHWPrivateIndex = -1;
+int RamDacScreenPrivateIndex = -1;
+
+RamDacRecPtr
+RamDacCreateInfoRec(void)
+{
+    RamDacRecPtr infoRec;
+
+    infoRec = calloc(1, sizeof(RamDacRec));
+
+    return infoRec;
+}
+
+RamDacHelperRecPtr
+RamDacHelperCreateInfoRec(void)
+{
+    RamDacHelperRecPtr infoRec;
+
+    infoRec = calloc(1, sizeof(RamDacHelperRec));
+
+    return infoRec;
+}
+
+void
+RamDacDestroyInfoRec(RamDacRecPtr infoRec)
+{
+    free(infoRec);
+}
+
+void
+RamDacHelperDestroyInfoRec(RamDacHelperRecPtr infoRec)
+{
+    free(infoRec);
+}
+
+Bool
+RamDacInit(ScrnInfoPtr pScrn, RamDacRecPtr ramdacPriv)
+{
+    RamDacScreenRecPtr ramdacScrPtr;
+
+    /*
+     * make sure the RamDacRec is allocated
+     */
+    if (!RamDacGetRec(pScrn))
+        return FALSE;
+    ramdacScrPtr =
+        ((RamDacScreenRecPtr) (pScrn)->privates[RamDacGetScreenIndex()].ptr);
+    ramdacScrPtr->RamDacRec = ramdacPriv;
+
+    return TRUE;
+}
+
+void
+RamDacGetRecPrivate(void)
+{
+    if (RamDacHWPrivateIndex < 0)
+        RamDacHWPrivateIndex = xf86AllocateScrnInfoPrivateIndex();
+    if (RamDacScreenPrivateIndex < 0)
+        RamDacScreenPrivateIndex = xf86AllocateScrnInfoPrivateIndex();
+    return;
+}
+
+Bool
+RamDacGetRec(ScrnInfoPtr scrp)
+{
+    RamDacGetRecPrivate();
+    /*
+     * New privates are always set to NULL, so we can check if the allocation
+     * has already been done.
+     */
+    if (scrp->privates[RamDacHWPrivateIndex].ptr != NULL)
+        return TRUE;
+    if (scrp->privates[RamDacScreenPrivateIndex].ptr != NULL)
+        return TRUE;
+
+    scrp->privates[RamDacHWPrivateIndex].ptr =
+        xnfcalloc(sizeof(RamDacHWRec), 1);
+    scrp->privates[RamDacScreenPrivateIndex].ptr =
+        xnfcalloc(sizeof(RamDacScreenRec), 1);
+
+    return TRUE;
+}
+
+void
+RamDacFreeRec(ScrnInfoPtr pScrn)
+{
+    RamDacHWRecPtr ramdacHWPtr;
+    RamDacScreenRecPtr ramdacScrPtr;
+
+    if (RamDacHWPrivateIndex < 0)
+        return;
+
+    if (RamDacScreenPrivateIndex < 0)
+        return;
+
+    ramdacHWPtr = RAMDACHWPTR(pScrn);
+    ramdacScrPtr = ((RamDacScreenRecPtr)
+                    (pScrn)->privates[RamDacGetScreenIndex()].ptr);
+
+    free(ramdacHWPtr);
+    ramdacHWPtr = NULL;
+
+    free(ramdacScrPtr);
+    ramdacScrPtr = NULL;
+}
+
+int
+RamDacGetHWIndex(void)
+{
+    return RamDacHWPrivateIndex;
+}
+
+int
+RamDacGetScreenIndex(void)
+{
+    return RamDacScreenPrivateIndex;
+}