xserver/hw/kdrive/mga g400_common.h, NONE, 1.1 g400_composite.c, NONE, 1.1 mga.c, 1.4, 1.5 mgadraw.c, 1.9, 1.10

[Damien Ciabrini]

Committed by: damienc

Update of /cvs/xserver/xserver/hw/kdrive/mga
In directory pdx:/home/damienc/xserver/hw/kdrive/mga

Modified Files:
	mga.c mgadraw.c 
Added Files:
	g400_common.h g400_composite.c 
Log Message:
Update MGA composite patch commit.
(some files were missing in the previous commit)


--- NEW FILE: g400_common.h ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: g400_composite.c ---
(This appears to be a binary file; contents omitted.)

Index: mga.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/mga/mga.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- mga.c	2 Nov 2003 19:56:10 -0000	1.4
+++ mga.c	16 Jun 2004 21:36:54 -0000	1.5
@@ -134,7 +134,7 @@
 			   KD_MAPPED_MODE_REGISTERS);
 	KdUnmapDevice ((void *) mgac->reg_base, MGA_REG_SIZE (card));
 	mgac->reg_base = 0;
-	// mgac->reg = 0;
+	/* mgac->reg = 0; */
     }
 }
 

Index: mgadraw.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/mga/mgadraw.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- mgadraw.c	14 Jun 2004 08:43:57 -0000	1.9
+++ mgadraw.c	16 Jun 2004 21:36:54 -0000	1.10
@@ -85,7 +85,7 @@
     return FALSE;
 
   mgaWaitAvail (wait + 4);
-  // Set the format of the destination pixmap
+  /* Set the format of the destination pixmap */
   switch (dest_bpp) {
   case 8:
     MGA_OUT32 (mmio, MGA_REG_MACCESS, MGA_PW8);
@@ -112,7 +112,9 @@
     KdScreenPriv(pPixmap->drawable.pScreen);
     int cmd;
     int dst_org;
-    // We must pad pm and fg depending on the format of the destination pixmap
+    /* We must pad pm and fg depending on the format of the
+     * destination pixmap 
+     */
     switch (pPixmap->drawable.bitsPerPixel) {
     case 16:
         fg |= fg << 16;
@@ -226,7 +228,7 @@
 
 static Bool
 mgaUploadToScreen(PixmapPtr pDst, char *src, int src_pitch) {
-  //fprintf(stderr,"Upload to Screen %p [%d]\n",src,src_pitch);
+  /* fprintf(stderr,"Upload to Screen %p [%d]\n",src,src_pitch); */
   return TRUE;
 }
 
@@ -259,7 +261,7 @@
 	mgaKaa.Composite=mgaComposite;
 	mgaKaa.DoneComposite=mgaDoneComposite;
     }
-    //mgaKaa.UploadToScreen=mgaUploadToScreen;
+    /*mgaKaa.UploadToScreen=mgaUploadToScreen;*/
         
     if (!kaaDrawInit (pScreen, &mgaKaa))
 	return FALSE;