frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make visible symbols required by xorg modules. 

This patch exports all symbols required by the compilable
(in a x86 linux computer) xorg/driver/* modules.
  Still missing symbols worth mentioning are:

sunleo
	miFindMaxBand no longer available

intel	(uxa/uxa-accel.c)
	fbShmPutImage no longer available (and should have been static)

mga
	MGAGetClientPointer (should come from matrox's libhal)

  This is not a definitive "visibility" patch, as all it does is to
export missing symbols, but the modules that current don't compile,
may require more symbols once fixed, and third party drivers should
also require more symbols exported.
  A "definitive" patch should export symbols defined in the sdk.
This commit is contained in:
Paulo Cesar Pereira de Andrade 2008-11-28 01:55:11 -02:00
parent 6f18ea7e65
commit 31285d063e
45 changed files with 174 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
exa/exa.c
View File

@ -67,7 +67,7 @@ ExaGetPixmapAddress(PixmapPtr p)
* support for having multiple card-accessible offscreen, such as an AGP memory * support for having multiple card-accessible offscreen, such as an AGP memory
* pool alongside the framebuffer pool. * pool alongside the framebuffer pool.
*/ */
unsigned long _X_EXPORT unsigned long
exaGetPixmapOffset(PixmapPtr pPix) exaGetPixmapOffset(PixmapPtr pPix)
{ {
ExaScreenPriv (pPix->drawable.pScreen); ExaScreenPriv (pPix->drawable.pScreen);
@ -90,7 +90,7 @@ exaGetPixmapDriverPrivate(PixmapPtr pPix)
* This is a helper to make driver code more obvious, due to the rather obscure * This is a helper to make driver code more obvious, due to the rather obscure
* naming of the pitch field in the pixmap. * naming of the pitch field in the pixmap.
*/ */
unsigned long _X_EXPORT unsigned long
exaGetPixmapPitch(PixmapPtr pPix) exaGetPixmapPitch(PixmapPtr pPix)
{ {
return pPix->devKind; return pPix->devKind;
@ -776,7 +776,7 @@ exaCloseScreen(int i, ScreenPtr pScreen)
* *
* @return a newly allocated, zero-filled driver structure * @return a newly allocated, zero-filled driver structure
*/ */
ExaDriverPtr _X_EXPORT ExaDriverPtr
exaDriverAlloc(void) exaDriverAlloc(void)
{ {
return xcalloc(1, sizeof(ExaDriverRec)); return xcalloc(1, sizeof(ExaDriverRec));
@ -792,7 +792,7 @@ exaDriverAlloc(void)
* *
* @return TRUE if EXA was successfully initialized. * @return TRUE if EXA was successfully initialized.
*/ */
Bool _X_EXPORT Bool
exaDriverInit (ScreenPtr pScreen, exaDriverInit (ScreenPtr pScreen,
ExaDriverPtr pScreenInfo) ExaDriverPtr pScreenInfo)
{ {
@ -1012,7 +1012,7 @@ exaDriverInit (ScreenPtr pScreen,
* *
* @param pScreen screen being torn down. * @param pScreen screen being torn down.
*/ */
void _X_EXPORT void
exaDriverFini (ScreenPtr pScreen) exaDriverFini (ScreenPtr pScreen)
{ {
/*right now does nothing*/ /*right now does nothing*/
@ -1029,7 +1029,7 @@ exaDriverFini (ScreenPtr pScreen)
* driver MarkSync() callback, the return value of which may be used to do partial * driver MarkSync() callback, the return value of which may be used to do partial
* synchronization with the hardware in the future. * synchronization with the hardware in the future.
*/ */
void exaMarkSync(ScreenPtr pScreen) _X_EXPORT void exaMarkSync(ScreenPtr pScreen)
{ {
ExaScreenPriv(pScreen); ExaScreenPriv(pScreen);
@ -1048,7 +1048,7 @@ void exaMarkSync(ScreenPtr pScreen)
* It should always be called before relying on the framebuffer contents * It should always be called before relying on the framebuffer contents
* reflecting previous drawing, from a CPU perspective. * reflecting previous drawing, from a CPU perspective.
*/ */
void exaWaitSync(ScreenPtr pScreen) _X_EXPORT void exaWaitSync(ScreenPtr pScreen)
{ {
ExaScreenPriv(pScreen); ExaScreenPriv(pScreen);

2
exa/exa_migration.c
View File

@ -348,7 +348,7 @@ exaDoMoveInPixmap (ExaMigrationPtr migrate)
pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER; pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
} }
void _X_EXPORT void
exaMoveInPixmap (PixmapPtr pPixmap) exaMoveInPixmap (PixmapPtr pPixmap)
{ {
static ExaMigrationRec migrate = { .as_dst = FALSE, .as_src = TRUE, static ExaMigrationRec migrate = { .as_dst = FALSE, .as_src = TRUE,

8
exa/exa_offscreen.c
View File

@ -164,7 +164,7 @@ exaFindAreaToEvict(ExaScreenPrivPtr pExaScr, int size, int align)
* requested version 2.1 or newer behavior. In that case, the save callback is * requested version 2.1 or newer behavior. In that case, the save callback is
* still called. * still called.
*/ */
ExaOffscreenArea * _X_EXPORT ExaOffscreenArea *
exaOffscreenAlloc (ScreenPtr pScreen, int size, int align, exaOffscreenAlloc (ScreenPtr pScreen, int size, int align,
Bool locked, Bool locked,
ExaOffscreenSaveProc save, ExaOffscreenSaveProc save,
@ -365,7 +365,7 @@ ExaOffscreenSwapIn (ScreenPtr pScreen)
* many drivers that could otherwise handle the lack of FB access while * many drivers that could otherwise handle the lack of FB access while
* swapped out. * swapped out.
*/ */
void _X_EXPORT void
exaEnableDisableFBAccess (int index, Bool enable) exaEnableDisableFBAccess (int index, Bool enable)
{ {
ScreenPtr pScreen = screenInfo.screens[index]; ScreenPtr pScreen = screenInfo.screens[index];
@ -412,7 +412,7 @@ ExaOffscreenMerge (ExaOffscreenArea *area)
* @return pointer to the newly freed area. This behavior should not be relied * @return pointer to the newly freed area. This behavior should not be relied
* on. * on.
*/ */
ExaOffscreenArea * _X_EXPORT ExaOffscreenArea *
exaOffscreenFree (ScreenPtr pScreen, ExaOffscreenArea *area) exaOffscreenFree (ScreenPtr pScreen, ExaOffscreenArea *area)
{ {
ExaScreenPriv(pScreen); ExaScreenPriv(pScreen);
@ -453,7 +453,7 @@ exaOffscreenFree (ScreenPtr pScreen, ExaOffscreenArea *area)
return area; return area;
} }
void _X_EXPORT void
ExaOffscreenMarkUsed (PixmapPtr pPixmap) ExaOffscreenMarkUsed (PixmapPtr pPixmap)
{ {
ExaPixmapPriv (pPixmap); ExaPixmapPriv (pPixmap);

2
exa/exa_unaccel.c
View File

@ -373,7 +373,7 @@ ExaCheckAddTraps (PicturePtr pPicture,
* *
* XXX This really belongs in fb, so it can be aware of tiling and etc. * XXX This really belongs in fb, so it can be aware of tiling and etc.
*/ */
CARD32 _X_EXPORT CARD32
exaGetPixmapFirstPixel (PixmapPtr pPixmap) exaGetPixmapFirstPixel (PixmapPtr pPixmap)
{ {
CARD32 pixel; CARD32 pixel;

2
fb/fbcmap.c
View File

@ -278,7 +278,7 @@ fbExpandDirectColors (ColormapPtr pmap,
return nresult; return nresult;
} }
Bool _X_EXPORT Bool
fbCreateDefColormap(ScreenPtr pScreen) fbCreateDefColormap(ScreenPtr pScreen)
{ {
unsigned short zero = 0, ones = 0xFFFF; unsigned short zero = 0, ones = 0xFFFF;

2
fb/fbcmap_mi.c
View File

@ -85,7 +85,7 @@ fbExpandDirectColors (ColormapPtr pmap,
return miExpandDirectColors(pmap, ndef, indefs, outdefs); return miExpandDirectColors(pmap, ndef, indefs, outdefs);
} }
Bool _X_EXPORT Bool
fbCreateDefColormap(ScreenPtr pScreen) fbCreateDefColormap(ScreenPtr pScreen)
{ {
return miCreateDefColormap(pScreen); return miCreateDefColormap(pScreen);

6
hw/xfree86/common/xf86Cursor.c
View File

@ -133,7 +133,7 @@ xf86InitViewport(ScrnInfoPtr pScr)
* Scroll the visual part of the screen so the pointer is visible. * Scroll the visual part of the screen so the pointer is visible.
*/ */
void _X_EXPORT void
xf86SetViewport(ScreenPtr pScreen, int x, int y) xf86SetViewport(ScreenPtr pScreen, int x, int y)
{ {
ScrnInfoPtr pScr = XF86SCRNINFO(pScreen); ScrnInfoPtr pScr = XF86SCRNINFO(pScreen);
@ -197,7 +197,7 @@ xf86LockZoom(ScreenPtr pScreen, Bool lock)
* set a new mode. * set a new mode.
*/ */
Bool _X_EXPORT Bool
xf86SwitchMode(ScreenPtr pScreen, DisplayModePtr mode) xf86SwitchMode(ScreenPtr pScreen, DisplayModePtr mode)
{ {
ScrnInfoPtr pScr = XF86SCRNINFO(pScreen); ScrnInfoPtr pScr = XF86SCRNINFO(pScreen);
@ -845,7 +845,7 @@ xf86InitOrigins(void)
} }
} }
void _X_EXPORT void
xf86ReconfigureLayout(void) xf86ReconfigureLayout(void)
{ {
int i; int i;

2
hw/xfree86/common/xf86Events.c
View File

@ -182,7 +182,7 @@ ProcessInputEvents ()
* Handle keyboard events that cause some kind of "action" * Handle keyboard events that cause some kind of "action"
* (i.e., server termination, video mode changes, VT switches, etc.) * (i.e., server termination, video mode changes, VT switches, etc.)
*/ */
void _X_EXPORT void
xf86ProcessActionEvent(ActionEvent action, void *arg) xf86ProcessActionEvent(ActionEvent action, void *arg)
{ {
#ifdef DEBUG #ifdef DEBUG

4
hw/xfree86/common/xf86Globals.c
View File

@ -97,7 +97,7 @@ InputInfoPtr xf86InputDevs = NULL;
/* Globals that video drivers may not access */ /* Globals that video drivers may not access */
xf86InfoRec xf86Info = { _X_EXPORT xf86InfoRec xf86Info = {
.consoleFd = -1, .consoleFd = -1,
.vtno = -1, .vtno = -1,
.vtSysreq = FALSE, .vtSysreq = FALSE,
@ -200,7 +200,7 @@ Bool xf86VidModeAllowNonLocal = FALSE;
#endif #endif
RootWinPropPtr *xf86RegisteredPropertiesTable = NULL; RootWinPropPtr *xf86RegisteredPropertiesTable = NULL;
_X_EXPORT Bool xf86inSuspend = FALSE; _X_EXPORT Bool xf86inSuspend = FALSE;
Bool xorgHWAccess = FALSE; _X_EXPORT Bool xorgHWAccess = FALSE;
struct pci_slot_match xf86IsolateDevice = { struct pci_slot_match xf86IsolateDevice = {
PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, 0 PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, 0

6
hw/xfree86/common/xf86xv.c
View File

@ -116,9 +116,9 @@ static int XF86XvScreenKeyIndex;
DevPrivateKey XF86XvScreenKey = &XF86XvScreenKeyIndex; DevPrivateKey XF86XvScreenKey = &XF86XvScreenKeyIndex;
static unsigned long PortResource = 0; static unsigned long PortResource = 0;
DevPrivateKey (*XvGetScreenKeyProc)(void) = NULL; _X_EXPORT DevPrivateKey (*XvGetScreenKeyProc)(void) = NULL;
unsigned long (*XvGetRTPortProc)(void) = NULL; _X_EXPORT unsigned long (*XvGetRTPortProc)(void) = NULL;
int (*XvScreenInitProc)(ScreenPtr) = NULL; _X_EXPORT int (*XvScreenInitProc)(ScreenPtr) = NULL;
#define GET_XV_SCREEN(pScreen) \ #define GET_XV_SCREEN(pScreen) \
((XvScreenPtr)dixLookupPrivate(&(pScreen)->devPrivates, XF86XvScreenKey)) ((XvScreenPtr)dixLookupPrivate(&(pScreen)->devPrivates, XF86XvScreenKey))

6
hw/xfree86/ddc/xf86DDC.c
View File

@ -63,7 +63,7 @@ static const OptionInfoRec DDCOptions[] = {
* @return pointer to a new xf86MonPtr containing the EDID information. * @return pointer to a new xf86MonPtr containing the EDID information.
* @return NULL if no monitor attached or failure to interpret the EDID. * @return NULL if no monitor attached or failure to interpret the EDID.
*/ */
xf86MonPtr _X_EXPORT xf86MonPtr
xf86DoEDID_DDC1( xf86DoEDID_DDC1(
int scrnIndex, DDC1SetSpeedProc DDC1SetSpeed, int scrnIndex, DDC1SetSpeedProc DDC1SetSpeed,
unsigned int (*DDC1Read)(ScrnInfoPtr) unsigned int (*DDC1Read)(ScrnInfoPtr)
@ -206,7 +206,7 @@ DDC2Read(I2CDevPtr dev, int block, unsigned char *R_Buffer)
* @return pointer to a new xf86MonPtr containing the EDID information. * @return pointer to a new xf86MonPtr containing the EDID information.
* @return NULL if no monitor attached or failure to interpret the EDID. * @return NULL if no monitor attached or failure to interpret the EDID.
*/ */
xf86MonPtr _X_EXPORT xf86MonPtr
xf86DoEEDID(int scrnIndex, I2CBusPtr pBus, Bool complete) xf86DoEEDID(int scrnIndex, I2CBusPtr pBus, Bool complete)
{ {
ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
@ -267,7 +267,7 @@ xf86DoEEDID(int scrnIndex, I2CBusPtr pBus, Bool complete)
* @return pointer to a new xf86MonPtr containing the EDID information. * @return pointer to a new xf86MonPtr containing the EDID information.
* @return NULL if no monitor attached or failure to interpret the EDID. * @return NULL if no monitor attached or failure to interpret the EDID.
*/ */
xf86MonPtr _X_EXPORT xf86MonPtr
xf86DoEDID_DDC2(int scrnIndex, I2CBusPtr pBus) xf86DoEDID_DDC2(int scrnIndex, I2CBusPtr pBus)
{ {
return xf86DoEEDID(scrnIndex, pBus, FALSE); return xf86DoEEDID(scrnIndex, pBus, FALSE);

54
hw/xfree86/dri/dri.c
View File

@ -315,7 +315,7 @@ dri_crtc_notify(ScreenPtr pScreen)
pDRIPriv->xf86_crtc_notify = xf86_wrap_crtc_notify(pScreen, dri_crtc_notify); pDRIPriv->xf86_crtc_notify = xf86_wrap_crtc_notify(pScreen, dri_crtc_notify);
} }
Bool _X_EXPORT Bool
DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD) DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD)
{ {
DRIScreenPrivPtr pDRIPriv; DRIScreenPrivPtr pDRIPriv;
@ -594,7 +594,7 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD)
return TRUE; return TRUE;
} }
Bool _X_EXPORT Bool
DRIFinishScreenInit(ScreenPtr pScreen) DRIFinishScreenInit(ScreenPtr pScreen)
{ {
DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen); DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
@ -640,7 +640,7 @@ DRIFinishScreenInit(ScreenPtr pScreen)
return TRUE; return TRUE;
} }
void _X_EXPORT void
DRICloseScreen(ScreenPtr pScreen) DRICloseScreen(ScreenPtr pScreen)
{ {
DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen); DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
@ -812,7 +812,7 @@ DRIReset(void)
*/ */
} }
Bool _X_EXPORT Bool
DRIQueryDirectRenderingCapable(ScreenPtr pScreen, Bool* isCapable) DRIQueryDirectRenderingCapable(ScreenPtr pScreen, Bool* isCapable)
{ {
DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen); DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
@ -825,7 +825,7 @@ DRIQueryDirectRenderingCapable(ScreenPtr pScreen, Bool* isCapable)
return TRUE; return TRUE;
} }
Bool _X_EXPORT Bool
DRIOpenConnection(ScreenPtr pScreen, drm_handle_t * hSAREA, char **busIdString) DRIOpenConnection(ScreenPtr pScreen, drm_handle_t * hSAREA, char **busIdString)
{ {
DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen); DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
@ -836,7 +836,7 @@ DRIOpenConnection(ScreenPtr pScreen, drm_handle_t * hSAREA, char **busIdString)
return TRUE; return TRUE;
} }
Bool _X_EXPORT Bool
DRIAuthConnection(ScreenPtr pScreen, drm_magic_t magic) DRIAuthConnection(ScreenPtr pScreen, drm_magic_t magic)
{ {
DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen); DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
@ -845,13 +845,13 @@ DRIAuthConnection(ScreenPtr pScreen, drm_magic_t magic)
return TRUE; return TRUE;
} }
Bool _X_EXPORT Bool
DRICloseConnection(ScreenPtr pScreen) DRICloseConnection(ScreenPtr pScreen)
{ {
return TRUE; return TRUE;
} }
Bool _X_EXPORT Bool
DRIGetClientDriverName(ScreenPtr pScreen, DRIGetClientDriverName(ScreenPtr pScreen,
int *ddxDriverMajorVersion, int *ddxDriverMajorVersion,
int *ddxDriverMinorVersion, int *ddxDriverMinorVersion,
@ -1014,7 +1014,7 @@ DRIDestroyDummyContext(ScreenPtr pScreen, Bool hasCtxPriv)
pDRIPriv->dummyCtxPriv = NULL; pDRIPriv->dummyCtxPriv = NULL;
} }
Bool _X_EXPORT Bool
DRICreateContext(ScreenPtr pScreen, VisualPtr visual, DRICreateContext(ScreenPtr pScreen, VisualPtr visual,
XID context, drm_context_t * pHWContext) XID context, drm_context_t * pHWContext)
{ {
@ -1050,7 +1050,7 @@ DRICreateContext(ScreenPtr pScreen, VisualPtr visual,
return TRUE; return TRUE;
} }
Bool _X_EXPORT Bool
DRIDestroyContext(ScreenPtr pScreen, XID context) DRIDestroyContext(ScreenPtr pScreen, XID context)
{ {
FreeResourceByType(context, DRIContextPrivResType, FALSE); FreeResourceByType(context, DRIContextPrivResType, FALSE);
@ -1233,7 +1233,7 @@ DRIDecreaseNumberVisible(ScreenPtr pScreen)
DRIDriverClipNotify(pScreen); DRIDriverClipNotify(pScreen);
} }
Bool _X_EXPORT Bool
DRICreateDrawable(ScreenPtr pScreen, ClientPtr client, DrawablePtr pDrawable, DRICreateDrawable(ScreenPtr pScreen, ClientPtr client, DrawablePtr pDrawable,
drm_drawable_t * hHWDrawable) drm_drawable_t * hHWDrawable)
{ {
@ -1345,7 +1345,7 @@ DRIDestroyDrawableCB(pointer value, XID id, pointer data)
return FALSE; return FALSE;
} }
Bool _X_EXPORT Bool
DRIDestroyDrawable(ScreenPtr pScreen, ClientPtr client, DrawablePtr pDrawable) DRIDestroyDrawable(ScreenPtr pScreen, ClientPtr client, DrawablePtr pDrawable)
{ {
if (pDrawable->type == DRAWABLE_WINDOW) { if (pDrawable->type == DRAWABLE_WINDOW) {
@ -1386,7 +1386,7 @@ DRIDrawablePrivDelete(pointer pResource, XID id)
} }
} }
Bool _X_EXPORT Bool
DRIGetDrawableInfo(ScreenPtr pScreen, DRIGetDrawableInfo(ScreenPtr pScreen,
DrawablePtr pDrawable, DrawablePtr pDrawable,
unsigned int* index, unsigned int* index,
@ -1558,7 +1558,7 @@ DRIGetDrawableInfo(ScreenPtr pScreen,
return TRUE; return TRUE;
} }
Bool _X_EXPORT Bool
DRIGetDeviceInfo(ScreenPtr pScreen, DRIGetDeviceInfo(ScreenPtr pScreen,
drm_handle_t * hFrameBuffer, drm_handle_t * hFrameBuffer,
int* fbOrigin, int* fbOrigin,
@ -1579,7 +1579,7 @@ DRIGetDeviceInfo(ScreenPtr pScreen,
return TRUE; return TRUE;
} }
DRIInfoPtr _X_EXPORT DRIInfoPtr
DRICreateInfoRec(void) DRICreateInfoRec(void)
{ {
DRIInfoPtr inforec = (DRIInfoPtr)xcalloc(1, sizeof(DRIInfoRec)); DRIInfoPtr inforec = (DRIInfoPtr)xcalloc(1, sizeof(DRIInfoRec));
@ -1605,7 +1605,7 @@ DRICreateInfoRec(void)
return inforec; return inforec;
} }
void _X_EXPORT void
DRIDestroyInfoRec(DRIInfoPtr DRIInfo) DRIDestroyInfoRec(DRIInfoPtr DRIInfo)
{ {
if (DRIInfo->busIdString) xfree(DRIInfo->busIdString); if (DRIInfo->busIdString) xfree(DRIInfo->busIdString);
@ -1613,7 +1613,7 @@ DRIDestroyInfoRec(DRIInfoPtr DRIInfo)
} }
void _X_EXPORT void
DRIWakeupHandler(pointer wakeupData, int result, pointer pReadmask) DRIWakeupHandler(pointer wakeupData, int result, pointer pReadmask)
{ {
int i; int i;
@ -1629,7 +1629,7 @@ DRIWakeupHandler(pointer wakeupData, int result, pointer pReadmask)
} }
} }
void _X_EXPORT void
DRIBlockHandler(pointer blockData, OSTimePtr pTimeout, pointer pReadmask) DRIBlockHandler(pointer blockData, OSTimePtr pTimeout, pointer pReadmask)
{ {
int i; int i;
@ -2156,7 +2156,7 @@ DRIClipNotify(WindowPtr pWin, int dx, int dy)
} }
} }
CARD32 _X_EXPORT CARD32
DRIGetDrawableIndex(WindowPtr pWin) DRIGetDrawableIndex(WindowPtr pWin)
{ {
ScreenPtr pScreen = pWin->drawable.pScreen; ScreenPtr pScreen = pWin->drawable.pScreen;
@ -2190,7 +2190,7 @@ DRIPrintDrawableLock(ScreenPtr pScreen, char *msg)
ErrorF("%s: %d\n", msg, pDRIPriv->pSAREA->drawable_lock.lock); ErrorF("%s: %d\n", msg, pDRIPriv->pSAREA->drawable_lock.lock);
} }
void _X_EXPORT void
DRILock(ScreenPtr pScreen, int flags) DRILock(ScreenPtr pScreen, int flags)
{ {
DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen); DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
@ -2211,7 +2211,7 @@ DRILock(ScreenPtr pScreen, int flags)
(*pDRIPriv->pLockRefCount)++; (*pDRIPriv->pLockRefCount)++;
} }
void _X_EXPORT void
DRIUnlock(ScreenPtr pScreen) DRIUnlock(ScreenPtr pScreen)
{ {
DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen); DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
@ -2236,7 +2236,7 @@ DRIUnlock(ScreenPtr pScreen)
DRM_UNLOCK(pDRIPriv->drmFD, pDRIPriv->pLSAREA, pDRIPriv->myContext); DRM_UNLOCK(pDRIPriv->drmFD, pDRIPriv->pLSAREA, pDRIPriv->myContext);
} }
void * _X_EXPORT void *
DRIGetSAREAPrivate(ScreenPtr pScreen) DRIGetSAREAPrivate(ScreenPtr pScreen)
{ {
DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen); DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
@ -2245,7 +2245,7 @@ DRIGetSAREAPrivate(ScreenPtr pScreen)
return (void *)(((char*)pDRIPriv->pSAREA)+sizeof(XF86DRISAREARec)); return (void *)(((char*)pDRIPriv->pSAREA)+sizeof(XF86DRISAREARec));
} }
drm_context_t _X_EXPORT drm_context_t
DRIGetContext(ScreenPtr pScreen) DRIGetContext(ScreenPtr pScreen)
{ {
DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen); DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
@ -2254,7 +2254,7 @@ DRIGetContext(ScreenPtr pScreen)
return pDRIPriv->myContext; return pDRIPriv->myContext;
} }
void _X_EXPORT void
DRIGetTexOffsetFuncs(ScreenPtr pScreen, DRIGetTexOffsetFuncs(ScreenPtr pScreen,
DRITexOffsetStartProcPtr *texOffsetStartFunc, DRITexOffsetStartProcPtr *texOffsetStartFunc,
DRITexOffsetFinishProcPtr *texOffsetFinishFunc) DRITexOffsetFinishProcPtr *texOffsetFinishFunc)
@ -2278,7 +2278,7 @@ DRIGetWrappedFuncs(ScreenPtr pScreen)
} }
/* note that this returns the library version, not the protocol version */ /* note that this returns the library version, not the protocol version */
void _X_EXPORT void
DRIQueryVersion(int *majorVersion, DRIQueryVersion(int *majorVersion,
int *minorVersion, int *minorVersion,
int *patchVersion) int *patchVersion)
@ -2349,7 +2349,7 @@ DRIAdjustFrame(int scrnIndex, int x, int y, int flags)
* REGION_VALIDATE on it, or better yet, save a copy first. * REGION_VALIDATE on it, or better yet, save a copy first.
*/ */
void _X_EXPORT void
DRIMoveBuffersHelper( DRIMoveBuffersHelper(
ScreenPtr pScreen, ScreenPtr pScreen,
int dx, int dx,
@ -2415,7 +2415,7 @@ DRIMoveBuffersHelper(
} }
char * _X_EXPORT char *
DRICreatePCIBusID(const struct pci_device * dev) DRICreatePCIBusID(const struct pci_device * dev)
{ {
char *busID; char *busID;

10
hw/xfree86/dri2/dri2.c
View File

@ -96,7 +96,7 @@ DRI2GetDrawable(DrawablePtr pDraw)
} }
} }
int _X_EXPORT int
DRI2CreateDrawable(DrawablePtr pDraw) DRI2CreateDrawable(DrawablePtr pDraw)
{ {
WindowPtr pWin; WindowPtr pWin;
@ -134,7 +134,7 @@ DRI2CreateDrawable(DrawablePtr pDraw)
return Success; return Success;
} }
DRI2BufferPtr _X_EXPORT DRI2BufferPtr
DRI2GetBuffers(DrawablePtr pDraw, int *width, int *height, DRI2GetBuffers(DrawablePtr pDraw, int *width, int *height,
unsigned int *attachments, int count, int *out_count) unsigned int *attachments, int count, int *out_count)
{ {
@ -160,7 +160,7 @@ DRI2GetBuffers(DrawablePtr pDraw, int *width, int *height,
return pPriv->buffers; return pPriv->buffers;
} }
int _X_EXPORT int
DRI2CopyRegion(DrawablePtr pDraw, RegionPtr pRegion, DRI2CopyRegion(DrawablePtr pDraw, RegionPtr pRegion,
unsigned int dest, unsigned int src) unsigned int dest, unsigned int src)
{ {
@ -190,7 +190,7 @@ DRI2CopyRegion(DrawablePtr pDraw, RegionPtr pRegion,
return Success; return Success;
} }
void _X_EXPORT void
DRI2DestroyDrawable(DrawablePtr pDraw) DRI2DestroyDrawable(DrawablePtr pDraw)
{ {
DRI2ScreenPtr ds = DRI2GetScreen(pDraw->pScreen); DRI2ScreenPtr ds = DRI2GetScreen(pDraw->pScreen);
@ -221,7 +221,7 @@ DRI2DestroyDrawable(DrawablePtr pDraw)
} }
} }
Bool _X_EXPORT Bool
DRI2Connect(ScreenPtr pScreen, unsigned int driverType, int *fd, DRI2Connect(ScreenPtr pScreen, unsigned int driverType, int *fd,
const char **driverName, const char **deviceName) const char **driverName, const char **deviceName)
{ {

2
hw/xfree86/dummylib/xf86info.c
View File

@ -8,5 +8,5 @@
#include "xf86Priv.h" #include "xf86Priv.h"
/* Dummy variables */ /* Dummy variables */
xf86InfoRec xf86Info; _X_EXPORT xf86InfoRec xf86Info;

14
hw/xfree86/fbdevhw/fbdevhw.c
View File

@ -141,7 +141,7 @@ fbdevHWGetRec(ScrnInfoPtr pScrn)
return TRUE; return TRUE;
} }
void _X_EXPORT void
fbdevHWFreeRec(ScrnInfoPtr pScrn) fbdevHWFreeRec(ScrnInfoPtr pScrn)
{ {
if (fbdevHWPrivateIndex < 0) if (fbdevHWPrivateIndex < 0)
@ -721,7 +721,7 @@ fbdevHWUnmapVidmem(ScrnInfoPtr pScrn)
return TRUE; return TRUE;
} }
void* _X_EXPORT void*
fbdevHWMapMMIO(ScrnInfoPtr pScrn) fbdevHWMapMMIO(ScrnInfoPtr pScrn)
{ {
unsigned int mmio_off; unsigned int mmio_off;
@ -754,7 +754,7 @@ fbdevHWMapMMIO(ScrnInfoPtr pScrn)
return fPtr->mmio; return fPtr->mmio;
} }
Bool _X_EXPORT Bool
fbdevHWUnmapMMIO(ScrnInfoPtr pScrn) fbdevHWUnmapMMIO(ScrnInfoPtr pScrn)
{ {
fbdevHWPtr fPtr = FBDEVHWPTR(pScrn); fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
@ -885,7 +885,7 @@ fbdevHWValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
return MODE_OK; return MODE_OK;
} }
Bool _X_EXPORT Bool
fbdevHWSwitchMode(int scrnIndex, DisplayModePtr mode, int flags) fbdevHWSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
{ {
ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
@ -916,7 +916,7 @@ fbdevHWAdjustFrame(int scrnIndex, int x, int y, int flags)
"FBIOPAN_DISPLAY: %s\n", strerror(errno)); "FBIOPAN_DISPLAY: %s\n", strerror(errno));
} }
Bool _X_EXPORT Bool
fbdevHWEnterVT(int scrnIndex, int flags) fbdevHWEnterVT(int scrnIndex, int flags)
{ {
ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
@ -928,7 +928,7 @@ fbdevHWEnterVT(int scrnIndex, int flags)
return TRUE; return TRUE;
} }
void _X_EXPORT void
fbdevHWLeaveVT(int scrnIndex, int flags) fbdevHWLeaveVT(int scrnIndex, int flags)
{ {
ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
@ -937,7 +937,7 @@ fbdevHWLeaveVT(int scrnIndex, int flags)
fbdevHWRestore(pScrn); fbdevHWRestore(pScrn);
} }
void _X_EXPORT void
fbdevHWDPMSSet(ScrnInfoPtr pScrn, int mode, int flags) fbdevHWDPMSSet(ScrnInfoPtr pScrn, int mode, int flags)
{ {
fbdevHWPtr fPtr = FBDEVHWPTR(pScrn); fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);

14
hw/xfree86/fbdevhw/fbdevhwstub.c
View File

@ -15,7 +15,7 @@ fbdevHWGetRec(ScrnInfoPtr pScrn)
return FALSE; return FALSE;
} }
void _X_EXPORT void
fbdevHWFreeRec(ScrnInfoPtr pScrn) fbdevHWFreeRec(ScrnInfoPtr pScrn)
{ {
} }
@ -98,13 +98,13 @@ fbdevHWUnmapVidmem(ScrnInfoPtr pScrn)
return FALSE; return FALSE;
} }
void* _X_EXPORT void*
fbdevHWMapMMIO(ScrnInfoPtr pScrn) fbdevHWMapMMIO(ScrnInfoPtr pScrn)
{ {
return NULL; return NULL;
} }
Bool _X_EXPORT Bool
fbdevHWUnmapMMIO(ScrnInfoPtr pScrn) fbdevHWUnmapMMIO(ScrnInfoPtr pScrn)
{ {
return FALSE; return FALSE;
@ -138,7 +138,7 @@ fbdevHWValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
return MODE_ERROR; return MODE_ERROR;
} }
Bool _X_EXPORT Bool
fbdevHWSwitchMode(int scrnIndex, DisplayModePtr mode, int flags) fbdevHWSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
{ {
return FALSE; return FALSE;
@ -149,18 +149,18 @@ fbdevHWAdjustFrame(int scrnIndex, int x, int y, int flags)
{ {
} }
Bool _X_EXPORT Bool
fbdevHWEnterVT(int scrnIndex, int flags) fbdevHWEnterVT(int scrnIndex, int flags)
{ {
return FALSE; return FALSE;
} }
void _X_EXPORT void
fbdevHWLeaveVT(int scrnIndex, int flags) fbdevHWLeaveVT(int scrnIndex, int flags)
{ {
} }
void _X_EXPORT void
fbdevHWDPMSSet(ScrnInfoPtr pScrn, int mode, int flags) fbdevHWDPMSSet(ScrnInfoPtr pScrn, int mode, int flags)
{ {
} }

2
hw/xfree86/i2c/msp3430.c
View File

@ -106,7 +106,7 @@ xf86DrvMsg(m->d.pI2CBus->scrnIndex, X_INFO, "MSP34xx: control=0x%02x%02x\n",
#endif #endif
/* wrapper */ /* wrapper */
void InitMSP3430(MSP3430Ptr m) _X_EXPORT void InitMSP3430(MSP3430Ptr m)
{ {
#if __MSPDEBUG__ > 1 #if __MSPDEBUG__ > 1
xf86DrvMsg(m->d.pI2CBus->scrnIndex,X_INFO,"InitMSP3430(m->connector=%d, m->standard=%d, m->chip_family=%d)\n", xf86DrvMsg(m->d.pI2CBus->scrnIndex,X_INFO,"InitMSP3430(m->connector=%d, m->standard=%d, m->chip_family=%d)\n",

16
hw/xfree86/i2c/xf86i2c.c
View File

@ -460,7 +460,7 @@ xf86I2CReadStatus(I2CDevPtr d, I2CByte *pbyte)
/* Read a byte from one of the registers determined by its sub-address. /* Read a byte from one of the registers determined by its sub-address.
*/ */
Bool _X_EXPORT Bool
xf86I2CReadByte(I2CDevPtr d, I2CByte subaddr, I2CByte *pbyte) xf86I2CReadByte(I2CDevPtr d, I2CByte subaddr, I2CByte *pbyte)
{ {
return xf86I2CWriteRead(d, &subaddr, 1, pbyte, 1); return xf86I2CWriteRead(d, &subaddr, 1, pbyte, 1);
@ -470,7 +470,7 @@ xf86I2CReadByte(I2CDevPtr d, I2CByte subaddr, I2CByte *pbyte)
* sub-address of the first register. * sub-address of the first register.
*/ */
Bool _X_EXPORT Bool
xf86I2CReadBytes(I2CDevPtr d, I2CByte subaddr, I2CByte *pbyte, int n) xf86I2CReadBytes(I2CDevPtr d, I2CByte subaddr, I2CByte *pbyte, int n)
{ {
return xf86I2CWriteRead(d, &subaddr, 1, pbyte, n); return xf86I2CWriteRead(d, &subaddr, 1, pbyte, n);
@ -495,7 +495,7 @@ xf86I2CReadWord(I2CDevPtr d, I2CByte subaddr, unsigned short *pword)
/* Write a byte to one of the registers determined by its sub-address. /* Write a byte to one of the registers determined by its sub-address.
*/ */
Bool _X_EXPORT Bool
xf86I2CWriteByte(I2CDevPtr d, I2CByte subaddr, I2CByte byte) xf86I2CWriteByte(I2CDevPtr d, I2CByte subaddr, I2CByte byte)
{ {
I2CByte wb[2]; I2CByte wb[2];
@ -555,7 +555,7 @@ xf86I2CWriteWord(I2CDevPtr d, I2CByte subaddr, unsigned short word)
* remain uninitialized. * remain uninitialized.
*/ */
Bool _X_EXPORT Bool
xf86I2CWriteVec(I2CDevPtr d, I2CByte *vec, int nValues) xf86I2CWriteVec(I2CDevPtr d, I2CByte *vec, int nValues)
{ {
I2CBusPtr b = d->pI2CBus; I2CBusPtr b = d->pI2CBus;
@ -605,7 +605,7 @@ xf86CreateI2CDevRec(void)
* you should set <unalloc> to free it. * you should set <unalloc> to free it.
*/ */
void _X_EXPORT void
xf86DestroyI2CDevRec(I2CDevPtr d, Bool unalloc) xf86DestroyI2CDevRec(I2CDevPtr d, Bool unalloc)
{ {
if (d) { if (d) {
@ -666,7 +666,7 @@ xf86I2CDevInit(I2CDevPtr d)
return TRUE; return TRUE;
} }
I2CDevPtr _X_EXPORT I2CDevPtr
xf86I2CFindDev(I2CBusPtr b, I2CSlaveAddr addr) xf86I2CFindDev(I2CBusPtr b, I2CSlaveAddr addr)
{ {
I2CDevPtr d; I2CDevPtr d;
@ -822,7 +822,7 @@ xf86I2CBusInit(I2CBusPtr b)
return TRUE; return TRUE;
} }
I2CBusPtr _X_EXPORT I2CBusPtr
xf86I2CFindBus(int scrnIndex, char *name) xf86I2CFindBus(int scrnIndex, char *name)
{ {
I2CBusPtr p; I2CBusPtr p;
@ -840,7 +840,7 @@ xf86I2CFindBus(int scrnIndex, char *name)
* Return an array of I2CBusPtr's related to a screen. The caller is * Return an array of I2CBusPtr's related to a screen. The caller is
* responsible for freeing the array. * responsible for freeing the array.
*/ */
int _X_EXPORT int
xf86I2CGetScreenBuses(int scrnIndex, I2CBusPtr **pppI2CBus) xf86I2CGetScreenBuses(int scrnIndex, I2CBusPtr **pppI2CBus)
{ {
I2CBusPtr pI2CBus; I2CBusPtr pI2CBus;

2
hw/xfree86/int10/helper_exec.c
View File

@ -724,7 +724,7 @@ xf86Int10SaveRestoreBIOSVars(xf86Int10InfoPtr pInt, Bool save)
} }
#endif #endif
xf86Int10InfoPtr _X_EXPORT xf86Int10InfoPtr
xf86InitInt10(int entityIndex) xf86InitInt10(int entityIndex)
{ {
return xf86ExtendedInitInt10(entityIndex, 0); return xf86ExtendedInitInt10(entityIndex, 0);

2
hw/xfree86/int10/stub.c
View File

@ -13,7 +13,7 @@
#define _INT10_PRIVATE #define _INT10_PRIVATE
#include "xf86int10.h" #include "xf86int10.h"
xf86Int10InfoPtr _X_EXPORT xf86Int10InfoPtr
xf86InitInt10(int entityIndex) xf86InitInt10(int entityIndex)
{ {
return xf86ExtendedInitInt10(entityIndex, 0); return xf86ExtendedInitInt10(entityIndex, 0);

8
hw/xfree86/modes/xf86Crtc.c
View File

@ -53,7 +53,7 @@
* Initialize xf86CrtcConfig structure * Initialize xf86CrtcConfig structure
*/ */
int xf86CrtcConfigPrivateIndex = -1; _X_EXPORT int xf86CrtcConfigPrivateIndex = -1;
_X_EXPORT void _X_EXPORT void
xf86CrtcConfigInit (ScrnInfoPtr scrn, xf86CrtcConfigInit (ScrnInfoPtr scrn,
@ -2913,7 +2913,7 @@ xf86_crtc_clip_video_helper(ScrnInfoPtr pScrn,
return ret; return ret;
} }
xf86_crtc_notify_proc_ptr _X_EXPORT xf86_crtc_notify_proc_ptr
xf86_wrap_crtc_notify (ScreenPtr screen, xf86_crtc_notify_proc_ptr new) xf86_wrap_crtc_notify (ScreenPtr screen, xf86_crtc_notify_proc_ptr new)
{ {
ScrnInfoPtr scrn = xf86Screens[screen->myNum]; ScrnInfoPtr scrn = xf86Screens[screen->myNum];
@ -2925,7 +2925,7 @@ xf86_wrap_crtc_notify (ScreenPtr screen, xf86_crtc_notify_proc_ptr new)
return old; return old;
} }
void _X_EXPORT void
xf86_unwrap_crtc_notify(ScreenPtr screen, xf86_crtc_notify_proc_ptr old) xf86_unwrap_crtc_notify(ScreenPtr screen, xf86_crtc_notify_proc_ptr old)
{ {
ScrnInfoPtr scrn = xf86Screens[screen->myNum]; ScrnInfoPtr scrn = xf86Screens[screen->myNum];
@ -2934,7 +2934,7 @@ xf86_unwrap_crtc_notify(ScreenPtr screen, xf86_crtc_notify_proc_ptr old)
config->xf86_crtc_notify = old; config->xf86_crtc_notify = old;
} }
void _X_EXPORT void
xf86_crtc_notify(ScreenPtr screen) xf86_crtc_notify(ScreenPtr screen)
{ {
ScrnInfoPtr scrn = xf86Screens[screen->myNum]; ScrnInfoPtr scrn = xf86Screens[screen->myNum];

2
hw/xfree86/modes/xf86EdidModes.c
View File

@ -693,7 +693,7 @@ xf86DDCDetectQuirks(int scrnIndex, xf86MonPtr DDC, Bool verbose)
* Note that some quirks applying to the mode list are still implemented in * Note that some quirks applying to the mode list are still implemented in
* xf86DDCGetModes. * xf86DDCGetModes.
*/ */
void _X_EXPORT void
xf86DDCApplyQuirks(int scrnIndex, xf86MonPtr DDC) xf86DDCApplyQuirks(int scrnIndex, xf86MonPtr DDC)
{ {
ddc_quirk_t quirks = xf86DDCDetectQuirks (scrnIndex, DDC, FALSE); ddc_quirk_t quirks = xf86DDCDetectQuirks (scrnIndex, DDC, FALSE);

2
hw/xfree86/parser/Flags.c
View File

@ -232,7 +232,7 @@ xf86freeFlags (XF86ConfFlagsPtr flags)
xf86conffree (flags); xf86conffree (flags);
} }
XF86OptionPtr _X_EXPORT XF86OptionPtr
xf86optionListDup (XF86OptionPtr opt) xf86optionListDup (XF86OptionPtr opt)
{ {
XF86OptionPtr newopt = NULL; XF86OptionPtr newopt = NULL;

2
hw/xfree86/ramdac/BT.c
View File

@ -65,7 +65,7 @@ BTramdacSave(ScrnInfoPtr pScrn, RamDacRecPtr ramdacPtr,
ramdacReg->DacRegs[i] = (*ramdacPtr->ReadDAC)(pScrn, i); ramdacReg->DacRegs[i] = (*ramdacPtr->ReadDAC)(pScrn, i);
} }
RamDacHelperRecPtr _X_EXPORT RamDacHelperRecPtr
BTramdacProbe(ScrnInfoPtr pScrn, RamDacSupportedInfoRecPtr ramdacs/*, RamDacRecPtr ramdacPtr*/) BTramdacProbe(ScrnInfoPtr pScrn, RamDacSupportedInfoRecPtr ramdacs/*, RamDacRecPtr ramdacPtr*/)
{ {
RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn); RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn);

8
hw/xfree86/ramdac/IBM.c
View File

@ -39,7 +39,7 @@
#define INITIALFREQERR 100000 #define INITIALFREQERR 100000
unsigned long _X_EXPORT unsigned long
IBMramdac640CalculateMNPCForClock( IBMramdac640CalculateMNPCForClock(
unsigned long RefClock, /* In 100Hz units */ unsigned long RefClock, /* In 100Hz units */
unsigned long ReqClock, /* In 100Hz units */ unsigned long ReqClock, /* In 100Hz units */
@ -105,7 +105,7 @@ IBMramdac640CalculateMNPCForClock(
return (ActualClock); return (ActualClock);
} }
unsigned long _X_EXPORT unsigned long
IBMramdac526CalculateMNPCForClock( IBMramdac526CalculateMNPCForClock(
unsigned long RefClock, /* In 100Hz units */ unsigned long RefClock, /* In 100Hz units */
unsigned long ReqClock, /* In 100Hz units */ unsigned long ReqClock, /* In 100Hz units */
@ -225,7 +225,7 @@ IBMramdacSave(ScrnInfoPtr pScrn, RamDacRecPtr ramdacPtr,
ramdacReg->DacRegs[i] = (*ramdacPtr->ReadDAC)(pScrn, i); ramdacReg->DacRegs[i] = (*ramdacPtr->ReadDAC)(pScrn, i);
} }
RamDacHelperRecPtr _X_EXPORT RamDacHelperRecPtr
IBMramdacProbe(ScrnInfoPtr pScrn, RamDacSupportedInfoRecPtr ramdacs/* , RamDacRecPtr ramdacPtr*/) IBMramdacProbe(ScrnInfoPtr pScrn, RamDacSupportedInfoRecPtr ramdacs/* , RamDacRecPtr ramdacPtr*/)
{ {
RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn); RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn);
@ -376,7 +376,7 @@ IBMramdac526SetBpp(ScrnInfoPtr pScrn, RamDacRegRecPtr ramdacReg)
} }
} }
IBMramdac526SetBppProc *IBMramdac526SetBppWeak(void) { _X_EXPORT IBMramdac526SetBppProc *IBMramdac526SetBppWeak(void) {
return IBMramdac526SetBpp; return IBMramdac526SetBpp;
} }

6
hw/xfree86/ramdac/TI.c
View File

@ -42,7 +42,7 @@
#define TI_MIN_VCO_FREQ 110000 #define TI_MIN_VCO_FREQ 110000
#define TI_MAX_VCO_FREQ 220000 #define TI_MAX_VCO_FREQ 220000
unsigned long _X_EXPORT unsigned long
TIramdacCalculateMNPForClock( TIramdacCalculateMNPForClock(
unsigned long RefClock, /* In 100Hz units */ unsigned long RefClock, /* In 100Hz units */
unsigned long ReqClock, /* In 100Hz units */ unsigned long ReqClock, /* In 100Hz units */
@ -280,7 +280,7 @@ TIramdacSave(ScrnInfoPtr pScrn, RamDacRecPtr ramdacPtr,
TISAVE(TIDAC_ind_curs_ctrl); TISAVE(TIDAC_ind_curs_ctrl);
} }
RamDacHelperRecPtr _X_EXPORT RamDacHelperRecPtr
TIramdacProbe(ScrnInfoPtr pScrn, RamDacSupportedInfoRecPtr ramdacs) TIramdacProbe(ScrnInfoPtr pScrn, RamDacSupportedInfoRecPtr ramdacs)
{ {
RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn); RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn);
@ -714,6 +714,6 @@ void TIramdacLoadPalette(
} }
} }
TIramdacLoadPaletteProc *TIramdacLoadPaletteWeak(void) { _X_EXPORT TIramdacLoadPaletteProc *TIramdacLoadPaletteWeak(void) {
return TIramdacLoadPalette; return TIramdacLoadPalette;
} }

8
hw/xfree86/ramdac/xf86Cursor.c
View File

@ -52,7 +52,7 @@ static void xf86CursorQueryBestSize(int, unsigned short*, unsigned short*,
static void xf86CursorEnableDisableFBAccess(int, Bool); static void xf86CursorEnableDisableFBAccess(int, Bool);
static Bool xf86CursorSwitchMode(int, DisplayModePtr,int); static Bool xf86CursorSwitchMode(int, DisplayModePtr,int);
Bool _X_EXPORT Bool
xf86InitCursor( xf86InitCursor(
ScreenPtr pScreen, ScreenPtr pScreen,
xf86CursorInfoPtr infoPtr xf86CursorInfoPtr infoPtr
@ -394,7 +394,7 @@ xf86CursorMoveCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
(*ScreenPriv->spriteFuncs->MoveCursor)(pDev, pScreen, x, y); (*ScreenPriv->spriteFuncs->MoveCursor)(pDev, pScreen, x, y);
} }
void _X_EXPORT void
xf86ForceHWCursor (ScreenPtr pScreen, Bool on) xf86ForceHWCursor (ScreenPtr pScreen, Bool on)
{ {
DeviceIntPtr pDev = inputInfo.pointer; DeviceIntPtr pDev = inputInfo.pointer;
@ -426,13 +426,13 @@ xf86ForceHWCursor (ScreenPtr pScreen, Bool on)
} }
} }
xf86CursorInfoPtr _X_EXPORT xf86CursorInfoPtr
xf86CreateCursorInfoRec(void) xf86CreateCursorInfoRec(void)
{ {
return xcalloc(1, sizeof(xf86CursorInfoRec)); return xcalloc(1, sizeof(xf86CursorInfoRec));
} }
void _X_EXPORT void
xf86DestroyCursorInfoRec(xf86CursorInfoPtr infoPtr) xf86DestroyCursorInfoRec(xf86CursorInfoPtr infoPtr)
{ {
xfree(infoPtr); xfree(infoPtr);

12
hw/xfree86/ramdac/xf86RamDac.c
View File

@ -36,7 +36,7 @@
int RamDacHWPrivateIndex = -1; int RamDacHWPrivateIndex = -1;
int RamDacScreenPrivateIndex = -1; int RamDacScreenPrivateIndex = -1;
RamDacRecPtr _X_EXPORT RamDacRecPtr
RamDacCreateInfoRec() RamDacCreateInfoRec()
{ {
RamDacRecPtr infoRec; RamDacRecPtr infoRec;
@ -46,7 +46,7 @@ RamDacCreateInfoRec()
return infoRec; return infoRec;
} }
RamDacHelperRecPtr _X_EXPORT RamDacHelperRecPtr
RamDacHelperCreateInfoRec() RamDacHelperCreateInfoRec()
{ {
RamDacHelperRecPtr infoRec; RamDacHelperRecPtr infoRec;
@ -56,7 +56,7 @@ RamDacHelperCreateInfoRec()
return infoRec; return infoRec;
} }
void _X_EXPORT void
RamDacDestroyInfoRec(RamDacRecPtr infoRec) RamDacDestroyInfoRec(RamDacRecPtr infoRec)
{ {
xfree(infoRec); xfree(infoRec);
@ -68,7 +68,7 @@ RamDacHelperDestroyInfoRec(RamDacHelperRecPtr infoRec)
xfree(infoRec); xfree(infoRec);
} }
Bool _X_EXPORT Bool
RamDacInit(ScrnInfoPtr pScrn, RamDacRecPtr ramdacPriv) RamDacInit(ScrnInfoPtr pScrn, RamDacRecPtr ramdacPriv)
{ {
RamDacScreenRecPtr ramdacScrPtr; RamDacScreenRecPtr ramdacScrPtr;
@ -116,7 +116,7 @@ RamDacGetRec(ScrnInfoPtr scrp)
return TRUE; return TRUE;
} }
void _X_EXPORT void
RamDacFreeRec(ScrnInfoPtr pScrn) RamDacFreeRec(ScrnInfoPtr pScrn)
{ {
RamDacHWRecPtr ramdacHWPtr; RamDacHWRecPtr ramdacHWPtr;
@ -141,7 +141,7 @@ RamDacFreeRec(ScrnInfoPtr pScrn)
ramdacScrPtr = NULL; ramdacScrPtr = NULL;
} }
int _X_EXPORT int
RamDacGetHWIndex() RamDacGetHWIndex()
{ {
return RamDacHWPrivateIndex; return RamDacHWPrivateIndex;

2
hw/xfree86/ramdac/xf86RamDacCmap.c
View File

@ -58,7 +58,7 @@ RamDacLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices, LOCO *colors,
} }
} }
Bool _X_EXPORT Bool
RamDacHandleColormaps(ScreenPtr pScreen, int maxColors, int sigRGBbits, RamDacHandleColormaps(ScreenPtr pScreen, int maxColors, int sigRGBbits,
unsigned int flags) unsigned int flags)
{ {

4
hw/xfree86/shadowfb/shadow.c
View File

@ -159,7 +159,7 @@ static DevPrivateKey ShadowGCKey = &ShadowGCKeyIndex;
Bool _X_EXPORT Bool
ShadowFBInit2 ( ShadowFBInit2 (
ScreenPtr pScreen, ScreenPtr pScreen,
RefreshAreaFuncPtr preRefreshArea, RefreshAreaFuncPtr preRefreshArea,
@ -212,7 +212,7 @@ ShadowFBInit2 (
return TRUE; return TRUE;
} }
Bool _X_EXPORT Bool
ShadowFBInit ( ShadowFBInit (
ScreenPtr pScreen, ScreenPtr pScreen,
RefreshAreaFuncPtr refreshArea RefreshAreaFuncPtr refreshArea

8
hw/xfree86/vbe/vbe.c
View File

@ -41,7 +41,7 @@ static Bool vbeProbeDDC(vbeInfoPtr pVbe);
static const char vbeVersionString[] = "VBE2"; static const char vbeVersionString[] = "VBE2";
vbeInfoPtr _X_EXPORT vbeInfoPtr
VBEInit(xf86Int10InfoPtr pInt, int entityIndex) VBEInit(xf86Int10InfoPtr pInt, int entityIndex)
{ {
return VBEExtendedInit(pInt, entityIndex, 0); return VBEExtendedInit(pInt, entityIndex, 0);
@ -423,7 +423,7 @@ VBEGetVBEInfo(vbeInfoPtr pVbe)
return (block); return (block);
} }
void _X_EXPORT void
VBEFreeVBEInfo(VbeInfoBlock *block) VBEFreeVBEInfo(VbeInfoBlock *block)
{ {
xfree(block->OEMStringPtr); xfree(block->OEMStringPtr);
@ -501,7 +501,7 @@ VBEGetVBEMode(vbeInfoPtr pVbe, int *mode)
return (FALSE); return (FALSE);
} }
VbeModeInfoBlock * _X_EXPORT VbeModeInfoBlock *
VBEGetModeInfo(vbeInfoPtr pVbe, int mode) VBEGetModeInfo(vbeInfoPtr pVbe, int mode)
{ {
VbeModeInfoBlock *block = NULL; VbeModeInfoBlock *block = NULL;
@ -596,7 +596,7 @@ VBEGetModeInfo(vbeInfoPtr pVbe, int mode)
return (block); return (block);
} }
void _X_EXPORT void
VBEFreeModeInfo(VbeModeInfoBlock *block) VBEFreeModeInfo(VbeModeInfoBlock *block)
{ {
xfree(block); xfree(block);

63
hw/xfree86/vgahw/vgaHW.c
View File

@ -328,7 +328,7 @@ stdWriteEnable(vgaHWPtr hwp, CARD8 value)
outb(hwp->PIOOffset + VGA_ENABLE, value); outb(hwp->PIOOffset + VGA_ENABLE, value);
} }
void _X_EXPORT void
vgaHWSetStdFuncs(vgaHWPtr hwp) vgaHWSetStdFuncs(vgaHWPtr hwp)
{ {
hwp->writeCrtc = stdWriteCrtc; hwp->writeCrtc = stdWriteCrtc;
@ -535,7 +535,7 @@ mmioWriteEnable(vgaHWPtr hwp, CARD8 value)
moutb(VGA_ENABLE, value); moutb(VGA_ENABLE, value);
} }
void _X_EXPORT void
vgaHWSetMmioFuncs(vgaHWPtr hwp, CARD8 *base, int offset) vgaHWSetMmioFuncs(vgaHWPtr hwp, CARD8 *base, int offset)
{ {
hwp->writeCrtc = mmioWriteCrtc; hwp->writeCrtc = mmioWriteCrtc;
@ -571,7 +571,7 @@ vgaHWSetMmioFuncs(vgaHWPtr hwp, CARD8 *base, int offset)
* Protect VGA registers and memory from corruption during loads. * Protect VGA registers and memory from corruption during loads.
*/ */
void _X_EXPORT void
vgaHWProtect(ScrnInfoPtr pScrn, Bool on) vgaHWProtect(ScrnInfoPtr pScrn, Bool on)
{ {
vgaHWPtr hwp = VGAHWPTR(pScrn); vgaHWPtr hwp = VGAHWPTR(pScrn);
@ -604,7 +604,7 @@ vgaHWProtect(ScrnInfoPtr pScrn, Bool on)
} }
} }
vgaHWProtectProc *vgaHWProtectWeak(void) { _X_EXPORT vgaHWProtectProc *vgaHWProtectWeak(void) {
return vgaHWProtect; return vgaHWProtect;
} }
@ -612,7 +612,7 @@ vgaHWProtectProc *vgaHWProtectWeak(void) {
* vgaHWBlankScreen -- blank the screen. * vgaHWBlankScreen -- blank the screen.
*/ */
void _X_EXPORT void
vgaHWBlankScreen(ScrnInfoPtr pScrn, Bool on) vgaHWBlankScreen(ScrnInfoPtr pScrn, Bool on)
{ {
vgaHWPtr hwp = VGAHWPTR(pScrn); vgaHWPtr hwp = VGAHWPTR(pScrn);
@ -631,7 +631,7 @@ vgaHWBlankScreen(ScrnInfoPtr pScrn, Bool on)
vgaHWSeqReset(hwp, FALSE); vgaHWSeqReset(hwp, FALSE);
} }
vgaHWBlankScreenProc *vgaHWBlankScreenWeak(void) { _X_EXPORT vgaHWBlankScreenProc *vgaHWBlankScreenWeak(void) {
return vgaHWBlankScreen; return vgaHWBlankScreen;
} }
@ -639,7 +639,7 @@ vgaHWBlankScreenProc *vgaHWBlankScreenWeak(void) {
* vgaHWSaveScreen -- blank the screen. * vgaHWSaveScreen -- blank the screen.
*/ */
Bool _X_EXPORT Bool
vgaHWSaveScreen(ScreenPtr pScreen, int mode) vgaHWSaveScreen(ScreenPtr pScreen, int mode)
{ {
ScrnInfoPtr pScrn = NULL; ScrnInfoPtr pScrn = NULL;
@ -670,7 +670,7 @@ vgaHWSaveScreen(ScreenPtr pScreen, int mode)
* for this function must be written. * for this function must be written.
*/ */
void _X_EXPORT void
vgaHWDPMSSet(ScrnInfoPtr pScrn, int PowerManagementMode, int flags) vgaHWDPMSSet(ScrnInfoPtr pScrn, int PowerManagementMode, int flags)
{ {
unsigned char seq1 = 0, crtc17 = 0; unsigned char seq1 = 0, crtc17 = 0;
@ -715,7 +715,7 @@ vgaHWDPMSSet(ScrnInfoPtr pScrn, int PowerManagementMode, int flags)
* perform a sequencer reset. * perform a sequencer reset.
*/ */
void _X_EXPORT void
vgaHWSeqReset(vgaHWPtr hwp, Bool start) vgaHWSeqReset(vgaHWPtr hwp, Bool start)
{ {
if (start) if (start)
@ -897,7 +897,7 @@ vgaHWRestoreColormap(ScrnInfoPtr scrninfp, vgaRegPtr restore)
* restore the VGA state * restore the VGA state
*/ */
void _X_EXPORT void
vgaHWRestore(ScrnInfoPtr scrninfp, vgaRegPtr restore, int flags) vgaHWRestore(ScrnInfoPtr scrninfp, vgaRegPtr restore, int flags)
{ {
if (flags & VGA_SR_MODE) if (flags & VGA_SR_MODE)
@ -1156,7 +1156,7 @@ vgaHWSaveColormap(ScrnInfoPtr scrninfp, vgaRegPtr save)
* save the current VGA state * save the current VGA state
*/ */
void _X_EXPORT void
vgaHWSave(ScrnInfoPtr scrninfp, vgaRegPtr save, int flags) vgaHWSave(ScrnInfoPtr scrninfp, vgaRegPtr save, int flags)
{ {
if (save == NULL) if (save == NULL)
@ -1179,7 +1179,7 @@ vgaHWSave(ScrnInfoPtr scrninfp, vgaRegPtr save, int flags)
* Return FALSE on failure. * Return FALSE on failure.
*/ */
Bool _X_EXPORT Bool
vgaHWInit(ScrnInfoPtr scrninfp, DisplayModePtr mode) vgaHWInit(ScrnInfoPtr scrninfp, DisplayModePtr mode)
{ {
unsigned int i; unsigned int i;
@ -1399,7 +1399,7 @@ vgaHWInit(ScrnInfoPtr scrninfp, DisplayModePtr mode)
* -- TSI @ UQV, 1998.08.21 * -- TSI @ UQV, 1998.08.21
*/ */
CARD32 _X_EXPORT CARD32
vgaHWHBlankKGA(DisplayModePtr mode, vgaRegPtr regp, int nBits, vgaHWHBlankKGA(DisplayModePtr mode, vgaRegPtr regp, int nBits,
unsigned int Flags) unsigned int Flags)
{ {
@ -1440,7 +1440,7 @@ vgaHWHBlankKGA(DisplayModePtr mode, vgaRegPtr regp, int nBits,
* very first scanline in a double- or multi-scanned mode. This last case * very first scanline in a double- or multi-scanned mode. This last case
* needs further investigation. * needs further investigation.
*/ */
CARD32 _X_EXPORT CARD32
vgaHWVBlankKGA(DisplayModePtr mode, vgaRegPtr regp, int nBits, vgaHWVBlankKGA(DisplayModePtr mode, vgaRegPtr regp, int nBits,
unsigned int Flags) unsigned int Flags)
{ {
@ -1532,7 +1532,7 @@ vgaHWAllocRegs(vgaRegPtr regp)
} }
Bool _X_EXPORT Bool
vgaHWAllocDefaultRegs(vgaRegPtr regp) vgaHWAllocDefaultRegs(vgaRegPtr regp)
{ {
regp->numCRTC = VGA_NUM_CRTC; regp->numCRTC = VGA_NUM_CRTC;
@ -1614,7 +1614,7 @@ vgaHWSetRegCounts(ScrnInfoPtr scrp, int numCRTC, int numSequencer,
} }
Bool _X_EXPORT Bool
vgaHWCopyReg(vgaRegPtr dst, vgaRegPtr src) vgaHWCopyReg(vgaRegPtr dst, vgaRegPtr src)
{ {
vgaHWFreeRegs(dst); vgaHWFreeRegs(dst);
@ -1633,7 +1633,7 @@ vgaHWCopyReg(vgaRegPtr dst, vgaRegPtr src)
} }
Bool _X_EXPORT Bool
vgaHWGetHWRec(ScrnInfoPtr scrp) vgaHWGetHWRec(ScrnInfoPtr scrp)
{ {
vgaRegPtr regp; vgaRegPtr regp;
@ -1729,7 +1729,7 @@ vgaHWGetHWRec(ScrnInfoPtr scrp)
} }
void _X_EXPORT void
vgaHWFreeHWRec(ScrnInfoPtr scrp) vgaHWFreeHWRec(ScrnInfoPtr scrp)
{ {
if (vgaHWPrivateIndex >= 0) { if (vgaHWPrivateIndex >= 0) {
@ -1751,7 +1751,7 @@ vgaHWFreeHWRec(ScrnInfoPtr scrp)
} }
Bool _X_EXPORT Bool
vgaHWMapMem(ScrnInfoPtr scrp) vgaHWMapMem(ScrnInfoPtr scrp)
{ {
vgaHWPtr hwp = VGAHWPTR(scrp); vgaHWPtr hwp = VGAHWPTR(scrp);
@ -1781,7 +1781,7 @@ vgaHWMapMem(ScrnInfoPtr scrp)
} }
void _X_EXPORT void
vgaHWUnmapMem(ScrnInfoPtr scrp) vgaHWUnmapMem(ScrnInfoPtr scrp)
{ {
vgaHWPtr hwp = VGAHWPTR(scrp); vgaHWPtr hwp = VGAHWPTR(scrp);
@ -1797,14 +1797,14 @@ vgaHWUnmapMem(ScrnInfoPtr scrp)
hwp->Base = NULL; hwp->Base = NULL;
} }
int _X_EXPORT int
vgaHWGetIndex() vgaHWGetIndex()
{ {
return vgaHWPrivateIndex; return vgaHWPrivateIndex;
} }
void _X_EXPORT void
vgaHWGetIOBase(vgaHWPtr hwp) vgaHWGetIOBase(vgaHWPtr hwp)
{ {
hwp->IOBase = (hwp->readMiscOut(hwp) & 0x01) ? hwp->IOBase = (hwp->readMiscOut(hwp) & 0x01) ?
@ -1815,14 +1815,14 @@ vgaHWGetIOBase(vgaHWPtr hwp)
} }
void _X_EXPORT void
vgaHWLock(vgaHWPtr hwp) vgaHWLock(vgaHWPtr hwp)
{ {
/* Protect CRTC[0-7] */ /* Protect CRTC[0-7] */
hwp->writeCrtc(hwp, 0x11, hwp->readCrtc(hwp, 0x11) | 0x80); hwp->writeCrtc(hwp, 0x11, hwp->readCrtc(hwp, 0x11) | 0x80);
} }
void _X_EXPORT void
vgaHWUnlock(vgaHWPtr hwp) vgaHWUnlock(vgaHWPtr hwp)
{ {
/* Unprotect CRTC[0-7] */ /* Unprotect CRTC[0-7] */
@ -1830,7 +1830,7 @@ vgaHWUnlock(vgaHWPtr hwp)
} }
void _X_EXPORT void
vgaHWEnable(vgaHWPtr hwp) vgaHWEnable(vgaHWPtr hwp)
{ {
hwp->writeEnable(hwp, hwp->readEnable(hwp) | 0x01); hwp->writeEnable(hwp, hwp->readEnable(hwp) | 0x01);
@ -1897,7 +1897,7 @@ vgaHWSetOverscan(ScrnInfoPtr pScrn, int overscan)
} }
Bool _X_EXPORT Bool
vgaHWHandleColormaps(ScreenPtr pScreen) vgaHWHandleColormaps(ScreenPtr pScreen)
{ {
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
@ -1999,6 +1999,13 @@ vgaHWddc1SetSpeed(ScrnInfoPtr pScrn, xf86ddcSpeed speed)
} }
} }
DDC1SetSpeedProc vgaHWddc1SetSpeedWeak(void) { return vgaHWddc1SetSpeed; } _X_EXPORT DDC1SetSpeedProc
vgaHWddc1SetSpeedWeak(void)
{
return vgaHWddc1SetSpeed;
}
SaveScreenProcPtr vgaHWSaveScreenWeak(void) { return vgaHWSaveScreen; } _X_EXPORT SaveScreenProcPtr vgaHWSaveScreenWeak(void)
{
return vgaHWSaveScreen;
}

3
hw/xfree86/xaa/xaaBitOrder.c
View File

@ -4,9 +4,10 @@
#endif #endif
#include <X11/Xmd.h> #include <X11/Xmd.h>
#include <X11/Xfuncproto.h>
CARD32 XAAReverseBitOrder(CARD32 v); CARD32 XAAReverseBitOrder(CARD32 v);
CARD32 _X_EXPORT CARD32
XAAReverseBitOrder(CARD32 v) XAAReverseBitOrder(CARD32 v)
{ {
return (((0x01010101 & v) << 7) | ((0x02020202 & v) << 5) | return (((0x01010101 & v) << 7) | ((0x02020202 & v) << 5) |

2
hw/xfree86/xaa/xaaFallback.c
View File

@ -346,7 +346,7 @@ GCOps XAAFallbackOps = {
{NULL} /* devPrivate */ {NULL} /* devPrivate */
}; };
GCOps *XAAGetFallbackOps(void) _X_EXPORT GCOps *XAAGetFallbackOps(void)
{ {
return &XAAFallbackOps; return &XAAFallbackOps;
} }

2
hw/xfree86/xaa/xaaFillRect.c
View File

@ -372,7 +372,7 @@ XAARenderPixmapCopyRects(
| Solid | | Solid |
\************/ \************/
void _X_EXPORT void
XAAFillSolidRects( XAAFillSolidRects(
ScrnInfoPtr pScrn, ScrnInfoPtr pScrn,
int fg, int rop, int fg, int rop,

2
hw/xfree86/xaa/xaaImage.c
View File

@ -38,7 +38,7 @@ void XAAMoveDWORDS_FixedBase(
*dest = *(src + 2); *dest = *(src + 2);
} }
void XAAMoveDWORDS( _X_EXPORT void XAAMoveDWORDS(
register CARD32* dest, register CARD32* dest,
register CARD32* src, register CARD32* src,
register int dwords ) register int dwords )

10
hw/xfree86/xaa/xaaInit.c
View File

@ -49,11 +49,11 @@ static DevPrivateKey XAAGCKey = &XAAGCKeyIndex;
static int XAAPixmapKeyIndex; static int XAAPixmapKeyIndex;
static DevPrivateKey XAAPixmapKey = &XAAPixmapKeyIndex; static DevPrivateKey XAAPixmapKey = &XAAPixmapKeyIndex;
DevPrivateKey XAAGetScreenKey(void) { _X_EXPORT DevPrivateKey XAAGetScreenKey(void) {
return XAAScreenKey; return XAAScreenKey;
} }
DevPrivateKey XAAGetGCKey(void) { _X_EXPORT DevPrivateKey XAAGetGCKey(void) {
return XAAGCKey; return XAAGCKey;
} }
@ -64,7 +64,7 @@ DevPrivateKey XAAGetPixmapKey(void) {
/* temp kludge */ /* temp kludge */
static Bool SwitchedOut = FALSE; static Bool SwitchedOut = FALSE;
XAAInfoRecPtr _X_EXPORT XAAInfoRecPtr
XAACreateInfoRec() XAACreateInfoRec()
{ {
XAAInfoRecPtr infoRec; XAAInfoRecPtr infoRec;
@ -76,7 +76,7 @@ XAACreateInfoRec()
return infoRec; return infoRec;
} }
void _X_EXPORT void
XAADestroyInfoRec(XAAInfoRecPtr infoRec) XAADestroyInfoRec(XAAInfoRecPtr infoRec)
{ {
if(!infoRec) return; if(!infoRec) return;
@ -94,7 +94,7 @@ XAADestroyInfoRec(XAAInfoRecPtr infoRec)
} }
Bool _X_EXPORT Bool
XAAInit(ScreenPtr pScreen, XAAInfoRecPtr infoRec) XAAInit(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
{ {
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];

2
hw/xfree86/xaa/xaaLine.c
View File

@ -18,7 +18,7 @@
#include "xaalocal.h" #include "xaalocal.h"
void _X_EXPORT void
#ifdef POLYSEGMENT #ifdef POLYSEGMENT
XAAPolySegment( XAAPolySegment(
DrawablePtr pDrawable, DrawablePtr pDrawable,

2
hw/xfree86/xaa/xaaOverlayDF.c
View File

@ -164,7 +164,7 @@ static DevPrivateKey XAAOverlayKey = &XAAOverlayKeyIndex;
} }
Bool _X_EXPORT Bool
XAAInitDualFramebufferOverlay( XAAInitDualFramebufferOverlay(
ScreenPtr pScreen, ScreenPtr pScreen,
DepthChangeFuncPtr callback DepthChangeFuncPtr callback

2
hw/xfree86/xaa/xaaPCache.c
View File

@ -1657,7 +1657,7 @@ XAACachePlanarMonoStipple(ScrnInfoPtr pScrn, PixmapPtr pPix)
return pCache; return pCache;
} }
XAACachePlanarMonoStippleProc _X_EXPORT XAACachePlanarMonoStippleProc
XAAGetCachePlanarMonoStipple(void) { return XAACachePlanarMonoStipple; } XAAGetCachePlanarMonoStipple(void) { return XAACachePlanarMonoStipple; }
XAACacheInfoPtr XAACacheInfoPtr

2
hw/xfree86/xaa/xaaPict.c
View File

@ -154,7 +154,7 @@ XAAGetRGBAFromPixel(
/* 8:8:8 + PICT_a8 -> 8:8:8:8 texture */ /* 8:8:8 + PICT_a8 -> 8:8:8:8 texture */
void _X_EXPORT void
XAA_888_plus_PICT_a8_to_8888 ( XAA_888_plus_PICT_a8_to_8888 (
CARD32 color, CARD32 color,
CARD8 *alphaPtr, /* in bytes */ CARD8 *alphaPtr, /* in bytes */

12
hw/xfree86/xaa/xaaROP.c
View File

@ -95,27 +95,27 @@ int XAAPatternROP_PM[16] =
ROP_DPo ROP_DPo
}; };
int XAAGetCopyROP(int i) _X_EXPORT int XAAGetCopyROP(int i)
{ {
return XAACopyROP[i]; return XAACopyROP[i];
} }
int XAAGetCopyROP_PM(int i) _X_EXPORT int XAAGetCopyROP_PM(int i)
{ {
return XAACopyROP_PM[i]; return XAACopyROP_PM[i];
} }
int XAAGetPatternROP(int i) _X_EXPORT int XAAGetPatternROP(int i)
{ {
return XAAPatternROP[i]; return XAAPatternROP[i];
} }
int XAAGetPatternROP_PM(int i) _X_EXPORT int XAAGetPatternROP_PM(int i)
{ {
return XAAPatternROP_PM[i]; return XAAPatternROP_PM[i];
} }
int _X_EXPORT int
XAAHelpPatternROP(ScrnInfoPtr pScrn, int *fg, int *bg, int pm, int *rop) XAAHelpPatternROP(ScrnInfoPtr pScrn, int *fg, int *bg, int pm, int *rop)
{ {
XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn); XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
@ -150,7 +150,7 @@ XAAHelpPatternROP(ScrnInfoPtr pScrn, int *fg, int *bg, int pm, int *rop)
} }
int _X_EXPORT int
XAAHelpSolidROP(ScrnInfoPtr pScrn, int *fg, int pm, int *rop) XAAHelpSolidROP(ScrnInfoPtr pScrn, int *fg, int pm, int *rop)
{ {
XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn); XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);

2
hw/xfree86/xaa/xaaStipple.c
View File

@ -32,7 +32,7 @@ StippleScanlineProcPtr stipple_scanline_func[6] = {
StippleOver32_Inverted StippleOver32_Inverted
}; };
StippleScanlineProcPtr *stipple_get_scanline_func(void) { _X_EXPORT StippleScanlineProcPtr *stipple_get_scanline_func(void) {
return stipple_scanline_func; return stipple_scanline_func;
} }

2
hw/xfree86/xaa/xaaTEGlyph.c
View File

@ -126,7 +126,7 @@ GlyphScanlineFuncPtr glyph_scanline_func[32] = {
DrawTETextScanlineGeneric, DrawTETextScanlineGeneric DrawTETextScanlineGeneric, DrawTETextScanlineGeneric
}; };
GlyphScanlineFuncPtr *glyph_get_scanline_func(void) { _X_EXPORT GlyphScanlineFuncPtr *glyph_get_scanline_func(void) {
return glyph_scanline_func; return glyph_scanline_func;
} }

2
hw/xfree86/xaa/xaaWrapper.c
View File

@ -265,7 +265,7 @@ xaaWrapperListInstalledColormaps(ScreenPtr pScreen, Colormap *pCmapIds)
return n; return n;
} }
Bool _X_EXPORT Bool
xaaSetupWrapper(ScreenPtr pScreen, XAAInfoRecPtr infoPtr, int depth, SyncFunc *func) xaaSetupWrapper(ScreenPtr pScreen, XAAInfoRecPtr infoPtr, int depth, SyncFunc *func)
{ {
Bool ret; Bool ret;