36 files changed, 121 insertions, 46 deletions

diff --git a/ChangeLog b/ChangeLog
index d947a5d..6edeb65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-03-22  Kristian Høgsberg  <krh@redhat.com>
+
+	* src/theatre200.c: Convert use of xf86fopen() and other xf86
+	wrapped libc symbols to use libc symbols directly.  The xf86*
+	versions aren't supposed to be used directly.
+
+	* src/*.c: Drop libc wrapper; don't include xf86_ansic.h and add
+	includes now missing.
+
 2006-03-18  Benjamin Herrenschmidt  <benh@kernel.crashing.org>
 
 	* src/radeon_driver.c: (RADEONRestoreMemMapRegisters),
diff --git a/src/ati.h b/src/ati.h
index 07eeba3..4f87b03 100644
--- a/src/ati.h
+++ b/src/ati.h
@@ -29,7 +29,6 @@
 
 #include "xf86.h"
 
-#include "xf86_ansic.h"
 #include "xf86_OSproc.h"
 
 extern DriverRec ATI;
diff --git a/src/atibus.c b/src/atibus.c
index c6eade1..7219483 100644
--- a/src/atibus.c
+++ b/src/atibus.c
@@ -25,6 +25,8 @@
 #include "config.h"
 #endif
 
+#include <string.h>
+
 #include "ati.h"
 #include "atiadapter.h"
 #include "atibus.h"
diff --git a/src/aticonfig.c b/src/aticonfig.c
index 6a118a0..33b9519 100644
--- a/src/aticonfig.c
+++ b/src/aticonfig.c
@@ -28,6 +28,8 @@
 #include "config.h"
 #endif
 
+#include <string.h>
+
 #include "ati.h"
 #include "atiadapter.h"
 #include "atichip.h"
diff --git a/src/atidac.c b/src/atidac.c
index 7eb4515..8c5ea52 100644
--- a/src/atidac.c
+++ b/src/atidac.c
@@ -25,6 +25,8 @@
 #include "config.h"
 #endif
 
+#include <string.h>
+
 #include "ati.h"
 #include "atidac.h"
 #include "atimach64io.h"
diff --git a/src/atidga.c b/src/atidga.c
index 0f8fb8a..fff28f5 100644
--- a/src/atidga.c
+++ b/src/atidga.c
@@ -26,6 +26,8 @@
 #endif
 #ifndef AVOID_DGA
 
+#include <string.h>
+
 #include "ati.h"
 #include "atiadjust.h"
 #include "atichip.h"
diff --git a/src/atidri.c b/src/atidri.c
index 2156603..b611632 100644
--- a/src/atidri.c
+++ b/src/atidri.c
@@ -31,6 +31,9 @@
  *   Leif Delgass <ldelgass@retinalburn.net>
  */
 
+#include <string.h>
+#include <stdio.h>
+
 /* Driver data structures */
 #include "ati.h"
 #include "atibus.h"
diff --git a/src/atimach64.c b/src/atimach64.c
index 95a9c07..166aaf0 100644
--- a/src/atimach64.c
+++ b/src/atimach64.c
@@ -53,6 +53,8 @@
 #include "config.h"
 #endif
 
+#include <string.h>
+
 #include "ati.h"
 #include "atibus.h"
 #include "atichip.h"
diff --git a/src/atimach64xv.c b/src/atimach64xv.c
index cba6f99..2ce4ce3 100644
--- a/src/atimach64xv.c
+++ b/src/atimach64xv.c
@@ -25,6 +25,8 @@
 #include "config.h"
 #endif
 
+#include <string.h>
+
 #include "ati.h"
 #include "atiaccel.h"
 #include "atichip.h"
diff --git a/src/atimode.c b/src/atimode.c
index 098659e..c3d5a2c 100644
--- a/src/atimode.c
+++ b/src/atimode.c
@@ -24,6 +24,8 @@
 #include "config.h"
 #endif
 
+#include <string.h>
+
 #include "ati.h"
 #include "atiadapter.h"
 #include "atichip.h"
