mirror of
https://github.com/X11Libre/xserver.git
synced 2026-11-01 03:03:58 +00:00
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
This commit is contained in:
parent
90f1536dd3
commit
adc7f9a4eb
705 changed files with 30330 additions and 26603 deletions
|
|
@ -23,7 +23,7 @@
|
|||
*
|
||||
* Generic RAMDAC access routines.
|
||||
*/
|
||||
/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDac.c,v 1.6 2000/09/26 15:57:21 tsi Exp $ */
|
||||
/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDac.c,v 1.7 2003/11/03 05:11:53 tsi Exp $ */
|
||||
|
||||
#include "xf86.h"
|
||||
#include "xf86_OSproc.h"
|
||||
|
|
@ -69,8 +69,6 @@ RamDacHelperDestroyInfoRec(RamDacHelperRecPtr infoRec)
|
|||
Bool
|
||||
RamDacInit(ScrnInfoPtr pScrn, RamDacRecPtr ramdacPriv)
|
||||
{
|
||||
RamDacHWRecPtr ramdacHWPtr;
|
||||
RamDacRegRecPtr ramdacReg;
|
||||
RamDacScreenRecPtr ramdacScrPtr;
|
||||
|
||||
/*
|
||||
|
|
@ -78,10 +76,8 @@ RamDacInit(ScrnInfoPtr pScrn, RamDacRecPtr ramdacPriv)
|
|||
*/
|
||||
if (!RamDacGetRec(pScrn))
|
||||
return FALSE;
|
||||
ramdacHWPtr = RAMDACHWPTR(pScrn);
|
||||
ramdacReg = &ramdacHWPtr->ModeReg;
|
||||
ramdacScrPtr = ((RamDacScreenRecPtr)
|
||||
(pScrn)->privates[RamDacGetScreenIndex()].ptr);
|
||||
ramdacScrPtr =
|
||||
((RamDacScreenRecPtr) (pScrn)->privates[RamDacGetScreenIndex()].ptr);
|
||||
ramdacScrPtr->RamDacRec = ramdacPriv;
|
||||
|
||||
return(TRUE);
|
||||
|
|
@ -100,8 +96,6 @@ RamDacGetRecPrivate()
|
|||
Bool
|
||||
RamDacGetRec(ScrnInfoPtr scrp)
|
||||
{
|
||||
RamDacRegRecPtr regp;
|
||||
|
||||
RamDacGetRecPrivate();
|
||||
/*
|
||||
* New privates are always set to NULL, so we can check if the allocation
|
||||
|
|
@ -116,8 +110,6 @@ RamDacGetRec(ScrnInfoPtr scrp)
|
|||
xnfcalloc(sizeof(RamDacHWRec), 1);
|
||||
scrp->privates[RamDacScreenPrivateIndex].ptr =
|
||||
xnfcalloc(sizeof(RamDacScreenRec), 1);
|
||||
/* Does this really belong here? */
|
||||
regp = &((RamDacHWRecPtr)scrp->privates[RamDacHWPrivateIndex].ptr)->ModeReg;
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue