Pull XORG-6_8_0 to CYGWIN branchCYGWIN-6_8_2-MERGECYGWIN-6_8_1-MERGECYGWIN-6_8_0-MERGECYGWIN

5 files changed, 36 insertions, 35 deletions

diff --git a/src/blade_accel.c b/src/blade_accel.c
index cf4ccf2..cb440b8 100644
--- a/src/blade_accel.c
+++ b/src/blade_accel.c
@@ -292,7 +292,7 @@ BladeSetupForScreenToScreenCopy(ScrnInfoPtr pScrn,
 	pTrident->BltScanDirection |= 1<<5;
     }
 #endif
-    BLADE_OUT(0x2148, XAACopyROP[rop]);
+    BLADE_OUT(0x2148, XAAGetCopyROP(rop));
 }
 
 static void
@@ -345,7 +345,7 @@ BladeSetupForSolidLine(ScrnInfoPtr pScrn, int color,
 
     REPLICATE(color);
     BLADE_OUT(0x2160, color);
-    BLADE_OUT(0x2148, XAACopyROP[rop]);
+    BLADE_OUT(0x2148, XAAGetCopyROP(rop));
     pTrident->BltScanDirection = 0;
     REPLICATE(planemask);
     if (planemask != -1) {
@@ -435,7 +435,7 @@ BladeSetupForDashedLine(ScrnInfoPtr pScrn, int fg, int bg, int rop,
     REPLICATE(bg);
     BLADE_OUT(0x2160, fg);
     BLADE_OUT(0x2164, bg);
-    BLADE_OUT(0x2148, XAACopyROP[rop]);
+    BLADE_OUT(0x2148, XAAGetCopyROP(rop));
     pTrident->BltScanDirection = 0;
     REPLICATE(planemask);
     if (planemask != -1) {
@@ -471,7 +471,7 @@ BladeSetupForFillRectSolid(ScrnInfoPtr pScrn, int color,
 
     REPLICATE(color);
     BLADE_OUT(0x2160, color);
-    BLADE_OUT(0x2148, XAACopyROP[rop]);
+    BLADE_OUT(0x2148, XAAGetCopyROP(rop));
     pTrident->BltScanDirection = 0;
 #if 0
     REPLICATE(planemask);
@@ -506,7 +506,7 @@ BladeSetupForScreenToScreenColorExpand(ScrnInfoPtr pScrn,
     REPLICATE(fg);
     IMAGE_OUT(0x44, fg);
     IMAGE_OUT(0x48, bg);
-    IMAGE_OUT(0x20, 0x90000000 | XAACopyROP[rop]);
+    IMAGE_OUT(0x20, 0x90000000 | XAAGetCopyROP(rop));
     pTrident->BltScanDirection = 0;
     REPLICATE(planemask);
     if (planemask != -1) {
@@ -538,7 +538,7 @@ BladeSetupForCPUToScreenColorExpand(ScrnInfoPtr pScrn,
     TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
 
     pTrident->BltScanDirection = 0;
-    BLADE_OUT(0x2148, XAACopyROP[rop]);
+    BLADE_OUT(0x2148, XAAGetCopyROP(rop));
     if (bg == -1) {
 	pTrident->BltScanDirection |= 2<<19;
     	REPLICATE(fg);
@@ -581,7 +581,7 @@ BladeSetupForMono8x8PatternFill(ScrnInfoPtr pScrn,
     TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
 
     BladeSync(pScrn);
-    BLADE_OUT(0x2148, XAAPatternROP[rop]);
+    BLADE_OUT(0x2148, XAAGetPatternROP(rop));
 
     if (bg == -1) {
     REPLICATE(fg);
@@ -645,7 +645,7 @@ BladeSetupForColor8x8PatternFill(ScrnInfoPtr pScrn,
 	BLADE_OUT(0x2168, transparency_color & 0xffffff);
 	pTrident->BltScanDirection |= 1<<6;
     }
-    TGUI_FMIX(XAAPatternROP[rop]);
+    TGUI_FMIX(XAAGetPatternROP(rop));
     REPLICATE(planemask);
     if (planemask != -1) {
 	BLADE_OUT(0x2184, ~planemask);
@@ -677,7 +677,7 @@ static void BladeSetupForImageWrite(
 ){
     TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
 
-    BLADE_OUT(0x2148, XAACopyROP[rop]);
+    BLADE_OUT(0x2148, XAAGetCopyROP(rop));
     pTrident->BltScanDirection = 0;
 #if 0
     REPLICATE(planemask);
diff --git a/src/image_accel.c b/src/image_accel.c
index 61017b5..b5c23eb 100644
--- a/src/image_accel.c
+++ b/src/image_accel.c
@@ -296,7 +296,7 @@ ImageSetupForScreenToScreenCopy(ScrnInfoPtr pScrn,
     if ((xdir < 0) || (ydir < 0)) pTrident->BltScanDirection |= 1<<2;
 
     IMAGE_OUT(0x2120, 0x80000000);
-    IMAGE_OUT(0x2120, 0x90000000 | XAACopyROP[rop]);
+    IMAGE_OUT(0x2120, 0x90000000 | XAAGetCopyROP(rop));
 
     if (transparency_color != -1) {
 	IMAGE_OUT(0x2120, 0x70000000 | 1<<26 | (transparency_color&0xffffff));
@@ -354,7 +354,7 @@ ImageSetupForSolidLine(ScrnInfoPtr pScrn, int color,
 
     REPLICATE(color);
     IMAGE_OUT(0x2120, 0x84000000);
-    IMAGE_OUT(0x2120, 0x90000000 | XAACopyROP[rop]);
+    IMAGE_OUT(0x2120, 0x90000000 | XAAGetCopyROP(rop));
     IMAGE_OUT(0x2144, color);
 }
 
@@ -406,7 +406,7 @@ ImageSetupForFillRectSolid(ScrnInfoPtr pScrn, int color,
 
     REPLICATE(color);
     IMAGE_OUT(0x2120, 0x80000000);
-    IMAGE_OUT(0x2120, 0x90000000 | XAACopyROP[rop]);
+    IMAGE_OUT(0x2120, 0x90000000 | XAAGetCopyROP(rop));
     IMAGE_OUT(0x2144, color);
 }
 
@@ -468,7 +468,7 @@ ImageSetupForMono8x8PatternFill(ScrnInfoPtr pScrn,
 {
     TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
 
-    IMAGE_OUT(0x2120, 0x90000000 | XAAPatternROP[rop]);
+    IMAGE_OUT(0x2120, 0x90000000 | XAAGetPatternROP(rop));
     if (bg == -1) {
 	REPLICATE(fg);
 	IMAGE_OUT(0x2120, 0x80000000 | 1<<27);
@@ -512,7 +512,7 @@ ImageSetupForColor8x8PatternFill(ScrnInfoPtr pScrn,
 {
     TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
 
-    IMAGE_OUT(0x2120, 0x90000000 | XAAPatternROP[rop]);
+    IMAGE_OUT(0x2120, 0x90000000 | XAAGetPatternROP(rop));
     IMAGE_OUT(0x2120, 0x80000000 | 1<<26);
     if (transparency_color != -1) {
 	IMAGE_OUT(0x2120, 0x70000000 | 1<<26 | (transparency_color&0xffffff));
@@ -548,7 +548,7 @@ ImageSetupForScanlineCPUToScreenColorExpandFill(
     TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
 
     IMAGE_OUT(0x2120, 0x80000000);
-    IMAGE_OUT(0x2120, 0x90000000 | XAACopyROP[rop]);
+    IMAGE_OUT(0x2120, 0x90000000 | XAAGetCopyROP(rop));
     if (bg == -1) {
 	pTrident->ROP = 2<<22;
     	REPLICATE(fg);
@@ -599,7 +599,7 @@ ImageSetupForScanlineImageWrite(ScrnInfoPtr pScrn, int rop,
                              int bpp, int depth)
 {
     TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
-    IMAGE_OUT(0x2120, 0x90000000 | XAACopyROP[rop]);
+    IMAGE_OUT(0x2120, 0x90000000 | XAAGetCopyROP(rop));
     if (transparency_color != -1) {
 	IMAGE_OUT(0x2120, 0x70000000 | 1<<26 | (transparency_color&0xffffff));
 	pTrident->DstEnable = TRUE;
diff --git a/src/trident_accel.c b/src/trident_accel.c
index 280bde2..7172e7d 100644
--- a/src/trident_accel.c
+++ b/src/trident_accel.c
@@ -292,7 +292,7 @@ TridentSetupForScreenToScreenCopy(ScrnInfoPtr pScrn,
     }
 
     TGUI_DRAWFLAG(pTrident->DrawFlag | pTrident->BltScanDirection | SCR2SCR | dst);
-    TGUI_FMIX(XAACopyROP[rop]);
+    TGUI_FMIX(XAAGetCopyROP(rop));
 }
 
 static void
@@ -324,7 +324,7 @@ TridentSetupForSolidLine(ScrnInfoPtr pScrn, int color,
 
     pTrident->BltScanDirection = 0;
     REPLICATE(color);
-    TGUI_FMIX(XAAPatternROP[rop]);
+    TGUI_FMIX(XAAGetPatternROP(rop));
     if (pTrident->Chipset == PROVIDIA9685 ||
         pTrident->Chipset == CYBER9388) {
     	TGUI_FPATCOL(color);
@@ -411,7 +411,7 @@ TridentSetupForDashedLine(
     	    TGUI_BCOLOUR(bg);
     	}
     }
-    TGUI_FMIX(XAAPatternROP[rop]);
+    TGUI_FMIX(XAAGetPatternROP(rop));
     pTrident->LinePattern = NiceDashPattern;
 }
 
@@ -445,7 +445,7 @@ TridentSetupForFillRectSolid(ScrnInfoPtr pScrn, int color,
     int drawflag = 0;
 
     REPLICATE(color);
-    TGUI_FMIX(XAAPatternROP[rop]);
+    TGUI_FMIX(XAAGetPatternROP(rop));
     if (pTrident->Chipset == PROVIDIA9685 ||
         pTrident->Chipset == CYBER9388) {
     	TGUI_FPATCOL(color);
@@ -536,7 +536,7 @@ TridentSetupForMono8x8PatternFill(ScrnInfoPtr pScrn,
     TGUI_DRAWFLAG(pTrident->DrawFlag | PAT2SCR | PATMONO | drawflag);
     TGUI_PATLOC(((patterny * pTrident->PatternLocation) +
 		 (patternx * pScrn->bitsPerPixel / 8)) >> 6);
-    TGUI_FMIX(XAAPatternROP[rop]);
+    TGUI_FMIX(XAAGetPatternROP(rop));
 }
 
 static void 
@@ -578,7 +578,7 @@ TridentSetupForColor8x8PatternFill(ScrnInfoPtr pScrn,
     TGUI_DRAWFLAG(pTrident->DrawFlag | PAT2SCR | drawflag);
     TGUI_PATLOC(((patterny * pTrident->PatternLocation) +
 		 (patternx * pScrn->bitsPerPixel / 8)) >> 6);
-    TGUI_FMIX(XAAPatternROP[rop]);
+    TGUI_FMIX(XAAGetPatternROP(rop));
 }
 
 static void 
@@ -619,7 +619,7 @@ TridentSetupForScanlineCPUToScreenColorExpandFill(
 
     TGUI_SRC_XY(0,0);
     TGUI_DRAWFLAG(drawflag);
-    TGUI_FMIX(XAACopyROP[rop]);
+    TGUI_FMIX(XAAGetCopyROP(rop));
 }
 
 static void
diff --git a/src/trident_driver.c b/src/trident_driver.c
index b8256f1..daaa73d 100644
--- a/src/trident_driver.c
+++ b/src/trident_driver.c
@@ -477,16 +477,16 @@ tridentLCD LCD[] = {
 #endif
 
 static const char *xaaSymbols[] = {
-    "XAACopyROP",
+    "XAAGetCopyROP",
     "XAACreateInfoRec",
     "XAADestroyInfoRec",
     "XAAInit",
-    "XAAPatternROP",
+    "XAAGetPatternROP",
     NULL
 };
 
 static const char *vgahwSymbols[] = {
-    "vgaHWBlankScreen",
+    "vgaHWBlankScreenWeak",
     "vgaHWFreeHWRec",
     "vgaHWGetHWRec",
     "vgaHWGetIOBase",
@@ -494,7 +494,7 @@ static const char *vgahwSymbols[] = {
     "vgaHWInit",
     "vgaHWLock",
     "vgaHWMapMem",
-    "vgaHWProtect",
+    "vgaHWProtectWeak",
     "vgaHWRestore",
     "vgaHWSave",
     "vgaHWSaveScreen",
@@ -565,7 +565,7 @@ static XF86ModuleVersionInfo tridentVersRec =
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	TRIDENT_MAJOR_VERSION, TRIDENT_MINOR_VERSION, TRIDENT_PATCHLEVEL,
 	ABI_CLASS_VIDEODRV,			/* This is a video driver */
 	ABI_VIDEODRV_VERSION,
@@ -2034,7 +2034,8 @@ TRIDENTPreInit(ScrnInfoPtr pScrn, int flags)
     if (!pScrn->progClock) {
 	pScrn->numClocks = NoClocks;
 	xf86GetClocks(pScrn, NoClocks, TRIDENTClockSelect,
-			  vgaHWProtect, vgaHWBlankScreen,
+			  vgaHWProtectWeak(),
+			  vgaHWBlankScreenWeak(),
 			  vgaIOBase + 0x0A, 0x08, 1, 28322);
 	from = X_PROBED;
 	xf86ShowClocks(pScrn, from);
diff --git a/src/xp_accel.c b/src/xp_accel.c
index f543d87..5093619 100644
--- a/src/xp_accel.c
+++ b/src/xp_accel.c
@@ -268,7 +268,7 @@ XPSetupForScreenToScreenCopy(ScrnInfoPtr pScrn,
     }
 
     TGUI_DRAWFLAG(pTrident->BltScanDirection | SCR2SCR | dst);
-    TGUI_FMIX(XAACopyROP[rop]);
+    TGUI_FMIX(XAAGetCopyROP(rop));
 }
 
 static void
@@ -301,7 +301,7 @@ XPSetupForSolidLine(ScrnInfoPtr pScrn, int color,
 
     pTrident->BltScanDirection = 0;
     REPLICATE(color);
-    TGUI_FMIX(XAAPatternROP[rop]);
+    TGUI_FMIX(XAAGetPatternROP(rop));
     if (pTrident->Chipset >= PROVIDIA9685) {
     	TGUI_FPATCOL(color);
     } else {
@@ -388,7 +388,7 @@ XPSetupForDashedLine(
     	    TGUI_BCOLOUR(bg);
     	}
     }
-    TGUI_FMIX(XAAPatternROP[rop]);
+    TGUI_FMIX(XAAGetPatternROP(rop));
     pTrident->LinePattern = NiceDashPattern;
 }
 
@@ -421,7 +421,7 @@ XPSetupForFillRectSolid(ScrnInfoPtr pScrn, int color,
     TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
 
     REPLICATE(color);
-    TGUI_FMIX(XAAPatternROP[rop]);
+    TGUI_FMIX(XAAGetPatternROP(rop));
     MMIO_OUT32(pTrident->IOBase, 0x2158, color);
     TGUI_DRAWFLAG(SOLIDFILL);
 }
@@ -516,7 +516,7 @@ XPSetupForMono8x8PatternFill(ScrnInfoPtr pScrn,
     TGUI_DRAWFLAG(PATMONO | drawflag);
     MMIO_OUT32(pTrident->IOBase, 0x2180, patternx);
     MMIO_OUT32(pTrident->IOBase, 0x2184, patterny);
-    TGUI_FMIX(XAAPatternROP[rop]);
+    TGUI_FMIX(XAAGetPatternROP(rop));
 }
 
 static void 
@@ -543,7 +543,7 @@ XPSetupForScanlineCPUToScreenColorExpandFill(
 ){
     TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
 
-    TGUI_FMIX(XAACopyROP[rop]);
+    TGUI_FMIX(XAAGetCopyROP(rop));
     if (bg == -1) {
     TGUI_DRAWFLAG(SRCMONO | 1<<12);
     	REPLICATE(fg);