diff --git a/src/atipreinit.c b/src/atipreinit.c
index cc45b05..8609f25 100644
--- a/src/atipreinit.c
+++ b/src/atipreinit.c
@@ -1,5 +1,5 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c,v 1.74 2003/12/22 17:48:09 tsi Exp $ */
-/* $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c,v 1.6 2005/06/26 04:38:12 ajax Exp $ */
+/* $XdotOrg: driver/xf86-video-ati/src/atipreinit.c,v 1.9 2005/08/28 18:10:34 ajax Exp $ */
 /*
  * Copyright 1999 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
  *
@@ -26,6 +26,9 @@
 #include "config.h"
 #endif
 
+#include <string.h>
+#include <stdio.h>
+
 #include "ati.h"
 #include "atiadapter.h"
 #include "atiadjust.h"
diff --git a/src/atiprint.c b/src/atiprint.c
index f611e9a..365cffc 100644
--- a/src/atiprint.c
+++ b/src/atiprint.c
@@ -25,6 +25,8 @@
 #include "config.h"
 #endif
 
+#include <string.h>
+
 #include "ati.h"
 #include "atiadapter.h"
 #include "atichip.h"
diff --git a/src/atiprobe.c b/src/atiprobe.c
index 5c347bb..5ad4cda 100644
--- a/src/atiprobe.c
+++ b/src/atiprobe.c
@@ -25,6 +25,9 @@
 #include "config.h"
 #endif
 
+#include <string.h>
+#include <stdio.h>
+
 #include "ati.h"
 #include "atiadapter.h"
 #include "atiadjust.h"
diff --git a/src/atiscreen.c b/src/atiscreen.c
index effeb66..134129c 100644
--- a/src/atiscreen.c
+++ b/src/atiscreen.c
@@ -30,6 +30,8 @@
 #include "config.h"
 #endif
 
+#include <string.h>
+
 #include "ati.h"
 #include "atibus.h"
 #include "atichip.h"
diff --git a/src/r128_accel.c b/src/r128_accel.c
index fe284e1..bdaa258 100644
--- a/src/r128_accel.c
+++ b/src/r128_accel.c
@@ -84,6 +84,8 @@
 #define R128_TRAPEZOIDS 0       /* Trapezoids don't work               */
 
 				/* Driver data structures */
+#include <errno.h>
+
 #include "r128.h"
 #include "r128_reg.h"
 #include "r128_probe.h"
diff --git a/src/r128_dga.c b/src/r128_dga.c
index ec85480..ffc2533 100644
--- a/src/r128_dga.c
+++ b/src/r128_dga.c
@@ -9,6 +9,8 @@
 #include "config.h"
 #endif
 
+#include <string.h>
+
 				/* Driver data structures */
 #include "r128.h"
 #include "r128_probe.h"
diff --git a/src/r128_dri.c b/src/r128_dri.c
index c516bec..5d7ac3f 100644
--- a/src/r128_dri.c
+++ b/src/r128_dri.c
@@ -32,6 +32,8 @@
 #include "config.h"
 #endif
 
+#include <string.h>
+
 /*
  * Authors:
  *   Kevin E. Martin <martin@valinux.com>
diff --git a/src/r128_driver.c b/src/r128_driver.c
index c4fc27d..f911d20 100644
--- a/src/r128_driver.c
+++ b/src/r128_driver.c
@@ -63,6 +63,8 @@
  * Dualhead support - Alex Deucher <agd5f@yahoo.com>
  */
 
+#include <string.h>
+#include <stdio.h>
 
 				/* Driver data structures */
 #include "r128.h"
diff --git a/src/r128_probe.c b/src/r128_probe.c
index ff6f75e..daad9db 100644
--- a/src/r128_probe.c
+++ b/src/r128_probe.c
@@ -32,6 +32,8 @@
 #include "config.h"
 #endif
 
