SCO port update for SCO OpenServer 5 and UnixWare 7. A few general cleanupssco_port_update

    and bugs not specifically related to the port fixed along the way.

31 files changed, 140 insertions, 75 deletions

diff --git a/man/rendition.man b/man/rendition.man
index b286f59..aaee1c7 100644
--- a/man/rendition.man
+++ b/man/rendition.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.man,v 1.3 2003/06/18 16:17:39 eich Exp $ 
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.man,v 1.1 2001/01/24 00:06:26 dawes Exp $ 
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH RENDITION __drivermansuffix__ __vendorversion__
@@ -14,7 +14,7 @@ rendition \- Rendition video driver
 .fi
 .SH DESCRIPTION
 .B rendition 
-is an XFree86 driver for Rendition/Micron based video cards.  The driver
+is an __xservername__ driver for Rendition/Micron based video cards.  The driver
 supports following framebuffer depths: 8, 15 (Verite V1000 only), 16
 and 24. Acceleration and multi-head configurations are
 not supported yet, but are work in progress.
@@ -32,7 +32,7 @@ Verite V2100 based cards. Diamond Stealth II S220 is the only known such card.
 .B V2200
 Verite V2200 based cards.
 .SH CONFIGURATION DETAILS
-Please refer to XF86Config(__filemansuffix__) for general configuration
+Please refer to __xconfigfile__(__filemansuffix__) for general configuration
 details.  This section only covers configuration details specific to this
 driver.
 .PP
@@ -79,9 +79,9 @@ Default: Disabled for V1000, enabled for V2100/V2200.
 .TP
 .BI "Option \*qNoDDC\*q \*q" boolean \*q
 Disable probing of DDC-information from your monitor. This information is not
-used yet and is only there for informational purposes. This might change
-before final XFree86 4.0 release. Safe to disable if you experience problems
-during startup of X-server.
+used yet and is only there for informational purposes.  
+Safe to disable if you experience problems
+during startup of __xservername__.
 Default: Probe DDC.
 .TP
 .BI "Option \*qShadowFB\*q \*q" boolean \*q
@@ -107,6 +107,6 @@ as there has been indications of problems with it. Use
 .B "Option \*qMTRR\*q"
 to let the driver request write-combining of memory access on the video board.
 .SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
 .SH AUTHORS
 Authors include: Marc Langenbach, Dejan Ilic
diff --git a/src/accel.h b/src/accel.h
index e2cfba7..ea814b6 100644
--- a/src/accel.h
+++ b/src/accel.h
@@ -3,7 +3,7 @@
  *
  * header file for accel.c
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/accel.h,v 1.3 1999/11/19 13:54:44 hohndel Exp $ */
+/* $XFree86$ */
 
 #ifndef __ACCEL_H__
 #define __ACCEL_H__
diff --git a/src/accelX.c b/src/accelX.c
index 04d92b5..9f1b06e 100644
--- a/src/accelX.c
+++ b/src/accelX.c
@@ -3,7 +3,7 @@
  *
  * accelerator functions for X
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/accelX.c,v 1.12 2002/04/04 14:05:45 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/accelX.c,v 1.10 2001/06/15 21:22:54 dawes Exp $ */
 
 
 
diff --git a/src/cmd2d.h b/src/cmd2d.h
index 8290ac7..a3866b5 100644
--- a/src/cmd2d.h
+++ b/src/cmd2d.h
@@ -4,7 +4,7 @@
 /*
  * commands the 2d microcode offers
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/cmd2d.h,v 1.2 1999/10/14 04:43:14 dawes Exp $ */
+/* $XFree86$ */
 
 #define CMD_SETUP					32
 #define CMD_SET_PIX_REG				2
diff --git a/src/commonregs.h b/src/commonregs.h
index 8958bf1..e472c53 100644
--- a/src/commonregs.h
+++ b/src/commonregs.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/commonregs.h,v 1.1 1999/11/19 13:54:44 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/v1kregs.h,v 1.2 1999/04/17 07:06:34 dawes Exp $ */
 
 #ifndef __COMMONREGS_H__
 #define __COMMONREGS_H__
