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

3 files changed, 36 insertions, 36 deletions

diff --git a/src/nsc_driver.c b/src/nsc_driver.c
index bc49fc7..e312683 100644
--- a/src/nsc_driver.c
+++ b/src/nsc_driver.c
@@ -398,7 +398,7 @@ static XF86ModuleVersionInfo NscVersionRec = {
    MODULEVENDORSTRING,
    MODINFOSTRING1,
    MODINFOSTRING2,
-   XF86_VERSION_CURRENT,
+   XORG_VERSION_CURRENT,
    NSC_VERSION_MAJOR, NSC_VERSION_MINOR, NSC_PATCHLEVEL,
    ABI_CLASS_VIDEODRV,			/* This is a video driver */
    ABI_VIDEODRV_VERSION,
diff --git a/src/nsc_gx1_accel.c b/src/nsc_gx1_accel.c
index 4ac06dd..d68348a 100644
--- a/src/nsc_gx1_accel.c
+++ b/src/nsc_gx1_accel.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_accel.c,v 1.1.4.3.4.2 2004/03/04 20:16:28 kaleb Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_accel.c,v 1.3 2004/07/30 20:30:53 ajax Exp $ */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_accel.c,v 1.7 2003/12/07 22:40:38 alanh Exp $ */
 /*
  * $Workfile: nsc_gx1_accel.c $
@@ -339,11 +339,11 @@ GX1SetupForFillRectSolid(ScrnInfoPtr pScreenInfo,
    /* CHECK IF PLANEMASK IS NOT USED (ALL PLANES ENABLED) */
    if (planemask == 0xFFFFFFFF) {
       /* USE NORMAL PATTERN ROPs IF ALL PLANES ARE ENABLED */
-      GFX(set_raster_operation(XAAPatternROP[rop]));
+      GFX(set_raster_operation(XAAGetPatternROP(rop)));
    } else {
       /* SELECT ROP THAT USES SOURCE DATA FOR PLANEMASK */
       GFX(set_solid_source((unsigned long)planemask));
-      GFX(set_raster_operation(XAAPatternROP_PM[rop]));
+      GFX(set_raster_operation(XAAGetPatternROP_PM(rop)));
    }
 }
 
@@ -414,11 +414,11 @@ GX1SetupFor8x8PatternColorExpand(ScrnInfoPtr pScreenInfo,
    /* CHECK IF PLANEMASK IS NOT USED (ALL PLANES ENABLED) */
    if (planemask == 0xFFFFFFFF) {
       /* USE NORMAL PATTERN ROPs IF ALL PLANES ARE ENABLED */
-      GFX(set_raster_operation(XAAPatternROP[rop]));
+      GFX(set_raster_operation(XAAGetPatternROP(rop)));
    } else {
       /* SELECT ROP THAT USES SOURCE DATA FOR PLANEMASK */
       GFX(set_solid_source((unsigned int)planemask));
-      GFX(set_raster_operation(XAAPatternROP_PM[rop]));
+      GFX(set_raster_operation(XAAGetPatternROP_PM(rop)));
    }
 }
 
@@ -503,11 +503,11 @@ GX1SetupFor8x8PatternMonoExpand(ScrnInfoPtr pScreenInfo,
    /* CHECK IF PLANEMASK IS NOT USED (ALL PLANES ENABLED) */
    if (planemask == 0xFFFFFFFF) {
       /* USE NORMAL PATTERN ROPs IF ALL PLANES ARE ENABLED */
-      GFX(set_raster_operation(XAAPatternROP[rop]));
+      GFX(set_raster_operation(XAAGetPatternROP(rop)));
    } else {
       /* SELECT ROP THAT USES SOURCE DATA FOR PLANEMASK */
       GFX(set_solid_source((unsigned int)planemask));
-      GFX(set_raster_operation(XAAPatternROP_PM[rop]));
+      GFX(set_raster_operation(XAAGetPatternROP_PM(rop)));
    }
 }
 
