diff options
| author | Adam Jackson <ajax@nwnk.net> | 2006-03-25 19:52:05 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2006-03-25 19:52:05 +0000 |
| commit | a68c11bb1d7c5419004a1714e49dffac57304e78 (patch) | |
| tree | 50456439939c03c57d422cfc9e3f3755fa2ae006 /hw/xfree86/common | |
| parent | ae935832facfa81a9689882406ecca74b0346790 (diff) | |
Mark everything in xf86sym.c as _X_EXPORT.
Diffstat (limited to 'hw/xfree86/common')
28 files changed, 382 insertions, 382 deletions
diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c index e0cc4dd65..d93503723 100644 --- a/hw/xfree86/common/xf86Bus.c +++ b/hw/xfree86/common/xf86Bus.c @@ -81,16 +81,16 @@ resPtr osRes = NULL; resPtr ResRange = NULL; /* predefined special resources */ -resRange resVgaExclusive[] = {_VGA_EXCLUSIVE, _END}; -resRange resVgaShared[] = {_VGA_SHARED, _END}; -resRange resVgaMemShared[] = {_VGA_SHARED_MEM,_END}; -resRange resVgaIoShared[] = {_VGA_SHARED_IO,_END}; -resRange resVgaUnusedExclusive[] = {_VGA_EXCLUSIVE_UNUSED, _END}; -resRange resVgaUnusedShared[] = {_VGA_SHARED_UNUSED, _END}; -resRange resVgaSparseExclusive[] = {_VGA_EXCLUSIVE_SPARSE, _END}; -resRange resVgaSparseShared[] = {_VGA_SHARED_SPARSE, _END}; -resRange res8514Exclusive[] = {_8514_EXCLUSIVE, _END}; -resRange res8514Shared[] = {_8514_SHARED, _END}; +_X_EXPORT resRange resVgaExclusive[] = {_VGA_EXCLUSIVE, _END}; +_X_EXPORT resRange resVgaShared[] = {_VGA_SHARED, _END}; +_X_EXPORT resRange resVgaMemShared[] = {_VGA_SHARED_MEM,_END}; +_X_EXPORT resRange resVgaIoShared[] = {_VGA_SHARED_IO,_END}; +_X_EXPORT resRange resVgaUnusedExclusive[] = {_VGA_EXCLUSIVE_UNUSED, _END}; +_X_EXPORT resRange resVgaUnusedShared[] = {_VGA_SHARED_UNUSED, _END}; +_X_EXPORT resRange resVgaSparseExclusive[] = {_VGA_EXCLUSIVE_SPARSE, _END}; +_X_EXPORT resRange resVgaSparseShared[] = {_VGA_SHARED_SPARSE, _END}; +_X_EXPORT resRange res8514Exclusive[] = {_8514_EXCLUSIVE, _END}; +_X_EXPORT resRange res8514Shared[] = {_8514_SHARED, _END}; /* Flag: do we need RAC ? */ static Bool needRAC = FALSE; @@ -245,7 +245,7 @@ EntityLeave(void) } } -Bool +_X_EXPORT Bool xf86IsEntityPrimary(int entityIndex) { EntityPtr pEnt = xf86Entities[entityIndex]; @@ -266,7 +266,7 @@ xf86IsEntityPrimary(int entityIndex) } } -Bool +_X_EXPORT Bool xf86SetEntityFuncs(int entityIndex, EntityProc init, EntityProc enter, EntityProc leave, pointer private) { @@ -290,7 +290,7 @@ xf86DriverHasEntities(DriverPtr drvp) return FALSE; } -void +_X_EXPORT void xf86AddEntityToScreen(ScrnInfoPtr pScrn, int entityIndex) { if (entityIndex == -1) @@ -312,7 +312,7 @@ xf86AddEntityToScreen(ScrnInfoPtr pScrn, int entityIndex) pScrn->domainIOBase = xf86Entities[entityIndex]->domainIO; } -void +_X_EXPORT void xf86SetEntityInstanceForScreen(ScrnInfoPtr pScrn, int entityIndex, int instance) { int i; @@ -332,7 +332,7 @@ xf86SetEntityInstanceForScreen(ScrnInfoPtr pScrn, int entityIndex, int instance) * XXX This needs to be updated for the case where a single entity may have * instances associated with more than one screen. */ -ScrnInfoPtr +_X_EXPORT ScrnInfoPtr xf86FindScreenForEntity(int entityIndex) { int i,j; @@ -350,7 +350,7 @@ xf86FindScreenForEntity(int entityIndex) return NULL; } -void +_X_EXPORT void xf86RemoveEntityFromScreen(ScrnInfoPtr pScrn, int entityIndex) { int i; @@ -413,7 +413,7 @@ xf86ClearEntityListForScreen(int scrnIndex) pScrn->entityInstanceList = NULL; } -void +_X_EXPORT void xf86DeallocateResourcesForEntity(int entityIndex, unsigned long type) { resPtr *pprev_next = &Acc; @@ -456,7 +456,7 @@ xf86AddDevToEntity(int entityIndex, GDevPtr dev) * EntityRec struct to the drivers. The EntityRec structure itself * remains invisible to the driver. */ -EntityInfoPtr +_X_EXPORT EntityInfoPtr xf86GetEntityInfo(int entityIndex) { EntityInfoPtr pEnt; @@ -484,7 +484,7 @@ xf86GetEntityInfo(int entityIndex) return pEnt; } -int +_X_EXPORT int xf86GetNumEntityInstances(int entityIndex) { if (entityIndex >= xf86NumEntities) @@ -493,7 +493,7 @@ xf86GetNumEntityInstances(int entityIndex) return xf86Entities[entityIndex]->numInstances; } -GDevPtr +_X_EXPORT GDevPtr xf86GetDevFromEntity(int entityIndex, int instance) { int i; @@ -668,7 +668,7 @@ xf86AccessRestoreState(void) #ifdef async static AsyncQPtr *AsyncQ = NULL; -ScrnInfoPtr xf86CurrentScreen = NULL; +_X_EXPORT ScrnInfoPtr xf86CurrentScreen = NULL; #define SETUP_Q org = AsyncQ; \ AsyncQ = &new; @@ -692,7 +692,7 @@ ScrnInfoPtr xf86CurrentScreen = NULL; #define PROCESS_Q #endif -void +_X_EXPORT void xf86EnableAccess(ScrnInfoPtr pScrn) { register EntityAccessPtr peAcc = (EntityAccessPtr) pScrn->access; @@ -827,7 +827,7 @@ xf86EnableAccess(ScrnInfoPtr pScrn) } } -void +_X_EXPORT void xf86SetCurrentAccess(Bool Enable, ScrnInfoPtr pScrn) { EntityAccessPtr pceAcc2 = NULL; @@ -869,7 +869,7 @@ xf86SetCurrentAccess(Bool Enable, ScrnInfoPtr pScrn) } } -void +_X_EXPORT void xf86SetAccessFuncs(EntityInfoPtr pEnt, xf86SetAccessFuncPtr funcs, xf86SetAccessFuncPtr oldFuncs) { @@ -1192,7 +1192,7 @@ ChkConflict(resRange *rgp, resPtr res, xf86State state) * the resource broker that gets exported. Tests all resources ie. * performs test with SETUP flag. */ -memType +_X_EXPORT memType xf86ChkConflict(resRange *rgp, int entityIndex) { return checkConflict(rgp, Acc, entityIndex, SETUP,FALSE); @@ -1202,7 +1202,7 @@ xf86ChkConflict(resRange *rgp, int entityIndex) * Resources List handling */ -resPtr +_X_EXPORT resPtr xf86JoinResLists(resPtr rlist1, resPtr rlist2) { resPtr pRes; @@ -1219,7 +1219,7 @@ xf86JoinResLists(resPtr rlist1, resPtr rlist2) return rlist1; } -resPtr +_X_EXPORT resPtr xf86AddResToList(resPtr rlist, resRange *range, int entityIndex) { resPtr new; @@ -1256,7 +1256,7 @@ xf86AddResToList(resPtr rlist, resRange *range, int entityIndex) return new; } -void +_X_EXPORT void xf86FreeResList(resPtr rlist) { resPtr pRes; @@ -1269,7 +1269,7 @@ xf86FreeResList(resPtr rlist) xfree(rlist); } -resPtr +_X_EXPORT resPtr xf86DupResList(const resPtr rlist) { resPtr pRes, ret, prev, new; @@ -1289,7 +1289,7 @@ xf86DupResList(const resPtr rlist) return ret; } -void +_X_EXPORT void xf86PrintResList(int verb, resPtr list) { int i = 0; @@ -1590,7 +1590,7 @@ RemoveOverlaps(resPtr target, resPtr list, Bool pow2Alignment, Bool useEstimated #define ALIGN(x,a) ((x) + a) &~(a) -resRange +_X_EXPORT resRange xf86GetBlock(unsigned long type, memType size, memType window_start, memType window_end, memType align_mask, resPtr avoid) @@ -1687,7 +1687,7 @@ fix_counter(memType val, memType old_mask, memType mask) return unmake_base(val,mask); } -resRange +_X_EXPORT resRange xf86GetSparse(unsigned long type, memType fixed_bits, memType decode_mask, memType address_mask, resPtr avoid) { @@ -1838,7 +1838,7 @@ convertRange2Host(int entityIndex, resRange *pRange) * returns a resPtr listing all resources not successfully registered. */ -resPtr +_X_EXPORT resPtr xf86RegisterResources(int entityIndex, resList list, unsigned long access) { resPtr res = NULL; @@ -2074,7 +2074,7 @@ SetSIGIOForState(xf86State state) } } -void +_X_EXPORT void xf86EnterServerState(xf86State state) { EntityPtr pEnt; @@ -2180,7 +2180,7 @@ xf86EnterServerState(xf86State state) /* * xf86SetOperatingState() -- Set ResOperMask for resources listed. */ -resPtr +_X_EXPORT resPtr xf86SetOperatingState(resList list, int entityIndex, int mask) { resPtr acc; @@ -2259,7 +2259,7 @@ resError(resList list) * xf86ClaimFixedResources() is used to allocate non-relocatable resources. * This should only be done by a driver's Probe() function. */ -void +_X_EXPORT void xf86ClaimFixedResources(resList list, int entityIndex) { resPtr ptr = NULL; @@ -3099,7 +3099,7 @@ CheckGenericGA() #endif } -Bool +_X_EXPORT Bool xf86NoSharedResources(int screenIndex,resType res) { int j; @@ -3140,7 +3140,7 @@ xf86ConvertListToHost(int entityIndex, resPtr list) } } -void +_X_EXPORT void xf86RegisterStateChangeNotificationCallback(xf86StateChangeNotificationCallbackFunc func, pointer arg) { StateChangeNotificationPtr ptr = @@ -3152,7 +3152,7 @@ xf86RegisterStateChangeNotificationCallback(xf86StateChangeNotificationCallbackF StateChangeNotificationList = ptr; } -Bool +_X_EXPORT Bool xf86DeregisterStateChangeNotificationCallback(xf86StateChangeNotificationCallbackFunc func) { StateChangeNotificationPtr *ptr = &StateChangeNotificationList; @@ -3181,7 +3181,7 @@ notifyStateChange(xf86NotifyState state) } #ifdef async -Bool +_X_EXPORT Bool xf86QueueAsyncEvent(void (*func)(pointer),pointer arg) { AsyncQPtr new; @@ -3199,7 +3199,7 @@ xf86QueueAsyncEvent(void (*func)(pointer),pointer arg) /* Multihead accel sharing accessor functions and entity Private handling */ -int +_X_EXPORT int xf86GetLastScrnFlag(int entityIndex) { if(entityIndex < xf86NumEntities) { @@ -3209,7 +3209,7 @@ xf86GetLastScrnFlag(int entityIndex) } } -void +_X_EXPORT void xf86SetLastScrnFlag(int entityIndex, int scrnIndex) { if(entityIndex < xf86NumEntities) { @@ -3217,7 +3217,7 @@ xf86SetLastScrnFlag(int entityIndex, int scrnIndex) } } -Bool +_X_EXPORT Bool xf86IsEntityShared(int entityIndex) { if(entityIndex < xf86NumEntities) { @@ -3228,7 +3228,7 @@ xf86IsEntityShared(int entityIndex) return FALSE; } -void +_X_EXPORT void xf86SetEntityShared(int entityIndex) { if(entityIndex < xf86NumEntities) { @@ -3236,7 +3236,7 @@ xf86SetEntityShared(int entityIndex) } } -Bool +_X_EXPORT Bool xf86IsEntitySharable(int entityIndex) { if(entityIndex < xf86NumEntities) { @@ -3247,7 +3247,7 @@ xf86IsEntitySharable(int entityIndex) return FALSE; } -void +_X_EXPORT void xf86SetEntitySharable(int entityIndex) { if(entityIndex < xf86NumEntities) { @@ -3255,7 +3255,7 @@ xf86SetEntitySharable(int entityIndex) } } -Bool +_X_EXPORT Bool xf86IsPrimInitDone(int entityIndex) { if(entityIndex < xf86NumEntities) { @@ -3266,7 +3266,7 @@ xf86IsPrimInitDone(int entityIndex) return FALSE; } -void +_X_EXPORT void xf86SetPrimInitDone(int entityIndex) { if(entityIndex < xf86NumEntities) { @@ -3274,7 +3274,7 @@ xf86SetPrimInitDone(int entityIndex) } } -void +_X_EXPORT void xf86ClearPrimInitDone(int entityIndex) { if(entityIndex < xf86NumEntities) { @@ -3287,7 +3287,7 @@ xf86ClearPrimInitDone(int entityIndex) * Allocate a private in the entities. */ -int +_X_EXPORT int xf86AllocateEntityPrivateIndex(void) { int idx, i; @@ -3306,7 +3306,7 @@ xf86AllocateEntityPrivateIndex(void) return idx; } -DevUnion * +_X_EXPORT DevUnion * xf86GetEntityPrivate(int entityIndex, int privIndex) { if (entityIndex >= xf86NumEntities || privIndex >= xf86EntityPrivateCount) diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c index faae32a82..3159704ac 100644 --- a/hw/xfree86/common/xf86Configure.c +++ b/hw/xfree86/common/xf86Configure.c @@ -69,7 +69,7 @@ typedef struct _DevToConfig { static DevToConfigPtr DevToConfig = NULL; static int nDevToConfig = 0, CurrentDriver; -xf86MonPtr ConfiguredMonitor; +_X_EXPORT xf86MonPtr ConfiguredMonitor; Bool xf86DoConfigurePass1 = TRUE; Bool foundMouse = FALSE; @@ -251,7 +251,7 @@ xf86AddBusDeviceToConfigure(const char *driver, BusType bus, void *busData, int /* * Backwards compatibility */ -GDevPtr +_X_EXPORT GDevPtr xf86AddDeviceToConfigure(const char *driver, pciVideoPtr pVideo, int chipset) { return xf86AddBusDeviceToConfigure(driver, pVideo ? BUS_PCI : BUS_ISA, diff --git a/hw/xfree86/common/xf86Cursor.c b/hw/xfree86/common/xf86Cursor.c index 0e2d77492..787c39de8 100644 --- a/hw/xfree86/common/xf86Cursor.c +++ b/hw/xfree86/common/xf86Cursor.c @@ -447,7 +447,7 @@ xf86WarpCursor (ScreenPtr pScreen, int x, int y) } -void * +_X_EXPORT void * xf86GetPointerScreenFuncs(void) { return (void *)&xf86PointerScreenFuncs; diff --git a/hw/xfree86/common/xf86DGA.c b/hw/xfree86/common/xf86DGA.c index cf9caddea..88324eb19 100644 --- a/hw/xfree86/common/xf86DGA.c +++ b/hw/xfree86/common/xf86DGA.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86DGA.c,v 1.7 2005/11/08 03:12:43 alanc Exp $ */ +/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86DGA.c,v 1.8 2006/02/15 20:44:13 ajax Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86DGA.c,v 1.46 2002/12/03 18:17:40 tsi Exp $ */ /* * Copyright (c) 1998-2002 by The XFree86 Project, Inc. @@ -101,7 +101,7 @@ typedef struct { } DGAScreenRec, *DGAScreenPtr; -Bool +_X_EXPORT Bool DGAInit( ScreenPtr pScreen, DGAFunctionPtr funcs, @@ -174,7 +174,7 @@ DGAInit( * the DGA mode list. */ -Bool +_X_EXPORT Bool DGAReInitModes( ScreenPtr pScreen, DGAModePtr modes, @@ -456,7 +456,7 @@ xf86SetDGAMode( /*********** exported ones ***************/ -void +_X_EXPORT void DGASetInputMode(int index, Bool keyboard, Bool mouse) { ScreenPtr pScreen = screenInfo.screens[index]; @@ -469,7 +469,7 @@ DGASetInputMode(int index, Bool keyboard, Bool mouse) } } -Bool +_X_EXPORT Bool DGAChangePixmapMode(int index, int *x, int *y, int mode) { DGAScreenPtr pScreenPriv; @@ -524,7 +524,7 @@ DGAChangePixmapMode(int index, int *x, int *y, int mode) return TRUE; } -Bool +_X_EXPORT Bool DGAAvailable(int index) { if(DGAScreenIndex < 0) @@ -540,7 +540,7 @@ DGAAvailable(int index) return FALSE; } -Bool +_X_EXPORT Bool DGAActive(int index) { DGAScreenPtr pScreenPriv; @@ -578,7 +578,7 @@ DGAShutdown() /* Called by the extension to initialize a mode */ -int +_X_EXPORT int DGASetMode( int index, int num, @@ -602,7 +602,7 @@ DGASetMode( /* Called from the extension to let the DDX know which events are requested */ -void +_X_EXPORT void DGASelectInput( int index, ClientPtr client, @@ -615,7 +615,7 @@ DGASelectInput( pScreenPriv->input = mask; } -int +_X_EXPORT int DGAGetViewportStatus(int index) { DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]); @@ -628,7 +628,7 @@ DGAGetViewportStatus(int index) return (*pScreenPriv->funcs->GetViewport)(pScreenPriv->pScrn); } -int +_X_EXPORT int DGASetViewport( int index, int x, int y, @@ -656,7 +656,7 @@ BitsClear(CARD32 data) return bits; } -int +_X_EXPORT int DGACreateColormap(int index, ClientPtr client, int id, int mode, int alloc) { ScreenPtr pScreen = screenInfo.screens[index]; @@ -725,7 +725,7 @@ DGACreateColormap(int index, ClientPtr client, int id, int mode, int alloc) /* Called by the extension to install a colormap on DGA active screens */ -void +_X_EXPORT void DGAInstallCmap(ColormapPtr cmap) { ScreenPtr pScreen = cmap->pScreen; @@ -741,7 +741,7 @@ DGAInstallCmap(ColormapPtr cmap) (*pScreen->InstallColormap)(cmap); } -int +_X_EXPORT int DGASync(int index) { DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]); @@ -754,7 +754,7 @@ DGASync(int index) return Success; } -int +_X_EXPORT int DGAFillRect( int index, int x, int y, int w, int h, @@ -773,7 +773,7 @@ DGAFillRect( return BadMatch; } -int +_X_EXPORT int DGABlitRect( int index, int srcx, int srcy, @@ -794,7 +794,7 @@ DGABlitRect( return BadMatch; } -int +_X_EXPORT int DGABlitTransRect( int index, int srcx, int srcy, @@ -817,7 +817,7 @@ DGABlitTransRect( } -int +_X_EXPORT int DGAGetModes(int index) { DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]); @@ -827,7 +827,7 @@ DGAGetModes(int index) } -int +_X_EXPORT int DGAGetModeInfo( int index, XDGAModePtr mode, @@ -1207,7 +1207,7 @@ DGADeliverEvent (ScreenPtr pScreen, xEvent *e) return TRUE; } -Bool +_X_EXPORT Bool DGAOpenFramebuffer( int index, char **name, @@ -1224,7 +1224,7 @@ DGAOpenFramebuffer( name, mem, size, offset, flags); } -void +_X_EXPORT void DGACloseFramebuffer(int index) { DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]); @@ -1236,7 +1236,7 @@ DGACloseFramebuffer(int index) /* For DGA 1.0 backwards compatibility only */ -int +_X_EXPORT int DGAGetOldDGAMode(int index) { DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]); diff --git a/hw/xfree86/common/xf86DPMS.c b/hw/xfree86/common/xf86DPMS.c index 7d135e0ec..001c3d4bf 100644 --- a/hw/xfree86/common/xf86DPMS.c +++ b/hw/xfree86/common/xf86DPMS.c @@ -1,5 +1,5 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86DPMS.c,v 1.11 2003/11/11 21:02:28 dawes Exp $ */ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86DPMS.c,v 1.5 2005/04/20 12:25:21 daniels Exp $ */ +/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86DPMS.c,v 1.8 2005/07/03 08:53:42 daniels Exp $ */ /* * Copyright (c) 1997-2003 by The XFree86 Project, Inc. @@ -56,7 +56,7 @@ static int DPMSCount = 0; #endif -Bool +_X_EXPORT Bool xf86DPMSInit(ScreenPtr pScreen, DPMSSetProcPtr set, int flags) { #ifdef DPMSExtension @@ -146,7 +146,7 @@ DPMSClose(int i, ScreenPtr pScreen) * Device dependent DPMS mode setting hook. This is called whenever * the DPMS mode is to be changed. */ -void +_X_EXPORT void DPMSSet(int level) { int i; @@ -177,7 +177,7 @@ DPMSSet(int level) * DPMSSupported -- * Return TRUE if any screen supports DPMS. */ -Bool +_X_EXPORT Bool DPMSSupported(void) { int i; @@ -213,7 +213,7 @@ DPMSSupported(void) * 2. It isn't clear that this function is ever used or what it should * return. */ -int +_X_EXPORT int DPMSGet(int *level) { return DPMSPowerLevel; diff --git a/hw/xfree86/common/xf86Debug.c b/hw/xfree86/common/xf86Debug.c index 15c267232..5579cde5b 100644 --- a/hw/xfree86/common/xf86Debug.c +++ b/hw/xfree86/common/xf86Debug.c @@ -44,19 +44,19 @@ #include "xf86_OSlib.h" #include "compiler.h" -void xf86Break1(void) +_X_EXPORT void xf86Break1(void) { } -void xf86Break2(void) +_X_EXPORT void xf86Break2(void) { } -void xf86Break3(void) +_X_EXPORT void xf86Break3(void) { } -char *xf86p8bit[] = { "00000000", "00000001", "00000010", "00000011", +_X_EXPORT char *xf86p8bit[] = { "00000000", "00000001", "00000010", "00000011", "00000100", "00000101", "00000110", "00000111", "00001000", "00001001", "00001010", "00001011", "00001100", "00001101", "00001110", "00001111", @@ -122,9 +122,9 @@ char *xf86p8bit[] = { "00000000", "00000001", "00000010", "00000011", "11111100", "11111101", "11111110", "11111111" }; -CARD32 xf86DummyVar1; -CARD32 xf86DummyVar2; -CARD32 xf86DummyVar3; +_X_EXPORT CARD32 xf86DummyVar1; +_X_EXPORT CARD32 xf86DummyVar2; +_X_EXPORT CARD32 xf86DummyVar3; CARD8 xf86PeekFb8(CARD8 *p) { return *p; } CARD16 xf86PeekFb16(CARD16 *p) { return *p; } @@ -164,7 +164,7 @@ void xf86PokeMmio32(pointer Base, unsigned long Offset, CARD32 v) } -void +_X_EXPORT void xf86STimestamp(xf86TsPtr* timestamp) { if (*timestamp) { @@ -175,7 +175,7 @@ xf86STimestamp(xf86TsPtr* timestamp) } } -void +_X_EXPORT void xf86SPTimestamp(xf86TsPtr* timestamp, char *str) { if (*timestamp) { diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c index ef63ea24e..44ac68878 100644 --- a/hw/xfree86/common/xf86Events.c +++ b/hw/xfree86/common/xf86Events.c @@ -49,7 +49,7 @@ */ /* $XConsortium: xf86Events.c /main/46 1996/10/25 11:36:30 kaleb $ */ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Events.c,v 1.9 2005/04/21 00:31:31 daniels Exp $ */ +/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86Events.c,v 1.21 2005/11/08 06:33:28 jkj Exp $ */ /* [JCH-96/01/21] Extended std reverse map to four buttons. */ @@ -216,7 +216,7 @@ TimeSinceLastInputEvent() * Set the lastEventTime to now. */ -void +_X_EXPORT void SetTimeSinceLastInputEvent() { xf86Info.lastEventTime = GetTimeInMillis(); @@ -1102,7 +1102,7 @@ special: #define ModifierIsSet(k) ((modifiers & (k)) == (k)) -Bool +_X_EXPORT Bool xf86CommonSpecialKey(int key, Bool down, int modifiers) { if ((!ModifierIsSet(ShiftMask)) && @@ -1242,7 +1242,7 @@ xf86SigioReadInput(int fd, * xf86AddEnabledDevice -- * */ -void +_X_EXPORT void xf86AddEnabledDevice(InputInfoPtr pInfo) { if (!xf86InstallSIGIOHandler (pInfo->fd, xf86SigioReadInput, pInfo)) { @@ -1254,7 +1254,7 @@ xf86AddEnabledDevice(InputInfoPtr pInfo) * xf86RemoveEnabledDevice -- * */ -void +_X_EXPORT void xf86RemoveEnabledDevice(InputInfoPtr pInfo) { if (!xf86RemoveSIGIOHandler (pInfo->fd)) { @@ -1264,7 +1264,7 @@ xf86RemoveEnabledDevice(InputInfoPtr pInfo) static int *xf86SignalIntercept = NULL; -void +_X_EXPORT void xf86InterceptSignals(int *signo) { if ((xf86SignalIntercept = signo)) @@ -1273,7 +1273,7 @@ xf86InterceptSignals(int *signo) static void (*xf86SigIllHandler)(void) = NULL; -void +_X_EXPORT void xf86InterceptSigIll(void (*sigillhandler)(void)) { xf86SigIllHandler = sigillhandler; @@ -1671,7 +1671,7 @@ xf86VTSwitch() /* Input handler registration */ -pointer +_X_EXPORT pointer xf86AddInputHandler(int fd, InputHandlerProc proc, pointer data) { IHPtr ih; @@ -1696,7 +1696,7 @@ xf86AddInputHandler(int fd, InputHandlerProc proc, pointer data) return ih; } -int +_X_EXPORT int xf86RemoveInputHandler(pointer handler) { IHPtr ih, p; @@ -1724,7 +1724,7 @@ xf86RemoveInputHandler(pointer handler) return fd; } -void +_X_EXPORT void xf86DisableInputHandler(pointer handler) { IHPtr ih; @@ -1738,7 +1738,7 @@ xf86DisableInputHandler(pointer handler) RemoveEnabledDevice(ih->fd); } -void +_X_EXPORT void xf86EnableInputHandler(pointer handler) { IHPtr ih; @@ -1755,7 +1755,7 @@ xf86EnableInputHandler(pointer handler) /* * As used currently by the DRI, the return value is ignored. */ -Bool +_X_EXPORT Bool xf86EnableVTSwitch(Bool new) { static Bool def = TRUE; diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c index 30fe10554..2066a2b89 100644 --- a/hw/xfree86/common/xf86Globals.c +++ b/hw/xfree86/common/xf86Globals.c @@ -47,11 +47,11 @@ /* Globals that video drivers may access */ -int xf86ScreenIndex = -1; /* Index of ScrnInfo in pScreen.devPrivates */ +_X_EXPORT int xf86ScreenIndex = -1; /* Index of ScrnInfo in pScreen.devPrivates */ int xf86CreateRootWindowIndex = -1; /* Index into pScreen.devPrivates */ -ScrnInfoPtr *xf86Screens = NULL; /* List of ScrnInfos */ -int xf86PixmapIndex = 0; -const unsigned char byte_reversed[256] = +_X_EXPORT ScrnInfoPtr *xf86Screens = NULL; /* List of ScrnInfos */ +_X_EXPORT int xf86PixmapIndex = 0; +_X_EXPORT const unsigned char byte_reversed[256] = { 0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0, 0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0, @@ -182,7 +182,7 @@ const char *xf86LogFile = DEFAULT_LOGPREFIX; MessageType xf86LogFileFrom = X_DEFAULT; Bool xf86LogFileWasOpened = FALSE; serverLayoutRec xf86ConfigLayout = {NULL, }; -confDRIRec xf86ConfigDRI = {0, }; +_X_EXPORT confDRIRec xf86ConfigDRI = {0, }; XF86ConfigPtr xf86configptr = NULL; Bool xf86Resetting = FALSE; Bool xf86Initialising = FALSE; @@ -242,7 +242,7 @@ Bool xf86MiscModInDevDisabled = FALSE; Bool xf86MiscModInDevAllowNonLocal = FALSE; #endif RootWinPropPtr *xf86RegisteredPropertiesTable = NULL; -Bool xf86inSuspend = FALSE; +_X_EXPORT Bool xf86inSuspend = FALSE; Bool xorgHWAccess = FALSE; PciBusId xf86IsolateDevice; diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c index fc1ced761..f417d24c2 100644 --- a/hw/xfree86/common/xf86Helper.c +++ b/hw/xfree86/common/xf86Helper.c @@ -73,7 +73,7 @@ static int xf86ScrnInfoPrivateCount = 0; #ifdef XFree86LOADER /* Add a pointer to a new DriverRec to xf86DriverList */ -void +_X_EXPORT void xf86AddDriver(DriverPtr driver, pointer module, int flags) { /* Don't add null entries */ @@ -100,7 +100,7 @@ xf86AddDriver(DriverPtr driver, pointer module, int flags) xf86DriverList[xf86NumDrivers - 1]->refCount = 0; } -void +_X_EXPORT void xf86DeleteDriver(int drvIndex) { if (xf86DriverList[drvIndex] @@ -114,7 +114,7 @@ xf86DeleteDriver(int drvIndex) /* Add a pointer to a new InputDriverRec to xf86InputDriverList */ -void +_X_EXPORT void xf86AddInputDriver(InputDriverPtr driver, pointer module, int flags) { /* Don't add null entries */ @@ -143,7 +143,7 @@ xf86DeleteInputDriver(int drvIndex) xf86InputDriverList[drvIndex] = NULL; } -void +_X_EXPORT void xf86AddModuleInfo(ModuleInfoPtr info, pointer module) { /* Don't add null entries */ @@ -162,7 +162,7 @@ xf86AddModuleInfo(ModuleInfoPtr info, pointer module) xf86ModuleInfoList[xf86NumModuleInfos - 1]->refCount = 0; } -void +_X_EXPORT void xf86DeleteModuleInfo(int idx) { if (xf86ModuleInfoList[idx]) { @@ -177,7 +177,7 @@ xf86DeleteModuleInfo(int idx) /* Allocate a new ScrnInfoRec in xf86Screens */ -ScrnInfoPtr +_X_EXPORT ScrnInfoPtr xf86AllocateScreen(DriverPtr drv, int flags) { int i; @@ -232,7 +232,7 @@ xf86AllocateScreen(DriverPtr drv, int flags) * data. To do this properly may require a driver hook. */ -void +_X_EXPORT void xf86DeleteScreen(int scrnIndex, int flags) { ScrnInfoPtr pScrn; @@ -290,7 +290,7 @@ xf86DeleteScreen(int scrnIndex, int flags) * Allocate a private in ScrnInfoRec. */ -int +_X_EXPORT int xf86AllocateScrnInfoPrivateIndex(void) { int idx, i; @@ -311,7 +311,7 @@ xf86AllocateScrnInfoPrivateIndex(void) /* Allocate a new InputInfoRec and add it to the head xf86InputDevs. */ -InputInfoPtr +_X_EXPORT InputInfoPtr xf86AllocateInput(InputDriverPtr drv, int flags) { InputInfoPtr new; @@ -337,7 +337,7 @@ xf86AllocateInput(InputDriverPtr drv, int flags) * data. To do this properly may require a driver hook. */ -void +_X_EXPORT void xf86DeleteInput(InputInfoPtr pInp, int flags) { InputInfoPtr p; @@ -377,7 +377,7 @@ xf86DeleteInput(InputInfoPtr pInp, int flags) xfree(pInp); } -Bool +_X_EXPORT Bool xf86AddPixFormat(ScrnInfoPtr pScrn, int depth, int bpp, int pad) { int i; @@ -452,7 +452,7 @@ xf86AddPixFormat(ScrnInfoPtr pScrn, int depth, int bpp, int pad) #define GLOBAL_DEFAULT_FBBPP 16 #endif -Bool +_X_EXPORT Bool xf86SetDepthBpp(ScrnInfoPtr scrp, int depth, int dummy, int fbbpp, int depth24flags) { @@ -780,7 +780,7 @@ xf86SetDepthBpp(ScrnInfoPtr scrp, int depth, int dummy, int fbbpp, /* * Print out the selected depth and bpp. */ -void +_X_EXPORT void xf86PrintDepthBpp(ScrnInfoPtr scrp) { xf86DrvMsg(scrp->scrnIndex, scrp->depthFrom, "Depth %d, ", scrp->depth); @@ -791,7 +791,7 @@ xf86PrintDepthBpp(ScrnInfoPtr scrp) * xf86SetWeight sets scrp->weight, scrp->mask, scrp->offset, and for depths * greater than MAX_PSEUDO_DEPTH also scrp->rgbBits. */ -Bool +_X_EXPORT Bool xf86SetWeight(ScrnInfoPtr scrp, rgb weight, rgb mask) { MessageType weightFrom = X_DEFAULT; @@ -883,7 +883,7 @@ xf86SetWeight(ScrnInfoPtr scrp, rgb weight, rgb mask) return TRUE; } -Bool +_X_EXPORT Bool xf86SetDefaultVisual(ScrnInfoPtr scrp, int visual) { MessageType visualFrom = X_DEFAULT; @@ -930,7 +930,7 @@ xf86SetDefaultVisual(ScrnInfoPtr scrp, int visual) #define SET_GAMMA(g) \ (g) > GAMMA_ZERO ? (g) : 1.0 -Bool +_X_EXPORT Bool xf86SetGamma(ScrnInfoPtr scrp, Gamma gamma) { MessageType from = X_DEFAULT; @@ -984,7 +984,7 @@ xf86SetGamma(ScrnInfoPtr scrp, Gamma gamma) #undef MMPERINCH #define MMPERINCH 25.4 -void +_X_EXPORT void xf86SetDpi(ScrnInfoPtr pScrn, int x, int y) { MessageType from = X_DEFAULT; @@ -1081,7 +1081,7 @@ xf86SetDpi(ScrnInfoPtr pScrn, int x, int y) #undef MMPERINCH -void +_X_EXPORT void xf86SetBlackWhitePixels(ScreenPtr pScreen) { if (xf86FlipPixels) { @@ -1254,7 +1254,7 @@ xf86SetRootClip (ScreenPtr pScreen, Bool enable) * whether they are switched in or out by keeping track of the root pixmap's * private data, and therefore don't need to access pScrnInfo->vtSema. */ -void +_X_EXPORT void xf86EnableDisableFBAccess(int scrnIndex, Bool enable) { ScrnInfoPtr pScrnInfo = xf86Screens[scrnIndex]; @@ -1296,7 +1296,7 @@ xf86EnableDisableFBAccess(int scrnIndex, Bool enable) #undef PREFIX_SIZE #define PREFIX_SIZE 14 -void +_X_EXPORT void xf86VDrvMsgVerb(int scrnIndex, MessageType type, int verb, const char *format, va_list args) { @@ -1323,7 +1323,7 @@ xf86VDrvMsgVerb(int scrnIndex, MessageType type, int verb, const char *format, #undef PREFIX_SIZE /* Print driver messages, with verbose level specified directly */ -void +_X_EXPORT void xf86DrvMsgVerb(int scrnIndex, MessageType type, int verb, const char *format, ...) { @@ -1335,7 +1335,7 @@ xf86DrvMsgVerb(int scrnIndex, MessageType type, int verb, const char *format, } /* Print driver messages, with verbose level of 1 (default) */ -void +_X_EXPORT void xf86DrvMsg(int scrnIndex, MessageType type, const char *format, ...) { va_list ap; @@ -1346,7 +1346,7 @@ xf86DrvMsg(int scrnIndex, MessageType type, const char *format, ...) } /* Print non-driver messages with verbose level specified directly */ -void +_X_EXPORT void xf86MsgVerb(MessageType type, int verb, const char *format, ...) { va_list ap; @@ -1357,7 +1357,7 @@ xf86MsgVerb(MessageType type, int verb, const char *format, ...) } /* Print non-driver messages with verbose level of 1 (default) */ -void +_X_EXPORT void xf86Msg(MessageType type, const char *format, ...) { va_list ap; @@ -1368,7 +1368,7 @@ xf86Msg(MessageType type, const char *format, ...) } /* Just like ErrorF, but with the verbose level checked */ -void +_X_EXPORT void xf86ErrorFVerb(int verb, const char *format, ...) { va_list ap; @@ -1380,7 +1380,7 @@ xf86ErrorFVerb(int verb, const char *format, ...) } /* Like xf86ErrorFVerb, but with an implied verbose level of 1 */ -void +_X_EXPORT void xf86ErrorF(const char *format, ...) { va_list ap; @@ -1432,7 +1432,7 @@ xf86CloseLog() * Drivers can use these for using their own SymTabRecs. */ -const char * +_X_EXPORT const char * xf86TokenToString(SymTabPtr table, int token) { int i; @@ -1446,7 +1446,7 @@ xf86TokenToString(SymTabPtr table, int token) return(table[i].name); } -int +_X_EXPORT int xf86StringToToken(SymTabPtr table, const char *string) { int i; @@ -1463,7 +1463,7 @@ xf86StringToToken(SymTabPtr table, const char *string) /* * helper to display the clocks found on a card */ -void +_X_EXPORT void xf86ShowClocks(ScrnInfoPtr scrp, MessageType from) { int j; @@ -1487,7 +1487,7 @@ xf86ShowClocks(ScrnInfoPtr scrp, MessageType from) * XXX This makes assumptions about the line width, etc. Maybe we could * use a more general "pretty print" function for messages. */ -void +_X_EXPORT void xf86PrintChipsets(const char *drvname, const char *drvmsg, SymTabPtr chips) { int len, i; @@ -1516,7 +1516,7 @@ xf86PrintChipsets(const char *drvname, const char *drvmsg, SymTabPtr chips) #define MAXDRIVERS 64 /* A >hack<, to be sure ... */ -int +_X_EXPORT int xf86MatchDevice(const char *drivername, GDevPtr **sectlist) { GDevPtr gdp, *pgdp = NULL; @@ -1632,7 +1632,7 @@ struct Inst { * \c DriverRec::driverName. In a future version of this function, remove * that parameter. */ -int +_X_EXPORT int xf86MatchPciInstances(const char *driverName, int vendorID, SymTabPtr chipsets, PciChipsets *PCIchipsets, GDevPtr *devList, int numDevs, DriverPtr drvp, @@ -1991,7 +1991,7 @@ xf86MatchPciInstances(const char *driverName, int vendorID, return numFound; } -int +_X_EXPORT int xf86MatchIsaInstances(const char *driverName, SymTabPtr chipsets, IsaChipsets *ISAchipsets, DriverPtr drvp, FindIsaDevProc FindIsaDevice, GDevPtr *devList, @@ -2096,7 +2096,7 @@ xf86MatchIsaInstances(const char *driverName, SymTabPtr chipsets, /* * xf86GetClocks -- get the dot-clocks via a BIG BAD hack ... */ -void +_X_EXPORT void xf86GetClocks(ScrnInfoPtr pScrn, int num, Bool (*ClockFunc)(ScrnInfoPtr, int), void (*ProtectRegs)(ScrnInfoPtr, Bool), void (*BlankScreen)(ScrnInfoPtr, Bool), IOADDRESS vertsyncreg, @@ -2197,7 +2197,7 @@ finish: (*ClockFunc)(pScrn, CLK_REG_RESTORE); } -void +_X_EXPORT void xf86SetPriority(Bool up) { static int saved_nice; @@ -2221,7 +2221,7 @@ xf86SetPriority(Bool up) } } -const char * +_X_EXPORT const char * xf86GetVisualName(int visual) { if (visual < 0 || visual > DirectColor) @@ -2231,62 +2231,62 @@ xf86GetVisualName(int visual) } -int +_X_EXPORT int xf86GetVerbosity() { return max(xf86Verbose, xf86LogVerbose); } -Pix24Flags +_X_EXPORT Pix24Flags xf86GetPix24() { return xf86Info.pixmap24; } -int +_X_EXPORT int xf86GetDepth() { return xf86Depth; } -rgb +_X_EXPORT rgb xf86GetWeight() { return xf86Weight; } -Gamma +_X_EXPORT Gamma xf86GetGamma() { return xf86Gamma; } -Bool +_X_EXPORT Bool xf86GetFlipPixels() { return xf86FlipPixels; } -const char * +_X_EXPORT const char * xf86GetServerName() { return xf86ServerName; } -Bool +_X_EXPORT Bool xf86ServerIsExiting() { return (dispatchException & DE_TERMINATE) == DE_TERMINATE; } -Bool +_X_EXPORT Bool xf86ServerIsResetting() { return xf86Resetting; @@ -2300,62 +2300,62 @@ xf86ServerIsInitialising() } -Bool +_X_EXPORT Bool xf86ServerIsOnlyDetecting(void) { return xf86DoProbe || xf86DoConfigure; } -Bool +_X_EXPORT Bool xf86ServerIsOnlyProbing(void) { return xf86ProbeOnly; } -Bool +_X_EXPORT Bool xf86CaughtSignal() { return xf86Info.caughtSignal; } -Bool +_X_EXPORT Bool xf86GetVidModeAllowNonLocal() { return xf86Info.vidModeAllowNonLocal; } -Bool +_X_EXPORT Bool xf86GetVidModeEnabled() { return xf86Info.vidModeEnabled; } -Bool +_X_EXPORT Bool xf86GetModInDevAllowNonLocal() { return xf86Info.miscModInDevAllowNonLocal; } -Bool +_X_EXPORT Bool xf86GetModInDevEnabled() { return xf86Info.miscModInDevEnabled; } -Bool +_X_EXPORT Bool xf86GetAllowMouseOpenFail() { return xf86Info.allowMouseOpenFail; } -Bool +_X_EXPORT Bool xf86IsPc98() { #if defined(i386) || defined(__i386__) @@ -2365,20 +2365,20 @@ xf86IsPc98() #endif } -void +_X_EXPORT void xf86DisableRandR() { xf86Info.disableRandR = TRUE; xf86Info.randRFrom = X_PROBED; } -CARD32 +_X_EXPORT CARD32 xf86GetVersion() { return XF86_VERSION_CURRENT; } -CARD32 +_X_EXPORT CARD32 xf86GetModuleVersion(pointer module) { #ifdef XFree86LOADER @@ -2388,7 +2388,7 @@ xf86GetModuleVersion(pointer module) #endif } -pointer +_X_EXPORT pointer xf86LoadDrvSubModule(DriverPtr drv, const char *name) { #ifdef XFree86LOADER @@ -2405,7 +2405,7 @@ xf86LoadDrvSubModule(DriverPtr drv, const char *name) #endif } -pointer +_X_EXPORT pointer xf86LoadSubModule(ScrnInfoPtr pScrn, const char *name) { #ifdef XFree86LOADER @@ -2425,7 +2425,7 @@ xf86LoadSubModule(ScrnInfoPtr pScrn, const char *name) /* * xf86LoadOneModule loads a single module. */ -pointer +_X_EXPORT pointer xf86LoadOneModule(char *name, pointer opt) { #ifdef XFree86LOADER @@ -2463,7 +2463,7 @@ xf86LoadOneModule(char *name, pointer opt) return mod; } -void +_X_EXPORT void xf86UnloadSubModule(pointer mod) { /* @@ -2475,7 +2475,7 @@ xf86UnloadSubModule(pointer mod) #endif } -Bool +_X_EXPORT Bool xf86LoaderCheckSymbol(const char *name) { #ifdef XFree86LOADER @@ -2485,7 +2485,7 @@ xf86LoaderCheckSymbol(const char *name) #endif } -void +_X_EXPORT void xf86LoaderReqSymLists(const char **list0, ...) { #ifdef XFree86LOADER @@ -2497,7 +2497,7 @@ xf86LoaderReqSymLists(const char **list0, ...) #endif } -void +_X_EXPORT void xf86LoaderReqSymbols(const char *sym0, ...) { #ifdef XFree86LOADER @@ -2509,7 +2509,7 @@ xf86LoaderReqSymbols(const char *sym0, ...) #endif } -void +_X_EXPORT void xf86LoaderRefSymLists(const char **list0, ...) { #ifdef XFree86LOADER @@ -2521,7 +2521,7 @@ xf86LoaderRefSymLists(const char **list0, ...) #endif } -void +_X_EXPORT void xf86LoaderRefSymbols(const char *sym0, ...) { #ifdef XFree86LOADER @@ -2543,7 +2543,7 @@ static const OptionInfoRec BSOptions[] = { { -1, NULL, OPTV_NONE, {0}, FALSE } }; -void +_X_EXPORT void xf86SetBackingStore(ScreenPtr pScreen) { Bool useBS = FALSE; @@ -2583,7 +2583,7 @@ static const OptionInfoRec SMOptions[] = { { -1, NULL, OPTV_NONE, {0}, FALSE } }; -void +_X_EXPORT void xf86SetSilkenMouse (ScreenPtr pScreen) { Bool useSM = TRUE; @@ -2624,7 +2624,7 @@ xf86SetSilkenMouse (ScreenPtr pScreen) /* Wrote this function for the PM2 Xv driver, preliminary. */ -pointer +_X_EXPORT pointer xf86FindXvOptions(int scrnIndex, int adaptor_index, char *port_name, char **adaptor_name, pointer *adaptor_options) { @@ -2660,7 +2660,7 @@ xf86FindXvOptions(int scrnIndex, int adaptor_index, char *port_name, * special enter/leave functions and their private scratch area to * this entity, take the dog for a walk... */ -ScrnInfoPtr +_X_EXPORT ScrnInfoPtr xf86ConfigIsaEntity(ScrnInfoPtr pScrn, int scrnFlag, int entityIndex, IsaChipsets *i_chip, resList res, EntityProc init, EntityProc enter, EntityProc leave, pointer private) @@ -2697,7 +2697,7 @@ xf86ConfigIsaEntity(ScrnInfoPtr pScrn, int scrnFlag, int entityIndex, return pScrn; } -ScrnInfoPtr +_X_EXPORT ScrnInfoPtr xf86ConfigPciEntity(ScrnInfoPtr pScrn, int scrnFlag, int entityIndex, PciChipsets *p_chip, resList res, EntityProc init, EntityProc enter, EntityProc leave, pointer private) @@ -2740,7 +2740,7 @@ xf86ConfigPciEntity(ScrnInfoPtr pScrn, int scrnFlag, int entityIndex, return pScrn; } -ScrnInfoPtr +_X_EXPORT ScrnInfoPtr xf86ConfigFbEntity(ScrnInfoPtr pScrn, int scrnFlag, int entityIndex, EntityProc init, EntityProc enter, EntityProc leave, pointer private) @@ -2773,7 +2773,7 @@ xf86ConfigFbEntity(ScrnInfoPtr pScrn, int scrnFlag, int entityIndex, * are obsolete functions. They the are likely to be removed * Don't use! */ -Bool +_X_EXPORT Bool xf86ConfigActiveIsaEntity(ScrnInfoPtr pScrn, int entityIndex, IsaChipsets *i_chip, resList res, EntityProc init, EntityProc enter, EntityProc leave, pointer private) @@ -2803,7 +2803,7 @@ xf86ConfigActiveIsaEntity(ScrnInfoPtr pScrn, int entityIndex, return TRUE; } -Bool +_X_EXPORT Bool xf86ConfigActivePciEntity(ScrnInfoPtr pScrn, int entityIndex, PciChipsets *p_chip, resList res, EntityProc init, EntityProc enter, EntityProc leave, pointer private) @@ -2840,7 +2840,7 @@ xf86ConfigActivePciEntity(ScrnInfoPtr pScrn, int entityIndex, * assigned to a screen before it will be removed. If p_pci(p_isa) is * non-NULL all static resources listed there will be registered. */ -void +_X_EXPORT void xf86ConfigPciEntityInactive(EntityInfoPtr pEnt, PciChipsets *p_chip, resList res, EntityProc init, EntityProc enter, EntityProc leave, pointer private) @@ -2862,7 +2862,7 @@ xf86ConfigPciEntityInactive(EntityInfoPtr pEnt, PciChipsets *p_chip, xf86SetEntityFuncs(pEnt->index,init,enter,leave,private); } -void +_X_EXPORT void xf86ConfigIsaEntityInactive(EntityInfoPtr pEnt, IsaChipsets *i_chip, resList res, EntityProc init, EntityProc enter, EntityProc leave, pointer private) @@ -2895,7 +2895,7 @@ xf86ConfigFbEntityInactive(EntityInfoPtr pEnt, EntityProc init, xf86SetEntityFuncs(pEnt->index,init,enter,leave,private); } -Bool +_X_EXPORT Bool xf86IsScreenPrimary(int scrnIndex) { ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; @@ -2908,7 +2908,7 @@ xf86IsScreenPrimary(int scrnIndex) return FALSE; } -int +_X_EXPORT int xf86RegisterRootWindowProperty(int ScrnIndex, Atom property, Atom type, int format, unsigned long len, pointer value ) { @@ -2999,7 +2999,7 @@ xf86RegisterRootWindowProperty(int ScrnIndex, Atom property, Atom type, return(Success); } -Bool +_X_EXPORT Bool xf86IsUnblank(int mode) { switch(mode) { diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c index 49947ca75..30431a3f0 100644 --- a/hw/xfree86/common/xf86Init.c +++ b/hw/xfree86/common/xf86Init.c @@ -1,5 +1,5 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Init.c,v 3.212 2004/01/27 01:31:45 dawes Exp $ */ -/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86Init.c,v 1.31 2006/03/07 23:58:22 idr Exp $ */ +/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86Init.c,v 1.32 2006/03/20 14:01:05 ajax Exp $ */ /* * Loosely based on code bearing the following copyright: @@ -1969,7 +1969,7 @@ xf86LoadModules(char **list, pointer *optlist) /* Pixmap format stuff */ -PixmapFormatPtr +_X_EXPORT PixmapFormatPtr xf86GetPixFormat(ScrnInfoPtr pScrn, int depth) { int i; @@ -2014,7 +2014,7 @@ xf86GetPixFormat(ScrnInfoPtr pScrn, int depth) return NULL; } -int +_X_EXPORT int xf86GetBppFromDepth(ScrnInfoPtr pScrn, int depth) { PixmapFormatPtr format; diff --git a/hw/xfree86/common/xf86Io.c b/hw/xfree86/common/xf86Io.c index 606084d41..4e1dc4b0f 100644 --- a/hw/xfree86/common/xf86Io.c +++ b/hw/xfree86/common/xf86Io.c @@ -49,7 +49,7 @@ */ /* $XConsortium: xf86Io.c /main/27 1996/10/19 17:58:55 kaleb $ */ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Io.c,v 1.3 2005/04/20 12:25:21 daniels Exp $ */ +/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86Io.c,v 1.5 2005/07/03 07:01:24 daniels Exp $ */ #define NEED_EVENTS #ifdef HAVE_XORG_CONFIG_H @@ -483,7 +483,7 @@ searchdone: * they really belong */ #define HALFMONTH ((unsigned long) 1<<31) -CARD32 +_X_EXPORT CARD32 GetTimeInMillis() { struct timeval tp; diff --git a/hw/xfree86/common/xf86MiscExt.c b/hw/xfree86/common/xf86MiscExt.c index 54c0cd510..80fbf417d 100644 --- a/hw/xfree86/common/xf86MiscExt.c +++ b/hw/xfree86/common/xf86MiscExt.c @@ -151,7 +151,7 @@ MapMseMiscToProto(int proto) return PROT_UNKNOWN; } -Bool +_X_EXPORT Bool MiscExtGetMouseSettings(pointer *mouse, char **devname) { mseParamsPtr mseptr; @@ -183,7 +183,7 @@ MiscExtGetMouseSettings(pointer *mouse, char **devname) return TRUE; } -int +_X_EXPORT int MiscExtGetMouseValue(pointer mouse, MiscExtMseValType valtype) { mseParamsPtr mse = mouse; @@ -204,7 +204,7 @@ MiscExtGetMouseValue(pointer mouse, MiscExtMseValType valtype) return 0; } -Bool +_X_EXPORT Bool MiscExtSetMouseValue(pointer mouse, MiscExtMseValType valtype, int value) { mseParamsPtr mse = mouse; @@ -243,7 +243,7 @@ MiscExtSetMouseValue(pointer mouse, MiscExtMseValType valtype, int value) return FALSE; } -Bool +_X_EXPORT Bool MiscExtSetMouseDevice(pointer mouse, char* device) { mseParamsPtr mse = mouse; @@ -253,7 +253,7 @@ MiscExtSetMouseDevice(pointer mouse, char* device) return TRUE; } -Bool +_X_EXPORT Bool MiscExtGetKbdSettings(pointer *kbd) { kbdParamsPtr kbdptr; @@ -270,7 +270,7 @@ MiscExtGetKbdSettings(pointer *kbd) return TRUE; } -int +_X_EXPORT int MiscExtGetKbdValue(pointer keyboard, MiscExtKbdValType valtype) { kbdParamsPtr kbd = keyboard; @@ -285,7 +285,7 @@ MiscExtGetKbdValue(pointer keyboard, MiscExtKbdValType valtype) return 0; } -Bool +_X_EXPORT Bool MiscExtSetKbdValue(pointer keyboard, MiscExtKbdValType valtype, int value) { kbdParamsPtr kbd = keyboard; @@ -326,7 +326,7 @@ MiscExtClientStateCallback(CallbackListPtr *callbacks, * grabs cannot be removed/killed */ #define MiscExtGrabStateAlready 2 /* Request for enabling/disabling * grab removeal/kill already done */ -int +_X_EXPORT int MiscExtSetGrabKeysState(ClientPtr client, int state) { DEBUG_P("MiscExtSetGrabKeysState"); @@ -354,7 +354,7 @@ MiscExtSetGrabKeysState(ClientPtr client, int state) return MiscExtGrabStateLocked; } -pointer +_X_EXPORT pointer MiscExtCreateStruct(MiscExtStructType mse_or_kbd) { DEBUG_P("MiscExtCreateStruct"); @@ -384,7 +384,7 @@ MiscExtCreateStruct(MiscExtStructType mse_or_kbd) return 0; } -void +_X_EXPORT void MiscExtDestroyStruct(pointer structure, MiscExtStructType mse_or_kbd) { DEBUG_P("MiscExtDestroyStruct"); @@ -446,7 +446,7 @@ MiscExtAuthorizeDevice(InputInfoPtr pInfo, char *device) return (authorized); } -MiscExtReturn +_X_EXPORT MiscExtReturn MiscExtApply(pointer structure, MiscExtStructType mse_or_kbd) { DEBUG_P("MiscExtApply"); @@ -626,7 +626,7 @@ MiscExtApply(pointer structure, MiscExtStructType mse_or_kbd) return MISC_RET_SUCCESS; } -Bool +_X_EXPORT Bool MiscExtGetFilePaths(const char **configfile, const char **modulepath, const char **logfile) { @@ -639,7 +639,7 @@ MiscExtGetFilePaths(const char **configfile, const char **modulepath, return TRUE; } -int +_X_EXPORT int MiscExtPassMessage(int scrnIndex, const char *msgtype, const char *msgval, char **retstr) { diff --git a/hw/xfree86/common/xf86Mode.c b/hw/xfree86/common/xf86Mode.c index c84d952f0..36e81559e 100644 --- a/hw/xfree86/common/xf86Mode.c +++ b/hw/xfree86/common/xf86Mode.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86Mode.c,v 1.9 2006/01/31 13:04:02 libv Exp $ */ +/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86Mode.c,v 1.10 2006/03/07 16:00:57 libv Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Mode.c,v 1.69 2003/10/08 14:58:28 dawes Exp $ */ /* * Copyright (c) 1997-2003 by The XFree86 Project, Inc. @@ -54,7 +54,7 @@ * Find closest clock to given frequency (in kHz). This assumes the * number of clocks is greater than zero. */ -int +_X_EXPORT int xf86GetNearestClock(ScrnInfoPtr scrp, int freq, Bool allowDiv2, int DivFactor, int MulFactor, int *divider) { @@ -93,7 +93,7 @@ xf86GetNearestClock(ScrnInfoPtr scrp, int freq, Bool allowDiv2, * Convert a ModeStatus value to a printable message */ -const char * +_X_EXPORT const char * xf86ModeStatusToString(ModeStatus status) { switch (status) { @@ -180,7 +180,7 @@ xf86ModeStatusToString(ModeStatus status) * xf86ShowClockRanges() -- Print the clock ranges allowed * and the clock values scaled by ClockMulFactor and ClockDivFactor */ -void +_X_EXPORT void xf86ShowClockRanges(ScrnInfoPtr scrp, ClockRangePtr clockRanges) { ClockRangePtr cp; @@ -412,7 +412,7 @@ ModeVRefresh(DisplayModePtr mode) * reason. */ -ModeStatus +_X_EXPORT ModeStatus xf86LookupMode(ScrnInfoPtr scrp, DisplayModePtr modep, ClockRangePtr clockRanges, LookupModeFlags strategy) { @@ -736,7 +736,7 @@ xf86SetModeCrtc(DisplayModePtr p, int adjustFlags) * This function takes a mode and monitor description, and determines * if the mode is valid for the monitor. */ -ModeStatus +_X_EXPORT ModeStatus xf86CheckModeForMonitor(DisplayModePtr mode, MonPtr monitor) { int i; @@ -912,7 +912,7 @@ xf86CheckModeSize(ScrnInfoPtr scrp, int w, int x, int y) * maxVValue maximum vertical timing value */ -ModeStatus +_X_EXPORT ModeStatus xf86InitialCheckModeForDriver(ScrnInfoPtr scrp, DisplayModePtr mode, ClockRangePtr clockRanges, LookupModeFlags strategy, @@ -1060,7 +1060,7 @@ xf86InitialCheckModeForDriver(ScrnInfoPtr scrp, DisplayModePtr mode, * clockRanges allowable clock ranges */ -ModeStatus +_X_EXPORT ModeStatus xf86CheckModeForDriver(ScrnInfoPtr scrp, DisplayModePtr mode, int flags) { ClockRangesPtr cp; @@ -1234,7 +1234,7 @@ xf86CheckModeForDriver(ScrnInfoPtr scrp, DisplayModePtr mode, int flags) * if an unrecoverable error was encountered. */ -int +_X_EXPORT int xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes, char **modeNames, ClockRangePtr clockRanges, int *linePitches, int minPitch, int maxPitch, int pitchInc, @@ -1978,7 +1978,7 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes, * */ -void +_X_EXPORT void xf86DeleteMode(DisplayModePtr *modeList, DisplayModePtr mode) { /* Catch the easy/insane cases */ @@ -2010,7 +2010,7 @@ xf86DeleteMode(DisplayModePtr *modeList, DisplayModePtr mode) * invalid. */ -void +_X_EXPORT void xf86PruneDriverModes(ScrnInfoPtr scrp) { DisplayModePtr first, p, n; @@ -2064,7 +2064,7 @@ xf86PruneDriverModes(ScrnInfoPtr scrp) * parameters for each mode. The initialisation includes adjustments * for interlaced and double scan modes. */ -void +_X_EXPORT void xf86SetCrtcForModes(ScrnInfoPtr scrp, int adjustFlags) { DisplayModePtr p; @@ -2139,7 +2139,7 @@ PrintModeline(int scrnIndex,DisplayModePtr mode) xfree(flags); } -void +_X_EXPORT void xf86PrintModes(ScrnInfoPtr scrp) { DisplayModePtr p; diff --git a/hw/xfree86/common/xf86Option.c b/hw/xfree86/common/xf86Option.c index 9bffdee70..d3e38b17d 100644 --- a/hw/xfree86/common/xf86Option.c +++ b/hw/xfree86/common/xf86Option.c @@ -65,7 +65,7 @@ static Bool ParseOptionValue(int scrnIndex, pointer options, OptionInfoPtr p, * extraOpts, display, confScreen, monitor, device */ -void +_X_EXPORT void xf86CollectOptions(ScrnInfoPtr pScrn, pointer extraOpts) { XF86OptionPtr tmp; @@ -132,7 +132,7 @@ xf86CollectOptions(ScrnInfoPtr pScrn, pointer extraOpts) * pInfo->conf_idev->commonOptions, defaultOpts */ -void +_X_EXPORT void xf86CollectInputOptions(InputInfoPtr pInfo, const char **defaultOpts, pointer extraOpts) { @@ -225,28 +225,28 @@ LookupBoolOption(pointer optlist, const char *name, int deflt, Bool markUsed) /* These xf86Set* functions are intended for use by non-screen specific code */ -int +_X_EXPORT int xf86SetIntOption(pointer optlist, const char *name, int deflt) { return LookupIntOption(optlist, name, deflt, TRUE); } -double +_X_EXPORT double xf86SetRealOption(pointer optlist, const char *name, double deflt) { return LookupRealOption(optlist, name, deflt, TRUE); } -char * +_X_EXPORT char * xf86SetStrOption(pointer optlist, const char *name, char *deflt) { return LookupStrOption(optlist, name, deflt, TRUE); } -int +_X_EXPORT int xf86SetBoolOption(pointer optlist, const char *name, int deflt) { return LookupBoolOption(optlist, name, deflt, TRUE); @@ -256,28 +256,28 @@ xf86SetBoolOption(pointer optlist, const char *name, int deflt) * These are like the Set*Option functions, but they don't mark the options * as used. */ -int +_X_EXPORT int xf86CheckIntOption(pointer optlist, const char *name, int deflt) { return LookupIntOption(optlist, name, deflt, FALSE); } -double +_X_EXPORT double xf86CheckRealOption(pointer optlist, const char *name, double deflt) { return LookupRealOption(optlist, name, deflt, FALSE); } -char * +_X_EXPORT char * xf86CheckStrOption(pointer optlist, const char *name, char *deflt) { return LookupStrOption(optlist, name, deflt, FALSE); } -int +_X_EXPORT int xf86CheckBoolOption(pointer optlist, const char *name, int deflt) { return LookupBoolOption(optlist, name, deflt, FALSE); @@ -287,7 +287,7 @@ xf86CheckBoolOption(pointer optlist, const char *name, int deflt) * addNewOption() has the required property of replacing the option value * if the option is already present. */ -pointer +_X_EXPORT pointer xf86ReplaceIntOption(pointer optlist, const char *name, const int val) { char *tmp = xnfalloc(16); @@ -295,7 +295,7 @@ xf86ReplaceIntOption(pointer optlist, const char *name, const int val) return xf86AddNewOption(optlist,name,tmp); } -pointer +_X_EXPORT pointer xf86ReplaceRealOption(pointer optlist, const char *name, const double val) { char *tmp = xnfalloc(32); @@ -303,19 +303,19 @@ xf86ReplaceRealOption(pointer optlist, const char *name, const double val) return xf86AddNewOption(optlist,name,tmp); } -pointer +_X_EXPORT pointer xf86ReplaceBoolOption(pointer optlist, const char *name, const Bool val) { return xf86AddNewOption(optlist,name,val?"True":"False"); } -pointer +_X_EXPORT pointer xf86ReplaceStrOption(pointer optlist, const char *name, const char* val) { return xf86AddNewOption(optlist,name,val); } -pointer +_X_EXPORT pointer xf86AddNewOption(pointer head, const char *name, const char *val) { /* XXX These should actually be allocated in the parser library. */ @@ -326,50 +326,50 @@ xf86AddNewOption(pointer head, const char *name, const char *val) } -pointer +_X_EXPORT pointer xf86NewOption(char *name, char *value) { return xf86newOption(name, value); } -pointer +_X_EXPORT pointer xf86NextOption(pointer list) { return xf86nextOption(list); } -pointer +_X_EXPORT pointer xf86OptionListCreate(const char **options, int count, int used) { return xf86optionListCreate(options, count, used); } -pointer +_X_EXPORT pointer xf86OptionListMerge(pointer head, pointer tail) { return xf86optionListMerge(head, tail); } -void +_X_EXPORT void xf86OptionListFree(pointer opt) { xf86optionListFree(opt); } -char * +_X_EXPORT char * xf86OptionName(pointer opt) { return xf86optionName(opt); } -char * +_X_EXPORT char * xf86OptionValue(pointer opt) { return xf86optionValue(opt); } -void +_X_EXPORT void xf86OptionListReport(pointer parm) { XF86OptionPtr opts = parm; @@ -386,21 +386,21 @@ xf86OptionListReport(pointer parm) /* End of XInput-caused section */ -pointer +_X_EXPORT pointer xf86FindOption(pointer options, const char *name) { return xf86findOption(options, name); } -char * +_X_EXPORT char * xf86FindOptionValue(pointer options, const char *name) { return xf86findOptionValue(options, name); } -void +_X_EXPORT void xf86MarkOptionUsed(pointer option) { if (option != NULL) @@ -408,7 +408,7 @@ xf86MarkOptionUsed(pointer option) } -void +_X_EXPORT void xf86MarkOptionUsedByName(pointer options, const char *name) { XF86OptionPtr opt; @@ -418,7 +418,7 @@ xf86MarkOptionUsedByName(pointer options, const char *name) opt->opt_used = TRUE; } -Bool +_X_EXPORT Bool xf86CheckIfOptionUsed(pointer option) { if (option != NULL) @@ -427,7 +427,7 @@ xf86CheckIfOptionUsed(pointer option) return FALSE; } -Bool +_X_EXPORT Bool xf86CheckIfOptionUsedByName(pointer options, const char *name) { XF86OptionPtr opt; @@ -439,7 +439,7 @@ xf86CheckIfOptionUsedByName(pointer options, const char *name) return FALSE; } -void +_X_EXPORT void xf86ShowUnusedOptions(int scrnIndex, pointer options) { XF86OptionPtr opt = options; @@ -662,7 +662,7 @@ ParseOptionValue(int scrnIndex, pointer options, OptionInfoPtr p, } -void +_X_EXPORT void xf86ProcessOptions(int scrnIndex, pointer options, OptionInfoPtr optinfo) { OptionInfoPtr p; @@ -673,7 +673,7 @@ xf86ProcessOptions(int scrnIndex, pointer options, OptionInfoPtr optinfo) } -OptionInfoPtr +_X_EXPORT OptionInfoPtr xf86TokenToOptinfo(const OptionInfoRec *table, int token) { const OptionInfoRec *p, *match = NULL, *set = NULL; @@ -700,7 +700,7 @@ xf86TokenToOptinfo(const OptionInfoRec *table, int token) } -const char * +_X_EXPORT const char * xf86TokenToOptName(const OptionInfoRec *table, int token) { const OptionInfoRec *p; @@ -710,7 +710,7 @@ xf86TokenToOptName(const OptionInfoRec *table, int token) } -Bool +_X_EXPORT Bool xf86IsOptionSet(const OptionInfoRec *table, int token) { OptionInfoPtr p; @@ -720,7 +720,7 @@ xf86IsOptionSet(const OptionInfoRec *table, int token) } -char * +_X_EXPORT char * xf86GetOptValString(const OptionInfoRec *table, int token) { OptionInfoPtr p; @@ -733,7 +733,7 @@ xf86GetOptValString(const OptionInfoRec *table, int token) } -Bool +_X_EXPORT Bool xf86GetOptValInteger(const OptionInfoRec *table, int token, int *value) { OptionInfoPtr p; @@ -747,7 +747,7 @@ xf86GetOptValInteger(const OptionInfoRec *table, int token, int *value) } -Bool +_X_EXPORT Bool xf86GetOptValULong(const OptionInfoRec *table, int token, unsigned long *value) { OptionInfoPtr p; @@ -761,7 +761,7 @@ xf86GetOptValULong(const OptionInfoRec *table, int token, unsigned long *value) } -Bool +_X_EXPORT Bool xf86GetOptValReal(const OptionInfoRec *table, int token, double *value) { OptionInfoPtr p; @@ -775,7 +775,7 @@ xf86GetOptValReal(const OptionInfoRec *table, int token, double *value) } -Bool +_X_EXPORT Bool xf86GetOptValFreq(const OptionInfoRec *table, int token, OptFreqUnits expectedUnits, double *value) { @@ -823,7 +823,7 @@ xf86GetOptValFreq(const OptionInfoRec *table, int token, } -Bool +_X_EXPORT Bool xf86GetOptValBool(const OptionInfoRec *table, int token, Bool *value) { OptionInfoPtr p; @@ -837,7 +837,7 @@ xf86GetOptValBool(const OptionInfoRec *table, int token, Bool *value) } -Bool +_X_EXPORT Bool xf86ReturnOptValBool(const OptionInfoRec *table, int token, Bool def) { OptionInfoPtr p; @@ -850,7 +850,7 @@ xf86ReturnOptValBool(const OptionInfoRec *table, int token, Bool def) } -int +_X_EXPORT int xf86NameCmp(const char *s1, const char *s2) { return xf86nameCompare(s1, s2); diff --git a/hw/xfree86/common/xf86RandR.c b/hw/xfree86/common/xf86RandR.c index 5c45c6040..b06bd7728 100644 --- a/hw/xfree86/common/xf86RandR.c +++ b/hw/xfree86/common/xf86RandR.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86RandR.c,v 1.9 2005/04/20 12:25:21 daniels Exp $ */ +/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86RandR.c,v 1.25 2005/10/30 17:38:49 twini Exp $ */ /* * $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86RandR.c,v 1.7tsi Exp $ * @@ -340,7 +340,7 @@ xf86RandRCloseScreen (int index, ScreenPtr pScreen) return (*pScreen->CloseScreen) (index, pScreen); } -Rotation +_X_EXPORT Rotation xf86GetRotation(ScreenPtr pScreen) { if (xf86RandRIndex == -1) @@ -350,7 +350,7 @@ xf86GetRotation(ScreenPtr pScreen) } /* Function to change RandR's idea of the virtual screen size */ -Bool +_X_EXPORT Bool xf86RandRSetNewVirtualAndDimensions(ScreenPtr pScreen, int newvirtX, int newvirtY, int newmmWidth, int newmmHeight, Bool resetMode) diff --git a/hw/xfree86/common/xf86Versions.c b/hw/xfree86/common/xf86Versions.c index 6de7d53c2..881de1372 100644 --- a/hw/xfree86/common/xf86Versions.c +++ b/hw/xfree86/common/xf86Versions.c @@ -36,7 +36,7 @@ static CARD32 registeredVersions[NUM_BUILTIN_IFS]; -CARD32 +_X_EXPORT CARD32 xf86GetBuiltinInterfaceVersion(BuiltinInterface iface, int flags) { if (iface < 0 || iface >= NUM_BUILTIN_IFS) { @@ -61,7 +61,7 @@ xf86GetBuiltinInterfaceVersion(BuiltinInterface iface, int flags) } } -Bool +_X_EXPORT Bool xf86RegisterBuiltinInterfaceVersion(BuiltinInterface iface, CARD32 version, int flags) { diff --git a/hw/xfree86/common/xf86VidMode.c b/hw/xfree86/common/xf86VidMode.c index f91164384..272665ba3 100644 --- a/hw/xfree86/common/xf86VidMode.c +++ b/hw/xfree86/common/xf86VidMode.c @@ -63,7 +63,7 @@ static Bool VidModeClose(int i, ScreenPtr pScreen); # define DEBUG_P(x) /**/ #endif -Bool +_X_EXPORT Bool VidModeExtensionInit(ScreenPtr pScreen) { #ifdef XF86VIDMODE @@ -155,7 +155,7 @@ VidModeAvailable(int scrnIndex) } } -Bool +_X_EXPORT Bool VidModeGetCurrentModeline(int scrnIndex, pointer *mode, int *dotClock) { ScrnInfoPtr pScrn; @@ -172,7 +172,7 @@ VidModeGetCurrentModeline(int scrnIndex, pointer *mode, int *dotClock) return TRUE; } -int +_X_EXPORT int VidModeGetDotClock(int scrnIndex, int Clock) { ScrnInfoPtr pScrn; @@ -189,7 +189,7 @@ VidModeGetDotClock(int scrnIndex, int Clock) return pScrn->clock[Clock]; } -int +_X_EXPORT int VidModeGetNumOfClocks(int scrnIndex, Bool *progClock) { ScrnInfoPtr pScrn; @@ -209,7 +209,7 @@ VidModeGetNumOfClocks(int scrnIndex, Bool *progClock) } } -Bool +_X_EXPORT Bool VidModeGetClocks(int scrnIndex, int *Clocks) { ScrnInfoPtr pScrn; @@ -232,7 +232,7 @@ VidModeGetClocks(int scrnIndex, int *Clocks) } -Bool +_X_EXPORT Bool VidModeGetFirstModeline(int scrnIndex, pointer *mode, int *dotClock) { ScrnInfoPtr pScrn; @@ -257,7 +257,7 @@ VidModeGetFirstModeline(int scrnIndex, pointer *mode, int *dotClock) return VidModeGetNextModeline(scrnIndex, mode, dotClock); } -Bool +_X_EXPORT Bool VidModeGetNextModeline(int scrnIndex, pointer *mode, int *dotClock) { ScrnInfoPtr pScrn; @@ -284,7 +284,7 @@ VidModeGetNextModeline(int scrnIndex, pointer *mode, int *dotClock) return FALSE; } -Bool +_X_EXPORT Bool VidModeDeleteModeline(int scrnIndex, pointer mode) { ScrnInfoPtr pScrn; @@ -299,7 +299,7 @@ VidModeDeleteModeline(int scrnIndex, pointer mode) return TRUE; } -Bool +_X_EXPORT Bool VidModeZoomViewport(int scrnIndex, int zoom) { ScrnInfoPtr pScrn; @@ -314,7 +314,7 @@ VidModeZoomViewport(int scrnIndex, int zoom) return TRUE; } -Bool +_X_EXPORT Bool VidModeSetViewPort(int scrnIndex, int x, int y) { ScrnInfoPtr pScrn; @@ -337,7 +337,7 @@ VidModeSetViewPort(int scrnIndex, int x, int y) return TRUE; } -Bool +_X_EXPORT Bool VidModeGetViewPort(int scrnIndex, int *x, int *y) { ScrnInfoPtr pScrn; @@ -353,7 +353,7 @@ VidModeGetViewPort(int scrnIndex, int *x, int *y) return TRUE; } -Bool +_X_EXPORT Bool VidModeSwitchMode(int scrnIndex, pointer mode) { ScrnInfoPtr pScrn; @@ -377,7 +377,7 @@ VidModeSwitchMode(int scrnIndex, pointer mode) return retval; } -Bool +_X_EXPORT Bool VidModeLockZoom(int scrnIndex, Bool lock) { ScrnInfoPtr pScrn; @@ -396,7 +396,7 @@ VidModeLockZoom(int scrnIndex, Bool lock) return TRUE; } -Bool +_X_EXPORT Bool VidModeGetMonitor(int scrnIndex, pointer *monitor) { ScrnInfoPtr pScrn; @@ -412,7 +412,7 @@ VidModeGetMonitor(int scrnIndex, pointer *monitor) return TRUE; } -ModeStatus +_X_EXPORT ModeStatus VidModeCheckModeForMonitor(int scrnIndex, pointer mode) { ScrnInfoPtr pScrn; @@ -427,7 +427,7 @@ VidModeCheckModeForMonitor(int scrnIndex, pointer mode) return xf86CheckModeForMonitor((DisplayModePtr)mode, pScrn->monitor); } -ModeStatus +_X_EXPORT ModeStatus VidModeCheckModeForDriver(int scrnIndex, pointer mode) { ScrnInfoPtr pScrn; @@ -442,7 +442,7 @@ VidModeCheckModeForDriver(int scrnIndex, pointer mode) return xf86CheckModeForDriver(pScrn, (DisplayModePtr)mode, 0); } -void +_X_EXPORT void VidModeSetCrtcForMode(int scrnIndex, pointer mode) { ScrnInfoPtr pScrn; @@ -463,7 +463,7 @@ VidModeSetCrtcForMode(int scrnIndex, pointer mode) return; } -Bool +_X_EXPORT Bool VidModeAddModeline(int scrnIndex, pointer mode) { ScrnInfoPtr pScrn; @@ -486,7 +486,7 @@ VidModeAddModeline(int scrnIndex, pointer mode) return TRUE; } -int +_X_EXPORT int VidModeGetNumOfModes(int scrnIndex) { pointer mode = NULL; @@ -504,7 +504,7 @@ VidModeGetNumOfModes(int scrnIndex) } while (TRUE); } -Bool +_X_EXPORT Bool VidModeSetGamma(int scrnIndex, float red, float green, float blue) { ScrnInfoPtr pScrn; @@ -525,7 +525,7 @@ VidModeSetGamma(int scrnIndex, float red, float green, float blue) return TRUE; } -Bool +_X_EXPORT Bool VidModeGetGamma(int scrnIndex, float *red, float *green, float *blue) { ScrnInfoPtr pScrn; @@ -542,7 +542,7 @@ VidModeGetGamma(int scrnIndex, float *red, float *green, float *blue) return TRUE; } -Bool +_X_EXPORT Bool VidModeSetGammaRamp(int scrnIndex, int size, CARD16 *r, CARD16 *g, CARD16 *b) { ScrnInfoPtr pScrn; @@ -555,7 +555,7 @@ VidModeSetGammaRamp(int scrnIndex, int size, CARD16 *r, CARD16 *g, CARD16 *b) return TRUE; } -Bool +_X_EXPORT Bool VidModeGetGammaRamp(int scrnIndex, int size, CARD16 *r, CARD16 *g, CARD16 *b) { ScrnInfoPtr pScrn; @@ -568,7 +568,7 @@ VidModeGetGammaRamp(int scrnIndex, int size, CARD16 *r, CARD16 *g, CARD16 *b) return TRUE; } -int +_X_EXPORT int VidModeGetGammaRampSize(int scrnIndex) { if (!VidModeAvailable(scrnIndex)) @@ -577,7 +577,7 @@ VidModeGetGammaRampSize(int scrnIndex) return xf86GetGammaRampSize(xf86Screens[scrnIndex]->pScreen); } -pointer +_X_EXPORT pointer VidModeCreateMode(void) { DisplayModePtr mode; @@ -593,14 +593,14 @@ VidModeCreateMode(void) return mode; } -void +_X_EXPORT void VidModeCopyMode(pointer modefrom, pointer modeto) { memcpy(modeto, modefrom, sizeof(DisplayModeRec)); } -int +_X_EXPORT int VidModeGetModeValue(pointer mode, int valtyp) { int ret = 0; @@ -643,7 +643,7 @@ VidModeGetModeValue(pointer mode, int valtyp) return ret; } -void +_X_EXPORT void VidModeSetModeValue(pointer mode, int valtyp, int val) { switch (valtyp) { @@ -684,7 +684,7 @@ VidModeSetModeValue(pointer mode, int valtyp, int val) return; } -vidMonitorValue +_X_EXPORT vidMonitorValue VidModeGetMonitorValue(pointer monitor, int valtyp, int indx) { vidMonitorValue ret; diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c index 2b8fbc9d1..a931a5d60 100644 --- a/hw/xfree86/common/xf86Xinput.c +++ b/hw/xfree86/common/xf86Xinput.c @@ -48,7 +48,7 @@ * authorization from the copyright holder(s) and author(s). */ /* $XConsortium: xf86Xinput.c /main/14 1996/10/27 11:05:25 kaleb $ */ -/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86Xinput.c,v 1.7 2005/10/21 19:06:13 ajax Exp $ */ +/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86Xinput.c,v 1.8 2006/03/24 20:50:13 fredrik Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> @@ -143,7 +143,7 @@ xf86AlwaysCoreControl(DeviceIntPtr device, * *********************************************************************** */ -int +_X_EXPORT int xf86IsCorePointer(DeviceIntPtr device) { return(device == inputInfo.pointer); @@ -178,7 +178,7 @@ xf86IsCoreKeyboard(DeviceIntPtr device) (device == inputInfo.keyboard)); } -void +_X_EXPORT void xf86XInputSetSendCoreEvents(LocalDevicePtr local, Bool always) { if (always) { @@ -229,7 +229,7 @@ xf86CheckButton(int button, * *********************************************************************** */ -void +_X_EXPORT void xf86ProcessCommonOptions(LocalDevicePtr local, pointer list) { @@ -296,7 +296,7 @@ xf86XinputFinalizeInit(DeviceIntPtr dev) * *********************************************************************** */ -void +_X_EXPORT void xf86ActivateDevice(LocalDevicePtr local) { DeviceIntPtr dev; @@ -669,7 +669,7 @@ xf86eqInit (DevicePtr pKbd, DevicePtr pPtr) * called from regular code. */ -void +_X_EXPORT void xf86eqEnqueue (xEvent *e) { int oldtail, newtail; @@ -865,7 +865,7 @@ xf86eqSwitchScreen(ScreenPtr pScreen, * convenient functions to post events */ -void +_X_EXPORT void xf86PostMotionEvent(DeviceIntPtr device, int is_absolute, int first_valuator, @@ -1082,7 +1082,7 @@ xf86PostMotionEvent(DeviceIntPtr device, is_shared ? "True" : "False")); } -void +_X_EXPORT void xf86PostProximityEvent(DeviceIntPtr device, int is_in, int first_valuator, @@ -1175,7 +1175,7 @@ xf86PostProximityEvent(DeviceIntPtr device, } -void +_X_EXPORT void xf86PostButtonEvent(DeviceIntPtr device, int is_absolute, int button, @@ -1282,7 +1282,7 @@ xf86PostButtonEvent(DeviceIntPtr device, DBG(5, ErrorF("xf86PostButtonEvent END\n")); } -void +_X_EXPORT void xf86PostKeyEvent(DeviceIntPtr device, unsigned int key_code, int is_down, @@ -1342,7 +1342,7 @@ xf86PostKeyEvent(DeviceIntPtr device, va_end(var); } -void +_X_EXPORT void xf86PostKeyboardEvent(DeviceIntPtr device, unsigned int key_code, int is_down) @@ -1368,7 +1368,7 @@ xf86PostKeyboardEvent(DeviceIntPtr device, * Motion history management. */ -void +_X_EXPORT void xf86MotionHistoryAllocate(LocalDevicePtr local) { ValuatorClassPtr valuator = local->dev->valuator; @@ -1382,7 +1382,7 @@ xf86MotionHistoryAllocate(LocalDevicePtr local) local->last = 0; } -int +_X_EXPORT int xf86GetMotionEvents(DeviceIntPtr dev, xTimecoord *buff, unsigned long start, @@ -1415,7 +1415,7 @@ xf86GetMotionEvents(DeviceIntPtr dev, return num; } -LocalDevicePtr +_X_EXPORT LocalDevicePtr xf86FirstLocalDevice() { return xf86InputDevs; @@ -1434,7 +1434,7 @@ xf86FirstLocalDevice() * different orgins on the touch screen vs X. */ -int +_X_EXPORT int xf86ScaleAxis(int Cx, int Sxhigh, int Sxlow, @@ -1468,7 +1468,7 @@ xf86ScaleAxis(int Cx, * ReadInput function before any events are posted, if the device is screen * specific like a touch screen. */ -void +_X_EXPORT void xf86XInputSetScreen(LocalDevicePtr local, int screen_number, int x, @@ -1481,7 +1481,7 @@ xf86XInputSetScreen(LocalDevicePtr local, } -void +_X_EXPORT void xf86InitValuatorAxisStruct(DeviceIntPtr dev, int axnum, int minval, int maxval, int resolution, int min_res, int max_res) { @@ -1502,7 +1502,7 @@ xf86InitValuatorAxisStruct(DeviceIntPtr dev, int axnum, int minval, int maxval, * Set the valuator values to be in synch with dix/event.c * DefineInitialRootWindow(). */ -void +_X_EXPORT void xf86InitValuatorDefaults(DeviceIntPtr dev, int axnum) { #ifdef XINPUT diff --git a/hw/xfree86/common/xf86cmap.c b/hw/xfree86/common/xf86cmap.c index 0aa162a22..1ee241d0b 100644 --- a/hw/xfree86/common/xf86cmap.c +++ b/hw/xfree86/common/xf86cmap.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86cmap.c,v 1.5 2005/04/20 12:25:21 daniels Exp $ */ +/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86cmap.c,v 1.9 2005/09/05 07:43:51 daniels Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86cmap.c,v 1.25 2003/10/17 20:02:12 alanh Exp $ */ /* * Copyright (c) 1998-2001 by The XFree86 Project, Inc. @@ -129,7 +129,7 @@ static void CMapUnwrapScreen(ScreenPtr pScreen); -Bool xf86HandleColormaps( +_X_EXPORT Bool xf86HandleColormaps( ScreenPtr pScreen, int maxColors, int sigRGBbits, @@ -986,7 +986,7 @@ ComputeGammaRamp ( } } -int +_X_EXPORT int xf86ChangeGammaRamp( ScreenPtr pScreen, int size, @@ -1053,7 +1053,7 @@ xf86ChangeGammaRamp( return Success; } -int +_X_EXPORT int xf86GetGammaRampSize(ScreenPtr pScreen) { CMapScreenPtr pScreenPriv; @@ -1066,7 +1066,7 @@ xf86GetGammaRampSize(ScreenPtr pScreen) return pScreenPriv->gammaElements; } -int +_X_EXPORT int xf86GetGammaRamp( ScreenPtr pScreen, int size, diff --git a/hw/xfree86/common/xf86fbBus.c b/hw/xfree86/common/xf86fbBus.c index 28a65302d..cf8de47f6 100644 --- a/hw/xfree86/common/xf86fbBus.c +++ b/hw/xfree86/common/xf86fbBus.c @@ -54,7 +54,7 @@ Bool fbSlotClaimed = FALSE; -int +_X_EXPORT int xf86ClaimFbSlot(DriverPtr drvp, int chipset, GDevPtr dev, Bool active) { EntityPtr p; diff --git a/hw/xfree86/common/xf86fbman.c b/hw/xfree86/common/xf86fbman.c index a65b00bc2..c3eadac1f 100644 --- a/hw/xfree86/common/xf86fbman.c +++ b/hw/xfree86/common/xf86fbman.c @@ -46,7 +46,7 @@ static int xf86FBMangerIndex = -1; static unsigned long xf86ManagerGeneration = 0; -Bool xf86RegisterOffscreenManager( +_X_EXPORT Bool xf86RegisterOffscreenManager( ScreenPtr pScreen, FBManagerFuncsPtr funcs ){ @@ -63,7 +63,7 @@ Bool xf86RegisterOffscreenManager( } -Bool +_X_EXPORT Bool xf86FBManagerRunning(ScreenPtr pScreen) { if(xf86FBMangerIndex < 0) @@ -74,7 +74,7 @@ xf86FBManagerRunning(ScreenPtr pScreen) return TRUE; } -Bool +_X_EXPORT Bool xf86RegisterFreeBoxCallback( ScreenPtr pScreen, FreeBoxCallbackProcPtr FreeBoxCallback, @@ -91,7 +91,7 @@ xf86RegisterFreeBoxCallback( } -FBAreaPtr +_X_EXPORT FBAreaPtr xf86AllocateOffscreenArea( ScreenPtr pScreen, int w, int h, @@ -112,7 +112,7 @@ xf86AllocateOffscreenArea( } -FBLinearPtr +_X_EXPORT FBLinearPtr xf86AllocateOffscreenLinear( ScreenPtr pScreen, int length, @@ -133,7 +133,7 @@ xf86AllocateOffscreenLinear( } -void +_X_EXPORT void xf86FreeOffscreenArea(FBAreaPtr area) { FBManagerFuncsPtr funcs; @@ -152,7 +152,7 @@ xf86FreeOffscreenArea(FBAreaPtr area) } -void +_X_EXPORT void xf86FreeOffscreenLinear(FBLinearPtr linear) { FBManagerFuncsPtr funcs; @@ -171,7 +171,7 @@ xf86FreeOffscreenLinear(FBLinearPtr linear) } -Bool +_X_EXPORT Bool xf86ResizeOffscreenArea( FBAreaPtr resize, int w, int h @@ -189,7 +189,7 @@ xf86ResizeOffscreenArea( return (*funcs->ResizeOffscreenArea)(resize, w, h); } -Bool +_X_EXPORT Bool xf86ResizeOffscreenLinear( FBLinearPtr resize, int size @@ -208,7 +208,7 @@ xf86ResizeOffscreenLinear( } -Bool +_X_EXPORT Bool xf86QueryLargestOffscreenArea( ScreenPtr pScreen, int *w, int *h, @@ -230,7 +230,7 @@ xf86QueryLargestOffscreenArea( pScreen, w, h, gran, preferences, severity); } -Bool +_X_EXPORT Bool xf86QueryLargestOffscreenLinear( ScreenPtr pScreen, int *size, @@ -251,7 +251,7 @@ xf86QueryLargestOffscreenLinear( } -Bool +_X_EXPORT Bool xf86PurgeUnlockedOffscreenAreas(ScreenPtr pScreen) { FBManagerFuncsPtr funcs; @@ -1195,7 +1195,7 @@ xf86FBCloseScreen (int i, ScreenPtr pScreen) return (*pScreen->CloseScreen) (i, pScreen); } -Bool +_X_EXPORT Bool xf86InitFBManager( ScreenPtr pScreen, BoxPtr FullBox @@ -1232,7 +1232,7 @@ xf86InitFBManager( return ret; } -Bool +_X_EXPORT Bool xf86InitFBManagerArea( ScreenPtr pScreen, int PixelArea, @@ -1324,7 +1324,7 @@ xf86InitFBManagerArea( return ret; } -Bool +_X_EXPORT Bool xf86InitFBManagerRegion( ScreenPtr pScreen, RegionPtr FullRegion @@ -1368,7 +1368,7 @@ xf86InitFBManagerRegion( return TRUE; } -Bool +_X_EXPORT Bool xf86InitFBManagerLinear( ScreenPtr pScreen, int offset, @@ -1412,7 +1412,7 @@ xf86InitFBManagerLinear( disappear after the next release. People should use the real linear functions instead */ -FBAreaPtr +_X_EXPORT FBAreaPtr xf86AllocateLinearOffscreenArea ( ScreenPtr pScreen, int length, diff --git a/hw/xfree86/common/xf86isaBus.c b/hw/xfree86/common/xf86isaBus.c index 2cad85de8..049dcda5f 100644 --- a/hw/xfree86/common/xf86isaBus.c +++ b/hw/xfree86/common/xf86isaBus.c @@ -59,7 +59,7 @@ Bool isaSlotClaimed = FALSE; * Otherwise, claim the slot for the screen requesting it. */ -int +_X_EXPORT int xf86ClaimIsaSlot(DriverPtr drvp, int chipset, GDevPtr dev, Bool active) { EntityPtr p; @@ -114,7 +114,7 @@ xf86GetIsaInfoForScreen(int scrnIndex) * Parse a BUS ID string, and return True if it is a ISA bus id. */ -Bool +_X_EXPORT Bool xf86ParseIsaBusString(const char *busID) { /* @@ -129,7 +129,7 @@ xf86ParseIsaBusString(const char *busID) * is ISA. */ -Bool +_X_EXPORT Bool xf86IsPrimaryIsa(void) { return ( primaryBus.type == BUS_ISA ); diff --git a/hw/xfree86/common/xf86noBus.c b/hw/xfree86/common/xf86noBus.c index 09f2f4407..52e8a194c 100644 --- a/hw/xfree86/common/xf86noBus.c +++ b/hw/xfree86/common/xf86noBus.c @@ -52,7 +52,7 @@ #include "xf86RAC.h" -int +_X_EXPORT int xf86ClaimNoSlot(DriverPtr drvp, int chipset, GDevPtr dev, Bool active) { EntityPtr p; diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c index f0fb93e0d..e06dce524 100644 --- a/hw/xfree86/common/xf86pciBus.c +++ b/hw/xfree86/common/xf86pciBus.c @@ -149,7 +149,7 @@ static PciBusPtr xf86PciBus = NULL; static void pciConvertListToHost(int bus, int dev, int func, resPtr list); static PciBusPtr xf86GetPciBridgeInfo(void); -void +_X_EXPORT void xf86FormatPciBusNumber(int busnum, char *buffer) { /* 'buffer' should be at least 8 characters long */ @@ -1437,7 +1437,7 @@ fixPciResource(int prt, memType alignment, pciVideoPtr pvp, unsigned long type) } -Bool +_X_EXPORT Bool xf86FixPciResource(int entityIndex, int prt, memType alignment, unsigned long type) { @@ -1445,7 +1445,7 @@ xf86FixPciResource(int entityIndex, int prt, memType alignment, return fixPciResource(prt, alignment, pvp, type); } -resPtr +_X_EXPORT resPtr xf86ReallocatePciResources(int entityIndex, resPtr pRes) { pciVideoPtr pvp = xf86GetPciInfoForEntity(entityIndex); @@ -2791,7 +2791,7 @@ DisablePciBusAccess(void) * Public functions */ -Bool +_X_EXPORT Bool xf86IsPciDevPresent(int bus, int dev, int func) { int i = 0; @@ -2812,7 +2812,7 @@ xf86IsPciDevPresent(int bus, int dev, int func) * Otherwise, claim the slot for the screen requesting it. */ -int +_X_EXPORT int xf86ClaimPciSlot(int bus, int device, int func, DriverPtr drvp, int chipset, GDevPtr dev, Bool active) { @@ -2879,7 +2879,7 @@ xf86ClaimPciSlot(int bus, int device, int func, DriverPtr drvp, /* * Get xf86PciVideoInfo for a driver. */ -pciVideoPtr * +_X_EXPORT pciVideoPtr * xf86GetPciVideoInfo(void) { return xf86PciVideoInfo; @@ -2890,7 +2890,7 @@ xf86GetPciVideoInfo(void) /* * Get the full xf86scanpci data. */ -pciConfigPtr * +_X_EXPORT pciConfigPtr * xf86GetPciConfigInfo(void) { return xf86PciInfo; @@ -2913,7 +2913,7 @@ xf86GetPciConfigInfo(void) * * The device represented by pvp may not have been previously claimed. */ -void +_X_EXPORT void xf86SetPciVideo(pciVideoPtr pvp, resType rt) { static BusAccPtr pbap = NULL; @@ -3013,7 +3013,7 @@ xf86SetPciVideo(pciVideoPtr pvp, resType rt) * in the correct format for a PCI bus id. */ -Bool +_X_EXPORT Bool xf86ParsePciBusString(const char *busID, int *bus, int *device, int *func) { /* @@ -3087,7 +3087,7 @@ xf86ParsePciBusString(const char *busID, int *bus, int *device, int *func) * Compare a BUS ID string with a PCI bus id. Return TRUE if they match. */ -Bool +_X_EXPORT Bool xf86ComparePciBusString(const char *busID, int bus, int device, int func) { int ibus, idevice, ifunc; @@ -3104,7 +3104,7 @@ xf86ComparePciBusString(const char *busID, int bus, int device, int func) * is PCI and bus, dev and func numbers match. */ -Bool +_X_EXPORT Bool xf86IsPrimaryPci(pciVideoPtr pPci) { if (primaryBus.type != BUS_PCI) return FALSE; @@ -3116,7 +3116,7 @@ xf86IsPrimaryPci(pciVideoPtr pPci) /* * xf86GetPciInfoForEntity() -- Get the pciVideoRec of entity. */ -pciVideoPtr +_X_EXPORT pciVideoPtr xf86GetPciInfoForEntity(int entityIndex) { pciVideoPtr *ppPci; @@ -3138,7 +3138,7 @@ xf86GetPciInfoForEntity(int entityIndex) return NULL; } -int +_X_EXPORT int xf86GetPciEntity(int bus, int dev, int func) { int i; @@ -3159,7 +3159,7 @@ xf86GetPciEntity(int bus, int dev, int func) * xf86CheckPciMemBase() checks that the memory base value matches one of the * PCI base address register values for the given PCI device. */ -Bool +_X_EXPORT Bool xf86CheckPciMemBase(pciVideoPtr pPci, memType base) { int i; @@ -3174,7 +3174,7 @@ xf86CheckPciMemBase(pciVideoPtr pPci, memType base) * Check if the slot requested is free. If it is already in use, return FALSE. */ -Bool +_X_EXPORT Bool xf86CheckPciSlot(int bus, int device, int func) { int i; @@ -3199,7 +3199,7 @@ xf86CheckPciSlot(int bus, int device, int func) * so by setting pvp_exclude one pci device can be explicitely * _excluded if required. */ -pciVideoPtr +_X_EXPORT pciVideoPtr xf86FindPciDeviceVendor(CARD16 vendorID, CARD16 deviceID, char n, pciVideoPtr pvp_exclude) { @@ -3215,7 +3215,7 @@ xf86FindPciDeviceVendor(CARD16 vendorID, CARD16 deviceID, return pvp; } -pciVideoPtr +_X_EXPORT pciVideoPtr xf86FindPciClass(CARD8 intf, CARD8 subClass, CARD16 class, char n, pciVideoPtr pvp_exclude) { @@ -3400,7 +3400,7 @@ pciConvertRange2Host(int entityIndex, resRange *pRange) #ifdef INCLUDE_DEPRECATED -void +_X_EXPORT void xf86EnablePciBusMaster(pciVideoPtr pPci, Bool enable) { CARD32 temp; diff --git a/hw/xfree86/common/xf86sbusBus.c b/hw/xfree86/common/xf86sbusBus.c index 3d6576f52..4e84729fb 100644 --- a/hw/xfree86/common/xf86sbusBus.c +++ b/hw/xfree86/common/xf86sbusBus.c @@ -361,7 +361,7 @@ xf86ClaimSbusSlot(sbusDevicePtr psdp, DriverPtr drvp, return -1; } -int +_X_EXPORT int xf86MatchSbusInstances(const char *driverName, int sbusDevId, GDevPtr *devList, int numDevs, DriverPtr drvp, int **foundEntities) @@ -537,7 +537,7 @@ xf86MatchSbusInstances(const char *driverName, int sbusDevId, /* * xf86GetSbusInfoForEntity() -- Get the sbusDevicePtr of entity. */ -sbusDevicePtr +_X_EXPORT sbusDevicePtr xf86GetSbusInfoForEntity(int entityIndex) { sbusDevicePtr *psdpp; @@ -553,7 +553,7 @@ xf86GetSbusInfoForEntity(int entityIndex) return NULL; } -int +_X_EXPORT int xf86GetEntityForSbusInfo(sbusDevicePtr psdp) { int i; @@ -568,7 +568,7 @@ xf86GetEntityForSbusInfo(sbusDevicePtr psdp) return -1; } -void +_X_EXPORT void xf86SbusUseBuiltinMode(ScrnInfoPtr pScrn, sbusDevicePtr psdp) { DisplayModePtr mode; @@ -667,7 +667,7 @@ xf86SbusCmapCloseScreen(int i, ScreenPtr pScreen) return (*pScreen->CloseScreen) (i, pScreen); } -Bool +_X_EXPORT Bool xf86SbusHandleColormaps(ScreenPtr pScreen, sbusDevicePtr psdp) { sbusCmapPtr cmap; diff --git a/hw/xfree86/common/xf86xv.c b/hw/xfree86/common/xf86xv.c index 35695bd9e..821ece11d 100644 --- a/hw/xfree86/common/xf86xv.c +++ b/hw/xfree86/common/xf86xv.c @@ -141,7 +141,7 @@ int (*XvScreenInitProc)(ScreenPtr) = XvScreenInit; static xf86XVInitGenericAdaptorPtr *GenDrivers = NULL; static int NumGenDrivers = 0; -int +_X_EXPORT int xf86XVRegisterGenericAdaptorDriver( xf86XVInitGenericAdaptorPtr InitFunc ){ @@ -158,7 +158,7 @@ xf86XVRegisterGenericAdaptorDriver( return 1; } -int +_X_EXPORT int xf86XVListGenericAdaptors( ScrnInfoPtr pScrn, XF86VideoAdaptorPtr **adaptors @@ -197,7 +197,7 @@ typedef struct { static OffscreenImageRec OffscreenImages[MAXSCREENS]; -Bool +_X_EXPORT Bool xf86XVRegisterOffscreenImages( ScreenPtr pScreen, XF86OffscreenImagePtr images, @@ -209,7 +209,7 @@ xf86XVRegisterOffscreenImages( return TRUE; } -XF86OffscreenImagePtr +_X_EXPORT XF86OffscreenImagePtr xf86XVQueryOffscreenImages( ScreenPtr pScreen, int *num @@ -219,20 +219,20 @@ xf86XVQueryOffscreenImages( } -XF86VideoAdaptorPtr +_X_EXPORT XF86VideoAdaptorPtr xf86XVAllocateVideoAdaptorRec(ScrnInfoPtr pScrn) { return xcalloc(1, sizeof(XF86VideoAdaptorRec)); } -void +_X_EXPORT void xf86XVFreeVideoAdaptorRec(XF86VideoAdaptorPtr ptr) { xfree(ptr); } -Bool +_X_EXPORT Bool xf86XVScreenInit( ScreenPtr pScreen, XF86VideoAdaptorPtr *adaptors, @@ -1819,7 +1819,7 @@ xf86XVQueryImageAttributes( format->id, width, height, pitches, offsets); } -void +_X_EXPORT void xf86XVFillKeyHelper (ScreenPtr pScreen, CARD32 key, RegionPtr clipboxes) { XF86XVScreenPtr ScreenPriv = GET_XF86XV_SCREEN(pScreen); @@ -1871,7 +1871,7 @@ xf86XVFillKeyHelper (ScreenPtr pScreen, CARD32 key, RegionPtr clipboxes) #define DummyScreen screenInfo.screens[0] -Bool +_X_EXPORT Bool xf86XVClipVideoHelper( BoxPtr dst, INT32 *xa, @@ -1953,7 +1953,7 @@ xf86XVClipVideoHelper( return TRUE; } -void +_X_EXPORT void xf86XVCopyYUV12ToPacked( const void *srcy, const void *srcv, @@ -2011,7 +2011,7 @@ xf86XVCopyYUV12ToPacked( } } -void +_X_EXPORT void xf86XVCopyPacked( const void *src, void *dst, diff --git a/hw/xfree86/common/xf86xvmc.c b/hw/xfree86/common/xf86xvmc.c index cfc63fa42..40c82c75d 100644 --- a/hw/xfree86/common/xf86xvmc.c +++ b/hw/xfree86/common/xf86xvmc.c @@ -163,7 +163,7 @@ xf86XvMCCloseScreen (int i, ScreenPtr pScreen) return (*pScreen->CloseScreen)(i, pScreen); } -Bool xf86XvMCScreenInit( +_X_EXPORT Bool xf86XvMCScreenInit( ScreenPtr pScreen, int num_adaptors, XF86MCAdaptorPtr *adaptors @@ -233,12 +233,12 @@ Bool xf86XvMCScreenInit( return TRUE; } -XF86MCAdaptorPtr xf86XvMCCreateAdaptorRec (void) +_X_EXPORT XF86MCAdaptorPtr xf86XvMCCreateAdaptorRec (void) { return xcalloc(1, sizeof(XF86MCAdaptorRec)); } -void xf86XvMCDestroyAdaptorRec(XF86MCAdaptorPtr adaptor) +_X_EXPORT void xf86XvMCDestroyAdaptorRec(XF86MCAdaptorPtr adaptor) { xfree(adaptor); } diff --git a/hw/xfree86/common/xisb.c b/hw/xfree86/common/xisb.c index 4ffc3ede4..8ec6f4c13 100644 --- a/hw/xfree86/common/xisb.c +++ b/hw/xfree86/common/xisb.c @@ -68,7 +68,7 @@ * Function Definitions ****************************************************************************/ -XISBuffer * +_X_EXPORT XISBuffer * XisbNew (int fd, xf86ssize_t size) { XISBuffer *b; @@ -92,14 +92,14 @@ XisbNew (int fd, xf86ssize_t size) return (b); } -void +_X_EXPORT void XisbFree (XISBuffer *b) { xfree (b->buf); xfree (b); } -int +_X_EXPORT int XisbRead (XISBuffer *b) { int ret; @@ -142,7 +142,7 @@ XisbRead (XISBuffer *b) } /* the only purpose of this function is to provide output tracing */ -xf86ssize_t +_X_EXPORT xf86ssize_t XisbWrite (XISBuffer *b, unsigned char *msg, xf86ssize_t len) { if (b->trace) @@ -155,7 +155,7 @@ XisbWrite (XISBuffer *b, unsigned char *msg, xf86ssize_t len) } /* turn tracing of this buffer on (1) or off (0) */ -void +_X_EXPORT void XisbTrace (XISBuffer *b, int trace) { b->trace = trace; @@ -173,7 +173,7 @@ XisbTrace (XISBuffer *b, int trace) * give duration in usecs. */ -void +_X_EXPORT void XisbBlockDuration (XISBuffer *b, int block_duration) { b->block_duration = block_duration; |