45. Remove two unused functions from xf4bpp (Miod Vallat, Marc La France).

4 files changed, 5 insertions, 69 deletions

diff --git a/programs/Xserver/hw/xfree86/CHANGELOG b/programs/Xserver/hw/xfree86/CHANGELOG
index c67cf7e14..26f551b0f 100644
--- a/programs/Xserver/hw/xfree86/CHANGELOG
+++ b/programs/Xserver/hw/xfree86/CHANGELOG
@@ -1,4 +1,5 @@
 XFree86 4.7.99.17 (xx May 2008)
+  45. Remove two unused functions from xf4bpp (Miod Vallat, Marc La France).
   44. Fix additional incorrect assumptions regarding unassigned PCI resources
       (Marc La France).
   43. Mitigate brokenness in /dev/console redirection on Solaris.  Should this
@@ -20737,4 +20738,4 @@ XFree86 3.0a (28 April 1994)
 XFree86 3.0 (26 April 1994)
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3954 2008/05/01 16:13:20 tsi Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3955 2008/05/01 17:11:30 tsi Exp $
diff --git a/programs/Xserver/hw/xfree86/xf4bpp/offscreen.c b/programs/Xserver/hw/xfree86/xf4bpp/offscreen.c
index f83898e30..ffc158a0c 100644
--- a/programs/Xserver/hw/xfree86/xf4bpp/offscreen.c
+++ b/programs/Xserver/hw/xfree86/xf4bpp/offscreen.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/offscreen.c,v 1.5 2001/08/01 00:44:56 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/offscreen.c,v 1.6tsi Exp $ */
 /*
  * Copyright 1993 Gerrit Jan Akkerman 
  *
@@ -297,25 +297,6 @@ DoMono
 }
 
 void
-xf4bppOffDrawMonoImage( pWin, data, x, y, w, h, fg, alu, planes )
-WindowPtr pWin; /* GJA */
-unsigned char *data;
-int x, y, w, h ;
-unsigned long int fg ;
-int alu ;
-unsigned long int planes;
-{
-
-	if ( ( alu == GXnoop ) || !( planes &= VGA_ALLPLANES ) )
-		return ;
-
-	DoMono( pWin, w, x, y, (const unsigned char *) data, h,
-		      w, ( ( w + 31 ) & ~31 ) >> 3, h, 0, 0, alu,
-		      (int)planes, (int)fg) ;
-
-}
-
-void
 xf4bppOffFillStipple( pWin, pStipple, fg, alu, planes, x, y, w, h, xSrc, ySrc )
 WindowPtr pWin; /* GJA */
 register PixmapPtr const pStipple ;
diff --git a/programs/Xserver/hw/xfree86/xf4bpp/vgaStipple.c b/programs/Xserver/hw/xfree86/xf4bpp/vgaStipple.c
index b811a88d4..d77934783 100644
--- a/programs/Xserver/hw/xfree86/xf4bpp/vgaStipple.c
+++ b/programs/Xserver/hw/xfree86/xf4bpp/vgaStipple.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaStipple.c,v 1.6 2003/11/03 05:11:57 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaStipple.c,v 1.7tsi Exp $ */
 /*
  * Copyright IBM Corporation 1987,1988,1989
  *
@@ -584,41 +584,6 @@ switch ( rasterOp ) {
 return ( color & VGA_ALLPLANES ) | data_rotate_value | invert_existing_data ;
 }
 
-static void
-vgaDrawMonoImage(WindowPtr pWin, unsigned char *data, int x, int y,
-		 int w, int h, unsigned long int fg, int alu,
-		 unsigned long int planes)
-{
-unsigned long regState ;
-
-if ( !xf86Screens[((DrawablePtr)pWin)->pScreen->myNum]->vtSema ) {
-	xf4bppOffDrawMonoImage( pWin, data, x, y, w, h, fg, alu, planes );
-	return;
-}
-
-if ( ( alu == GXnoop ) || !( planes &= VGA_ALLPLANES ) )
-	return ;
-
-#ifndef	PC98_EGC
-if ( ( regState = vgaCalcMonoMode( alu, fg ) ) & DO_RECURSE ) {
-	vgaDrawMonoImage( pWin, data, x, y, w, h,
-			  VGA_ALLPLANES, GXinvert, planes ) ;
-	regState &= ~DO_RECURSE ;
-}
-#else
-regState = vgaCalcMonoMode(alu, (char)fg);
-#endif
-
-
-vgaSetMonoRegisters( (DrawablePtr)pWin, planes, regState ) ;
-
-DoMonoSingle( pWin, w, x, y, (const unsigned char *) data, h,
-	      w, ( ( w + 31 ) & ~31 ) >> 3, h, 0, 0 ) ;
-
-
-return ;
-}
-
 void
 xf4bppFillStipple(WindowPtr pWin, PixmapPtr const pStipple, unsigned long fg,
 		  const int alu, unsigned long planes,
diff --git a/programs/Xserver/hw/xfree86/xf4bpp/xf4bpp.h b/programs/Xserver/hw/xfree86/xf4bpp/xf4bpp.h
index 0d10a4bdd..741e43832 100644
--- a/programs/Xserver/hw/xfree86/xf4bpp/xf4bpp.h
+++ b/programs/Xserver/hw/xfree86/xf4bpp/xf4bpp.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/xf4bpp.h,v 1.10tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/xf4bpp.h,v 1.11tsi Exp $ */
 
 
 #ifndef __XF4BPP_H__
@@ -479,17 +479,6 @@ void xf4bppOffFillSolid(
     int,
     const int
 );
-void xf4bppOffDrawMonoImage(
-    WindowPtr,
-    unsigned char *,
-    int,
-    int,
-    int,
-    int,
-    unsigned long int,
-    int,
-    unsigned long int
-);
 void xf4bppOffFillStipple(
     WindowPtr,
     const PixmapPtr,