summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2008-08-15 14:24:31 -0400
committerAdam Jackson <ajax@redhat.com>2008-08-15 14:24:31 -0400
commitd28ed6aa0d28fdcf8f555b2bb8a58fe28d1b464b (patch)
tree7c446e0fa0bbc83625365db72d7b0e8efe1f2fa3
parent7cfecd313aaea74ad5675c53b4d0099d6e9dec39 (diff)
Dead code removal.
-rw-r--r--src/smi_video.c52
1 files changed, 0 insertions, 52 deletions
diff --git a/src/smi_video.c b/src/smi_video.c
index b00b8da..01db7f3 100644
--- a/src/smi_video.c
+++ b/src/smi_video.c
@@ -156,9 +156,6 @@ static int SetAttrSAA7110(ScrnInfoPtr pScrn, int i, int value);
static int SetAttrSAA7111(ScrnInfoPtr pScrn, int i, int value);
static void SetKeyReg(SMIPtr pSmi, int reg, int value);
-#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,3,99,0,0)
-static Bool RegionsEqual(RegionPtr A, RegionPtr B);
-#endif
/**
* Atoms
*/
@@ -464,55 +461,6 @@ static I2CByte SAA7111InitData[] =
/**************************************************************************/
-/* To allow this ddx to work on 4_3_0 and above, we need to include this */
-#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,3,99,0,0)
-static Bool
-RegionsEqual(
- RegionPtr A,
- RegionPtr B
-)
-{
- int *dataA, *dataB;
- int num;
-
- ENTER_PROC("RegionsEqual");
-
- num = REGION_NUM_RECTS(A);
- if (num != REGION_NUM_RECTS(B))
- {
- LEAVE_PROC("RegionsEqual");
- return(FALSE);
- }
-
- if ( (A->extents.x1 != B->extents.x1)
- || (A->extents.y1 != B->extents.y1)
- || (A->extents.x2 != B->extents.x2)
- || (A->extents.y2 != B->extents.y2)
- )
- {
- LEAVE_PROC("RegionsEqual");
- return(FALSE);
- }
-
- dataA = (int*) REGION_RECTS(A);
- dataB = (int*) REGION_RECTS(B);
-
- while (num--)
- {
- if ((dataA[0] != dataB[0]) || (dataA[1] != dataB[1]))
- {
- return(FALSE);
- }
- dataA += 2;
- dataB += 2;
- }
-
- LEAVE_PROC("RegionsEqual");
- return(TRUE);
-}
-#endif
-
-
/**
* generates XF86VideoEncoding[i] with video norm norm, video input format
* input and video input channel channel