diff --git a/src/cscode.h b/src/cscode.h
index 7ffb578..f73a438 100644
--- a/src/cscode.h
+++ b/src/cscode.h
@@ -1,7 +1,7 @@
 /****************************************************************************\ 
  *       NOTE: This file generated automatically. Do not edit by hand!      *
 \****************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/cscode.h,v 1.3 1999/10/13 04:21:19 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/cscode.h,v 1.2 1999/04/17 07:06:31 dawes Exp $ */
 
 #ifndef __CSCODE_H__
 #define __CSCODE_H__
diff --git a/src/hwcursor.c b/src/hwcursor.c
index baf4c4d..e22e2f4 100644
--- a/src/hwcursor.c
+++ b/src/hwcursor.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/hwcursor.c,v 1.8 2002/04/04 14:05:45 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/hwcursor.c,v 1.6 2000/02/25 21:03:00 dawes Exp $ */
 /*
  * includes
  */
diff --git a/src/hwcursor.h b/src/hwcursor.h
index 1387858..38b444c 100644
--- a/src/hwcursor.h
+++ b/src/hwcursor.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/hwcursor.h,v 1.4 1999/11/19 13:54:45 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/rendition/hwcursor.h,v 1.1.2.2 1998/08/07 06:40:20 hohndel Exp $ */
 /*
  * file hwcursor.h
  */
diff --git a/src/rendition.c b/src/rendition.c
index 0f3cfce..9173bc9 100644
--- a/src/rendition.c
+++ b/src/rendition.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.c,v 1.56 2003/08/23 16:09:18 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.c,v 1.58 2003/11/03 05:11:26 tsi Exp $ */
 /*
  * Copyright (C) 1998 The XFree86 Project, Inc.  All Rights Reserved.
  *
@@ -75,6 +75,22 @@
 #define RENDITION_VERSION_CURRENT ((RENDITION_VERSION_MAJOR << 24) | \
                  (RENDITION_VERSION_MINOR << 16) | RENDITION_PATCHLEVEL)
 
+/*
+ * Constants for the (theoretical) maximum width and height that can
+ * be used to display data on the CRT.  These were calculated from 
+ * the HORZ and VERT macors, respectively, in vmodes.c.
+ */
+static const int MAX_HDISPLAY = 2048;
+static const int MAX_VDISPLAY = 2048;
+
+/*
+ * Constants for the (theoretical) maximum line length of a scan line
+ * and scan lines per screen (including overdraw).  These were 
+ * calculated from the HORZ and VERT macors, respectively, in vmodes.c.
+ */
+static const int MAX_HTOTAL   = 2880;
+static const int MAX_VTOTAL   = 2184;
+
 /* 
  * local function prototypes
  */
@@ -212,7 +228,7 @@ static XF86ModuleVersionInfo renditionVersionRec = {
     MODULEVENDORSTRING,
     MODINFOSTRING1,
     MODINFOSTRING2,
-    XF86_VERSION_CURRENT,
+    XORG_VERSION_CURRENT,
     RENDITION_VERSION_MAJOR, RENDITION_VERSION_MINOR, RENDITION_PATCHLEVEL,
     ABI_CLASS_VIDEODRV,
     ABI_VIDEODRV_VERSION,
@@ -338,8 +354,8 @@ renditionProbe(DriverPtr drv, int flags)
 		foundScreen=TRUE;
 	    }
         }
+	xfree(usedChips);
     }
-    xfree(usedChips);
     return foundScreen;
 }
 
@@ -533,15 +549,40 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags)
     if (!xf86SetDepthBpp(pScreenInfo, 0, 0, 0, Support32bppFb))
         return FALSE;
 
