diff options
| author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-09-15 16:34:02 +0000 |
|---|---|---|
| committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-09-15 16:34:02 +0000 |
| commit | 32b93c30938e0ca5bc4ef24bbc04e8230e770be8 (patch) | |
| tree | 62e0820bc9068151180e24c1df53615713f7b795 | |
| parent | ea374e6b989db24b907c48a8d5a604d797323242 (diff) | |
Pull XORG-6_8_0 to CYGWIN branchYGWIN-6_8_1-MERGECYGWIN-6_8_2-MERGECYGWIN-6_8_1-MERGECYGWIN-6_8_0-MERGECYGWIN
| -rw-r--r-- | README.sgml | 1 | ||||
| -rw-r--r-- | src/s3v_accel.c | 12 | ||||
| -rw-r--r-- | src/s3v_driver.c | 10 |
3 files changed, 12 insertions, 11 deletions
diff --git a/README.sgml b/README.sgml index b7a84fb..e47b8c4 100644 --- a/README.sgml +++ b/README.sgml @@ -8,7 +8,6 @@ <date>19 Dec 2001 <ident> -$Id$ </ident> <toc> diff --git a/src/s3v_accel.c b/src/s3v_accel.c index e5cb7fe..14a7536 100644 --- a/src/s3v_accel.c +++ b/src/s3v_accel.c @@ -634,14 +634,14 @@ S3VSetupForScreenToScreenCopy( ps3v->AccelCmd = ps3v->CommonCmd | CMD_AUTOEXEC | CMD_BITBLT; if(planemask != ps3v->FullPlaneMask) { - ps3v->AccelCmd |= (XAACopyROP_PM[rop] << 17) | MIX_MONO_PATT; + ps3v->AccelCmd |= (XAAGetCopyROP_PM(rop) << 17) | MIX_MONO_PATT; WAITFIFO(4); OUTREG(PAT_FG_CLR, planemask); OUTREG(MONO_PAT_0, ~0); OUTREG(MONO_PAT_1, ~0); } else { - ps3v->AccelCmd |= XAACopyROP[rop] << 17; + ps3v->AccelCmd |= XAAGetCopyROP(rop) << 17; WAITFIFO(1); } if(xdir == 1) ps3v->AccelCmd |= CMD_XP; @@ -781,10 +781,10 @@ S3VSetupForCPUToScreenColorExpand( if(planemask == ps3v->FullPlaneMask) { - ps3v->AccelCmd |= XAACopyROP[rop] << 17; + ps3v->AccelCmd |= XAAGetCopyROP(rop) << 17; WAITFIFO(3); } else { - ps3v->AccelCmd |= (XAACopyROP_PM[rop] << 17) | MIX_MONO_PATT; + ps3v->AccelCmd |= (XAAGetCopyROP_PM(rop) << 17) | MIX_MONO_PATT; WAITFIFO(6); OUTREG(MONO_PAT_0, ~0); OUTREG(MONO_PAT_1, ~0); @@ -837,13 +837,13 @@ S3VSetupForImageWrite( MIX_CPUDATA | CMD_ITA_DWORD | CMD_HWCLIP | CMD_XP | CMD_YP; if(planemask != ps3v->FullPlaneMask) { - ps3v->AccelCmd |= (XAACopyROP_PM[rop] << 17) | MIX_MONO_PATT; + ps3v->AccelCmd |= (XAAGetCopyROP_PM(rop) << 17) | MIX_MONO_PATT; WAITFIFO(4); OUTREG(PAT_FG_CLR, planemask); OUTREG(MONO_PAT_0, ~0); OUTREG(MONO_PAT_1, ~0); } else { - ps3v->AccelCmd |= XAACopyROP[rop] << 17; + ps3v->AccelCmd |= XAAGetCopyROP(rop) << 17; WAITFIFO(1); } diff --git a/src/s3v_driver.c b/src/s3v_driver.c index 6eddce0..991982e 100644 --- a/src/s3v_driver.c +++ b/src/s3v_driver.c @@ -274,6 +274,7 @@ static const char *vgahwSymbols[] = { "vgaHWSetMmioFuncs", "vgaHWSetStdFuncs", "vgaHWUnmapMem", + "vgaHWddc1SetSpeedWeak", /* not used by ViRGE (at the moment :( ) */ /* "vgaHWUnlock", @@ -283,8 +284,8 @@ static const char *vgahwSymbols[] = { }; static const char *xaaSymbols[] = { - "XAACopyROP", - "XAACopyROP_PM", + "XAAGetCopyROP", + "XAAGetCopyROP_PM", "XAADestroyInfoRec", "XAACreateInfoRec", "XAAHelpPatternROP", @@ -364,7 +365,7 @@ static XF86ModuleVersionInfo S3VVersRec = MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, S3VIRGE_VERSION_MAJOR, S3VIRGE_VERSION_MINOR, S3VIRGE_PATCHLEVEL, ABI_CLASS_VIDEODRV, /* This is a video driver */ ABI_VIDEODRV_VERSION, @@ -3990,7 +3991,8 @@ S3Vddc1(int scrnIndex) OUTREG(DDC_REG,(tmp | 0x12)); if ((pMon = xf86PrintEDID( - xf86DoEDID_DDC1(scrnIndex,vgaHWddc1SetSpeed,S3Vddc1Read))) != NULL) + xf86DoEDID_DDC1(scrnIndex,vgaHWddc1SetSpeedWeak(), + S3Vddc1Read))) != NULL) success = TRUE; xf86SetDDCproperties(pScrn,pMon); |