From 0f834b91a4768673833ab4917e87d86c237bb1a6 Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 23 Mar 2012 10:05:55 +0100 Subject: libX11 xserver fontconfig mesa pixman xkbcomp xkeyboard-config git update 23 Mar 2012 --- xorg-server/hw/xfree86/fbdevhw/fbdevhw.h | 98 +++++++++++++++++--------------- 1 file changed, 52 insertions(+), 46 deletions(-) (limited to 'xorg-server/hw/xfree86/fbdevhw/fbdevhw.h') diff --git a/xorg-server/hw/xfree86/fbdevhw/fbdevhw.h b/xorg-server/hw/xfree86/fbdevhw/fbdevhw.h index 34870c27d..536987101 100644 --- a/xorg-server/hw/xfree86/fbdevhw/fbdevhw.h +++ b/xorg-server/hw/xfree86/fbdevhw/fbdevhw.h @@ -5,58 +5,64 @@ #include "xf86str.h" #include "colormapst.h" -#define FBDEVHW_PACKED_PIXELS 0 /* Packed Pixels */ -#define FBDEVHW_PLANES 1 /* Non interleaved planes */ -#define FBDEVHW_INTERLEAVED_PLANES 2 /* Interleaved planes */ -#define FBDEVHW_TEXT 3 /* Text/attributes */ -#define FBDEVHW_VGA_PLANES 4 /* EGA/VGA planes */ +#define FBDEVHW_PACKED_PIXELS 0 /* Packed Pixels */ +#define FBDEVHW_PLANES 1 /* Non interleaved planes */ +#define FBDEVHW_INTERLEAVED_PLANES 2 /* Interleaved planes */ +#define FBDEVHW_TEXT 3 /* Text/attributes */ +#define FBDEVHW_VGA_PLANES 4 /* EGA/VGA planes */ -extern _X_EXPORT Bool fbdevHWGetRec(ScrnInfoPtr pScrn); -extern _X_EXPORT void fbdevHWFreeRec(ScrnInfoPtr pScrn); +extern _X_EXPORT Bool fbdevHWGetRec(ScrnInfoPtr pScrn); +extern _X_EXPORT void fbdevHWFreeRec(ScrnInfoPtr pScrn); -extern _X_EXPORT int fbdevHWGetFD(ScrnInfoPtr pScrn); +extern _X_EXPORT int fbdevHWGetFD(ScrnInfoPtr pScrn); -extern _X_EXPORT Bool fbdevHWProbe(struct pci_device * pPci, char *device, char **namep); -extern _X_EXPORT Bool fbdevHWInit(ScrnInfoPtr pScrn, struct pci_device * pPci, char *device); +extern _X_EXPORT Bool fbdevHWProbe(struct pci_device *pPci, char *device, + char **namep); +extern _X_EXPORT Bool fbdevHWInit(ScrnInfoPtr pScrn, struct pci_device *pPci, + char *device); -extern _X_EXPORT char* fbdevHWGetName(ScrnInfoPtr pScrn); -extern _X_EXPORT int fbdevHWGetDepth(ScrnInfoPtr pScrn, int *fbbpp); -extern _X_EXPORT int fbdevHWGetLineLength(ScrnInfoPtr pScrn); -extern _X_EXPORT int fbdevHWGetType(ScrnInfoPtr pScrn); -extern _X_EXPORT int fbdevHWGetVidmem(ScrnInfoPtr pScrn); +extern _X_EXPORT char *fbdevHWGetName(ScrnInfoPtr pScrn); +extern _X_EXPORT int fbdevHWGetDepth(ScrnInfoPtr pScrn, int *fbbpp); +extern _X_EXPORT int fbdevHWGetLineLength(ScrnInfoPtr pScrn); +extern _X_EXPORT int fbdevHWGetType(ScrnInfoPtr pScrn); +extern _X_EXPORT int fbdevHWGetVidmem(ScrnInfoPtr pScrn); -extern _X_EXPORT void* fbdevHWMapVidmem(ScrnInfoPtr pScrn); -extern _X_EXPORT int fbdevHWLinearOffset(ScrnInfoPtr pScrn); -extern _X_EXPORT Bool fbdevHWUnmapVidmem(ScrnInfoPtr pScrn); -extern _X_EXPORT void* fbdevHWMapMMIO(ScrnInfoPtr pScrn); -extern _X_EXPORT Bool fbdevHWUnmapMMIO(ScrnInfoPtr pScrn); +extern _X_EXPORT void *fbdevHWMapVidmem(ScrnInfoPtr pScrn); +extern _X_EXPORT int fbdevHWLinearOffset(ScrnInfoPtr pScrn); +extern _X_EXPORT Bool fbdevHWUnmapVidmem(ScrnInfoPtr pScrn); +extern _X_EXPORT void *fbdevHWMapMMIO(ScrnInfoPtr pScrn); +extern _X_EXPORT Bool fbdevHWUnmapMMIO(ScrnInfoPtr pScrn); -extern _X_EXPORT void fbdevHWSetVideoModes(ScrnInfoPtr pScrn); +extern _X_EXPORT void fbdevHWSetVideoModes(ScrnInfoPtr pScrn); extern _X_EXPORT DisplayModePtr fbdevHWGetBuildinMode(ScrnInfoPtr pScrn); -extern _X_EXPORT void fbdevHWUseBuildinMode(ScrnInfoPtr pScrn); -extern _X_EXPORT Bool fbdevHWModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode); -extern _X_EXPORT void fbdevHWSave(ScrnInfoPtr pScrn); -extern _X_EXPORT void fbdevHWRestore(ScrnInfoPtr pScrn); - -extern _X_EXPORT void fbdevHWLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices, - LOCO *colors, VisualPtr pVisual); - -extern _X_EXPORT ModeStatus fbdevHWValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags); -extern _X_EXPORT Bool fbdevHWSwitchMode(int scrnIndex, DisplayModePtr mode, int flags); -extern _X_EXPORT void fbdevHWAdjustFrame(int scrnIndex, int x, int y, int flags); -extern _X_EXPORT Bool fbdevHWEnterVT(int scrnIndex, int flags); -extern _X_EXPORT void fbdevHWLeaveVT(int scrnIndex, int flags); -extern _X_EXPORT void fbdevHWDPMSSet(ScrnInfoPtr pScrn, int mode, int flags); - -extern _X_EXPORT Bool fbdevHWSaveScreen(ScreenPtr pScreen, int mode); - -extern _X_EXPORT xf86SwitchModeProc *fbdevHWSwitchModeWeak(void); -extern _X_EXPORT xf86AdjustFrameProc *fbdevHWAdjustFrameWeak(void); -extern _X_EXPORT xf86EnterVTProc *fbdevHWEnterVTWeak(void); -extern _X_EXPORT xf86LeaveVTProc *fbdevHWLeaveVTWeak(void); -extern _X_EXPORT xf86ValidModeProc *fbdevHWValidModeWeak(void); -extern _X_EXPORT xf86DPMSSetProc *fbdevHWDPMSSetWeak(void); -extern _X_EXPORT xf86LoadPaletteProc *fbdevHWLoadPaletteWeak(void); -extern _X_EXPORT SaveScreenProcPtr fbdevHWSaveScreenWeak(void); +extern _X_EXPORT void fbdevHWUseBuildinMode(ScrnInfoPtr pScrn); +extern _X_EXPORT Bool fbdevHWModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode); +extern _X_EXPORT void fbdevHWSave(ScrnInfoPtr pScrn); +extern _X_EXPORT void fbdevHWRestore(ScrnInfoPtr pScrn); + +extern _X_EXPORT void fbdevHWLoadPalette(ScrnInfoPtr pScrn, int numColors, + int *indices, LOCO * colors, + VisualPtr pVisual); + +extern _X_EXPORT ModeStatus fbdevHWValidMode(int scrnIndex, DisplayModePtr mode, + Bool verbose, int flags); +extern _X_EXPORT Bool fbdevHWSwitchMode(int scrnIndex, DisplayModePtr mode, + int flags); +extern _X_EXPORT void fbdevHWAdjustFrame(int scrnIndex, int x, int y, + int flags); +extern _X_EXPORT Bool fbdevHWEnterVT(int scrnIndex, int flags); +extern _X_EXPORT void fbdevHWLeaveVT(int scrnIndex, int flags); +extern _X_EXPORT void fbdevHWDPMSSet(ScrnInfoPtr pScrn, int mode, int flags); + +extern _X_EXPORT Bool fbdevHWSaveScreen(ScreenPtr pScreen, int mode); + +extern _X_EXPORT xf86SwitchModeProc *fbdevHWSwitchModeWeak(void); +extern _X_EXPORT xf86AdjustFrameProc *fbdevHWAdjustFrameWeak(void); +extern _X_EXPORT xf86EnterVTProc *fbdevHWEnterVTWeak(void); +extern _X_EXPORT xf86LeaveVTProc *fbdevHWLeaveVTWeak(void); +extern _X_EXPORT xf86ValidModeProc *fbdevHWValidModeWeak(void); +extern _X_EXPORT xf86DPMSSetProc *fbdevHWDPMSSetWeak(void); +extern _X_EXPORT xf86LoadPaletteProc *fbdevHWLoadPaletteWeak(void); +extern _X_EXPORT SaveScreenProcPtr fbdevHWSaveScreenWeak(void); #endif -- cgit v1.2.3