-    if (pScreenInfo->depth == 15)
-    {
-        if (PCI_CHIP_V1000 != pRendition->PciInfo->chipType) {
-	    xf86DrvMsg(pScreenInfo->scrnIndex, X_ERROR,
-		       "Given depth (%d) is not supported by this chipset.\n",
-		       pScreenInfo->depth);
-	    return FALSE;
-	}
-    }
+    /* Verify that the color depth is supported. */
+    switch( pScreenInfo->depth ) {
+
+        case 8:
+        case 16:
+        case 24:
+        {
+            break;
+        }
+
+        case 15:
+        {
+            if (PCI_CHIP_V1000 != pRendition->PciInfo->chipType) {
+                xf86DrvMsg( pScreenInfo->scrnIndex, X_ERROR,
+                        "Given depth (%d) is not supported by this chipset.\n",
+                        pScreenInfo->depth);
+                return FALSE;
+            }
+        }
+
+        default:
+        {
+            xf86DrvMsg( pScreenInfo->scrnIndex, X_ERROR,
+                    "Given depth (%d) is not supported by this driver\n",
+                    pScreenInfo->depth );
+            return FALSE;
+        }
+
+    } /* End of switch( pScreenInfo->depth ) {*/
+
+
+    /* Print the color depth and frame buffer bits per pixel. */
+    xf86PrintDepthBpp( pScreenInfo );
+
 
     /* collect all of the options flags and process them */
 
@@ -637,7 +678,7 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags)
     /* I do not get the IO base addres <ml> */
     /* XXX Is this still true?  If so, the wrong base is being checked */
     xf86DrvMsg(pScreenInfo->scrnIndex, X_PROBED,
-	       "Rendition %s @ %x/%x\n",
+	       "Rendition %s @ %lx/%lx\n",
 	       renditionChipsets[pRendition->board.chip==V1000_DEVICE ? 0:1]
 	       .name,
 	       pRendition->PciInfo->ioBase[1],
@@ -788,12 +829,13 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags)
      * Validate the modes.  Note that the limits passed to
      * xf86ValidateModes() are VGA CRTC architectural limits.
      */
-    pScreenInfo->maxHValue = 2080;
-    pScreenInfo->maxVValue = 1025;
+    pScreenInfo->maxHValue = MAX_HTOTAL;
+    pScreenInfo->maxVValue = MAX_VTOTAL;
     nModes = xf86ValidateModes(pScreenInfo,
             pScreenInfo->monitor->Modes, pScreenInfo->display->modes,
-            &renditionClockRange, NULL, 8, 2040, Rounding, 1, 1024,
-            pScreenInfo->display->virtualX, pScreenInfo->display->virtualY,
+            &renditionClockRange, NULL, 8, MAX_HDISPLAY, Rounding,
+            1, MAX_VDISPLAY, pScreenInfo->display->virtualX,
+            pScreenInfo->display->virtualY,
             0x10000, LOOKUP_CLOSEST_CLOCK | LOOKUP_CLKDIV2);
 
     if (nModes < 0)