+#include <string.h>
+
 /*
  * Authors:
  *   Rickard E. Faith <faith@valinux.com>
@@ -48,7 +50,6 @@
 #include "atipciids.h"
 
 #include "xf86.h"
-#include "xf86_ansic.h"
 #include "xf86Resources.h"
 
 #include "r128_chipset.h"
diff --git a/src/r128_reg.h b/src/r128_reg.h
index 721a72c..5dc2628 100644
--- a/src/r128_reg.h
+++ b/src/r128_reg.h
@@ -48,9 +48,6 @@
 #ifndef _R128_REG_H_
 #define _R128_REG_H_
 
-#ifdef XFree86Module
-#include "xf86_ansic.h"
-#endif
 #include "compiler.h"
 
 				/* Memory mapped register access macros */
diff --git a/src/r128_video.c b/src/r128_video.c
index 7f4912f..805aa0f 100644
--- a/src/r128_video.c
+++ b/src/r128_video.c
@@ -4,6 +4,8 @@
 #include "config.h"
 #endif
 
+#include <string.h>
+
 #include "r128.h"
 #include "r128_reg.h"
 
diff --git a/src/radeon.h b/src/radeon.h
index b6ae547..ab82081 100644
--- a/src/radeon.h
+++ b/src/radeon.h
@@ -39,7 +39,6 @@
 #define _RADEON_H_
 
 #include "xf86str.h"
-#include "xf86_ansic.h"
 #include "compiler.h"
 #include "xf86fbman.h"
 
diff --git a/src/radeon_accel.c b/src/radeon_accel.c
index 0e0ede9..d3a52a4 100644
--- a/src/radeon_accel.c
+++ b/src/radeon_accel.c
@@ -74,6 +74,8 @@
  *
  */
 
+#include <errno.h>
+#include <string.h>
 				/* Driver data structures */
 #include "radeon.h"
 #include "radeon_reg.h"
diff --git a/src/radeon_bios.c b/src/radeon_bios.c
index aec55b7..dbe2978 100644
--- a/src/radeon_bios.c
+++ b/src/radeon_bios.c
@@ -30,6 +30,8 @@
 #include "config.h"
 #endif
 
+#include <string.h>
+
 #include "xf86.h"
 #include "xf86_OSproc.h"
 
diff --git a/src/radeon_dga.c b/src/radeon_dga.c
index 06fc62e..e67a964 100644
--- a/src/radeon_dga.c
+++ b/src/radeon_dga.c
@@ -43,6 +43,8 @@
  *
  */
 
+#include <string.h>
+
 				/* Driver data structures */
 #include "radeon.h"
 #include "radeon_probe.h"
diff --git a/src/radeon_dri.c b/src/radeon_dri.c
index 1b67e9d..47b03ba 100644
--- a/src/radeon_dri.c
+++ b/src/radeon_dri.c
@@ -39,6 +39,8 @@
  *
  */
 
+#include <string.h>
+#include <stdio.h>
 
 				/* Driver data structures */
 #include "radeon.h"
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 5a83de4..33c3e0e 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -1,5 +1,5 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c,v 1.117 2004/02/19 22:38:12 tsi Exp $ */
-/* $XdotOrg: driver/xf86-video-ati/src/radeon_driver.c,v 1.105 2006/03/17 03:00:53 sroland Exp $ */
+/* $XdotOrg: driver/xf86-video-ati/src/radeon_driver.c,v 1.106 2006/03/18 00:08:24 benh Exp $ */
 /*
  * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and
  *                VA Linux Systems Inc., Fremont, California.
@@ -67,6 +67,9 @@
  *
  */
 
+#include <string.h>
+#include <stdio.h>
+
 				/* Driver data structures */
 #include "radeon.h"
 #include "radeon_reg.h"
diff --git a/src/radeon_exa_funcs.c b/src/radeon_exa_funcs.c
index 4f08d9b..c443ec3 100644
--- a/src/radeon_exa_funcs.c
+++ b/src/radeon_exa_funcs.c
@@ -49,6 +49,8 @@
 #endif
 #endif
 
+#include <string.h>
+
 #include "radeon.h"
 #include "atidri.h"
 
diff --git a/src/radeon_macros.h b/src/radeon_macros.h
index b121a95..0d27405 100644
--- a/src/radeon_macros.h
+++ b/src/radeon_macros.h
@@ -50,9 +50,6 @@
 #ifndef _RADEON_MACROS_H_
 #define _RADEON_MACROS_H_
 
