summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2004-09-17 03:04:50 +0000
committerAdam Jackson <ajax@nwnk.net>2004-09-17 03:04:50 +0000
commit29bbee6b8a8dd1b883e07547691ff8e1289459ce (patch)
treecd7c86b195a5aa9e29a11d0c815a531c8ecd7ce7
parentcec06d4126f5f31d14ace73798c71ec75e544c45 (diff)
Bug #1192: Remove cfb support from drivers where its use is an option.
Delete xf24_32bpp, as s3virge was the last user. Fix up some comments to refer to fb rather than cfb.
-rw-r--r--src/atimach64io.c4
-rw-r--r--src/atiscreen.c4
-rw-r--r--src/radeon_accelfuncs.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/atimach64io.c b/src/atimach64io.c
index b4fafd97..e6a15b3e 100644
--- a/src/atimach64io.c
+++ b/src/atimach64io.c
@@ -1,6 +1,6 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atimach64io.c,v 1.6 2003/04/23 21:51:29 tsi Exp $ */
/*
- * Copyright 2000 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
+ * Copyright 2000 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
@@ -72,7 +72,7 @@ ATIMach64PollEngineStatus
/*
* The following counts the number of bits in FIFO_STAT_BITS, and is
- * derived from miSetVisualTypes() (formerly cfbSetVisualTypes()).
+ * derived from miSetVisualTypes().
*/
IOValue = GetBits(IOValue, FIFO_STAT_BITS);
Count = (IOValue >> 1) & 0x36DBU;
diff --git a/src/atiscreen.c b/src/atiscreen.c
index 33e8a322..9f8b6982 100644
--- a/src/atiscreen.c
+++ b/src/atiscreen.c
@@ -176,7 +176,7 @@ ATIScreenInit
#ifdef XF86DRI_DEVEL
/* Setup DRI after visuals have been established, but before
- * cfbScreenInit is called. cfbScreenInit will eventually call the
+ * fbScreenInit is called. fbScreenInit will eventually call the
* driver's InitGLXVisuals call back.
*/
@@ -557,7 +557,7 @@ ATIScreenInit
/* DRI finalization */
if (pATI->directRenderingEnabled) {
- /* Now that mi, cfb, drm and others have done their thing,
+ /* Now that mi, fb, drm and others have done their thing,
* complete the DRI setup.
*/
pATI->directRenderingEnabled = ATIDRIFinishScreenInit(pScreen);
diff --git a/src/radeon_accelfuncs.c b/src/radeon_accelfuncs.c
index 848b4c0f..9d27ce25 100644
--- a/src/radeon_accelfuncs.c
+++ b/src/radeon_accelfuncs.c
@@ -1260,7 +1260,7 @@ FUNC_NAME(RADEONAccelInit)(ScreenPtr pScreen, XAAInfoRecPtr a)
a->SolidLineLimits.x2 = pScrn->virtualX-1;
a->SolidLineLimits.y2 = pScrn->virtualY-1;
- /* Call miSetZeroLineBias() to have mi/mfb/cfb/fb routines match
+ /* Call miSetZeroLineBias() to have mi/mfb/fb routines match
hardware accel two point lines */
miSetZeroLineBias(pScreen, (OCTANT5 | OCTANT6 | OCTANT7 | OCTANT8));