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 | |
| parent | ae935832facfa81a9689882406ecca74b0346790 (diff) | |
Mark everything in xf86sym.c as _X_EXPORT.
Diffstat (limited to 'hw')
106 files changed, 833 insertions, 833 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; diff --git a/hw/xfree86/dummylib/xf86addrestolist.c b/hw/xfree86/dummylib/xf86addrestolist.c index fe21d5cab..86b8d5243 100644 --- a/hw/xfree86/dummylib/xf86addrestolist.c +++ b/hw/xfree86/dummylib/xf86addrestolist.c @@ -6,19 +6,19 @@ #include "xf86.h" -resPtr +_X_EXPORT resPtr xf86AddResToList(resPtr rlist, resRange *Range, int entityIndex) { return rlist; } -void +_X_EXPORT void xf86FreeResList(resPtr rlist) { return; } -resPtr +_X_EXPORT resPtr xf86DupResList(const resPtr rlist) { return rlist; diff --git a/hw/xfree86/dummylib/xf86allocscripi.c b/hw/xfree86/dummylib/xf86allocscripi.c index 9d9e72154..8abad9fa5 100644 --- a/hw/xfree86/dummylib/xf86allocscripi.c +++ b/hw/xfree86/dummylib/xf86allocscripi.c @@ -13,7 +13,7 @@ * Utility functions required by libxf86_os. */ -int +_X_EXPORT int xf86AllocateScrnInfoPrivateIndex() { return -1; diff --git a/hw/xfree86/dummylib/xf86drvmsg.c b/hw/xfree86/dummylib/xf86drvmsg.c index 40f956594..13c8c0bc5 100644 --- a/hw/xfree86/dummylib/xf86drvmsg.c +++ b/hw/xfree86/dummylib/xf86drvmsg.c @@ -13,7 +13,7 @@ * Utility functions required by libxf86_os. */ -void +_X_EXPORT void xf86DrvMsg(int i, MessageType type, const char *format, ...) { va_list ap; diff --git a/hw/xfree86/dummylib/xf86drvmsgverb.c b/hw/xfree86/dummylib/xf86drvmsgverb.c index 04cbf59da..1320117fc 100644 --- a/hw/xfree86/dummylib/xf86drvmsgverb.c +++ b/hw/xfree86/dummylib/xf86drvmsgverb.c @@ -13,7 +13,7 @@ * Utility functions required by libxf86_os. */ -void +_X_EXPORT void xf86DrvMsgVerb(int i, MessageType type, int verb, const char *format, ...) { va_list ap; diff --git a/hw/xfree86/dummylib/xf86errorf.c b/hw/xfree86/dummylib/xf86errorf.c index 4ad677413..41ebbee21 100644 --- a/hw/xfree86/dummylib/xf86errorf.c +++ b/hw/xfree86/dummylib/xf86errorf.c @@ -13,7 +13,7 @@ * Utility functions required by libxf86_os. */ -void +_X_EXPORT void xf86ErrorF(const char *format, ...) { va_list ap; diff --git a/hw/xfree86/dummylib/xf86errorfverb.c b/hw/xfree86/dummylib/xf86errorfverb.c index 65399e334..398d0b3c3 100644 --- a/hw/xfree86/dummylib/xf86errorfverb.c +++ b/hw/xfree86/dummylib/xf86errorfverb.c @@ -13,7 +13,7 @@ * Utility functions required by libxf86_os. */ -void +_X_EXPORT void xf86ErrorFVerb(int verb, const char *format, ...) { va_list ap; diff --git a/hw/xfree86/dummylib/xf86getpagesize.c b/hw/xfree86/dummylib/xf86getpagesize.c index 439b63ac9..ec13c9b41 100644 --- a/hw/xfree86/dummylib/xf86getpagesize.c +++ b/hw/xfree86/dummylib/xf86getpagesize.c @@ -15,7 +15,7 @@ int xf86getpagesize(void); -int +_X_EXPORT int xf86getpagesize(void) { return 4096; /* not used */ diff --git a/hw/xfree86/dummylib/xf86getverb.c b/hw/xfree86/dummylib/xf86getverb.c index 24046af67..dae6c68d7 100644 --- a/hw/xfree86/dummylib/xf86getverb.c +++ b/hw/xfree86/dummylib/xf86getverb.c @@ -13,7 +13,7 @@ * Utility functions required by libxf86_os. */ -int +_X_EXPORT int xf86GetVerbosity() { return xf86Verbose; diff --git a/hw/xfree86/dummylib/xf86msg.c b/hw/xfree86/dummylib/xf86msg.c index 919625ead..08cb5da80 100644 --- a/hw/xfree86/dummylib/xf86msg.c +++ b/hw/xfree86/dummylib/xf86msg.c @@ -13,7 +13,7 @@ * Utility functions required by libxf86_os. */ -void +_X_EXPORT void xf86Msg(MessageType type, const char *format, ...) { va_list ap; diff --git a/hw/xfree86/dummylib/xf86msgverb.c b/hw/xfree86/dummylib/xf86msgverb.c index a54c8a565..ffad8c7cb 100644 --- a/hw/xfree86/dummylib/xf86msgverb.c +++ b/hw/xfree86/dummylib/xf86msgverb.c @@ -13,7 +13,7 @@ * Utility functions required by libxf86_os. */ -void +_X_EXPORT void xf86MsgVerb(MessageType type, int verb, const char *format, ...) { va_list ap; diff --git a/hw/xfree86/dummylib/xf86opt.c b/hw/xfree86/dummylib/xf86opt.c index 45779054a..e46c00b69 100644 --- a/hw/xfree86/dummylib/xf86opt.c +++ b/hw/xfree86/dummylib/xf86opt.c @@ -13,12 +13,12 @@ * Utility functions required by libxf86_os. */ -void +_X_EXPORT void xf86ProcessOptions(int i, pointer p, OptionInfoPtr o) { } -Bool +_X_EXPORT Bool xf86GetOptValBool(const OptionInfoRec *o, int i, Bool *b) { return FALSE; diff --git a/hw/xfree86/dummylib/xf86screens.c b/hw/xfree86/dummylib/xf86screens.c index dfd9d8a1a..32a35ef91 100644 --- a/hw/xfree86/dummylib/xf86screens.c +++ b/hw/xfree86/dummylib/xf86screens.c @@ -10,5 +10,5 @@ #include "xf86Priv.h" /* Dummy variables */ -ScrnInfoPtr *xf86Screens = NULL; +_X_EXPORT ScrnInfoPtr *xf86Screens = NULL; diff --git a/hw/xfree86/loader/loader.c b/hw/xfree86/loader/loader.c index aed5a541b..ba2f4e692 100644 --- a/hw/xfree86/loader/loader.c +++ b/hw/xfree86/loader/loader.c @@ -858,7 +858,7 @@ LoaderVRefSymbols(const char *sym0, va_list args) } while (s != NULL); } -void +_X_EXPORT void LoaderRefSymbols(const char *sym0, ...) { va_list ap; @@ -883,7 +883,7 @@ LoaderVRefSymLists(const char **list0, va_list args) } while (l != NULL); } -void +_X_EXPORT void LoaderRefSymLists(const char **list0, ...) { va_list ap; @@ -908,7 +908,7 @@ LoaderVReqSymLists(const char **list0, va_list args) } while (l != NULL); } -void +_X_EXPORT void LoaderReqSymLists(const char **list0, ...) { va_list ap; @@ -933,7 +933,7 @@ LoaderVReqSymbols(const char *sym0, va_list args) } while (s != NULL); } -void +_X_EXPORT void LoaderReqSymbols(const char *sym0, ...) { va_list ap; @@ -1364,7 +1364,7 @@ LoaderHandleOpen(int handle) return handle; } -void * +_X_EXPORT void * LoaderSymbol(const char *sym) { int i; @@ -1395,7 +1395,7 @@ LoaderResolveSymbols(void) return 0; } -int +_X_EXPORT int LoaderCheckUnresolved(int delay_flag) { int i, ret = 0; @@ -1429,7 +1429,7 @@ xf86LoaderTrap(void) { } -void +_X_EXPORT void LoaderDefaultFunc(void) { ErrorF("\n\n\tThis should not happen!\n" diff --git a/hw/xfree86/loader/loadext.c b/hw/xfree86/loader/loadext.c index 5a795d372..787538fd4 100644 --- a/hw/xfree86/loader/loadext.c +++ b/hw/xfree86/loader/loadext.c @@ -63,7 +63,7 @@ NewExtensionModule(void) } } -void +_X_EXPORT void LoadExtension(ExtensionModule * e, Bool builtin) { ExtensionModule *newext; diff --git a/hw/xfree86/loader/loadfont.c b/hw/xfree86/loader/loadfont.c index 675828412..ba5b6fb43 100644 --- a/hw/xfree86/loader/loadfont.c +++ b/hw/xfree86/loader/loadfont.c @@ -62,7 +62,7 @@ NewFontModule(void) } } -void +_X_EXPORT void LoadFont(FontModule * f) { FontModule *newfont; diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c index b14914eb5..8105abb52 100644 --- a/hw/xfree86/loader/loadmod.c +++ b/hw/xfree86/loader/loadmod.c @@ -479,7 +479,7 @@ FindModule(const char *module, const char *dir, const char **subdirlist, return NULL; } -char ** +_X_EXPORT char ** LoaderListDirs(const char **subdirlist, const char **patternlist) { char buf[PATH_MAX + 1]; @@ -573,7 +573,7 @@ LoaderListDirs(const char **subdirlist, const char **patternlist) return listing; } -void +_X_EXPORT void LoaderFreeDirList(char **list) { FreeStringList(list); @@ -756,7 +756,7 @@ CheckVersion(const char *module, XF86ModuleVersionInfo * data, return TRUE; } -ModuleDescPtr +_X_EXPORT ModuleDescPtr LoadSubModule(ModuleDescPtr parent, const char *module, const char **subdirlist, const char **patternlist, pointer options, const XF86ModReqInfo * modreq, @@ -828,7 +828,7 @@ LoadSubModuleLocal(ModuleDescPtr parent, const char *module, return submod; } -ModuleDescPtr +_X_EXPORT ModuleDescPtr DuplicateModule(ModuleDescPtr mod, ModuleDescPtr parent) { ModuleDescPtr ret; @@ -1158,7 +1158,7 @@ UnloadModuleOrDriver(ModuleDescPtr mod) #endif } -void +_X_EXPORT void UnloadSubModule(ModuleDescPtr mod) { if (mod == NULL || mod->name == NULL) @@ -1261,7 +1261,7 @@ RemoveChild(ModuleDescPtr child) return; } -void +_X_EXPORT void LoaderErrorMsg(const char *name, const char *modname, int errmaj, int errmin) { const char *msg; diff --git a/hw/xfree86/loader/os.c b/hw/xfree86/loader/os.c index 9715af07b..4274200c3 100644 --- a/hw/xfree86/loader/os.c +++ b/hw/xfree86/loader/os.c @@ -70,7 +70,7 @@ /* Return the OS name, and run-time OS version */ -void +_X_EXPORT void LoaderGetOS(const char **name, int *major, int *minor, int *teeny) { if (name) diff --git a/hw/xfree86/os-support/bsd/alpha_video.c b/hw/xfree86/os-support/bsd/alpha_video.c index ca0f0f8e7..518deaa1e 100644 --- a/hw/xfree86/os-support/bsd/alpha_video.c +++ b/hw/xfree86/os-support/bsd/alpha_video.c @@ -358,7 +358,7 @@ unmapVidMem(int ScreenNum, pointer Base, unsigned long Size) * Read BIOS via mmap()ing DEV_MEM */ -int +_X_EXPORT int xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf, int Len) { @@ -403,7 +403,7 @@ xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf, extern int ioperm(unsigned long from, unsigned long num, int on); -Bool +_X_EXPORT Bool xf86EnableIO() { if (!ioperm(0, 65536, TRUE)) @@ -411,7 +411,7 @@ xf86EnableIO() return FALSE; } -void +_X_EXPORT void xf86DisableIO() { return; @@ -440,14 +440,14 @@ xf86DisableIO() /* Interrupt Handling section */ /***************************************************************************/ -Bool +_X_EXPORT Bool xf86DisableInterrupts() { return(TRUE); } -void +_X_EXPORT void xf86EnableInterrupts() { return; @@ -714,22 +714,22 @@ writeSparseNB32(int Value, pointer Base, register unsigned long Offset) return; } -void (*xf86WriteMmio8)(int Value, pointer Base, unsigned long Offset) +_X_EXPORT void (*xf86WriteMmio8)(int Value, pointer Base, unsigned long Offset) = writeDense8; -void (*xf86WriteMmio16)(int Value, pointer Base, unsigned long Offset) +_X_EXPORT void (*xf86WriteMmio16)(int Value, pointer Base, unsigned long Offset) = writeDense16; -void (*xf86WriteMmio32)(int Value, pointer Base, unsigned long Offset) +_X_EXPORT void (*xf86WriteMmio32)(int Value, pointer Base, unsigned long Offset) = writeDense32; -void (*xf86WriteMmioNB8)(int Value, pointer Base, unsigned long Offset) +_X_EXPORT void (*xf86WriteMmioNB8)(int Value, pointer Base, unsigned long Offset) = writeDenseNB8; -void (*xf86WriteMmioNB16)(int Value, pointer Base, unsigned long Offset) +_X_EXPORT void (*xf86WriteMmioNB16)(int Value, pointer Base, unsigned long Offset) = writeDenseNB16; -void (*xf86WriteMmioNB32)(int Value, pointer Base, unsigned long Offset) +_X_EXPORT void (*xf86WriteMmioNB32)(int Value, pointer Base, unsigned long Offset) = writeDenseNB32; -int (*xf86ReadMmio8)(pointer Base, unsigned long Offset) +_X_EXPORT int (*xf86ReadMmio8)(pointer Base, unsigned long Offset) = readDense8; -int (*xf86ReadMmio16)(pointer Base, unsigned long Offset) +_X_EXPORT int (*xf86ReadMmio16)(pointer Base, unsigned long Offset) = readDense16; -int (*xf86ReadMmio32)(pointer Base, unsigned long Offset) +_X_EXPORT int (*xf86ReadMmio32)(pointer Base, unsigned long Offset) = readDense32; diff --git a/hw/xfree86/os-support/bsd/arm_video.c b/hw/xfree86/os-support/bsd/arm_video.c index 98fb8f993..bdc2e0a2b 100644 --- a/hw/xfree86/os-support/bsd/arm_video.c +++ b/hw/xfree86/os-support/bsd/arm_video.c @@ -236,7 +236,7 @@ unmapVidMem(int ScreenNum, pointer Base, unsigned long Size) * Read BIOS via mmap()ing DEV_MEM */ -int +_X_EXPORT int xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf, int Len) { @@ -453,7 +453,7 @@ armUnmapVidMem(int ScreenNum, pointer Base, unsigned long Size) #ifdef USE_DEV_IO static int IoFd = -1; -Bool +_X_EXPORT Bool xf86EnableIO() { if (IoFd >= 0) @@ -468,7 +468,7 @@ xf86EnableIO() return TRUE; } -void +_X_EXPORT void xf86DisableIO() { if (IoFd < 0) @@ -530,14 +530,14 @@ xf86DisableIO() /* Interrupt Handling section */ /***************************************************************************/ -Bool +_X_EXPORT Bool xf86DisableInterrupts() { return(TRUE); } -void +_X_EXPORT void xf86EnableInterrupts() { diff --git a/hw/xfree86/os-support/bsd/bsdResource.c b/hw/xfree86/os-support/bsd/bsdResource.c index d38230a83..0ecd6f64f 100644 --- a/hw/xfree86/os-support/bsd/bsdResource.c +++ b/hw/xfree86/os-support/bsd/bsdResource.c @@ -18,7 +18,7 @@ /* Avoid Imakefile changes */ #include "bus/Pci.h" -resRange PciAvoid[] = {_PCI_AVOID_PC_STYLE, _END}; +_X_EXPORT resRange PciAvoid[] = {_PCI_AVOID_PC_STYLE, _END}; #ifdef INCLUDE_XF86_NO_DOMAIN diff --git a/hw/xfree86/os-support/bsd/bsd_io.c b/hw/xfree86/os-support/bsd/bsd_io.c index 3b1f58889..6e288d43f 100644 --- a/hw/xfree86/os-support/bsd/bsd_io.c +++ b/hw/xfree86/os-support/bsd/bsd_io.c @@ -43,7 +43,7 @@ #define KBD_FD(i) ((i).kbdFd != -1 ? (i).kbdFd : (i).consoleFd) #endif -void +_X_EXPORT void xf86SoundKbdBell(int loudness, int pitch, int duration) { #ifdef WSCONS_SUPPORT diff --git a/hw/xfree86/os-support/bsd/bsd_kbd.c b/hw/xfree86/os-support/bsd/bsd_kbd.c index 18219e5bc..4b4ba3af3 100644 --- a/hw/xfree86/os-support/bsd/bsd_kbd.c +++ b/hw/xfree86/os-support/bsd/bsd_kbd.c @@ -542,7 +542,7 @@ OpenKeyboard(InputInfoPtr pInfo) return TRUE; } -Bool +_X_EXPORT Bool xf86OSKbdPreInit(InputInfoPtr pInfo) { KbdDevPtr pKbd = pInfo->private; diff --git a/hw/xfree86/os-support/bsd/bsd_kmod.c b/hw/xfree86/os-support/bsd/bsd_kmod.c index e3c4bb77c..08180106d 100644 --- a/hw/xfree86/os-support/bsd/bsd_kmod.c +++ b/hw/xfree86/os-support/bsd/bsd_kmod.c @@ -21,7 +21,7 @@ * Return: * 0 for failure, 1 for success */ -int xf86LoadKernelModule(const char *modName) +_X_EXPORT int xf86LoadKernelModule(const char *modName) { if (kldload(modName) != -1) return 1; diff --git a/hw/xfree86/os-support/bsd/bsd_mouse.c b/hw/xfree86/os-support/bsd/bsd_mouse.c index a1b284d2b..9c8e6699e 100644 --- a/hw/xfree86/os-support/bsd/bsd_mouse.c +++ b/hw/xfree86/os-support/bsd/bsd_mouse.c @@ -762,7 +762,7 @@ bsdMousePreInit(InputInfoPtr pInfo, const char *protocol, int flags) return TRUE; } -OSMouseInfoPtr +_X_EXPORT OSMouseInfoPtr xf86OSMouseInit(int flags) { OSMouseInfoPtr p; diff --git a/hw/xfree86/os-support/bsd/i386_video.c b/hw/xfree86/os-support/bsd/i386_video.c index 3f4cdb010..8668396e0 100644 --- a/hw/xfree86/os-support/bsd/i386_video.c +++ b/hw/xfree86/os-support/bsd/i386_video.c @@ -286,7 +286,7 @@ unmapVidMem(int ScreenNum, pointer Base, unsigned long Size) * Read BIOS via mmap()ing DEV_MEM */ -int +_X_EXPORT int xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf, int Len) { @@ -338,7 +338,7 @@ xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf, static Bool ExtendedEnabled = FALSE; -Bool +_X_EXPORT Bool xf86EnableIO() { if (ExtendedEnabled) @@ -360,7 +360,7 @@ xf86EnableIO() return TRUE; } -void +_X_EXPORT void xf86DisableIO() { if (!ExtendedEnabled) @@ -456,7 +456,7 @@ xf86DisableIO() /* Interrupt Handling section */ /***************************************************************************/ -Bool +_X_EXPORT Bool xf86DisableInterrupts() { @@ -469,7 +469,7 @@ xf86DisableInterrupts() return(TRUE); } -void +_X_EXPORT void xf86EnableInterrupts() { diff --git a/hw/xfree86/os-support/bsd/ppc_video.c b/hw/xfree86/os-support/bsd/ppc_video.c index edcb20c1b..d53f615bb 100644 --- a/hw/xfree86/os-support/bsd/ppc_video.c +++ b/hw/xfree86/os-support/bsd/ppc_video.c @@ -67,7 +67,7 @@ xf86OSInitVidMem(VidMemInfoPtr pVidMem) } -volatile unsigned char *ioBase = MAP_FAILED; +_X_EXPORT volatile unsigned char *ioBase = MAP_FAILED; static pointer ppcMapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags) @@ -96,7 +96,7 @@ ppcUnmapVidMem(int ScreenNum, pointer Base, unsigned long Size) munmap(Base, Size); } -int +_X_EXPORT int xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf, int Len) { @@ -126,14 +126,14 @@ xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf, /* Interrupt Handling section */ /***************************************************************************/ -Bool +_X_EXPORT Bool xf86DisableInterrupts() { return(TRUE); } -void +_X_EXPORT void xf86EnableInterrupts() { diff --git a/hw/xfree86/os-support/bsd/sparc64_video.c b/hw/xfree86/os-support/bsd/sparc64_video.c index d9dfcca31..dfd5d9f54 100644 --- a/hw/xfree86/os-support/bsd/sparc64_video.c +++ b/hw/xfree86/os-support/bsd/sparc64_video.c @@ -86,7 +86,7 @@ sparc64UnmapVidMem(int ScreenNum, pointer Base, unsigned long Size) munmap(Base, Size); } -int +_X_EXPORT int xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf, int Len) { @@ -98,14 +98,14 @@ xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf, /* Interrupt Handling section */ /***************************************************************************/ -Bool +_X_EXPORT Bool xf86DisableInterrupts() { return(TRUE); } -void +_X_EXPORT void xf86EnableInterrupts() { diff --git a/hw/xfree86/os-support/bus/Pci.c b/hw/xfree86/os-support/bus/Pci.c index 46d1bf60e..15cd8f461 100644 --- a/hw/xfree86/os-support/bus/Pci.c +++ b/hw/xfree86/os-support/bus/Pci.c @@ -227,7 +227,7 @@ int pciFuncNum; /* Function number of current device */ PCITAG pciDeviceTag; /* Tag for current device */ pciBusInfo_t *pciBusInfo[MAX_PCI_BUSES] = { NULL, }; -int pciNumBuses = 0; /* Actual number of PCI buses */ +_X_EXPORT int pciNumBuses = 0; /* Actual number of PCI buses */ int pciMaxBusNum = MAX_PCI_BUSES; static Bool inProbe = FALSE; @@ -269,7 +269,7 @@ pciInit() #endif } -PCITAG +_X_EXPORT PCITAG pciFindFirst(CARD32 id, CARD32 mask) { #ifdef DEBUGPCI @@ -283,7 +283,7 @@ pciFindFirst(CARD32 id, CARD32 mask) return((*pciFindFirstFP)()); } -PCITAG +_X_EXPORT PCITAG pciFindNext(void) { #ifdef DEBUGPCI @@ -294,7 +294,7 @@ pciFindNext(void) return((*pciFindNextFP)()); } -CARD32 +_X_EXPORT CARD32 pciReadLong(PCITAG tag, int offset) { int bus = PCI_BUS_FROM_TAG(tag); @@ -316,7 +316,7 @@ pciReadLong(PCITAG tag, int offset) return(PCI_NOT_FOUND); } -CARD16 +_X_EXPORT CARD16 pciReadWord(PCITAG tag, int offset) { CARD32 tmp; @@ -342,7 +342,7 @@ pciReadWord(PCITAG tag, int offset) } } -CARD8 +_X_EXPORT CARD8 pciReadByte(PCITAG tag, int offset) { CARD32 tmp; @@ -364,7 +364,7 @@ pciReadByte(PCITAG tag, int offset) } } -void +_X_EXPORT void pciWriteLong(PCITAG tag, int offset, CARD32 val) { int bus = PCI_BUS_FROM_TAG(tag); @@ -376,7 +376,7 @@ pciWriteLong(PCITAG tag, int offset, CARD32 val) (*pciBusInfo[bus]->funcs->pciWriteLong)(tag, offset, val); } -void +_X_EXPORT void pciWriteWord(PCITAG tag, int offset, CARD16 val) { CARD32 tmp; @@ -403,7 +403,7 @@ pciWriteWord(PCITAG tag, int offset, CARD16 val) } } -void +_X_EXPORT void pciWriteByte(PCITAG tag, int offset, CARD8 val) { CARD32 tmp; @@ -427,7 +427,7 @@ pciWriteByte(PCITAG tag, int offset, CARD8 val) } } -void +_X_EXPORT void pciSetBitsLong(PCITAG tag, int offset, CARD32 mask, CARD32 val) { int bus = PCI_BUS_FROM_TAG(tag); @@ -455,7 +455,7 @@ pciSetBitsByte(PCITAG tag, int offset, CARD8 mask, CARD8 val) pciSetBitsLong(tag, aligned_offset, tmp_mask, tmp_val); } -ADDRESS +_X_EXPORT ADDRESS pciBusAddrToHostAddr(PCITAG tag, PciAddrType type, ADDRESS addr) { int bus = PCI_BUS_FROM_TAG(tag); @@ -469,7 +469,7 @@ pciBusAddrToHostAddr(PCITAG tag, PciAddrType type, ADDRESS addr) return(addr); } -ADDRESS +_X_EXPORT ADDRESS pciHostAddrToBusAddr(PCITAG tag, PciAddrType type, ADDRESS addr) { int bus = PCI_BUS_FROM_TAG(tag); @@ -600,7 +600,7 @@ pciGetBaseSize(PCITAG tag, int index, Bool destructive, Bool *min) return bits; } -PCITAG +_X_EXPORT PCITAG pciTag(int busnum, int devnum, int funcnum) { return(PCI_MAKE_TAG(busnum,devnum,funcnum)); @@ -890,7 +890,7 @@ pciAddrNOOP(PCITAG tag, PciAddrType type, ADDRESS addr) return(addr); } -pciConfigPtr * +_X_EXPORT pciConfigPtr * xf86scanpci(int flags) { pciConfigPtr devp; @@ -1070,7 +1070,7 @@ pciCheckForBrokenBase(PCITAG Tag,int basereg) #if defined(INCLUDE_XF86_MAP_PCI_MEM) -pointer +_X_EXPORT pointer xf86MapPciMem(int ScreenNum, int Flags, PCITAG Tag, ADDRESS Base, unsigned long Size) { @@ -1307,7 +1307,7 @@ HandlePciBios(PCITAG Tag, int basereg, unsigned char * buf, int len) return n; } -int +_X_EXPORT int xf86ReadPciBIOS(unsigned long Offset, PCITAG Tag, int basereg, unsigned char *Buf, int Len) { @@ -1318,27 +1318,27 @@ xf86ReadPciBIOS(unsigned long Offset, PCITAG Tag, int basereg, #ifdef INCLUDE_XF86_NO_DOMAIN -int +_X_EXPORT int xf86GetPciDomain(PCITAG Tag) { return 0; } -pointer +_X_EXPORT pointer xf86MapDomainMemory(int ScreenNum, int Flags, PCITAG Tag, ADDRESS Base, unsigned long Size) { return xf86MapVidMem(ScreenNum, Flags, Base, Size); } -IOADDRESS +_X_EXPORT IOADDRESS xf86MapDomainIO(int ScreenNum, int Flags, PCITAG Tag, IOADDRESS Base, unsigned long Size) { return Base; } -int +_X_EXPORT int xf86ReadDomainMemory(PCITAG Tag, ADDRESS Base, int Len, unsigned char *Buf) { int ret, length, rlength; diff --git a/hw/xfree86/os-support/bus/Sbus.c b/hw/xfree86/os-support/bus/Sbus.c index 168bc669e..22d84be17 100644 --- a/hw/xfree86/os-support/bus/Sbus.c +++ b/hw/xfree86/os-support/bus/Sbus.c @@ -181,7 +181,7 @@ promIsP1275(void) #endif } -void +_X_EXPORT void sparcPromClose(void) { if (promOpenCount > 1) { @@ -199,7 +199,7 @@ sparcPromClose(void) promOpenCount = 0; } -int +_X_EXPORT int sparcPromInit(void) { if (promOpenCount) { @@ -225,7 +225,7 @@ sparcPromInit(void) return 0; } -char * +_X_EXPORT char * sparcPromGetProperty(sbusPromNodePtr pnode, const char *prop, int *lenp) { if (promSetNode(pnode)) @@ -233,7 +233,7 @@ sparcPromGetProperty(sbusPromNodePtr pnode, const char *prop, int *lenp) return promGetProperty(prop, lenp); } -int +_X_EXPORT int sparcPromGetBool(sbusPromNodePtr pnode, const char *prop) { if (promSetNode(pnode)) @@ -556,7 +556,7 @@ sparcPromPathname2Node(const char *pathName) return i; } -pointer +_X_EXPORT pointer xf86MapSbusMem(sbusDevicePtr psdp, unsigned long offset, unsigned long size) { pointer ret; @@ -583,7 +583,7 @@ xf86MapSbusMem(sbusDevicePtr psdp, unsigned long offset, unsigned long size) return (char *)ret + (offset - off); } -void +_X_EXPORT void xf86UnmapSbusMem(sbusDevicePtr psdp, pointer addr, unsigned long size) { unsigned long mask = xf86getpagesize() - 1; @@ -594,7 +594,7 @@ xf86UnmapSbusMem(sbusDevicePtr psdp, pointer addr, unsigned long size) } /* Tell OS that we are driving the HW cursor ourselves. */ -void +_X_EXPORT void xf86SbusHideOsHwCursor(sbusDevicePtr psdp) { struct fbcursor fbcursor; @@ -615,7 +615,7 @@ xf86SbusHideOsHwCursor(sbusDevicePtr psdp) } /* Set HW cursor colormap. */ -void +_X_EXPORT void xf86SbusSetOsHwCursorCmap(sbusDevicePtr psdp, int bg, int fg) { struct fbcursor fbcursor; diff --git a/hw/xfree86/os-support/bus/axpPci.c b/hw/xfree86/os-support/bus/axpPci.c index 08c7fbd39..660f008e1 100644 --- a/hw/xfree86/os-support/bus/axpPci.c +++ b/hw/xfree86/os-support/bus/axpPci.c @@ -303,13 +303,13 @@ axpPciCfgSetBits(PCITAG tag, int off, CARD32 mask, CARD32 bits) * Alpha/Linux addressing domain support */ -int +_X_EXPORT int xf86GetPciDomain(PCITAG Tag) { return PCI_DOM_FROM_TAG(Tag); } -pointer +_X_EXPORT pointer xf86MapDomainMemory(int ScreenNum, int Flags, PCITAG Tag, ADDRESS Base, unsigned long Size) { @@ -330,7 +330,7 @@ xf86MapDomainMemory(int ScreenNum, int Flags, PCITAG Tag, pDomain->dense_mem + Base - _bus_base(), Size); } -IOADDRESS +_X_EXPORT IOADDRESS xf86MapDomainIO(int ScreenNum, int Flags, PCITAG Tag, IOADDRESS Base, unsigned long Size) { @@ -366,7 +366,7 @@ xf86MapDomainIO(int ScreenNum, int Flags, PCITAG Tag, return pDomain->mapped_io + Base; } -int +_X_EXPORT int xf86ReadDomainMemory(PCITAG Tag, ADDRESS Base, int Len, unsigned char *Buf) { static unsigned long pagemask = 0; diff --git a/hw/xfree86/os-support/bus/linuxPci.c b/hw/xfree86/os-support/bus/linuxPci.c index bfd576dd3..3dce431a6 100644 --- a/hw/xfree86/os-support/bus/linuxPci.c +++ b/hw/xfree86/os-support/bus/linuxPci.c @@ -478,7 +478,7 @@ linuxGetSizes(PCITAG Tag, unsigned long *io_size, unsigned long *mem_size) } } -int +_X_EXPORT int xf86GetPciDomain(PCITAG Tag) { pciConfigPtr pPCI; @@ -624,7 +624,7 @@ linuxOpenLegacy(PCITAG Tag, char *name) * returns a pointer to it. The pointer is saved for future use if it's in * the legacy ISA memory space (memory in a domain between 0 and 1MB). */ -pointer +_X_EXPORT pointer xf86MapDomainMemory(int ScreenNum, int Flags, PCITAG Tag, ADDRESS Base, unsigned long Size) { @@ -674,7 +674,7 @@ xf86MapDomainMemory(int ScreenNum, int Flags, PCITAG Tag, * * This has no means of returning failure, so all errors are fatal */ -IOADDRESS +_X_EXPORT IOADDRESS xf86MapDomainIO(int ScreenNum, int Flags, PCITAG Tag, IOADDRESS Base, unsigned long Size) { @@ -706,7 +706,7 @@ xf86MapDomainIO(int ScreenNum, int Flags, PCITAG Tag, /* * xf86ReadDomainMemory - copy from domain memory into a caller supplied buffer */ -int +_X_EXPORT int xf86ReadDomainMemory(PCITAG Tag, ADDRESS Base, int Len, unsigned char *Buf) { unsigned char *ptr, *src; diff --git a/hw/xfree86/os-support/bus/sparcPci.c b/hw/xfree86/os-support/bus/sparcPci.c index 48e10ede4..5e0ef5b18 100644 --- a/hw/xfree86/os-support/bus/sparcPci.c +++ b/hw/xfree86/os-support/bus/sparcPci.c @@ -592,13 +592,13 @@ sparcPciInit(void) #ifndef INCLUDE_XF86_NO_DOMAIN -int +_X_EXPORT int xf86GetPciDomain(PCITAG Tag) { return PCI_DOM_FROM_TAG(Tag); } -pointer +_X_EXPORT pointer xf86MapDomainMemory(int ScreenNum, int Flags, PCITAG Tag, ADDRESS Base, unsigned long Size) { @@ -622,7 +622,7 @@ xf86MapDomainMemory(int ScreenNum, int Flags, PCITAG Tag, return result; } -IOADDRESS +_X_EXPORT IOADDRESS xf86MapDomainIO(int ScreenNum, int Flags, PCITAG Tag, IOADDRESS Base, unsigned long Size) { @@ -649,7 +649,7 @@ xf86MapDomainIO(int ScreenNum, int Flags, PCITAG Tag, return (IOADDRESS)pDomain->io + Base; } -int +_X_EXPORT int xf86ReadDomainMemory(PCITAG Tag, ADDRESS Base, int Len, unsigned char *Buf) { unsigned char *ptr, *src; diff --git a/hw/xfree86/os-support/linux/lnxResource.c b/hw/xfree86/os-support/linux/lnxResource.c index 690d3bc8f..d01297901 100644 --- a/hw/xfree86/os-support/linux/lnxResource.c +++ b/hw/xfree86/os-support/linux/lnxResource.c @@ -19,7 +19,7 @@ /* Avoid Imakefile changes */ #include "bus/Pci.h" -resRange PciAvoid[] = +_X_EXPORT resRange PciAvoid[] = { #if !defined(__sparc__) || !defined(INCLUDE_XF86_NO_DOMAIN) _PCI_AVOID_PC_STYLE, diff --git a/hw/xfree86/os-support/linux/lnx_agp.c b/hw/xfree86/os-support/linux/lnx_agp.c index 6a5c83db2..65a5a0ea3 100644 --- a/hw/xfree86/os-support/linux/lnx_agp.c +++ b/hw/xfree86/os-support/linux/lnx_agp.c @@ -44,7 +44,7 @@ static Bool initDone = FALSE; * Close /dev/agpgart. This frees all associated memory allocated during * this server generation. */ -Bool +_X_EXPORT Bool xf86GARTCloseScreen(int screenNum) { if(gartFd != -1) { @@ -117,13 +117,13 @@ GARTInit(int screenNum) return TRUE; } -Bool +_X_EXPORT Bool xf86AgpGARTSupported() { return GARTInit(-1); } -AgpInfoPtr +_X_EXPORT AgpInfoPtr xf86GetAGPInfo(int screenNum) { struct _agp_info agpinf; @@ -166,7 +166,7 @@ xf86GetAGPInfo(int screenNum) * count instead of using acquiredScreen? */ -Bool +_X_EXPORT Bool xf86AcquireGART(int screenNum) { if (screenNum != -1 && !GARTInit(screenNum)) @@ -184,7 +184,7 @@ xf86AcquireGART(int screenNum) return TRUE; } -Bool +_X_EXPORT Bool xf86ReleaseGART(int screenNum) { if (screenNum != -1 && !GARTInit(screenNum)) @@ -214,7 +214,7 @@ xf86ReleaseGART(int screenNum) return FALSE; } -int +_X_EXPORT int xf86AllocateGARTMemory(int screenNum, unsigned long size, int type, unsigned long *physical) { @@ -252,7 +252,7 @@ xf86AllocateGARTMemory(int screenNum, unsigned long size, int type, return alloc.key; } -Bool +_X_EXPORT Bool xf86DeallocateGARTMemory(int screenNum, int key) { if (!GARTInit(screenNum) || acquiredScreen != screenNum) @@ -275,7 +275,7 @@ xf86DeallocateGARTMemory(int screenNum, int key) } /* Bind GART memory with "key" at "offset" */ -Bool +_X_EXPORT Bool xf86BindGARTMemory(int screenNum, int key, unsigned long offset) { struct _agp_bind bind; @@ -318,7 +318,7 @@ xf86BindGARTMemory(int screenNum, int key, unsigned long offset) /* Unbind GART memory with "key" */ -Bool +_X_EXPORT Bool xf86UnbindGARTMemory(int screenNum, int key) { struct _agp_unbind unbind; @@ -350,7 +350,7 @@ xf86UnbindGARTMemory(int screenNum, int key) /* XXX Interface may change. */ -Bool +_X_EXPORT Bool xf86EnableAGP(int screenNum, CARD32 mode) { agp_setup setup; diff --git a/hw/xfree86/os-support/linux/lnx_axp.c b/hw/xfree86/os-support/linux/lnx_axp.c index fd47a5559..d2aa03587 100644 --- a/hw/xfree86/os-support/linux/lnx_axp.c +++ b/hw/xfree86/os-support/linux/lnx_axp.c @@ -132,12 +132,12 @@ extern unsigned int _dense_inb(unsigned long); extern unsigned int _dense_inw(unsigned long); extern unsigned int _dense_inl(unsigned long); -void (*_alpha_outb)(char, unsigned long) = _outb; -void (*_alpha_outw)(short, unsigned long) = _outw; -void (*_alpha_outl)(int, unsigned long) = _outl; -unsigned int (*_alpha_inb)(unsigned long) = _inb; -unsigned int (*_alpha_inw)(unsigned long) = _inw; -unsigned int (*_alpha_inl)(unsigned long) = _inl; +_X_EXPORT void (*_alpha_outb)(char, unsigned long) = _outb; +_X_EXPORT void (*_alpha_outw)(short, unsigned long) = _outw; +_X_EXPORT void (*_alpha_outl)(int, unsigned long) = _outl; +_X_EXPORT unsigned int (*_alpha_inb)(unsigned long) = _inb; +_X_EXPORT unsigned int (*_alpha_inw)(unsigned long) = _inw; +_X_EXPORT unsigned int (*_alpha_inl)(unsigned long) = _inl; static long _alpha_iobase_query(unsigned, int, int, int); long (*_iobase)(unsigned, int, int, int) = _alpha_iobase_query; diff --git a/hw/xfree86/os-support/linux/lnx_io.c b/hw/xfree86/os-support/linux/lnx_io.c index 47df0dfb6..32f660108 100644 --- a/hw/xfree86/os-support/linux/lnx_io.c +++ b/hw/xfree86/os-support/linux/lnx_io.c @@ -40,7 +40,7 @@ #define KBC_TIMEOUT 250 /* Timeout in ms for sending to keyboard controller */ -void +_X_EXPORT void xf86SoundKbdBell(int loudness, int pitch, int duration) { if (loudness && pitch) diff --git a/hw/xfree86/os-support/linux/lnx_kbd.c b/hw/xfree86/os-support/linux/lnx_kbd.c index b1fc95b56..504c52710 100644 --- a/hw/xfree86/os-support/linux/lnx_kbd.c +++ b/hw/xfree86/os-support/linux/lnx_kbd.c @@ -517,7 +517,7 @@ OpenKeyboard(InputInfoPtr pInfo) return TRUE; } -Bool +_X_EXPORT Bool xf86OSKbdPreInit(InputInfoPtr pInfo) { KbdDevPtr pKbd = pInfo->private; diff --git a/hw/xfree86/os-support/linux/lnx_kmod.c b/hw/xfree86/os-support/linux/lnx_kmod.c index c211d115a..5e91032d3 100644 --- a/hw/xfree86/os-support/linux/lnx_kmod.c +++ b/hw/xfree86/os-support/linux/lnx_kmod.c @@ -37,7 +37,7 @@ * Return: * 0 for failure, 1 for success */ -int +_X_EXPORT int xf86LoadKernelModule(const char *modName) { char mpPath[MAX_PATH] = ""; diff --git a/hw/xfree86/os-support/linux/lnx_mouse.c b/hw/xfree86/os-support/linux/lnx_mouse.c index d73c69853..afd216028 100644 --- a/hw/xfree86/os-support/linux/lnx_mouse.c +++ b/hw/xfree86/os-support/linux/lnx_mouse.c @@ -189,7 +189,7 @@ GuessProtocol(InputInfoPtr pInfo, int flags) return NULL; } -OSMouseInfoPtr +_X_EXPORT OSMouseInfoPtr xf86OSMouseInit(int flags) { OSMouseInfoPtr p; diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c index ca1689bdb..29b7800f3 100644 --- a/hw/xfree86/os-support/linux/lnx_video.c +++ b/hw/xfree86/os-support/linux/lnx_video.c @@ -1,4 +1,4 @@ -/* $XdotOrg: $ */ +/* $XdotOrg: xserver/xorg/hw/xfree86/os-support/linux/lnx_video.c,v 1.10 2005/09/19 18:38:26 alanc Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c,v 3.67 2003/06/25 18:27:07 eich Exp $ */ /* * Copyright 1992 by Orest Zborowski <obz@Kodak.com> @@ -531,7 +531,7 @@ unmapVidMem(int ScreenNum, pointer Base, unsigned long Size) /***************************************************************************/ #if defined(__powerpc__) -volatile unsigned char *ioBase = NULL; +_X_EXPORT volatile unsigned char *ioBase = NULL; #ifndef __NR_pciconfig_iobase #define __NR_pciconfig_iobase 200 @@ -539,7 +539,7 @@ volatile unsigned char *ioBase = NULL; #endif -Bool +_X_EXPORT Bool xf86EnableIO(void) { #if defined(__powerpc__) @@ -588,7 +588,7 @@ xf86EnableIO(void) return TRUE; } -void +_X_EXPORT void xf86DisableIO(void) { if (!ExtendedEnabled) @@ -612,7 +612,7 @@ xf86DisableIO(void) /* XXX The #ifdefs should be made simpler. */ -Bool +_X_EXPORT Bool xf86DisableInterrupts() { #if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__ia64__) && !defined(__sh__) && !defined(__hppa__) @@ -644,7 +644,7 @@ xf86DisableInterrupts() return (TRUE); } -void +_X_EXPORT void xf86EnableInterrupts() { #if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__ia64__) && !defined(__sh__) && !defined(__hppa__) @@ -976,23 +976,23 @@ writeSparseNB32(int Value, pointer Base, register unsigned long Offset) return; } -void (*xf86WriteMmio8)(int Value, pointer Base, unsigned long Offset) +_X_EXPORT void (*xf86WriteMmio8)(int Value, pointer Base, unsigned long Offset) = writeDense8; -void (*xf86WriteMmio16)(int Value, pointer Base, unsigned long Offset) +_X_EXPORT void (*xf86WriteMmio16)(int Value, pointer Base, unsigned long Offset) = writeDense16; -void (*xf86WriteMmio32)(int Value, pointer Base, unsigned long Offset) +_X_EXPORT void (*xf86WriteMmio32)(int Value, pointer Base, unsigned long Offset) = writeDense32; -void (*xf86WriteMmioNB8)(int Value, pointer Base, unsigned long Offset) +_X_EXPORT void (*xf86WriteMmioNB8)(int Value, pointer Base, unsigned long Offset) = writeDenseNB8; -void (*xf86WriteMmioNB16)(int Value, pointer Base, unsigned long Offset) +_X_EXPORT void (*xf86WriteMmioNB16)(int Value, pointer Base, unsigned long Offset) = writeDenseNB16; -void (*xf86WriteMmioNB32)(int Value, pointer Base, unsigned long Offset) +_X_EXPORT void (*xf86WriteMmioNB32)(int Value, pointer Base, unsigned long Offset) = writeDenseNB32; -int (*xf86ReadMmio8)(pointer Base, unsigned long Offset) +_X_EXPORT int (*xf86ReadMmio8)(pointer Base, unsigned long Offset) = readDense8; -int (*xf86ReadMmio16)(pointer Base, unsigned long Offset) +_X_EXPORT int (*xf86ReadMmio16)(pointer Base, unsigned long Offset) = readDense16; -int (*xf86ReadMmio32)(pointer Base, unsigned long Offset) +_X_EXPORT int (*xf86ReadMmio32)(pointer Base, unsigned long Offset) = readDense32; #ifdef JENSEN_SUPPORT diff --git a/hw/xfree86/os-support/lynxos/lynx_io.c b/hw/xfree86/os-support/lynxos/lynx_io.c index afd3f8962..761fec0e0 100644 --- a/hw/xfree86/os-support/lynxos/lynx_io.c +++ b/hw/xfree86/os-support/lynxos/lynx_io.c @@ -37,7 +37,7 @@ #if defined(KDMKTONE) || defined(KIOCSOUND) /* Lynx 2.2.1 has sophisticated atc stuff.... */ -void +_X_EXPORT void xf86SoundKbdBell(int loudness, int pitch, int duration) { if (loudness && pitch) @@ -159,7 +159,7 @@ xf86KbdOff() #include "xf86OSKbd.h" -Bool +_X_EXPORT Bool xf86OSKbdPreInit(InputInfoPtr pInfo) { return FALSE; diff --git a/hw/xfree86/os-support/lynxos/lynx_mmap.c b/hw/xfree86/os-support/lynxos/lynx_mmap.c index c00b6700f..75ed0731b 100644 --- a/hw/xfree86/os-support/lynxos/lynx_mmap.c +++ b/hw/xfree86/os-support/lynxos/lynx_mmap.c @@ -37,7 +37,7 @@ * Read BIOS using smem_create facility */ -int +_X_EXPORT int xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf, int Len) { diff --git a/hw/xfree86/os-support/lynxos/lynx_mouse.c b/hw/xfree86/os-support/lynxos/lynx_mouse.c index 68aca5d38..c04d0f71a 100644 --- a/hw/xfree86/os-support/lynxos/lynx_mouse.c +++ b/hw/xfree86/os-support/lynxos/lynx_mouse.c @@ -20,7 +20,7 @@ SupportedInterfaces(void) return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO; } -OSMouseInfoPtr +_X_EXPORT OSMouseInfoPtr xf86OSMouseInit(int flags) { OSMouseInfoPtr p; diff --git a/hw/xfree86/os-support/lynxos/lynx_noinline.c b/hw/xfree86/os-support/lynxos/lynx_noinline.c index 1c12f62f9..0e143256a 100644 --- a/hw/xfree86/os-support/lynxos/lynx_noinline.c +++ b/hw/xfree86/os-support/lynxos/lynx_noinline.c @@ -33,13 +33,13 @@ extern volatile unsigned char *ioBase; -void +_X_EXPORT void eieio() { __asm__ __volatile__ ("eieio"); } -unsigned long +_X_EXPORT unsigned long ldl_brx(volatile unsigned char *base, int ndx) { register unsigned long tmp = *(volatile unsigned long *)(base+ndx); @@ -49,14 +49,14 @@ ldl_brx(volatile unsigned char *base, int ndx) ((tmp & 0xff000000) >> 24) ); } -unsigned short +_X_EXPORT unsigned short ldw_brx(volatile unsigned char *base, int ndx) { register unsigned short tmp = *(volatile unsigned short *)(base+ndx); return((tmp << 8) | (tmp >> 8)); } -void +_X_EXPORT void stl_brx(unsigned long val, volatile unsigned char *base, int ndx) { unsigned char *p = (unsigned char *)&val; @@ -64,7 +64,7 @@ stl_brx(unsigned long val, volatile unsigned char *base, int ndx) *(volatile unsigned long *)(base+ndx) = tmp; } -void +_X_EXPORT void stw_brx(unsigned short val, volatile unsigned char *base, int ndx) { unsigned char *p = (unsigned char *)&val; @@ -72,25 +72,25 @@ stw_brx(unsigned short val, volatile unsigned char *base, int ndx) *(volatile unsigned short *)(base+ndx) = tmp; } -void +_X_EXPORT void outb(IOADDRESS port, unsigned char value) { *((volatile unsigned char *)(ioBase + port)) = value; eieio(); } -void +_X_EXPORT void outw(IOADDRESS port, unsigned short value) { stw_brx(value, ioBase, port); eieio(); } -void +_X_EXPORT void outl(IOADDRESS port, unsigned int value) { stl_brx(value, ioBase, port); eieio(); } -unsigned char +_X_EXPORT unsigned char inb(IOADDRESS port) { unsigned char val; @@ -99,7 +99,7 @@ inb(IOADDRESS port) return(val); } -unsigned short +_X_EXPORT unsigned short inw(IOADDRESS port) { unsigned short val; @@ -108,7 +108,7 @@ inw(IOADDRESS port) return(val); } -unsigned int +_X_EXPORT unsigned int inl(IOADDRESS port) { unsigned int val; @@ -117,7 +117,7 @@ inl(IOADDRESS port) return(val); } -unsigned long +_X_EXPORT unsigned long ldl_u(void *p) { return (((*(unsigned char *)(p)) | @@ -126,20 +126,20 @@ ldl_u(void *p) (*((unsigned char *)(p)+3)<<24))); } -unsigned long +_X_EXPORT unsigned long ldq_u(void *p) { return ldl_u(p); } -unsigned short +_X_EXPORT unsigned short ldw_u(void *p) { return(((*(unsigned char *)(p)) | (*((unsigned char *)(p)+1)<<8))); } -void +_X_EXPORT void stl_u(unsigned long v, void *p) { @@ -149,13 +149,13 @@ stl_u(unsigned long v, void *p) (*((unsigned char *)(p)+3)) = ((v) >> 24); } -void +_X_EXPORT void stq_u(unsigned long v, void *p) { stl_u(v,p); } -void +_X_EXPORT void stw_u(unsigned short v, void *p) { (*(unsigned char *)(p)) = (v); @@ -163,13 +163,13 @@ stw_u(unsigned short v, void *p) } -void +_X_EXPORT void mem_barrier(void) { __asm__ __volatile__("eieio"); } -void +_X_EXPORT void write_mem_barrier(void) { __asm__ __volatile__("eieio"); diff --git a/hw/xfree86/os-support/lynxos/lynx_video.c b/hw/xfree86/os-support/lynxos/lynx_video.c index 5d0949091..4e707a989 100644 --- a/hw/xfree86/os-support/lynxos/lynx_video.c +++ b/hw/xfree86/os-support/lynxos/lynx_video.c @@ -269,13 +269,13 @@ xf86OSInitVidMem(VidMemInfoPtr pVidMem) /* Interrupt Handling section */ /***************************************************************************/ -Bool +_X_EXPORT Bool xf86DisableInterrupts() { return(TRUE); } -void +_X_EXPORT void xf86EnableInterrupts() { return; @@ -287,7 +287,7 @@ xf86EnableInterrupts() #if defined(__powerpc__) -volatile unsigned char *ioBase = MAP_FAILED; +_X_EXPORT volatile unsigned char *ioBase = MAP_FAILED; volatile unsigned char *pciConfBase = MAP_FAILED; static int IOEnabled; @@ -301,7 +301,7 @@ removeIOSmem(void) ioBase = MAP_FAILED; } -Bool +_X_EXPORT Bool xf86EnableIO() { if (IOEnabled++ == 0) { @@ -322,7 +322,7 @@ xf86EnableIO() return TRUE; } -void +_X_EXPORT void xf86DisableIO() { if (!IOEnabled) diff --git a/hw/xfree86/os-support/misc/BUSmemcpy.c b/hw/xfree86/os-support/misc/BUSmemcpy.c index 9ff14396c..58864e5e0 100644 --- a/hw/xfree86/os-support/misc/BUSmemcpy.c +++ b/hw/xfree86/os-support/misc/BUSmemcpy.c @@ -257,12 +257,12 @@ xf86JensenBusToMem(char *Base, char *dst, unsigned long src, int count) static unsigned long __memcpy(unsigned long dest, unsigned long src, int n); -void +_X_EXPORT void xf86BusToMem(unsigned char *dst, unsigned char *src, int len) { __memcpy((unsigned long)dst, (unsigned long)src, len); } -void +_X_EXPORT void xf86MemToBus(unsigned char *dst, unsigned char *src, int len) { if (len == sizeof(int)) diff --git a/hw/xfree86/os-support/misc/Delay.c b/hw/xfree86/os-support/misc/Delay.c index 33d0789fd..7c105a9e0 100644 --- a/hw/xfree86/os-support/misc/Delay.c +++ b/hw/xfree86/os-support/misc/Delay.c @@ -14,7 +14,7 @@ #include <time.h> -void +_X_EXPORT void xf86UDelay(long usec) { #if 0 diff --git a/hw/xfree86/os-support/misc/IODelay.c b/hw/xfree86/os-support/misc/IODelay.c index 697c07f61..083cfed8a 100644 --- a/hw/xfree86/os-support/misc/IODelay.c +++ b/hw/xfree86/os-support/misc/IODelay.c @@ -20,7 +20,7 @@ * about any occasion, but we'll be more conservative here: On a * 100-MHz CPU, produce at least a delay of 1,000ns. */ -void +_X_EXPORT void xf86IODelay() { xf86UDelay(1); diff --git a/hw/xfree86/os-support/misc/SlowBcopy.c b/hw/xfree86/os-support/misc/SlowBcopy.c index ec2c67ffa..be870194a 100644 --- a/hw/xfree86/os-support/misc/SlowBcopy.c +++ b/hw/xfree86/os-support/misc/SlowBcopy.c @@ -27,7 +27,7 @@ #include "compiler.h" /* The outb() isn't needed on my machine, but who knows ... -- ost */ -void +_X_EXPORT void xf86SlowBcopy(unsigned char *src, unsigned char *dst, int len) { while(len--) @@ -70,7 +70,7 @@ unsigned long _bus_base(void); #endif -void +_X_EXPORT void xf86SlowBCopyFromBus(unsigned char *src, unsigned char *dst, int count) { if (isJensen()) @@ -92,7 +92,7 @@ xf86SlowBCopyFromBus(unsigned char *src, unsigned char *dst, int count) xf86SlowBcopy(src,dst,count); } -void +_X_EXPORT void xf86SlowBCopyToBus(unsigned char *src, unsigned char *dst, int count) { if (isJensen()) diff --git a/hw/xfree86/os-support/sco/sco_io.c b/hw/xfree86/os-support/sco/sco_io.c index c97916cf5..6067d51a5 100644 --- a/hw/xfree86/os-support/sco/sco_io.c +++ b/hw/xfree86/os-support/sco/sco_io.c @@ -42,7 +42,7 @@ #include <sys/emap.h> #include <sys/nmap.h> -void +_X_EXPORT void xf86SoundKbdBell(int loudness, int pitch, int duration) { if (loudness && pitch) { diff --git a/hw/xfree86/os-support/sco/sco_iop.c b/hw/xfree86/os-support/sco/sco_iop.c index 35d48e04a..4870266d8 100644 --- a/hw/xfree86/os-support/sco/sco_iop.c +++ b/hw/xfree86/os-support/sco/sco_iop.c @@ -66,7 +66,7 @@ extern long sysi86 (int cmd, ...); static Bool IOEnabled = FALSE; -Bool +_X_EXPORT Bool xf86EnableIO(void) { if (IOEnabled) @@ -81,7 +81,7 @@ xf86EnableIO(void) return TRUE; } -void +_X_EXPORT void xf86DisableIO(void) { if (!IOEnabled) @@ -95,7 +95,7 @@ xf86DisableIO(void) /* Interrupt Handling section */ /***************************************************************************/ -Bool +_X_EXPORT Bool xf86DisableInterrupts(void) { if (!IOEnabled) { @@ -116,7 +116,7 @@ xf86DisableInterrupts(void) return(TRUE); } -void +_X_EXPORT void xf86EnableInterrupts(void) { if (!IOEnabled) { diff --git a/hw/xfree86/os-support/sco/sco_kbd.c b/hw/xfree86/os-support/sco/sco_kbd.c index a26b7e96b..8b1d5b762 100644 --- a/hw/xfree86/os-support/sco/sco_kbd.c +++ b/hw/xfree86/os-support/sco/sco_kbd.c @@ -501,7 +501,7 @@ OpenKeyboard(InputInfoPtr pInfo) return TRUE; } -Bool +_X_EXPORT Bool xf86OSKbdPreInit(InputInfoPtr pInfo) { KbdDevPtr pKbd = pInfo->private; diff --git a/hw/xfree86/os-support/sco/sco_mouse.c b/hw/xfree86/os-support/sco/sco_mouse.c index ea81c947d..f9d068c24 100644 --- a/hw/xfree86/os-support/sco/sco_mouse.c +++ b/hw/xfree86/os-support/sco/sco_mouse.c @@ -242,7 +242,7 @@ OsMousePreInit(InputInfoPtr pInfo, const char *protocol, int flags) return TRUE; } -OSMouseInfoPtr +_X_EXPORT OSMouseInfoPtr xf86OSMouseInit (int flags) { OSMouseInfoPtr p; diff --git a/hw/xfree86/os-support/shared/agp_noop.c b/hw/xfree86/os-support/shared/agp_noop.c index c13b29c38..e85b1f8d4 100644 --- a/hw/xfree86/os-support/shared/agp_noop.c +++ b/hw/xfree86/os-support/shared/agp_noop.c @@ -44,63 +44,63 @@ #include "xf86_OSlib.h" #include "xf86OSpriv.h" -Bool +_X_EXPORT Bool xf86GARTCloseScreen(int screenNum) { return FALSE; } -Bool +_X_EXPORT Bool xf86AgpGARTSupported() { return FALSE; } -AgpInfoPtr +_X_EXPORT AgpInfoPtr xf86GetAGPInfo(int screenNum) { return NULL; } -Bool +_X_EXPORT Bool xf86AcquireGART(int screenNum) { return FALSE; } -Bool +_X_EXPORT Bool xf86ReleaseGART(int screenNum) { return FALSE; } -int +_X_EXPORT int xf86AllocateGARTMemory(int screenNum, unsigned long size, int type, unsigned long *physical) { return -1; } -Bool +_X_EXPORT Bool xf86DeallocateGARTMemory(int screenNum, int key) { return FALSE; } -Bool +_X_EXPORT Bool xf86BindGARTMemory(int screenNum, int key, unsigned long offset) { return FALSE; } -Bool +_X_EXPORT Bool xf86UnbindGARTMemory(int screenNum, int key) { return FALSE; } -Bool +_X_EXPORT Bool xf86EnableAGP(int screenNum, CARD32 mode) { return FALSE; diff --git a/hw/xfree86/os-support/shared/bios_devmem.c b/hw/xfree86/os-support/shared/bios_devmem.c index 8bd6d3f3e..b63704cde 100644 --- a/hw/xfree86/os-support/shared/bios_devmem.c +++ b/hw/xfree86/os-support/shared/bios_devmem.c @@ -41,7 +41,7 @@ # define DEV_MEM "/dev/mem" #endif -int +_X_EXPORT int xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf, int Len) { diff --git a/hw/xfree86/os-support/shared/bios_mmap.c b/hw/xfree86/os-support/shared/bios_mmap.c index b4ff8c31f..5f300a967 100644 --- a/hw/xfree86/os-support/shared/bios_mmap.c +++ b/hw/xfree86/os-support/shared/bios_mmap.c @@ -42,7 +42,7 @@ */ #ifndef __alpha__ -int +_X_EXPORT int xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf, int Len) { diff --git a/hw/xfree86/os-support/shared/ia64Pci.c b/hw/xfree86/os-support/shared/ia64Pci.c index ff4312bf5..1fe119dcd 100644 --- a/hw/xfree86/os-support/shared/ia64Pci.c +++ b/hw/xfree86/os-support/shared/ia64Pci.c @@ -66,7 +66,7 @@ static int ia64_port_to_fd(unsigned long port) return (port >> 24) & 0xffffffff; } -void outb(unsigned long port, unsigned char val) +_X_EXPORT void outb(unsigned long port, unsigned char val) { int fd = ia64_port_to_fd(port); @@ -86,7 +86,7 @@ void outb(unsigned long port, unsigned char val) return; } -void outw(unsigned long port, unsigned short val) +_X_EXPORT void outw(unsigned long port, unsigned short val) { int fd = ia64_port_to_fd(port); @@ -106,7 +106,7 @@ void outw(unsigned long port, unsigned short val) return; } -void outl(unsigned long port, unsigned int val) +_X_EXPORT void outl(unsigned long port, unsigned int val) { int fd = ia64_port_to_fd(port); @@ -126,7 +126,7 @@ void outl(unsigned long port, unsigned int val) return; } -unsigned int inb(unsigned long port) +_X_EXPORT unsigned int inb(unsigned long port) { int fd = ia64_port_to_fd(port); unsigned char val; @@ -148,7 +148,7 @@ unsigned int inb(unsigned long port) return val; } -unsigned int inw(unsigned long port) +_X_EXPORT unsigned int inw(unsigned long port) { int fd = ia64_port_to_fd(port); unsigned short val; @@ -170,7 +170,7 @@ unsigned int inw(unsigned long port) return val; } -unsigned int inl(unsigned long port) +_X_EXPORT unsigned int inl(unsigned long port) { int fd = ia64_port_to_fd(port); unsigned int val; diff --git a/hw/xfree86/os-support/shared/ioperm_noop.c b/hw/xfree86/os-support/shared/ioperm_noop.c index b3ea044f9..04e72fe1c 100644 --- a/hw/xfree86/os-support/shared/ioperm_noop.c +++ b/hw/xfree86/os-support/shared/ioperm_noop.c @@ -37,13 +37,13 @@ #include "xf86Priv.h" #include "xf86_OSlib.h" -Bool +_X_EXPORT Bool xf86EnableIO() { return TRUE; } -void +_X_EXPORT void xf86DisableIO() { return; diff --git a/hw/xfree86/os-support/shared/kbd.c b/hw/xfree86/os-support/shared/kbd.c index 822c8fe52..b9aeafd7b 100644 --- a/hw/xfree86/os-support/shared/kbd.c +++ b/hw/xfree86/os-support/shared/kbd.c @@ -32,7 +32,7 @@ #include "xf86OSKbd.h" -Bool +_X_EXPORT Bool xf86OSKbdPreInit(InputInfoPtr pInfo) { return FALSE; diff --git a/hw/xfree86/os-support/shared/kmod_noop.c b/hw/xfree86/os-support/shared/kmod_noop.c index 620e9bf35..935f44bbe 100644 --- a/hw/xfree86/os-support/shared/kmod_noop.c +++ b/hw/xfree86/os-support/shared/kmod_noop.c @@ -32,7 +32,7 @@ #include "xf86_OSproc.h" -int xf86LoadKernelModule(const char *pathname) +_X_EXPORT int xf86LoadKernelModule(const char *pathname) { (void) pathname; return 0; /* failure */ diff --git a/hw/xfree86/os-support/shared/libc_wrapper.c b/hw/xfree86/os-support/shared/libc_wrapper.c index 346915885..fc4edc378 100644 --- a/hw/xfree86/os-support/shared/libc_wrapper.c +++ b/hw/xfree86/os-support/shared/libc_wrapper.c @@ -182,7 +182,7 @@ typedef struct dirent DIRENTRY; #define SETBUF_RETURNS_INT #endif -double xf86HUGE_VAL; +_X_EXPORT double xf86HUGE_VAL; #ifndef SELF_CONTAINED_WRAPPERS extern void xf86DisableIO(void); @@ -193,13 +193,13 @@ extern void xf86DisableIO(void); * called by loadable modules */ -double +_X_EXPORT double xf86hypot(double x, double y) { return(hypot(x,y)); } -void +_X_EXPORT void xf86qsort(void *base, xf86size_t nmemb, xf86size_t size, int (*comp)(const void *, const void *)) { @@ -208,26 +208,26 @@ xf86qsort(void *base, xf86size_t nmemb, xf86size_t size, /* string functions */ -char* +_X_EXPORT char* xf86strcat(char* dest, const char* src) { return(strcat(dest,src)); } -char* +_X_EXPORT char* xf86strchr(const char* s, int c) { return strchr(s,c); } -int +_X_EXPORT int xf86strcmp(const char* s1, const char* s2) { return strcmp(s1,s2); } /* Just like the BSD version. It assumes that tolower() is ANSI-compliant */ -int +_X_EXPORT int xf86strcasecmp(const char* s1, const char* s2) { const unsigned char *us1 = (const unsigned char *)s1; @@ -240,50 +240,50 @@ xf86strcasecmp(const char* s1, const char* s2) return tolower(*us1) - tolower(*--us2); } -char* +_X_EXPORT char* xf86strcpy(char* dest, const char* src) { return strcpy(dest,src); } -xf86size_t +_X_EXPORT xf86size_t xf86strcspn(const char* s1, const char* s2) { return (xf86size_t)strcspn(s1,s2); } -xf86size_t +_X_EXPORT xf86size_t xf86strlen(const char* s) { return (xf86size_t)strlen(s); } -xf86size_t +_X_EXPORT xf86size_t xf86strlcat(char *dest, const char *src, xf86size_t size) { return(strlcat(dest, src, size)); } -xf86size_t +_X_EXPORT xf86size_t xf86strlcpy(char *dest, const char *src, xf86size_t size) { return strlcpy(dest, src, size); } -char* +_X_EXPORT char* xf86strncat(char* dest, const char* src, xf86size_t n) { return strncat(dest,src,(size_t)n); } -int +_X_EXPORT int xf86strncmp(const char* s1, const char* s2, xf86size_t n) { return strncmp(s1,s2,(size_t)n); } /* Just like the BSD version. It assumes that tolower() is ANSI-compliant */ -int +_X_EXPORT int xf86strncasecmp(const char* s1, const char* s2, xf86size_t n) { if (n != 0) { @@ -300,49 +300,49 @@ xf86strncasecmp(const char* s1, const char* s2, xf86size_t n) return 0; } -char* +_X_EXPORT char* xf86strncpy(char* dest, const char* src, xf86size_t n) { return strncpy(dest,src,(size_t)n); } -char* +_X_EXPORT char* xf86strpbrk(const char* s1, const char* s2) { return strpbrk(s1,s2); } -char* +_X_EXPORT char* xf86strrchr(const char* s, int c) { return strrchr(s,c); } -xf86size_t +_X_EXPORT xf86size_t xf86strspn(const char* s1, const char* s2) { return strspn(s1,s2); } -char* +_X_EXPORT char* xf86strstr(const char* s1, const char* s2) { return strstr(s1,s2); } -char* +_X_EXPORT char* xf86strtok(char* s1, const char* s2) { return strtok(s1,s2); } -char* +_X_EXPORT char* xf86strdup(const char* s) { return xstrdup(s); } -int +_X_EXPORT int xf86sprintf(char *s, const char *format, ...) { int ret; @@ -353,7 +353,7 @@ xf86sprintf(char *s, const char *format, ...) return ret; } -int +_X_EXPORT int xf86snprintf(char *s, xf86size_t len, const char *format, ...) { int ret; @@ -364,17 +364,17 @@ xf86snprintf(char *s, xf86size_t len, const char *format, ...) return ret; } -void +_X_EXPORT void xf86bzero(void* s, unsigned int n) { memset(s, 0, n); } #ifdef HAVE_VSSCANF -int +_X_EXPORT int xf86sscanf(char *s, const char *format, ...) #else -int +_X_EXPORT int xf86sscanf(char *s, const char *format, char *a0, char *a1, char *a2, char *a3, char *a4, char *a5, char *a6, char *a7, char *a8, char *a9) /* limit of ten args */ @@ -395,7 +395,7 @@ xf86sscanf(char *s, const char *format, char *a0, char *a1, char *a2, /* Basic I/O */ -int xf86errno; +_X_EXPORT int xf86errno; /* XXX This is not complete */ @@ -415,7 +415,7 @@ xfToOsOpenFlags(int xfflags) return flags; } -int +_X_EXPORT int xf86open(const char *path, int flags, ...) { int fd; @@ -437,7 +437,7 @@ xf86open(const char *path, int flags, ...) return fd; } -int +_X_EXPORT int xf86close(int fd) { int status = close(fd); @@ -446,7 +446,7 @@ xf86close(int fd) return status; } -long +_X_EXPORT long xf86lseek(int fd, long offset, int whence) { switch (whence) { @@ -463,7 +463,7 @@ xf86lseek(int fd, long offset, int whence) return (long)lseek(fd, (off_t)offset, whence); } -int +_X_EXPORT int xf86ioctl(int fd, unsigned long request, pointer argp) { int status = ioctl(fd, request, argp); @@ -472,7 +472,7 @@ xf86ioctl(int fd, unsigned long request, pointer argp) return status; } -xf86ssize_t +_X_EXPORT xf86ssize_t xf86read(int fd, void *buf, xf86size_t nbytes) { xf86ssize_t n = read(fd, buf, (size_t)nbytes); @@ -481,7 +481,7 @@ xf86read(int fd, void *buf, xf86size_t nbytes) return n; } -xf86ssize_t +_X_EXPORT xf86ssize_t xf86write(int fd, const void *buf, xf86size_t nbytes) { xf86ssize_t n = write(fd, buf, (size_t)nbytes); @@ -490,7 +490,7 @@ xf86write(int fd, const void *buf, xf86size_t nbytes) return n; } -void* +_X_EXPORT void* xf86mmap(void *start, xf86size_t length, int prot, int flags, int fd, xf86size_t /* off_t */ offset) { @@ -547,7 +547,7 @@ xf86mmap(void *start, xf86size_t length, int prot, #endif } -int +_X_EXPORT int xf86munmap(void *start, xf86size_t length) { #ifndef NO_MMAP @@ -569,7 +569,7 @@ xf86munmap(void *start, xf86size_t length) #endif } -int +_X_EXPORT int xf86stat(const char *file_name, struct xf86stat *xfst) { int rc; @@ -581,7 +581,7 @@ xf86stat(const char *file_name, struct xf86stat *xfst) return rc; } -int +_X_EXPORT int xf86fstat(int fd, struct xf86stat *xfst) { int rc; @@ -605,7 +605,7 @@ xfToOsAccessMode(int xfmode) return 0; } -int +_X_EXPORT int xf86access(const char *pathname, int mode) { int rc; @@ -635,9 +635,9 @@ XF86FILE_priv stdhnd[3] = { { 0, XF86FILE_magic, NULL, "$stderr$" } }; -XF86FILE* xf86stdin = (XF86FILE*)&stdhnd[0]; -XF86FILE* xf86stdout = (XF86FILE*)&stdhnd[1]; -XF86FILE* xf86stderr = (XF86FILE*)&stdhnd[2]; +_X_EXPORT XF86FILE* xf86stdin = (XF86FILE*)&stdhnd[0]; +_X_EXPORT XF86FILE* xf86stdout = (XF86FILE*)&stdhnd[1]; +_X_EXPORT XF86FILE* xf86stderr = (XF86FILE*)&stdhnd[2]; void xf86WrapperInit() @@ -651,7 +651,7 @@ xf86WrapperInit() xf86HUGE_VAL = HUGE_VAL; } -XF86FILE* +_X_EXPORT XF86FILE* xf86fopen(const char* fn, const char* mode) { XF86FILE_priv* fp; @@ -681,7 +681,7 @@ static void _xf86checkhndl(XF86FILE_priv* f,const char *func) } } -int +_X_EXPORT int xf86fclose(XF86FILE* f) { XF86FILE_priv* fp = (XF86FILE_priv*)f; @@ -702,7 +702,7 @@ xf86fclose(XF86FILE* f) return ret ? -1 : 0; } -int +_X_EXPORT int xf86printf(const char *format, ...) { int ret; @@ -714,7 +714,7 @@ xf86printf(const char *format, ...) return ret; } -int +_X_EXPORT int xf86fprintf(XF86FILE* f, const char *format, ...) { XF86FILE_priv* fp = (XF86FILE_priv*)f; @@ -733,7 +733,7 @@ xf86fprintf(XF86FILE* f, const char *format, ...) return ret; } -int +_X_EXPORT int xf86vfprintf(XF86FILE* f, const char *format, va_list ap) { XF86FILE_priv* fp = (XF86FILE_priv*)f; @@ -746,23 +746,23 @@ xf86vfprintf(XF86FILE* f, const char *format, va_list ap) return vfprintf(fp->filehnd,format,ap); } -int +_X_EXPORT int xf86vsprintf(char *s, const char *format, va_list ap) { return vsprintf(s, format, ap); } -int +_X_EXPORT int xf86vsnprintf(char *s, xf86size_t len, const char *format, va_list ap) { return vsnprintf(s, (size_t)len, format, ap); } #ifdef HAVE_VFSCANF -int +_X_EXPORT int xf86fscanf(XF86FILE* f, const char *format, ...) #else -int +_X_EXPORT int xf86fscanf(XF86FILE* f, const char *format, char *a0, char *a1, char *a2, char *a3, char *a4, char *a5, char *a6, char *a7, char *a8, char *a9) /* limit of ten args */ @@ -786,7 +786,7 @@ xf86fscanf(XF86FILE* f, const char *format, char *a0, char *a1, char *a2, #endif } -char * +_X_EXPORT char * xf86fgets(char *buf, INT32 n, XF86FILE* f) { XF86FILE_priv* fp = (XF86FILE_priv*)f; @@ -795,7 +795,7 @@ xf86fgets(char *buf, INT32 n, XF86FILE* f) return fgets(buf,(int)n,fp->filehnd); } -int +_X_EXPORT int xf86fputs(const char *buf, XF86FILE* f) { XF86FILE_priv* fp = (XF86FILE_priv*)f; @@ -804,7 +804,7 @@ xf86fputs(const char *buf, XF86FILE* f) return fputs(buf,fp->filehnd); } -int +_X_EXPORT int xf86getc(XF86FILE* f) { XF86FILE_priv* fp = (XF86FILE_priv*)f; @@ -813,7 +813,7 @@ xf86getc(XF86FILE* f) return getc(fp->filehnd); } -int +_X_EXPORT int xf86fgetc(XF86FILE* f) { XF86FILE_priv* fp = (XF86FILE_priv*)f; @@ -822,7 +822,7 @@ xf86fgetc(XF86FILE* f) return fgetc(fp->filehnd); } -int +_X_EXPORT int xf86fputc(int c,XF86FILE* f) { XF86FILE_priv* fp = (XF86FILE_priv*)f; @@ -831,7 +831,7 @@ xf86fputc(int c,XF86FILE* f) return fputc(c,fp->filehnd); } -int +_X_EXPORT int xf86fflush(XF86FILE* f) { XF86FILE_priv* fp = (XF86FILE_priv*)f; @@ -840,7 +840,7 @@ xf86fflush(XF86FILE* f) return fflush(fp->filehnd); } -xf86size_t +_X_EXPORT xf86size_t xf86fread(void* buf, xf86size_t sz, xf86size_t cnt, XF86FILE* f) { XF86FILE_priv* fp = (XF86FILE_priv*)f; @@ -852,7 +852,7 @@ xf86fread(void* buf, xf86size_t sz, xf86size_t cnt, XF86FILE* f) return fread(buf,(size_t)sz,(size_t)cnt,fp->filehnd); } -xf86size_t +_X_EXPORT xf86size_t xf86fwrite(const void* buf, xf86size_t sz, xf86size_t cnt, XF86FILE* f) { XF86FILE_priv* fp = (XF86FILE_priv*)f; @@ -861,7 +861,7 @@ xf86fwrite(const void* buf, xf86size_t sz, xf86size_t cnt, XF86FILE* f) return fwrite(buf,(size_t)sz,(size_t)cnt,fp->filehnd); } -int +_X_EXPORT int xf86fseek(XF86FILE* f, long offset, int whence) { XF86FILE_priv* fp = (XF86FILE_priv*)f; @@ -881,7 +881,7 @@ xf86fseek(XF86FILE* f, long offset, int whence) return fseek(fp->filehnd,offset,whence); } -long +_X_EXPORT long xf86ftell(XF86FILE* f) { XF86FILE_priv* fp = (XF86FILE_priv*)f; @@ -892,7 +892,7 @@ xf86ftell(XF86FILE* f) #define mapnum(e) case (xf86_##e): err = e; break; -char* +_X_EXPORT char* xf86strerror(int n) { int err; @@ -978,13 +978,13 @@ xf86strerror(int n) * use as * XF86fpos_t* pos = xalloc(xf86fpossize()); */ -long +_X_EXPORT long xf86fpossize() { return sizeof(fpos_t); } -int +_X_EXPORT int xf86fgetpos(XF86FILE* f,XF86fpos_t* pos) { XF86FILE_priv* fp = (XF86FILE_priv*)f; @@ -1001,7 +1001,7 @@ xf86fgetpos(XF86FILE* f,XF86fpos_t* pos) #endif } -int +_X_EXPORT int xf86fsetpos(XF86FILE* f,const XF86fpos_t* pos) { XF86FILE_priv* fp = (XF86FILE_priv*)f; @@ -1021,13 +1021,13 @@ xf86fsetpos(XF86FILE* f,const XF86fpos_t* pos) #endif } -void +_X_EXPORT void xf86perror(const char *s) { perror(s); } -int +_X_EXPORT int xf86remove(const char *s) { #ifdef _POSIX_SOURCE @@ -1037,7 +1037,7 @@ xf86remove(const char *s) #endif } -int +_X_EXPORT int xf86rename(const char *old, const char *new) { #ifdef _POSIX_SOURCE @@ -1053,7 +1053,7 @@ xf86rename(const char *old, const char *new) #endif } -void +_X_EXPORT void xf86rewind(XF86FILE* f) { XF86FILE_priv* fp = (XF86FILE_priv*)f; @@ -1062,7 +1062,7 @@ xf86rewind(XF86FILE* f) rewind(fp->filehnd); } -void +_X_EXPORT void xf86clearerr(XF86FILE* f) { XF86FILE_priv* fp = (XF86FILE_priv*)f; @@ -1071,7 +1071,7 @@ xf86clearerr(XF86FILE* f) clearerr(fp->filehnd); } -int +_X_EXPORT int xf86feof(XF86FILE* f) { XF86FILE_priv* fp = (XF86FILE_priv*)f; @@ -1080,7 +1080,7 @@ xf86feof(XF86FILE* f) return feof(fp->filehnd); } -int +_X_EXPORT int xf86ferror(XF86FILE* f) { XF86FILE_priv* fp = (XF86FILE_priv*)f; @@ -1089,7 +1089,7 @@ xf86ferror(XF86FILE* f) return ferror(fp->filehnd); } -XF86FILE* +_X_EXPORT XF86FILE* xf86freopen(const char* fname,const char* mode,XF86FILE* fold) { XF86FILE_priv* fp = (XF86FILE_priv*)fold; @@ -1114,7 +1114,7 @@ xf86freopen(const char* fname,const char* mode,XF86FILE* fold) return (XF86FILE*)fp; } -int +_X_EXPORT int xf86setbuf(XF86FILE* f, char *buf) { XF86FILE_priv* fp = (XF86FILE_priv*)f; @@ -1128,7 +1128,7 @@ xf86setbuf(XF86FILE* f, char *buf) #endif } -int +_X_EXPORT int xf86setvbuf(XF86FILE* f, char *buf, int mode, xf86size_t size) { XF86FILE_priv* fp = (XF86FILE_priv*)f; @@ -1154,7 +1154,7 @@ xf86setvbuf(XF86FILE* f, char *buf, int mode, xf86size_t size) return setvbuf(fp->filehnd,buf,vbufmode,(size_t)size); } -XF86FILE* +_X_EXPORT XF86FILE* xf86tmpfile(void) { #ifdef NEED_TMPFILE @@ -1178,7 +1178,7 @@ xf86tmpfile(void) #endif /* HAS_TMPFILE */ -int +_X_EXPORT int xf86ungetc(int c,XF86FILE* f) { XF86FILE_priv* fp = (XF86FILE_priv*)f; @@ -1189,7 +1189,7 @@ xf86ungetc(int c,XF86FILE* f) /* Misc functions. Some are ANSI C, some are not. */ -void +_X_EXPORT void xf86usleep(usec) unsigned long usec; { @@ -1200,7 +1200,7 @@ xf86usleep(usec) #endif } -void +_X_EXPORT void xf86getsecs(long * secs, long * usecs) { struct timeval tv; @@ -1214,7 +1214,7 @@ xf86getsecs(long * secs, long * usecs) return; } -int +_X_EXPORT int xf86ffs(int mask) { int n; @@ -1224,7 +1224,7 @@ xf86ffs(int mask) return n; } -char * +_X_EXPORT char * xf86getenv(const char * a) { /* Only allow this when the real and effective uids are the same */ @@ -1234,14 +1234,14 @@ xf86getenv(const char * a) return(getenv(a)); } -void * +_X_EXPORT void * xf86bsearch(const void *key, const void *base, xf86size_t nmemb, xf86size_t size, int (*compar)(const void *, const void *)) { return bsearch(key, base, (size_t)nmemb, (size_t)size, compar); } -int +_X_EXPORT int xf86execl(const char *pathname, const char *arg, ...) { #ifndef __UNIXOS2__ @@ -1330,14 +1330,14 @@ xf86execl(const char *pathname, const char *arg, ...) #endif /* __UNIXOS2__ Disable this crazy business for now */ } -void +_X_EXPORT void xf86abort(void) { ErrorF("Module called abort() function\n"); abort(); } -void +_X_EXPORT void xf86exit(int ex) { ErrorF("Module called exit() function with value=%d\n",ex); @@ -1363,7 +1363,7 @@ _xf86checkdirhndl(XF86DIR_priv* f,const char *func) } } -XF86DIR * +_X_EXPORT XF86DIR * xf86opendir(const char *name) { XF86DIR_priv *dp; @@ -1381,7 +1381,7 @@ xf86opendir(const char *name) return (XF86DIR*)dp; } -XF86DIRENT* +_X_EXPORT XF86DIRENT* xf86readdir(XF86DIR* dirp) { XF86DIR_priv* dp = (XF86DIR_priv*)dirp; @@ -1401,7 +1401,7 @@ xf86readdir(XF86DIR* dirp) return xde; } -void +_X_EXPORT void xf86rewinddir(XF86DIR* dirp) { XF86DIR_priv* dp = (XF86DIR_priv*)dirp; @@ -1410,7 +1410,7 @@ xf86rewinddir(XF86DIR* dirp) rewinddir(dp->dir); } -int +_X_EXPORT int xf86closedir(XF86DIR* dir) { XF86DIR_priv* dp = (XF86DIR_priv*)dir; @@ -1449,7 +1449,7 @@ xfToOsChmodMode(xf86mode_t xfmode) return mode; } -int +_X_EXPORT int xf86chmod(const char *path, xf86mode_t xfmode) { mode_t mode = xfToOsChmodMode(xfmode); @@ -1459,7 +1459,7 @@ xf86chmod(const char *path, xf86mode_t xfmode) return rc; } -int +_X_EXPORT int xf86chown(const char *path, xf86uid_t owner, xf86gid_t group) { #ifndef __UNIXOS2__ @@ -1471,19 +1471,19 @@ xf86chown(const char *path, xf86uid_t owner, xf86gid_t group) return rc; } -xf86uid_t +_X_EXPORT xf86uid_t xf86geteuid(void) { return geteuid(); } -xf86gid_t +_X_EXPORT xf86gid_t xf86getegid(void) { return getegid(); } -int +_X_EXPORT int xf86getpid(void) { return getpid(); @@ -1504,7 +1504,7 @@ xfToOsMknodMode(xf86mode_t xfmode) return mode; } -int xf86mknod(const char *pathname, xf86mode_t xfmode, xf86dev_t dev) +_X_EXPORT int xf86mknod(const char *pathname, xf86mode_t xfmode, xf86dev_t dev) { mode_t mode = xfToOsMknodMode(xfmode); #ifndef __UNIXOS2__ @@ -1516,12 +1516,12 @@ int xf86mknod(const char *pathname, xf86mode_t xfmode, xf86dev_t dev) return rc; } -unsigned int xf86sleep(unsigned int seconds) +_X_EXPORT unsigned int xf86sleep(unsigned int seconds) { return sleep(seconds); } -int xf86mkdir(const char *pathname, xf86mode_t xfmode) +_X_EXPORT int xf86mkdir(const char *pathname, xf86mode_t xfmode) { mode_t mode = xfToOsChmodMode(xfmode); int rc = mkdir(pathname, mode); @@ -1533,79 +1533,79 @@ int xf86mkdir(const char *pathname, xf86mode_t xfmode) /* Several math functions */ -int +_X_EXPORT int xf86abs(int x) { return abs(x); } -double +_X_EXPORT double xf86acos(double x) { return acos(x); } -double +_X_EXPORT double xf86asin(double x) { return asin(x); } -double +_X_EXPORT double xf86atan(double x) { return atan(x); } -double +_X_EXPORT double xf86atan2(double x,double y) { return atan2(x,y); } -double +_X_EXPORT double xf86atof(const char* s) { return atof(s); } -int +_X_EXPORT int xf86atoi(const char* s) { return atoi(s); } -long +_X_EXPORT long xf86atol(const char* s) { return atol(s); } -double +_X_EXPORT double xf86ceil(double x) { return ceil(x); } -double +_X_EXPORT double xf86cos(double x) { return(cos(x)); } -double +_X_EXPORT double xf86exp(double x) { return(exp(x)); } -double +_X_EXPORT double xf86fabs(double x) { return(fabs(x)); } -int +_X_EXPORT int xf86finite(double x) { #ifndef QNX4 @@ -1620,116 +1620,116 @@ xf86finite(double x) #endif } -double +_X_EXPORT double xf86floor(double x) { return floor(x); } -double +_X_EXPORT double xf86fmod(double x,double y) { return fmod(x,y); } -long +_X_EXPORT long xf86labs(long x) { return labs(x); } -double +_X_EXPORT double xf86ldexp(double x, int exp) { return ldexp(x, exp); } -double +_X_EXPORT double xf86log(double x) { return(log(x)); } -double +_X_EXPORT double xf86log10(double x) { return(log10(x)); } -double +_X_EXPORT double xf86modf(double x,double* y) { return modf(x,y); } -double +_X_EXPORT double xf86pow(double x, double y) { return(pow(x,y)); } -double +_X_EXPORT double xf86sin(double x) { return sin(x); } -double +_X_EXPORT double xf86sqrt(double x) { return(sqrt(x)); } -double +_X_EXPORT double xf86strtod(const char *s, char **end) { return strtod(s,end); } -long +_X_EXPORT long xf86strtol(const char *s, char **end, int radix) { return strtol(s,end,radix); } -unsigned long +_X_EXPORT unsigned long xf86strtoul(const char *s, char **end,int radix) { return strtoul(s,end,radix); } -double +_X_EXPORT double xf86tan(double x) { return tan(x); } /* memory functions */ -void* +_X_EXPORT void* xf86memchr(const void* s, int c, xf86size_t n) { return memchr(s,c,(size_t)n); } -int +_X_EXPORT int xf86memcmp(const void* s1, const void* s2, xf86size_t n) { return(memcmp(s1,s2,(size_t)n)); } -void* +_X_EXPORT void* xf86memcpy(void* dest, const void* src, xf86size_t n) { return(memcpy(dest,src,(size_t)n)); } -void* +_X_EXPORT void* xf86memmove(void* dest, const void* src, xf86size_t n) { return(memmove(dest,src,(size_t)n)); } -void* +_X_EXPORT void* xf86memset(void* s, int c, xf86size_t n) { return(memset(s,c,(size_t)n)); @@ -1737,110 +1737,110 @@ xf86memset(void* s, int c, xf86size_t n) /* ctype functions */ -int +_X_EXPORT int xf86isalnum(int c) { return isalnum(c) ? 1 : 0; } -int +_X_EXPORT int xf86isalpha(int c) { return isalpha(c) ? 1 : 0; } -int +_X_EXPORT int xf86iscntrl(int c) { return iscntrl(c) ? 1 : 0; } -int +_X_EXPORT int xf86isdigit(int c) { return isdigit(c) ? 1 : 0; } -int +_X_EXPORT int xf86isgraph(int c) { return isgraph(c) ? 1 : 0; } -int +_X_EXPORT int xf86islower(int c) { return islower(c) ? 1 : 0; } -int +_X_EXPORT int xf86isprint(int c) { return isprint(c) ? 1 : 0; } -int +_X_EXPORT int xf86ispunct(int c) { return ispunct(c) ? 1 : 0; } -int +_X_EXPORT int xf86isspace(int c) { return isspace(c) ? 1 : 0; } -int +_X_EXPORT int xf86isupper(int c) { return isupper(c) ? 1 : 0; } -int +_X_EXPORT int xf86isxdigit(int c) { return isxdigit(c) ? 1 : 0; } -int +_X_EXPORT int xf86tolower(int c) { return tolower(c); } -int +_X_EXPORT int xf86toupper(int c) { return toupper(c); } /* memory allocation functions */ -void* +_X_EXPORT void* xf86calloc(xf86size_t sz,xf86size_t n) { return xcalloc(sz, n); } -void +_X_EXPORT void xf86free(void* p) { xfree(p); } -double +_X_EXPORT double xf86frexp(double x, int *exp) { return frexp(x, exp); } -void* +_X_EXPORT void* xf86malloc(xf86size_t n) { return xalloc(n); } -void* +_X_EXPORT void* xf86realloc(void* p, xf86size_t n) { return xrealloc(p,n); @@ -1849,7 +1849,7 @@ xf86realloc(void* p, xf86size_t n) /* * XXX This probably doesn't belong here. */ -int +_X_EXPORT int xf86getpagesize() { static int pagesize = -1; @@ -1881,7 +1881,7 @@ xf86getpagesize() #define mapnum(e) case (e): return (xf86_##e) -int +_X_EXPORT int xf86GetErrno () { switch (errno) @@ -1962,7 +1962,7 @@ xf86GetErrno () #ifdef HAVE_SYSV_IPC -int +_X_EXPORT int xf86shmget(xf86key_t key, int size, int xf86shmflg) { int shmflg; @@ -1984,7 +1984,7 @@ xf86shmget(xf86key_t key, int size, int xf86shmflg) return ret; } -char * +_X_EXPORT char * xf86shmat(int id, char *addr, int xf86shmflg) { int shmflg = 0; @@ -2008,7 +2008,7 @@ xf86shmat(int id, char *addr, int xf86shmflg) return ret; } -int +_X_EXPORT int xf86shmdt(char *addr) { int ret; @@ -2024,7 +2024,7 @@ xf86shmdt(char *addr) /* * for now only implement the rmid command. */ -int +_X_EXPORT int xf86shmctl(int id, int xf86cmd, pointer buf) { int cmd; @@ -2080,7 +2080,7 @@ xf86shmdt(char *addr) } #endif /* HAVE_SYSV_IPC */ -int +_X_EXPORT int xf86getjmptype() { #ifdef HAS_GLIBC_SIGSETJMP @@ -2092,7 +2092,7 @@ xf86getjmptype() #ifdef HAS_GLIBC_SIGSETJMP -int +_X_EXPORT int xf86setjmp(xf86jmp_buf env) { #if defined(__GLIBC__) && (__GLIBC__ >= 2) @@ -2102,7 +2102,7 @@ xf86setjmp(xf86jmp_buf env) #endif } -int +_X_EXPORT int xf86setjmp0(xf86jmp_buf env) { FatalError("setjmp: type 0 called instead of type %d", xf86getjmptype()); @@ -2110,7 +2110,7 @@ xf86setjmp0(xf86jmp_buf env) #if !defined(__GLIBC__) || (__GLIBC__ < 2) /* libc5 */ -int +_X_EXPORT int xf86setjmp1(xf86jmp_buf env, int arg2) { __sigjmp_save((void *)env, arg2); @@ -2135,13 +2135,13 @@ xf86setjmp0(xf86jmp_buf env) #endif /* HAS_GLIBC_SIGSETJMP */ -int +_X_EXPORT int xf86setjmp1_arg2() { return 1; } -int +_X_EXPORT int xf86setjmperror(xf86jmp_buf env) { FatalError("setjmp: don't know how to handle setjmp() type %d", diff --git a/hw/xfree86/os-support/shared/posix_tty.c b/hw/xfree86/os-support/shared/posix_tty.c index be3703944..3f9a82214 100644 --- a/hw/xfree86/os-support/shared/posix_tty.c +++ b/hw/xfree86/os-support/shared/posix_tty.c @@ -114,7 +114,7 @@ GetBaud (int baudrate) return (0); } -int +_X_EXPORT int xf86OpenSerial (pointer options) { #ifdef Lynx @@ -206,7 +206,7 @@ xf86OpenSerial (pointer options) return (fd); } -int +_X_EXPORT int xf86SetSerial (int fd, pointer options) { struct termios t; @@ -377,7 +377,7 @@ xf86SetSerial (int fd, pointer options) return (r); } -int +_X_EXPORT int xf86SetSerialSpeed (int fd, int speed) { struct termios t; @@ -408,7 +408,7 @@ xf86SetSerialSpeed (int fd, int speed) return (r); } -int +_X_EXPORT int xf86ReadSerial (int fd, void *buf, int count) { int r; @@ -426,7 +426,7 @@ xf86ReadSerial (int fd, void *buf, int count) return (r); } -int +_X_EXPORT int xf86WriteSerial (int fd, const void *buf, int count) { int r; @@ -442,7 +442,7 @@ xf86WriteSerial (int fd, const void *buf, int count) return (r); } -int +_X_EXPORT int xf86CloseSerial (int fd) { int r; @@ -451,7 +451,7 @@ xf86CloseSerial (int fd) return (r); } -int +_X_EXPORT int xf86WaitForInput (int fd, int timeout) { fd_set readfds; @@ -477,7 +477,7 @@ xf86WaitForInput (int fd, int timeout) return (r); } -int +_X_EXPORT int xf86SerialSendBreak (int fd, int duration) { int r; @@ -487,7 +487,7 @@ xf86SerialSendBreak (int fd, int duration) } -int +_X_EXPORT int xf86FlushInput(int fd) { fd_set fds; @@ -588,7 +588,7 @@ getOsStateMask(void) static int osStateMask = 0; -int +_X_EXPORT int xf86SetSerialModemState(int fd, int state) { int ret; @@ -621,7 +621,7 @@ xf86SetSerialModemState(int fd, int state) #endif } -int +_X_EXPORT int xf86GetSerialModemState(int fd) { int ret; @@ -644,7 +644,7 @@ xf86GetSerialModemState(int fd) #endif } -int +_X_EXPORT int xf86SerialModemSetBits(int fd, int bits) { int ret; @@ -666,7 +666,7 @@ xf86SerialModemSetBits(int fd, int bits) #endif } -int +_X_EXPORT int xf86SerialModemClearBits(int fd, int bits) { int ret; diff --git a/hw/xfree86/os-support/shared/sigio.c b/hw/xfree86/os-support/shared/sigio.c index e6da3940f..ecdc1cdd7 100644 --- a/hw/xfree86/os-support/shared/sigio.c +++ b/hw/xfree86/os-support/shared/sigio.c @@ -143,7 +143,7 @@ xf86IsPipe (int fd) return S_ISFIFO(buf.st_mode); } -int +_X_EXPORT int xf86InstallSIGIOHandler(int fd, void (*f)(int, void *), void *closure) { struct sigaction sa; @@ -207,7 +207,7 @@ xf86InstallSIGIOHandler(int fd, void (*f)(int, void *), void *closure) return 0; } -int +_X_EXPORT int xf86RemoveSIGIOHandler(int fd) { struct sigaction sa; @@ -257,7 +257,7 @@ xf86RemoveSIGIOHandler(int fd) return ret; } -int +_X_EXPORT int xf86BlockSIGIO (void) { sigset_t set, old; @@ -273,7 +273,7 @@ xf86BlockSIGIO (void) return ret; } -void +_X_EXPORT void xf86UnblockSIGIO (int wasset) { sigset_t set; diff --git a/hw/xfree86/os-support/shared/sigiostubs.c b/hw/xfree86/os-support/shared/sigiostubs.c index c79055853..eb5e2db2c 100644 --- a/hw/xfree86/os-support/shared/sigiostubs.c +++ b/hw/xfree86/os-support/shared/sigiostubs.c @@ -25,7 +25,7 @@ * the sale, use or other dealings in this Software without prior written * authorization from the copyright holder(s) and author(s). */ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/shared/sigiostubs.c,v 1.3 2005/04/20 12:25:38 daniels Exp $ */ +/* $XdotOrg: xserver/xorg/hw/xfree86/os-support/shared/sigiostubs.c,v 1.5 2005/07/03 07:01:35 daniels Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> @@ -47,25 +47,25 @@ # include <errno.h> #endif -int +_X_EXPORT int xf86InstallSIGIOHandler(int fd, void (*f)(int, void *), void *closure) { return 0; } -int +_X_EXPORT int xf86RemoveSIGIOHandler(int fd) { return 0; } -int +_X_EXPORT int xf86BlockSIGIO (void) { return 0; } -void +_X_EXPORT void xf86UnblockSIGIO (int wasset) { } diff --git a/hw/xfree86/os-support/shared/stdResource.c b/hw/xfree86/os-support/shared/stdResource.c index 4704d8194..859997309 100644 --- a/hw/xfree86/os-support/shared/stdResource.c +++ b/hw/xfree86/os-support/shared/stdResource.c @@ -56,7 +56,7 @@ #define xf86StdPciBusAccWindowsFromOS xf86PciBusAccWindowsFromOS #define xf86StdIsaBusAccWindowsFromOS xf86IsaBusAccWindowsFromOS -resRange PciAvoid[] = {_PCI_AVOID_PC_STYLE, _END}; +_X_EXPORT resRange PciAvoid[] = {_PCI_AVOID_PC_STYLE, _END}; #endif #ifdef INCLUDE_XF86_NO_DOMAIN diff --git a/hw/xfree86/os-support/shared/vidmem.c b/hw/xfree86/os-support/shared/vidmem.c index 237d47a4d..c2618d075 100644 --- a/hw/xfree86/os-support/shared/vidmem.c +++ b/hw/xfree86/os-support/shared/vidmem.c @@ -188,7 +188,7 @@ xf86InitVidMem(void) } } -pointer +_X_EXPORT pointer xf86MapVidMem(int ScreenNum, int Flags, unsigned long Base, unsigned long Size) { pointer vbase = NULL; @@ -234,7 +234,7 @@ xf86MapVidMem(int ScreenNum, int Flags, unsigned long Base, unsigned long Size) return vbase; } -void +_X_EXPORT void xf86UnMapVidMem(int ScreenNum, pointer Base, unsigned long Size) { VidMapPtr vp; @@ -261,7 +261,7 @@ xf86UnMapVidMem(int ScreenNum, pointer Base, unsigned long Size) removeMapping(vp, mp); } -Bool +_X_EXPORT Bool xf86CheckMTRR(int ScreenNum) { VidMapPtr vp = getVidMapRec(ScreenNum); @@ -278,14 +278,14 @@ xf86CheckMTRR(int ScreenNum) return FALSE; } -Bool +_X_EXPORT Bool xf86LinearVidMem() { xf86InitVidMem(); return vidMemInfo.linearSupported; } -void +_X_EXPORT void xf86MapReadSideEffects(int ScreenNum, int Flags, pointer base, unsigned long Size) { diff --git a/hw/xfree86/os-support/solaris/sun_agp.c b/hw/xfree86/os-support/solaris/sun_agp.c index ce35ea88b..9db2b86ba 100644 --- a/hw/xfree86/os-support/solaris/sun_agp.c +++ b/hw/xfree86/os-support/solaris/sun_agp.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_agp.c,v 1.1 2005/06/09 03:11:58 alanc Exp $ */ +/* $XdotOrg: xserver/xorg/hw/xfree86/os-support/solaris/sun_agp.c,v 1.5 2005/08/24 22:37:15 alanc Exp $ */ /* * Abstraction of the AGP GART interface. * @@ -67,7 +67,7 @@ static Bool initDone = FALSE; * Close /dev/agpgart. This frees all associated memory allocated during * this server generation. */ -Bool +_X_EXPORT Bool xf86GARTCloseScreen(int screenNum) { if (gartFd != -1) { @@ -111,14 +111,14 @@ GARTInit(int screenNum) return TRUE; } -Bool +_X_EXPORT Bool xf86AgpGARTSupported(void) { return (GARTInit(-1)); } -AgpInfoPtr +_X_EXPORT AgpInfoPtr xf86GetAGPInfo(int screenNum) { agp_info_t agpinf; @@ -151,7 +151,7 @@ xf86GetAGPInfo(int screenNum) return info; } -Bool +_X_EXPORT Bool xf86AcquireGART(int screenNum) { @@ -172,7 +172,7 @@ xf86AcquireGART(int screenNum) return TRUE; } -Bool +_X_EXPORT Bool xf86ReleaseGART(int screenNum) { @@ -201,7 +201,7 @@ xf86ReleaseGART(int screenNum) return FALSE; } -int +_X_EXPORT int xf86AllocateGARTMemory(int screenNum, unsigned long size, int type, unsigned long *physical) { @@ -239,7 +239,7 @@ xf86AllocateGARTMemory(int screenNum, unsigned long size, int type, return alloc.agpa_key; } -Bool +_X_EXPORT Bool xf86DeallocateGARTMemory(int screenNum, int key) { if (!GARTInit(screenNum) || (acquiredScreen != screenNum)) @@ -256,7 +256,7 @@ xf86DeallocateGARTMemory(int screenNum, int key) } /* Bind GART memory with "key" at "offset" */ -Bool +_X_EXPORT Bool xf86BindGARTMemory(int screenNum, int key, unsigned long offset) { agp_bind_t bind; @@ -292,7 +292,7 @@ xf86BindGARTMemory(int screenNum, int key, unsigned long offset) } /* Unbind GART memory with "key" */ -Bool +_X_EXPORT Bool xf86UnbindGARTMemory(int screenNum, int key) { agp_unbind_t unbind; @@ -318,7 +318,7 @@ xf86UnbindGARTMemory(int screenNum, int key) /* XXX Interface may change. */ -Bool +_X_EXPORT Bool xf86EnableAGP(int screenNum, CARD32 mode) { agp_setup_t setup; diff --git a/hw/xfree86/os-support/solaris/sun_bios.c b/hw/xfree86/os-support/solaris/sun_bios.c index 8319de04e..18f6558f3 100644 --- a/hw/xfree86/os-support/solaris/sun_bios.c +++ b/hw/xfree86/os-support/solaris/sun_bios.c @@ -43,7 +43,7 @@ extern char *apertureDevName; /* * Read BIOS via mmap()ing physical memory. */ -int +_X_EXPORT int xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf, int Len) { diff --git a/hw/xfree86/os-support/solaris/sun_mouse.c b/hw/xfree86/os-support/solaris/sun_mouse.c index 54775b03d..c8efa8dbe 100644 --- a/hw/xfree86/os-support/solaris/sun_mouse.c +++ b/hw/xfree86/os-support/solaris/sun_mouse.c @@ -1,5 +1,5 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_mouse.c,v 1.4 2002/01/25 21:56:21 tsi Exp $ */ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_mouse.c,v 1.5 2005/06/03 21:49:11 alanc Exp $ */ +/* $XdotOrg: xserver/xorg/hw/xfree86/os-support/solaris/sun_mouse.c,v 1.8 2005/07/28 02:38:23 alanc Exp $ */ /* * Copyright 1999-2001 The XFree86 Project, Inc. All Rights Reserved. * @@ -697,7 +697,7 @@ SupportedInterfaces(void) return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO | MSE_XPS2 | MSE_MISC; } -OSMouseInfoPtr +_X_EXPORT OSMouseInfoPtr xf86OSMouseInit(int flags) { OSMouseInfoPtr p; diff --git a/hw/xfree86/os-support/solaris/sun_vid.c b/hw/xfree86/os-support/solaris/sun_vid.c index 82cd1ae7b..f3409dcb2 100644 --- a/hw/xfree86/os-support/solaris/sun_vid.c +++ b/hw/xfree86/os-support/solaris/sun_vid.c @@ -46,7 +46,7 @@ char *apertureDevName = NULL; -Bool +_X_EXPORT Bool xf86LinearVidMem(void) { int mmapFd; @@ -76,7 +76,7 @@ xf86LinearVidMem(void) return TRUE; } -pointer +_X_EXPORT pointer xf86MapVidMem(int ScreenNum, int Flags, unsigned long Base, unsigned long Size) { pointer base; @@ -139,7 +139,7 @@ xf86MapVidMem(int ScreenNum, int Flags, unsigned long Base, unsigned long Size) } /* ARGSUSED */ -void +_X_EXPORT void xf86UnMapVidMem(int ScreenNum, pointer Base, unsigned long Size) { munmap(Base, Size); @@ -153,7 +153,7 @@ xf86UnMapVidMem(int ScreenNum, pointer Base, unsigned long Size) static Bool ExtendedEnabled = FALSE; #endif -Bool +_X_EXPORT Bool xf86EnableIO(void) { #if defined(i386) || defined(__x86) @@ -169,7 +169,7 @@ xf86EnableIO(void) return TRUE; } -void +_X_EXPORT void xf86DisableIO(void) { #if defined(i386) || defined(__x86) @@ -187,7 +187,7 @@ xf86DisableIO(void) /* Interrupt Handling section */ /***************************************************************************/ -Bool xf86DisableInterrupts(void) +_X_EXPORT Bool xf86DisableInterrupts(void) { #if defined(i386) || defined(__x86) if (!ExtendedEnabled && (sysi86(SI86V86, V86SC_IOPL, PS_IOPL) < 0)) @@ -206,7 +206,7 @@ Bool xf86DisableInterrupts(void) return TRUE; } -void xf86EnableInterrupts(void) +_X_EXPORT void xf86EnableInterrupts(void) { #if defined(i386) || defined(__x86) if (!ExtendedEnabled && (sysi86(SI86V86, V86SC_IOPL, PS_IOPL) < 0)) @@ -223,13 +223,13 @@ void xf86EnableInterrupts(void) #endif /* i386 */ } -void +_X_EXPORT void xf86MapReadSideEffects(int ScreenNum, int Flags, pointer Base, unsigned long Size) { } -Bool +_X_EXPORT Bool xf86CheckMTRR(int ScreenNum) { return FALSE; diff --git a/hw/xfree86/os-support/sysv/sysv_io.c b/hw/xfree86/os-support/sysv/sysv_io.c index 6fb642bce..d10c40fa4 100644 --- a/hw/xfree86/os-support/sysv/sysv_io.c +++ b/hw/xfree86/os-support/sysv/sysv_io.c @@ -37,7 +37,7 @@ #include "xf86Priv.h" #include "xf86_OSlib.h" -void +_X_EXPORT void xf86SoundKbdBell(int loudness, int pitch, int duration) { if (loudness && pitch) @@ -71,7 +71,7 @@ xf86SetKbdLeds(int leds) #include "xf86OSKbd.h" -Bool +_X_EXPORT Bool xf86OSKbdPreInit(InputInfoPtr pInfo) { return FALSE; diff --git a/hw/xfree86/os-support/sysv/sysv_mouse.c b/hw/xfree86/os-support/sysv/sysv_mouse.c index f839362fc..e3c084e14 100644 --- a/hw/xfree86/os-support/sysv/sysv_mouse.c +++ b/hw/xfree86/os-support/sysv/sysv_mouse.c @@ -45,7 +45,7 @@ CheckProtocol(const char *protocol) } #endif -OSMouseInfoPtr +_X_EXPORT OSMouseInfoPtr xf86OSMouseInit(int flags) { OSMouseInfoPtr p; diff --git a/hw/xfree86/os-support/sysv/sysv_video.c b/hw/xfree86/os-support/sysv/sysv_video.c index e8c26dada..2b491be0e 100644 --- a/hw/xfree86/os-support/sysv/sysv_video.c +++ b/hw/xfree86/os-support/sysv/sysv_video.c @@ -285,7 +285,7 @@ xf86OSInitVidMem(VidMemInfoPtr pVidMem) static Bool ExtendedEnabled = FALSE; static Bool InitDone = FALSE; -Bool +_X_EXPORT Bool xf86EnableIO() { int i; @@ -304,7 +304,7 @@ xf86EnableIO() return TRUE; } -void +_X_EXPORT void xf86DisableIO() { if (!ExtendedEnabled) @@ -320,7 +320,7 @@ xf86DisableIO() /* Interrupt Handling section */ /***************************************************************************/ -Bool +_X_EXPORT Bool xf86DisableInterrupts() { if (!ExtendedEnabled) @@ -344,7 +344,7 @@ xf86DisableInterrupts() return(TRUE); } -void +_X_EXPORT void xf86EnableInterrupts() { if (!ExtendedEnabled) diff --git a/hw/xfree86/os-support/usl/usl_io.c b/hw/xfree86/os-support/usl/usl_io.c index a62fdc6f6..45c511f42 100644 --- a/hw/xfree86/os-support/usl/usl_io.c +++ b/hw/xfree86/os-support/usl/usl_io.c @@ -1,4 +1,4 @@ -/* $XdotOrg$ */ +/* $XdotOrg: xserver/xorg/hw/xfree86/os-support/usl/usl_io.c,v 1.2 2005/11/08 06:33:30 jkj Exp $ */ /* * Copyright 2001-2005 by Kean Johnston <jkj@sco.com> * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany @@ -35,7 +35,7 @@ #include "xf86Priv.h" #include "xf86_OSlib.h" -void +_X_EXPORT void xf86SoundKbdBell(int loudness, int pitch, int duration) { if (loudness && pitch) { diff --git a/hw/xfree86/os-support/usl/usl_iop.c b/hw/xfree86/os-support/usl/usl_iop.c index 2beac0b31..ae30655f8 100644 --- a/hw/xfree86/os-support/usl/usl_iop.c +++ b/hw/xfree86/os-support/usl/usl_iop.c @@ -1,4 +1,4 @@ -/* $XdotOrg$ */ +/* $XdotOrg: xserver/xorg/hw/xfree86/os-support/usl/usl_iop.c,v 1.2 2005/11/08 06:33:30 jkj Exp $ */ /* * Copyright 2001,2005 by Kean Johnston <jkj@sco.com> * @@ -40,7 +40,7 @@ static Bool IOEnabled = FALSE; -Bool +_X_EXPORT Bool xf86EnableIO(void) { if (IOEnabled) @@ -52,7 +52,7 @@ xf86EnableIO(void) return TRUE; } -void +_X_EXPORT void xf86DisableIO(void) { if (!IOEnabled) @@ -66,7 +66,7 @@ xf86DisableIO(void) /* Interrupt Handling section */ /***************************************************************************/ -Bool +_X_EXPORT Bool xf86DisableInterrupts(void) { if (!IOEnabled) { @@ -87,7 +87,7 @@ xf86DisableInterrupts(void) return(TRUE); } -void +_X_EXPORT void xf86EnableInterrupts(void) { if (!IOEnabled) { diff --git a/hw/xfree86/os-support/usl/usl_kbd.c b/hw/xfree86/os-support/usl/usl_kbd.c index 11aa2cf03..5f96fa676 100644 --- a/hw/xfree86/os-support/usl/usl_kbd.c +++ b/hw/xfree86/os-support/usl/usl_kbd.c @@ -1,4 +1,4 @@ -/* $XdotOrg$ */ +/* $XdotOrg: xserver/xorg/hw/xfree86/os-support/usl/usl_kbd.c,v 1.2 2005/11/08 06:33:30 jkj Exp $ */ /* * Copyright 2005 by Kean Johnston <jkj@sco.com> * @@ -426,7 +426,7 @@ OpenKeyboard(InputInfoPtr pInfo) return TRUE; } -Bool +_X_EXPORT Bool xf86OSKbdPreInit(InputInfoPtr pInfo) { KbdDevPtr pKbd = pInfo->private; diff --git a/hw/xfree86/os-support/usl/usl_mouse.c b/hw/xfree86/os-support/usl/usl_mouse.c index 22d3626b4..f70a0b89e 100644 --- a/hw/xfree86/os-support/usl/usl_mouse.c +++ b/hw/xfree86/os-support/usl/usl_mouse.c @@ -1,4 +1,4 @@ -/* $XdotOrg$ */ +/* $XdotOrg: xserver/xorg/hw/xfree86/os-support/usl/usl_mouse.c,v 1.3 2005/11/10 02:41:20 jkj Exp $ */ /* * Copyright 2005 Kean Johnston @@ -162,7 +162,7 @@ OsMousePreInit(InputInfoPtr pInfo, const char *protocol, int flags) return TRUE; } -OSMouseInfoPtr +_X_EXPORT OSMouseInfoPtr xf86OSMouseInit(int flags) { OSMouseInfoPtr p; diff --git a/hw/xfree86/utils/xorgcfg/loadmod.c b/hw/xfree86/utils/xorgcfg/loadmod.c index 81a31d326..8f970cb72 100644 --- a/hw/xfree86/utils/xorgcfg/loadmod.c +++ b/hw/xfree86/utils/xorgcfg/loadmod.c @@ -551,7 +551,7 @@ xf86cfgCheckModule(void) return (1); } -void +_X_EXPORT void xf86AddDriver(DriverPtr drv, void *module, int flags) { driver = drv; @@ -560,36 +560,36 @@ xf86AddDriver(DriverPtr drv, void *module, int flags) module_type = VideoModule; } -Bool +_X_EXPORT Bool xf86ServerIsOnlyDetecting(void) { return (True); } -void +_X_EXPORT void xf86AddInputDriver(InputDriverPtr inp, void *module, int flags) { module_type = InputModule; } -void +_X_EXPORT void xf86AddModuleInfo(ModuleInfoPtr inf, void *module) { info = inf; } -Bool +_X_EXPORT Bool xf86LoaderCheckSymbol(const char *symbol) { return LoaderSymbol(symbol) != NULL; } -void +_X_EXPORT void xf86LoaderRefSymLists(const char **list0, ...) { } -void +_X_EXPORT void xf86LoaderReqSymLists(const char **list0, ...) { } @@ -601,14 +601,14 @@ void xf86Msg(int type, const char *format, ...) #endif /*ARGSUSED*/ -void +_X_EXPORT void xf86PrintChipsets(const char *name, const char *msg, SymTabPtr chipsets) { vendor = 0; chips = chipsets; } -pciVideoPtr * +_X_EXPORT pciVideoPtr * xf86GetPciVideoInfo(void) { static pciVideoRec pci_video; @@ -619,7 +619,7 @@ xf86GetPciVideoInfo(void) return (pci_video_ptr); } -int +_X_EXPORT int xf86MatchDevice(const char *name, GDevPtr **gdev) { *gdev = NULL; @@ -627,7 +627,7 @@ xf86MatchDevice(const char *name, GDevPtr **gdev) return (1); } -int +_X_EXPORT int xf86MatchPciInstances(const char *name, int VendorID, SymTabPtr chipsets, PciChipsets *PCIchipsets, GDevPtr *devList, int numDevs, DriverPtr drvp, int **foundEntities) { @@ -639,7 +639,7 @@ xf86MatchPciInstances(const char *name, int VendorID, SymTabPtr chipsets, PciChi return (0); } -int +_X_EXPORT int xf86MatchIsaInstances(const char *name, SymTabPtr chipsets, IsaChipsets *ISAchipsets, DriverPtr drvp, FindIsaDevProc FindIsaDevice, GDevPtr *devList, int numDevs, int **foundEntities) { @@ -649,7 +649,7 @@ xf86MatchIsaInstances(const char *name, SymTabPtr chipsets, IsaChipsets *ISAchip } /*ARGSUSED*/ -void * +_X_EXPORT void * xf86LoadDrvSubModule(DriverPtr drv, const char *name) { pointer ret; @@ -662,19 +662,19 @@ xf86LoadDrvSubModule(DriverPtr drv, const char *name) return (ret); } -pciConfigPtr * +_X_EXPORT pciConfigPtr * xf86GetPciConfigInfo(void) { return (NULL); } -Bool +_X_EXPORT Bool xf86IsPrimaryPci(pciVideoPtr pPci) { return (True); } -Bool +_X_EXPORT Bool xf86CheckPciSlot(int bus, int device, int func) { return (False); |