@@ -578,7 +578,7 @@ GX1SetupForScreenToScreenCopy(ScrnInfoPtr pScreenInfo,
 {
    GFX(set_solid_pattern(planemask));
    /* SET RASTER OPERATION FOR USING PATTERN AS PLANE MASK */
-   GFX(set_raster_operation(XAACopyROP[rop]));
+   GFX(set_raster_operation(XAAGetCopyROP(rop)));
    /* SAVE TRANSPARENCY FLAG */
    GeodeTransparent = (transparency_color == -1) ? 0 : 1;
    GeodeTransColor = transparency_color;
@@ -672,7 +672,7 @@ GX1SetupForScanlineImageWrite(ScrnInfoPtr pScreenInfo,
 {
    GFX(set_solid_pattern((unsigned int)planemask));
    /* SET RASTER OPERATION FOR USING PATTERN AS PLANE MASK */
-   GFX(set_raster_operation(XAACopyROP_PM[rop]));
+   GFX(set_raster_operation(XAAGetCopyROP_PM(rop)));
    /* SAVE TRANSPARENCY FLAG */
    GeodeTransparent = (transparency_color == -1) ? 0 : 1;
    GeodeTransColor = transparency_color;
@@ -817,7 +817,7 @@ GX1SetupForSolidLine(ScrnInfoPtr pScreenInfo,
    GFX(set_solid_pattern((unsigned int)color));
 
    /* USE NORMAL PATTERN ROPs IF ALL PLANES ARE ENABLED */
-   GFX(set_raster_operation(XAAPatternROP[rop]));
+   GFX(set_raster_operation(XAAGetPatternROP(rop)));
 }
 
 /*---------------------------------------------------------------------------
@@ -971,12 +971,12 @@ GX1SetupForDashedLine(ScrnInfoPtr pScrn, int fg, int bg, int rop,
    if (planemask == (unsigned int)-1) {
       /* USE NORMAL PATTERN ROPs IF ALL PLANES ARE ENABLED */
 
-      GFX(set_raster_operation(XAAPatternROP[rop]));
+      GFX(set_raster_operation(XAAGetPatternROP(rop)));
    } else {
       /* SELECT ROP THAT USES SOURCE DATA FOR PLANEMASK */
 
       GFX(set_solid_source((unsigned long)planemask));
-      GFX(set_raster_operation(XAAPatternROP_PM[rop]));
+      GFX(set_raster_operation(XAAGetPatternROP_PM(rop)));
    }
 }
 
@@ -990,7 +990,7 @@ GX1SetupForScreenToScreenColorExpandFill(ScrnInfoPtr pScrn,
    GFX(set_mono_source(bg, fg, (bg == -1)));
 
    /* USE NORMAL PATTERN ROPs IF ALL PLANES ARE ENABLED */
-   GFX(set_raster_operation(XAACopyROP_PM[rop & 0x0F]));
+   GFX(set_raster_operation(XAAGetCopyROP_PM(rop & 0x0F)));
 
    DEBUGMSG(0, (0, X_NONE, "%x %x %x %x\n", fg, bg, rop, planemask));
 }
@@ -1049,14 +1049,14 @@ OPTGX1SetupForFillRectSolid(ScrnInfoPtr pScreenInfo,
 	 planemask |= (planemask << 8);
       }
 
-      rop16 = XAAPatternROP[rop];
+      rop16 = XAAGetPatternROP(rop);
 
       /* POLL UNTIL ABLE TO WRITE THE SOURCE COLOR */
 
       GFX_WAIT_PENDING;
       WRITE_REG32(GP_SRC_COLOR_0, (planemask << 16) | planemask);
    } else {
-      rop16 = XAAPatternROP_PM[rop];
+      rop16 = XAAGetPatternROP_PM(rop);
    }
 
    Geode_blt_mode = 0;
@@ -1166,7 +1166,7 @@ OPTGX1SetupForScreenToScreenCopy(ScrnInfoPtr pScreenInfo,
 				 int transparency_color)
 {
    int GFXusesDstData;
-   unsigned short rop16 = XAACopyROP[rop];
+   unsigned short rop16 = XAAGetCopyROP(rop);
 
    /* FORMAT 8 BPP COLOR */
    /* GX requires 8BPP color data be duplicated into bits [15:8]. */
@@ -1488,7 +1488,7 @@ OPTGX1SetupForSolidLine(ScrnInfoPtr pScreenInfo,
       color |= (color << 8);
    }
 
-   GeodeROP = XAAPatternROP[rop];
+   GeodeROP = XAAGetPatternROP(rop);
 
    /* POLL UNTIL ABLE TO WRITE THE PATTERN COLOR */
    GFX_WAIT_PENDING;
diff --git a/src/nsc_gx2_accel.c b/src/nsc_gx2_accel.c
index a41b8b7..a75303e 100644
--- a/src/nsc_gx2_accel.c
+++ b/src/nsc_gx2_accel.c
@@ -408,11 +408,11 @@ GX2SetupForFillRectSolid(ScrnInfoPtr pScreenInfo,
    /* CHECK IF PLANEMASK IS NOT USED (ALL PLANES ENABLED) */
    if (planemask == 0xFFFFFFFF) {
       /* USE NORMAL PATTERN ROPs IF ALL PLANES ARE ENABLED */
-      GFX(set_raster_operation(XAAPatternROP[rop]));
+      GFX(set_raster_operation(XAAGetPatternROP(rop)));
    } else {
       /* SELECT ROP THAT USES SOURCE DATA FOR PLANEMASK */
       GFX(set_solid_source((unsigned int)planemask));
-      GFX(set_raster_operation(XAAPatternROP_PM[rop]));
+      GFX(set_raster_operation(XAAGetPatternROP(rop)));
    }
 }
 
@@ -476,11 +476,11 @@ GX2SetupFor8x8PatternColorExpand(ScrnInfoPtr pScreenInfo,
    /* CHECK IF PLANEMASK IS NOT USED (ALL PLANES ENABLED) */
    if (planemask == 0xFFFFFFFF) {
       /* USE NORMAL PATTERN ROPs IF ALL PLANES ARE ENABLED */
-      GFX(set_raster_operation(XAAPatternROP[rop]));
+      GFX(set_raster_operation(XAAGetPatternROP(rop)));
    } else {
       /* SELECT ROP THAT USES SOURCE DATA FOR PLANEMASK */
       GFX(set_solid_source((unsigned int)planemask));
-      GFX(set_raster_operation(XAAPatternROP_PM[rop]));
+      GFX(set_raster_operation(XAAGetPatternROP(rop)));
    }
 }
 
@@ -560,11 +560,11 @@ GX2SetupFor8x8PatternMonoExpand(ScrnInfoPtr pScreenInfo,
    /* CHECK IF PLANEMASK IS NOT USED (ALL PLANES ENABLED) */
    if (planemask == 0xFFFFFFFF) {
       /* USE NORMAL PATTERN ROPs IF ALL PLANES ARE ENABLED */
-      GFX(set_raster_operation(XAAPatternROP[rop]));
+      GFX(set_raster_operation(XAAGetPatternROP(rop)));
    } else {
       /* SELECT ROP THAT USES SOURCE DATA FOR PLANEMASK */
       GFX(set_solid_source((unsigned int)planemask));
-      GFX(set_raster_operation(XAAPatternROP_PM[rop]));
+      GFX(set_raster_operation(XAAGetPatternROP(rop)));
    }
 }
 
@@ -630,7 +630,7 @@ GX2SetupForScreenToScreenCopy(ScrnInfoPtr pScreenInfo,
 {
    GFX(set_solid_pattern(planemask));
    /* SET RASTER OPERATION FOR USING PATTERN AS PLANE MASK */
-   GFX(set_raster_operation(XAACopyROP[rop]));
+   GFX(set_raster_operation(XAAGetCopyROP(rop)));
    /* SAVE TRANSPARENCY FLAG */
    GeodeTransparent = (transparency_color == -1) ? 0 : 1;
    GeodeTransColor = transparency_color;
@@ -690,7 +690,7 @@ GX2SetupForImageWrite(ScrnInfoPtr pScreenInfo,
 {
    GFX(set_solid_pattern((unsigned int)planemask));
    /* SET RASTER OPERATION FOR USING PATTERN AS PLANE MASK */
-   GFX(set_raster_operation(XAACopyROP[rop]));
+   GFX(set_raster_operation(XAAGetCopyROP(rop)));
    /* SAVE TRANSPARENCY FLAG */
    GeodeTransparent = (transparency_color == -1) ? 0 : 1;
    GeodeTransColor = transparency_color;
@@ -738,7 +738,7 @@ GX2SetupForScanlineImageWrite(ScrnInfoPtr pScreenInfo,
 {
    GFX(set_solid_pattern((unsigned int)planemask));
    /* SET RASTER OPERATION FOR USING PATTERN AS PLANE MASK */
-   GFX(set_raster_operation(XAACopyROP[rop & 0x0F]));
+   GFX(set_raster_operation(XAAGetCopyROP(rop & 0x0F)));
    /* SAVE TRANSPARENCY FLAG */
    GeodeTransparent = (transparency_color == -1) ? 0 : 1;
    GeodeTransColor = transparency_color;
@@ -883,7 +883,7 @@ GX2SetupForCPUToScreenColorExpandFill(ScrnInfoPtr pScreenInfo,
    GFX(set_mono_source(bg, fg, (bg == -1)));
 
    /* USE NORMAL PATTERN ROPs IF ALL PLANES ARE ENABLED */
-   GFX(set_raster_operation(XAACopyROP_PM[rop & 0x0F]));
+   GFX(set_raster_operation(XAAGetCopyROP_PM(rop & 0x0F)));
 
    DEBUGMSG(0, (0, X_NONE, "%x %x %x %x\n", fg, bg, rop, planemask));
 }
@@ -927,7 +927,7 @@ GX2SetupForScreenToScreenColorExpandFill(ScrnInfoPtr pScrn,
    GFX(set_mono_source(bg, fg, (bg == -1)));
 
    /* USE NORMAL PATTERN ROPs IF ALL PLANES ARE ENABLED */
-   GFX(set_raster_operation(XAACopyROP_PM[rop & 0x0F]));
+   GFX(set_raster_operation(XAAGetCopyROP_PM(rop & 0x0F)));
 
    DEBUGMSG(0, (0, X_NONE, "%x %x %x %x\n", fg, bg, rop, planemask));
 }
@@ -982,7 +982,7 @@ GX2SetupForSolidLine(ScrnInfoPtr pScreenInfo,
    GFX(set_solid_pattern((unsigned int)color));
 
    /* USE NORMAL PATTERN ROPs IF ALL PLANES ARE ENABLED */
-   GFX(set_raster_operation(XAAPatternROP[rop & 0x0F]));
+   GFX(set_raster_operation(XAAGetPatternROP(rop & 0x0F)));
 }
 
 /*---------------------------------------------------------------------------
@@ -1318,7 +1318,7 @@ OPTGX2SetupForCPUToScreenColorExpandFill(ScrnInfoPtr pScreenInfo,
 {
    int trans = (bg == -1);
 
-   GeodeROP = XAACopyROP_PM[rop];
+   GeodeROP = XAAGetCopyROP_PM(rop);
 
    if ((GeodeROP & 0x55) ^ ((GeodeROP >> 1) & 0x55)) {
       Geode_blt_mode = MGP_BM_DST_REQ;
@@ -1402,10 +1402,10 @@ OPTGX2SetupForFillRectSolid(ScrnInfoPtr pScreenInfo,
    WRITE_GP32(MGP_STRIDE, pGeode->Pitch);
 
    if (planemask == 0xFFFFFFFF) {
-      GeodeROP = XAAPatternROP[rop];
+      GeodeROP = XAAGetPatternROP(rop);
    } else {
       WRITE_GP32(MGP_SRC_COLOR_FG, (unsigned long)planemask);
-      GeodeROP = XAAPatternROP_PM[rop];
+      GeodeROP = XAAGetPatternROP(rop);
    }
 
    WRITE_GP32(MGP_RASTER_MODE, gu2_bpp | GeodeROP);
@@ -1482,7 +1482,7 @@ OPTGX2SetupForScreenToScreenCopy(ScrnInfoPtr pScreenInfo,
 {
    GeodePtr pGeode = GEODEPTR(pScreenInfo);
 
-   GeodeROP = XAACopyROP_PM[rop];
+   GeodeROP = XAAGetCopyROP_PM(rop);
 
    Geode_blt_mode = MGP_BM_SRC_FB;
 
@@ -1934,9 +1934,9 @@ OPTGX2SetupForDashedLine(ScrnInfoPtr pScrn, int fg, int bg, int rop,
    /* SET PATTERN FLAGS */
 
    if (planemask == 0xFFFFFFFF) {
-      GeodeROP = XAAPatternROP[rop & 0x0F];
+      GeodeROP = XAAGetPatternROP(rop & 0x0F);
    } else {
-      GeodeROP = XAAPatternROP_PM[rop & 0x0F];
+      GeodeROP = XAAGetPatternROP_PM(rop & 0x0F);
    }
    if (bg == -1)
       GeodeROP |= MGP_RM_PAT_MONO | MGP_RM_PAT_TRANS;