merge latest (4.3.99.16) from XFree86 (vendor) branchXEVIE-BASE

6 files changed, 39 insertions, 49 deletions

diff --git a/README.sgml b/README.sgml
index 71100bf..a3c5391 100644
--- a/README.sgml
+++ b/README.sgml
@@ -3,12 +3,12 @@
 ]>
 
 <article>
-<title>Information for Rendition (Micron) Verité Users
+<title>Information for Rendition (Micron) Verit&eacute; Users
 <author>The XFree86 Project Inc.
 <date>9 June 2000, last update by Dejan Ilic <email>dejan.ilic@home.se</email>
 
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/rendition.sgml,v 1.12 2000/06/17 02:30:33 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/rendition.sgml,v 1.13 2003/10/19 19:47:17 dawes Exp $
 </ident>
 
 <toc>
diff --git a/man/rendition.man b/man/rendition.man
index 2b6fae2..b286f59 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.2 2001/01/27 18:20:51 dawes Exp $ 
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.man,v 1.3 2003/06/18 16:17:39 eich Exp $ 
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH RENDITION __drivermansuffix__ __vendorversion__
@@ -43,7 +43,7 @@ names may optionally be specified in the config file
 section, and will override the auto-detection:
 .PP
 .RS 4
-"v1000", "v2100", "v2200".
+"v1000", "v2x00".
 .RE
 .PP
 The driver will auto-detect the amount of video memory present for all
diff --git a/src/rendition.c b/src/rendition.c
index e884346..1aa9055 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.50 2002/10/08 22:14:10 tsi 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.
  *
@@ -152,12 +152,14 @@ static const char *ramdacSymbols[] = {
     NULL
 };
 
+#if defined(XFree86LOADER) || USE_ACCEL
 static const char *xaaSymbols[] = {
     "XAACreateInfoRec",
     "XAADestroyInfoRec",
     "XAAInit",
     NULL
 };
+#endif
 
 static const char *ddcSymbols[] = {
     "xf86DoEDID_DDC1",
@@ -171,11 +173,13 @@ static const char *int10Symbols[] = {
     NULL
 };
 
+#ifdef XFree86LOADER
 static const char *miscfbSymbols[]={
     "xf1bppScreenInit",
     "xf4bppScreenInit",
     NULL
 };
+#endif
 
 static const char *fbSymbols[]={
     "fbScreenInit",
@@ -251,7 +255,7 @@ enum renditionTypes {
 /* supported chipsets */
 static SymTabRec renditionChipsets[] = {
     {CHIP_RENDITION_V1000, "V1000"},
-    {CHIP_RENDITION_V2x00, "V2100/V2200"},
+    {CHIP_RENDITION_V2x00, "V2x00"},
     {-1,                   NULL}
 };
 
@@ -526,7 +530,7 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags)
     pScreenInfo->racIoFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
     
     /* determine depth, bpp, etc. */
-    if (!xf86SetDepthBpp(pScreenInfo, 8, 8, 8, Support32bppFb))
+    if (!xf86SetDepthBpp(pScreenInfo, 0, 0, 0, Support32bppFb))
         return FALSE;
 
     if (pScreenInfo->depth == 15)
@@ -599,8 +603,10 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags)
       renditionClockRange.clockIndex = -1;
     }
 
-    /***********************************************/
-    /* ensure vgahw private structure is allocated */
+    if (!xf86LoadSubModule(pScreenInfo, "vgahw")){
+        return FALSE;
+    }
+    xf86LoaderReqSymLists(vgahwSymbols, NULL);
 
     if (!vgaHWGetHWRec(pScreenInfo))
         return FALSE;
@@ -631,7 +637,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],
@@ -657,11 +663,6 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags)
 
     /* Load the needed symbols */
 
-    if (!xf86LoadSubModule(pScreenInfo, "vgahw")){
-        return FALSE;
-    }
-    xf86LoaderReqSymLists(vgahwSymbols, NULL);
-
     pRendition->board.shadowfb=TRUE;
 
     if ((in_string = xf86GetOptValString(pRendition->Options, OPTION_ROTATE))){
@@ -733,13 +734,13 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags)
 #else
     /* Load DDC module if needed */
     if (!xf86ReturnOptValBool(pRendition->Options, OPTION_NO_DDC,0)){
-      if (!xf86LoadSubModule(pScreenInfo, "vbe")) {
+      if (!xf86LoadSubModule(pScreenInfo, "ddc")) {
 	xf86DrvMsg(pScreenInfo->scrnIndex, X_ERROR,
 		   ("Loading of DDC library failed, skipping DDC-probe\n"));
       }
       else {
 	  xf86MonPtr mon;
-	  xf86LoaderReqSymLists(vbeSymbols, NULL);
+	  xf86LoaderReqSymLists(ddcSymbols, NULL);
 	  mon = renditionProbeDDC(pScreenInfo, pRendition->pEnt->index);
 	  xf86PrintEDID(mon);
 	  xf86SetDDCproperties(pScreenInfo, mon);
@@ -911,7 +912,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");
@@ -919,8 +919,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;
@@ -1482,16 +1480,4 @@ renditionDDC1Read (ScrnInfoPtr pScreenInfo)
   return value;
 }
 
-void
-renditionProbeDDC(ScrnInfoPtr pScreenInfo, int index)
-{
-  vbeInfoPtr pVbe;
-  if (xf86LoadSubModule(pScreenInfo, "vbe")) {
-    xf86LoaderReqSymLists(vbeSymbols, NULL);
-
-    pVbe = VBEInit(NULL,index);
-    ConfiguredMonitor = vbeDoEDID(pVbe, NULL);
-    vbeFree(pVbe);
-  }
-}
 #endif
diff --git a/src/vboard.c b/src/vboard.c
index 2e94a53..95a8fbc 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.16 2002/12/11 17:23:33 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vboard.c,v 1.19 2003/11/06 18:38:04 tsi Exp $ */
 /*
  * includes
  */
@@ -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 */
@@ -105,7 +105,7 @@ verite_initboard(ScrnInfoPtr pScreenInfo)
     pRendition->board.ucode_entry=c;
 
 #ifdef DEBUG
-    ErrorF("UCode_Entry == 0x%x\n",pRendition->board.ucode_entry); */
+    ErrorF("UCode_Entry == 0x%x\n",pRendition->board.ucode_entry); 
 #endif
 
     /* Everything's OK */
@@ -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/vloaduc.c b/src/vloaduc.c
index cc2c6e6..2b69969 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.14 2003/11/06 18:38:04 tsi 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/vramdac.c b/src/vramdac.c
index 7652a36..850030c 100644
--- a/src/vramdac.c
+++ b/src/vramdac.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vramdac.c,v 1.18 2002/12/11 17:23:33 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vramdac.c,v 1.19 2003/09/24 02:43:25 dawes Exp $ */
 /*
  * includes
  */
@@ -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;
     }