merge latest (4.3.99.16) from XFree86 (vendor) branchXORG-RELEASE-1-BASEXEVIE-MERGEXEVIE-BASEXINERAMA_2XEVIE

2 files changed, 19 insertions, 19 deletions

diff --git a/src/cyrix_driver.c b/src/cyrix_driver.c
index 9908478..d8092a2 100644
--- a/src/cyrix_driver.c
+++ b/src/cyrix_driver.c
@@ -50,7 +50,7 @@
  *		(note that most of the data books have been released by
  *		 NatSemi and are downloadable for free as pdf files)
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c,v 1.26 2003/01/07 00:05:13 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c,v 1.31 2003/11/06 18:38:02 tsi Exp $ */
 
 #include "fb.h"
 #include "mibank.h"
@@ -99,8 +99,8 @@ static void	CYRIXAdjustFrame(int scrnIndex, int x, int y, int flags);
 /* Optional functions */
 static void	CYRIXFreeScreen(int scrnIndex, int flags);
 static int	CYRIXFindIsaDevice(GDevPtr dev);
-static int	CYRIXValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose,
-			     int flags);
+static ModeStatus CYRIXValidMode(int scrnIndex, DisplayModePtr mode,
+				 Bool verbose, int flags);
 
 /* Internally used functions */
 static void	CYRIXSave(ScrnInfoPtr pScrn);
@@ -207,12 +207,14 @@ static const char *shadowSymbols[] = {
     NULL
 };
 
+#ifdef XFree86LOADER
 static const char *vbeSymbols[] = {
     "VBEInit",
     "vbeDoEDID",
     "vbeFree",
     NULL
 };
+#endif
 
 /* access to the MediaGX video hardware registers */
 
@@ -547,8 +549,7 @@ CYRIXPreInit(ScrnInfoPtr pScrn, int flags)
     int videoram;
     int i;
     ClockRangePtr clockRanges;
-    CARD32 physbase, padsize;
-    int CYRIXisOldChipRevision;
+    unsigned int physbase, padsize;
     int device_step, device_revision;
     int vgaIOBase;
     unsigned char gcr;
@@ -616,8 +617,8 @@ CYRIXPreInit(ScrnInfoPtr pScrn, int flags)
     /*      end GGI MediaGX driver based code */
     if (padsize == 0) return (FALSE);
 
-    xf86ErrorF("%s: GX_BASE: 0x%x\n",CYRIX_NAME, physbase);
-    xf86ErrorF("%s: Scratchpad size: %d kbytes\n",CYRIX_NAME, padsize);
+    xf86ErrorF("%s: GX_BASE: 0x%x\n", CYRIX_NAME, physbase);
+    xf86ErrorF("%s: Scratchpad size: %d kbytes\n", CYRIX_NAME, padsize);
 
     /* Probe for the MediaGX processor version details.  Older versions
      * use different op-codes for setting the organization of the
@@ -633,8 +634,6 @@ CYRIXPreInit(ScrnInfoPtr pScrn, int flags)
     xf86ErrorF("%s: MediaGX processor ID %d revision %d\n", 
 		CYRIX_NAME, device_step, device_revision);
 
-    CYRIXisOldChipRevision = (device_step == 0 && device_revision < 40);
-
     /* Some  MediaGX systems have different blit buffer offsets than
      * is  indicated by the scratchpad size.  Make sure that we have
      * the  right offsets by writing them into the corresponding CPU
@@ -838,7 +837,7 @@ CYRIXPreInit(ScrnInfoPtr pScrn, int flags)
 	pCyrix->IOAccelAddress = 0x40008100; /* Hard coded for 1st try */
     }
 
-    xf86DrvMsg(pScrn->scrnIndex, from,"IO registers at 0x%x\n",pCyrix->IOAccelAddress);
+    xf86DrvMsg(pScrn->scrnIndex, from,"IO registers at 0x%lx\n",(unsigned long)pCyrix->IOAccelAddress);
 
     /* HW bpp matches reported bpp */
     pCyrix->HwBpp = pScrn->bitsPerPixel;
@@ -1009,7 +1008,7 @@ CYRIXModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
 {
     int ret = -1;
     vgaHWPtr hwp;
-    vgaRegPtr vgaReg;
+/*    vgaRegPtr vgaReg; */
     CYRIXPrvPtr pCyrix;
     CYRIXRegPtr cyrixReg;
 
@@ -1030,7 +1029,7 @@ CYRIXModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
 	return FALSE;
 
     /* Program the registers */
-    vgaReg = &hwp->ModeReg;
+/*    vgaReg = &hwp->ModeReg; */
     cyrixReg = &pCyrix->ModeReg;
 
     CyrixRestore(pScrn, cyrixReg);
@@ -1047,13 +1046,13 @@ CYRIXRestore(ScrnInfoPtr pScrn)
 {
     vgaHWPtr hwp;
     vgaRegPtr vgaReg;
-    CYRIXPrvPtr pCyrix;
-    CYRIXRegPtr cyrixReg;
+    /*CYRIXPrvPtr pCyrix;*/
+    /*CYRIXRegPtr cyrixReg*/;
 
     hwp = VGAHWPTR(pScrn);
-    pCyrix = CYRIXPTR(pScrn);
+    /*pCyrix = CYRIXPTR(pScrn);*/
     vgaReg = &hwp->SavedReg;
-    cyrixReg = &pCyrix->SavedReg;
+    /*cyrixReg = &pCyrix->SavedReg*/;
 
     vgaHWProtect(pScrn, TRUE);
 
@@ -1499,7 +1498,7 @@ CYRIXFreeScreen(int scrnIndex, int flags)
 /* Checks if a mode is suitable for the selected chipset. */
 
 /* Optional */
-static int
+static ModeStatus
 CYRIXValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
 {
     return(MODE_OK);
diff --git a/src/cyrix_helper.c b/src/cyrix_helper.c
index 22c46a2..771f62c 100644
--- a/src/cyrix_helper.c
+++ b/src/cyrix_helper.c
@@ -39,12 +39,13 @@
  *          Dirk H. Hohndel (hohndel@suse.de),
  *          Portions: the GGI project & confidential CYRIX databooks.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_helper.c,v 1.4 2002/11/06 11:38:59 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_helper.c,v 1.5 2003/09/24 02:43:21 dawes Exp $ */
 
 #include "cyrix.h"
 #include "vgaHW.h"
 #include "xf86_ansic.h"
 #include "compiler.h"
+#include "xf86.h"
 
 #define CYRIXmarkLinesDirty { \
                                int k = 0; \
@@ -58,7 +59,7 @@ static void CYRIXresetVGA(ScrnInfoPtr pScrn, unsigned long vgaIOBase);
 
 void  Cyrix1bppColorMap(ScrnInfoPtr pScrn)
 {	/* use dedicated color map routines on new chipsets in 8bpp */
-	ErrorF("%s: Cyrix 1BPP is only a stub for now.\n", X_PROBED);
+	xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Cyrix 1BPP is only a stub for now.\n");
 	return;
 }