xf86-video-ati: Branch 'master'

[Michel Daenzer]

 src/radeon.h        |    2 +-
 src/radeon_cursor.c |    2 +-
 src/radeon_dri.c    |    4 ++--
 src/radeon_driver.c |    4 ++--
 src/radeon_render.c |   44 ++++++++++++++++++++++----------------------
 5 files changed, 28 insertions(+), 28 deletions(-)

New commits:
commit 708e7c98f636738fbcc47a597bc94b309a4dc1c4
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Tue May 13 11:00:38 2008 +0200

    Reinstate CARD* types that are part of external interfaces.
    
    The compiler pointed this out...

diff --git a/src/radeon.h b/src/radeon.h
index 187d342..93b1aa7 100644
--- a/src/radeon.h
+++ b/src/radeon.h
@@ -885,7 +885,7 @@ extern Bool RADEONSetTiling(ScrnInfoPtr pScrn);
 /* radeon_cursor.c */
 extern Bool RADEONCursorInit(ScreenPtr pScreen);
 extern void radeon_crtc_hide_cursor(xf86CrtcPtr crtc);
-extern void radeon_crtc_load_cursor_argb(xf86CrtcPtr crtc, uint32_t *image);
+extern void radeon_crtc_load_cursor_argb(xf86CrtcPtr crtc, CARD32 *image);
 extern void radeon_crtc_set_cursor_colors(xf86CrtcPtr crtc, int bg, int fg);
 extern void radeon_crtc_set_cursor_position(xf86CrtcPtr crtc, int x, int y);
 extern void radeon_crtc_show_cursor(xf86CrtcPtr crtc);
diff --git a/src/radeon_cursor.c b/src/radeon_cursor.c
index 3ca576b..c4472db 100644
--- a/src/radeon_cursor.c
+++ b/src/radeon_cursor.c
@@ -293,7 +293,7 @@ radeon_crtc_set_cursor_colors (xf86CrtcPtr crtc, int bg, int fg)
 #ifdef ARGB_CURSOR
 
 void
-radeon_crtc_load_cursor_argb (xf86CrtcPtr crtc, uint32_t *image)
+radeon_crtc_load_cursor_argb (xf86CrtcPtr crtc, CARD32 *image)
 {
     ScrnInfoPtr pScrn = crtc->scrn;
     RADEONCrtcPrivatePtr radeon_crtc = crtc->driver_private;
diff --git a/src/radeon_dri.c b/src/radeon_dri.c
index f7f3e40..9fdc5b6 100644
--- a/src/radeon_dri.c
+++ b/src/radeon_dri.c
@@ -508,7 +508,7 @@ static void RADEONScreenToScreenCopyDepth(ScrnInfoPtr pScrn,
 #endif /* USE_XAA */
 
 /* Initialize the state of the back and depth buffers */
-static void RADEONDRIInitBuffers(WindowPtr pWin, RegionPtr prgn, uint32_t indx)
+static void RADEONDRIInitBuffers(WindowPtr pWin, RegionPtr prgn, CARD32 indx)
 {
    /* NOOP.  There's no need for the 2d driver to be clearing buffers
     * for the 3d client.  It knows how to do that on its own.
@@ -523,7 +523,7 @@ static void RADEONDRIInitBuffers(WindowPtr pWin, RegionPtr prgn, uint32_t indx)
  * are reversed.
  */
 static void RADEONDRIMoveBuffers(WindowPtr pParent, DDXPointRec ptOldOrg,
-				 RegionPtr prgnSrc, uint32_t indx)
+				 RegionPtr prgnSrc, CARD32 indx)
 {
 #ifdef USE_XAA
     ScreenPtr      pScreen  = pParent->drawable.pScreen;
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index d4d95cf..36994c8 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -213,8 +213,8 @@ static Bool RADEONMapMMIO(ScrnInfoPtr pScrn);
 static Bool RADEONUnmapMMIO(ScrnInfoPtr pScrn);
 
 static void *
-radeonShadowWindow(ScreenPtr screen, uint32_t row, uint32_t offset, int mode,
-		   uint32_t *size, void *closure)
+radeonShadowWindow(ScreenPtr screen, CARD32 row, CARD32 offset, int mode,
+		   CARD32 *size, void *closure)
 {
     ScrnInfoPtr pScrn = xf86Screens[screen->myNum];
     RADEONInfoPtr  info   = RADEONPTR(pScrn);
diff --git a/src/radeon_render.c b/src/radeon_render.c
index b5661f9..dbd5b79 100644
--- a/src/radeon_render.c
+++ b/src/radeon_render.c
@@ -147,7 +147,7 @@ static const struct blendinfo RadeonBlendOp[] = {
  * The RADEON and R200 TXFORMATS we use are the same on r100/r200.
  */
 
-static uint32_t RADEONTextureFormats[] = {
+static CARD32 RADEONTextureFormats[] = {
     PICT_a8r8g8b8,
     PICT_a8,
     PICT_x8r8g8b8,
@@ -157,7 +157,7 @@ static uint32_t RADEONTextureFormats[] = {
     0
 };
 
-static uint32_t RADEONDstFormats[] = {
+static CARD32 RADEONDstFormats[] = {
     PICT_a8r8g8b8,
     PICT_x8r8g8b8,
     PICT_r5g6b5,
@@ -493,13 +493,13 @@ static Bool
 FUNC_NAME(R100SetupForCPUToScreenAlphaTexture) (
 	ScrnInfoPtr	pScrn,
 	int		op,
-	uint16_t	red,
-	uint16_t	green,
-	uint16_t	blue,
-	uint16_t	alpha,
-	uint32_t	maskFormat,
-	uint32_t	dstFormat,
-	uint8_t		*alphaPtr,
+	CARD16		red,
+	CARD16		green,
+	CARD16		blue,
+	CARD16		alpha,
+	CARD32		maskFormat,
+	CARD32		dstFormat,
+	CARD8		*alphaPtr,
 	int		alphaPitch,
 	int		width,
 	int		height,
@@ -548,9 +548,9 @@ static Bool
 FUNC_NAME(R100SetupForCPUToScreenTexture) (
 	ScrnInfoPtr	pScrn,
 	int		op,
-	uint32_t	srcFormat,
-	uint32_t	dstFormat,
-	uint8_t		*texPtr,
+	CARD32		srcFormat,
+	CARD32		dstFormat,
+	CARD8		*texPtr,
 	int		texPitch,
 	int		width,
 	int		height,
@@ -834,13 +834,13 @@ static Bool
 FUNC_NAME(R200SetupForCPUToScreenAlphaTexture) (
 	ScrnInfoPtr	pScrn,
 	int		op,
-	uint16_t	red,
-	uint16_t	green,
-	uint16_t	blue,
-	uint16_t	alpha,
-	uint32_t	maskFormat,
-	uint32_t	dstFormat,
-	uint8_t		*alphaPtr,
+	CARD16		red,
+	CARD16		green,
+	CARD16		blue,
+	CARD16		alpha,
+	CARD32		maskFormat,
+	CARD32		dstFormat,
+	CARD8		*alphaPtr,
 	int		alphaPitch,
 	int		width,
 	int		height,
@@ -890,9 +890,9 @@ static Bool
 FUNC_NAME(R200SetupForCPUToScreenTexture) (
 	ScrnInfoPtr	pScrn,
 	int		op,
-	uint32_t	srcFormat,
-	uint32_t	dstFormat,
-	uint8_t		*texPtr,
+	CARD32		srcFormat,
+	CARD32		dstFormat,
+	CARD8		*texPtr,
 	int		texPitch,
 	int		width,
 	int		height,