fb: rename lots more stuff to drv to avoid namespace clash

1 files changed, 31 insertions, 31 deletions

diff --git a/drv/fb/fbgc.c b/drv/fb/fbgc.c
index 134c7bba4..4b88bb4bd 100644
--- a/drv/fb/fbgc.c
+++ b/drv/fb/fbgc.c
@@ -30,35 +30,35 @@
 //#include "imped.h"
 
 
-const DrvGCOps	fbGCOps = {
-    fbFillSpans,
-    fbSetSpans,
-    fbPutImage,
+const DrvGCOps	drvfbGCOps = {
+    drvfbFillSpans,
+    drvfbSetSpans,
+    drvfbPutImage,
     NULL,
     NULL,
-    fbPolyPoint,
-    fbPolyLine,
-    fbPolySegment,
+    drvfbPolyPoint,
+    drvfbPolyLine,
+    drvfbPolySegment,
     drvPolyRectangle,
-    fbPolyArc,
+    drvfbPolyArc,
     drvFillPolygon,
-    fbPolyFillRect,
+    drvfbPolyFillRect,
     drvPolyFillArc,
     drvPolyText8,
     drvPolyText16,
     drvImageText8,
     drvImageText16,
-    fbImageGlyphBlt,
-    fbPolyGlyphBlt,
-    fbPushPixels,
-    fbValidateGC,
+    drvfbImageGlyphBlt,
+    drvfbPolyGlyphBlt,
+    drvfbPushPixels,
+    drvfbValidateGC,
 };
 
 Bool
 drvfbCreateGC(DrvGCPtr pGC)
 {
-    pGC->ops = (DrvGCOps *) &fbGCOps;
-    fbGetGCPrivate(pGC)->bpp = BitsPerPixel (pGC->depth);
+    pGC->ops = (DrvGCOps *) &drvfbGCOps;
+    drvfbGetGCPrivate(pGC)->bpp = BitsPerPixel (pGC->depth);
     return TRUE;
 }
 
@@ -66,7 +66,7 @@ drvfbCreateGC(DrvGCPtr pGC)
  * Pad pixmap to FB_UNIT bits wide
  */
 void
-fbPadPixmap (DrvPixmapPtr pPixmap)
+drvfbPadPixmap (DrvPixmapPtr pPixmap)
 {
     int	    width;
     FbBits  *bits;
@@ -78,7 +78,7 @@ fbPadPixmap (DrvPixmapPtr pPixmap)
     int     bpp;
     int     xOff, yOff;
 
-    fbGetDrawable (pPixmap, bits, stride, bpp, xOff, yOff);
+    drvfbGetDrawable (pPixmap, bits, stride, bpp, xOff, yOff);
 
     width = pPixmap->width * pPixmap->bitsPerPixel;
     height = pPixmap->height;
@@ -96,7 +96,7 @@ fbPadPixmap (DrvPixmapPtr pPixmap)
 	bits += stride;
     }
 
-    fbFinishAccess (pPixmap);
+    drvfbFinishAccess (pPixmap);
 }
 
 /*
@@ -159,25 +159,25 @@ fbCanEvenStipple (DrvPixmapPtr pStipple, int bpp)
     /* make sure the stipple width is a multiple of the even stipple width */
     if (pStipple->width % len != 0)
 	return FALSE;
-    fbGetDrawable (pStipple, bits, stride, stip_bpp, stipXoff, stipYoff);
+    drvfbGetDrawable (pStipple, bits, stride, stip_bpp, stipXoff, stipYoff);
     h = pStipple->height;
     /* check to see that the stipple repeats horizontally */
     while (h--)
     {
 	if (!fbLineRepeat (bits, len, pStipple->width)) {
-	    fbFinishAccess (pStipple);
+	    drvfbFinishAccess (pStipple);
 	    return FALSE;
 	}
 	bits += stride;
     }
-    fbFinishAccess (pStipple);
+    drvfbFinishAccess (pStipple);
     return TRUE;
 }
 
 void
-fbValidateGC(DrvGCPtr pGC, unsigned long changes, DrvPixmapPtr pPixmap)
+drvfbValidateGC(DrvGCPtr pGC, unsigned long changes, DrvPixmapPtr pPixmap)
 {
-    FbGCPrivPtr	pPriv = fbGetGCPrivate(pGC);
+    drvFbGCPrivPtr	pPriv = drvfbGetGCPrivate(pGC);
     FbBits	mask;
 
     if (pPriv->bpp != pPixmap->bitsPerPixel)
@@ -185,10 +185,10 @@ fbValidateGC(DrvGCPtr pGC, unsigned long changes, DrvPixmapPtr pPixmap)
 	changes |= GCStipple|GCForeground|GCBackground|GCPlaneMask;
 	pPriv->bpp = pPixmap->bitsPerPixel;
     }
-    if ((changes & GCTile) && fbGetRotatedPixmap(pGC))
+    if ((changes & GCTile) && drvfbGetRotatedPixmap(pGC))
     {
-	(*pGC->pDrvScreen->DestroyPixmap) (fbGetRotatedPixmap(pGC));
-	fbGetRotatedPixmap(pGC) = 0;
+	(*pGC->pDrvScreen->DestroyPixmap) (drvfbGetRotatedPixmap(pGC));
+	drvfbGetRotatedPixmap(pGC) = 0;
     }
 	
     if (pGC->fillStyle == FillTiled)
@@ -198,16 +198,16 @@ fbValidateGC(DrvGCPtr pGC, unsigned long changes, DrvPixmapPtr pPixmap)
 	pOldTile = pGC->tile.pixmap;
 	if (pOldTile->bitsPerPixel != pPixmap->bitsPerPixel)
 	{
-	    pNewTile = fbGetRotatedPixmap(pGC);
+	    pNewTile = drvfbGetRotatedPixmap(pGC);
 	    if (!pNewTile || pNewTile ->bitsPerPixel != pPixmap->bitsPerPixel)
 	    {
 		if (pNewTile)
 		    (*pGC->pDrvScreen->DestroyPixmap) (pNewTile);
-		pNewTile = fb24_32ReformatTile (pOldTile, pPixmap->bitsPerPixel);
+		pNewTile = drvfb24_32ReformatTile (pOldTile, pPixmap->bitsPerPixel);
 	    }
 	    if (pNewTile)
 	    {
-		fbGetRotatedPixmap(pGC) = pOldTile;
+		drvfbGetRotatedPixmap(pGC) = pOldTile;
 		pGC->tile.pixmap = pNewTile;
 		changes |= GCTile;
 	    }
@@ -218,7 +218,7 @@ fbValidateGC(DrvGCPtr pGC, unsigned long changes, DrvPixmapPtr pPixmap)
 	if (!pGC->tileIsPixel && 
 	    FbEvenTile (pGC->tile.pixmap->width *
 			pPixmap->bitsPerPixel))
-	    fbPadPixmap (pGC->tile.pixmap);
+	    drvfbPadPixmap (pGC->tile.pixmap);
     }
     if (changes & GCStipple)
     {
@@ -233,7 +233,7 @@ fbValidateGC(DrvGCPtr pGC, unsigned long changes, DrvPixmapPtr pPixmap)
 	   	pPriv->evenStipple = TRUE;
 
 	    if (pGC->stipple->width * pPixmap->bitsPerPixel < FB_UNIT)
-		fbPadPixmap (pGC->stipple);
+		drvfbPadPixmap (pGC->stipple);
 	}
     }
     /*