@@ -912,7 +954,6 @@ static Bool
 renditionSetMode(ScrnInfoPtr pScreenInfo, DisplayModePtr pMode)
 {
     struct verite_modeinfo_t *modeinfo=&RENDITIONPTR(pScreenInfo)->mode;
-    vgaHWPtr pvgaHW;
 
 #ifdef DEBUG
     ErrorF("RENDITION: renditionSetMode() called\n");
@@ -920,8 +961,6 @@ renditionSetMode(ScrnInfoPtr pScreenInfo, DisplayModePtr pMode)
     sleep(1);
 #endif
 
-    pvgaHW = VGAHWPTR(pScreenInfo);
-
     /* construct a modeinfo for the verite_setmode function */
     modeinfo->clock=pMode->SynthClock;
     modeinfo->hdisplay=pMode->HDisplay;
@@ -1042,17 +1081,17 @@ renditionCloseScreen(int scrnIndex, ScreenPtr pScreen)
     if (prenditionPriv->board.accel)
 	RENDITIONAccelNone(pScreenInfo);
 
+    if (pScreenInfo->vtSema)
+	renditionLeaveGraphics(pScreenInfo);
+
+    pScreenInfo->vtSema = FALSE;
+
     if (prenditionPriv 
 	&& (pScreen->CloseScreen = prenditionPriv->CloseScreen)) {
         prenditionPriv->CloseScreen = NULL;
         Closed = (*pScreen->CloseScreen)(scrnIndex, pScreen);
     }
     
-    if (pScreenInfo->vtSema)
-	renditionLeaveGraphics(pScreenInfo);
-
-    pScreenInfo->vtSema = FALSE;
-
 #ifdef DEBUG
     ErrorF("Closescreen OK...!!!!\n");
     sleep(1);
@@ -1107,6 +1146,8 @@ renditionScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
 
     verite_save(pScreenInfo);
 
+    pScreenInfo->vtSema = TRUE;
+
     if (!renditionSetMode(pScreenInfo, pScreenInfo->currentMode))
         return FALSE;
 
@@ -1228,7 +1269,6 @@ renditionScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
     if (pScreenInfo->depth > 1)
 	if (!xf86HandleColormaps(pScreen, 256, pScreenInfo->rgbBits,
 				 renditionLoadPalette, NULL,
-				 CMAP_LOAD_EVEN_IF_OFFSCREEN|
 				 CMAP_RELOAD_ON_MODE_SWITCH)) {
 	    xf86DrvMsg(pScreenInfo->scrnIndex, X_ERROR, 
 		       "Colormap initialization failed\n");
diff --git a/src/rendition.h b/src/rendition.h
index 3ec6726..44035d2 100644
--- a/src/rendition.h
+++ b/src/rendition.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.h,v 1.7 2001/05/16 06:48:10 keithp Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.h,v 1.5 2000/02/25 21:03:02 dawes Exp $ */
 
 #ifndef __RENDITION_H__
 #define __RENDITION_H__
diff --git a/src/rendition_options.h b/src/rendition_options.h
index c41db49..414a23f 100644
--- a/src/rendition_options.h
+++ b/src/rendition_options.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition_options.h,v 1.5 2001/05/04 19:05:42 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition_options.h,v 1.4 2000/03/01 00:25:24 dawes Exp $ */
 
 #ifndef __RENDITION_OPTION_H__
 #define __RENDITION_OPTION_H__
diff --git a/src/rendition_shadow.c b/src/rendition_shadow.c
index cf93af5..8ec4a0b 100644
--- a/src/rendition_shadow.c
+++ b/src/rendition_shadow.c
@@ -4,7 +4,7 @@
  * The functions used by ShadowFB
  * Based on code written by Mark Vojkovich <markv@valinux.com>
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition_shadow.c,v 1.1 2000/03/01 00:25:25 dawes Exp $ */
+/* $XFree86$ */
 
 #include "rendition.h"
 #include "vtypes.h"
diff --git a/src/rendition_shadow.h b/src/rendition_shadow.h
index ec74463..19e4a5e 100644
--- a/src/rendition_shadow.h
+++ b/src/rendition_shadow.h
@@ -3,7 +3,7 @@
  *
  * headfile for rendition_shadow.c
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition_shadow.h,v 1.1 2000/03/01 00:25:25 dawes Exp $ */
+/* $XFree86$ */
 
 #ifndef __RENDITION_SHADOW_H__
 #define __RENDITION_SHADOW_H__
diff --git a/src/v1kregs.h b/src/v1kregs.h
index af1817b..b2758b9 100644
--- a/src/v1kregs.h
+++ b/src/v1kregs.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/v1kregs.h,v 1.4 1999/11/19 13:54:45 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/v1kregs.h,v 1.2 1999/04/17 07:06:34 dawes Exp $ */
 
 #ifndef __V1KREGS_H__
 #define __V1KREGS_H__
diff --git a/src/v1krisc.c b/src/v1krisc.c
index dc0a42d..0c18bae 100644
--- a/src/v1krisc.c
+++ b/src/v1krisc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/v1krisc.c,v 1.7 2002/01/25 21:56:07 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/v1krisc.c,v 1.6 2000/03/31 20:13:25 dawes Exp $ */
 /*
  *
  */
diff --git a/src/v1krisc.h b/src/v1krisc.h
index 7301129..e005a3a 100644
--- a/src/v1krisc.h
+++ b/src/v1krisc.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/v1krisc.h,v 1.3 1999/10/13 04:21:21 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/v1krisc.h,v 1.2 1999/04/17 07:06:34 dawes Exp $ */
 /*
  * file v1krisc.h
  *
diff --git a/src/v2kregs.h b/src/v2kregs.h
index d2b66be..faadd6a 100644
--- a/src/v2kregs.h
+++ b/src/v2kregs.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/v2kregs.h,v 1.4 1999/11/19 13:54:46 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/v2kregs.h,v 1.2 1999/04/17 07:06:34 dawes Exp $ */
 #ifndef __V2KREGS_H__
 #define __V2KREGS_H__
 
diff --git a/src/vboard.c b/src/vboard.c
index 4e769b6..0d670fa 100644
--- a/src/vboard.c
+++ b/src/vboard.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vboard.c,v 1.17 2003/03/25 04:18:22 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vboard.c,v 1.18tsi Exp $ */
 /*
  * includes
  */
@@ -9,7 +9,7 @@
 #include "vloaduc.h"
 #include "vos.h"
 
-#if defined(SCO) || defined(SCO325)
+#if defined(__SCO__)
 #define PATH_MAX 1024
 #endif
 
@@ -50,7 +50,7 @@ verite_initboard(ScrnInfoPtr pScreenInfo)
     /* Note that CS ucode must wait on address in csucode_base
      * when initialized for later context switch code to work. */
 
-    ErrorF("Loading csucode @ 0x%x + 0x800\n", pRendition->board.vmem_base);
+    ErrorF("Loading csucode @ %p + 0x800\n", pRendition->board.vmem_base);
     vmb=pRendition->board.vmem_base;
     offset=pRendition->board.csucode_base;
     for (c=0; c<sizeof(csrisc)/sizeof(vu32); c++, offset+=sizeof(vu32))
@@ -81,8 +81,8 @@ verite_initboard(ScrnInfoPtr pScreenInfo)
     if (pc != pRendition->board.csucode_base){
 	xf86DrvMsg(pScreenInfo->scrnIndex, X_ERROR,
 		   ("VERITE_INITBOARD -- PC != CSUCODEBASE\n"));
-	ErrorF ("RENDITION: PC == 0x%x   --  CSU == 0x%x\n",
-		pc,pRendition->board.csucode_base);
+	ErrorF ("RENDITION: PC == 0x%x   --  CSU == 0x%lx\n",
+		pc,(unsigned long)pRendition->board.csucode_base);
     }
 
     /* reset memory endian */
@@ -228,10 +228,10 @@ verite_check_csucode(ScrnInfoPtr pScreenInfo)
   offset=pRendition->board.csucode_base;
   for (c=0; c<sizeof(csrisc)/sizeof(vu32); c++, offset+=sizeof(vu32))
     if (csrisc[c] != verite_read_memory32(vmb, offset)) {
-      ErrorF("csucode mismatch in word %02d: 0x%08x should be 0x%08x\n",
+      ErrorF("csucode mismatch in word %02d: 0x%08lx should be 0x%08lx\n",
 	     c,
-	     verite_read_memory32(vmb, offset),
-	     csrisc[c]);
+	     (unsigned long)verite_read_memory32(vmb, offset),
+	     (unsigned long)csrisc[c]);
       mismatches++;
     }
 #ifdef DEBUG
diff --git a/src/vboard.h b/src/vboard.h
index ddda206..3de5aec 100644
--- a/src/vboard.h
+++ b/src/vboard.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vboard.h,v 1.6 2000/03/31 20:13:26 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vboard.h,v 1.5 2000/02/25 21:03:04 dawes Exp $ */
 
 /*
  * vboard.h
diff --git a/src/vgafont-std.data b/src/vgafont-std.data
index db63ea8..37a3b9c 100644
--- a/src/vgafont-std.data
+++ b/src/vgafont-std.data
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vgafont-std.data,v 1.3 1999/10/13 04:21:22 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vgafont-std.data,v 1.2 1999/04/17 07:06:37 dawes Exp $ */
 #ifndef __VGAFONT_STD__
 #define __VGAFONT_STD__
 
diff --git a/src/vgafont-vrx.data b/src/vgafont-vrx.data
index ad34582..9f99844 100644
--- a/src/vgafont-vrx.data
+++ b/src/vgafont-vrx.data
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vgafont-vrx.data,v 1.3 1999/10/13 04:21:23 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vgafont-vrx.data,v 1.2 1999/04/17 07:06:38 dawes Exp $ */
 #ifndef __VGAFONT_VRX__
 #define __VGAFONT_VRX__
 
diff --git a/src/vgapalette.data b/src/vgapalette.data
index 5267608..b1926a1 100644
--- a/src/vgapalette.data
+++ b/src/vgapalette.data
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vgapalette.data,v 1.3 1999/10/13 04:21:23 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vgapalette.data,v 1.2 1999/04/17 07:06:38 dawes Exp $ */
 #ifndef __VGAPALETTE__
 #define __VGAPALETTE__
 
diff --git a/src/vloaduc.c b/src/vloaduc.c
index cc2c6e6..a052ce8 100644
--- a/src/vloaduc.c
+++ b/src/vloaduc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vloaduc.c,v 1.12 2000/04/07 03:57:51 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vloaduc.c,v 1.13tsi Exp $ */
 /*
  * includes
  */
@@ -177,18 +177,21 @@ loadSegment2board(ScrnInfoPtr pScreenInfo, int fd, Elf32_Phdr *phdr)
   vu32 physAddr=SW32(phdr->p_paddr);
 
   if (lseek(fd, offset, SEEK_SET) != offset) {
-	ErrorF("RENDITION: Failure in loadSegmentToBoard, offset %lx\n", offset);
+	ErrorF("RENDITION: Failure in loadSegmentToBoard, offset %lx\n",
+		(unsigned long)offset);
     return;
   }
 
   data=(vu8 *)xalloc(size);
   if (NULL == data){
-	ErrorF("RENDITION: GlobalAllocPtr couldn't allocate %x bytes", size);
+	ErrorF("RENDITION: GlobalAllocPtr couldn't allocate %lx bytes",
+		(unsigned long)size);
 	return;
   }
 
   if (read(fd, data, size) != size){
-	ErrorF("RENDITION: verite_readfile Failure, couldn't read %x bytes ", size);
+	ErrorF("RENDITION: verite_readfile Failure, couldn't read %lx bytes ",
+		(unsigned long)size);
 	return;
   }
 
diff --git a/src/vloaduc.h b/src/vloaduc.h
index 0c127d1..e44f110 100644
--- a/src/vloaduc.h
+++ b/src/vloaduc.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vloaduc.h,v 1.4 2000/03/31 20:13:27 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vloaduc.h,v 1.3 1999/10/13 04:21:23 dawes Exp $ */
 
 /*
  * file vloaduc.h
diff --git a/src/vmisc.c b/src/vmisc.c
index fec54ed..ac14cf0 100644
--- a/src/vmisc.c
+++ b/src/vmisc.c
@@ -1,5 +1,5 @@
 /* Misc routines used elsewhere in driver */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vmisc.c,v 1.4 2000/03/31 20:13:27 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vmisc.c,v 1.3 2000/02/25 21:03:05 dawes Exp $ */
 
 #include "rendition.h"
 #include "vtypes.h"
diff --git a/src/vmisc.h b/src/vmisc.h
index c104147..5e75ea0 100644
--- a/src/vmisc.h
+++ b/src/vmisc.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vmisc.h,v 1.3 2000/03/31 20:13:27 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vmisc.h,v 1.2 1999/11/19 14:59:18 hohndel Exp $ */
 
 #ifndef __VMISC_H__
 #define __VMISC_H__
diff --git a/src/vmodes.c b/src/vmodes.c
index 3e0bfd3..4c4336b 100644
--- a/src/vmodes.c
+++ b/src/vmodes.c
@@ -376,7 +376,16 @@ verite_restore(ScrnInfoPtr pScreenInfo, RenditionRegPtr reg)
     int iob=pRendition->board.io_base;
 
     verite_restoredac (pScreenInfo, reg);
-    verite_out32(iob+MODEREG,reg->mode);
+    /*
+     * If this is a Verite 1000, restore the MODEREG
+     * register now.  The MODEREG gets restored later
+     * for the Verite 2x00 because restoring it here
+     * has been confirmed to cause intermittent
+     * system locks.
+     */
+    if (pRendition->board.chip == V1000_DEVICE) {
+	verite_out32(iob+MODEREG,reg->mode);
+    }
     verite_out8(iob+MEMENDIAN,reg->memendian);
     verite_out32(iob+DRAMCTL,reg->dramctl);
     verite_out32(iob+SCLKPLL,reg->sclkpll);
@@ -397,6 +406,18 @@ verite_restore(ScrnInfoPtr pScreenInfo, RenditionRegPtr reg)
 	while ((verite_in32(iob+CRTCSTATUS)&CRTCSTATUS_VERT_MASK) ==
 	       CRTCSTATUS_VERT_ACTIVE);
     }
+
+    /*
+     * If this is a Verite 2x00, restore the MODEREG
+     * register now.  The MODEREG register is restored
+     * earlier for the Verite 1000, but is restored
+     * here for the Verite 2x00 to prevent system
+     * locks.
+     */
+    if (pRendition->board.chip != V1000_DEVICE) {
+	verite_out32(iob+MODEREG,reg->mode);
+    }
+
     verite_out32(iob+CRTCHORZ,reg->crtch);
     verite_out32(iob+CRTCVERT,reg->crtcv);
     verite_out32(iob+FRAMEBASEA, reg->vbasea);
diff --git a/src/vmodes.h b/src/vmodes.h
index 3cb8669..4f2c308 100644
--- a/src/vmodes.h
+++ b/src/vmodes.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vmodes.h,v 1.5 2002/04/04 14:05:45 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vmodes.h,v 1.3 1999/10/13 04:21:24 dawes Exp $ */
 /*
  * file vmodes.h
  *
diff --git a/src/vos.h b/src/vos.h
index e2ec54f..bcb75ab 100644
--- a/src/vos.h
+++ b/src/vos.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vos.h,v 1.9 2002/01/25 21:56:07 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vos.h,v 1.8 2000/03/31 20:13:28 dawes Exp $ */
 /*
  * file vos.h
  *
diff --git a/src/vramdac.c b/src/vramdac.c
index 7652a36..f09d198 100644
--- a/src/vramdac.c
+++ b/src/vramdac.c
@@ -170,8 +170,9 @@ verite_initdac(ScrnInfoPtr pScreenInfo, vu8 bpp, vu8 doubleclock)
     switch (bpp) {
         case 1:
         case 4:
-			ErrorF("%s %s: color depth %d not (yet ?) supported\n",
-				X_CONFIG, /*vga256InfoRec.name*/"Rendition", bpp);
+			xf86DrvMsg(pScreenInfo->scrnIndex, X_CONFIG,
+				   "color depth %d not (yet ?) supported\n",
+				   bpp);
 			return -1;
 
         case 8:
@@ -232,8 +233,8 @@ verite_initdac(ScrnInfoPtr pScreenInfo, vu8 bpp, vu8 doubleclock)
             break;
 
         default:
-            ErrorF( "%s %s: Color depth not supported (%d bpp)\n",
-	    	    X_CONFIG, /*vga256InfoRec.name*/"Rendition", bpp);
+            xf86DrvMsg(pScreenInfo->scrnIndex, X_CONFIG,
+			"Color depth not supported (%d bpp)\n", bpp);
             return -1;
             break;
     }
diff --git a/src/vramdac.h b/src/vramdac.h
index c7db3c1..ac29672 100644
--- a/src/vramdac.h
+++ b/src/vramdac.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vramdac.h,v 1.6 2002/04/04 14:05:45 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vramdac.h,v 1.4 2000/02/25 21:03:07 dawes Exp $ */
 /*
  * file vramdac.h
  *