SCO port update for SCO OpenServer 5 and UnixWare 7. A few general cleanupssco_port_update

    and bugs not specifically related to the port fixed along the way.

1 files changed, 6 insertions, 10 deletions

diff --git a/src/mga_dh.c b/src/mga_dh.c
index 79c8510..b1cd569 100644
--- a/src/mga_dh.c
+++ b/src/mga_dh.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dh.c,v 1.4 2002/01/11 15:42:57 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dh.c,v 1.4tsi Exp $ */
 /*********************************************************************
 *  	G450: This is for Dual Head. 
 *       Matrox Graphics
@@ -151,13 +151,11 @@ void MGACRTC2Get(ScrnInfoPtr pScrn, xMODEINFO *pModeInfo)
     CARD32 ulHTotal;
     CARD32 ulHDispEnd;
     CARD32 ulHBlkStr;
-    CARD32 ulHBlkEnd;
     CARD32 ulHSyncStr;
     CARD32 ulHSyncEnd;
     CARD32 ulVTotal;
     CARD32 ulVDispEnd;
     CARD32 ulVBlkStr;
-    CARD32 ulVBlkEnd;
     CARD32 ulVSyncStr;
     CARD32 ulVSyncEnd;
     CARD32 ulOffset;
@@ -181,7 +179,6 @@ void MGACRTC2Get(ScrnInfoPtr pScrn, xMODEINFO *pModeInfo)
     
     ulHDispEnd = tmpModeInfo.ulDispWidth;
     ulHBlkStr  = ulHDispEnd;
-    ulHBlkEnd  = ulHBlkStr + tmpModeInfo.ulHBPorch + tmpModeInfo.ulHFPorch + tmpModeInfo.ulHSync;
     ulHSyncStr = ulHBlkStr + tmpModeInfo.ulHFPorch;
     ulHSyncEnd = ulHSyncStr + tmpModeInfo.ulHSync;
     
@@ -193,7 +190,6 @@ void MGACRTC2Get(ScrnInfoPtr pScrn, xMODEINFO *pModeInfo)
     
     ulVDispEnd = ulDispHeight;
     ulVBlkStr = ulVDispEnd;
-    ulVBlkEnd = ulVBlkStr + tmpModeInfo.ulVBPorch + tmpModeInfo.ulVFPorch + tmpModeInfo.ulVSync;
     ulVSyncStr = ulVBlkStr + tmpModeInfo.ulVFPorch;
     ulVSyncEnd = ulVSyncStr + tmpModeInfo.ulVSync;
     
@@ -285,10 +281,11 @@ void MGACRTC2Set(ScrnInfoPtr pScrn, xMODEINFO *pModeInfo)
 void MGAEnableSecondOutPut(ScrnInfoPtr pScrn, xMODEINFO *pModeInfo)
 {
     CARD8   ucByte, ucXDispCtrl;
-    CARD32   ulC2CTL, ulStatusReg;
+    CARD32   ulC2CTL;
     MGAPtr pMga = MGAPTR(pScrn);
     MGARegPtr pReg;
     pReg = &pMga->ModeReg;
+
 #ifdef DEBUG
     ErrorF("ENTER MGAEnableSecondOutPut\n");
 #endif
@@ -300,10 +297,9 @@ void MGAEnableSecondOutPut(ScrnInfoPtr pScrn, xMODEINFO *pModeInfo)
     /*--- Disable Pixel clock oscillations On Crtc1 */
     OUTREG( MGAREG_C2CTL, ulC2CTL | C2CTL_PIXCLKDIS_MASK);
     /*--- Have to wait minimum time (2 acces will be ok) */
-    ulStatusReg = INREG( MGAREG_Status);
-    ulStatusReg = INREG( MGAREG_Status);
-    
-    
+    (void) INREG( MGAREG_Status);
+    (void) INREG( MGAREG_Status);
+
     ulC2CTL &= ~(C2CTL_PIXCLKSEL_MASK | C2CTL_PIXCLKSELH_MASK);
     
     ulC2CTL |= C2CTL_PIXCLKSEL_VIDEOPLL;