diff options
| author | Kean Johnson <kean@armory.com> | 2005-06-10 06:54:05 +0000 |
|---|---|---|
| committer | Kean Johnson <kean@armory.com> | 2005-06-10 06:54:05 +0000 |
| commit | 931395cad53aaf20d506896920be9567f033b9eb (patch) | |
| tree | 1696e57622361d21c733157bfb158c1b7fc294bc | |
| parent | be455c98276cec6cc881ca0093476e244c765bf8 (diff) | |
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.
| -rw-r--r-- | src/savage_cursor.c | 2 | ||||
| -rw-r--r-- | src/savage_dga.c | 9 | ||||
| -rw-r--r-- | src/savage_shadow.c | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/src/savage_cursor.c b/src/savage_cursor.c index ff0136f..248b979 100644 --- a/src/savage_cursor.c +++ b/src/savage_cursor.c @@ -186,7 +186,7 @@ SavageLoadCursorImage( * loading the cursor. */ volatile unsigned int i = ALT_STATUS_WORD0; - (void)i; /* Not to be optimised out */ + (void)i++; /* Not to be optimised out */ } } diff --git a/src/savage_dga.c b/src/savage_dga.c index 50a36b0..55f057e 100644 --- a/src/savage_dga.c +++ b/src/savage_dga.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_dga.c,v 1.3 2001/05/18 23:35:32 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_dga.c,v 1.6 2003/01/18 15:22:29 eich Exp $ */ /* Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved. @@ -275,7 +275,7 @@ Savage_SetMode( psav->DGAactive = FALSE; SavageSwitchMode(index, pScrn->currentMode, 0); - if( psav->hwcursor ) + if( psav->hwcursor && psav->hwc_on ) SavageShowCursor(pScrn); } else { Bool holdBIOS = psav->UseBIOS; @@ -289,8 +289,11 @@ Savage_SetMode( pMode->bitsPerPixel, pMode->depth); #endif - if( psav->hwcursor ) + if( psav->hwcursor && psav->hwc_on) { SavageHideCursor(pScrn); + psav->hwc_on = TRUE; /* save for later restauration */ + } + if(!psav->DGAactive) { /* save the old parameters */ OldDisplayWidth[index] = pScrn->displayWidth; diff --git a/src/savage_shadow.c b/src/savage_shadow.c index 00a5120..2fb0e91 100644 --- a/src/savage_shadow.c +++ b/src/savage_shadow.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_shadow.c,v 1.2 2002/05/14 20:19:52 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_shadow.c,v 1.3 2000/03/31 20:13:33 dawes Exp $ */ /* Copyright (c) 1999,2000 The XFree86 Project Inc. |