DRI XFree86-4_3_99_12-merge importDRI-trunk-20040721DRI-trunk-20040613DRI-XFree86-4_3_99_12-merge

16 files changed, 52 insertions, 25 deletions

diff --git a/README b/README
index d29cc1b..883d311 100644
--- a/README
+++ b/README
@@ -539,4 +539,4 @@ the first bits of the next scanline should use them.
 
 The bitmap data as a whole must be 4 byte aligned.
 
-$XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/README,v 1.2 2001/04/05 21:09:37 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/README,v 1.5 2002/10/16 22:12:53 alanh Exp $
diff --git a/man/vmware.man b/man/vmware.man
index e8615ba..e2d707f 100644
--- a/man/vmware.man
+++ b/man/vmware.man
@@ -1,3 +1,4 @@
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/vmware.man,v 1.2 2001/04/06 17:44:58 dawes Exp $
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH VMWARE __drivermansuffix__ __vendorversion__
@@ -13,9 +14,9 @@ vmware \- VMware SVGA video driver
 .fi
 .SH DESCRIPTION
 .B vmware 
-is an __xservername__ driver for VMware virtual video cards. 
+is an XFree86 driver for VMware virtual video cards. 
 .SH CONFIGURATION DETAILS
-Please refer to __xconfigfile__(__filemansuffix__) for general configuration
+Please refer to XF86Config(__filemansuffix__) for general configuration
 details.  This section only covers configuration details specific to this
 driver.
 .PP
@@ -31,6 +32,6 @@ Enable or disable the HW cursor.  Default: off.
 .BI "Option \*qNoAccel\*q \*q" boolean \*q
 Disable or enable acceleration.  Default: acceleration is enabled.
 .SH "SEE ALSO"
-__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
+XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
 .SH AUTHORS
 Copyright (c) 1999-2001 VMware, Inc.
diff --git a/src/bits2pixels.c b/src/bits2pixels.c
index c08fa79..416a1a7 100644
--- a/src/bits2pixels.c
+++ b/src/bits2pixels.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/bits2pixels.c,v 1.1 2001/04/05 19:29:43 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/bits2pixels.c,v 1.2 2002/12/11 17:07:58 dawes Exp $ */
 /* **********************************************************
  * Copyright (C) 1999-2001 VMware, Inc.
  * All Rights Reserved
diff --git a/src/bits2pixels.h b/src/bits2pixels.h
index a337902..585f6fc 100644
--- a/src/bits2pixels.h
+++ b/src/bits2pixels.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/bits2pixels.h,v 1.1 2001/04/05 19:29:44 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/bits2pixels.h,v 1.2 2002/12/11 17:07:58 dawes Exp $ */
 /* **********************************************************
  * Copyright (C) 1999-2001 VMware, Inc.
  * All Rights Reserved
diff --git a/src/guest_os.h b/src/guest_os.h
index 96378f0..dedebe0 100644
--- a/src/guest_os.h
+++ b/src/guest_os.h
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/guest_os.h,v 1.1 2001/04/05 19:29:44 dawes Exp $ */
 /* *********************************************************
  * Copyright (C) 1999-2001 VMware, Inc.
  * All Rights Reserved
diff --git a/src/includeCheck.h b/src/includeCheck.h
index 5d02f03..8df4666 100644
--- a/src/includeCheck.h
+++ b/src/includeCheck.h
@@ -1,3 +1,3 @@
 /* This space intentionally left blank. */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/includeCheck.h,v 1.2 2001/04/06 17:44:58 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/includeCheck.h,v 1.3 2002/10/16 22:12:53 alanh Exp $ */
 
diff --git a/src/offscreen_manager.c b/src/offscreen_manager.c
index c2a7a0d..68c8632 100644
--- a/src/offscreen_manager.c
+++ b/src/offscreen_manager.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1998-2002 VMware, Inc.
  * All Rights Reserved
  * **********************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/offscreen_manager.c,v 1.1 2002/12/10 04:17:19 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/offscreen_manager.c,v 1.2 2002/12/11 17:07:58 dawes Exp $ */
 
 #include "vmware.h"
 
diff --git a/src/offscreen_manager.h b/src/offscreen_manager.h
index 27d97a7..e948da9 100644
--- a/src/offscreen_manager.h
+++ b/src/offscreen_manager.h
@@ -2,7 +2,7 @@
  * Copyright (C) 1998-2002 VMware, Inc.
  * All Rights Reserved
  * **********************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/offscreen_manager.h,v 1.1 2002/12/10 04:17:19 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/offscreen_manager.h,v 1.2 2002/12/11 17:07:58 dawes Exp $ */
 
 #ifndef OFFSCREEN_MANAGER_H
 #define OFFSCREEN_MANAGER_H
