? s3virge/Makefile
? s3virge/s3virge.4.html
? s3virge/s3virge._man
Index: s3virge/s3v_common.h
===================================================================
RCS file: /cvsroot/dri/xc/xc/programs/Xserver/hw/xfree86/drivers/s3virge/Attic/s3v_common.h,v
retrieving revision 1.1.2.2
diff -u -w -r1.1.2.2 s3v_common.h
--- s3virge/s3v_common.h	26 Jun 2002 15:41:50 -0000	1.1.2.2
+++ s3virge/s3v_common.h	28 Jun 2002 21:27:08 -0000
@@ -49,6 +49,7 @@
  */
 #define DRM_S3V_INIT_DMA              0x00
 #define DRM_S3V_CLEANUP_DMA           0x01
+#if 0
 
 typedef struct _drmS3VInit {
    enum {
@@ -71,6 +72,38 @@
    unsigned int pitch;
 /* unsigned int pitch_bits; */
 } drmS3VInit;
+#endif
+
+typedef struct _drmS3VInit {
+	enum {
+		S3V_INIT_DMA = 0x01,
+		S3V_CLEANUP_DMA = 0x02
+	} func;
+
+	unsigned int pcimode;	/* bool: 1=pci 0=agp */
+
+	unsigned int mmio_offset;
+	unsigned int buffers_offset;
+	unsigned int sarea_priv_offset;
+
+	unsigned int front_offset;
+	unsigned int front_width;
+	unsigned int front_height;
+	unsigned int front_pitch;
+
+	unsigned int back_offset;
+	unsigned int back_width;
+	unsigned int back_height;
+	unsigned int back_pitch;
+
+	unsigned int depth_offset;
+	unsigned int depth_width;
+	unsigned int depth_height;
+	unsigned int depth_pitch;
+	
+	unsigned int texture_offset;
+} drmS3VInit;
+
 
 /* Bool not defined ; (*/
 
Index: s3virge/s3v_dri.c
===================================================================
RCS file: /cvsroot/dri/xc/xc/programs/Xserver/hw/xfree86/drivers/s3virge/Attic/s3v_dri.c,v
retrieving revision 1.1.2.4
diff -u -w -r1.1.2.4 s3v_dri.c
--- s3virge/s3v_dri.c	26 Jun 2002 22:57:49 -0000	1.1.2.4
+++ s3virge/s3v_dri.c	28 Jun 2002 21:27:09 -0000
@@ -52,7 +52,7 @@
    ret_val = drmCommandWrite( ps3v->drmFD, DRM_S3V_INIT_DMA, 
                           &info, sizeof(drmS3VInit) );
 
-   if (ret_val == FALSE)
+   if (ret_val < 0)
       xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "[dri] S3V Dma Cleanup Failed\n");
    return ret_val;
 }
@@ -83,28 +83,29 @@
    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
               "[drm] info.buffers_offset = %x\n", info.buffers_offset);
 
-   info.sarea_offset = sizeof(XF86DRISAREARec);
+   info.sarea_priv_offset = sizeof(XF86DRISAREARec);
 
    info.func = S3V_INIT_DMA;
    info.front_offset = 0;
    info.back_offset = ps3v->backOffset;
    info.depth_offset = ps3v->depthOffset;
-   info.w = pScrn->virtualX;
-   info.h = pScrn->virtualY;
-   info.pitch = ps3v->frontPitch;
+   info.front_width = pScrn->virtualX;
+   info.front_height = pScrn->virtualY;
+   info.front_pitch = ps3v->frontPitch;
 
    ret_val = drmCommandWrite( ps3v->drmFD, DRM_S3V_INIT_DMA, 
                           &info, sizeof(drmS3VInit) );
 
-   if(ret_val == FALSE) {
+   if (ret_val < 0) {
       xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
       "[drm] S3V Dma Initialization failed.\n");
+      return FALSE;
    }
    else
    {
       xf86DrvMsg(pScrn->scrnIndex, X_INFO, "[drm] S3V Dma Initialized\n");
    }
-   return ret_val;
+   return TRUE;
 }
 
 static int S3VDRIBufInit(S3VPtr info, ScreenPtr pScreen)