diff options
Diffstat (limited to 'xorg-server/hw/xfree86/ramdac/xf86RamDac.h')
-rw-r--r-- | xorg-server/hw/xfree86/ramdac/xf86RamDac.h | 103 |
1 files changed, 35 insertions, 68 deletions
diff --git a/xorg-server/hw/xfree86/ramdac/xf86RamDac.h b/xorg-server/hw/xfree86/ramdac/xf86RamDac.h index 4a3900b93..50a659a22 100644 --- a/xorg-server/hw/xfree86/ramdac/xf86RamDac.h +++ b/xorg-server/hw/xfree86/ramdac/xf86RamDac.h @@ -16,96 +16,63 @@ typedef struct _RamDacRegRec { * and they seem o.k * Then we allocate 768 entries for the DAC too. IBM640 needs 1024 -FIXME */ - unsigned short DacRegs[0x400]; /* register set */ - unsigned char DAC[0x300]; /* colour map */ + unsigned short DacRegs[0x400]; /* register set */ + unsigned char DAC[0x300]; /* colour map */ Bool Overlay; } RamDacRegRec, *RamDacRegRecPtr; typedef struct _RamDacHWRegRec { - RamDacRegRec SavedReg; - RamDacRegRec ModeReg; + RamDacRegRec SavedReg; + RamDacRegRec ModeReg; } RamDacHWRec, *RamDacHWRecPtr; typedef struct _RamDacRec { CARD32 RamDacType; - void (*LoadPalette)( - ScrnInfoPtr pScrn, - int numColors, - int *indices, - LOCO *colors, - VisualPtr pVisual - ); - - unsigned char (*ReadDAC)( - ScrnInfoPtr pScrn, - CARD32 - ); - - void (*WriteDAC)( - ScrnInfoPtr pScrn, - CARD32, - unsigned char, - unsigned char - ); - - void (*WriteAddress)( - ScrnInfoPtr pScrn, - CARD32 - ); - - void (*WriteData)( - ScrnInfoPtr pScrn, - unsigned char - ); - - void (*ReadAddress)( - ScrnInfoPtr pScrn, - CARD32 - ); - - unsigned char (*ReadData)( - ScrnInfoPtr pScrn - ); + void (*LoadPalette) (ScrnInfoPtr pScrn, + int numColors, + int *indices, LOCO * colors, VisualPtr pVisual); + + unsigned char (*ReadDAC) (ScrnInfoPtr pScrn, CARD32); + + void (*WriteDAC) (ScrnInfoPtr pScrn, CARD32, unsigned char, unsigned char); + + void (*WriteAddress) (ScrnInfoPtr pScrn, CARD32); + + void (*WriteData) (ScrnInfoPtr pScrn, unsigned char); + + void (*ReadAddress) (ScrnInfoPtr pScrn, CARD32); + + unsigned char (*ReadData) (ScrnInfoPtr pScrn); } RamDacRec, *RamDacRecPtr; typedef struct _RamDacHelperRec { CARD32 RamDacType; - void (*Restore)( - ScrnInfoPtr pScrn, - RamDacRecPtr ramdacPtr, - RamDacRegRecPtr ramdacReg - ); - - void (*Save)( - ScrnInfoPtr pScrn, - RamDacRecPtr ramdacPtr, - RamDacRegRecPtr ramdacReg - ); - - void (*SetBpp)( - ScrnInfoPtr pScrn, - RamDacRegRecPtr ramdacReg - ); - - void (*HWCursorInit)( - xf86CursorInfoPtr infoPtr - ); + void (*Restore) (ScrnInfoPtr pScrn, + RamDacRecPtr ramdacPtr, RamDacRegRecPtr ramdacReg); + + void (*Save) (ScrnInfoPtr pScrn, + RamDacRecPtr ramdacPtr, RamDacRegRecPtr ramdacReg); + + void (*SetBpp) (ScrnInfoPtr pScrn, RamDacRegRecPtr ramdacReg); + + void (*HWCursorInit) (xf86CursorInfoPtr infoPtr); } RamDacHelperRec, *RamDacHelperRecPtr; #define RAMDACHWPTR(p) ((RamDacHWRecPtr)((p)->privates[RamDacGetHWIndex()].ptr)) typedef struct _RamdacScreenRec { - RamDacRecPtr RamDacRec; + RamDacRecPtr RamDacRec; } RamDacScreenRec, *RamDacScreenRecPtr; + #define RAMDACSCRPTR(p) ((RamDacScreenRecPtr)((p)->privates[RamDacGetScreenIndex()].ptr))->RamDacRec extern _X_EXPORT int RamDacHWPrivateIndex; extern _X_EXPORT int RamDacScreenPrivateIndex; typedef struct { - int token; + int token; } RamDacSupportedInfoRec, *RamDacSupportedInfoRecPtr; extern _X_EXPORT RamDacRecPtr RamDacCreateInfoRec(void); @@ -113,9 +80,9 @@ extern _X_EXPORT RamDacHelperRecPtr RamDacHelperCreateInfoRec(void); extern _X_EXPORT void RamDacDestroyInfoRec(RamDacRecPtr RamDacRec); extern _X_EXPORT void RamDacHelperDestroyInfoRec(RamDacHelperRecPtr RamDacRec); extern _X_EXPORT Bool RamDacInit(ScrnInfoPtr pScrn, RamDacRecPtr RamDacRec); -extern _X_EXPORT Bool RamDacHandleColormaps(ScreenPtr pScreen, int maxColors, int sigRGBbits, - unsigned int flags); +extern _X_EXPORT Bool RamDacHandleColormaps(ScreenPtr pScreen, int maxColors, + int sigRGBbits, unsigned int flags); extern _X_EXPORT void RamDacFreeRec(ScrnInfoPtr pScrn); -extern _X_EXPORT int RamDacGetHWIndex(void); +extern _X_EXPORT int RamDacGetHWIndex(void); -#endif /* _XF86RAMDAC_H */ +#endif /* _XF86RAMDAC_H */ |