diff --git a/src/svga_limits.h b/src/svga_limits.h
index 209dd8f..016c2b8 100644
--- a/src/svga_limits.h
+++ b/src/svga_limits.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/svga_limits.h,v 1.1 2001/04/05 19:29:44 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/svga_limits.h,v 1.2 2002/10/16 22:12:53 alanh Exp $ */
 /* **********************************************************
  * Copyright (C) 1998-2001 VMware, Inc.
  * All Rights Reserved
diff --git a/src/svga_reg.h b/src/svga_reg.h
index d68666c..2d6800d 100644
--- a/src/svga_reg.h
+++ b/src/svga_reg.h
@@ -9,7 +9,7 @@
  *
  * SVGA hardware definitions
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/svga_reg.h,v 1.7 2002/12/10 04:17:19 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/svga_reg.h,v 1.8 2003/02/04 01:39:53 dawes Exp $ */
 
 #ifndef _SVGA_REG_H_
 #define _SVGA_REG_H_
diff --git a/src/vm_basic_types.h b/src/vm_basic_types.h
index 703e217..673522f 100644
--- a/src/vm_basic_types.h
+++ b/src/vm_basic_types.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/vm_basic_types.h,v 1.4 2001/04/25 16:44:58 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/vm_basic_types.h,v 1.5 2002/01/07 20:38:29 dawes Exp $ */
 /* **********************************************************
  * Copyright (C) 1998-2001 VMware, Inc.
  * All Rights Reserved
diff --git a/src/vm_device_version.h b/src/vm_device_version.h
index f7af959..8f6dd3b 100644
--- a/src/vm_device_version.h
+++ b/src/vm_device_version.h
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/vm_device_version.h,v 1.1 2001/04/05 19:29:44 dawes Exp $ */
 /* **********************************************************
  * Copyright (C) 1998-2001 VMware, Inc.
  * All Rights Reserved
diff --git a/src/vmware.c b/src/vmware.c
index f635ff2..d21ebb7 100644
--- a/src/vmware.c
+++ b/src/vmware.c
@@ -6,7 +6,7 @@
 char rcsId_vmware[] =
     "Id: vmware.c,v 1.11 2001/02/23 02:10:39 yoel Exp $";
 #endif
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/vmware.c,v 1.18 2003/09/24 02:43:31 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/vmware.c,v 1.17 2003/02/18 19:10:36 alanh Exp $ */
 
 /*
  * TODO: support the vmware linux kernel fb driver (Option "UseFBDev").
@@ -130,7 +130,7 @@ static XF86ModuleVersionInfo vmwareVersRec = {
     MODULEVENDORSTRING,
     MODINFOSTRING1,
     MODINFOSTRING2,
-    XORG_VERSION_CURRENT,
+    XF86_VERSION_CURRENT,
     VMWARE_MAJOR_VERSION, VMWARE_MINOR_VERSION, VMWARE_PATCHLEVEL,
     ABI_CLASS_VIDEODRV,
     ABI_VIDEODRV_VERSION,
@@ -432,7 +432,7 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int flags)
            pVMWARE->PciInfo->ioBase[0] + SVGA_VALUE_PORT;
     }
     xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
-               "VMware SVGA regs at (0x%04lx, 0x%04lx)\n",
+               "VMware SVGA regs at (0x%04x, 0x%04x)\n",
                pVMWARE->indexReg, pVMWARE->valueReg);
 
     id = VMXGetVMwareSvgaId(pVMWARE);
@@ -494,7 +494,7 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int flags)
     xf86DrvMsgVerb(pScrn->scrnIndex, X_PROBED, 2, "bpp:   %d\n", pVMWARE->bitsPerPixel);
 
     xf86DrvMsgVerb(pScrn->scrnIndex, X_PROBED, 2, "vram:  %d\n", pVMWARE->videoRam);
-    xf86DrvMsgVerb(pScrn->scrnIndex, X_PROBED, 2, "pbase: 0x%08lx\n", pVMWARE->memPhysBase);
+    xf86DrvMsgVerb(pScrn->scrnIndex, X_PROBED, 2, "pbase: %p\n", pVMWARE->memPhysBase);
     xf86DrvMsgVerb(pScrn->scrnIndex, X_PROBED, 2, "mwidt: %d\n", pVMWARE->maxWidth);
     xf86DrvMsgVerb(pScrn->scrnIndex, X_PROBED, 2, "mheig: %d\n", pVMWARE->maxHeight);
 
@@ -578,11 +578,11 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int flags)
     xf86DrvMsgVerb(pScrn->scrnIndex, X_PROBED,
                    2, "bpp:   %d\n", pVMWARE->bitsPerPixel);
     xf86DrvMsgVerb(pScrn->scrnIndex, X_PROBED,
-                   2, "w.red: %d\n", (int)pVMWARE->weight.red);
+                   2, "w.red: %d\n", pVMWARE->weight.red);
     xf86DrvMsgVerb(pScrn->scrnIndex, X_PROBED,
-                   2, "w.grn: %d\n", (int)pVMWARE->weight.green);
+                   2, "w.grn: %d\n", pVMWARE->weight.green);
     xf86DrvMsgVerb(pScrn->scrnIndex, X_PROBED,
-                   2, "w.blu: %d\n", (int)pVMWARE->weight.blue);
+                   2, "w.blu: %d\n", pVMWARE->weight.blue);
     xf86DrvMsgVerb(pScrn->scrnIndex, X_PROBED,
                    2, "vis:   %d\n", pVMWARE->defaultVisual);
 
@@ -646,7 +646,7 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int flags)
     pScrn->chipset = (char*)xf86TokenToString(VMWAREChipsets, pVMWARE->PciInfo->chipType);
 
     if (!pScrn->chipset) {
-        xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "ChipID 0x%04x is not recognised\n", pVMWARE->PciInfo->chipType);
+        xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "ChipID 0x%04 is not recognised\n", pVMWARE->PciInfo->chipType);
         return FALSE;
     }
 
@@ -1303,7 +1303,7 @@ VMWAREFreeScreen(int scrnIndex, int flags)
    VMWAREFreeRec(xf86Screens[scrnIndex]);
 }
 
-static ModeStatus
+static Bool
 VMWAREValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
 {
     return MODE_OK;
diff --git a/src/vmware.h b/src/vmware.h
index 7be49d5..c12fc29 100644
--- a/src/vmware.h
+++ b/src/vmware.h
@@ -180,61 +180,87 @@ extern const char *vmwareXaaSymbols[];
 #define ACCELERATE_OPS
 
 void vmwareWriteReg(
+#if NeedFunctionPrototypes
    VMWAREPtr pVMWARE, int index, CARD32 value
+#endif
    );
 
 CARD32 vmwareReadReg(
+#if NeedFunctionPrototypes
     VMWAREPtr pVMWARE, int index
+#endif
     );
 
 void vmwareWriteWordToFIFO(
+#if NeedFunctionPrototypes
    VMWAREPtr pVMWARE, CARD32 value
+#endif
    );
 
 void vmwareWaitForFB(
+#ifdef NeedFunctionPrototypes
    VMWAREPtr pVMWARE
+#endif
    );
 
 void vmwareSendSVGACmdUpdate(
+#if NeedFunctionPrototypes
    VMWAREPtr pVMWARE, BoxPtr pBB
+#endif
    );
 
 /* vmwarecurs.c */
 Bool vmwareCursorInit(
+#if NeedFunctionPrototypes
    ScreenPtr pScr
+#endif
    );
 
 void vmwareCursorModeInit(
+#if NeedFunctionPrototypes
     ScrnInfoPtr pScrn,
     DisplayModePtr mode
+#endif
    );
 
 void vmwareCursorCloseScreen(
+#if NeedFunctionPrototypes
     ScreenPtr pScr
+#endif
     );
 
 void vmwareWriteCursorRegs(
+#if NeedFunctionPrototypes
    VMWAREPtr pVMWARE,
    Bool visible,
    Bool force
+#endif
    );
 
 void vmwareCursorHookWrappers(
+#if NeedFunctionPrototypes
    ScreenPtr pScreen
+#endif
    );
 
 
 /* vmwarexaa.c */
 Bool vmwareXAAScreenInit(
+#if NeedFunctionPrototypes
    ScreenPtr pScreen
+#endif
    );
 
 Bool vmwareXAAModeInit(
+#if NeedFunctionPrototypes
     ScrnInfoPtr pScrn, DisplayModePtr mode
+#endif
     );
 
 void vmwareXAACloseScreen(
+#if NeedFunctionPrototypes
    ScreenPtr pScreen
+#endif
    );
 
 #endif
diff --git a/src/vmwarecurs.c b/src/vmwarecurs.c
index 23ddc59..1a7c6eb 100644
--- a/src/vmwarecurs.c
+++ b/src/vmwarecurs.c
@@ -6,7 +6,7 @@
 char rcsId_vmwarecurs[] =
     "Id: vmwarecurs.c,v 1.5 2001/01/30 23:33:02 bennett Exp $";
 #endif
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/vmwarecurs.c,v 1.10 2003/02/04 01:39:53 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/vmwarecurs.c,v 1.11 2003/02/05 12:47:42 dawes Exp $ */
 
 #include "vmware.h"
 #include "bits2pixels.h"
diff --git a/src/vmwarexaa.c b/src/vmwarexaa.c
index 8142412..e39d14c 100644
--- a/src/vmwarexaa.c
+++ b/src/vmwarexaa.c
@@ -6,7 +6,7 @@
 char rcsId_vmwarexaa[] =
     "Id: $";
 #endif
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/vmwarexaa.c,v 1.5 2003/02/04 01:39:53 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/vmwarexaa.c,v 1.6 2003/04/13 18:09:27 dawes Exp $ */
 
 #include "vmware.h"