-#ifdef XFree86Module
-#include "xf86_ansic.h"
-#endif
 #include "compiler.h"
 
 #define RADEON_BIOS8(v)  (info->VBIOS[v])
diff --git a/src/radeon_mergedfb.c b/src/radeon_mergedfb.c
index 186abc0..0510bb6 100644
--- a/src/radeon_mergedfb.c
+++ b/src/radeon_mergedfb.c
@@ -36,6 +36,9 @@
  *   Based, in large part, on the sis driver by Thomas Winischhofer.
  */
 
+#include <string.h>
+#include <stdio.h>
+
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86Resources.h"
diff --git a/src/radeon_mm_i2c.c b/src/radeon_mm_i2c.c
index f95bcf5..fbc2063 100644
--- a/src/radeon_mm_i2c.c
+++ b/src/radeon_mm_i2c.c
@@ -2,6 +2,8 @@
 #include "config.h"
 #endif
 
+#include <math.h>
+
 #include "radeon.h"
 #include "radeon_reg.h"
 #include "radeon_macros.h"
diff --git a/src/radeon_probe.c b/src/radeon_probe.c
index ddb510e..40f88dc 100644
--- a/src/radeon_probe.c
+++ b/src/radeon_probe.c
@@ -31,6 +31,8 @@
 #include "config.h"
 #endif
 
+#include <string.h>
+
 /*
  * Authors:
  *   Kevin E. Martin <martin@xfree86.org>
@@ -47,7 +49,6 @@
 #include "atipciids.h"
 
 #include "xf86.h"
-#include "xf86_ansic.h"
 #define _XF86MISC_SERVER_
 #include <X11/extensions/xf86misc.h>
 #include "xf86Resources.h"
diff --git a/src/radeon_render.c b/src/radeon_render.c
index 0fab39f..e444bd2 100644
--- a/src/radeon_render.c
+++ b/src/radeon_render.c
@@ -31,6 +31,8 @@
 #include "config.h"
 #endif
 
+#include <string.h>
+
 #ifdef USE_XAA
 
 #include "dixstruct.h"
diff --git a/src/radeon_video.c b/src/radeon_video.c
index 3f44e4b..cd43ea0 100644
--- a/src/radeon_video.c
+++ b/src/radeon_video.c
@@ -4,6 +4,11 @@
 #include "config.h"
 #endif
 
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <math.h>
+
 #include "radeon.h"
 #include "radeon_reg.h"
 #include "radeon_macros.h"
@@ -1265,7 +1270,7 @@ static void RADEONSetupTheatre(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
                         xf86DrvMsg(pScrn->scrnIndex, X_INFO,
                                 "Unsupported reference clock frequency, Rage Theatre disabled\n");
                         t->theatre_num=-1;
-			xf86free(pPriv->theatre);
+			xfree(pPriv->theatre);
 			pPriv->theatre = NULL;
 			return;
                 }
diff --git a/src/radeon_vip.c b/src/radeon_vip.c
index b61adfe..abcba06 100644
--- a/src/radeon_vip.c
+++ b/src/radeon_vip.c
@@ -2,6 +2,8 @@
 #include "config.h"
 #endif
 
+#include <string.h>
+
 #include "radeon.h"
 #include "radeon_reg.h"
 #include "radeon_macros.h"
diff --git a/src/theatre200.c b/src/theatre200.c
index 0b0e8a4..eb5139c 100644
--- a/src/theatre200.c
+++ b/src/theatre200.c
@@ -23,8 +23,15 @@
  * authorization from the author.
  *
  * $Log$
- * Revision 1.5  2005/11/07 19:28:40  bogdand
- * Replaced the variadic macros(gcc) by macros according to C99 standard
+ * Revision 1.6  2006/03/22 22:30:14  krh
+ * 2006-03-22  Kristian Høgsberg  <krh@redhat.com>
+ *
+ * 	* src/theatre200.c: Convert use of xf86fopen() and other xf86
+ * 	wrapped libc symbols to use libc symbols directly.  The xf86*
+ * 	versions aren't supposed to be used directly.
+ *
+ * 	* src/*.c: Drop libc wrapper; don't include xf86_ansic.h and add
+ * 	includes now missing.
  *
  * Revision 1.4  2005/08/28 18:00:23  bogdand
  * Modified the licens type from GPL to a X/MIT one
@@ -42,9 +49,10 @@
 #include "config.h"
 #endif
 
+#include <stdio.h>
+
 #include "xf86.h"
 #include "generic_bus.h"
-#include "xf86_ansic.h"
 #include "radeon_reg.h"
 #include "radeon.h"
 #include "theatre_reg.h"
@@ -131,15 +139,15 @@ static int microc_load (char* micro_path, char* micro_type, struct rt200_microc_
 	if (micro_type == NULL)
 		return -1;
 
-	file = xf86fopen(micro_path, "r");
+	file = fopen(micro_path, "r");
 	if (file == NULL) {
 		ERROR_0("Cannot open microcode file\n");
 					 return -1;
 	}
 
-	if (!xf86strcmp(micro_type, "BINARY"))
+	if (!strcmp(micro_type, "BINARY"))
 	{
-		if (xf86fread(microc_headp, sizeof(struct rt200_microc_head), 1, file) != 1)
+		if (fread(microc_headp, sizeof(struct rt200_microc_head), 1, file) != 1)
 		{
 			ERROR("Cannot read header from file: %s\n", micro_path);
 			goto fail_exit;
@@ -154,23 +162,23 @@ static int microc_load (char* micro_path, char* micro_type, struct rt200_microc_
 		{
 			int ret;
 			
-			curr_seg = (struct rt200_microc_seg*)xf86malloc(sizeof(struct rt200_microc_seg));
+			curr_seg = (struct rt200_microc_seg*)Xalloc(sizeof(struct rt200_microc_seg));
 			if (curr_seg == NULL)
 			{
 				ERROR_0("Cannot allocate memory\n");
 				goto fail_exit;
 			}
 
-			ret = xf86fread(&curr_seg->num_bytes, 4, 1, file);
-			ret += xf86fread(&curr_seg->download_dst, 4, 1, file);
-			ret += xf86fread(&curr_seg->crc_val, 4, 1, file);
+			ret = fread(&curr_seg->num_bytes, 4, 1, file);
+			ret += fread(&curr_seg->download_dst, 4, 1, file);
+			ret += fread(&curr_seg->crc_val, 4, 1, file);
 			if (ret != 3)
 			{
 				ERROR("Cannot read segment from microcode file: %s\n", micro_path);
 				goto fail_exit;
 			}
 
-			curr_seg->data = (unsigned char*)xf86malloc(curr_seg->num_bytes);
+			curr_seg->data = (unsigned char*)Xalloc(curr_seg->num_bytes);
 			if (curr_seg->data == NULL)
 			{
 				ERROR_0("cannot allocate memory\n");
@@ -196,7 +204,7 @@ static int microc_load (char* micro_path, char* micro_type, struct rt200_microc_
 		curr_seg = seg_list;
 		while (curr_seg)
 		{
-			if (xf86fread(curr_seg->data, curr_seg->num_bytes, 1, file) != 1)
+			if (fread(curr_seg->data, curr_seg->num_bytes, 1, file) != 1)
 			{
 				ERROR_0("Cannot read segment data\n");
 				goto fail_exit;
@@ -205,20 +213,20 @@ static int microc_load (char* micro_path, char* micro_type, struct rt200_microc_
 			curr_seg = curr_seg->next;
 		}
 	}
-	else if (!xf86strcmp(micro_type, "ASCII"))
+	else if (!strcmp(micro_type, "ASCII"))
 	{
 		char tmp1[12], tmp2[12], tmp3[12], tmp4[12];
 		unsigned int ltmp;
 
-		if ((xf86fgets(tmp1, 12, file) != NULL) &&
-			(xf86fgets(tmp2, 12, file) != NULL) &&
-			(xf86fgets(tmp3, 12, file) != NULL) &&
-			xf86fgets(tmp4, 12, file) != NULL)
+		if ((fgets(tmp1, 12, file) != NULL) &&
+			(fgets(tmp2, 12, file) != NULL) &&
+			(fgets(tmp3, 12, file) != NULL) &&
+			fgets(tmp4, 12, file) != NULL)
 		{
-			microc_headp->device_id = xf86strtoul(tmp1, NULL, 16);
-			microc_headp->vendor_id = xf86strtoul(tmp2, NULL, 16);
-			microc_headp->revision_id = xf86strtoul(tmp3, NULL, 16);
-			microc_headp->num_seg = xf86strtoul(tmp4, NULL, 16);
+			microc_headp->device_id = strtoul(tmp1, NULL, 16);
+			microc_headp->vendor_id = strtoul(tmp2, NULL, 16);
+			microc_headp->revision_id = strtoul(tmp3, NULL, 16);
+			microc_headp->num_seg = strtoul(tmp4, NULL, 16);
 		}
 		else
 		{
@@ -233,20 +241,20 @@ static int microc_load (char* micro_path, char* micro_type, struct rt200_microc_
 
 		for (i = 0; i < microc_headp->num_seg; i++)
 		{
-			curr_seg = (struct rt200_microc_seg*)xf86malloc(sizeof(struct rt200_microc_seg));
+			curr_seg = (struct rt200_microc_seg*)Xalloc(sizeof(struct rt200_microc_seg));
 			if (curr_seg == NULL)
 			{
 				ERROR_0("Cannot allocate memory\n");
 				goto fail_exit;
 			}
 
-			if (xf86fgets(tmp1, 12, file) != NULL &&
-				xf86fgets(tmp2, 12, file) != NULL &&
-				xf86fgets(tmp3, 12, file) != NULL)
+			if (fgets(tmp1, 12, file) != NULL &&
+				fgets(tmp2, 12, file) != NULL &&
+				fgets(tmp3, 12, file) != NULL)
 			{
-				curr_seg->num_bytes = xf86strtoul(tmp1, NULL, 16); 
-				curr_seg->download_dst = xf86strtoul(tmp2, NULL, 16); 
-				curr_seg->crc_val = xf86strtoul(tmp3, NULL, 16); 
+				curr_seg->num_bytes = strtoul(tmp1, NULL, 16); 
+				curr_seg->download_dst = strtoul(tmp2, NULL, 16); 
+				curr_seg->crc_val = strtoul(tmp3, NULL, 16); 
 			}
 			else
 			{
@@ -254,7 +262,7 @@ static int microc_load (char* micro_path, char* micro_type, struct rt200_microc_
 				goto fail_exit;
 			}
 								
-			curr_seg->data = (unsigned char*)xf86malloc(curr_seg->num_bytes);
+			curr_seg->data = (unsigned char*)Xalloc(curr_seg->num_bytes);
 			if (curr_seg->data == NULL)
 			{
 				ERROR_0("cannot allocate memory\n");
@@ -282,12 +290,12 @@ static int microc_load (char* micro_path, char* micro_type, struct rt200_microc_
 			for ( i = 0; i < curr_seg->num_bytes; i+=4)
 			{
 
-				if (xf86fgets(tmp1, 12, file) == NULL)
+				if (fgets(tmp1, 12, file) == NULL)
 				{
 					ERROR_0("Cannot read from file\n");
 					goto fail_exit;
 				}
-				ltmp = xf86strtoul(tmp1, NULL, 16);
+				ltmp = strtoul(tmp1, NULL, 16);
 
 				*(unsigned int*)(curr_seg->data + i) = ltmp;
 			}
@@ -303,7 +311,7 @@ static int microc_load (char* micro_path, char* micro_type, struct rt200_microc_
 
 	microc_datap->microc_seg_list = seg_list;
 
-	xf86fclose(file);
+	fclose(file);
 	return 0;
 
 fail_exit:
@@ -315,7 +323,7 @@ fail_exit:
 		curr_seg = curr_seg->next;
 		Xfree(prev_seg);
 	}
-	xf86fclose(file);
+	fclose(file);
 
 	return -1;
 }