diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-12-03 05:43:34 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-12-03 05:43:34 -0200 |
| commit | 49f77fff1495c0a2050fb18f9b1fc627839bbfc2 (patch) | |
| tree | eebaec908150abfc0159d9ee941404918f553113 /hw/xfree86 | |
| parent | 0b8f8b24f718820a72ebdc52423c2e6a44e848c5 (diff) | |
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
Diffstat (limited to 'hw/xfree86')
254 files changed, 2702 insertions, 2678 deletions
diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am index 77ab4c386..ca452c6f9 100644 --- a/hw/xfree86/common/Makefile.am +++ b/hw/xfree86/common/Makefile.am @@ -10,6 +10,10 @@ XVSOURCES = xf86xv.c xf86xvmc.c XVSDKINCS = xf86xv.h xf86xvmc.h endif +if XF86VIDMODE +XF86VMODE_SDK = vidmodeproc.h +endif + XISOURCES = xf86Xinput.c xisb.c XISDKINCS = xf86Xinput.h xisb.h RANDRSOURCES = xf86RandR.c @@ -46,7 +50,7 @@ INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \ sdk_HEADERS = compiler.h fourcc.h xf86.h xf86Module.h xf86Opt.h \ xf86PciInfo.h xf86Priv.h xf86Privstr.h xf86Resources.h \ xf86cmap.h xf86fbman.h xf86str.h xf86RAC.h xf86Xinput.h xisb.h \ - $(XVSDKINCS) xorgVersion.h \ + $(XVSDKINCS) $(XF86VMODE_SDK) xorgVersion.h \ xf86sbusBus.h xf86xv.h xf86xvmc.h xf86xvpriv.h DISTCLEANFILES = xf86Build.h @@ -56,6 +60,7 @@ EXTRA_DIST = \ compiler.h \ fourcc.h \ scoasm.h \ + vidmodeproc.h \ xf86.h \ xf86Bus.h \ xf86Config.h \ diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h index 285d9a3f6..5a3d1268f 100644 --- a/hw/xfree86/common/compiler.h +++ b/hw/xfree86/common/compiler.h @@ -87,37 +87,37 @@ && !(defined(__alpha__) && defined(linux)) \ && !(defined(__ia64__) && defined(linux)) \ -extern void outb(unsigned short, unsigned char); -extern void outw(unsigned short, unsigned short); -extern void outl(unsigned short, unsigned int); -extern unsigned int inb(unsigned short); -extern unsigned int inw(unsigned short); -extern unsigned int inl(unsigned short); +extern _X_EXPORT void outb(unsigned short, unsigned char); +extern _X_EXPORT void outw(unsigned short, unsigned short); +extern _X_EXPORT void outl(unsigned short, unsigned int); +extern _X_EXPORT unsigned int inb(unsigned short); +extern _X_EXPORT unsigned int inw(unsigned short); +extern _X_EXPORT unsigned int inl(unsigned short); # else /* __sparc__, __arm32__, __alpha__*/ -extern void outb(unsigned long, unsigned char); -extern void outw(unsigned long, unsigned short); -extern void outl(unsigned long, unsigned int); -extern unsigned int inb(unsigned long); -extern unsigned int inw(unsigned long); -extern unsigned int inl(unsigned long); +extern _X_EXPORT void outb(unsigned long, unsigned char); +extern _X_EXPORT void outw(unsigned long, unsigned short); +extern _X_EXPORT void outl(unsigned long, unsigned int); +extern _X_EXPORT unsigned int inb(unsigned long); +extern _X_EXPORT unsigned int inw(unsigned long); +extern _X_EXPORT unsigned int inl(unsigned long); # endif /* __sparc__, __arm32__, __alpha__ */ # endif /* __arm__ */ -extern unsigned long ldq_u(unsigned long *); -extern unsigned long ldl_u(unsigned int *); -extern unsigned long ldw_u(unsigned short *); -extern void stq_u(unsigned long, unsigned long *); -extern void stl_u(unsigned long, unsigned int *); -extern void stw_u(unsigned long, unsigned short *); -extern void mem_barrier(void); -extern void write_mem_barrier(void); -extern void stl_brx(unsigned long, volatile unsigned char *, int); -extern void stw_brx(unsigned short, volatile unsigned char *, int); -extern unsigned long ldl_brx(volatile unsigned char *, int); -extern unsigned short ldw_brx(volatile unsigned char *, int); +extern _X_EXPORT unsigned long ldq_u(unsigned long *); +extern _X_EXPORT unsigned long ldl_u(unsigned int *); +extern _X_EXPORT unsigned long ldw_u(unsigned short *); +extern _X_EXPORT void stq_u(unsigned long, unsigned long *); +extern _X_EXPORT void stl_u(unsigned long, unsigned int *); +extern _X_EXPORT void stw_u(unsigned long, unsigned short *); +extern _X_EXPORT void mem_barrier(void); +extern _X_EXPORT void write_mem_barrier(void); +extern _X_EXPORT void stl_brx(unsigned long, volatile unsigned char *, int); +extern _X_EXPORT void stw_brx(unsigned short, volatile unsigned char *, int); +extern _X_EXPORT unsigned long ldl_brx(volatile unsigned char *, int); +extern _X_EXPORT unsigned short ldw_brx(volatile unsigned char *, int); # endif @@ -130,42 +130,42 @@ extern unsigned short ldw_brx(volatile unsigned char *, int); /* note that the appropriate setup via "ioperm" needs to be done */ /* *before* any inx/outx is done. */ -extern void (*_alpha_outb)(char val, unsigned long port); +extern _X_EXPORT void (*_alpha_outb)(char val, unsigned long port); static __inline__ void outb(unsigned long port, unsigned char val) { _alpha_outb(val, port); } -extern void (*_alpha_outw)(short val, unsigned long port); +extern _X_EXPORT void (*_alpha_outw)(short val, unsigned long port); static __inline__ void outw(unsigned long port, unsigned short val) { _alpha_outw(val, port); } -extern void (*_alpha_outl)(int val, unsigned long port); +extern _X_EXPORT void (*_alpha_outl)(int val, unsigned long port); static __inline__ void outl(unsigned long port, unsigned int val) { _alpha_outl(val, port); } -extern unsigned int (*_alpha_inb)(unsigned long port); +extern _X_EXPORT unsigned int (*_alpha_inb)(unsigned long port); static __inline__ unsigned int inb(unsigned long port) { return _alpha_inb(port); } -extern unsigned int (*_alpha_inw)(unsigned long port); +extern _X_EXPORT unsigned int (*_alpha_inw)(unsigned long port); static __inline__ unsigned int inw(unsigned long port) { return _alpha_inw(port); } -extern unsigned int (*_alpha_inl)(unsigned long port); +extern _X_EXPORT unsigned int (*_alpha_inl)(unsigned long port); static __inline__ unsigned int inl(unsigned long port) { @@ -182,12 +182,12 @@ inl(unsigned long port) /* note that the appropriate setup via "ioperm" needs to be done */ /* *before* any inx/outx is done. */ -extern void outb(unsigned int port, unsigned char val); -extern void outw(unsigned int port, unsigned short val); -extern void outl(unsigned int port, unsigned int val); -extern unsigned char inb(unsigned int port); -extern unsigned short inw(unsigned int port); -extern unsigned int inl(unsigned int port); +extern _X_EXPORT void outb(unsigned int port, unsigned char val); +extern _X_EXPORT void outw(unsigned int port, unsigned short val); +extern _X_EXPORT void outl(unsigned int port, unsigned int val); +extern _X_EXPORT unsigned char inb(unsigned int port); +extern _X_EXPORT unsigned short inw(unsigned int port); +extern _X_EXPORT unsigned int inl(unsigned int port); # endif /* (__FreeBSD__ || __OpenBSD__ ) && !DO_PROTOTYPES */ @@ -458,12 +458,12 @@ __ustw (unsigned long r5, unsigned short * r11) # undef inb # undef inw # undef inl -extern void outb(unsigned long port, unsigned char val); -extern void outw(unsigned long port, unsigned short val); -extern void outl(unsigned long port, unsigned int val); -extern unsigned int inb(unsigned long port); -extern unsigned int inw(unsigned long port); -extern unsigned int inl(unsigned long port); +extern _X_EXPORT void outb(unsigned long port, unsigned char val); +extern _X_EXPORT void outw(unsigned long port, unsigned short val); +extern _X_EXPORT void outl(unsigned long port, unsigned int val); +extern _X_EXPORT unsigned int inb(unsigned long port); +extern _X_EXPORT unsigned int inw(unsigned long port); +extern _X_EXPORT unsigned int inl(unsigned long port); # elif defined(linux) && defined(__amd64__) @@ -870,7 +870,7 @@ static __inline__ void stw_u(unsigned long val, unsigned short *p) # define PORT_SIZE short # endif -unsigned int IOPortBase; /* Memory mapped I/O port area */ +_X_EXPORT unsigned int IOPortBase; /* Memory mapped I/O port area */ static __inline__ void outb(unsigned PORT_SIZE port, unsigned char val) @@ -1038,7 +1038,7 @@ xf86WriteMmio32Be(__volatile__ void *base, const unsigned long offset, # define MAP_FAILED ((void *)-1) # endif -extern volatile unsigned char *ioBase; +extern _X_EXPORT volatile unsigned char *ioBase; #if defined(linux) && defined(__powerpc64__) # include <linux/version.h> @@ -1522,10 +1522,10 @@ inl(unsigned short port) # ifdef __alpha__ /* entry points for Mmio memory access routines */ -extern int (*xf86ReadMmio8)(void *, unsigned long); -extern int (*xf86ReadMmio16)(void *, unsigned long); +extern _X_EXPORT int (*xf86ReadMmio8)(void *, unsigned long); +extern _X_EXPORT int (*xf86ReadMmio16)(void *, unsigned long); # ifndef STANDALONE_MMIO -extern int (*xf86ReadMmio32)(void *, unsigned long); +extern _X_EXPORT int (*xf86ReadMmio32)(void *, unsigned long); # else /* Some DRI 3D drivers need MMIO_IN32. */ static __inline__ int @@ -1535,14 +1535,14 @@ xf86ReadMmio32(void *Base, unsigned long Offset) return *(volatile unsigned int*)((unsigned long)Base+(Offset)); } # endif -extern void (*xf86WriteMmio8)(int, void *, unsigned long); -extern void (*xf86WriteMmio16)(int, void *, unsigned long); -extern void (*xf86WriteMmio32)(int, void *, unsigned long); -extern void (*xf86WriteMmioNB8)(int, void *, unsigned long); -extern void (*xf86WriteMmioNB16)(int, void *, unsigned long); -extern void (*xf86WriteMmioNB32)(int, void *, unsigned long); -extern void xf86SlowBCopyFromBus(unsigned char *, unsigned char *, int); -extern void xf86SlowBCopyToBus(unsigned char *, unsigned char *, int); +extern _X_EXPORT void (*xf86WriteMmio8)(int, void *, unsigned long); +extern _X_EXPORT void (*xf86WriteMmio16)(int, void *, unsigned long); +extern _X_EXPORT void (*xf86WriteMmio32)(int, void *, unsigned long); +extern _X_EXPORT void (*xf86WriteMmioNB8)(int, void *, unsigned long); +extern _X_EXPORT void (*xf86WriteMmioNB16)(int, void *, unsigned long); +extern _X_EXPORT void (*xf86WriteMmioNB32)(int, void *, unsigned long); +extern _X_EXPORT void xf86SlowBCopyFromBus(unsigned char *, unsigned char *, int); +extern _X_EXPORT void xf86SlowBCopyToBus(unsigned char *, unsigned char *, int); /* Some macros to hide the system dependencies for MMIO accesses */ /* Changed to kill noise generated by gcc's -Wcast-align */ diff --git a/hw/xfree86/common/vidmodeproc.h b/hw/xfree86/common/vidmodeproc.h new file mode 100644 index 000000000..da4d05e1c --- /dev/null +++ b/hw/xfree86/common/vidmodeproc.h @@ -0,0 +1,77 @@ + +/* Prototypes for DGA functions that the DDX must provide */ + +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + +#ifndef _VIDMODEPROC_H_ +#define _VIDMODEPROC_H_ + + +typedef enum { + VIDMODE_H_DISPLAY, + VIDMODE_H_SYNCSTART, + VIDMODE_H_SYNCEND, + VIDMODE_H_TOTAL, + VIDMODE_H_SKEW, + VIDMODE_V_DISPLAY, + VIDMODE_V_SYNCSTART, + VIDMODE_V_SYNCEND, + VIDMODE_V_TOTAL, + VIDMODE_FLAGS, + VIDMODE_CLOCK +} VidModeSelectMode; + +typedef enum { + VIDMODE_MON_VENDOR, + VIDMODE_MON_MODEL, + VIDMODE_MON_NHSYNC, + VIDMODE_MON_NVREFRESH, + VIDMODE_MON_HSYNC_LO, + VIDMODE_MON_HSYNC_HI, + VIDMODE_MON_VREFRESH_LO, + VIDMODE_MON_VREFRESH_HI +} VidModeSelectMonitor; + +typedef union { + pointer ptr; + int i; + float f; +} vidMonitorValue; + +extern _X_EXPORT void XFree86VidModeExtensionInit(void); + +extern _X_EXPORT Bool VidModeAvailable(int scrnIndex); +extern _X_EXPORT Bool VidModeGetCurrentModeline(int scrnIndex, pointer *mode, int *dotClock); +extern _X_EXPORT Bool VidModeGetFirstModeline(int scrnIndex, pointer *mode, int *dotClock); +extern _X_EXPORT Bool VidModeGetNextModeline(int scrnIndex, pointer *mode, int *dotClock); +extern _X_EXPORT Bool VidModeDeleteModeline(int scrnIndex, pointer mode); +extern _X_EXPORT Bool VidModeZoomViewport(int scrnIndex, int zoom); +extern _X_EXPORT Bool VidModeGetViewPort(int scrnIndex, int *x, int *y); +extern _X_EXPORT Bool VidModeSetViewPort(int scrnIndex, int x, int y); +extern _X_EXPORT Bool VidModeSwitchMode(int scrnIndex, pointer mode); +extern _X_EXPORT Bool VidModeLockZoom(int scrnIndex, Bool lock); +extern _X_EXPORT Bool VidModeGetMonitor(int scrnIndex, pointer *monitor); +extern _X_EXPORT int VidModeGetNumOfClocks(int scrnIndex, Bool *progClock); +extern _X_EXPORT Bool VidModeGetClocks(int scrnIndex, int *Clocks); +extern _X_EXPORT ModeStatus VidModeCheckModeForMonitor(int scrnIndex, pointer mode); +extern _X_EXPORT ModeStatus VidModeCheckModeForDriver(int scrnIndex, pointer mode); +extern _X_EXPORT void VidModeSetCrtcForMode(int scrnIndex, pointer mode); +extern _X_EXPORT Bool VidModeAddModeline(int scrnIndex, pointer mode); +extern _X_EXPORT int VidModeGetDotClock(int scrnIndex, int Clock); +extern _X_EXPORT int VidModeGetNumOfModes(int scrnIndex); +extern _X_EXPORT Bool VidModeSetGamma(int scrnIndex, float red, float green, float blue); +extern _X_EXPORT Bool VidModeGetGamma(int scrnIndex, float *red, float *green, float *blue); +extern _X_EXPORT pointer VidModeCreateMode(void); +extern _X_EXPORT void VidModeCopyMode(pointer modefrom, pointer modeto); +extern _X_EXPORT int VidModeGetModeValue(pointer mode, int valtyp); +extern _X_EXPORT void VidModeSetModeValue(pointer mode, int valtyp, int val); +extern _X_EXPORT vidMonitorValue VidModeGetMonitorValue(pointer monitor, int valtyp, int indx); +extern _X_EXPORT Bool VidModeSetGammaRamp(int, int, CARD16 *, CARD16 *, CARD16 *); +extern _X_EXPORT Bool VidModeGetGammaRamp(int, int, CARD16 *, CARD16 *, CARD16 *); +extern _X_EXPORT int VidModeGetGammaRampSize(int scrnIndex); + +#endif + + diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h index 90e8ff871..957357654 100644 --- a/hw/xfree86/common/xf86.h +++ b/hw/xfree86/common/xf86.h @@ -55,23 +55,25 @@ #include "propertyst.h" /* General parameters */ -extern int xf86DoConfigure; -extern int xf86DoShowOptions; -extern Bool xf86DoModalias; -extern Bool xf86DoConfigurePass1; -extern DevPrivateKey xf86ScreenKey; -extern DevPrivateKey xf86CreateRootWindowKey; -extern DevPrivateKey xf86PixmapKey; -extern ScrnInfoPtr *xf86Screens; /* List of pointers to ScrnInfoRecs */ -extern const unsigned char byte_reversed[256]; -extern Bool pciSlotClaimed; -extern Bool fbSlotClaimed; +extern _X_EXPORT int xf86DoConfigure; +extern _X_EXPORT int xf86DoShowOptions; +extern _X_EXPORT Bool xf86DoModalias; +extern _X_EXPORT Bool xf86DoConfigurePass1; +extern _X_EXPORT DevPrivateKey xf86ScreenKey; +extern _X_EXPORT DevPrivateKey xf86CreateRootWindowKey; +extern _X_EXPORT DevPrivateKey xf86PixmapKey; +extern _X_EXPORT ScrnInfoPtr *xf86Screens; /* List of pointers to ScrnInfoRecs */ +extern _X_EXPORT const unsigned char byte_reversed[256]; +extern _X_EXPORT Bool pciSlotClaimed; +extern _X_EXPORT Bool fbSlotClaimed; #if defined(__sparc__) || defined(__sparc) -extern Bool sbusSlotClaimed; +extern _X_EXPORT Bool sbusSlotClaimed; #endif -extern confDRIRec xf86ConfigDRI; -extern Bool xf86inSuspend; -extern Bool xf86DRI2Enabled(void); +extern _X_EXPORT confDRIRec xf86ConfigDRI; +extern _X_EXPORT Bool xf86inSuspend; +extern _X_EXPORT Bool xf86DRI2Enabled(void); + +extern _X_EXPORT Bool VTSwitchEnabled; /* kbd driver */ #define XF86SCRNINFO(p) ((ScrnInfoPtr)dixLookupPrivate(&(p)->devPrivates, \ xf86ScreenKey)) @@ -93,282 +95,285 @@ extern Bool xf86DRI2Enabled(void); /* xf86Bus.c */ -Bool xf86CheckPciSlot( const struct pci_device * ); -int xf86ClaimPciSlot( struct pci_device *, DriverPtr drvp, +extern _X_EXPORT Bool xf86CheckPciSlot( const struct pci_device * ); +extern _X_EXPORT int xf86ClaimPciSlot( struct pci_device *, DriverPtr drvp, int chipset, GDevPtr dev, Bool active); -Bool xf86ParsePciBusString(const char *busID, int *bus, int *device, +extern _X_EXPORT Bool xf86ParsePciBusString(const char *busID, int *bus, int *device, int *func); -Bool xf86ComparePciBusString(const char *busID, int bus, int device, int func); -void xf86FormatPciBusNumber(int busnum, char *buffer); -resPtr xf86AddRangesToList(resPtr list, resRange *pRange, int entityIndex); -int xf86GetFbInfoForScreen(int scrnIndex); -int xf86ClaimFbSlot(DriverPtr drvp, int chipset, GDevPtr dev, Bool active); -int xf86ClaimNoSlot(DriverPtr drvp, int chipset, GDevPtr dev, Bool active); -void xf86EnableAccess(ScrnInfoPtr pScrn); -void xf86SetCurrentAccess(Bool Enable, ScrnInfoPtr pScrn); -Bool xf86IsPrimaryPci(struct pci_device * pPci); +extern _X_EXPORT Bool xf86ComparePciBusString(const char *busID, int bus, int device, int func); +extern _X_EXPORT void xf86FormatPciBusNumber(int busnum, char *buffer); +extern _X_EXPORT resPtr xf86AddRangesToList(resPtr list, resRange *pRange, int entityIndex); +extern _X_EXPORT int xf86GetFbInfoForScreen(int scrnIndex); +extern _X_EXPORT int xf86ClaimFbSlot(DriverPtr drvp, int chipset, GDevPtr dev, Bool active); +extern _X_EXPORT int xf86ClaimNoSlot(DriverPtr drvp, int chipset, GDevPtr dev, Bool active); +extern _X_EXPORT void xf86EnableAccess(ScrnInfoPtr pScrn); +extern _X_EXPORT void xf86SetCurrentAccess(Bool Enable, ScrnInfoPtr pScrn); +extern _X_EXPORT Bool xf86IsPrimaryPci(struct pci_device * pPci); /* new RAC */ -resPtr xf86AddResToList(resPtr rlist, resRange *Range, int entityIndex); -void xf86FreeResList(resPtr rlist); -void xf86ClaimFixedResources(resList list, int entityIndex); -Bool xf86DriverHasEntities(DriverPtr drvp); -void xf86AddEntityToScreen(ScrnInfoPtr pScrn, int entityIndex); -void xf86SetEntityInstanceForScreen(ScrnInfoPtr pScrn, int entityIndex, +extern _X_EXPORT resPtr xf86AddResToList(resPtr rlist, resRange *Range, int entityIndex); +extern _X_EXPORT void xf86FreeResList(resPtr rlist); +extern _X_EXPORT void xf86ClaimFixedResources(resList list, int entityIndex); +extern _X_EXPORT Bool xf86DriverHasEntities(DriverPtr drvp); +extern _X_EXPORT void xf86AddEntityToScreen(ScrnInfoPtr pScrn, int entityIndex); +extern _X_EXPORT void xf86SetEntityInstanceForScreen(ScrnInfoPtr pScrn, int entityIndex, int instance); -int xf86GetNumEntityInstances(int entityIndex); -GDevPtr xf86GetDevFromEntity(int entityIndex, int instance); -void xf86RemoveEntityFromScreen(ScrnInfoPtr pScrn, int entityIndex); -EntityInfoPtr xf86GetEntityInfo(int entityIndex); -struct pci_device * xf86GetPciInfoForEntity(int entityIndex); -Bool xf86SetEntityFuncs(int entityIndex, EntityProc init, +extern _X_EXPORT int xf86GetNumEntityInstances(int entityIndex); +extern _X_EXPORT GDevPtr xf86GetDevFromEntity(int entityIndex, int instance); +extern _X_EXPORT void xf86RemoveEntityFromScreen(ScrnInfoPtr pScrn, int entityIndex); +extern _X_EXPORT EntityInfoPtr xf86GetEntityInfo(int entityIndex); +extern _X_EXPORT struct pci_device * xf86GetPciInfoForEntity(int entityIndex); +extern _X_EXPORT Bool xf86SetEntityFuncs(int entityIndex, EntityProc init, EntityProc enter, EntityProc leave, pointer); -void xf86DeallocateResourcesForEntity(int entityIndex, unsigned long type); -resPtr xf86RegisterResources(int entityIndex, resList list, +extern _X_EXPORT void xf86DeallocateResourcesForEntity(int entityIndex, unsigned long type); +extern _X_EXPORT resPtr xf86RegisterResources(int entityIndex, resList list, unsigned long Access); -Bool xf86CheckPciMemBase(struct pci_device * pPci, memType base); -void xf86SetAccessFuncs(EntityInfoPtr pEnt, xf86SetAccessFuncPtr funcs, +extern _X_EXPORT Bool xf86CheckPciMemBase(struct pci_device * pPci, memType base); +extern _X_EXPORT void xf86SetAccessFuncs(EntityInfoPtr pEnt, xf86SetAccessFuncPtr funcs, xf86SetAccessFuncPtr oldFuncs); -Bool xf86IsEntityPrimary(int entityIndex); -resPtr xf86SetOperatingState(resList list, int entityIndex, int mask); -void xf86EnterServerState(xf86State state); -ScrnInfoPtr xf86FindScreenForEntity(int entityIndex); -Bool xf86NoSharedResources(int screenIndex, resType res); -resPtr xf86FindIntersectOfLists(resPtr l1, resPtr l2); -void xf86RegisterStateChangeNotificationCallback(xf86StateChangeNotificationCallbackFunc func, pointer arg); -Bool xf86DeregisterStateChangeNotificationCallback(xf86StateChangeNotificationCallbackFunc func); - -int xf86GetLastScrnFlag(int entityIndex); -void xf86SetLastScrnFlag(int entityIndex, int scrnIndex); -Bool xf86IsEntityShared(int entityIndex); -void xf86SetEntityShared(int entityIndex); -Bool xf86IsEntitySharable(int entityIndex); -void xf86SetEntitySharable(int entityIndex); -Bool xf86IsPrimInitDone(int entityIndex); -void xf86SetPrimInitDone(int entityIndex); -void xf86ClearPrimInitDone(int entityIndex); -int xf86AllocateEntityPrivateIndex(void); -DevUnion *xf86GetEntityPrivate(int entityIndex, int privIndex); +extern _X_EXPORT Bool xf86IsEntityPrimary(int entityIndex); +extern _X_EXPORT resPtr xf86SetOperatingState(resList list, int entityIndex, int mask); +extern _X_EXPORT void xf86EnterServerState(xf86State state); +extern _X_EXPORT ScrnInfoPtr xf86FindScreenForEntity(int entityIndex); +extern _X_EXPORT Bool xf86NoSharedResources(int screenIndex, resType res); +extern _X_EXPORT resPtr xf86FindIntersectOfLists(resPtr l1, resPtr l2); +extern _X_EXPORT void xf86RegisterStateChangeNotificationCallback(xf86StateChangeNotificationCallbackFunc func, pointer arg); +extern _X_EXPORT Bool xf86DeregisterStateChangeNotificationCallback(xf86StateChangeNotificationCallbackFunc func); + +extern _X_EXPORT int xf86GetLastScrnFlag(int entityIndex); +extern _X_EXPORT void xf86SetLastScrnFlag(int entityIndex, int scrnIndex); +extern _X_EXPORT Bool xf86IsEntityShared(int entityIndex); +extern _X_EXPORT void xf86SetEntityShared(int entityIndex); +extern _X_EXPORT Bool xf86IsEntitySharable(int entityIndex); +extern _X_EXPORT void xf86SetEntitySharable(int entityIndex); +extern _X_EXPORT Bool xf86IsPrimInitDone(int entityIndex); +extern _X_EXPORT void xf86SetPrimInitDone(int entityIndex); +extern _X_EXPORT void xf86ClearPrimInitDone(int entityIndex); +extern _X_EXPORT int xf86AllocateEntityPrivateIndex(void); +extern _X_EXPORT DevUnion *xf86GetEntityPrivate(int entityIndex, int privIndex); /* xf86Configure.c */ -GDevPtr xf86AddBusDeviceToConfigure(const char *driver, BusType bus, +extern _X_EXPORT GDevPtr xf86AddBusDeviceToConfigure(const char *driver, BusType bus, void *busData, int chipset); /* xf86Cursor.c */ -void xf86LockZoom(ScreenPtr pScreen, int lock); -void xf86InitViewport(ScrnInfoPtr pScr); -void xf86SetViewport(ScreenPtr pScreen, int x, int y); -void xf86ZoomViewport(ScreenPtr pScreen, int zoom); -Bool xf86SwitchMode(ScreenPtr pScreen, DisplayModePtr mode); -void *xf86GetPointerScreenFuncs(void); -void xf86InitOrigins(void); -void xf86ReconfigureLayout(void); +extern _X_EXPORT void xf86LockZoom(ScreenPtr pScreen, int lock); +extern _X_EXPORT void xf86InitViewport(ScrnInfoPtr pScr); +extern _X_EXPORT void xf86SetViewport(ScreenPtr pScreen, int x, int y); +extern _X_EXPORT void xf86ZoomViewport(ScreenPtr pScreen, int zoom); +extern _X_EXPORT Bool xf86SwitchMode(ScreenPtr pScreen, DisplayModePtr mode); +extern _X_EXPORT void *xf86GetPointerScreenFuncs(void); +extern _X_EXPORT void xf86InitOrigins(void); +extern _X_EXPORT void xf86ReconfigureLayout(void); /* xf86cvt.c */ -DisplayModePtr xf86CVTMode(int HDisplay, int VDisplay, float VRefresh, +extern _X_EXPORT DisplayModePtr xf86CVTMode(int HDisplay, int VDisplay, float VRefresh, Bool Reduced, Bool Interlaced); /* xf86DPMS.c */ -Bool xf86DPMSInit(ScreenPtr pScreen, DPMSSetProcPtr set, int flags); +extern _X_EXPORT Bool xf86DPMSInit(ScreenPtr pScreen, DPMSSetProcPtr set, int flags); + +extern _X_EXPORT int DPMSSet(ClientPtr client, int level); /* libextmod */ + /* xf86DGA.c */ -Bool DGAInit(ScreenPtr pScreen, DGAFunctionPtr funcs, DGAModePtr modes, +extern _X_EXPORT Bool DGAInit(ScreenPtr pScreen, DGAFunctionPtr funcs, DGAModePtr modes, int num); -Bool DGAReInitModes(ScreenPtr pScreen, DGAModePtr modes, int num); -xf86SetDGAModeProc xf86SetDGAMode; +extern _X_EXPORT Bool DGAReInitModes(ScreenPtr pScreen, DGAModePtr modes, int num); +extern _X_EXPORT xf86SetDGAModeProc xf86SetDGAMode; /* xf86Events.c */ -void SetTimeSinceLastInputEvent(void); -pointer xf86AddInputHandler(int fd, InputHandlerProc proc, pointer data); -int xf86RemoveInputHandler(pointer handler); -void xf86DisableInputHandler(pointer handler); -void xf86EnableInputHandler(pointer handler); -pointer xf86AddGeneralHandler(int fd, InputHandlerProc proc, pointer data); -int xf86RemoveGeneralHandler(pointer handler); -void xf86DisableGeneralHandler(pointer handler); -void xf86EnableGeneralHandler(pointer handler); -void xf86InterceptSignals(int *signo); -void xf86InterceptSigIll(void (*sigillhandler)(void)); -Bool xf86EnableVTSwitch(Bool new); -void xf86ProcessActionEvent(ActionEvent action, void *arg); -void xf86PrintBacktrace(void); +extern _X_EXPORT void SetTimeSinceLastInputEvent(void); +extern _X_EXPORT pointer xf86AddInputHandler(int fd, InputHandlerProc proc, pointer data); +extern _X_EXPORT int xf86RemoveInputHandler(pointer handler); +extern _X_EXPORT void xf86DisableInputHandler(pointer handler); +extern _X_EXPORT void xf86EnableInputHandler(pointer handler); +extern _X_EXPORT pointer xf86AddGeneralHandler(int fd, InputHandlerProc proc, pointer data); +extern _X_EXPORT int xf86RemoveGeneralHandler(pointer handler); +extern _X_EXPORT void xf86DisableGeneralHandler(pointer handler); +extern _X_EXPORT void xf86EnableGeneralHandler(pointer handler); +extern _X_EXPORT void xf86InterceptSignals(int *signo); +extern _X_EXPORT void xf86InterceptSigIll(void (*sigillhandler)(void)); +extern _X_EXPORT Bool xf86EnableVTSwitch(Bool new); +extern _X_EXPORT void xf86ProcessActionEvent(ActionEvent action, void *arg); +extern _X_EXPORT void xf86PrintBacktrace(void); /* xf86Helper.c */ -void xf86AddDriver(DriverPtr driver, pointer module, int flags); -void xf86DeleteDriver(int drvIndex); -ScrnInfoPtr xf86AllocateScreen(DriverPtr drv, int flags); -void xf86DeleteScreen(int scrnIndex, int flags); -int xf86AllocateScrnInfoPrivateIndex(void); -Bool xf86AddPixFormat(ScrnInfoPtr pScrn, int depth, int bpp, int pad); -Bool xf86SetDepthBpp(ScrnInfoPtr scrp, int depth, int bpp, int fbbpp, +extern _X_EXPORT void xf86AddDriver(DriverPtr driver, pointer module, int flags); +extern _X_EXPORT void xf86DeleteDriver(int drvIndex); +extern _X_EXPORT ScrnInfoPtr xf86AllocateScreen(DriverPtr drv, int flags); +extern _X_EXPORT void xf86DeleteScreen(int scrnIndex, int flags); +extern _X_EXPORT int xf86AllocateScrnInfoPrivateIndex(void); +extern _X_EXPORT Bool xf86AddPixFormat(ScrnInfoPtr pScrn, int depth, int bpp, int pad); +extern _X_EXPORT Bool xf86SetDepthBpp(ScrnInfoPtr scrp, int depth, int bpp, int fbbpp, int depth24flags); -void xf86PrintDepthBpp(ScrnInfoPtr scrp); -Bool xf86SetWeight(ScrnInfoPtr scrp, rgb weight, rgb mask); -Bool xf86SetDefaultVisual(ScrnInfoPtr scrp, int visual); -Bool xf86SetGamma(ScrnInfoPtr scrp, Gamma newGamma); -void xf86SetDpi(ScrnInfoPtr pScrn, int x, int y); -void xf86SetBlackWhitePixels(ScreenPtr pScreen); -void xf86EnableDisableFBAccess(int scrnIndex, Bool enable); -void xf86VDrvMsgVerb(int scrnIndex, MessageType type, int verb, +extern _X_EXPORT void xf86PrintDepthBpp(ScrnInfoPtr scrp); +extern _X_EXPORT Bool xf86SetWeight(ScrnInfoPtr scrp, rgb weight, rgb mask); +extern _X_EXPORT Bool xf86SetDefaultVisual(ScrnInfoPtr scrp, int visual); +extern _X_EXPORT Bool xf86SetGamma(ScrnInfoPtr scrp, Gamma newGamma); +extern _X_EXPORT void xf86SetDpi(ScrnInfoPtr pScrn, int x, int y); +extern _X_EXPORT void xf86SetBlackWhitePixels(ScreenPtr pScreen); +extern _X_EXPORT void xf86EnableDisableFBAccess(int scrnIndex, Bool enable); +extern _X_EXPORT void xf86VDrvMsgVerb(int scrnIndex, MessageType type, int verb, const char *format, va_list args); -void xf86DrvMsgVerb(int scrnIndex, MessageType type, int verb, +extern _X_EXPORT void xf86DrvMsgVerb(int scrnIndex, MessageType type, int verb, const char *format, ...) _printf_attribute(4,5); -void xf86DrvMsg(int scrnIndex, MessageType type, const char *format, ...) +extern _X_EXPORT void xf86DrvMsg(int scrnIndex, MessageType type, const char *format, ...) _printf_attribute(3,4); -void xf86MsgVerb(MessageType type, int verb, const char *format, ...) +extern _X_EXPORT void xf86MsgVerb(MessageType type, int verb, const char *format, ...) _printf_attribute(3,4); -void xf86Msg(MessageType type, const char *format, ...) _printf_attribute(2,3); -void xf86ErrorFVerb(int verb, const char *format, ...) _printf_attribute(2,3); -void xf86ErrorF(const char *format, ...) _printf_attribute(1,2); -const char *xf86TokenToString(SymTabPtr table, int token); -int xf86StringToToken(SymTabPtr table, const char *string); -void xf86ShowClocks(ScrnInfoPtr scrp, MessageType from); -void xf86PrintChipsets(const char *drvname, const char *drvmsg, +extern _X_EXPORT void xf86Msg(MessageType type, const char *format, ...) _printf_attribute(2,3); +extern _X_EXPORT void xf86ErrorFVerb(int verb, const char *format, ...) _printf_attribute(2,3); +extern _X_EXPORT void xf86ErrorF(const char *format, ...) _printf_attribute(1,2); +extern _X_EXPORT const char *xf86TokenToString(SymTabPtr table, int token); +extern _X_EXPORT int xf86StringToToken(SymTabPtr table, const char *string); +extern _X_EXPORT void xf86ShowClocks(ScrnInfoPtr scrp, MessageType from); +extern _X_EXPORT void xf86PrintChipsets(const char *drvname, const char *drvmsg, SymTabPtr chips); -int xf86MatchDevice(const char *drivername, GDevPtr **driversectlist); -int xf86MatchPciInstances(const char *driverName, int vendorID, +extern _X_EXPORT int xf86MatchDevice(const char *drivername, GDevPtr **driversectlist); +extern _X_EXPORT int xf86MatchPciInstances(const char *driverName, int vendorID, SymTabPtr chipsets, PciChipsets *PCIchipsets, GDevPtr *devList, int numDevs, DriverPtr drvp, int **foundEntities); -void xf86GetClocks(ScrnInfoPtr pScrn, int num, +extern _X_EXPORT void xf86GetClocks(ScrnInfoPtr pScrn, int num, Bool (*ClockFunc)(ScrnInfoPtr, int), void (*ProtectRegs)(ScrnInfoPtr, Bool), void (*BlankScreen)(ScrnInfoPtr, Bool), IOADDRESS vertsyncreg, int maskval, int knownclkindex, int knownclkvalue); -void xf86SetPriority(Bool up); -const char *xf86GetVisualName(int visual); -int xf86GetVerbosity(void); -Pix24Flags xf86GetPix24(void); -int xf86GetDepth(void); -rgb xf86GetWeight(void); -Gamma xf86GetGamma(void); -Bool xf86GetFlipPixels(void); -const char *xf86GetServerName(void); -Bool xf86ServerIsExiting(void); -Bool xf86ServerIsResetting(void); -Bool xf86ServerIsInitialising(void); -Bool xf86ServerIsOnlyDetecting(void); -Bool xf86ServerIsOnlyProbing(void); -Bool xf86CaughtSignal(void); -Bool xf86GetVidModeAllowNonLocal(void); -Bool xf86GetVidModeEnabled(void); -Bool xf86GetModInDevAllowNonLocal(void); -Bool xf86GetModInDevEnabled(void); -Bool xf86GetAllowMouseOpenFail(void); -Bool xf86IsPc98(void); -void xf86DisableRandR(void); -CARD32 xorgGetVersion(void); -CARD32 xf86GetModuleVersion(pointer module); -pointer xf86LoadDrvSubModule(DriverPtr drv, const char *name); -pointer xf86LoadSubModule(ScrnInfoPtr pScrn, const char *name); -pointer xf86LoadOneModule(char *name, pointer optlist); -void xf86UnloadSubModule(pointer mod); -Bool xf86LoaderCheckSymbol(const char *name); -void xf86LoaderReqSymLists(const char **, ...); -void xf86LoaderReqSymbols(const char *, ...); -void xf86LoaderRefSymLists(const char **, ...); -void xf86LoaderRefSymbols(const char *, ...); -void xf86SetBackingStore(ScreenPtr pScreen); -void xf86SetSilkenMouse(ScreenPtr pScreen); -pointer xf86FindXvOptions(int scrnIndex, int adapt_index, char *port_name, +extern _X_EXPORT void xf86SetPriority(Bool up); +extern _X_EXPORT const char *xf86GetVisualName(int visual); +extern _X_EXPORT int xf86GetVerbosity(void); +extern _X_EXPORT Pix24Flags xf86GetPix24(void); +extern _X_EXPORT int xf86GetDepth(void); +extern _X_EXPORT rgb xf86GetWeight(void); +extern _X_EXPORT Gamma xf86GetGamma(void); +extern _X_EXPORT Bool xf86GetFlipPixels(void); +extern _X_EXPORT const char *xf86GetServerName(void); +extern _X_EXPORT Bool xf86ServerIsExiting(void); +extern _X_EXPORT Bool xf86ServerIsResetting(void); +extern _X_EXPORT Bool xf86ServerIsInitialising(void); +extern _X_EXPORT Bool xf86ServerIsOnlyDetecting(void); +extern _X_EXPORT Bool xf86ServerIsOnlyProbing(void); +extern _X_EXPORT Bool xf86CaughtSignal(void); +extern _X_EXPORT Bool xf86GetVidModeAllowNonLocal(void); +extern _X_EXPORT Bool xf86GetVidModeEnabled(void); +extern _X_EXPORT Bool xf86GetModInDevAllowNonLocal(void); +extern _X_EXPORT Bool xf86GetModInDevEnabled(void); +extern _X_EXPORT Bool xf86GetAllowMouseOpenFail(void); +extern _X_EXPORT Bool xf86IsPc98(void); +extern _X_EXPORT void xf86DisableRandR(void); +extern _X_EXPORT CARD32 xorgGetVersion(void); +extern _X_EXPORT CARD32 xf86GetModuleVersion(pointer module); +extern _X_EXPORT pointer xf86LoadDrvSubModule(DriverPtr drv, const char *name); +extern _X_EXPORT pointer xf86LoadSubModule(ScrnInfoPtr pScrn, const char *name); +extern _X_EXPORT pointer xf86LoadOneModule(char *name, pointer optlist); +extern _X_EXPORT void xf86UnloadSubModule(pointer mod); +extern _X_EXPORT Bool xf86LoaderCheckSymbol(const char *name); +extern _X_EXPORT void xf86LoaderReqSymLists(const char **, ...); +extern _X_EXPORT void xf86LoaderReqSymbols(const char *, ...); +extern _X_EXPORT void xf86LoaderRefSymLists(const char **, ...); +extern _X_EXPORT void xf86LoaderRefSymbols(const char *, ...); +extern _X_EXPORT void xf86SetBackingStore(ScreenPtr pScreen); +extern _X_EXPORT void xf86SetSilkenMouse(ScreenPtr pScreen); +extern _X_EXPORT pointer xf86FindXvOptions(int scrnIndex, int adapt_index, char *port_name, char **adaptor_name, pointer *adaptor_options); -void xf86GetOS(const char **name, int *major, int *minor, int *teeny); -ScrnInfoPtr xf86ConfigPciEntity(ScrnInfoPtr pScrn, int scrnFlag, +extern _X_EXPORT void xf86GetOS(const char **name, int *major, int *minor, int *teeny); +extern _X_EXPORT ScrnInfoPtr xf86ConfigPciEntity(ScrnInfoPtr pScrn, int scrnFlag, int entityIndex,PciChipsets *p_chip, resList res, EntityProc init, EntityProc enter, EntityProc leave, pointer private); -ScrnInfoPtr xf86ConfigFbEntity(ScrnInfoPtr pScrn, int scrnFlag, +extern _X_EXPORT ScrnInfoPtr xf86ConfigFbEntity(ScrnInfoPtr pScrn, int scrnFlag, int entityIndex, EntityProc init, EntityProc enter, EntityProc leave, pointer private); /* Obsolete! don't use */ -Bool xf86ConfigActivePciEntity(ScrnInfoPtr pScrn, +extern _X_EXPORT Bool xf86ConfigActivePciEntity(ScrnInfoPtr pScrn, int entityIndex,PciChipsets *p_chip, resList res, EntityProc init, EntityProc enter, EntityProc leave, pointer private); /* Obsolete! don't use */ -void xf86ConfigPciEntityInactive(EntityInfoPtr pEnt, PciChipsets *p_chip, +extern _X_EXPORT void xf86ConfigPciEntityInactive(EntityInfoPtr pEnt, PciChipsets *p_chip, resList res, EntityProc init, EntityProc enter, EntityProc leave, pointer private); -void xf86ConfigFbEntityInactive(EntityInfoPtr pEnt, EntityProc init, +extern _X_EXPORT void xf86ConfigFbEntityInactive(EntityInfoPtr pEnt, EntityProc init, EntityProc enter, EntityProc leave, pointer private); -Bool xf86IsScreenPrimary(int scrnIndex); -int xf86RegisterRootWindowProperty(int ScrnIndex, Atom property, Atom type, +extern _X_EXPORT Bool xf86IsScreenPrimary(int scrnIndex); +extern _X_EXPORT int xf86RegisterRootWindowProperty(int ScrnIndex, Atom property, Atom type, int format, unsigned long len, pointer value); -Bool xf86IsUnblank(int mode); +extern _X_EXPORT Bool xf86IsUnblank(int mode); -_X_DEPRECATED void xf86AddModuleInfo(pointer info, pointer module); -_X_DEPRECATED void xf86DeleteModuleInfo(int idx); +extern _X_EXPORT _X_DEPRECATED void xf86AddModuleInfo(pointer info, pointer module); +extern _X_EXPORT _X_DEPRECATED void xf86DeleteModuleInfo(int idx); /* xf86Init.c */ -PixmapFormatPtr xf86GetPixFormat(ScrnInfoPtr pScrn, int depth); -int xf86GetBppFromDepth(ScrnInfoPtr pScrn, int depth); +extern _X_EXPORT PixmapFormatPtr xf86GetPixFormat(ScrnInfoPtr pScrn, int depth); +extern _X_EXPORT int xf86GetBppFromDepth(ScrnInfoPtr pScrn, int depth); /* xf86Mode.c */ -int xf86GetNearestClock(ScrnInfoPtr scrp, int freq, Bool allowDiv2, +extern _X_EXPORT int xf86GetNearestClock(ScrnInfoPtr scrp, int freq, Bool allowDiv2, int DivFactor, int MulFactor, int *divider); -const char *xf86ModeStatusToString(ModeStatus status); -ModeStatus xf86LookupMode(ScrnInfoPtr scrp, DisplayModePtr modep, +extern _X_EXPORT const char *xf86ModeStatusToString(ModeStatus status); +extern _X_EXPORT ModeStatus xf86LookupMode(ScrnInfoPtr scrp, DisplayModePtr modep, ClockRangePtr clockRanges, LookupModeFlags strategy); -ModeStatus xf86CheckModeForMonitor(DisplayModePtr mode, MonPtr monitor); -ModeStatus xf86InitialCheckModeForDriver(ScrnInfoPtr scrp, DisplayModePtr mode, +extern _X_EXPORT ModeStatus xf86CheckModeForMonitor(DisplayModePtr mode, MonPtr monitor); +extern _X_EXPORT ModeStatus xf86InitialCheckModeForDriver(ScrnInfoPtr scrp, DisplayModePtr mode, ClockRangePtr clockRanges, LookupModeFlags strategy, int maxPitch, int virtualX, int virtualY); -ModeStatus xf86CheckModeForDriver(ScrnInfoPtr scrp, DisplayModePtr mode, +extern _X_EXPORT ModeStatus xf86CheckModeForDriver(ScrnInfoPtr scrp, DisplayModePtr mode, int flags); -int xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes, +extern _X_EXPORT int xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes, char **modeNames, ClockRangePtr clockRanges, int *linePitches, int minPitch, int maxPitch, int minHeight, int maxHeight, int pitchInc, int virtualX, int virtualY, int apertureSize, LookupModeFlags strategy); -void xf86DeleteMode(DisplayModePtr *modeList, DisplayModePtr mode); -void xf86PruneDriverModes(ScrnInfoPtr scrp); -void xf86SetCrtcForModes(ScrnInfoPtr scrp, int adjustFlags); -void xf86PrintModes(ScrnInfoPtr scrp); -void xf86ShowClockRanges(ScrnInfoPtr scrp, ClockRangePtr clockRanges); -double xf86ModeHSync(const DisplayModeRec *mode); -double xf86ModeVRefresh(const DisplayModeRec *mode); -void xf86SetModeDefaultName(DisplayModePtr mode); -void xf86SetModeCrtc(DisplayModePtr p, int adjustFlags); -DisplayModePtr xf86DuplicateMode(const DisplayModeRec *pMode); -DisplayModePtr xf86DuplicateModes(ScrnInfoPtr pScrn, DisplayModePtr modeList); -Bool xf86ModesEqual(const DisplayModeRec *pMode1, +extern _X_EXPORT void xf86DeleteMode(DisplayModePtr *modeList, DisplayModePtr mode); +extern _X_EXPORT void xf86PruneDriverModes(ScrnInfoPtr scrp); +extern _X_EXPORT void xf86SetCrtcForModes(ScrnInfoPtr scrp, int adjustFlags); +extern _X_EXPORT void xf86PrintModes(ScrnInfoPtr scrp); +extern _X_EXPORT void xf86ShowClockRanges(ScrnInfoPtr scrp, ClockRangePtr clockRanges); +extern _X_EXPORT double xf86ModeHSync(const DisplayModeRec *mode); +extern _X_EXPORT double xf86ModeVRefresh(const DisplayModeRec *mode); +extern _X_EXPORT void xf86SetModeDefaultName(DisplayModePtr mode); +extern _X_EXPORT void xf86SetModeCrtc(DisplayModePtr p, int adjustFlags); +extern _X_EXPORT DisplayModePtr xf86DuplicateMode(const DisplayModeRec *pMode); +extern _X_EXPORT DisplayModePtr xf86DuplicateModes(ScrnInfoPtr pScrn, DisplayModePtr modeList); +extern _X_EXPORT Bool xf86ModesEqual(const DisplayModeRec *pMode1, const DisplayModeRec *pMode2); -void xf86PrintModeline(int scrnIndex,DisplayModePtr mode); -DisplayModePtr xf86ModesAdd(DisplayModePtr modes, DisplayModePtr new); +extern _X_EXPORT void xf86PrintModeline(int scrnIndex,DisplayModePtr mode); +extern _X_EXPORT DisplayModePtr xf86ModesAdd(DisplayModePtr modes, DisplayModePtr new); /* xf86Option.c */ -void xf86CollectOptions(ScrnInfoPtr pScrn, pointer extraOpts); +extern _X_EXPORT void xf86CollectOptions(ScrnInfoPtr pScrn, pointer extraOpts); /* xf86RandR.c */ #ifdef RANDR -Bool xf86RandRInit (ScreenPtr pScreen); -Rotation xf86GetRotation(ScreenPtr pScreen); -Bool xf86RandRSetNewVirtualAndDimensions(ScreenPtr pScreen, +extern _X_EXPORT Bool xf86RandRInit (ScreenPtr pScreen); +extern _X_EXPORT Rotation xf86GetRotation(ScreenPtr pScreen); +extern _X_EXPORT Bool xf86RandRSetNewVirtualAndDimensions(ScreenPtr pScreen, int newvirtX, int newvirtY, int newmmWidth, int newmmHeight, Bool resetMode); #endif /* xf86VidModeExtentionInit.c */ -Bool VidModeExtensionInit(ScreenPtr pScreen); +extern _X_EXPORT Bool VidModeExtensionInit(ScreenPtr pScreen); #endif /* _NO_XF86_PROTOTYPES */ diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c index c825d236f..e0e3cb4b5 100644 --- a/hw/xfree86/common/xf86Bus.c +++ b/hw/xfree86/common/xf86Bus.c @@ -64,7 +64,7 @@ noopEnableDisable(void *arg) { } xf86AccessRec AccessNULL = { noopEnableDisable, noopEnableDisable, NULL }; -_X_EXPORT xf86CurrentAccessRec xf86CurrentAccess = {NULL,NULL}; +xf86CurrentAccessRec xf86CurrentAccess = {NULL,NULL}; BusRec primaryBus = { BUS_NONE, {{0}}}; @@ -75,16 +75,16 @@ static Bool xf86ResAccessEnter = FALSE; resPtr Acc = NULL; /* predefined special resources */ -_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}; +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}; /* Flag: do we need RAC ? */ static Bool needRAC = FALSE; @@ -100,7 +100,7 @@ static void notifyStateChange(xf86NotifyState state); * The only one available so far is for PCI and SBUS. */ -_X_EXPORT void +void xf86BusProbe(void) { xf86PciProbe(); @@ -148,7 +148,7 @@ StringToBusType(const char* busID, const char **retID) * Entity related code. */ -_X_EXPORT void +void xf86EntityInit(void) { int i; @@ -214,7 +214,7 @@ EntityLeave(void) } } -_X_EXPORT Bool +Bool xf86IsEntityPrimary(int entityIndex) { EntityPtr pEnt = xf86Entities[entityIndex]; @@ -231,7 +231,7 @@ xf86IsEntityPrimary(int entityIndex) } } -_X_EXPORT Bool +Bool xf86SetEntityFuncs(int entityIndex, EntityProc init, EntityProc enter, EntityProc leave, pointer private) { @@ -244,7 +244,7 @@ xf86SetEntityFuncs(int entityIndex, EntityProc init, EntityProc enter, return TRUE; } -_X_EXPORT Bool +Bool xf86DriverHasEntities(DriverPtr drvp) { int i; @@ -255,7 +255,7 @@ xf86DriverHasEntities(DriverPtr drvp) return FALSE; } -_X_EXPORT void +void xf86AddEntityToScreen(ScrnInfoPtr pScrn, int entityIndex) { if (entityIndex == -1) @@ -279,7 +279,7 @@ xf86AddEntityToScreen(ScrnInfoPtr pScrn, int entityIndex) pScrn->domainIOBase = xf86Entities[entityIndex]->domainIO; } -_X_EXPORT void +void xf86SetEntityInstanceForScreen(ScrnInfoPtr pScrn, int entityIndex, int instance) { int i; @@ -299,7 +299,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. */ -_X_EXPORT ScrnInfoPtr +ScrnInfoPtr xf86FindScreenForEntity(int entityIndex) { int i,j; @@ -317,7 +317,7 @@ xf86FindScreenForEntity(int entityIndex) return NULL; } -_X_EXPORT void +void xf86RemoveEntityFromScreen(ScrnInfoPtr pScrn, int entityIndex) { int i; @@ -348,7 +348,7 @@ xf86RemoveEntityFromScreen(ScrnInfoPtr pScrn, int entityIndex) * xf86ClearEntitiesForScreen() - called when a screen is deleted * to mark it's entities unused. Called by xf86DeleteScreen(). */ -_X_EXPORT void +void xf86ClearEntityListForScreen(int scrnIndex) { ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; @@ -380,7 +380,7 @@ xf86ClearEntityListForScreen(int scrnIndex) pScrn->entityInstanceList = NULL; } -_X_EXPORT void +void xf86DeallocateResourcesForEntity(int entityIndex, unsigned long type) { resPtr *pprev_next = &Acc; @@ -402,7 +402,7 @@ xf86DeallocateResourcesForEntity(int entityIndex, unsigned long type) * Add an extra device section (GDevPtr) to an entity. */ -_X_EXPORT void +void xf86AddDevToEntity(int entityIndex, GDevPtr dev) { EntityPtr pEnt; @@ -423,7 +423,7 @@ xf86AddDevToEntity(int entityIndex, GDevPtr dev) * EntityRec struct to the drivers. The EntityRec structure itself * remains invisible to the driver. */ -_X_EXPORT EntityInfoPtr +EntityInfoPtr xf86GetEntityInfo(int entityIndex) { EntityInfoPtr pEnt; @@ -451,7 +451,7 @@ xf86GetEntityInfo(int entityIndex) return pEnt; } -_X_EXPORT int +int xf86GetNumEntityInstances(int entityIndex) { if (entityIndex >= xf86NumEntities) @@ -460,7 +460,7 @@ xf86GetNumEntityInstances(int entityIndex) return xf86Entities[entityIndex]->numInstances; } -_X_EXPORT GDevPtr +GDevPtr xf86GetDevFromEntity(int entityIndex, int instance) { int i; @@ -539,7 +539,7 @@ clearAccess(void) * xf86AccessInit() - set up everything needed for access control * called only once on first server generation. */ -_X_EXPORT void +void xf86AccessInit(void) { initPciState(); @@ -554,7 +554,7 @@ xf86AccessInit(void) * xf86AccessEnter() -- gets called to save the text mode VGA IO * resources when reentering the server after a VT switch. */ -_X_EXPORT void +void xf86AccessEnter(void) { if (xf86ResAccessEnter) @@ -583,7 +583,7 @@ xf86AccessEnter(void) * This was split to call xf86AccessLeaveState() from * ddxGiveUp(). */ -_X_EXPORT void +void xf86AccessLeave(void) { if (!xf86ResAccessEnter) @@ -594,7 +594,7 @@ xf86AccessLeave(void) EntityLeave(); } -_X_EXPORT void +void xf86AccessLeaveState(void) { if (!xf86ResAccessEnter) @@ -632,7 +632,7 @@ xf86AccessRestoreState(void) * by other resources! */ -_X_EXPORT void +void xf86EnableAccess(ScrnInfoPtr pScrn) { register EntityAccessPtr peAcc = (EntityAccessPtr) pScrn->access; @@ -753,7 +753,7 @@ xf86EnableAccess(ScrnInfoPtr pScrn) } } -_X_EXPORT void +void xf86SetCurrentAccess(Bool Enable, ScrnInfoPtr pScrn) { EntityAccessPtr pceAcc2 = NULL; @@ -793,7 +793,7 @@ xf86SetCurrentAccess(Bool Enable, ScrnInfoPtr pScrn) } } -_X_EXPORT void +void xf86SetAccessFuncs(EntityInfoPtr pEnt, xf86SetAccessFuncPtr funcs, xf86SetAccessFuncPtr oldFuncs) { @@ -1098,7 +1098,7 @@ xf86JoinResLists(resPtr rlist1, resPtr rlist2) return rlist1; } -_X_EXPORT resPtr +resPtr xf86AddResToList(resPtr rlist, resRange *range, int entityIndex) { resPtr new; @@ -1135,7 +1135,7 @@ xf86AddResToList(resPtr rlist, resRange *range, int entityIndex) return new; } -_X_EXPORT void +void xf86FreeResList(resPtr rlist) { resPtr pRes; @@ -1267,7 +1267,7 @@ xf86PrintResList(int verb, resPtr list) } } -_X_EXPORT resPtr +resPtr xf86AddRangesToList(resPtr list, resRange *pRange, int entityIndex) { while(pRange && pRange->type != ResEnd) { @@ -1277,7 +1277,7 @@ xf86AddRangesToList(resPtr list, resRange *pRange, int entityIndex) return list; } -_X_EXPORT void +void xf86ResourceBrokerInit(void) { Acc = NULL; @@ -1323,7 +1323,7 @@ xf86ConvertListToHost(int entityIndex, resPtr list) * which we mean, NULL. */ -_X_EXPORT resPtr +resPtr xf86RegisterResources(int entityIndex, resList list, unsigned long access) { resRange range; @@ -1543,7 +1543,7 @@ SetSIGIOForState(xf86State state) } } -_X_EXPORT void +void xf86EnterServerState(xf86State state) { EntityPtr pEnt; @@ -1649,7 +1649,7 @@ xf86EnterServerState(xf86State state) /* * xf86SetOperatingState() -- Set ResOperMask for resources listed. */ -_X_EXPORT resPtr +resPtr xf86SetOperatingState(resList list, int entityIndex, int mask) { resPtr acc; @@ -1690,7 +1690,7 @@ xf86SetOperatingState(resList list, int entityIndex, int mask) * xf86ClaimFixedResources() is used to allocate non-relocatable resources. * This should only be done by a driver's Probe() function. */ -_X_EXPORT void +void xf86ClaimFixedResources(resList list, int entityIndex) { resPtr ptr = NULL; @@ -1820,7 +1820,7 @@ checkRoutingForScreens(xf86State state) * xf86PostProbe() -- Allocate all non conflicting resources * This function gets called by xf86Init(). */ -_X_EXPORT void +void xf86PostProbe(void) { memType val; @@ -1935,7 +1935,7 @@ checkRequiredResources(int entityIndex) pEnt->entityProp &= ~(unsigned long)NEED_IO_SHARED; } -_X_EXPORT void +void xf86PostPreInit() { if (doFramebufferMode) return; @@ -1955,7 +1955,7 @@ xf86PostPreInit() xf86PrintResList(3, Acc); } -_X_EXPORT void +void xf86PostScreenInit(void) { int i,j; @@ -2304,7 +2304,7 @@ findIntersect(resRange Range, resPtr list) return new; } -_X_EXPORT resPtr +resPtr xf86FindIntersectOfLists(resPtr l1, resPtr l2) { resPtr ret = NULL; @@ -2369,7 +2369,7 @@ xf86ExtractTypeFromList(resPtr list, unsigned long type) * xf86FindPrimaryDevice() - Find the display device which * was active when the server was started. */ -_X_EXPORT void +void xf86FindPrimaryDevice() { if (primaryBus.type != BUS_NONE) { @@ -2398,7 +2398,7 @@ xf86FindPrimaryDevice() } } -_X_EXPORT Bool +Bool xf86NoSharedResources(int screenIndex,resType res) { int j; @@ -2430,7 +2430,7 @@ xf86NoSharedResources(int screenIndex,resType res) return TRUE; } -_X_EXPORT void +void xf86RegisterStateChangeNotificationCallback(xf86StateChangeNotificationCallbackFunc func, pointer arg) { StateChangeNotificationPtr ptr = @@ -2442,7 +2442,7 @@ xf86RegisterStateChangeNotificationCallback(xf86StateChangeNotificationCallbackF StateChangeNotificationList = ptr; } -_X_EXPORT Bool +Bool xf86DeregisterStateChangeNotificationCallback(xf86StateChangeNotificationCallbackFunc func) { StateChangeNotificationPtr *ptr = &StateChangeNotificationList; @@ -2472,7 +2472,7 @@ notifyStateChange(xf86NotifyState state) /* Multihead accel sharing accessor functions and entity Private handling */ -_X_EXPORT int +int xf86GetLastScrnFlag(int entityIndex) { if(entityIndex < xf86NumEntities) { @@ -2482,7 +2482,7 @@ xf86GetLastScrnFlag(int entityIndex) } } -_X_EXPORT void +void xf86SetLastScrnFlag(int entityIndex, int scrnIndex) { if(entityIndex < xf86NumEntities) { @@ -2490,7 +2490,7 @@ xf86SetLastScrnFlag(int entityIndex, int scrnIndex) } } -_X_EXPORT Bool +Bool xf86IsEntityShared(int entityIndex) { if(entityIndex < xf86NumEntities) { @@ -2501,7 +2501,7 @@ xf86IsEntityShared(int entityIndex) return FALSE; } -_X_EXPORT void +void xf86SetEntityShared(int entityIndex) { if(entityIndex < xf86NumEntities) { @@ -2509,7 +2509,7 @@ xf86SetEntityShared(int entityIndex) } } -_X_EXPORT Bool +Bool xf86IsEntitySharable(int entityIndex) { if(entityIndex < xf86NumEntities) { @@ -2520,7 +2520,7 @@ xf86IsEntitySharable(int entityIndex) return FALSE; } -_X_EXPORT void +void xf86SetEntitySharable(int entityIndex) { if(entityIndex < xf86NumEntities) { @@ -2528,7 +2528,7 @@ xf86SetEntitySharable(int entityIndex) } } -_X_EXPORT Bool +Bool xf86IsPrimInitDone(int entityIndex) { if(entityIndex < xf86NumEntities) { @@ -2539,7 +2539,7 @@ xf86IsPrimInitDone(int entityIndex) return FALSE; } -_X_EXPORT void +void xf86SetPrimInitDone(int entityIndex) { if(entityIndex < xf86NumEntities) { @@ -2547,7 +2547,7 @@ xf86SetPrimInitDone(int entityIndex) } } -_X_EXPORT void +void xf86ClearPrimInitDone(int entityIndex) { if(entityIndex < xf86NumEntities) { @@ -2560,7 +2560,7 @@ xf86ClearPrimInitDone(int entityIndex) * Allocate a private in the entities. */ -_X_EXPORT int +int xf86AllocateEntityPrivateIndex(void) { int idx, i; @@ -2579,7 +2579,7 @@ xf86AllocateEntityPrivateIndex(void) return idx; } -_X_EXPORT DevUnion * +DevUnion * xf86GetEntityPrivate(int entityIndex, int privIndex) { if (entityIndex >= xf86NumEntities || privIndex >= xf86EntityPrivateCount) diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c index 9bf18b555..5a5a7f20f 100644 --- a/hw/xfree86/common/xf86Config.c +++ b/hw/xfree86/common/xf86Config.c @@ -1118,7 +1118,7 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts) return TRUE; } -_X_EXPORT Bool xf86DRI2Enabled(void) +Bool xf86DRI2Enabled(void) { return xf86Info.dri2; } @@ -2608,7 +2608,7 @@ xf86HandleConfigFile(Bool autoconfig) return CONFIG_OK; } -_X_EXPORT Bool +Bool xf86PathIsSafe(const char *path) { return (xf86pathIsSafe(path) != 0); diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c index 1430cda4d..b803b4910 100644 --- a/hw/xfree86/common/xf86Configure.c +++ b/hw/xfree86/common/xf86Configure.c @@ -67,8 +67,8 @@ typedef struct _DevToConfig { static DevToConfigPtr DevToConfig = NULL; static int nDevToConfig = 0, CurrentDriver; -_X_EXPORT xf86MonPtr ConfiguredMonitor; -_X_EXPORT Bool xf86DoConfigurePass1 = TRUE; +xf86MonPtr ConfiguredMonitor; +Bool xf86DoConfigurePass1 = TRUE; static Bool foundMouse = FALSE; #if defined(__SCO__) @@ -92,7 +92,7 @@ static char *DFLT_MOUSE_PROTO = "auto"; * directly. We allocate a GDevRec and fill it in as much as we can, letting * the caller fill in the rest and/or change it as it sees fit. */ -_X_EXPORT GDevPtr +GDevPtr xf86AddBusDeviceToConfigure(const char *driver, BusType bus, void *busData, int chipset) { int i, j; @@ -614,7 +614,7 @@ configureDDCMonitorSection (int screennum) # define PATH_MAX 1024 #endif -_X_EXPORT void +void DoConfigure(void) { int i,j, screennum = -1; diff --git a/hw/xfree86/common/xf86Cursor.c b/hw/xfree86/common/xf86Cursor.c index f7a469f9a..1203aad43 100644 --- a/hw/xfree86/common/xf86Cursor.c +++ b/hw/xfree86/common/xf86Cursor.c @@ -89,7 +89,7 @@ static Bool HardEdges; * is valid if specified. */ -_X_EXPORT void +void xf86InitViewport(ScrnInfoPtr pScr) { @@ -133,7 +133,7 @@ xf86InitViewport(ScrnInfoPtr pScr) * Scroll the visual part of the screen so the pointer is visible. */ -_X_EXPORT void +void xf86SetViewport(ScreenPtr pScreen, int x, int y) { ScrnInfoPtr pScr = XF86SCRNINFO(pScreen); @@ -185,7 +185,7 @@ xf86PointerMoved(int scrnIndex, int x, int y) * Enable/disable ZoomViewport */ -_X_EXPORT void +void xf86LockZoom(ScreenPtr pScreen, Bool lock) { XF86SCRNINFO(pScreen)->zoomLocked = lock; @@ -197,7 +197,7 @@ xf86LockZoom(ScreenPtr pScreen, Bool lock) * set a new mode. */ -_X_EXPORT Bool +Bool xf86SwitchMode(ScreenPtr pScreen, DisplayModePtr mode) { ScrnInfoPtr pScr = XF86SCRNINFO(pScreen); @@ -322,7 +322,7 @@ xf86SwitchMode(ScreenPtr pScreen, DisplayModePtr mode) * Reinitialize the visual part of the screen for another mode. */ -_X_EXPORT void +void xf86ZoomViewport(ScreenPtr pScreen, int zoom) { ScrnInfoPtr pScr = XF86SCRNINFO(pScreen); @@ -480,7 +480,7 @@ xf86WarpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y) } -_X_EXPORT void * +void * xf86GetPointerScreenFuncs(void) { return (void *)&xf86PointerScreenFuncs; @@ -579,7 +579,7 @@ FillOutEdge(xf86EdgePtr pEdge, int limit) * on 32 bit architectures, 64 on 64 bit architectures. */ -_X_EXPORT void +void xf86InitOrigins(void) { unsigned long screensLeft, prevScreensLeft, mask; @@ -845,7 +845,7 @@ xf86InitOrigins(void) } } -_X_EXPORT void +void xf86ReconfigureLayout(void) { int i; diff --git a/hw/xfree86/common/xf86DGA.c b/hw/xfree86/common/xf86DGA.c index f378c1399..bbb87929f 100644 --- a/hw/xfree86/common/xf86DGA.c +++ b/hw/xfree86/common/xf86DGA.c @@ -68,7 +68,7 @@ DGACopyModeInfo( XDGAModePtr xmode ); -_X_EXPORT int *XDGAEventBase = NULL; +int *XDGAEventBase = NULL; #define DGA_GET_SCREEN_PRIV(pScreen) ((DGAScreenPtr) \ dixLookupPrivate(&(pScreen)->devPrivates, DGAScreenKey)) @@ -101,7 +101,7 @@ typedef struct { Bool grabKeyboard; } DGAScreenRec, *DGAScreenPtr; -_X_EXPORT Bool +Bool DGAInit( ScreenPtr pScreen, DGAFunctionPtr funcs, @@ -164,7 +164,7 @@ DGAInit( * the DGA mode list. */ -_X_EXPORT Bool +Bool DGAReInitModes( ScreenPtr pScreen, DGAModePtr modes, @@ -334,7 +334,7 @@ DGAUninstallColormap(ColormapPtr pmap) pScreen->UninstallColormap = DGAUninstallColormap; } -_X_EXPORT int +int xf86SetDGAMode( int index, int num, @@ -453,7 +453,7 @@ xf86SetDGAMode( /*********** exported ones ***************/ -_X_EXPORT void +void DGASetInputMode(int index, Bool keyboard, Bool mouse) { ScreenPtr pScreen = screenInfo.screens[index]; @@ -475,7 +475,7 @@ DGASetInputMode(int index, Bool keyboard, Bool mouse) } } -_X_EXPORT Bool +Bool DGAChangePixmapMode(int index, int *x, int *y, int mode) { DGAScreenPtr pScreenPriv; @@ -530,7 +530,7 @@ DGAChangePixmapMode(int index, int *x, int *y, int mode) return TRUE; } -_X_EXPORT Bool +Bool DGAAvailable(int index) { if(DGAScreenKey == NULL) @@ -547,7 +547,7 @@ DGAAvailable(int index) return FALSE; } -_X_EXPORT Bool +Bool DGAActive(int index) { DGAScreenPtr pScreenPriv; @@ -567,7 +567,7 @@ DGAActive(int index) /* Called by the event code in case the server is abruptly terminated */ -_X_EXPORT void +void DGAShutdown() { ScrnInfoPtr pScrn; @@ -585,7 +585,7 @@ DGAShutdown() /* Called by the extension to initialize a mode */ -_X_EXPORT int +int DGASetMode( int index, int num, @@ -609,7 +609,7 @@ DGASetMode( /* Called from the extension to let the DDX know which events are requested */ -_X_EXPORT void +void DGASelectInput( int index, ClientPtr client, @@ -622,7 +622,7 @@ DGASelectInput( pScreenPriv->input = mask; } -_X_EXPORT int +int DGAGetViewportStatus(int index) { DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]); @@ -635,7 +635,7 @@ DGAGetViewportStatus(int index) return (*pScreenPriv->funcs->GetViewport)(pScreenPriv->pScrn); } -_X_EXPORT int +int DGASetViewport( int index, int x, int y, @@ -663,7 +663,7 @@ BitsClear(CARD32 data) return bits; } -_X_EXPORT int +int DGACreateColormap(int index, ClientPtr client, int id, int mode, int alloc) { ScreenPtr pScreen = screenInfo.screens[index]; @@ -732,7 +732,7 @@ DGACreateColormap(int index, ClientPtr client, int id, int mode, int alloc) /* Called by the extension to install a colormap on DGA active screens */ -_X_EXPORT void +void DGAInstallCmap(ColormapPtr cmap) { ScreenPtr pScreen = cmap->pScreen; @@ -748,7 +748,7 @@ DGAInstallCmap(ColormapPtr cmap) (*pScreen->InstallColormap)(cmap); } -_X_EXPORT int +int DGASync(int index) { DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]); @@ -761,7 +761,7 @@ DGASync(int index) return Success; } -_X_EXPORT int +int DGAFillRect( int index, int x, int y, int w, int h, @@ -780,7 +780,7 @@ DGAFillRect( return BadMatch; } -_X_EXPORT int +int DGABlitRect( int index, int srcx, int srcy, @@ -801,7 +801,7 @@ DGABlitRect( return BadMatch; } -_X_EXPORT int +int DGABlitTransRect( int index, int srcx, int srcy, @@ -824,7 +824,7 @@ DGABlitTransRect( } -_X_EXPORT int +int DGAGetModes(int index) { DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]); @@ -834,7 +834,7 @@ DGAGetModes(int index) } -_X_EXPORT int +int DGAGetModeInfo( int index, XDGAModePtr mode, @@ -892,7 +892,7 @@ DGACopyModeInfo( } -_X_EXPORT Bool +Bool DGAVTSwitch(void) { ScreenPtr pScreen; @@ -914,7 +914,7 @@ DGAVTSwitch(void) return TRUE; } -_X_EXPORT Bool +Bool DGAStealKeyEvent(DeviceIntPtr dev, int index, int key_code, int is_down) { DGAScreenPtr pScreenPriv; @@ -941,7 +941,7 @@ DGAStealKeyEvent(DeviceIntPtr dev, int index, int key_code, int is_down) static int DGAMouseX, DGAMouseY; -_X_EXPORT Bool +Bool DGAStealMotionEvent(DeviceIntPtr dev, int index, int dx, int dy) { DGAScreenPtr pScreenPriv; @@ -976,7 +976,7 @@ DGAStealMotionEvent(DeviceIntPtr dev, int index, int dx, int dy) return TRUE; } -_X_EXPORT Bool +Bool DGAStealButtonEvent(DeviceIntPtr dev, int index, int button, int is_down) { DGAScreenPtr pScreenPriv; @@ -1004,7 +1004,7 @@ DGAStealButtonEvent(DeviceIntPtr dev, int index, int button, int is_down) /* We have the power to steal or modify events that are about to get queued */ -_X_EXPORT Bool +Bool DGAIsDgaEvent (xEvent *e) { int coreEquiv; @@ -1125,7 +1125,7 @@ DGAProcessPointerEvent (ScreenPtr pScreen, dgaEvent *de, DeviceIntPtr mouse) } } -_X_EXPORT Bool +Bool DGAOpenFramebuffer( int index, char **name, @@ -1142,7 +1142,7 @@ DGAOpenFramebuffer( name, mem, size, offset, flags); } -_X_EXPORT void +void DGACloseFramebuffer(int index) { DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]); @@ -1154,7 +1154,7 @@ DGACloseFramebuffer(int index) /* For DGA 1.0 backwards compatibility only */ -_X_EXPORT int +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 5ee5e2451..baa093f75 100644 --- a/hw/xfree86/common/xf86DPMS.c +++ b/hw/xfree86/common/xf86DPMS.c @@ -54,7 +54,7 @@ static int DPMSCount = 0; #endif -_X_EXPORT Bool +Bool xf86DPMSInit(ScreenPtr pScreen, DPMSSetProcPtr set, int flags) { #ifdef DPMSExtension @@ -144,7 +144,7 @@ DPMSClose(int i, ScreenPtr pScreen) * Device dependent DPMS mode setting hook. This is called whenever * the DPMS mode is to be changed. */ -_X_EXPORT int +int DPMSSet(ClientPtr client, int level) { int rc, i; @@ -180,7 +180,7 @@ DPMSSet(ClientPtr client, int level) * DPMSSupported -- * Return TRUE if any screen supports DPMS. */ -_X_EXPORT Bool +Bool DPMSSupported(void) { int i; @@ -217,7 +217,7 @@ DPMSSupported(void) * 2. It isn't clear that this function is ever used or what it should * return. */ -_X_EXPORT int +int DPMSGet(int *level) { return DPMSPowerLevel; diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c index aec43e61e..c7f6c88f3 100644 --- a/hw/xfree86/common/xf86Events.c +++ b/hw/xfree86/common/xf86Events.c @@ -102,7 +102,7 @@ * This has been generalised to work with Linux and *BSD+syscons (DHD) */ -_X_EXPORT Bool VTSwitchEnabled = TRUE; /* Allows run-time disabling for +Bool VTSwitchEnabled = TRUE; /* Allows run-time disabling for *BSD and for avoiding VT switches when using the DRI automatic full screen mode.*/ @@ -130,7 +130,7 @@ typedef struct x_IHRec { static IHPtr InputHandlers = NULL; -_X_EXPORT Bool +Bool LegalModifier(unsigned int key, DeviceIntPtr pDev) { return TRUE; @@ -141,7 +141,7 @@ LegalModifier(unsigned int key, DeviceIntPtr pDev) * Function used for screensaver purposes by the os module. Returns the * time in milliseconds since there last was any input. */ -_X_EXPORT int +int TimeSinceLastInputEvent() { if (xf86Info.lastEventTime == 0) { @@ -154,7 +154,7 @@ TimeSinceLastInputEvent() * SetTimeSinceLastInputEvent -- * Set the lastEventTime to now. */ -_X_EXPORT void +void SetTimeSinceLastInputEvent() { xf86Info.lastEventTime = GetTimeInMillis(); @@ -166,7 +166,7 @@ SetTimeSinceLastInputEvent() * correct chronological order. Only reads from the system pointer * and keyboard. */ -_X_EXPORT void +void ProcessInputEvents () { int x, y; @@ -182,7 +182,7 @@ ProcessInputEvents () * Handle keyboard events that cause some kind of "action" * (i.e., server termination, video mode changes, VT switches, etc.) */ -_X_EXPORT void +void xf86ProcessActionEvent(ActionEvent action, void *arg) { #ifdef DEBUG @@ -251,7 +251,7 @@ xf86ProcessActionEvent(ActionEvent action, void *arg) */ /* ARGSUSED */ -_X_EXPORT void +void xf86Wakeup(pointer blockData, int err, pointer pReadmask) { fd_set* LastSelectMask = (fd_set*)pReadmask; @@ -318,7 +318,7 @@ xf86SigioReadInput(int fd, * xf86AddEnabledDevice -- * */ -_X_EXPORT void +void xf86AddEnabledDevice(InputInfoPtr pInfo) { if (!xf86InstallSIGIOHandler (pInfo->fd, xf86SigioReadInput, pInfo)) { @@ -330,7 +330,7 @@ xf86AddEnabledDevice(InputInfoPtr pInfo) * xf86RemoveEnabledDevice -- * */ -_X_EXPORT void +void xf86RemoveEnabledDevice(InputInfoPtr pInfo) { if (!xf86RemoveSIGIOHandler (pInfo->fd)) { @@ -340,7 +340,7 @@ xf86RemoveEnabledDevice(InputInfoPtr pInfo) static int *xf86SignalIntercept = NULL; -_X_EXPORT void +void xf86InterceptSignals(int *signo) { if ((xf86SignalIntercept = signo)) @@ -349,7 +349,7 @@ xf86InterceptSignals(int *signo) static void (*xf86SigIllHandler)(void) = NULL; -_X_EXPORT void +void xf86InterceptSigIll(void (*sigillhandler)(void)) { xf86SigIllHandler = sigillhandler; @@ -359,7 +359,7 @@ xf86InterceptSigIll(void (*sigillhandler)(void)) * xf86SigHandler -- * Catch unexpected signals and exit or continue cleanly. */ -_X_EXPORT void +void xf86SigHandler(int signo) { if ((signo == SIGILL) && xf86SigIllHandler) { @@ -391,7 +391,7 @@ xf86SigHandler(int signo) * xf86PrintBacktrace -- * Print a stack backtrace for debugging purposes. */ -_X_EXPORT void +void xf86PrintBacktrace(void) { xorg_backtrace(); @@ -650,7 +650,7 @@ addInputHandler(int fd, InputHandlerProc proc, pointer data) return ih; } -_X_EXPORT pointer +pointer xf86AddInputHandler(int fd, InputHandlerProc proc, pointer data) { IHPtr ih = addInputHandler(fd, proc, data); @@ -660,7 +660,7 @@ xf86AddInputHandler(int fd, InputHandlerProc proc, pointer data) return ih; } -_X_EXPORT pointer +pointer xf86AddGeneralHandler(int fd, InputHandlerProc proc, pointer data) { IHPtr ih = addInputHandler(fd, proc, data); @@ -687,7 +687,7 @@ removeInputHandler(IHPtr ih) xfree(ih); } -_X_EXPORT int +int xf86RemoveInputHandler(pointer handler) { IHPtr ih; @@ -706,7 +706,7 @@ xf86RemoveInputHandler(pointer handler) return fd; } -_X_EXPORT int +int xf86RemoveGeneralHandler(pointer handler) { IHPtr ih; @@ -725,7 +725,7 @@ xf86RemoveGeneralHandler(pointer handler) return fd; } -_X_EXPORT void +void xf86DisableInputHandler(pointer handler) { IHPtr ih; @@ -739,7 +739,7 @@ xf86DisableInputHandler(pointer handler) RemoveEnabledDevice(ih->fd); } -_X_EXPORT void +void xf86DisableGeneralHandler(pointer handler) { IHPtr ih; @@ -753,7 +753,7 @@ xf86DisableGeneralHandler(pointer handler) RemoveGeneralSocket(ih->fd); } -_X_EXPORT void +void xf86EnableInputHandler(pointer handler) { IHPtr ih; @@ -767,7 +767,7 @@ xf86EnableInputHandler(pointer handler) AddEnabledDevice(ih->fd); } -_X_EXPORT void +void xf86EnableGeneralHandler(pointer handler) { IHPtr ih; @@ -784,7 +784,7 @@ xf86EnableGeneralHandler(pointer handler) /* * As used currently by the DRI, the return value is ignored. */ -_X_EXPORT Bool +Bool xf86EnableVTSwitch(Bool new) { static Bool def = TRUE; @@ -802,7 +802,7 @@ xf86EnableVTSwitch(Bool new) return old; } -_X_EXPORT void +void xf86ReloadInputDevs(int sig) { InputInfoPtr pInfo; @@ -819,7 +819,7 @@ xf86ReloadInputDevs(int sig) return; } -_X_EXPORT void +void DDXRingBell(int volume, int pitch, int duration) { xf86OSRingBell(volume, pitch, duration); } diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c index c01f485ab..c27736937 100644 --- a/hw/xfree86/common/xf86Globals.c +++ b/hw/xfree86/common/xf86Globals.c @@ -48,14 +48,14 @@ /* Index into pScreen.devPrivates */ static int xf86CreateRootWindowKeyIndex; -_X_EXPORT DevPrivateKey xf86CreateRootWindowKey = &xf86CreateRootWindowKeyIndex; +DevPrivateKey xf86CreateRootWindowKey = &xf86CreateRootWindowKeyIndex; /* Index of ScrnInfo in pScreen.devPrivates */ static int xf86ScreenKeyIndex; -_X_EXPORT DevPrivateKey xf86ScreenKey = &xf86ScreenKeyIndex; +DevPrivateKey xf86ScreenKey = &xf86ScreenKeyIndex; static int xf86PixmapKeyIndex; -_X_EXPORT DevPrivateKey xf86PixmapKey = &xf86PixmapKeyIndex; -_X_EXPORT ScrnInfoPtr *xf86Screens = NULL; /* List of ScrnInfos */ -_X_EXPORT const unsigned char byte_reversed[256] = +DevPrivateKey xf86PixmapKey = &xf86PixmapKeyIndex; +ScrnInfoPtr *xf86Screens = NULL; /* List of ScrnInfos */ +const unsigned char byte_reversed[256] = { 0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0, 0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0, @@ -92,12 +92,12 @@ _X_EXPORT const unsigned char byte_reversed[256] = }; /* Globals that input drivers may access */ -_X_EXPORT InputInfoPtr xf86InputDevs = NULL; +InputInfoPtr xf86InputDevs = NULL; /* Globals that video drivers may not access */ -_X_EXPORT xf86InfoRec xf86Info = { +xf86InfoRec xf86Info = { .consoleFd = -1, .vtno = -1, .vtSysreq = FALSE, @@ -138,29 +138,29 @@ _X_EXPORT xf86InfoRec xf86Info = { .autoEnableDevices = FALSE #endif }; -_X_EXPORT const char *xf86ConfigFile = NULL; -_X_EXPORT const char *xf86InputDeviceList = NULL; -_X_EXPORT const char *xf86ModulePath = DEFAULT_MODULE_PATH; -_X_EXPORT MessageType xf86ModPathFrom = X_DEFAULT; -_X_EXPORT const char *xf86LogFile = DEFAULT_LOGPREFIX; -_X_EXPORT MessageType xf86LogFileFrom = X_DEFAULT; -_X_EXPORT Bool xf86LogFileWasOpened = FALSE; -_X_EXPORT serverLayoutRec xf86ConfigLayout = {NULL, }; -_X_EXPORT confDRIRec xf86ConfigDRI = {0, }; +const char *xf86ConfigFile = NULL; +const char *xf86InputDeviceList = NULL; +const char *xf86ModulePath = DEFAULT_MODULE_PATH; +MessageType xf86ModPathFrom = X_DEFAULT; +const char *xf86LogFile = DEFAULT_LOGPREFIX; +MessageType xf86LogFileFrom = X_DEFAULT; +Bool xf86LogFileWasOpened = FALSE; +serverLayoutRec xf86ConfigLayout = {NULL, }; +confDRIRec xf86ConfigDRI = {0, }; XF86ConfigPtr xf86configptr = NULL; -_X_EXPORT Bool xf86Resetting = FALSE; -_X_EXPORT Bool xf86Initialising = FALSE; -_X_EXPORT Bool xf86DoProbe = FALSE; -_X_EXPORT Bool xf86DoConfigure = FALSE; -_X_EXPORT Bool xf86DoShowOptions = FALSE; -_X_EXPORT Bool xf86DoModalias = FALSE; -_X_EXPORT DriverPtr *xf86DriverList = NULL; -_X_EXPORT int xf86NumDrivers = 0; +Bool xf86Resetting = FALSE; +Bool xf86Initialising = FALSE; +Bool xf86DoProbe = FALSE; +Bool xf86DoConfigure = FALSE; +Bool xf86DoShowOptions = FALSE; +Bool xf86DoModalias = FALSE; +DriverPtr *xf86DriverList = NULL; +int xf86NumDrivers = 0; InputDriverPtr *xf86InputDriverList = NULL; int xf86NumInputDrivers = 0; -_X_EXPORT int xf86NumScreens = 0; +int xf86NumScreens = 0; -_X_EXPORT const char *xf86VisualNames[] = { +const char *xf86VisualNames[] = { "StaticGray", "GrayScale", "StaticColor", @@ -171,36 +171,36 @@ _X_EXPORT const char *xf86VisualNames[] = { /* Parameters set only from the command line */ char *xf86ServerName = "no-name"; -_X_EXPORT Bool xf86fpFlag = FALSE; -_X_EXPORT Bool xf86sFlag = FALSE; -_X_EXPORT Bool xf86bsEnableFlag = FALSE; -_X_EXPORT Bool xf86bsDisableFlag = FALSE; -_X_EXPORT Bool xf86silkenMouseDisableFlag = FALSE; +Bool xf86fpFlag = FALSE; +Bool xf86sFlag = FALSE; +Bool xf86bsEnableFlag = FALSE; +Bool xf86bsDisableFlag = FALSE; +Bool xf86silkenMouseDisableFlag = FALSE; #ifdef HAVE_ACPI -_X_EXPORT Bool xf86acpiDisableFlag = FALSE; +Bool xf86acpiDisableFlag = FALSE; #endif -_X_EXPORT char *xf86LayoutName = NULL; -_X_EXPORT char *xf86ScreenName = NULL; -_X_EXPORT char *xf86PointerName = NULL; -_X_EXPORT char *xf86KeyboardName = NULL; -_X_EXPORT Bool xf86ProbeOnly = FALSE; -_X_EXPORT int xf86Verbose = DEFAULT_VERBOSE; -_X_EXPORT int xf86LogVerbose = DEFAULT_LOG_VERBOSE; -_X_EXPORT int xf86FbBpp = -1; -_X_EXPORT Pix24Flags xf86Pix24 = Pix24DontCare; -_X_EXPORT int xf86Depth = -1; -_X_EXPORT rgb xf86Weight = {0, 0, 0}; -_X_EXPORT Bool xf86FlipPixels = FALSE; -_X_EXPORT Gamma xf86Gamma = {0.0, 0.0, 0.0}; -_X_EXPORT Bool xf86AllowMouseOpenFail = FALSE; +char *xf86LayoutName = NULL; +char *xf86ScreenName = NULL; +char *xf86PointerName = NULL; +char *xf86KeyboardName = NULL; +Bool xf86ProbeOnly = FALSE; +int xf86Verbose = DEFAULT_VERBOSE; +int xf86LogVerbose = DEFAULT_LOG_VERBOSE; +int xf86FbBpp = -1; +Pix24Flags xf86Pix24 = Pix24DontCare; +int xf86Depth = -1; +rgb xf86Weight = {0, 0, 0}; +Bool xf86FlipPixels = FALSE; +Gamma xf86Gamma = {0.0, 0.0, 0.0}; +Bool xf86AllowMouseOpenFail = FALSE; #ifdef XF86VIDMODE -_X_EXPORT Bool xf86VidModeDisabled = FALSE; -_X_EXPORT Bool xf86VidModeAllowNonLocal = FALSE; +Bool xf86VidModeDisabled = FALSE; +Bool xf86VidModeAllowNonLocal = FALSE; #endif -_X_EXPORT RootWinPropPtr *xf86RegisteredPropertiesTable = NULL; -_X_EXPORT Bool xf86inSuspend = FALSE; -_X_EXPORT Bool xorgHWAccess = FALSE; +RootWinPropPtr *xf86RegisteredPropertiesTable = NULL; +Bool xf86inSuspend = FALSE; +Bool xorgHWAccess = FALSE; -_X_EXPORT struct pci_slot_match xf86IsolateDevice = { +struct pci_slot_match xf86IsolateDevice = { PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, 0 }; diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c index 2c550feb5..0a66f8067 100644 --- a/hw/xfree86/common/xf86Helper.c +++ b/hw/xfree86/common/xf86Helper.c @@ -72,7 +72,7 @@ static int xf86ScrnInfoPrivateCount = 0; /* Add a pointer to a new DriverRec to xf86DriverList */ -_X_EXPORT void +void xf86AddDriver(DriverPtr driver, pointer module, int flags) { /* Don't add null entries */ @@ -99,7 +99,7 @@ xf86AddDriver(DriverPtr driver, pointer module, int flags) xf86DriverList[xf86NumDrivers - 1]->refCount = 0; } -_X_EXPORT void +void xf86DeleteDriver(int drvIndex) { if (xf86DriverList[drvIndex] @@ -113,7 +113,7 @@ xf86DeleteDriver(int drvIndex) /* Add a pointer to a new InputDriverRec to xf86InputDriverList */ -_X_EXPORT void +void xf86AddInputDriver(InputDriverPtr driver, pointer module, int flags) { /* Don't add null entries */ @@ -133,7 +133,7 @@ xf86AddInputDriver(InputDriverPtr driver, pointer module, int flags) xf86InputDriverList[xf86NumInputDrivers - 1]->refCount = 0; } -_X_EXPORT void +void xf86DeleteInputDriver(int drvIndex) { if (xf86InputDriverList[drvIndex] && xf86InputDriverList[drvIndex]->module) @@ -142,7 +142,7 @@ xf86DeleteInputDriver(int drvIndex) xf86InputDriverList[drvIndex] = NULL; } -_X_EXPORT InputDriverPtr +InputDriverPtr xf86LookupInputDriver(const char *name) { int i; @@ -155,7 +155,7 @@ xf86LookupInputDriver(const char *name) return NULL; } -_X_EXPORT InputInfoPtr +InputInfoPtr xf86LookupInput(const char *name) { InputInfoPtr p; @@ -169,19 +169,19 @@ xf86LookupInput(const char *name) } /* ABI stubs of despair */ -_X_EXPORT void +void xf86AddModuleInfo(pointer info, pointer module) { } -_X_EXPORT void +void xf86DeleteModuleInfo(int idx) { } /* Allocate a new ScrnInfoRec in xf86Screens */ -_X_EXPORT ScrnInfoPtr +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. */ -_X_EXPORT void +void xf86DeleteScreen(int scrnIndex, int flags) { ScrnInfoPtr pScrn; @@ -288,7 +288,7 @@ xf86DeleteScreen(int scrnIndex, int flags) * Allocate a private in ScrnInfoRec. */ -_X_EXPORT int +int xf86AllocateScrnInfoPrivateIndex(void) { int idx, i; @@ -308,7 +308,7 @@ xf86AllocateScrnInfoPrivateIndex(void) } /* Allocate a new InputInfoRec and append it to the tail of xf86InputDevs. */ -_X_EXPORT InputInfoPtr +InputInfoPtr xf86AllocateInput(InputDriverPtr drv, int flags) { InputInfoPtr new, *prev = NULL; @@ -335,7 +335,7 @@ xf86AllocateInput(InputDriverPtr drv, int flags) * data. To do this properly may require a driver hook. */ -_X_EXPORT void +void xf86DeleteInput(InputInfoPtr pInp, int flags) { InputInfoPtr p; @@ -376,7 +376,7 @@ xf86DeleteInput(InputInfoPtr pInp, int flags) xfree(pInp); } -_X_EXPORT Bool +Bool xf86AddPixFormat(ScrnInfoPtr pScrn, int depth, int bpp, int pad) { int i; @@ -447,7 +447,7 @@ xf86AddPixFormat(ScrnInfoPtr pScrn, int depth, int bpp, int pad) #define GLOBAL_DEFAULT_DEPTH 24 #endif -_X_EXPORT Bool +Bool xf86SetDepthBpp(ScrnInfoPtr scrp, int depth, int dummy, int fbbpp, int depth24flags) { @@ -764,7 +764,7 @@ xf86SetDepthBpp(ScrnInfoPtr scrp, int depth, int dummy, int fbbpp, /* * Print out the selected depth and bpp. */ -_X_EXPORT void +void xf86PrintDepthBpp(ScrnInfoPtr scrp) { xf86DrvMsg(scrp->scrnIndex, scrp->depthFrom, "Depth %d, ", scrp->depth); @@ -775,7 +775,7 @@ xf86PrintDepthBpp(ScrnInfoPtr scrp) * xf86SetWeight sets scrp->weight, scrp->mask, scrp->offset, and for depths * greater than MAX_PSEUDO_DEPTH also scrp->rgbBits. */ -_X_EXPORT Bool +Bool xf86SetWeight(ScrnInfoPtr scrp, rgb weight, rgb mask) { MessageType weightFrom = X_DEFAULT; @@ -867,7 +867,7 @@ xf86SetWeight(ScrnInfoPtr scrp, rgb weight, rgb mask) return TRUE; } -_X_EXPORT Bool +Bool xf86SetDefaultVisual(ScrnInfoPtr scrp, int visual) { MessageType visualFrom = X_DEFAULT; @@ -914,7 +914,7 @@ xf86SetDefaultVisual(ScrnInfoPtr scrp, int visual) #define SET_GAMMA(g) \ (g) > GAMMA_ZERO ? (g) : 1.0 -_X_EXPORT Bool +Bool xf86SetGamma(ScrnInfoPtr scrp, Gamma gamma) { MessageType from = X_DEFAULT; @@ -968,7 +968,7 @@ xf86SetGamma(ScrnInfoPtr scrp, Gamma gamma) #undef MMPERINCH #define MMPERINCH 25.4 -_X_EXPORT void +void xf86SetDpi(ScrnInfoPtr pScrn, int x, int y) { MessageType from = X_DEFAULT; @@ -1065,7 +1065,7 @@ xf86SetDpi(ScrnInfoPtr pScrn, int x, int y) #undef MMPERINCH -_X_EXPORT void +void xf86SetBlackWhitePixels(ScreenPtr pScreen) { if (xf86FlipPixels) { @@ -1196,7 +1196,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. */ -_X_EXPORT void +void xf86EnableDisableFBAccess(int scrnIndex, Bool enable) { ScrnInfoPtr pScrnInfo = xf86Screens[scrnIndex]; @@ -1238,7 +1238,7 @@ xf86EnableDisableFBAccess(int scrnIndex, Bool enable) #undef PREFIX_SIZE #define PREFIX_SIZE 14 -_X_EXPORT void +void xf86VDrvMsgVerb(int scrnIndex, MessageType type, int verb, const char *format, va_list args) { @@ -1265,7 +1265,7 @@ xf86VDrvMsgVerb(int scrnIndex, MessageType type, int verb, const char *format, #undef PREFIX_SIZE /* Print driver messages, with verbose level specified directly */ -_X_EXPORT void +void xf86DrvMsgVerb(int scrnIndex, MessageType type, int verb, const char *format, ...) { @@ -1277,7 +1277,7 @@ xf86DrvMsgVerb(int scrnIndex, MessageType type, int verb, const char *format, } /* Print driver messages, with verbose level of 1 (default) */ -_X_EXPORT void +void xf86DrvMsg(int scrnIndex, MessageType type, const char *format, ...) { va_list ap; @@ -1288,7 +1288,7 @@ xf86DrvMsg(int scrnIndex, MessageType type, const char *format, ...) } /* Print non-driver messages with verbose level specified directly */ -_X_EXPORT void +void xf86MsgVerb(MessageType type, int verb, const char *format, ...) { va_list ap; @@ -1299,7 +1299,7 @@ xf86MsgVerb(MessageType type, int verb, const char *format, ...) } /* Print non-driver messages with verbose level of 1 (default) */ -_X_EXPORT void +void xf86Msg(MessageType type, const char *format, ...) { va_list ap; @@ -1310,7 +1310,7 @@ xf86Msg(MessageType type, const char *format, ...) } /* Just like ErrorF, but with the verbose level checked */ -_X_EXPORT void +void xf86ErrorFVerb(int verb, const char *format, ...) { va_list ap; @@ -1322,7 +1322,7 @@ xf86ErrorFVerb(int verb, const char *format, ...) } /* Like xf86ErrorFVerb, but with an implied verbose level of 1 */ -_X_EXPORT void +void xf86ErrorF(const char *format, ...) { va_list ap; @@ -1334,7 +1334,7 @@ xf86ErrorF(const char *format, ...) } -_X_EXPORT void +void xf86LogInit() { char *lf = NULL; @@ -1365,7 +1365,7 @@ xf86LogInit() free(lf); } -_X_EXPORT void +void xf86CloseLog() { LogClose(); @@ -1376,7 +1376,7 @@ xf86CloseLog() * Drivers can use these for using their own SymTabRecs. */ -_X_EXPORT const char * +const char * xf86TokenToString(SymTabPtr table, int token) { int i; @@ -1390,7 +1390,7 @@ xf86TokenToString(SymTabPtr table, int token) return(table[i].name); } -_X_EXPORT int +int xf86StringToToken(SymTabPtr table, const char *string) { int i; @@ -1407,7 +1407,7 @@ xf86StringToToken(SymTabPtr table, const char *string) /* * helper to display the clocks found on a card */ -_X_EXPORT void +void xf86ShowClocks(ScrnInfoPtr scrp, MessageType from) { int j; @@ -1431,7 +1431,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. */ -_X_EXPORT void +void xf86PrintChipsets(const char *drvname, const char *drvmsg, SymTabPtr chips) { int len, i; @@ -1457,7 +1457,7 @@ xf86PrintChipsets(const char *drvname, const char *drvmsg, SymTabPtr chips) } -_X_EXPORT int +int xf86MatchDevice(const char *drivername, GDevPtr **sectlist) { GDevPtr gdp, *pgdp = NULL; @@ -1590,7 +1590,7 @@ struct Inst { * \c DriverRec::driverName. In a future version of this function, remove * that parameter. */ -_X_EXPORT int +int xf86MatchPciInstances(const char *driverName, int vendorID, SymTabPtr chipsets, PciChipsets *PCIchipsets, GDevPtr *devList, int numDevs, DriverPtr drvp, @@ -1956,7 +1956,7 @@ xf86MatchPciInstances(const char *driverName, int vendorID, /* * xf86GetClocks -- get the dot-clocks via a BIG BAD hack ... */ -_X_EXPORT void +void xf86GetClocks(ScrnInfoPtr pScrn, int num, Bool (*ClockFunc)(ScrnInfoPtr, int), void (*ProtectRegs)(ScrnInfoPtr, Bool), void (*BlankScreen)(ScrnInfoPtr, Bool), IOADDRESS vertsyncreg, @@ -2047,7 +2047,7 @@ finish: (*ClockFunc)(pScrn, CLK_REG_RESTORE); } -_X_EXPORT void +void xf86SetPriority(Bool up) { static int saved_nice; @@ -2071,7 +2071,7 @@ xf86SetPriority(Bool up) } } -_X_EXPORT const char * +const char * xf86GetVisualName(int visual) { if (visual < 0 || visual > DirectColor) @@ -2081,131 +2081,131 @@ xf86GetVisualName(int visual) } -_X_EXPORT int +int xf86GetVerbosity() { return max(xf86Verbose, xf86LogVerbose); } -_X_EXPORT Pix24Flags +Pix24Flags xf86GetPix24() { return xf86Info.pixmap24; } -_X_EXPORT int +int xf86GetDepth() { return xf86Depth; } -_X_EXPORT rgb +rgb xf86GetWeight() { return xf86Weight; } -_X_EXPORT Gamma +Gamma xf86GetGamma() { return xf86Gamma; } -_X_EXPORT Bool +Bool xf86GetFlipPixels() { return xf86FlipPixels; } -_X_EXPORT const char * +const char * xf86GetServerName() { return xf86ServerName; } -_X_EXPORT Bool +Bool xf86ServerIsExiting() { return (dispatchException & DE_TERMINATE) == DE_TERMINATE; } -_X_EXPORT Bool +Bool xf86ServerIsResetting() { return xf86Resetting; } -_X_EXPORT Bool +Bool xf86ServerIsInitialising() { return xf86Initialising; } -_X_EXPORT Bool +Bool xf86ServerIsOnlyDetecting(void) { return xf86DoProbe || xf86DoConfigure; } -_X_EXPORT Bool +Bool xf86ServerIsOnlyProbing(void) { return xf86ProbeOnly; } -_X_EXPORT Bool +Bool xf86CaughtSignal() { return xf86Info.caughtSignal; } -_X_EXPORT Bool +Bool xf86GetVidModeAllowNonLocal() { return xf86Info.vidModeAllowNonLocal; } -_X_EXPORT Bool +Bool xf86GetVidModeEnabled() { return xf86Info.vidModeEnabled; } -_X_EXPORT Bool +Bool xf86GetModInDevAllowNonLocal() { return xf86Info.miscModInDevAllowNonLocal; } -_X_EXPORT Bool +Bool xf86GetModInDevEnabled() { return xf86Info.miscModInDevEnabled; } -_X_EXPORT Bool +Bool xf86GetAllowMouseOpenFail() { return xf86Info.allowMouseOpenFail; } -_X_EXPORT Bool +Bool xf86IsPc98() { #ifdef __i386__ @@ -2215,20 +2215,20 @@ xf86IsPc98() #endif } -_X_EXPORT void +void xf86DisableRandR() { xf86Info.disableRandR = TRUE; xf86Info.randRFrom = X_PROBED; } -_X_EXPORT CARD32 +CARD32 xf86GetModuleVersion(pointer module) { return (CARD32)LoaderGetModuleVersion(module); } -_X_EXPORT pointer +pointer xf86LoadDrvSubModule(DriverPtr drv, const char *name) { pointer ret; @@ -2241,7 +2241,7 @@ xf86LoadDrvSubModule(DriverPtr drv, const char *name) return ret; } -_X_EXPORT pointer +pointer xf86LoadSubModule(ScrnInfoPtr pScrn, const char *name) { pointer ret; @@ -2257,7 +2257,7 @@ xf86LoadSubModule(ScrnInfoPtr pScrn, const char *name) /* * xf86LoadOneModule loads a single module. */ -_X_EXPORT pointer +pointer xf86LoadOneModule(char *name, pointer opt) { int errmaj, errmin; @@ -2285,7 +2285,7 @@ xf86LoadOneModule(char *name, pointer opt) return mod; } -_X_EXPORT void +void xf86UnloadSubModule(pointer mod) { /* @@ -2297,29 +2297,29 @@ xf86UnloadSubModule(pointer mod) #endif } -_X_EXPORT Bool +Bool xf86LoaderCheckSymbol(const char *name) { return LoaderSymbol(name) != NULL; } /* These two are just ABI stubs, they don't do anything in dlloader world */ -_X_EXPORT void +void xf86LoaderReqSymLists(const char **list0, ...) { } -_X_EXPORT void +void xf86LoaderReqSymbols(const char *sym0, ...) { } -_X_EXPORT void +void xf86LoaderRefSymLists(const char **list0, ...) { } -_X_EXPORT void +void xf86LoaderRefSymbols(const char *sym0, ...) { } @@ -2334,7 +2334,7 @@ static const OptionInfoRec BSOptions[] = { { -1, NULL, OPTV_NONE, {0}, FALSE } }; -_X_EXPORT void +void xf86SetBackingStore(ScreenPtr pScreen) { Bool useBS = FALSE; @@ -2374,7 +2374,7 @@ static const OptionInfoRec SMOptions[] = { { -1, NULL, OPTV_NONE, {0}, FALSE } }; -_X_EXPORT void +void xf86SetSilkenMouse (ScreenPtr pScreen) { Bool useSM = TRUE; @@ -2415,7 +2415,7 @@ xf86SetSilkenMouse (ScreenPtr pScreen) /* Wrote this function for the PM2 Xv driver, preliminary. */ -_X_EXPORT pointer +pointer xf86FindXvOptions(int scrnIndex, int adaptor_index, char *port_name, char **adaptor_name, pointer *adaptor_options) { @@ -2446,7 +2446,7 @@ xf86FindXvOptions(int scrnIndex, int adaptor_index, char *port_name, /* new RAC */ -_X_EXPORT ScrnInfoPtr +ScrnInfoPtr xf86ConfigPciEntity(ScrnInfoPtr pScrn, int scrnFlag, int entityIndex, PciChipsets *p_chip, resList res, EntityProc init, EntityProc enter, EntityProc leave, pointer private) @@ -2490,7 +2490,7 @@ xf86ConfigPciEntity(ScrnInfoPtr pScrn, int scrnFlag, int entityIndex, return pScrn; } -_X_EXPORT ScrnInfoPtr +ScrnInfoPtr xf86ConfigFbEntity(ScrnInfoPtr pScrn, int scrnFlag, int entityIndex, EntityProc init, EntityProc enter, EntityProc leave, pointer private) @@ -2524,7 +2524,7 @@ xf86ConfigFbEntity(ScrnInfoPtr pScrn, int scrnFlag, int entityIndex, * It is likely to be removed. Don't use! */ -_X_EXPORT Bool +Bool xf86ConfigActivePciEntity(ScrnInfoPtr pScrn, int entityIndex, PciChipsets *p_chip, resList res, EntityProc init, EntityProc enter, EntityProc leave, pointer private) @@ -2561,7 +2561,7 @@ xf86ConfigActivePciEntity(ScrnInfoPtr pScrn, int entityIndex, * assigned to a screen before it will be removed. If p_chip is * non-NULL all static resources listed there will be registered. */ -_X_EXPORT void +void xf86ConfigPciEntityInactive(EntityInfoPtr pEnt, PciChipsets *p_chip, resList res, EntityProc init, EntityProc enter, EntityProc leave, pointer private) @@ -2583,7 +2583,7 @@ xf86ConfigPciEntityInactive(EntityInfoPtr pEnt, PciChipsets *p_chip, xf86SetEntityFuncs(pEnt->index,init,enter,leave,private); } -_X_EXPORT void +void xf86ConfigFbEntityInactive(EntityInfoPtr pEnt, EntityProc init, EntityProc enter, EntityProc leave, pointer private) { @@ -2594,7 +2594,7 @@ xf86ConfigFbEntityInactive(EntityInfoPtr pEnt, EntityProc init, xf86SetEntityFuncs(pEnt->index,init,enter,leave,private); } -_X_EXPORT Bool +Bool xf86IsScreenPrimary(int scrnIndex) { ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; @@ -2607,7 +2607,7 @@ xf86IsScreenPrimary(int scrnIndex) return FALSE; } -_X_EXPORT int +int xf86RegisterRootWindowProperty(int ScrnIndex, Atom property, Atom type, int format, unsigned long len, pointer value ) { @@ -2698,7 +2698,7 @@ xf86RegisterRootWindowProperty(int ScrnIndex, Atom property, Atom type, return(Success); } -_X_EXPORT Bool +Bool xf86IsUnblank(int mode) { switch(mode) { @@ -2714,13 +2714,13 @@ xf86IsUnblank(int mode) } } -_X_EXPORT void +void xf86MotionHistoryAllocate(LocalDevicePtr local) { AllocateMotionHistory(local->dev); } -_X_EXPORT int +int xf86GetMotionEvents(DeviceIntPtr pDev, xTimecoord *buff, unsigned long start, unsigned long stop, ScreenPtr pScreen, BOOL core) { diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c index e8095e5d5..eacf34449 100644 --- a/hw/xfree86/common/xf86Init.c +++ b/hw/xfree86/common/xf86Init.c @@ -613,7 +613,7 @@ check_for_matching_devices(DriverPtr drvp) * If a device can be successfully probed by the driver, \c TRUE is * returned. Otherwise, \c FALSE is returned. */ -_X_EXPORT Bool +Bool xf86CallDriverProbe( DriverPtr drv, Bool detect_only ) { Bool foundScreen = FALSE; @@ -719,7 +719,7 @@ DoProbe(void) * That includes vt-manager setup, querying all possible devices and * collecting the pixmap formats. */ -_X_EXPORT void +void InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv) { int i, j, k, scr_index; @@ -1305,7 +1305,7 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv) * Initialize all supported input devices. */ -_X_EXPORT void +void InitInput(argc, argv) int argc; char **argv; @@ -1336,7 +1336,7 @@ InitInput(argc, argv) * is called by dix before establishing the well known sockets. */ -_X_EXPORT void +void OsVendorInit() { static Bool beenHere = FALSE; @@ -1381,7 +1381,7 @@ OsVendorInit() * checking here, since there should be restored as much as possible. */ -_X_EXPORT void +void ddxGiveUp() { int i; @@ -1426,7 +1426,7 @@ ddxGiveUp() * are closed. */ -_X_EXPORT void +void AbortDDX() { int i; @@ -1462,7 +1462,7 @@ AbortDDX() ddxGiveUp(); } -_X_EXPORT void +void OsVendorFatalError() { #ifdef VENDORSUPPORT @@ -1478,7 +1478,7 @@ OsVendorFatalError() ErrorF("\n"); } -_X_EXPORT int +int xf86SetVerbosity(int verb) { int save = xf86Verbose; @@ -1488,7 +1488,7 @@ xf86SetVerbosity(int verb) return save; } -_X_EXPORT int +int xf86SetLogVerbosity(int verb) { int save = xf86LogVerbose; @@ -1519,7 +1519,7 @@ xf86PrintDefaultLibraryPath(void) */ /* ARGSUSED */ -_X_EXPORT int +int ddxProcessArgument(int argc, char **argv, int i) { /* @@ -1854,7 +1854,7 @@ ddxProcessArgument(int argc, char **argv, int i) * Maybe the user now knows what really to do ... */ -_X_EXPORT void +void ddxUseMsg() { ErrorF("\n"); @@ -1908,7 +1908,7 @@ ddxUseMsg() /* * xf86LoadModules iterates over a list that is being passed in. */ -_X_EXPORT Bool +Bool xf86LoadModules(char **list, pointer *optlist) { int errmaj, errmin; @@ -1950,7 +1950,7 @@ xf86LoadModules(char **list, pointer *optlist) /* Pixmap format stuff */ -_X_EXPORT PixmapFormatPtr +PixmapFormatPtr xf86GetPixFormat(ScrnInfoPtr pScrn, int depth) { int i; @@ -1995,7 +1995,7 @@ xf86GetPixFormat(ScrnInfoPtr pScrn, int depth) return NULL; } -_X_EXPORT int +int xf86GetBppFromDepth(ScrnInfoPtr pScrn, int depth) { PixmapFormatPtr format; diff --git a/hw/xfree86/common/xf86Mode.c b/hw/xfree86/common/xf86Mode.c index 24a431dc5..522d3c28b 100644 --- a/hw/xfree86/common/xf86Mode.c +++ b/hw/xfree86/common/xf86Mode.c @@ -71,7 +71,7 @@ printModeRejectMessage(int index, DisplayModePtr p, int status) * Find closest clock to given frequency (in kHz). This assumes the * number of clocks is greater than zero. */ -_X_EXPORT int +int xf86GetNearestClock(ScrnInfoPtr scrp, int freq, Bool allowDiv2, int DivFactor, int MulFactor, int *divider) { @@ -110,7 +110,7 @@ xf86GetNearestClock(ScrnInfoPtr scrp, int freq, Bool allowDiv2, * Convert a ModeStatus value to a printable message */ -_X_EXPORT const char * +const char * xf86ModeStatusToString(ModeStatus status) { switch (status) { @@ -199,7 +199,7 @@ xf86ModeStatusToString(ModeStatus status) * xf86ShowClockRanges() -- Print the clock ranges allowed * and the clock values scaled by ClockMulFactor and ClockDivFactor */ -_X_EXPORT void +void xf86ShowClockRanges(ScrnInfoPtr scrp, ClockRangePtr clockRanges) { ClockRangePtr cp; @@ -399,7 +399,7 @@ xf86HandleBuiltinMode(ScrnInfoPtr scrp, * reason. */ -_X_EXPORT ModeStatus +ModeStatus xf86LookupMode(ScrnInfoPtr scrp, DisplayModePtr modep, ClockRangePtr clockRanges, LookupModeFlags strategy) { @@ -643,7 +643,7 @@ xf86LookupMode(ScrnInfoPtr scrp, DisplayModePtr modep, * This function takes a mode and monitor description, and determines * if the mode is valid for the monitor. */ -_X_EXPORT ModeStatus +ModeStatus xf86CheckModeForMonitor(DisplayModePtr mode, MonPtr monitor) { int i; @@ -790,7 +790,7 @@ xf86CheckModeSize(ScrnInfoPtr scrp, int w, int x, int y) * maxVValue maximum vertical timing value */ -_X_EXPORT ModeStatus +ModeStatus xf86InitialCheckModeForDriver(ScrnInfoPtr scrp, DisplayModePtr mode, ClockRangePtr clockRanges, LookupModeFlags strategy, @@ -938,7 +938,7 @@ xf86InitialCheckModeForDriver(ScrnInfoPtr scrp, DisplayModePtr mode, * clockRanges allowable clock ranges */ -_X_EXPORT ModeStatus +ModeStatus xf86CheckModeForDriver(ScrnInfoPtr scrp, DisplayModePtr mode, int flags) { ClockRangesPtr cp; @@ -1185,7 +1185,7 @@ found: * if an unrecoverable error was encountered. */ -_X_EXPORT int +int xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes, char **modeNames, ClockRangePtr clockRanges, int *linePitches, int minPitch, int maxPitch, int pitchInc, @@ -1771,7 +1771,7 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes, * */ -_X_EXPORT void +void xf86DeleteMode(DisplayModePtr *modeList, DisplayModePtr mode) { /* Catch the easy/insane cases */ @@ -1803,7 +1803,7 @@ xf86DeleteMode(DisplayModePtr *modeList, DisplayModePtr mode) * invalid. */ -_X_EXPORT void +void xf86PruneDriverModes(ScrnInfoPtr scrp) { DisplayModePtr first, p, n; @@ -1843,7 +1843,7 @@ xf86PruneDriverModes(ScrnInfoPtr scrp) * parameters for each mode. The initialisation includes adjustments * for interlaced and double scan modes. */ -_X_EXPORT void +void xf86SetCrtcForModes(ScrnInfoPtr scrp, int adjustFlags) { DisplayModePtr p; @@ -1883,7 +1883,7 @@ add(char **p, char *new) strcat(*p, new); } -_X_EXPORT void +void xf86PrintModeline(int scrnIndex,DisplayModePtr mode) { char tmp[256]; @@ -1920,7 +1920,7 @@ xf86PrintModeline(int scrnIndex,DisplayModePtr mode) } #endif -_X_EXPORT void +void xf86PrintModes(ScrnInfoPtr scrp) { DisplayModePtr p; @@ -1995,7 +1995,7 @@ xf86PrintModes(ScrnInfoPtr scrp) * * \param modes doubly-linked mode list. */ -_X_EXPORT DisplayModePtr +DisplayModePtr xf86ModesAdd(DisplayModePtr modes, DisplayModePtr new) { if (modes == NULL) diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h index f4ce387a4..7557bc5a3 100644 --- a/hw/xfree86/common/xf86Module.h +++ b/hw/xfree86/common/xf86Module.h @@ -181,31 +181,28 @@ typedef struct { const char ** initDependencies; } ExtensionModule; -extern ExtensionModule *ExtensionModuleList; +extern _X_EXPORT ExtensionModule *ExtensionModuleList; /* Prototypes for Loader functions that are exported to modules */ -#ifndef IN_LOADER -/* Prototypes with opaque pointers for use by modules */ -pointer LoadSubModule(pointer, const char *, const char **, +extern _X_EXPORT pointer LoadSubModule(pointer, const char *, const char **, const char **, pointer, const XF86ModReqInfo *, int *, int *); -void UnloadSubModule(pointer); -void UnloadModule (pointer); -#endif -pointer LoaderSymbol(const char *); -pointer LoaderSymbolLocal(pointer module, const char *); -char **LoaderListDirs(const char **, const char **); -void LoaderFreeDirList(char **); -void LoaderErrorMsg(const char *, const char *, int, int); -void LoadExtension(ExtensionModule *, Bool); -void LoaderRefSymLists(const char **, ...); -void LoaderRefSymbols(const char *, ...); -void LoaderReqSymLists(const char **, ...); -void LoaderReqSymbols(const char *, ...); -int LoaderCheckUnresolved(int); -void LoaderGetOS(const char **name, int *major, int *minor, int *teeny); -Bool LoaderShouldIgnoreABI(void); -int LoaderGetABIVersion(const char *abiclass); +extern _X_EXPORT void UnloadSubModule(pointer); +extern _X_EXPORT void UnloadModule (pointer); +extern _X_EXPORT pointer LoaderSymbol(const char *); +extern _X_EXPORT pointer LoaderSymbolLocal(pointer module, const char *); +extern _X_EXPORT char **LoaderListDirs(const char **, const char **); +extern _X_EXPORT void LoaderFreeDirList(char **); +extern _X_EXPORT void LoaderErrorMsg(const char *, const char *, int, int); +extern _X_EXPORT void LoadExtension(ExtensionModule *, Bool); +extern _X_EXPORT void LoaderRefSymLists(const char **, ...); +extern _X_EXPORT void LoaderRefSymbols(const char *, ...); +extern _X_EXPORT void LoaderReqSymLists(const char **, ...); +extern _X_EXPORT void LoaderReqSymbols(const char *, ...); +extern _X_EXPORT int LoaderCheckUnresolved(int); +extern _X_EXPORT void LoaderGetOS(const char **name, int *major, int *minor, int *teeny); +extern _X_EXPORT Bool LoaderShouldIgnoreABI(void); +extern _X_EXPORT int LoaderGetABIVersion(const char *abiclass); typedef pointer (*ModuleSetupProc)(pointer, pointer, int *, int *); typedef void (*ModuleTearDownProc)(pointer); diff --git a/hw/xfree86/common/xf86Opt.h b/hw/xfree86/common/xf86Opt.h index dbb98da03..ce3d76724 100644 --- a/hw/xfree86/common/xf86Opt.h +++ b/hw/xfree86/common/xf86Opt.h @@ -68,46 +68,46 @@ typedef struct { Bool found; } OptionInfoRec, *OptionInfoPtr; -int xf86SetIntOption(pointer optlist, const char *name, int deflt); -double xf86SetRealOption(pointer optlist, const char *name, double deflt); -char *xf86SetStrOption(pointer optlist, const char *name, char *deflt); -int xf86SetBoolOption(pointer list, const char *name, int deflt ); -int xf86CheckIntOption(pointer optlist, const char *name, int deflt); -double xf86CheckRealOption(pointer optlist, const char *name, double deflt); -char *xf86CheckStrOption(pointer optlist, const char *name, char *deflt); -int xf86CheckBoolOption(pointer list, const char *name, int deflt ); -pointer xf86AddNewOption(pointer head, const char *name, const char *val ); -pointer xf86NewOption(char *name, char *value ); -pointer xf86NextOption(pointer list ); -pointer xf86OptionListCreate(const char **options, int count, int used); -pointer xf86OptionListMerge(pointer head, pointer tail); -void xf86OptionListFree(pointer opt); -char *xf86OptionName(pointer opt); -char *xf86OptionValue(pointer opt); -void xf86OptionListReport(pointer parm); -pointer xf86FindOption(pointer options, const char *name); -char *xf86FindOptionValue(pointer options, const char *name); -void xf86MarkOptionUsed(pointer option); -void xf86MarkOptionUsedByName(pointer options, const char *name); -Bool xf86CheckIfOptionUsed(pointer option); -Bool xf86CheckIfOptionUsedByName(pointer options, const char *name); -void xf86ShowUnusedOptions(int scrnIndex, pointer options); -void xf86ProcessOptions(int scrnIndex, pointer options, OptionInfoPtr optinfo); -OptionInfoPtr xf86TokenToOptinfo(const OptionInfoRec *table, int token); -const char *xf86TokenToOptName(const OptionInfoRec *table, int token); -Bool xf86IsOptionSet(const OptionInfoRec *table, int token); -char *xf86GetOptValString(const OptionInfoRec *table, int token); -Bool xf86GetOptValInteger(const OptionInfoRec *table, int token, int *value); -Bool xf86GetOptValULong(const OptionInfoRec *table, int token, unsigned long *value); -Bool xf86GetOptValReal(const OptionInfoRec *table, int token, double *value); -Bool xf86GetOptValFreq(const OptionInfoRec *table, int token, +extern _X_EXPORT int xf86SetIntOption(pointer optlist, const char *name, int deflt); +extern _X_EXPORT double xf86SetRealOption(pointer optlist, const char *name, double deflt); +extern _X_EXPORT char *xf86SetStrOption(pointer optlist, const char *name, char *deflt); +extern _X_EXPORT int xf86SetBoolOption(pointer list, const char *name, int deflt ); +extern _X_EXPORT int xf86CheckIntOption(pointer optlist, const char *name, int deflt); +extern _X_EXPORT double xf86CheckRealOption(pointer optlist, const char *name, double deflt); +extern _X_EXPORT char *xf86CheckStrOption(pointer optlist, const char *name, char *deflt); +extern _X_EXPORT int xf86CheckBoolOption(pointer list, const char *name, int deflt ); +extern _X_EXPORT pointer xf86AddNewOption(pointer head, const char *name, const char *val ); +extern _X_EXPORT pointer xf86NewOption(char *name, char *value ); +extern _X_EXPORT pointer xf86NextOption(pointer list ); +extern _X_EXPORT pointer xf86OptionListCreate(const char **options, int count, int used); +extern _X_EXPORT pointer xf86OptionListMerge(pointer head, pointer tail); +extern _X_EXPORT void xf86OptionListFree(pointer opt); +extern _X_EXPORT char *xf86OptionName(pointer opt); +extern _X_EXPORT char *xf86OptionValue(pointer opt); +extern _X_EXPORT void xf86OptionListReport(pointer parm); +extern _X_EXPORT pointer xf86FindOption(pointer options, const char *name); +extern _X_EXPORT char *xf86FindOptionValue(pointer options, const char *name); +extern _X_EXPORT void xf86MarkOptionUsed(pointer option); +extern _X_EXPORT void xf86MarkOptionUsedByName(pointer options, const char *name); +extern _X_EXPORT Bool xf86CheckIfOptionUsed(pointer option); +extern _X_EXPORT Bool xf86CheckIfOptionUsedByName(pointer options, const char *name); +extern _X_EXPORT void xf86ShowUnusedOptions(int scrnIndex, pointer options); +extern _X_EXPORT void xf86ProcessOptions(int scrnIndex, pointer options, OptionInfoPtr optinfo); +extern _X_EXPORT OptionInfoPtr xf86TokenToOptinfo(const OptionInfoRec *table, int token); +extern _X_EXPORT const char *xf86TokenToOptName(const OptionInfoRec *table, int token); +extern _X_EXPORT Bool xf86IsOptionSet(const OptionInfoRec *table, int token); +extern _X_EXPORT char *xf86GetOptValString(const OptionInfoRec *table, int token); +extern _X_EXPORT Bool xf86GetOptValInteger(const OptionInfoRec *table, int token, int *value); +extern _X_EXPORT Bool xf86GetOptValULong(const OptionInfoRec *table, int token, unsigned long *value); +extern _X_EXPORT Bool xf86GetOptValReal(const OptionInfoRec *table, int token, double *value); +extern _X_EXPORT Bool xf86GetOptValFreq(const OptionInfoRec *table, int token, OptFreqUnits expectedUnits, double *value); -Bool xf86GetOptValBool(const OptionInfoRec *table, int token, Bool *value); -Bool xf86ReturnOptValBool(const OptionInfoRec *table, int token, Bool def); -int xf86NameCmp(const char *s1, const char *s2); -char *xf86NormalizeName(const char *s); -pointer xf86ReplaceIntOption(pointer optlist, const char *name, const int val); -pointer xf86ReplaceRealOption(pointer optlist, const char *name, const double val); -pointer xf86ReplaceBoolOption(pointer optlist, const char *name, const Bool val); -pointer xf86ReplaceStrOption(pointer optlist, const char *name, const char* val); +extern _X_EXPORT Bool xf86GetOptValBool(const OptionInfoRec *table, int token, Bool *value); +extern _X_EXPORT Bool xf86ReturnOptValBool(const OptionInfoRec *table, int token, Bool def); +extern _X_EXPORT int xf86NameCmp(const char *s1, const char *s2); +extern _X_EXPORT char *xf86NormalizeName(const char *s); +extern _X_EXPORT pointer xf86ReplaceIntOption(pointer optlist, const char *name, const int val); +extern _X_EXPORT pointer xf86ReplaceRealOption(pointer optlist, const char *name, const double val); +extern _X_EXPORT pointer xf86ReplaceBoolOption(pointer optlist, const char *name, const Bool val); +extern _X_EXPORT pointer xf86ReplaceStrOption(pointer optlist, const char *name, const char* val); #endif diff --git a/hw/xfree86/common/xf86Option.c b/hw/xfree86/common/xf86Option.c index f4d35fc0f..ad8d1c426 100644 --- a/hw/xfree86/common/xf86Option.c +++ b/hw/xfree86/common/xf86Option.c @@ -64,7 +64,7 @@ static Bool ParseOptionValue(int scrnIndex, pointer options, OptionInfoPtr p, * extraOpts, display, confScreen, monitor, device */ -_X_EXPORT void +void xf86CollectOptions(ScrnInfoPtr pScrn, pointer extraOpts) { XF86OptionPtr tmp; @@ -131,7 +131,7 @@ xf86CollectOptions(ScrnInfoPtr pScrn, pointer extraOpts) * pInfo->conf_idev->commonOptions, defaultOpts */ -_X_EXPORT void +void xf86CollectInputOptions(InputInfoPtr pInfo, const char **defaultOpts, pointer extraOpts) { @@ -224,28 +224,28 @@ LookupBoolOption(pointer optlist, const char *name, int deflt, Bool markUsed) /* These xf86Set* functions are intended for use by non-screen specific code */ -_X_EXPORT int +int xf86SetIntOption(pointer optlist, const char *name, int deflt) { return LookupIntOption(optlist, name, deflt, TRUE); } -_X_EXPORT double +double xf86SetRealOption(pointer optlist, const char *name, double deflt) { return LookupRealOption(optlist, name, deflt, TRUE); } -_X_EXPORT char * +char * xf86SetStrOption(pointer optlist, const char *name, char *deflt) { return LookupStrOption(optlist, name, deflt, TRUE); } -_X_EXPORT int +int xf86SetBoolOption(pointer optlist, const char *name, int deflt) { return LookupBoolOption(optlist, name, deflt, TRUE); @@ -255,28 +255,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. */ -_X_EXPORT int +int xf86CheckIntOption(pointer optlist, const char *name, int deflt) { return LookupIntOption(optlist, name, deflt, FALSE); } -_X_EXPORT double +double xf86CheckRealOption(pointer optlist, const char *name, double deflt) { return LookupRealOption(optlist, name, deflt, FALSE); } -_X_EXPORT char * +char * xf86CheckStrOption(pointer optlist, const char *name, char *deflt) { return LookupStrOption(optlist, name, deflt, FALSE); } -_X_EXPORT int +int xf86CheckBoolOption(pointer optlist, const char *name, int deflt) { return LookupBoolOption(optlist, name, deflt, FALSE); @@ -286,7 +286,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. */ -_X_EXPORT pointer +pointer xf86ReplaceIntOption(pointer optlist, const char *name, const int val) { char tmp[16]; @@ -294,7 +294,7 @@ xf86ReplaceIntOption(pointer optlist, const char *name, const int val) return xf86AddNewOption(optlist,name,tmp); } -_X_EXPORT pointer +pointer xf86ReplaceRealOption(pointer optlist, const char *name, const double val) { char tmp[32]; @@ -302,19 +302,19 @@ xf86ReplaceRealOption(pointer optlist, const char *name, const double val) return xf86AddNewOption(optlist,name,tmp); } -_X_EXPORT pointer +pointer xf86ReplaceBoolOption(pointer optlist, const char *name, const Bool val) { return xf86AddNewOption(optlist,name,val?"True":"False"); } -_X_EXPORT pointer +pointer xf86ReplaceStrOption(pointer optlist, const char *name, const char* val) { return xf86AddNewOption(optlist,name,val); } -_X_EXPORT pointer +pointer xf86AddNewOption(pointer head, const char *name, const char *val) { /* XXX These should actually be allocated in the parser library. */ @@ -325,50 +325,50 @@ xf86AddNewOption(pointer head, const char *name, const char *val) } -_X_EXPORT pointer +pointer xf86NewOption(char *name, char *value) { return xf86newOption(name, value); } -_X_EXPORT pointer +pointer xf86NextOption(pointer list) { return xf86nextOption(list); } -_X_EXPORT pointer +pointer xf86OptionListCreate(const char **options, int count, int used) { return xf86optionListCreate(options, count, used); } -_X_EXPORT pointer +pointer xf86OptionListMerge(pointer head, pointer tail) { return xf86optionListMerge(head, tail); } -_X_EXPORT void +void xf86OptionListFree(pointer opt) { xf86optionListFree(opt); } -_X_EXPORT char * +char * xf86OptionName(pointer opt) { return xf86optionName(opt); } -_X_EXPORT char * +char * xf86OptionValue(pointer opt) { return xf86optionValue(opt); } -_X_EXPORT void +void xf86OptionListReport(pointer parm) { XF86OptionPtr opts = parm; @@ -385,21 +385,21 @@ xf86OptionListReport(pointer parm) /* End of XInput-caused section */ -_X_EXPORT pointer +pointer xf86FindOption(pointer options, const char *name) { return xf86findOption(options, name); } -_X_EXPORT char * +char * xf86FindOptionValue(pointer options, const char *name) { return xf86findOptionValue(options, name); } -_X_EXPORT void +void xf86MarkOptionUsed(pointer option) { if (option != NULL) @@ -407,7 +407,7 @@ xf86MarkOptionUsed(pointer option) } -_X_EXPORT void +void xf86MarkOptionUsedByName(pointer options, const char *name) { XF86OptionPtr opt; @@ -417,7 +417,7 @@ xf86MarkOptionUsedByName(pointer options, const char *name) opt->opt_used = TRUE; } -_X_EXPORT Bool +Bool xf86CheckIfOptionUsed(pointer option) { if (option != NULL) @@ -426,7 +426,7 @@ xf86CheckIfOptionUsed(pointer option) return FALSE; } -_X_EXPORT Bool +Bool xf86CheckIfOptionUsedByName(pointer options, const char *name) { XF86OptionPtr opt; @@ -438,7 +438,7 @@ xf86CheckIfOptionUsedByName(pointer options, const char *name) return FALSE; } -_X_EXPORT void +void xf86ShowUnusedOptions(int scrnIndex, pointer options) { XF86OptionPtr opt = options; @@ -661,7 +661,7 @@ ParseOptionValue(int scrnIndex, pointer options, OptionInfoPtr p, } -_X_EXPORT void +void xf86ProcessOptions(int scrnIndex, pointer options, OptionInfoPtr optinfo) { OptionInfoPtr p; @@ -672,7 +672,7 @@ xf86ProcessOptions(int scrnIndex, pointer options, OptionInfoPtr optinfo) } -_X_EXPORT OptionInfoPtr +OptionInfoPtr xf86TokenToOptinfo(const OptionInfoRec *table, int token) { const OptionInfoRec *p, *match = NULL, *set = NULL; @@ -699,7 +699,7 @@ xf86TokenToOptinfo(const OptionInfoRec *table, int token) } -_X_EXPORT const char * +const char * xf86TokenToOptName(const OptionInfoRec *table, int token) { const OptionInfoRec *p; @@ -709,7 +709,7 @@ xf86TokenToOptName(const OptionInfoRec *table, int token) } -_X_EXPORT Bool +Bool xf86IsOptionSet(const OptionInfoRec *table, int token) { OptionInfoPtr p; @@ -719,7 +719,7 @@ xf86IsOptionSet(const OptionInfoRec *table, int token) } -_X_EXPORT char * +char * xf86GetOptValString(const OptionInfoRec *table, int token) { OptionInfoPtr p; @@ -732,7 +732,7 @@ xf86GetOptValString(const OptionInfoRec *table, int token) } -_X_EXPORT Bool +Bool xf86GetOptValInteger(const OptionInfoRec *table, int token, int *value) { OptionInfoPtr p; @@ -746,7 +746,7 @@ xf86GetOptValInteger(const OptionInfoRec *table, int token, int *value) } -_X_EXPORT Bool +Bool xf86GetOptValULong(const OptionInfoRec *table, int token, unsigned long *value) { OptionInfoPtr p; @@ -760,7 +760,7 @@ xf86GetOptValULong(const OptionInfoRec *table, int token, unsigned long *value) } -_X_EXPORT Bool +Bool xf86GetOptValReal(const OptionInfoRec *table, int token, double *value) { OptionInfoPtr p; @@ -774,7 +774,7 @@ xf86GetOptValReal(const OptionInfoRec *table, int token, double *value) } -_X_EXPORT Bool +Bool xf86GetOptValFreq(const OptionInfoRec *table, int token, OptFreqUnits expectedUnits, double *value) { @@ -822,7 +822,7 @@ xf86GetOptValFreq(const OptionInfoRec *table, int token, } -_X_EXPORT Bool +Bool xf86GetOptValBool(const OptionInfoRec *table, int token, Bool *value) { OptionInfoPtr p; @@ -836,7 +836,7 @@ xf86GetOptValBool(const OptionInfoRec *table, int token, Bool *value) } -_X_EXPORT Bool +Bool xf86ReturnOptValBool(const OptionInfoRec *table, int token, Bool def) { OptionInfoPtr p; @@ -849,13 +849,13 @@ xf86ReturnOptValBool(const OptionInfoRec *table, int token, Bool def) } -_X_EXPORT int +int xf86NameCmp(const char *s1, const char *s2) { return xf86nameCompare(s1, s2); } -_X_EXPORT char * +char * xf86NormalizeName(const char *s) { char *ret, *q; diff --git a/hw/xfree86/common/xf86PM.c b/hw/xfree86/common/xf86PM.c index 87b9fa87b..7c8320dee 100644 --- a/hw/xfree86/common/xf86PM.c +++ b/hw/xfree86/common/xf86PM.c @@ -34,8 +34,8 @@ #include "xf86Priv.h" #include "xf86Xinput.h" -_X_EXPORT int (*xf86PMGetEventFromOs)(int fd,pmEvent *events,int num) = NULL; -_X_EXPORT pmWait (*xf86PMConfirmEventToOs)(int fd,pmEvent event) = NULL; +int (*xf86PMGetEventFromOs)(int fd,pmEvent *events,int num) = NULL; +pmWait (*xf86PMConfirmEventToOs)(int fd,pmEvent event) = NULL; static Bool suspended = FALSE; @@ -178,7 +178,7 @@ DoApmEvent(pmEvent event, Bool undo) #define MAX_NO_EVENTS 8 -_X_EXPORT void +void xf86HandlePMEvents(int fd, pointer data) { pmEvent events[MAX_NO_EVENTS]; diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h index d2d806f4e..50f5f7cb7 100644 --- a/hw/xfree86/common/xf86Priv.h +++ b/hw/xfree86/common/xf86Priv.h @@ -41,60 +41,64 @@ #include "propertyst.h" #include "input.h" +#ifdef XF86VIDMODE +# include "vidmodeproc.h" +#endif + /* * Parameters set ONLY from the command line options * The global state of these things is held in xf86InfoRec (when appropriate). */ -extern const char *xf86ConfigFile; -extern Bool xf86AllowMouseOpenFail; +extern _X_EXPORT const char *xf86ConfigFile; +extern _X_EXPORT Bool xf86AllowMouseOpenFail; #ifdef XF86VIDMODE -extern Bool xf86VidModeDisabled; -extern Bool xf86VidModeAllowNonLocal; +extern _X_EXPORT Bool xf86VidModeDisabled; +extern _X_EXPORT Bool xf86VidModeAllowNonLocal; #endif -extern Bool xf86fpFlag; -extern Bool xf86sFlag; -extern Bool xf86bsEnableFlag; -extern Bool xf86bsDisableFlag; -extern Bool xf86silkenMouseDisableFlag; -extern Bool xf86acpiDisableFlag; -extern char *xf86LayoutName; -extern char *xf86ScreenName; -extern char *xf86PointerName; -extern char *xf86KeyboardName; -extern int xf86FbBpp; -extern int xf86Depth; -extern Pix24Flags xf86Pix24; -extern rgb xf86Weight; -extern Bool xf86FlipPixels; -extern Gamma xf86Gamma; -extern char *xf86ServerName; -extern struct pci_slot_match xf86IsolateDevice; +extern _X_EXPORT Bool xf86fpFlag; +extern _X_EXPORT Bool xf86sFlag; +extern _X_EXPORT Bool xf86bsEnableFlag; +extern _X_EXPORT Bool xf86bsDisableFlag; +extern _X_EXPORT Bool xf86silkenMouseDisableFlag; +extern _X_EXPORT Bool xf86acpiDisableFlag; +extern _X_EXPORT char *xf86LayoutName; +extern _X_EXPORT char *xf86ScreenName; +extern _X_EXPORT char *xf86PointerName; +extern _X_EXPORT char *xf86KeyboardName; +extern _X_EXPORT int xf86FbBpp; +extern _X_EXPORT int xf86Depth; +extern _X_EXPORT Pix24Flags xf86Pix24; +extern _X_EXPORT rgb xf86Weight; +extern _X_EXPORT Bool xf86FlipPixels; +extern _X_EXPORT Gamma xf86Gamma; +extern _X_EXPORT char *xf86ServerName; +extern _X_EXPORT struct pci_slot_match xf86IsolateDevice; /* Other parameters */ -extern xf86InfoRec xf86Info; -extern const char *xf86InputDeviceList; -extern const char *xf86ModulePath; -extern MessageType xf86ModPathFrom; -extern const char *xf86LogFile; -extern MessageType xf86LogFileFrom; -extern Bool xf86LogFileWasOpened; -extern serverLayoutRec xf86ConfigLayout; - -extern DriverPtr *xf86DriverList; -extern int xf86NumDrivers; -extern Bool xf86Resetting; -extern Bool xf86Initialising; -extern int xf86NumScreens; -extern xf86CurrentAccessRec xf86CurrentAccess; -extern const char *xf86VisualNames[]; -extern int xf86Verbose; /* verbosity level */ -extern int xf86LogVerbose; /* log file verbosity level */ -extern Bool xf86ProbeOnly; -extern Bool xf86DoProbe; -extern Bool xorgHWAccess; - -extern RootWinPropPtr *xf86RegisteredPropertiesTable; +extern _X_EXPORT xf86InfoRec xf86Info; +extern _X_EXPORT const char *xf86InputDeviceList; +extern _X_EXPORT const char *xf86ModulePath; +extern _X_EXPORT MessageType xf86ModPathFrom; +extern _X_EXPORT const char *xf86LogFile; +extern _X_EXPORT MessageType xf86LogFileFrom; +extern _X_EXPORT Bool xf86LogFileWasOpened; +extern _X_EXPORT serverLayoutRec xf86ConfigLayout; + +extern _X_EXPORT DriverPtr *xf86DriverList; +extern _X_EXPORT int xf86NumDrivers; +extern _X_EXPORT Bool xf86Resetting; +extern _X_EXPORT Bool xf86Initialising; +extern _X_EXPORT int xf86NumScreens; +extern _X_EXPORT xf86CurrentAccessRec xf86CurrentAccess; +extern _X_EXPORT const char *xf86VisualNames[]; +extern _X_EXPORT int xf86Verbose; /* verbosity level */ +extern _X_EXPORT int xf86LogVerbose; /* log file verbosity level */ +extern _X_EXPORT Bool xf86ProbeOnly; +extern _X_EXPORT Bool xf86DoProbe; +extern _X_EXPORT Bool xorgHWAccess; + +extern _X_EXPORT RootWinPropPtr *xf86RegisteredPropertiesTable; #ifndef DEFAULT_VERBOSE #define DEFAULT_VERBOSE 0 @@ -114,57 +118,57 @@ extern RootWinPropPtr *xf86RegisteredPropertiesTable; /* xf86Bus.c */ -void xf86BusProbe(void); -void xf86AccessInit(void); -void xf86AccessEnter(void); -void xf86AccessLeave(void); -void xf86EntityInit(void); -void xf86AccessLeaveState(void); +extern _X_EXPORT void xf86BusProbe(void); +extern _X_EXPORT void xf86AccessInit(void); +extern _X_EXPORT void xf86AccessEnter(void); +extern _X_EXPORT void xf86AccessLeave(void); +extern _X_EXPORT void xf86EntityInit(void); +extern _X_EXPORT void xf86AccessLeaveState(void); -void xf86FindPrimaryDevice(void); +extern _X_EXPORT void xf86FindPrimaryDevice(void); /* new RAC */ -void xf86ResourceBrokerInit(void); -void xf86PostProbe(void); -void xf86ClearEntityListForScreen(int scrnIndex); -void xf86AddDevToEntity(int entityIndex, GDevPtr dev); -extern void xf86PostPreInit(void); -extern void xf86PostScreenInit(void); +extern _X_EXPORT void xf86ResourceBrokerInit(void); +extern _X_EXPORT void xf86PostProbe(void); +extern _X_EXPORT void xf86ClearEntityListForScreen(int scrnIndex); +extern _X_EXPORT void xf86AddDevToEntity(int entityIndex, GDevPtr dev); +extern _X_EXPORT void xf86PostPreInit(void); +extern _X_EXPORT void xf86PostScreenInit(void); /* xf86Config.c */ -Bool xf86PathIsSafe(const char *path); +extern _X_EXPORT Bool xf86PathIsSafe(const char *path); /* xf86DefaultModes */ -extern const DisplayModeRec xf86DefaultModes[]; -extern const int xf86NumDefaultModes; +extern _X_EXPORT const DisplayModeRec xf86DefaultModes[]; +extern _X_EXPORT const int xf86NumDefaultModes; /* xf86Configure.c */ -void DoConfigure(void); +extern _X_EXPORT void DoConfigure(void); /* xf86ShowOpts.c */ -void DoShowOptions(void); +extern _X_EXPORT void DoShowOptions(void); /* xf86Events.c */ -void xf86Wakeup(pointer blockData, int err, pointer pReadmask); -void xf86SigHandler(int signo); -void xf86HandlePMEvents(int fd, pointer data); -extern int (*xf86PMGetEventFromOs)(int fd,pmEvent *events,int num); -extern pmWait (*xf86PMConfirmEventToOs)(int fd,pmEvent event); +extern _X_EXPORT void xf86Wakeup(pointer blockData, int err, pointer pReadmask); +extern _X_EXPORT void xf86SigHandler(int signo); +extern _X_EXPORT void xf86HandlePMEvents(int fd, pointer data); +extern _X_EXPORT int (*xf86PMGetEventFromOs)(int fd,pmEvent *events,int num); +extern _X_EXPORT pmWait (*xf86PMConfirmEventToOs)(int fd,pmEvent event); /* xf86Helper.c */ -void xf86LogInit(void); -void xf86CloseLog(void); +extern _X_EXPORT void xf86LogInit(void); +extern _X_EXPORT void xf86CloseLog(void); /* xf86Init.c */ -Bool xf86LoadModules(char **list, pointer *optlist); -int xf86SetVerbosity(int verb); -int xf86SetLogVerbosity(int verb); -Bool xf86CallDriverProbe( struct _DriverRec * drv, Bool detect_only ); +extern _X_EXPORT Bool xf86LoadModules(char **list, pointer *optlist); +extern _X_EXPORT int xf86SetVerbosity(int verb); +extern _X_EXPORT int xf86SetLogVerbosity(int verb); +extern _X_EXPORT Bool xf86CallDriverProbe( struct _DriverRec * drv, Bool detect_only ); /* xf86Xinput.c */ -extern EventList *xf86Events; +extern _X_EXPORT EventList *xf86Events; #endif /* _NO_XF86_PROTOTYPES */ diff --git a/hw/xfree86/common/xf86RAC.c b/hw/xfree86/common/xf86RAC.c index 1ee5e5705..2eed8c7f5 100644 --- a/hw/xfree86/common/xf86RAC.c +++ b/hw/xfree86/common/xf86RAC.c @@ -262,7 +262,7 @@ static int RACGCKeyIndex; static DevPrivateKey RACGCKey = &RACGCKeyIndex; -_X_EXPORT Bool +Bool xf86RACInit(ScreenPtr pScreen, unsigned int flag) { ScrnInfoPtr pScrn; diff --git a/hw/xfree86/common/xf86RAC.h b/hw/xfree86/common/xf86RAC.h index 366c21485..881d0042f 100644 --- a/hw/xfree86/common/xf86RAC.h +++ b/hw/xfree86/common/xf86RAC.h @@ -6,7 +6,7 @@ #include "misc.h" #include "xf86.h" -Bool xf86RACInit(ScreenPtr pScreen, unsigned int flag); +extern _X_EXPORT Bool xf86RACInit(ScreenPtr pScreen, unsigned int flag); /* flags */ #define RAC_FB 0x01 diff --git a/hw/xfree86/common/xf86RandR.c b/hw/xfree86/common/xf86RandR.c index 2d1ec5d85..0e06de661 100644 --- a/hw/xfree86/common/xf86RandR.c +++ b/hw/xfree86/common/xf86RandR.c @@ -364,7 +364,7 @@ xf86RandRCloseScreen (int index, ScreenPtr pScreen) return (*pScreen->CloseScreen) (index, pScreen); } -_X_EXPORT Rotation +Rotation xf86GetRotation(ScreenPtr pScreen) { if (xf86RandRKey == NULL) @@ -374,7 +374,7 @@ xf86GetRotation(ScreenPtr pScreen) } /* Function to change RandR's idea of the virtual screen size */ -_X_EXPORT Bool +Bool xf86RandRSetNewVirtualAndDimensions(ScreenPtr pScreen, int newvirtX, int newvirtY, int newmmWidth, int newmmHeight, Bool resetMode) @@ -411,7 +411,7 @@ xf86RandRSetNewVirtualAndDimensions(ScreenPtr pScreen, return TRUE; } -_X_EXPORT Bool +Bool xf86RandRInit (ScreenPtr pScreen) { rrScrPrivPtr rp; diff --git a/hw/xfree86/common/xf86Resources.h b/hw/xfree86/common/xf86Resources.h index 15bd32c69..012fa699e 100644 --- a/hw/xfree86/common/xf86Resources.h +++ b/hw/xfree86/common/xf86Resources.h @@ -106,16 +106,16 @@ {ResShrIoSparse | ResBios | ResBus, 0x02E8, 0x03F8} /* Predefined resources */ -extern resRange resVgaExclusive[]; -extern resRange resVgaShared[]; -extern resRange resVgaIoShared[]; -extern resRange resVgaMemShared[]; -extern resRange resVgaUnusedExclusive[]; -extern resRange resVgaUnusedShared[]; -extern resRange resVgaSparseExclusive[]; -extern resRange resVgaSparseShared[]; -extern resRange res8514Exclusive[]; -extern resRange res8514Shared[]; +extern _X_EXPORT resRange resVgaExclusive[]; +extern _X_EXPORT resRange resVgaShared[]; +extern _X_EXPORT resRange resVgaIoShared[]; +extern _X_EXPORT resRange resVgaMemShared[]; +extern _X_EXPORT resRange resVgaUnusedExclusive[]; +extern _X_EXPORT resRange resVgaUnusedShared[]; +extern _X_EXPORT resRange resVgaSparseExclusive[]; +extern _X_EXPORT resRange resVgaSparseShared[]; +extern _X_EXPORT resRange res8514Exclusive[]; +extern _X_EXPORT resRange res8514Shared[]; /* Less misleading aliases for xf86SetOperatingState() */ #define resVgaMem resVgaMemShared diff --git a/hw/xfree86/common/xf86ShowOpts.c b/hw/xfree86/common/xf86ShowOpts.c index 077d93604..b8efa73c2 100644 --- a/hw/xfree86/common/xf86ShowOpts.c +++ b/hw/xfree86/common/xf86ShowOpts.c @@ -76,7 +76,7 @@ optionTypeToSting(OptionValueType type) } } -_X_EXPORT void DoShowOptions (void) { +void DoShowOptions (void) { int i = 0; char **vlist = 0; char *pSymbol = 0; diff --git a/hw/xfree86/common/xf86VidMode.c b/hw/xfree86/common/xf86VidMode.c index 24fccd31b..d855bd1a8 100644 --- a/hw/xfree86/common/xf86VidMode.c +++ b/hw/xfree86/common/xf86VidMode.c @@ -62,7 +62,7 @@ static Bool VidModeClose(int i, ScreenPtr pScreen); # define DEBUG_P(x) /**/ #endif -_X_EXPORT Bool +Bool VidModeExtensionInit(ScreenPtr pScreen) { #ifdef XF86VIDMODE @@ -142,7 +142,7 @@ VidModeAvailable(int scrnIndex) } } -_X_EXPORT Bool +Bool VidModeGetCurrentModeline(int scrnIndex, pointer *mode, int *dotClock) { ScrnInfoPtr pScrn; @@ -161,7 +161,7 @@ VidModeGetCurrentModeline(int scrnIndex, pointer *mode, int *dotClock) return FALSE; } -_X_EXPORT int +int VidModeGetDotClock(int scrnIndex, int Clock) { ScrnInfoPtr pScrn; @@ -176,7 +176,7 @@ VidModeGetDotClock(int scrnIndex, int Clock) return pScrn->clock[Clock]; } -_X_EXPORT int +int VidModeGetNumOfClocks(int scrnIndex, Bool *progClock) { ScrnInfoPtr pScrn; @@ -194,7 +194,7 @@ VidModeGetNumOfClocks(int scrnIndex, Bool *progClock) } } -_X_EXPORT Bool +Bool VidModeGetClocks(int scrnIndex, int *Clocks) { ScrnInfoPtr pScrn; @@ -215,7 +215,7 @@ VidModeGetClocks(int scrnIndex, int *Clocks) } -_X_EXPORT Bool +Bool VidModeGetFirstModeline(int scrnIndex, pointer *mode, int *dotClock) { ScrnInfoPtr pScrn; @@ -238,7 +238,7 @@ VidModeGetFirstModeline(int scrnIndex, pointer *mode, int *dotClock) return VidModeGetNextModeline(scrnIndex, mode, dotClock); } -_X_EXPORT Bool +Bool VidModeGetNextModeline(int scrnIndex, pointer *mode, int *dotClock) { ScrnInfoPtr pScrn; @@ -263,7 +263,7 @@ VidModeGetNextModeline(int scrnIndex, pointer *mode, int *dotClock) return FALSE; } -_X_EXPORT Bool +Bool VidModeDeleteModeline(int scrnIndex, pointer mode) { ScrnInfoPtr pScrn; @@ -276,7 +276,7 @@ VidModeDeleteModeline(int scrnIndex, pointer mode) return TRUE; } -_X_EXPORT Bool +Bool VidModeZoomViewport(int scrnIndex, int zoom) { ScrnInfoPtr pScrn; @@ -289,7 +289,7 @@ VidModeZoomViewport(int scrnIndex, int zoom) return TRUE; } -_X_EXPORT Bool +Bool VidModeSetViewPort(int scrnIndex, int x, int y) { ScrnInfoPtr pScrn; @@ -310,7 +310,7 @@ VidModeSetViewPort(int scrnIndex, int x, int y) return TRUE; } -_X_EXPORT Bool +Bool VidModeGetViewPort(int scrnIndex, int *x, int *y) { ScrnInfoPtr pScrn; @@ -324,7 +324,7 @@ VidModeGetViewPort(int scrnIndex, int *x, int *y) return TRUE; } -_X_EXPORT Bool +Bool VidModeSwitchMode(int scrnIndex, pointer mode) { ScrnInfoPtr pScrn; @@ -346,7 +346,7 @@ VidModeSwitchMode(int scrnIndex, pointer mode) return retval; } -_X_EXPORT Bool +Bool VidModeLockZoom(int scrnIndex, Bool lock) { ScrnInfoPtr pScrn; @@ -363,7 +363,7 @@ VidModeLockZoom(int scrnIndex, Bool lock) return TRUE; } -_X_EXPORT Bool +Bool VidModeGetMonitor(int scrnIndex, pointer *monitor) { ScrnInfoPtr pScrn; @@ -377,7 +377,7 @@ VidModeGetMonitor(int scrnIndex, pointer *monitor) return TRUE; } -_X_EXPORT ModeStatus +ModeStatus VidModeCheckModeForMonitor(int scrnIndex, pointer mode) { ScrnInfoPtr pScrn; @@ -390,7 +390,7 @@ VidModeCheckModeForMonitor(int scrnIndex, pointer mode) return xf86CheckModeForMonitor((DisplayModePtr)mode, pScrn->monitor); } -_X_EXPORT ModeStatus +ModeStatus VidModeCheckModeForDriver(int scrnIndex, pointer mode) { ScrnInfoPtr pScrn; @@ -403,7 +403,7 @@ VidModeCheckModeForDriver(int scrnIndex, pointer mode) return xf86CheckModeForDriver(pScrn, (DisplayModePtr)mode, 0); } -_X_EXPORT void +void VidModeSetCrtcForMode(int scrnIndex, pointer mode) { ScrnInfoPtr pScrn; @@ -422,7 +422,7 @@ VidModeSetCrtcForMode(int scrnIndex, pointer mode) return; } -_X_EXPORT Bool +Bool VidModeAddModeline(int scrnIndex, pointer mode) { ScrnInfoPtr pScrn; @@ -443,7 +443,7 @@ VidModeAddModeline(int scrnIndex, pointer mode) return TRUE; } -_X_EXPORT int +int VidModeGetNumOfModes(int scrnIndex) { pointer mode = NULL; @@ -459,7 +459,7 @@ VidModeGetNumOfModes(int scrnIndex) } while (TRUE); } -_X_EXPORT Bool +Bool VidModeSetGamma(int scrnIndex, float red, float green, float blue) { ScrnInfoPtr pScrn; @@ -478,7 +478,7 @@ VidModeSetGamma(int scrnIndex, float red, float green, float blue) return TRUE; } -_X_EXPORT Bool +Bool VidModeGetGamma(int scrnIndex, float *red, float *green, float *blue) { ScrnInfoPtr pScrn; @@ -493,7 +493,7 @@ VidModeGetGamma(int scrnIndex, float *red, float *green, float *blue) return TRUE; } -_X_EXPORT Bool +Bool VidModeSetGammaRamp(int scrnIndex, int size, CARD16 *r, CARD16 *g, CARD16 *b) { ScrnInfoPtr pScrn; @@ -506,7 +506,7 @@ VidModeSetGammaRamp(int scrnIndex, int size, CARD16 *r, CARD16 *g, CARD16 *b) return TRUE; } -_X_EXPORT Bool +Bool VidModeGetGammaRamp(int scrnIndex, int size, CARD16 *r, CARD16 *g, CARD16 *b) { ScrnInfoPtr pScrn; @@ -519,7 +519,7 @@ VidModeGetGammaRamp(int scrnIndex, int size, CARD16 *r, CARD16 *g, CARD16 *b) return TRUE; } -_X_EXPORT int +int VidModeGetGammaRampSize(int scrnIndex) { if (!VidModeAvailable(scrnIndex)) @@ -528,7 +528,7 @@ VidModeGetGammaRampSize(int scrnIndex) return xf86GetGammaRampSize(xf86Screens[scrnIndex]->pScreen); } -_X_EXPORT pointer +pointer VidModeCreateMode(void) { DisplayModePtr mode; @@ -544,14 +544,14 @@ VidModeCreateMode(void) return mode; } -_X_EXPORT void +void VidModeCopyMode(pointer modefrom, pointer modeto) { memcpy(modeto, modefrom, sizeof(DisplayModeRec)); } -_X_EXPORT int +int VidModeGetModeValue(pointer mode, int valtyp) { int ret = 0; @@ -594,7 +594,7 @@ VidModeGetModeValue(pointer mode, int valtyp) return ret; } -_X_EXPORT void +void VidModeSetModeValue(pointer mode, int valtyp, int val) { switch (valtyp) { @@ -635,7 +635,7 @@ VidModeSetModeValue(pointer mode, int valtyp, int val) return; } -_X_EXPORT vidMonitorValue +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 89a27c7b5..38fd1ecbf 100644 --- a/hw/xfree86/common/xf86Xinput.c +++ b/hw/xfree86/common/xf86Xinput.c @@ -96,7 +96,7 @@ #include "os.h" -_X_EXPORT EventListPtr xf86Events = NULL; +EventListPtr xf86Events = NULL; /** * Eval config and modify DeviceVelocityRec accordingly @@ -255,7 +255,7 @@ xf86SendDragEvents(DeviceIntPtr device) * *********************************************************************** */ -_X_EXPORT void +void xf86ProcessCommonOptions(LocalDevicePtr local, pointer list) { @@ -293,7 +293,7 @@ xf86ProcessCommonOptions(LocalDevicePtr local, * Returns TRUE on success, or FALSE otherwise. *********************************************************************** */ -_X_EXPORT int +int xf86ActivateDevice(LocalDevicePtr local) { DeviceIntPtr dev; @@ -368,7 +368,7 @@ xf86ActivateDevice(LocalDevicePtr local) *********************************************************************** */ -_X_EXPORT void +void OpenInputDevice(DeviceIntPtr dev, ClientPtr client, int *status) @@ -379,7 +379,7 @@ OpenInputDevice(DeviceIntPtr dev, *status = Success; } -_X_EXPORT void +void CloseInputDevice(DeviceIntPtr dev, ClientPtr client) { @@ -398,7 +398,7 @@ CloseInputDevice(DeviceIntPtr dev, *********************************************************************** */ -_X_EXPORT int +int SetDeviceMode (ClientPtr client, DeviceIntPtr dev, int mode) { LocalDevicePtr local = (LocalDevicePtr)dev->public.devicePrivate; @@ -424,7 +424,7 @@ SetDeviceMode (ClientPtr client, DeviceIntPtr dev, int mode) *********************************************************************** */ -_X_EXPORT int +int SetDeviceValuators (ClientPtr client, DeviceIntPtr dev, int *valuators, int first_valuator, int num_valuators) { @@ -447,7 +447,7 @@ SetDeviceValuators (ClientPtr client, DeviceIntPtr dev, int *valuators, *********************************************************************** */ -_X_EXPORT int +int ChangeDeviceControl (ClientPtr client, DeviceIntPtr dev, xDeviceCtl *control) { LocalDevicePtr local = (LocalDevicePtr)dev->public.devicePrivate; @@ -470,7 +470,7 @@ ChangeDeviceControl (ClientPtr client, DeviceIntPtr dev, xDeviceCtl *control) } } -_X_EXPORT void +void AddOtherInputDevices() { } @@ -562,7 +562,7 @@ unwind: return rval; } -_X_EXPORT int +int NewInputDeviceRequest (InputOption *options, DeviceIntPtr *pdev) { IDevRec *idev = NULL; @@ -646,7 +646,7 @@ unwind: return rval; } -_X_EXPORT void +void DeleteInputDeviceRequest(DeviceIntPtr pDev) { LocalDevicePtr pInfo = (LocalDevicePtr) pDev->public.devicePrivate; @@ -691,7 +691,7 @@ DeleteInputDeviceRequest(DeviceIntPtr pDev) * convenient functions to post events */ -_X_EXPORT void +void xf86PostMotionEvent(DeviceIntPtr device, int is_absolute, int first_valuator, @@ -716,7 +716,7 @@ xf86PostMotionEvent(DeviceIntPtr device, xf86PostMotionEventP(device, is_absolute, first_valuator, num_valuators, valuators); } -_X_EXPORT void +void xf86PostMotionEventP(DeviceIntPtr device, int is_absolute, int first_valuator, @@ -781,7 +781,7 @@ xf86PostMotionEventP(DeviceIntPtr device, } } -_X_EXPORT void +void xf86PostProximityEvent(DeviceIntPtr device, int is_in, int first_valuator, @@ -813,7 +813,7 @@ xf86PostProximityEvent(DeviceIntPtr device, } -_X_EXPORT void +void xf86PostButtonEvent(DeviceIntPtr device, int is_absolute, int button, @@ -856,7 +856,7 @@ xf86PostButtonEvent(DeviceIntPtr device, } -_X_EXPORT void +void xf86PostKeyEvent(DeviceIntPtr device, unsigned int key_code, int is_down, @@ -902,7 +902,7 @@ xf86PostKeyEvent(DeviceIntPtr device, mieqEnqueue(device, (xf86Events + i)->event); } -_X_EXPORT void +void xf86PostKeyboardEvent(DeviceIntPtr device, unsigned int key_code, int is_down) @@ -931,7 +931,7 @@ xf86PostKeyboardEvent(DeviceIntPtr device, mieqEnqueue(device, (xf86Events + i)->event); } -_X_EXPORT LocalDevicePtr +LocalDevicePtr xf86FirstLocalDevice() { return xf86InputDevs; @@ -950,7 +950,7 @@ xf86FirstLocalDevice() * different orgins on the touch screen vs X. */ -_X_EXPORT int +int xf86ScaleAxis(int Cx, int Sxhigh, int Sxlow, @@ -984,7 +984,7 @@ xf86ScaleAxis(int Cx, * ReadInput function before any events are posted, if the device is screen * specific like a touch screen. */ -_X_EXPORT void +void xf86XInputSetScreen(LocalDevicePtr local, int screen_number, int x, @@ -997,7 +997,7 @@ xf86XInputSetScreen(LocalDevicePtr local, } -_X_EXPORT void +void xf86InitValuatorAxisStruct(DeviceIntPtr dev, int axnum, int minval, int maxval, int resolution, int min_res, int max_res) { @@ -1012,7 +1012,7 @@ xf86InitValuatorAxisStruct(DeviceIntPtr dev, int axnum, int minval, int maxval, * Set the valuator values to be in synch with dix/event.c * DefineInitialRootWindow(). */ -_X_EXPORT void +void xf86InitValuatorDefaults(DeviceIntPtr dev, int axnum) { if (axnum == 0) { @@ -1038,7 +1038,7 @@ xf86InitValuatorDefaults(DeviceIntPtr dev, int axnum) * * @param panic True if device is unrecoverable and needs to be removed. */ -_X_EXPORT void +void xf86DisableDevice(DeviceIntPtr dev, Bool panic) { devicePresenceNotify ev; @@ -1066,7 +1066,7 @@ xf86DisableDevice(DeviceIntPtr dev, Bool panic) * out that the read error wasn't quite that bad after all. * Device will be re-activated, and an event sent to the client. */ -_X_EXPORT void +void xf86EnableDevice(DeviceIntPtr dev) { EnableDevice(dev); diff --git a/hw/xfree86/common/xf86Xinput.h b/hw/xfree86/common/xf86Xinput.h index bfd7f895c..8afda95e1 100644 --- a/hw/xfree86/common/xf86Xinput.h +++ b/hw/xfree86/common/xf86Xinput.h @@ -152,51 +152,53 @@ typedef struct _DeviceAssocRec } DeviceAssocRec, *DeviceAssocPtr; /* xf86Globals.c */ -extern InputInfoPtr xf86InputDevs; +extern _X_EXPORT InputInfoPtr xf86InputDevs; /* xf86Xinput.c */ -void xf86PostMotionEvent(DeviceIntPtr device, int is_absolute, +extern _X_EXPORT void xf86PostMotionEvent(DeviceIntPtr device, int is_absolute, int first_valuator, int num_valuators, ...); -void xf86PostMotionEventP(DeviceIntPtr device, int is_absolute, +extern _X_EXPORT void xf86PostMotionEventP(DeviceIntPtr device, int is_absolute, int first_valuator, int num_valuators, int *valuators); -void xf86PostProximityEvent(DeviceIntPtr device, int is_in, +extern _X_EXPORT void xf86PostProximityEvent(DeviceIntPtr device, int is_in, int first_valuator, int num_valuators, ...); -void xf86PostButtonEvent(DeviceIntPtr device, int is_absolute, int button, +extern _X_EXPORT void xf86PostButtonEvent(DeviceIntPtr device, int is_absolute, int button, int is_down, int first_valuator, int num_valuators, ...); -void xf86PostKeyEvent(DeviceIntPtr device, unsigned int key_code, int is_down, +extern _X_EXPORT void xf86PostKeyEvent(DeviceIntPtr device, unsigned int key_code, int is_down, int is_absolute, int first_valuator, int num_valuators, ...); -void xf86PostKeyboardEvent(DeviceIntPtr device, unsigned int key_code, +extern _X_EXPORT void xf86PostKeyboardEvent(DeviceIntPtr device, unsigned int key_code, int is_down); -int xf86ActivateDevice(LocalDevicePtr local); -LocalDevicePtr xf86FirstLocalDevice(void); -int xf86ScaleAxis(int Cx, int Sxhigh, int Sxlow, int Rxhigh, int Rxlow); -void xf86XInputSetScreen(LocalDevicePtr local, int screen_number, int x, int y); -void xf86ProcessCommonOptions(InputInfoPtr pInfo, pointer options); -void xf86InitValuatorAxisStruct(DeviceIntPtr dev, int axnum, int minval, +extern _X_EXPORT int xf86ActivateDevice(LocalDevicePtr local); +extern _X_EXPORT LocalDevicePtr xf86FirstLocalDevice(void); +extern _X_EXPORT int xf86ScaleAxis(int Cx, int Sxhigh, int Sxlow, int Rxhigh, int Rxlow); +extern _X_EXPORT void xf86XInputSetScreen(LocalDevicePtr local, int screen_number, int x, int y); +extern _X_EXPORT void xf86ProcessCommonOptions(InputInfoPtr pInfo, pointer options); +extern _X_EXPORT void xf86InitValuatorAxisStruct(DeviceIntPtr dev, int axnum, int minval, int maxval, int resolution, int min_res, int max_res); -void xf86InitValuatorDefaults(DeviceIntPtr dev, int axnum); -void xf86AddEnabledDevice(InputInfoPtr pInfo); -void xf86RemoveEnabledDevice(InputInfoPtr pInfo); -void xf86DisableDevice(DeviceIntPtr dev, Bool panic); -void xf86EnableDevice(DeviceIntPtr dev); +extern _X_EXPORT void xf86InitValuatorDefaults(DeviceIntPtr dev, int axnum); +extern _X_EXPORT void xf86AddEnabledDevice(InputInfoPtr pInfo); +extern _X_EXPORT void xf86RemoveEnabledDevice(InputInfoPtr pInfo); +extern _X_EXPORT void xf86DisableDevice(DeviceIntPtr dev, Bool panic); +extern _X_EXPORT void xf86EnableDevice(DeviceIntPtr dev); +/* not exported */ +int xf86NewInputDevice(IDevPtr idev, DeviceIntPtr *pdev, BOOL is_auto); /* xf86Helper.c */ -void xf86AddInputDriver(InputDriverPtr driver, pointer module, int flags); -void xf86DeleteInputDriver(int drvIndex); -InputInfoPtr xf86AllocateInput(InputDriverPtr drv, int flags); -InputDriverPtr xf86LookupInputDriver(const char *name); -InputInfoPtr xf86LookupInput(const char *name); -void xf86DeleteInput(InputInfoPtr pInp, int flags); -void xf86MotionHistoryAllocate(LocalDevicePtr local); -int xf86GetMotionEvents(DeviceIntPtr dev, xTimecoord *buff, +extern _X_EXPORT void xf86AddInputDriver(InputDriverPtr driver, pointer module, int flags); +extern _X_EXPORT void xf86DeleteInputDriver(int drvIndex); +extern _X_EXPORT InputInfoPtr xf86AllocateInput(InputDriverPtr drv, int flags); +extern _X_EXPORT InputDriverPtr xf86LookupInputDriver(const char *name); +extern _X_EXPORT InputInfoPtr xf86LookupInput(const char *name); +extern _X_EXPORT void xf86DeleteInput(InputInfoPtr pInp, int flags); +extern _X_EXPORT void xf86MotionHistoryAllocate(LocalDevicePtr local); +extern _X_EXPORT int xf86GetMotionEvents(DeviceIntPtr dev, xTimecoord *buff, unsigned long start, unsigned long stop, ScreenPtr pScreen, BOOL core); /* xf86Option.c */ -void xf86CollectInputOptions(InputInfoPtr pInfo, const char **defaultOpts, +extern _X_EXPORT void xf86CollectInputOptions(InputInfoPtr pInfo, const char **defaultOpts, pointer extraOpts); diff --git a/hw/xfree86/common/xf86cmap.c b/hw/xfree86/common/xf86cmap.c index 3944d7873..bb1aff1d9 100644 --- a/hw/xfree86/common/xf86cmap.c +++ b/hw/xfree86/common/xf86cmap.c @@ -126,7 +126,7 @@ static void CMapUnwrapScreen(ScreenPtr pScreen); -_X_EXPORT Bool xf86HandleColormaps( +Bool xf86HandleColormaps( ScreenPtr pScreen, int maxColors, int sigRGBbits, @@ -972,7 +972,7 @@ ComputeGammaRamp ( } } -_X_EXPORT int +int xf86ChangeGammaRamp( ScreenPtr pScreen, int size, @@ -1040,7 +1040,7 @@ xf86ChangeGammaRamp( return Success; } -_X_EXPORT int +int xf86GetGammaRampSize(ScreenPtr pScreen) { CMapScreenPtr pScreenPriv; @@ -1054,7 +1054,7 @@ xf86GetGammaRampSize(ScreenPtr pScreen) return pScreenPriv->gammaElements; } -_X_EXPORT int +int xf86GetGammaRamp( ScreenPtr pScreen, int size, @@ -1098,7 +1098,7 @@ xf86GetGammaRamp( return Success; } -_X_EXPORT int +int xf86ChangeGamma( ScreenPtr pScreen, Gamma gamma diff --git a/hw/xfree86/common/xf86cmap.h b/hw/xfree86/common/xf86cmap.h index b98bd3bfd..f15844e59 100644 --- a/hw/xfree86/common/xf86cmap.h +++ b/hw/xfree86/common/xf86cmap.h @@ -36,7 +36,7 @@ #define CMAP_RELOAD_ON_MODE_SWITCH 0x0000002 #define CMAP_LOAD_EVEN_IF_OFFSCREEN 0x0000004 -Bool xf86HandleColormaps( +extern _X_EXPORT Bool xf86HandleColormaps( ScreenPtr pScreen, int maxCol, int sigRGBbits, @@ -45,13 +45,13 @@ Bool xf86HandleColormaps( unsigned int flags ); -int +extern _X_EXPORT int xf86ChangeGamma( ScreenPtr pScreen, Gamma newGamma ); -int +extern _X_EXPORT int xf86ChangeGammaRamp( ScreenPtr pScreen, int size, @@ -60,9 +60,9 @@ xf86ChangeGammaRamp( unsigned short *blue ); -int xf86GetGammaRampSize(ScreenPtr pScreen); +extern _X_EXPORT int xf86GetGammaRampSize(ScreenPtr pScreen); -int +extern _X_EXPORT int xf86GetGammaRamp( ScreenPtr pScreen, int size, diff --git a/hw/xfree86/common/xf86fbBus.c b/hw/xfree86/common/xf86fbBus.c index bd7d935e5..552b9f8b1 100644 --- a/hw/xfree86/common/xf86fbBus.c +++ b/hw/xfree86/common/xf86fbBus.c @@ -51,9 +51,9 @@ #include "xf86RAC.h" -_X_EXPORT Bool fbSlotClaimed = FALSE; +Bool fbSlotClaimed = FALSE; -_X_EXPORT int +int xf86ClaimFbSlot(DriverPtr drvp, int chipset, GDevPtr dev, Bool active) { EntityPtr p; @@ -79,7 +79,7 @@ xf86ClaimFbSlot(DriverPtr drvp, int chipset, GDevPtr dev, Bool active) /* * Get the list of FB "slots" claimed by a screen */ -_X_EXPORT int +int xf86GetFbInfoForScreen(int scrnIndex) { int num = 0; diff --git a/hw/xfree86/common/xf86fbman.c b/hw/xfree86/common/xf86fbman.c index 5471c58f0..510c3d8c4 100644 --- a/hw/xfree86/common/xf86fbman.c +++ b/hw/xfree86/common/xf86fbman.c @@ -45,7 +45,7 @@ static int xf86FBManagerKeyIndex; static DevPrivateKey xf86FBManagerKey; -_X_EXPORT Bool xf86RegisterOffscreenManager( +Bool xf86RegisterOffscreenManager( ScreenPtr pScreen, FBManagerFuncsPtr funcs ){ @@ -57,7 +57,7 @@ _X_EXPORT Bool xf86RegisterOffscreenManager( } -_X_EXPORT Bool +Bool xf86FBManagerRunning(ScreenPtr pScreen) { if(xf86FBManagerKey == NULL) @@ -68,7 +68,7 @@ xf86FBManagerRunning(ScreenPtr pScreen) return TRUE; } -_X_EXPORT Bool +Bool xf86RegisterFreeBoxCallback( ScreenPtr pScreen, FreeBoxCallbackProcPtr FreeBoxCallback, @@ -86,7 +86,7 @@ xf86RegisterFreeBoxCallback( } -_X_EXPORT FBAreaPtr +FBAreaPtr xf86AllocateOffscreenArea( ScreenPtr pScreen, int w, int h, @@ -108,7 +108,7 @@ xf86AllocateOffscreenArea( } -_X_EXPORT FBLinearPtr +FBLinearPtr xf86AllocateOffscreenLinear( ScreenPtr pScreen, int length, @@ -130,7 +130,7 @@ xf86AllocateOffscreenLinear( } -_X_EXPORT void +void xf86FreeOffscreenArea(FBAreaPtr area) { FBManagerFuncsPtr funcs; @@ -149,7 +149,7 @@ xf86FreeOffscreenArea(FBAreaPtr area) } -_X_EXPORT void +void xf86FreeOffscreenLinear(FBLinearPtr linear) { FBManagerFuncsPtr funcs; @@ -168,7 +168,7 @@ xf86FreeOffscreenLinear(FBLinearPtr linear) } -_X_EXPORT Bool +Bool xf86ResizeOffscreenArea( FBAreaPtr resize, int w, int h @@ -186,7 +186,7 @@ xf86ResizeOffscreenArea( return (*funcs->ResizeOffscreenArea)(resize, w, h); } -_X_EXPORT Bool +Bool xf86ResizeOffscreenLinear( FBLinearPtr resize, int size @@ -205,7 +205,7 @@ xf86ResizeOffscreenLinear( } -_X_EXPORT Bool +Bool xf86QueryLargestOffscreenArea( ScreenPtr pScreen, int *w, int *h, @@ -228,7 +228,7 @@ xf86QueryLargestOffscreenArea( pScreen, w, h, gran, preferences, severity); } -_X_EXPORT Bool +Bool xf86QueryLargestOffscreenLinear( ScreenPtr pScreen, int *size, @@ -250,7 +250,7 @@ xf86QueryLargestOffscreenLinear( } -_X_EXPORT Bool +Bool xf86PurgeUnlockedOffscreenAreas(ScreenPtr pScreen) { FBManagerFuncsPtr funcs; @@ -1196,7 +1196,7 @@ xf86FBCloseScreen (int i, ScreenPtr pScreen) return (*pScreen->CloseScreen) (i, pScreen); } -_X_EXPORT Bool +Bool xf86InitFBManager( ScreenPtr pScreen, BoxPtr FullBox @@ -1233,7 +1233,7 @@ xf86InitFBManager( return ret; } -_X_EXPORT Bool +Bool xf86InitFBManagerArea( ScreenPtr pScreen, int PixelArea, @@ -1325,7 +1325,7 @@ xf86InitFBManagerArea( return ret; } -_X_EXPORT Bool +Bool xf86InitFBManagerRegion( ScreenPtr pScreen, RegionPtr FullRegion @@ -1363,7 +1363,7 @@ xf86InitFBManagerRegion( return TRUE; } -_X_EXPORT Bool +Bool xf86InitFBManagerLinear( ScreenPtr pScreen, int offset, @@ -1407,7 +1407,7 @@ xf86InitFBManagerLinear( disappear after the next release. People should use the real linear functions instead */ -_X_EXPORT FBAreaPtr +FBAreaPtr xf86AllocateLinearOffscreenArea ( ScreenPtr pScreen, int length, diff --git a/hw/xfree86/common/xf86fbman.h b/hw/xfree86/common/xf86fbman.h index 4f2eac5e6..1b3c31635 100644 --- a/hw/xfree86/common/xf86fbman.h +++ b/hw/xfree86/common/xf86fbman.h @@ -110,43 +110,43 @@ typedef struct { } FBManagerFuncs, *FBManagerFuncsPtr; -Bool xf86RegisterOffscreenManager( +extern _X_EXPORT Bool xf86RegisterOffscreenManager( ScreenPtr pScreen, FBManagerFuncsPtr funcs ); -Bool +extern _X_EXPORT Bool xf86InitFBManagerRegion( ScreenPtr pScreen, RegionPtr ScreenRegion ); -Bool +extern _X_EXPORT Bool xf86InitFBManagerArea( ScreenPtr pScreen, int PixalArea, int Verbosity ); -Bool +extern _X_EXPORT Bool xf86InitFBManager( ScreenPtr pScreen, BoxPtr FullBox ); -Bool +extern _X_EXPORT Bool xf86InitFBManagerLinear( ScreenPtr pScreen, int offset, int size ); -Bool +extern _X_EXPORT Bool xf86FBManagerRunning( ScreenPtr pScreen ); -FBAreaPtr +extern _X_EXPORT FBAreaPtr xf86AllocateOffscreenArea ( ScreenPtr pScreen, int w, int h, @@ -156,7 +156,7 @@ xf86AllocateOffscreenArea ( pointer privData ); -FBAreaPtr +extern _X_EXPORT FBAreaPtr xf86AllocateLinearOffscreenArea ( ScreenPtr pScreen, int length, @@ -166,7 +166,7 @@ xf86AllocateLinearOffscreenArea ( pointer privData ); -FBLinearPtr +extern _X_EXPORT FBLinearPtr xf86AllocateOffscreenLinear ( ScreenPtr pScreen, int length, @@ -176,36 +176,36 @@ xf86AllocateOffscreenLinear ( pointer privData ); -void xf86FreeOffscreenArea(FBAreaPtr area); -void xf86FreeOffscreenLinear(FBLinearPtr area); +extern _X_EXPORT void xf86FreeOffscreenArea(FBAreaPtr area); +extern _X_EXPORT void xf86FreeOffscreenLinear(FBLinearPtr area); -Bool +extern _X_EXPORT Bool xf86ResizeOffscreenArea( FBAreaPtr resize, int w, int h ); -Bool +extern _X_EXPORT Bool xf86ResizeOffscreenLinear( FBLinearPtr resize, int size ); -Bool +extern _X_EXPORT Bool xf86RegisterFreeBoxCallback( ScreenPtr pScreen, FreeBoxCallbackProcPtr FreeBoxCallback, pointer devPriv ); -Bool +extern _X_EXPORT Bool xf86PurgeUnlockedOffscreenAreas( ScreenPtr pScreen ); -Bool +extern _X_EXPORT Bool xf86QueryLargestOffscreenArea( ScreenPtr pScreen, int *width, int *height, @@ -214,7 +214,7 @@ xf86QueryLargestOffscreenArea( int priority ); -Bool +extern _X_EXPORT Bool xf86QueryLargestOffscreenLinear( ScreenPtr pScreen, int *size, diff --git a/hw/xfree86/common/xf86noBus.c b/hw/xfree86/common/xf86noBus.c index 0e3e3cc6b..d72674855 100644 --- a/hw/xfree86/common/xf86noBus.c +++ b/hw/xfree86/common/xf86noBus.c @@ -51,7 +51,7 @@ #include "xf86RAC.h" -_X_EXPORT int +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 ba2f8f73d..786a2b92e 100644 --- a/hw/xfree86/common/xf86pciBus.c +++ b/hw/xfree86/common/xf86pciBus.c @@ -53,7 +53,7 @@ #include "xf86RAC.h" /* Bus-specific globals */ -_X_EXPORT Bool pciSlotClaimed = FALSE; +Bool pciSlotClaimed = FALSE; static struct pci_device ** xf86PciVideoInfo = NULL; /* PCI probe for video hw */ @@ -97,7 +97,7 @@ static struct pci_device ** xf86PciVideoInfo = NULL; /* PCI probe for video hw * || IS_VGA(c) ) -_X_EXPORT void +void xf86FormatPciBusNumber(int busnum, char *buffer) { /* 'buffer' should be at least 8 characters long */ @@ -701,7 +701,7 @@ DisablePciBusAccess(void) * Otherwise, claim the slot for the screen requesting it. */ -_X_EXPORT int +int xf86ClaimPciSlot(struct pci_device * d, DriverPtr drvp, int chipset, GDevPtr dev, Bool active) { @@ -759,7 +759,7 @@ xf86ClaimPciSlot(struct pci_device * d, DriverPtr drvp, * in the correct format for a PCI bus id. */ -_X_EXPORT Bool +Bool xf86ParsePciBusString(const char *busID, int *bus, int *device, int *func) { /* @@ -833,7 +833,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. */ -_X_EXPORT Bool +Bool xf86ComparePciBusString(const char *busID, int bus, int device, int func) { int ibus, idevice, ifunc; @@ -850,7 +850,7 @@ xf86ComparePciBusString(const char *busID, int bus, int device, int func) * is PCI and bus, dev and func numbers match. */ -_X_EXPORT Bool +Bool xf86IsPrimaryPci(struct pci_device *pPci) { return ((primaryBus.type == BUS_PCI) && (pPci == primaryBus.id.pci)); @@ -859,7 +859,7 @@ xf86IsPrimaryPci(struct pci_device *pPci) /* * xf86GetPciInfoForEntity() -- Get the pciVideoRec of entity. */ -_X_EXPORT struct pci_device * +struct pci_device * xf86GetPciInfoForEntity(int entityIndex) { EntityPtr p; @@ -875,7 +875,7 @@ xf86GetPciInfoForEntity(int entityIndex) * xf86CheckPciMemBase() checks that the memory base value matches one of the * PCI base address register values for the given PCI device. */ -_X_EXPORT Bool +Bool xf86CheckPciMemBase( struct pci_device * pPci, memType base ) { int i; @@ -890,7 +890,7 @@ xf86CheckPciMemBase( struct pci_device * pPci, memType base ) * Check if the slot requested is free. If it is already in use, return FALSE. */ -_X_EXPORT Bool +Bool xf86CheckPciSlot(const struct pci_device *d) { int i; diff --git a/hw/xfree86/common/xf86sbusBus.c b/hw/xfree86/common/xf86sbusBus.c index 78e5d7cb7..a4caef3eb 100644 --- a/hw/xfree86/common/xf86sbusBus.c +++ b/hw/xfree86/common/xf86sbusBus.c @@ -41,7 +41,7 @@ #include "xf86sbusBus.h" #include "xf86Sbus.h" -_X_EXPORT Bool sbusSlotClaimed = FALSE; +Bool sbusSlotClaimed = FALSE; static int xf86nSbusInfo; @@ -79,7 +79,7 @@ CheckSbusDevice(const char *device, int fbNum) psdp->fd = -1; } -_X_EXPORT void +void xf86SbusProbe(void) { int i, useProm = 0; @@ -360,7 +360,7 @@ xf86ClaimSbusSlot(sbusDevicePtr psdp, DriverPtr drvp, return -1; } -_X_EXPORT int +int xf86MatchSbusInstances(const char *driverName, int sbusDevId, GDevPtr *devList, int numDevs, DriverPtr drvp, int **foundEntities) @@ -536,7 +536,7 @@ xf86MatchSbusInstances(const char *driverName, int sbusDevId, /* * xf86GetSbusInfoForEntity() -- Get the sbusDevicePtr of entity. */ -_X_EXPORT sbusDevicePtr +sbusDevicePtr xf86GetSbusInfoForEntity(int entityIndex) { sbusDevicePtr *psdpp; @@ -552,7 +552,7 @@ xf86GetSbusInfoForEntity(int entityIndex) return NULL; } -_X_EXPORT int +int xf86GetEntityForSbusInfo(sbusDevicePtr psdp) { int i; @@ -567,7 +567,7 @@ xf86GetEntityForSbusInfo(sbusDevicePtr psdp) return -1; } -_X_EXPORT void +void xf86SbusUseBuiltinMode(ScrnInfoPtr pScrn, sbusDevicePtr psdp) { DisplayModePtr mode; @@ -667,7 +667,7 @@ xf86SbusCmapCloseScreen(int i, ScreenPtr pScreen) return (*pScreen->CloseScreen) (i, pScreen); } -_X_EXPORT Bool +Bool xf86SbusHandleColormaps(ScreenPtr pScreen, sbusDevicePtr psdp) { sbusCmapPtr cmap; diff --git a/hw/xfree86/common/xf86sbusBus.h b/hw/xfree86/common/xf86sbusBus.h index 6161a08e2..1e7e03350 100644 --- a/hw/xfree86/common/xf86sbusBus.h +++ b/hw/xfree86/common/xf86sbusBus.h @@ -64,36 +64,36 @@ extern struct sbus_devtable { char *descr; } sbusDeviceTable[]; -void xf86SbusProbe(void); -extern sbusDevicePtr *xf86SbusInfo; +extern _X_EXPORT void xf86SbusProbe(void); +extern _X_EXPORT sbusDevicePtr *xf86SbusInfo; -int xf86MatchSbusInstances(const char *driverName, int sbusDevId, +extern _X_EXPORT int xf86MatchSbusInstances(const char *driverName, int sbusDevId, GDevPtr *devList, int numDevs, DriverPtr drvp, int **foundEntities); -sbusDevicePtr xf86GetSbusInfoForEntity(int entityIndex); -int xf86GetEntityForSbusInfo(sbusDevicePtr psdp); -void xf86SbusUseBuiltinMode(ScrnInfoPtr pScrn, sbusDevicePtr psdp); -pointer xf86MapSbusMem(sbusDevicePtr psdp, unsigned long offset, +extern _X_EXPORT sbusDevicePtr xf86GetSbusInfoForEntity(int entityIndex); +extern _X_EXPORT int xf86GetEntityForSbusInfo(sbusDevicePtr psdp); +extern _X_EXPORT void xf86SbusUseBuiltinMode(ScrnInfoPtr pScrn, sbusDevicePtr psdp); +extern _X_EXPORT pointer xf86MapSbusMem(sbusDevicePtr psdp, unsigned long offset, unsigned long size); -void xf86UnmapSbusMem(sbusDevicePtr psdp, pointer addr, unsigned long size); -void xf86SbusHideOsHwCursor(sbusDevicePtr psdp); -void xf86SbusSetOsHwCursorCmap(sbusDevicePtr psdp, int bg, int fg); -Bool xf86SbusHandleColormaps(ScreenPtr pScreen, sbusDevicePtr psdp); +extern _X_EXPORT void xf86UnmapSbusMem(sbusDevicePtr psdp, pointer addr, unsigned long size); +extern _X_EXPORT void xf86SbusHideOsHwCursor(sbusDevicePtr psdp); +extern _X_EXPORT void xf86SbusSetOsHwCursorCmap(sbusDevicePtr psdp, int bg, int fg); +extern _X_EXPORT Bool xf86SbusHandleColormaps(ScreenPtr pScreen, sbusDevicePtr psdp); -extern int promRootNode; +extern _X_EXPORT int promRootNode; -int promGetSibling(int node); -int promGetChild(int node); -char * promGetProperty(const char *prop, int *lenp); -int promGetBool(const char *prop); +extern _X_EXPORT int promGetSibling(int node); +extern _X_EXPORT int promGetChild(int node); +extern _X_EXPORT char * promGetProperty(const char *prop, int *lenp); +extern _X_EXPORT int promGetBool(const char *prop); -int sparcPromInit(void); -void sparcPromClose(void); -char * sparcPromGetProperty(sbusPromNodePtr pnode, const char *prop, int *lenp); -int sparcPromGetBool(sbusPromNodePtr pnode, const char *prop); -void sparcPromAssignNodes(void); -char * sparcPromNode2Pathname(sbusPromNodePtr pnode); -int sparcPromPathname2Node(const char *pathName); -char *sparcDriverName(void); +extern _X_EXPORT int sparcPromInit(void); +extern _X_EXPORT void sparcPromClose(void); +extern _X_EXPORT char * sparcPromGetProperty(sbusPromNodePtr pnode, const char *prop, int *lenp); +extern _X_EXPORT int sparcPromGetBool(sbusPromNodePtr pnode, const char *prop); +extern _X_EXPORT void sparcPromAssignNodes(void); +extern _X_EXPORT char * sparcPromNode2Pathname(sbusPromNodePtr pnode); +extern _X_EXPORT int sparcPromPathname2Node(const char *pathName); +extern _X_EXPORT char *sparcDriverName(void); #endif /* _XF86_SBUSBUS_H */ diff --git a/hw/xfree86/common/xf86xv.c b/hw/xfree86/common/xf86xv.c index cc8452528..85b13d371 100644 --- a/hw/xfree86/common/xf86xv.c +++ b/hw/xfree86/common/xf86xv.c @@ -113,12 +113,12 @@ static Bool xf86XVInitAdaptors(ScreenPtr, XF86VideoAdaptorPtr*, int); static int XF86XVWindowKeyIndex; static DevPrivateKey XF86XVWindowKey = &XF86XVWindowKeyIndex; static int XF86XvScreenKeyIndex; -_X_EXPORT DevPrivateKey XF86XvScreenKey = &XF86XvScreenKeyIndex; +DevPrivateKey XF86XvScreenKey = &XF86XvScreenKeyIndex; static unsigned long PortResource = 0; -_X_EXPORT DevPrivateKey (*XvGetScreenKeyProc)(void) = NULL; -_X_EXPORT unsigned long (*XvGetRTPortProc)(void) = NULL; -_X_EXPORT int (*XvScreenInitProc)(ScreenPtr) = NULL; +DevPrivateKey (*XvGetScreenKeyProc)(void) = NULL; +unsigned long (*XvGetRTPortProc)(void) = NULL; +int (*XvScreenInitProc)(ScreenPtr) = NULL; #define GET_XV_SCREEN(pScreen) \ ((XvScreenPtr)dixLookupPrivate(&(pScreen)->devPrivates, XF86XvScreenKey)) @@ -132,7 +132,7 @@ _X_EXPORT int (*XvScreenInitProc)(ScreenPtr) = NULL; static xf86XVInitGenericAdaptorPtr *GenDrivers = NULL; static int NumGenDrivers = 0; -_X_EXPORT int +int xf86XVRegisterGenericAdaptorDriver( xf86XVInitGenericAdaptorPtr InitFunc ){ @@ -149,7 +149,7 @@ xf86XVRegisterGenericAdaptorDriver( return 1; } -_X_EXPORT int +int xf86XVListGenericAdaptors( ScrnInfoPtr pScrn, XF86VideoAdaptorPtr **adaptors @@ -188,7 +188,7 @@ typedef struct { static OffscreenImageRec OffscreenImages[MAXSCREENS]; -_X_EXPORT Bool +Bool xf86XVRegisterOffscreenImages( ScreenPtr pScreen, XF86OffscreenImagePtr images, @@ -200,7 +200,7 @@ xf86XVRegisterOffscreenImages( return TRUE; } -_X_EXPORT XF86OffscreenImagePtr +XF86OffscreenImagePtr xf86XVQueryOffscreenImages( ScreenPtr pScreen, int *num @@ -210,20 +210,20 @@ xf86XVQueryOffscreenImages( } -_X_EXPORT XF86VideoAdaptorPtr +XF86VideoAdaptorPtr xf86XVAllocateVideoAdaptorRec(ScrnInfoPtr pScrn) { return xcalloc(1, sizeof(XF86VideoAdaptorRec)); } -_X_EXPORT void +void xf86XVFreeVideoAdaptorRec(XF86VideoAdaptorPtr ptr) { xfree(ptr); } -_X_EXPORT Bool +Bool xf86XVScreenInit( ScreenPtr pScreen, XF86VideoAdaptorPtr *adaptors, @@ -1814,7 +1814,7 @@ xf86XVQueryImageAttributes( } -_X_EXPORT void +void xf86XVFillKeyHelperDrawable (DrawablePtr pDraw, CARD32 key, RegionPtr clipboxes) { ScreenPtr pScreen = pDraw->pScreen; @@ -1864,7 +1864,7 @@ xf86XVFillKeyHelperDrawable (DrawablePtr pDraw, CARD32 key, RegionPtr clipboxes) xfree(rects); } -_X_EXPORT void +void xf86XVFillKeyHelper (ScreenPtr pScreen, CARD32 key, RegionPtr clipboxes) { DrawablePtr root = &WindowTable[pScreen->myNum]->drawable; @@ -1909,7 +1909,7 @@ xf86XVFillKeyHelper (ScreenPtr pScreen, CARD32 key, RegionPtr clipboxes) #define DummyScreen screenInfo.screens[0] -_X_EXPORT Bool +Bool xf86XVClipVideoHelper( BoxPtr dst, INT32 *xa, @@ -1991,7 +1991,7 @@ xf86XVClipVideoHelper( return TRUE; } -_X_EXPORT void +void xf86XVCopyYUV12ToPacked( const void *srcy, const void *srcv, @@ -2049,7 +2049,7 @@ xf86XVCopyYUV12ToPacked( } } -_X_EXPORT void +void xf86XVCopyPacked( const void *src, void *dst, diff --git a/hw/xfree86/common/xf86xv.h b/hw/xfree86/common/xf86xv.h index 817e2b994..e98c4234a 100644 --- a/hw/xfree86/common/xf86xv.h +++ b/hw/xfree86/common/xf86xv.h @@ -191,7 +191,7 @@ typedef struct { XF86AttributePtr attributes; } XF86OffscreenImageRec, *XF86OffscreenImagePtr; -Bool +extern _X_EXPORT Bool xf86XVScreenInit( ScreenPtr pScreen, XF86VideoAdaptorPtr *Adaptors, @@ -201,41 +201,41 @@ xf86XVScreenInit( typedef int (* xf86XVInitGenericAdaptorPtr)(ScrnInfoPtr pScrn, XF86VideoAdaptorPtr **Adaptors); -int +extern _X_EXPORT int xf86XVRegisterGenericAdaptorDriver( xf86XVInitGenericAdaptorPtr InitFunc ); -int +extern _X_EXPORT int xf86XVListGenericAdaptors( ScrnInfoPtr pScrn, XF86VideoAdaptorPtr **Adaptors ); -Bool +extern _X_EXPORT Bool xf86XVRegisterOffscreenImages( ScreenPtr pScreen, XF86OffscreenImagePtr images, int num ); -XF86OffscreenImagePtr +extern _X_EXPORT XF86OffscreenImagePtr xf86XVQueryOffscreenImages( ScreenPtr pScreen, int *num ); -XF86VideoAdaptorPtr xf86XVAllocateVideoAdaptorRec(ScrnInfoPtr pScrn); +extern _X_EXPORT XF86VideoAdaptorPtr xf86XVAllocateVideoAdaptorRec(ScrnInfoPtr pScrn); -void xf86XVFreeVideoAdaptorRec(XF86VideoAdaptorPtr ptr); +extern _X_EXPORT void xf86XVFreeVideoAdaptorRec(XF86VideoAdaptorPtr ptr); -void +extern _X_EXPORT void xf86XVFillKeyHelper (ScreenPtr pScreen, CARD32 key, RegionPtr clipboxes); -void +extern _X_EXPORT void xf86XVFillKeyHelperDrawable (DrawablePtr pDraw, CARD32 key, RegionPtr clipboxes); -Bool +extern _X_EXPORT Bool xf86XVClipVideoHelper( BoxPtr dst, INT32 *xa, @@ -247,7 +247,7 @@ xf86XVClipVideoHelper( INT32 height ); -void +extern _X_EXPORT void xf86XVCopyYUV12ToPacked( const void *srcy, const void *srcv, @@ -260,7 +260,7 @@ xf86XVCopyYUV12ToPacked( int w ); -void +extern _X_EXPORT void xf86XVCopyPacked( const void *src, void *dst, @@ -270,4 +270,8 @@ xf86XVCopyPacked( int w ); +extern _X_EXPORT DevPrivateKey (*XvGetScreenKeyProc)(void); +extern _X_EXPORT unsigned long (*XvGetRTPortProc)(void); +extern _X_EXPORT int (*XvScreenInitProc)(ScreenPtr); + #endif /* _XF86XV_H_ */ diff --git a/hw/xfree86/common/xf86xvmc.c b/hw/xfree86/common/xf86xvmc.c index 41ef0a0ca..39d33da08 100644 --- a/hw/xfree86/common/xf86xvmc.c +++ b/hw/xfree86/common/xf86xvmc.c @@ -45,8 +45,7 @@ #include "xf86xvpriv.h" #include "xf86xvmc.h" -typedef int (*XvMCScreenInitProcPtr)(ScreenPtr, int, XvMCAdaptorPtr); -_X_EXPORT XvMCScreenInitProcPtr XvMCScreenInitProc = NULL; +XvMCScreenInitProcPtr XvMCScreenInitProc = NULL; typedef struct { @@ -156,7 +155,7 @@ xf86XvMCCloseScreen (int i, ScreenPtr pScreen) return (*pScreen->CloseScreen)(i, pScreen); } -_X_EXPORT Bool xf86XvMCScreenInit( +Bool xf86XvMCScreenInit( ScreenPtr pScreen, int num_adaptors, XF86MCAdaptorPtr *adaptors @@ -219,12 +218,12 @@ _X_EXPORT Bool xf86XvMCScreenInit( return TRUE; } -_X_EXPORT XF86MCAdaptorPtr xf86XvMCCreateAdaptorRec (void) +XF86MCAdaptorPtr xf86XvMCCreateAdaptorRec (void) { return xcalloc(1, sizeof(XF86MCAdaptorRec)); } -_X_EXPORT void xf86XvMCDestroyAdaptorRec(XF86MCAdaptorPtr adaptor) +void xf86XvMCDestroyAdaptorRec(XF86MCAdaptorPtr adaptor) { xfree(adaptor); } diff --git a/hw/xfree86/common/xf86xvmc.h b/hw/xfree86/common/xf86xvmc.h index bc7a98c6a..902b4f8fc 100644 --- a/hw/xfree86/common/xf86xvmc.h +++ b/hw/xfree86/common/xf86xvmc.h @@ -151,13 +151,16 @@ typedef struct { an array of structures. */ -Bool xf86XvMCScreenInit( +extern _X_EXPORT Bool xf86XvMCScreenInit( ScreenPtr pScreen, int num_adaptors, XF86MCAdaptorPtr *adaptors ); -XF86MCAdaptorPtr xf86XvMCCreateAdaptorRec (void); -void xf86XvMCDestroyAdaptorRec(XF86MCAdaptorPtr adaptor); +extern _X_EXPORT XF86MCAdaptorPtr xf86XvMCCreateAdaptorRec (void); +extern _X_EXPORT void xf86XvMCDestroyAdaptorRec(XF86MCAdaptorPtr adaptor); + +typedef int (*XvMCScreenInitProcPtr)(ScreenPtr, int, XvMCAdaptorPtr); +extern _X_EXPORT XvMCScreenInitProcPtr XvMCScreenInitProc; #endif /* _XF86XVMC_H */ diff --git a/hw/xfree86/common/xf86xvpriv.h b/hw/xfree86/common/xf86xvpriv.h index 4200dac80..761fc3adf 100644 --- a/hw/xfree86/common/xf86xvpriv.h +++ b/hw/xfree86/common/xf86xvpriv.h @@ -34,7 +34,7 @@ /*** These are DDX layer privates ***/ -extern DevPrivateKey XF86XvScreenKey; +extern _X_EXPORT DevPrivateKey XF86XvScreenKey; typedef struct { DestroyWindowProcPtr DestroyWindow; diff --git a/hw/xfree86/common/xisb.c b/hw/xfree86/common/xisb.c index 6314094a0..1cb9e4854 100644 --- a/hw/xfree86/common/xisb.c +++ b/hw/xfree86/common/xisb.c @@ -62,7 +62,7 @@ * Function Definitions ****************************************************************************/ -_X_EXPORT XISBuffer * +XISBuffer * XisbNew (int fd, ssize_t size) { XISBuffer *b; @@ -86,14 +86,14 @@ XisbNew (int fd, ssize_t size) return (b); } -_X_EXPORT void +void XisbFree (XISBuffer *b) { xfree (b->buf); xfree (b); } -_X_EXPORT int +int XisbRead (XISBuffer *b) { int ret; @@ -136,7 +136,7 @@ XisbRead (XISBuffer *b) } /* the only purpose of this function is to provide output tracing */ -_X_EXPORT ssize_t +ssize_t XisbWrite (XISBuffer *b, unsigned char *msg, ssize_t len) { if (b->trace) @@ -149,7 +149,7 @@ XisbWrite (XISBuffer *b, unsigned char *msg, ssize_t len) } /* turn tracing of this buffer on (1) or off (0) */ -_X_EXPORT void +void XisbTrace (XISBuffer *b, int trace) { b->trace = trace; @@ -167,7 +167,7 @@ XisbTrace (XISBuffer *b, int trace) * give duration in usecs. */ -_X_EXPORT void +void XisbBlockDuration (XISBuffer *b, int block_duration) { b->block_duration = block_duration; diff --git a/hw/xfree86/common/xisb.h b/hw/xfree86/common/xisb.h index b7bdd5682..bacfde166 100644 --- a/hw/xfree86/common/xisb.h +++ b/hw/xfree86/common/xisb.h @@ -52,12 +52,12 @@ typedef struct _XISBuffer * of globals. * put locals in the .c file. *****************************************************************************/ -XISBuffer * XisbNew (int fd, ssize_t size); -void XisbFree (XISBuffer *b); -int XisbRead (XISBuffer *b); -ssize_t XisbWrite (XISBuffer *b, unsigned char *msg, ssize_t len); -void XisbTrace (XISBuffer *b, int trace); -void XisbBlockDuration (XISBuffer *b, int block_duration); +extern _X_EXPORT XISBuffer * XisbNew (int fd, ssize_t size); +extern _X_EXPORT void XisbFree (XISBuffer *b); +extern _X_EXPORT int XisbRead (XISBuffer *b); +extern _X_EXPORT ssize_t XisbWrite (XISBuffer *b, unsigned char *msg, ssize_t len); +extern _X_EXPORT void XisbTrace (XISBuffer *b, int trace); +extern _X_EXPORT void XisbBlockDuration (XISBuffer *b, int block_duration); /* * DO NOT PUT ANYTHING AFTER THIS ENDIF diff --git a/hw/xfree86/common/xorgHelper.c b/hw/xfree86/common/xorgHelper.c index 00fe7cab3..7f9dd507a 100644 --- a/hw/xfree86/common/xorgHelper.c +++ b/hw/xfree86/common/xorgHelper.c @@ -16,7 +16,7 @@ #include "xorgVersion.h" -_X_EXPORT CARD32 +CARD32 xorgGetVersion() { return XORG_VERSION_CURRENT; diff --git a/hw/xfree86/ddc/ddcProperty.c b/hw/xfree86/ddc/ddcProperty.c index 124abd7ec..a4384f1d3 100644 --- a/hw/xfree86/ddc/ddcProperty.c +++ b/hw/xfree86/ddc/ddcProperty.c @@ -108,7 +108,7 @@ addRootWindowProperties(ScrnInfoPtr pScrn, xf86MonPtr DDC) } } -_X_EXPORT Bool +Bool xf86SetDDCproperties(ScrnInfoPtr pScrn, xf86MonPtr DDC) { if (!pScrn || !pScrn->monitor || !DDC) diff --git a/hw/xfree86/ddc/edid.h b/hw/xfree86/ddc/edid.h index 45caf6ea9..aeda6b30c 100644 --- a/hw/xfree86/ddc/edid.h +++ b/hw/xfree86/ddc/edid.h @@ -547,6 +547,6 @@ typedef struct { Uchar *rawData; } xf86Monitor, *xf86MonPtr; -extern xf86MonPtr ConfiguredMonitor; +extern _X_EXPORT xf86MonPtr ConfiguredMonitor; #endif /* _EDID_H_ */ diff --git a/hw/xfree86/ddc/interpret_edid.c b/hw/xfree86/ddc/interpret_edid.c index 588e2547b..c0e3df96c 100644 --- a/hw/xfree86/ddc/interpret_edid.c +++ b/hw/xfree86/ddc/interpret_edid.c @@ -132,7 +132,7 @@ handle_edid_quirks(xf86MonPtr m) } } -_X_EXPORT xf86MonPtr +xf86MonPtr xf86InterpretEDID(int scrnIndex, Uchar *block) { xf86MonPtr m; @@ -163,7 +163,7 @@ xf86InterpretEDID(int scrnIndex, Uchar *block) return NULL; } -_X_EXPORT xf86MonPtr +xf86MonPtr xf86InterpretEEDID(int scrnIndex, Uchar *block) { xf86MonPtr m; @@ -463,7 +463,7 @@ validate_version(int scrnIndex, struct edid_version *r) /* * Returns true if HDMI, false if definitely not or unknown. */ -_X_EXPORT Bool +Bool xf86MonitorIsHDMI(xf86MonPtr mon) { int i = 0, version, offset; diff --git a/hw/xfree86/ddc/print_edid.c b/hw/xfree86/ddc/print_edid.c index 7708889a8..7b6e2989a 100644 --- a/hw/xfree86/ddc/print_edid.c +++ b/hw/xfree86/ddc/print_edid.c @@ -460,7 +460,7 @@ print_number_sections(int scrnIndex, int num) num); } -_X_EXPORT xf86MonPtr +xf86MonPtr xf86PrintEDID(xf86MonPtr m) { CARD16 i, j, n; diff --git a/hw/xfree86/ddc/xf86DDC.c b/hw/xfree86/ddc/xf86DDC.c index da7b34e51..e3f40ec12 100644 --- a/hw/xfree86/ddc/xf86DDC.c +++ b/hw/xfree86/ddc/xf86DDC.c @@ -63,7 +63,7 @@ static const OptionInfoRec DDCOptions[] = { * @return pointer to a new xf86MonPtr containing the EDID information. * @return NULL if no monitor attached or failure to interpret the EDID. */ -_X_EXPORT xf86MonPtr +xf86MonPtr xf86DoEDID_DDC1( int scrnIndex, DDC1SetSpeedProc DDC1SetSpeed, unsigned int (*DDC1Read)(ScrnInfoPtr) @@ -206,7 +206,7 @@ DDC2Read(I2CDevPtr dev, int block, unsigned char *R_Buffer) * @return pointer to a new xf86MonPtr containing the EDID information. * @return NULL if no monitor attached or failure to interpret the EDID. */ -_X_EXPORT xf86MonPtr +xf86MonPtr xf86DoEEDID(int scrnIndex, I2CBusPtr pBus, Bool complete) { ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; @@ -267,7 +267,7 @@ xf86DoEEDID(int scrnIndex, I2CBusPtr pBus, Bool complete) * @return pointer to a new xf86MonPtr containing the EDID information. * @return NULL if no monitor attached or failure to interpret the EDID. */ -_X_EXPORT xf86MonPtr +xf86MonPtr xf86DoEDID_DDC2(int scrnIndex, I2CBusPtr pBus) { return xf86DoEEDID(scrnIndex, pBus, FALSE); diff --git a/hw/xfree86/ddc/xf86DDC.h b/hw/xfree86/ddc/xf86DDC.h index 3172b555d..07411b849 100644 --- a/hw/xfree86/ddc/xf86DDC.h +++ b/hw/xfree86/ddc/xf86DDC.h @@ -24,42 +24,42 @@ typedef enum { typedef void (* DDC1SetSpeedProc)(ScrnInfoPtr, xf86ddcSpeed); -extern xf86MonPtr xf86DoEDID_DDC1( +extern _X_EXPORT xf86MonPtr xf86DoEDID_DDC1( int scrnIndex, DDC1SetSpeedProc DDC1SetSpeed, unsigned int (*DDC1Read)(ScrnInfoPtr) ); -extern xf86MonPtr xf86DoEDID_DDC2( +extern _X_EXPORT xf86MonPtr xf86DoEDID_DDC2( int scrnIndex, I2CBusPtr pBus ); -extern xf86MonPtr xf86DoEEDID(int scrnIndex, I2CBusPtr pBus, Bool); +extern _X_EXPORT xf86MonPtr xf86DoEEDID(int scrnIndex, I2CBusPtr pBus, Bool); -extern xf86MonPtr xf86PrintEDID( +extern _X_EXPORT xf86MonPtr xf86PrintEDID( xf86MonPtr monPtr ); -extern xf86MonPtr xf86InterpretEDID( +extern _X_EXPORT xf86MonPtr xf86InterpretEDID( int screenIndex, Uchar *block ); -extern xf86MonPtr xf86InterpretEEDID( +extern _X_EXPORT xf86MonPtr xf86InterpretEEDID( int screenIndex, Uchar *block ); -extern void +extern _X_EXPORT void xf86DDCMonitorSet(int scrnIndex, MonPtr Monitor, xf86MonPtr DDC); -extern Bool xf86SetDDCproperties( +extern _X_EXPORT Bool xf86SetDDCproperties( ScrnInfoPtr pScreen, xf86MonPtr DDC ); -DisplayModePtr xf86DDCGetModes(int scrnIndex, xf86MonPtr DDC); +extern _X_EXPORT DisplayModePtr xf86DDCGetModes(int scrnIndex, xf86MonPtr DDC); -extern Bool +extern _X_EXPORT Bool xf86MonitorIsHDMI(xf86MonPtr mon); #endif diff --git a/hw/xfree86/dixmods/extmod/Makefile.am b/hw/xfree86/dixmods/extmod/Makefile.am index dd4ccd633..d93e63afa 100644 --- a/hw/xfree86/dixmods/extmod/Makefile.am +++ b/hw/xfree86/dixmods/extmod/Makefile.am @@ -12,7 +12,7 @@ XV_SRCS = xvmod.c xvmodproc.h endif if XF86VIDMODE -XF86VMODE_SRCS = xf86vmode.c vidmodeproc.h +XF86VMODE_SRCS = xf86vmode.c endif AM_CFLAGS = @DIX_CFLAGS@ @XORG_CFLAGS@ diff --git a/hw/xfree86/dixmods/extmod/dgaproc.h b/hw/xfree86/dixmods/extmod/dgaproc.h index 67ca39c06..6745a6e7a 100644 --- a/hw/xfree86/dixmods/extmod/dgaproc.h +++ b/hw/xfree86/dixmods/extmod/dgaproc.h @@ -54,7 +54,7 @@ typedef struct { /* DDX interface */ -int +extern _X_EXPORT int DGASetMode( int Index, int num, @@ -62,35 +62,35 @@ DGASetMode( PixmapPtr *pPix ); -void +extern _X_EXPORT void DGASetInputMode( int Index, Bool keyboard, Bool mouse ); -void +extern _X_EXPORT void DGASelectInput( int Index, ClientPtr client, long mask ); -Bool DGAAvailable(int Index); -Bool DGAActive(int Index); -void DGAShutdown(void); -void DGAInstallCmap(ColormapPtr cmap); -int DGAGetViewportStatus(int Index); -int DGASync(int Index); +extern _X_EXPORT Bool DGAAvailable(int Index); +extern _X_EXPORT Bool DGAActive(int Index); +extern _X_EXPORT void DGAShutdown(void); +extern _X_EXPORT void DGAInstallCmap(ColormapPtr cmap); +extern _X_EXPORT int DGAGetViewportStatus(int Index); +extern _X_EXPORT int DGASync(int Index); -int +extern _X_EXPORT int DGAFillRect( int Index, int x, int y, int w, int h, unsigned long color ); -int +extern _X_EXPORT int DGABlitRect( int Index, int srcx, int srcy, @@ -98,7 +98,7 @@ DGABlitRect( int dstx, int dsty ); -int +extern _X_EXPORT int DGABlitTransRect( int Index, int srcx, int srcy, @@ -107,36 +107,36 @@ DGABlitTransRect( unsigned long color ); -int +extern _X_EXPORT int DGASetViewport( int Index, int x, int y, int mode ); -int DGAGetModes(int Index); -int DGAGetOldDGAMode(int Index); +extern _X_EXPORT int DGAGetModes(int Index); +extern _X_EXPORT int DGAGetOldDGAMode(int Index); -int DGAGetModeInfo(int Index, XDGAModePtr mode, int num); +extern _X_EXPORT int DGAGetModeInfo(int Index, XDGAModePtr mode, int num); -Bool DGAVTSwitch(void); -Bool DGAStealButtonEvent(DeviceIntPtr dev, int Index, int button, +extern _X_EXPORT Bool DGAVTSwitch(void); +extern _X_EXPORT Bool DGAStealButtonEvent(DeviceIntPtr dev, int Index, int button, int is_down); -Bool DGAStealMotionEvent(DeviceIntPtr dev, int Index, int dx, int dy); -Bool DGAStealKeyEvent(DeviceIntPtr dev, int Index, int key_code, int is_down); -Bool DGAIsDgaEvent (xEvent *e); +extern _X_EXPORT Bool DGAStealMotionEvent(DeviceIntPtr dev, int Index, int dx, int dy); +extern _X_EXPORT Bool DGAStealKeyEvent(DeviceIntPtr dev, int Index, int key_code, int is_down); +extern _X_EXPORT Bool DGAIsDgaEvent (xEvent *e); -Bool DGAOpenFramebuffer(int Index, char **name, unsigned char **mem, +extern _X_EXPORT Bool DGAOpenFramebuffer(int Index, char **name, unsigned char **mem, int *size, int *offset, int *flags); -void DGACloseFramebuffer(int Index); -Bool DGAChangePixmapMode(int Index, int *x, int *y, int mode); -int DGACreateColormap(int Index, ClientPtr client, int id, int mode, +extern _X_EXPORT void DGACloseFramebuffer(int Index); +extern _X_EXPORT Bool DGAChangePixmapMode(int Index, int *x, int *y, int mode); +extern _X_EXPORT int DGACreateColormap(int Index, ClientPtr client, int id, int mode, int alloc); -extern unsigned char DGAReqCode; -extern int DGAErrorBase; -extern int DGAEventBase; -extern int *XDGAEventBase; +extern _X_EXPORT unsigned char DGAReqCode; +extern _X_EXPORT int DGAErrorBase; +extern _X_EXPORT int DGAEventBase; +extern _X_EXPORT int *XDGAEventBase; diff --git a/hw/xfree86/dixmods/extmod/vidmodeproc.h b/hw/xfree86/dixmods/extmod/vidmodeproc.h deleted file mode 100644 index c5ad03af2..000000000 --- a/hw/xfree86/dixmods/extmod/vidmodeproc.h +++ /dev/null @@ -1,77 +0,0 @@ - -/* Prototypes for DGA functions that the DDX must provide */ - -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - -#ifndef _VIDMODEPROC_H_ -#define _VIDMODEPROC_H_ - - -typedef enum { - VIDMODE_H_DISPLAY, - VIDMODE_H_SYNCSTART, - VIDMODE_H_SYNCEND, - VIDMODE_H_TOTAL, - VIDMODE_H_SKEW, - VIDMODE_V_DISPLAY, - VIDMODE_V_SYNCSTART, - VIDMODE_V_SYNCEND, - VIDMODE_V_TOTAL, - VIDMODE_FLAGS, - VIDMODE_CLOCK -} VidModeSelectMode; - -typedef enum { - VIDMODE_MON_VENDOR, - VIDMODE_MON_MODEL, - VIDMODE_MON_NHSYNC, - VIDMODE_MON_NVREFRESH, - VIDMODE_MON_HSYNC_LO, - VIDMODE_MON_HSYNC_HI, - VIDMODE_MON_VREFRESH_LO, - VIDMODE_MON_VREFRESH_HI -} VidModeSelectMonitor; - -typedef union { - pointer ptr; - int i; - float f; -} vidMonitorValue; - -void XFree86VidModeExtensionInit(void); - -Bool VidModeAvailable(int scrnIndex); -Bool VidModeGetCurrentModeline(int scrnIndex, pointer *mode, int *dotClock); -Bool VidModeGetFirstModeline(int scrnIndex, pointer *mode, int *dotClock); -Bool VidModeGetNextModeline(int scrnIndex, pointer *mode, int *dotClock); -Bool VidModeDeleteModeline(int scrnIndex, pointer mode); -Bool VidModeZoomViewport(int scrnIndex, int zoom); -Bool VidModeGetViewPort(int scrnIndex, int *x, int *y); -Bool VidModeSetViewPort(int scrnIndex, int x, int y); -Bool VidModeSwitchMode(int scrnIndex, pointer mode); -Bool VidModeLockZoom(int scrnIndex, Bool lock); -Bool VidModeGetMonitor(int scrnIndex, pointer *monitor); -int VidModeGetNumOfClocks(int scrnIndex, Bool *progClock); -Bool VidModeGetClocks(int scrnIndex, int *Clocks); -ModeStatus VidModeCheckModeForMonitor(int scrnIndex, pointer mode); -ModeStatus VidModeCheckModeForDriver(int scrnIndex, pointer mode); -void VidModeSetCrtcForMode(int scrnIndex, pointer mode); -Bool VidModeAddModeline(int scrnIndex, pointer mode); -int VidModeGetDotClock(int scrnIndex, int Clock); -int VidModeGetNumOfModes(int scrnIndex); -Bool VidModeSetGamma(int scrnIndex, float red, float green, float blue); -Bool VidModeGetGamma(int scrnIndex, float *red, float *green, float *blue); -pointer VidModeCreateMode(void); -void VidModeCopyMode(pointer modefrom, pointer modeto); -int VidModeGetModeValue(pointer mode, int valtyp); -void VidModeSetModeValue(pointer mode, int valtyp, int val); -vidMonitorValue VidModeGetMonitorValue(pointer monitor, int valtyp, int indx); -Bool VidModeSetGammaRamp(int, int, CARD16 *, CARD16 *, CARD16 *); -Bool VidModeGetGammaRamp(int, int, CARD16 *, CARD16 *, CARD16 *); -int VidModeGetGammaRampSize(int scrnIndex); - -#endif - - diff --git a/hw/xfree86/dixmods/extmod/xf86dga2.c b/hw/xfree86/dixmods/extmod/xf86dga2.c index e712b4288..df0030e80 100644 --- a/hw/xfree86/dixmods/extmod/xf86dga2.c +++ b/hw/xfree86/dixmods/extmod/xf86dga2.c @@ -62,9 +62,9 @@ static void DGAClientStateChange (CallbackListPtr*, pointer, pointer); static ClientPtr DGAClients[MAXSCREENS]; -_X_EXPORT unsigned char DGAReqCode = 0; -_X_EXPORT int DGAErrorBase; -_X_EXPORT int DGAEventBase; +unsigned char DGAReqCode = 0; +int DGAErrorBase; +int DGAEventBase; static int DGAClientPrivateKeyIndex; static DevPrivateKey DGAClientPrivateKey = &DGAClientPrivateKeyIndex; diff --git a/hw/xfree86/dixmods/xkbKillSrv.c b/hw/xfree86/dixmods/xkbKillSrv.c index ac9c41220..9074fd390 100644 --- a/hw/xfree86/dixmods/xkbKillSrv.c +++ b/hw/xfree86/dixmods/xkbKillSrv.c @@ -45,7 +45,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "xf86.h" -_X_EXPORT int +int XkbDDXTerminateServer(DeviceIntPtr dev,KeyCode key,XkbAction *act) { if (dev != inputInfo.keyboard) diff --git a/hw/xfree86/dixmods/xkbPrivate.c b/hw/xfree86/dixmods/xkbPrivate.c index e2a1273d7..db21a4e17 100644 --- a/hw/xfree86/dixmods/xkbPrivate.c +++ b/hw/xfree86/dixmods/xkbPrivate.c @@ -17,7 +17,7 @@ #include "os.h" #include "xf86.h" -_X_EXPORT int +int XkbDDXPrivate(DeviceIntPtr dev,KeyCode key,XkbAction *act) { XkbAnyAction *xf86act = &(act->any); diff --git a/hw/xfree86/dixmods/xkbVT.c b/hw/xfree86/dixmods/xkbVT.c index aaa4665a5..e6d69e2eb 100644 --- a/hw/xfree86/dixmods/xkbVT.c +++ b/hw/xfree86/dixmods/xkbVT.c @@ -45,7 +45,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "xf86.h" -_X_EXPORT int +int XkbDDXSwitchScreen(DeviceIntPtr dev,KeyCode key,XkbAction *act) { int scrnnum = XkbSAScreen(&act->screen); diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c index 370c6a289..4d17c9a8b 100644 --- a/hw/xfree86/dri/dri.c +++ b/hw/xfree86/dri/dri.c @@ -132,26 +132,26 @@ DRIOpenDRMCleanup(DRIEntPrivPtr pDRIEntPriv) } } -_X_EXPORT int +int DRIMasterFD(ScrnInfoPtr pScrn) { return DRI_ENT_PRIV(pScrn)->drmFD; } -_X_EXPORT void * +void * DRIMasterSareaPointer(ScrnInfoPtr pScrn) { return DRI_ENT_PRIV(pScrn)->pLSAREA; } -_X_EXPORT drm_handle_t +drm_handle_t DRIMasterSareaHandle(ScrnInfoPtr pScrn) { return DRI_ENT_PRIV(pScrn)->hLSAREA; } -_X_EXPORT Bool +Bool DRIOpenDRMMaster(ScrnInfoPtr pScrn, unsigned long sAreaSize, const char *busID, @@ -315,7 +315,7 @@ dri_crtc_notify(ScreenPtr pScreen) pDRIPriv->xf86_crtc_notify = xf86_wrap_crtc_notify(pScreen, dri_crtc_notify); } -_X_EXPORT Bool +Bool DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD) { DRIScreenPrivPtr pDRIPriv; @@ -594,7 +594,7 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD) return TRUE; } -_X_EXPORT Bool +Bool DRIFinishScreenInit(ScreenPtr pScreen) { DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen); @@ -640,7 +640,7 @@ DRIFinishScreenInit(ScreenPtr pScreen) return TRUE; } -_X_EXPORT void +void DRICloseScreen(ScreenPtr pScreen) { DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen); @@ -785,7 +785,7 @@ drmServerInfo DRIDRMServerInfo = { dri_drm_get_perms, }; -_X_EXPORT Bool +Bool DRIExtensionInit(void) { if (!DRIScreenPrivKey || DRIGeneration != serverGeneration) { @@ -800,7 +800,7 @@ DRIExtensionInit(void) return TRUE; } -_X_EXPORT void +void DRIReset(void) { /* @@ -812,7 +812,7 @@ DRIReset(void) */ } -_X_EXPORT Bool +Bool DRIQueryDirectRenderingCapable(ScreenPtr pScreen, Bool* isCapable) { DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen); @@ -825,7 +825,7 @@ DRIQueryDirectRenderingCapable(ScreenPtr pScreen, Bool* isCapable) return TRUE; } -_X_EXPORT Bool +Bool DRIOpenConnection(ScreenPtr pScreen, drm_handle_t * hSAREA, char **busIdString) { DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen); @@ -836,7 +836,7 @@ DRIOpenConnection(ScreenPtr pScreen, drm_handle_t * hSAREA, char **busIdString) return TRUE; } -_X_EXPORT Bool +Bool DRIAuthConnection(ScreenPtr pScreen, drm_magic_t magic) { DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen); @@ -845,13 +845,13 @@ DRIAuthConnection(ScreenPtr pScreen, drm_magic_t magic) return TRUE; } -_X_EXPORT Bool +Bool DRICloseConnection(ScreenPtr pScreen) { return TRUE; } -_X_EXPORT Bool +Bool DRIGetClientDriverName(ScreenPtr pScreen, int *ddxDriverMajorVersion, int *ddxDriverMinorVersion, @@ -880,7 +880,7 @@ DRIGetClientDriverName(ScreenPtr pScreen, DRICreateContextPriv returns a pointer to newly allocated DRIContextPriv, and returns the kernel drm_context_t in pHWContext. */ -_X_EXPORT DRIContextPrivPtr +DRIContextPrivPtr DRICreateContextPriv(ScreenPtr pScreen, drm_context_t * pHWContext, DRIContextFlags flags) @@ -894,7 +894,7 @@ DRICreateContextPriv(ScreenPtr pScreen, return DRICreateContextPrivFromHandle(pScreen, *pHWContext, flags); } -_X_EXPORT DRIContextPrivPtr +DRIContextPrivPtr DRICreateContextPrivFromHandle(ScreenPtr pScreen, drm_context_t hHWContext, DRIContextFlags flags) @@ -940,7 +940,7 @@ DRICreateContextPrivFromHandle(ScreenPtr pScreen, return pDRIContextPriv; } -_X_EXPORT Bool +Bool DRIDestroyContextPriv(DRIContextPrivPtr pDRIContextPriv) { DRIScreenPrivPtr pDRIPriv; @@ -1014,7 +1014,7 @@ DRIDestroyDummyContext(ScreenPtr pScreen, Bool hasCtxPriv) pDRIPriv->dummyCtxPriv = NULL; } -_X_EXPORT Bool +Bool DRICreateContext(ScreenPtr pScreen, VisualPtr visual, XID context, drm_context_t * pHWContext) { @@ -1050,7 +1050,7 @@ DRICreateContext(ScreenPtr pScreen, VisualPtr visual, return TRUE; } -_X_EXPORT Bool +Bool DRIDestroyContext(ScreenPtr pScreen, XID context) { FreeResourceByType(context, DRIContextPrivResType, FALSE); @@ -1059,7 +1059,7 @@ DRIDestroyContext(ScreenPtr pScreen, XID context) } /* DRIContextPrivDelete is called by the resource manager. */ -_X_EXPORT Bool +Bool DRIContextPrivDelete(pointer pResource, XID id) { DRIContextPrivPtr pDRIContextPriv = (DRIContextPrivPtr)pResource; @@ -1233,7 +1233,7 @@ DRIDecreaseNumberVisible(ScreenPtr pScreen) DRIDriverClipNotify(pScreen); } -_X_EXPORT Bool +Bool DRICreateDrawable(ScreenPtr pScreen, ClientPtr client, DrawablePtr pDrawable, drm_drawable_t * hHWDrawable) { @@ -1345,7 +1345,7 @@ DRIDestroyDrawableCB(pointer value, XID id, pointer data) return FALSE; } -_X_EXPORT Bool +Bool DRIDestroyDrawable(ScreenPtr pScreen, ClientPtr client, DrawablePtr pDrawable) { if (pDrawable->type == DRAWABLE_WINDOW) { @@ -1361,7 +1361,7 @@ DRIDestroyDrawable(ScreenPtr pScreen, ClientPtr client, DrawablePtr pDrawable) return TRUE; } -_X_EXPORT Bool +Bool DRIDrawablePrivDelete(pointer pResource, XID id) { WindowPtr pWin; @@ -1386,7 +1386,7 @@ DRIDrawablePrivDelete(pointer pResource, XID id) } } -_X_EXPORT Bool +Bool DRIGetDrawableInfo(ScreenPtr pScreen, DrawablePtr pDrawable, unsigned int* index, @@ -1558,7 +1558,7 @@ DRIGetDrawableInfo(ScreenPtr pScreen, return TRUE; } -_X_EXPORT Bool +Bool DRIGetDeviceInfo(ScreenPtr pScreen, drm_handle_t * hFrameBuffer, int* fbOrigin, @@ -1579,7 +1579,7 @@ DRIGetDeviceInfo(ScreenPtr pScreen, return TRUE; } -_X_EXPORT DRIInfoPtr +DRIInfoPtr DRICreateInfoRec(void) { DRIInfoPtr inforec = (DRIInfoPtr)xcalloc(1, sizeof(DRIInfoRec)); @@ -1605,7 +1605,7 @@ DRICreateInfoRec(void) return inforec; } -_X_EXPORT void +void DRIDestroyInfoRec(DRIInfoPtr DRIInfo) { if (DRIInfo->busIdString) xfree(DRIInfo->busIdString); @@ -1613,7 +1613,7 @@ DRIDestroyInfoRec(DRIInfoPtr DRIInfo) } -_X_EXPORT void +void DRIWakeupHandler(pointer wakeupData, int result, pointer pReadmask) { int i; @@ -1629,7 +1629,7 @@ DRIWakeupHandler(pointer wakeupData, int result, pointer pReadmask) } } -_X_EXPORT void +void DRIBlockHandler(pointer blockData, OSTimePtr pTimeout, pointer pReadmask) { int i; @@ -1645,7 +1645,7 @@ DRIBlockHandler(pointer blockData, OSTimePtr pTimeout, pointer pReadmask) } } -_X_EXPORT void +void DRIDoWakeupHandler(int screenNum, pointer wakeupData, unsigned long result, pointer pReadmask) { @@ -1664,7 +1664,7 @@ DRIDoWakeupHandler(int screenNum, pointer wakeupData, } } -_X_EXPORT void +void DRIDoBlockHandler(int screenNum, pointer blockData, pointer pTimeout, pointer pReadmask) { @@ -1688,7 +1688,7 @@ DRIDoBlockHandler(int screenNum, pointer blockData, DRIUnlock(pScreen); } -_X_EXPORT void +void DRISwapContext(int drmFD, void *oldctx, void *newctx) { DRIContextPrivPtr oldContext = (DRIContextPrivPtr)oldctx; @@ -1835,13 +1835,13 @@ DRISwapContext(int drmFD, void *oldctx, void *newctx) newContextStore); } -_X_EXPORT void* +void* DRIGetContextStore(DRIContextPrivPtr context) { return((void *)context->pContextStore); } -_X_EXPORT void +void DRIWindowExposures(WindowPtr pWin, RegionPtr prgn, RegionPtr bsreg) { ScreenPtr pScreen = pWin->drawable.pScreen; @@ -1891,7 +1891,7 @@ DRITreeTraversal(WindowPtr pWin, pointer data) return WT_WALKCHILDREN; } -_X_EXPORT Bool +Bool DRIDestroyWindow(WindowPtr pWin) { ScreenPtr pScreen = pWin->drawable.pScreen; @@ -1916,7 +1916,7 @@ DRIDestroyWindow(WindowPtr pWin) return retval; } -_X_EXPORT void +void DRICopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc) { ScreenPtr pScreen = pWin->drawable.pScreen; @@ -2055,7 +2055,7 @@ DRILockTree(ScreenPtr pScreen) } } -_X_EXPORT int +int DRIValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind) { ScreenPtr pScreen = pParent->drawable.pScreen; @@ -2081,7 +2081,7 @@ DRIValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind) return returnValue; } -_X_EXPORT void +void DRIPostValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind) { ScreenPtr pScreen; @@ -2107,7 +2107,7 @@ DRIPostValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind) } } -_X_EXPORT void +void DRIClipNotify(WindowPtr pWin, int dx, int dy) { ScreenPtr pScreen = pWin->drawable.pScreen; @@ -2156,7 +2156,7 @@ DRIClipNotify(WindowPtr pWin, int dx, int dy) } } -_X_EXPORT CARD32 +CARD32 DRIGetDrawableIndex(WindowPtr pWin) { ScreenPtr pScreen = pWin->drawable.pScreen; @@ -2174,7 +2174,7 @@ DRIGetDrawableIndex(WindowPtr pWin) return index; } -_X_EXPORT unsigned int +unsigned int DRIGetDrawableStamp(ScreenPtr pScreen, CARD32 drawable_index) { DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen); @@ -2182,7 +2182,7 @@ DRIGetDrawableStamp(ScreenPtr pScreen, CARD32 drawable_index) } -_X_EXPORT void +void DRIPrintDrawableLock(ScreenPtr pScreen, char *msg) { DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen); @@ -2190,7 +2190,7 @@ DRIPrintDrawableLock(ScreenPtr pScreen, char *msg) ErrorF("%s: %d\n", msg, pDRIPriv->pSAREA->drawable_lock.lock); } -_X_EXPORT void +void DRILock(ScreenPtr pScreen, int flags) { DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen); @@ -2211,7 +2211,7 @@ DRILock(ScreenPtr pScreen, int flags) (*pDRIPriv->pLockRefCount)++; } -_X_EXPORT void +void DRIUnlock(ScreenPtr pScreen) { DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen); @@ -2236,7 +2236,7 @@ DRIUnlock(ScreenPtr pScreen) DRM_UNLOCK(pDRIPriv->drmFD, pDRIPriv->pLSAREA, pDRIPriv->myContext); } -_X_EXPORT void * +void * DRIGetSAREAPrivate(ScreenPtr pScreen) { DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen); @@ -2245,7 +2245,7 @@ DRIGetSAREAPrivate(ScreenPtr pScreen) return (void *)(((char*)pDRIPriv->pSAREA)+sizeof(XF86DRISAREARec)); } -_X_EXPORT drm_context_t +drm_context_t DRIGetContext(ScreenPtr pScreen) { DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen); @@ -2254,7 +2254,7 @@ DRIGetContext(ScreenPtr pScreen) return pDRIPriv->myContext; } -_X_EXPORT void +void DRIGetTexOffsetFuncs(ScreenPtr pScreen, DRITexOffsetStartProcPtr *texOffsetStartFunc, DRITexOffsetFinishProcPtr *texOffsetFinishFunc) @@ -2271,14 +2271,14 @@ DRIGetTexOffsetFuncs(ScreenPtr pScreen, * call the lowerlevel functions, and choose whether they will be * called at every level of recursion (eg in validatetree). */ -_X_EXPORT DRIWrappedFuncsRec * +DRIWrappedFuncsRec * DRIGetWrappedFuncs(ScreenPtr pScreen) { return &(DRI_SCREEN_PRIV(pScreen)->wrap); } /* note that this returns the library version, not the protocol version */ -_X_EXPORT void +void DRIQueryVersion(int *majorVersion, int *minorVersion, int *patchVersion) @@ -2297,7 +2297,7 @@ _DRIAdjustFrame(ScrnInfoPtr pScrn, DRIScreenPrivPtr pDRIPriv, int x, int y) pDRIPriv->pSAREA->frame.height = pScrn->frameY1 - y + 1; } -_X_EXPORT void +void DRIAdjustFrame(int scrnIndex, int x, int y, int flags) { ScreenPtr pScreen = screenInfo.screens[scrnIndex]; @@ -2349,7 +2349,7 @@ DRIAdjustFrame(int scrnIndex, int x, int y, int flags) * REGION_VALIDATE on it, or better yet, save a copy first. */ -_X_EXPORT void +void DRIMoveBuffersHelper( ScreenPtr pScreen, int dx, @@ -2415,7 +2415,7 @@ DRIMoveBuffersHelper( } -_X_EXPORT char * +char * DRICreatePCIBusID(const struct pci_device * dev) { char *busID; @@ -2479,7 +2479,7 @@ static void drmSIGIOHandler(int interrupt, void *closure) } -_X_EXPORT int drmInstallSIGIOHandler(int fd, void (*f)(int, void *, void *)) +int drmInstallSIGIOHandler(int fd, void (*f)(int, void *, void *)) { drmHashEntry *entry; @@ -2489,7 +2489,7 @@ _X_EXPORT int drmInstallSIGIOHandler(int fd, void (*f)(int, void *, void *)) return xf86InstallSIGIOHandler(fd, drmSIGIOHandler, 0); } -_X_EXPORT int drmRemoveSIGIOHandler(int fd) +int drmRemoveSIGIOHandler(int fd) { drmHashEntry *entry = drmGetEntry(fd); diff --git a/hw/xfree86/dri/dri.h b/hw/xfree86/dri/dri.h index 516da97a5..f690e234b 100644 --- a/hw/xfree86/dri/dri.h +++ b/hw/xfree86/dri/dri.h @@ -198,59 +198,59 @@ typedef struct { } DRIInfoRec, *DRIInfoPtr; -extern Bool DRIOpenDRMMaster(ScrnInfoPtr pScrn, unsigned long sAreaSize, +extern _X_EXPORT Bool DRIOpenDRMMaster(ScrnInfoPtr pScrn, unsigned long sAreaSize, const char *busID, const char *drmDriverName); -extern Bool DRIScreenInit(ScreenPtr pScreen, +extern _X_EXPORT Bool DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD); -extern void DRICloseScreen(ScreenPtr pScreen); +extern _X_EXPORT void DRICloseScreen(ScreenPtr pScreen); -extern Bool DRIExtensionInit(void); +extern _X_EXPORT Bool DRIExtensionInit(void); -extern void DRIReset(void); +extern _X_EXPORT void DRIReset(void); -extern Bool DRIQueryDirectRenderingCapable(ScreenPtr pScreen, +extern _X_EXPORT Bool DRIQueryDirectRenderingCapable(ScreenPtr pScreen, Bool *isCapable); -extern Bool DRIOpenConnection(ScreenPtr pScreen, +extern _X_EXPORT Bool DRIOpenConnection(ScreenPtr pScreen, drm_handle_t * hSAREA, char **busIdString); -extern Bool DRIAuthConnection(ScreenPtr pScreen, drm_magic_t magic); +extern _X_EXPORT Bool DRIAuthConnection(ScreenPtr pScreen, drm_magic_t magic); -extern Bool DRICloseConnection(ScreenPtr pScreen); +extern _X_EXPORT Bool DRICloseConnection(ScreenPtr pScreen); -extern Bool DRIGetClientDriverName(ScreenPtr pScreen, +extern _X_EXPORT Bool DRIGetClientDriverName(ScreenPtr pScreen, int* ddxDriverMajorVersion, int* ddxDriverMinorVersion, int* ddxDriverPatchVersion, char** clientDriverName); -extern Bool DRICreateContext(ScreenPtr pScreen, +extern _X_EXPORT Bool DRICreateContext(ScreenPtr pScreen, VisualPtr visual, XID context, drm_context_t * pHWContext); -extern Bool DRIDestroyContext(ScreenPtr pScreen, XID context); +extern _X_EXPORT Bool DRIDestroyContext(ScreenPtr pScreen, XID context); -extern Bool DRIContextPrivDelete(pointer pResource, XID id); +extern _X_EXPORT Bool DRIContextPrivDelete(pointer pResource, XID id); -extern Bool DRICreateDrawable(ScreenPtr pScreen, +extern _X_EXPORT Bool DRICreateDrawable(ScreenPtr pScreen, ClientPtr client, DrawablePtr pDrawable, drm_drawable_t * hHWDrawable); -extern Bool DRIDestroyDrawable(ScreenPtr pScreen, +extern _X_EXPORT Bool DRIDestroyDrawable(ScreenPtr pScreen, ClientPtr client, DrawablePtr pDrawable); -extern Bool DRIDrawablePrivDelete(pointer pResource, +extern _X_EXPORT Bool DRIDrawablePrivDelete(pointer pResource, XID id); -extern Bool DRIGetDrawableInfo(ScreenPtr pScreen, +extern _X_EXPORT Bool DRIGetDrawableInfo(ScreenPtr pScreen, DrawablePtr pDrawable, unsigned int* indx, unsigned int* stamp, @@ -265,7 +265,7 @@ extern Bool DRIGetDrawableInfo(ScreenPtr pScreen, int* numBackClipRects, drm_clip_rect_t ** pBackClipRects); -extern Bool DRIGetDeviceInfo(ScreenPtr pScreen, +extern _X_EXPORT Bool DRIGetDeviceInfo(ScreenPtr pScreen, drm_handle_t * hFrameBuffer, int* fbOrigin, int* fbSize, @@ -273,109 +273,109 @@ extern Bool DRIGetDeviceInfo(ScreenPtr pScreen, int* devPrivateSize, void** pDevPrivate); -extern DRIInfoPtr DRICreateInfoRec(void); +extern _X_EXPORT DRIInfoPtr DRICreateInfoRec(void); -extern void DRIDestroyInfoRec(DRIInfoPtr DRIInfo); +extern _X_EXPORT void DRIDestroyInfoRec(DRIInfoPtr DRIInfo); -extern Bool DRIFinishScreenInit(ScreenPtr pScreen); +extern _X_EXPORT Bool DRIFinishScreenInit(ScreenPtr pScreen); -extern void DRIWakeupHandler(pointer wakeupData, +extern _X_EXPORT void DRIWakeupHandler(pointer wakeupData, int result, pointer pReadmask); -extern void DRIBlockHandler(pointer blockData, +extern _X_EXPORT void DRIBlockHandler(pointer blockData, OSTimePtr pTimeout, pointer pReadmask); -extern void DRIDoWakeupHandler(int screenNum, +extern _X_EXPORT void DRIDoWakeupHandler(int screenNum, pointer wakeupData, unsigned long result, pointer pReadmask); -extern void DRIDoBlockHandler(int screenNum, +extern _X_EXPORT void DRIDoBlockHandler(int screenNum, pointer blockData, pointer pTimeout, pointer pReadmask); -extern void DRISwapContext(int drmFD, +extern _X_EXPORT void DRISwapContext(int drmFD, void *oldctx, void *newctx); -extern void *DRIGetContextStore(DRIContextPrivPtr context); +extern _X_EXPORT void *DRIGetContextStore(DRIContextPrivPtr context); -extern void DRIWindowExposures(WindowPtr pWin, +extern _X_EXPORT void DRIWindowExposures(WindowPtr pWin, RegionPtr prgn, RegionPtr bsreg); -extern Bool DRIDestroyWindow(WindowPtr pWin); +extern _X_EXPORT Bool DRIDestroyWindow(WindowPtr pWin); -extern void DRICopyWindow(WindowPtr pWin, +extern _X_EXPORT void DRICopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc); -extern int DRIValidateTree(WindowPtr pParent, +extern _X_EXPORT int DRIValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind); -extern void DRIPostValidateTree(WindowPtr pParent, +extern _X_EXPORT void DRIPostValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind); -extern void DRIClipNotify(WindowPtr pWin, +extern _X_EXPORT void DRIClipNotify(WindowPtr pWin, int dx, int dy); -extern CARD32 DRIGetDrawableIndex(WindowPtr pWin); +extern _X_EXPORT CARD32 DRIGetDrawableIndex(WindowPtr pWin); -extern void DRIPrintDrawableLock(ScreenPtr pScreen, char *msg); +extern _X_EXPORT void DRIPrintDrawableLock(ScreenPtr pScreen, char *msg); -extern void DRILock(ScreenPtr pScreen, int flags); +extern _X_EXPORT void DRILock(ScreenPtr pScreen, int flags); -extern void DRIUnlock(ScreenPtr pScreen); +extern _X_EXPORT void DRIUnlock(ScreenPtr pScreen); -extern DRIWrappedFuncsRec *DRIGetWrappedFuncs(ScreenPtr pScreen); +extern _X_EXPORT DRIWrappedFuncsRec *DRIGetWrappedFuncs(ScreenPtr pScreen); -extern void *DRIGetSAREAPrivate(ScreenPtr pScreen); +extern _X_EXPORT void *DRIGetSAREAPrivate(ScreenPtr pScreen); -extern unsigned int DRIGetDrawableStamp(ScreenPtr pScreen, +extern _X_EXPORT unsigned int DRIGetDrawableStamp(ScreenPtr pScreen, CARD32 drawable_index); -extern DRIContextPrivPtr DRICreateContextPriv(ScreenPtr pScreen, +extern _X_EXPORT DRIContextPrivPtr DRICreateContextPriv(ScreenPtr pScreen, drm_context_t * pHWContext, DRIContextFlags flags); -extern DRIContextPrivPtr DRICreateContextPrivFromHandle(ScreenPtr pScreen, +extern _X_EXPORT DRIContextPrivPtr DRICreateContextPrivFromHandle(ScreenPtr pScreen, drm_context_t hHWContext, DRIContextFlags flags); -extern Bool DRIDestroyContextPriv(DRIContextPrivPtr pDRIContextPriv); +extern _X_EXPORT Bool DRIDestroyContextPriv(DRIContextPrivPtr pDRIContextPriv); -extern drm_context_t DRIGetContext(ScreenPtr pScreen); +extern _X_EXPORT drm_context_t DRIGetContext(ScreenPtr pScreen); -extern void DRIQueryVersion(int *majorVersion, +extern _X_EXPORT void DRIQueryVersion(int *majorVersion, int *minorVersion, int *patchVersion); -extern void DRIAdjustFrame(int scrnIndex, int x, int y, int flags); +extern _X_EXPORT void DRIAdjustFrame(int scrnIndex, int x, int y, int flags); -extern void DRIMoveBuffersHelper(ScreenPtr pScreen, +extern _X_EXPORT void DRIMoveBuffersHelper(ScreenPtr pScreen, int dx, int dy, int *xdir, int *ydir, RegionPtr reg); -extern char *DRICreatePCIBusID(const struct pci_device *PciInfo); +extern _X_EXPORT char *DRICreatePCIBusID(const struct pci_device *PciInfo); -extern int drmInstallSIGIOHandler(int fd, void (*f)(int, void *, void *)); -extern int drmRemoveSIGIOHandler(int fd); -extern int DRIMasterFD(ScrnInfoPtr pScrn); +extern _X_EXPORT int drmInstallSIGIOHandler(int fd, void (*f)(int, void *, void *)); +extern _X_EXPORT int drmRemoveSIGIOHandler(int fd); +extern _X_EXPORT int DRIMasterFD(ScrnInfoPtr pScrn); -extern void *DRIMasterSareaPointer(ScrnInfoPtr pScrn); +extern _X_EXPORT void *DRIMasterSareaPointer(ScrnInfoPtr pScrn); -extern drm_handle_t DRIMasterSareaHandle(ScrnInfoPtr pScrn); +extern _X_EXPORT drm_handle_t DRIMasterSareaHandle(ScrnInfoPtr pScrn); -extern void DRIGetTexOffsetFuncs(ScreenPtr pScreen, +extern _X_EXPORT void DRIGetTexOffsetFuncs(ScreenPtr pScreen, DRITexOffsetStartProcPtr *texOffsetStartFunc, DRITexOffsetFinishProcPtr *texOffsetFinishFunc); diff --git a/hw/xfree86/dri2/dri2.c b/hw/xfree86/dri2/dri2.c index de94daa1e..0f2e24b3f 100644 --- a/hw/xfree86/dri2/dri2.c +++ b/hw/xfree86/dri2/dri2.c @@ -94,7 +94,7 @@ DRI2GetDrawable(DrawablePtr pDraw) } } -_X_EXPORT int +int DRI2CreateDrawable(DrawablePtr pDraw) { WindowPtr pWin; @@ -132,7 +132,7 @@ DRI2CreateDrawable(DrawablePtr pDraw) return Success; } -_X_EXPORT DRI2BufferPtr +DRI2BufferPtr DRI2GetBuffers(DrawablePtr pDraw, int *width, int *height, unsigned int *attachments, int count, int *out_count) { @@ -158,7 +158,7 @@ DRI2GetBuffers(DrawablePtr pDraw, int *width, int *height, return pPriv->buffers; } -_X_EXPORT int +int DRI2CopyRegion(DrawablePtr pDraw, RegionPtr pRegion, unsigned int dest, unsigned int src) { @@ -188,7 +188,7 @@ DRI2CopyRegion(DrawablePtr pDraw, RegionPtr pRegion, return Success; } -_X_EXPORT void +void DRI2DestroyDrawable(DrawablePtr pDraw) { DRI2ScreenPtr ds = DRI2GetScreen(pDraw->pScreen); @@ -219,7 +219,7 @@ DRI2DestroyDrawable(DrawablePtr pDraw) } } -_X_EXPORT Bool +Bool DRI2Connect(ScreenPtr pScreen, unsigned int driverType, int *fd, const char **driverName, const char **deviceName) { @@ -238,7 +238,7 @@ DRI2Connect(ScreenPtr pScreen, unsigned int driverType, int *fd, return TRUE; } -_X_EXPORT Bool +Bool DRI2Authenticate(ScreenPtr pScreen, drm_magic_t magic) { DRI2ScreenPtr ds = DRI2GetScreen(pScreen); @@ -249,7 +249,7 @@ DRI2Authenticate(ScreenPtr pScreen, drm_magic_t magic) return TRUE; } -_X_EXPORT Bool +Bool DRI2ScreenInit(ScreenPtr pScreen, DRI2InfoPtr info) { DRI2ScreenPtr ds; @@ -272,7 +272,7 @@ DRI2ScreenInit(ScreenPtr pScreen, DRI2InfoPtr info) return TRUE; } -_X_EXPORT void +void DRI2CloseScreen(ScreenPtr pScreen) { DRI2ScreenPtr ds = DRI2GetScreen(pScreen); diff --git a/hw/xfree86/dri2/dri2.h b/hw/xfree86/dri2/dri2.h index 5e7fd65d5..847e57c68 100644 --- a/hw/xfree86/dri2/dri2.h +++ b/hw/xfree86/dri2/dri2.h @@ -71,31 +71,31 @@ typedef struct { } DRI2InfoRec, *DRI2InfoPtr; -Bool DRI2ScreenInit(ScreenPtr pScreen, +extern _X_EXPORT Bool DRI2ScreenInit(ScreenPtr pScreen, DRI2InfoPtr info); -void DRI2CloseScreen(ScreenPtr pScreen); +extern _X_EXPORT void DRI2CloseScreen(ScreenPtr pScreen); -Bool DRI2Connect(ScreenPtr pScreen, +extern _X_EXPORT Bool DRI2Connect(ScreenPtr pScreen, unsigned int driverType, int *fd, const char **driverName, const char **deviceName); -Bool DRI2Authenticate(ScreenPtr pScreen, drm_magic_t magic); +extern _X_EXPORT Bool DRI2Authenticate(ScreenPtr pScreen, drm_magic_t magic); -int DRI2CreateDrawable(DrawablePtr pDraw); +extern _X_EXPORT int DRI2CreateDrawable(DrawablePtr pDraw); -void DRI2DestroyDrawable(DrawablePtr pDraw); +extern _X_EXPORT void DRI2DestroyDrawable(DrawablePtr pDraw); -DRI2BufferPtr DRI2GetBuffers(DrawablePtr pDraw, +extern _X_EXPORT DRI2BufferPtr DRI2GetBuffers(DrawablePtr pDraw, int *width, int *height, unsigned int *attachments, int count, int *out_count); -int DRI2CopyRegion(DrawablePtr pDraw, +extern _X_EXPORT int DRI2CopyRegion(DrawablePtr pDraw, RegionPtr pRegion, unsigned int dest, unsigned int src); diff --git a/hw/xfree86/dummylib/dixprivates.c b/hw/xfree86/dummylib/dixprivates.c index 40c173a20..0c1376dfa 100644 --- a/hw/xfree86/dummylib/dixprivates.c +++ b/hw/xfree86/dummylib/dixprivates.c @@ -11,7 +11,7 @@ * Utility functions required by libxf86_os. */ -_X_EXPORT pointer * +pointer * dixAllocatePrivate(PrivateRec **privates, const DevPrivateKey key) { return NULL; /* not used */ diff --git a/hw/xfree86/dummylib/fatalerror.c b/hw/xfree86/dummylib/fatalerror.c index e147c7303..bbeda37df 100644 --- a/hw/xfree86/dummylib/fatalerror.c +++ b/hw/xfree86/dummylib/fatalerror.c @@ -11,7 +11,7 @@ * Utility functions required by libxf86_os. */ -_X_EXPORT void +void FatalError(const char *f, ...) { va_list args; diff --git a/hw/xfree86/dummylib/logvwrite.c b/hw/xfree86/dummylib/logvwrite.c index 26868e7c8..aed1ad247 100644 --- a/hw/xfree86/dummylib/logvwrite.c +++ b/hw/xfree86/dummylib/logvwrite.c @@ -12,7 +12,7 @@ * Utility functions required by libxf86_os. */ -_X_EXPORT void +void LogVWrite(int verb, const char *format, va_list ap) { if (xf86Verbose >= verb) diff --git a/hw/xfree86/dummylib/verrorf.c b/hw/xfree86/dummylib/verrorf.c index c75d1bc6d..886366ba2 100644 --- a/hw/xfree86/dummylib/verrorf.c +++ b/hw/xfree86/dummylib/verrorf.c @@ -11,7 +11,7 @@ * Utility functions required by libxf86_os. */ -_X_EXPORT void +void VErrorF(const char *f, va_list args) { vfprintf(stderr, f, args); diff --git a/hw/xfree86/dummylib/xalloc.c b/hw/xfree86/dummylib/xalloc.c index 52183eaee..77c168f7e 100644 --- a/hw/xfree86/dummylib/xalloc.c +++ b/hw/xfree86/dummylib/xalloc.c @@ -12,7 +12,7 @@ * Utility functions required by libxf86_os. */ -_X_EXPORT pointer +pointer Xalloc(unsigned long n) { if (!n) @@ -20,7 +20,7 @@ Xalloc(unsigned long n) return malloc(n); } -_X_EXPORT pointer +pointer Xrealloc(pointer p, unsigned long n) { if (!n) @@ -28,7 +28,7 @@ Xrealloc(pointer p, unsigned long n) return realloc(p, n); } -_X_EXPORT pointer +pointer Xcalloc(unsigned long n) { pointer r; @@ -38,7 +38,7 @@ Xcalloc(unsigned long n) return r; } -_X_EXPORT pointer +pointer XNFalloc(unsigned long n) { pointer r; @@ -50,7 +50,7 @@ XNFalloc(unsigned long n) } -_X_EXPORT pointer +pointer XNFrealloc(pointer p, unsigned long n) { pointer r; @@ -62,7 +62,7 @@ XNFrealloc(pointer p, unsigned long n) } -_X_EXPORT pointer +pointer XNFcalloc(unsigned long n) { pointer r; @@ -74,13 +74,13 @@ XNFcalloc(unsigned long n) } -_X_EXPORT void +void Xfree(pointer p) { free(p); } -_X_EXPORT char * +char * Xstrdup(const char *s) { char *sd; @@ -94,7 +94,7 @@ Xstrdup(const char *s) return sd; } -_X_EXPORT char * +char * XNFstrdup(const char *s) { char *sd; diff --git a/hw/xfree86/dummylib/xf86addrestolist.c b/hw/xfree86/dummylib/xf86addrestolist.c index 32789ecbb..d8faaacda 100644 --- a/hw/xfree86/dummylib/xf86addrestolist.c +++ b/hw/xfree86/dummylib/xf86addrestolist.c @@ -5,19 +5,19 @@ #include "xf86.h" -_X_EXPORT resPtr +resPtr xf86AddResToList(resPtr rlist, resRange *Range, int entityIndex) { return rlist; } -_X_EXPORT void +void xf86FreeResList(resPtr rlist) { return; } -_X_EXPORT resPtr +resPtr xf86DupResList(const resPtr rlist) { return rlist; diff --git a/hw/xfree86/dummylib/xf86allocscripi.c b/hw/xfree86/dummylib/xf86allocscripi.c index 926884884..d747bd54b 100644 --- a/hw/xfree86/dummylib/xf86allocscripi.c +++ b/hw/xfree86/dummylib/xf86allocscripi.c @@ -11,7 +11,7 @@ * Utility functions required by libxf86_os. */ -_X_EXPORT int +int xf86AllocateScrnInfoPrivateIndex() { return -1; diff --git a/hw/xfree86/dummylib/xf86drvmsg.c b/hw/xfree86/dummylib/xf86drvmsg.c index b77948d0c..f0644ecad 100644 --- a/hw/xfree86/dummylib/xf86drvmsg.c +++ b/hw/xfree86/dummylib/xf86drvmsg.c @@ -12,7 +12,7 @@ * Utility functions required by libxf86_os. */ -_X_EXPORT void +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 5ecd99e4d..eb268852b 100644 --- a/hw/xfree86/dummylib/xf86drvmsgverb.c +++ b/hw/xfree86/dummylib/xf86drvmsgverb.c @@ -12,7 +12,7 @@ * Utility functions required by libxf86_os. */ -_X_EXPORT void +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 9834c613b..026000454 100644 --- a/hw/xfree86/dummylib/xf86errorf.c +++ b/hw/xfree86/dummylib/xf86errorf.c @@ -12,7 +12,7 @@ * Utility functions required by libxf86_os. */ -_X_EXPORT void +void xf86ErrorF(const char *format, ...) { va_list ap; @@ -22,7 +22,7 @@ xf86ErrorF(const char *format, ...) va_end(ap); } -_X_EXPORT void +void ErrorF(const char *format, ...) { va_list ap; diff --git a/hw/xfree86/dummylib/xf86errorfverb.c b/hw/xfree86/dummylib/xf86errorfverb.c index 94f030719..b8944559c 100644 --- a/hw/xfree86/dummylib/xf86errorfverb.c +++ b/hw/xfree86/dummylib/xf86errorfverb.c @@ -12,7 +12,7 @@ * Utility functions required by libxf86_os. */ -_X_EXPORT void +void xf86ErrorFVerb(int verb, const char *format, ...) { va_list ap; diff --git a/hw/xfree86/dummylib/xf86getverb.c b/hw/xfree86/dummylib/xf86getverb.c index a489e9ca3..f3b2f1b35 100644 --- a/hw/xfree86/dummylib/xf86getverb.c +++ b/hw/xfree86/dummylib/xf86getverb.c @@ -11,7 +11,7 @@ * Utility functions required by libxf86_os. */ -_X_EXPORT int +int xf86GetVerbosity() { return xf86Verbose; diff --git a/hw/xfree86/dummylib/xf86info.c b/hw/xfree86/dummylib/xf86info.c index 6becb0626..7db6817c3 100644 --- a/hw/xfree86/dummylib/xf86info.c +++ b/hw/xfree86/dummylib/xf86info.c @@ -8,5 +8,5 @@ #include "xf86Priv.h" /* Dummy variables */ -_X_EXPORT xf86InfoRec xf86Info; +xf86InfoRec xf86Info; diff --git a/hw/xfree86/dummylib/xf86msg.c b/hw/xfree86/dummylib/xf86msg.c index ea5bb3560..8378d9074 100644 --- a/hw/xfree86/dummylib/xf86msg.c +++ b/hw/xfree86/dummylib/xf86msg.c @@ -12,7 +12,7 @@ * Utility functions required by libxf86_os. */ -_X_EXPORT void +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 4467af9d5..f3366eea3 100644 --- a/hw/xfree86/dummylib/xf86msgverb.c +++ b/hw/xfree86/dummylib/xf86msgverb.c @@ -12,7 +12,7 @@ * Utility functions required by libxf86_os. */ -_X_EXPORT void +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 1b7bca9c6..44b0b496d 100644 --- a/hw/xfree86/dummylib/xf86opt.c +++ b/hw/xfree86/dummylib/xf86opt.c @@ -12,12 +12,12 @@ * Utility functions required by libxf86_os. */ -_X_EXPORT void +void xf86ProcessOptions(int i, pointer p, OptionInfoPtr o) { } -_X_EXPORT Bool +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 6288c60dc..558553383 100644 --- a/hw/xfree86/dummylib/xf86screens.c +++ b/hw/xfree86/dummylib/xf86screens.c @@ -8,5 +8,5 @@ #include "xf86Priv.h" /* Dummy variables */ -_X_EXPORT ScrnInfoPtr *xf86Screens = NULL; +ScrnInfoPtr *xf86Screens = NULL; diff --git a/hw/xfree86/dummylib/xf86servisinit.c b/hw/xfree86/dummylib/xf86servisinit.c index 077cab2fc..c356a2b88 100644 --- a/hw/xfree86/dummylib/xf86servisinit.c +++ b/hw/xfree86/dummylib/xf86servisinit.c @@ -11,7 +11,7 @@ * Utility functions required by libxf86_os. */ -_X_EXPORT Bool +Bool xf86ServerIsInitialising() { return FALSE; diff --git a/hw/xfree86/dummylib/xf86verbose.c b/hw/xfree86/dummylib/xf86verbose.c index 324d891c7..c4a45d68e 100644 --- a/hw/xfree86/dummylib/xf86verbose.c +++ b/hw/xfree86/dummylib/xf86verbose.c @@ -8,5 +8,5 @@ #include "xf86Priv.h" /* Dummy variables */ -_X_EXPORT int xf86Verbose = 0; +int xf86Verbose = 0; diff --git a/hw/xfree86/fbdevhw/fbdevhw.c b/hw/xfree86/fbdevhw/fbdevhw.c index ecb63b858..5269277ef 100644 --- a/hw/xfree86/fbdevhw/fbdevhw.c +++ b/hw/xfree86/fbdevhw/fbdevhw.c @@ -126,7 +126,7 @@ typedef struct { } fbdevHWRec, *fbdevHWPtr; -_X_EXPORT Bool +Bool fbdevHWGetRec(ScrnInfoPtr pScrn) { fbdevHWPtr fPtr; @@ -141,7 +141,7 @@ fbdevHWGetRec(ScrnInfoPtr pScrn) return TRUE; } -_X_EXPORT void +void fbdevHWFreeRec(ScrnInfoPtr pScrn) { if (fbdevHWPrivateIndex < 0) @@ -431,7 +431,7 @@ fbdev_open(int scrnIndex, char *dev, char** namep) /* -------------------------------------------------------------------- */ -_X_EXPORT Bool +Bool fbdevHWProbe(struct pci_device * pPci, char *device,char **namep) { int fd; @@ -447,7 +447,7 @@ fbdevHWProbe(struct pci_device * pPci, char *device,char **namep) return TRUE; } -_X_EXPORT Bool +Bool fbdevHWInit(ScrnInfoPtr pScrn, struct pci_device * pPci, char *device) { fbdevHWPtr fPtr; @@ -495,14 +495,14 @@ fbdevHWInit(ScrnInfoPtr pScrn, struct pci_device * pPci, char *device) return TRUE; } -_X_EXPORT char* +char* fbdevHWGetName(ScrnInfoPtr pScrn) { fbdevHWPtr fPtr = FBDEVHWPTR(pScrn); return fPtr->fix.id; } -_X_EXPORT int +int fbdevHWGetDepth(ScrnInfoPtr pScrn, int *fbbpp) { fbdevHWPtr fPtr = FBDEVHWPTR(pScrn); @@ -518,7 +518,7 @@ fbdevHWGetDepth(ScrnInfoPtr pScrn, int *fbbpp) return fPtr->var.bits_per_pixel; } -_X_EXPORT int +int fbdevHWGetLineLength(ScrnInfoPtr pScrn) { fbdevHWPtr fPtr = FBDEVHWPTR(pScrn); @@ -529,14 +529,14 @@ fbdevHWGetLineLength(ScrnInfoPtr pScrn) return fPtr->var.xres_virtual*fPtr->var.bits_per_pixel/8; } -_X_EXPORT int +int fbdevHWGetType(ScrnInfoPtr pScrn) { fbdevHWPtr fPtr = FBDEVHWPTR(pScrn); return fPtr->fix.type; } -_X_EXPORT int +int fbdevHWGetVidmem(ScrnInfoPtr pScrn) { fbdevHWPtr fPtr = FBDEVHWPTR(pScrn); @@ -587,7 +587,7 @@ fbdevHWSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode, Bool check) return TRUE; } -_X_EXPORT void +void fbdevHWSetVideoModes(ScrnInfoPtr pScrn) { char **modename; @@ -645,7 +645,7 @@ fbdevHWGetBuildinMode(ScrnInfoPtr pScrn) return &fPtr->buildin; } -_X_EXPORT void +void fbdevHWUseBuildinMode(ScrnInfoPtr pScrn) { fbdevHWPtr fPtr = FBDEVHWPTR(pScrn); @@ -671,7 +671,7 @@ calculateFbmem_len(fbdevHWPtr fPtr) } -_X_EXPORT void* +void* fbdevHWMapVidmem(ScrnInfoPtr pScrn) { fbdevHWPtr fPtr = FBDEVHWPTR(pScrn); @@ -697,7 +697,7 @@ fbdevHWMapVidmem(ScrnInfoPtr pScrn) return fPtr->fbmem; } -_X_EXPORT int +int fbdevHWLinearOffset(ScrnInfoPtr pScrn) { fbdevHWPtr fPtr = FBDEVHWPTR(pScrn); @@ -706,7 +706,7 @@ fbdevHWLinearOffset(ScrnInfoPtr pScrn) return fPtr->fboff; } -_X_EXPORT Bool +Bool fbdevHWUnmapVidmem(ScrnInfoPtr pScrn) { fbdevHWPtr fPtr = FBDEVHWPTR(pScrn); @@ -721,7 +721,7 @@ fbdevHWUnmapVidmem(ScrnInfoPtr pScrn) return TRUE; } -_X_EXPORT void* +void* fbdevHWMapMMIO(ScrnInfoPtr pScrn) { unsigned int mmio_off; @@ -754,7 +754,7 @@ fbdevHWMapMMIO(ScrnInfoPtr pScrn) return fPtr->mmio; } -_X_EXPORT Bool +Bool fbdevHWUnmapMMIO(ScrnInfoPtr pScrn) { fbdevHWPtr fPtr = FBDEVHWPTR(pScrn); @@ -772,7 +772,7 @@ fbdevHWUnmapMMIO(ScrnInfoPtr pScrn) /* -------------------------------------------------------------------- */ -_X_EXPORT Bool +Bool fbdevHWModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode) { fbdevHWPtr fPtr = FBDEVHWPTR(pScrn); @@ -815,7 +815,7 @@ fbdevHWModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode) /* video mode save/restore */ /* TODO: colormap */ -_X_EXPORT void +void fbdevHWSave(ScrnInfoPtr pScrn) { fbdevHWPtr fPtr = FBDEVHWPTR(pScrn); @@ -826,7 +826,7 @@ fbdevHWSave(ScrnInfoPtr pScrn) "FBIOGET_VSCREENINFO: %s\n", strerror(errno)); } -_X_EXPORT void +void fbdevHWRestore(ScrnInfoPtr pScrn) { fbdevHWPtr fPtr = FBDEVHWPTR(pScrn); @@ -840,7 +840,7 @@ fbdevHWRestore(ScrnInfoPtr pScrn) /* -------------------------------------------------------------------- */ /* callback for xf86HandleColormaps */ -_X_EXPORT void +void fbdevHWLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices, LOCO *colors, VisualPtr pVisual) { @@ -872,7 +872,7 @@ fbdevHWLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices, /* -------------------------------------------------------------------- */ /* these can be hooked directly into ScrnInfoRec */ -_X_EXPORT ModeStatus +ModeStatus fbdevHWValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) { ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; @@ -885,7 +885,7 @@ fbdevHWValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) return MODE_OK; } -_X_EXPORT Bool +Bool fbdevHWSwitchMode(int scrnIndex, DisplayModePtr mode, int flags) { ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; @@ -898,7 +898,7 @@ fbdevHWSwitchMode(int scrnIndex, DisplayModePtr mode, int flags) return TRUE; } -_X_EXPORT void +void fbdevHWAdjustFrame(int scrnIndex, int x, int y, int flags) { ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; @@ -916,7 +916,7 @@ fbdevHWAdjustFrame(int scrnIndex, int x, int y, int flags) "FBIOPAN_DISPLAY: %s\n", strerror(errno)); } -_X_EXPORT Bool +Bool fbdevHWEnterVT(int scrnIndex, int flags) { ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; @@ -928,7 +928,7 @@ fbdevHWEnterVT(int scrnIndex, int flags) return TRUE; } -_X_EXPORT void +void fbdevHWLeaveVT(int scrnIndex, int flags) { ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; @@ -937,7 +937,7 @@ fbdevHWLeaveVT(int scrnIndex, int flags) fbdevHWRestore(pScrn); } -_X_EXPORT void +void fbdevHWDPMSSet(ScrnInfoPtr pScrn, int mode, int flags) { fbdevHWPtr fPtr = FBDEVHWPTR(pScrn); @@ -969,7 +969,7 @@ fbdevHWDPMSSet(ScrnInfoPtr pScrn, int mode, int flags) "FBIOBLANK: %s\n", strerror(errno)); } -_X_EXPORT Bool +Bool fbdevHWSaveScreen(ScreenPtr pScreen, int mode) { ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; @@ -991,26 +991,26 @@ fbdevHWSaveScreen(ScreenPtr pScreen, int mode) return TRUE; } -_X_EXPORT xf86SwitchModeProc * +xf86SwitchModeProc * fbdevHWSwitchModeWeak(void) { return fbdevHWSwitchMode; } -_X_EXPORT xf86AdjustFrameProc * +xf86AdjustFrameProc * fbdevHWAdjustFrameWeak(void) { return fbdevHWAdjustFrame; } -_X_EXPORT xf86EnterVTProc * +xf86EnterVTProc * fbdevHWEnterVTWeak(void) { return fbdevHWEnterVT; } -_X_EXPORT xf86LeaveVTProc * +xf86LeaveVTProc * fbdevHWLeaveVTWeak(void) { return fbdevHWLeaveVT; } -_X_EXPORT xf86ValidModeProc * +xf86ValidModeProc * fbdevHWValidModeWeak(void) { return fbdevHWValidMode; } -_X_EXPORT xf86DPMSSetProc * +xf86DPMSSetProc * fbdevHWDPMSSetWeak(void) { return fbdevHWDPMSSet; } -_X_EXPORT xf86LoadPaletteProc * +xf86LoadPaletteProc * fbdevHWLoadPaletteWeak(void) { return fbdevHWLoadPalette; } -_X_EXPORT SaveScreenProcPtr +SaveScreenProcPtr fbdevHWSaveScreenWeak(void) { return fbdevHWSaveScreen; } diff --git a/hw/xfree86/fbdevhw/fbdevhw.h b/hw/xfree86/fbdevhw/fbdevhw.h index 614dc6fed..41c3e339a 100644 --- a/hw/xfree86/fbdevhw/fbdevhw.h +++ b/hw/xfree86/fbdevhw/fbdevhw.h @@ -13,50 +13,50 @@ #define FBDEVHW_TEXT 3 /* Text/attributes */ #define FBDEVHW_VGA_PLANES 4 /* EGA/VGA planes */ -Bool fbdevHWGetRec(ScrnInfoPtr pScrn); -void fbdevHWFreeRec(ScrnInfoPtr pScrn); - -Bool fbdevHWProbe(struct pci_device * pPci, char *device, char **namep); -Bool fbdevHWInit(ScrnInfoPtr pScrn, struct pci_device * pPci, char *device); - -char* fbdevHWGetName(ScrnInfoPtr pScrn); -int fbdevHWGetDepth(ScrnInfoPtr pScrn, int *fbbpp); -int fbdevHWGetLineLength(ScrnInfoPtr pScrn); -int fbdevHWGetType(ScrnInfoPtr pScrn); -int fbdevHWGetVidmem(ScrnInfoPtr pScrn); - -void* fbdevHWMapVidmem(ScrnInfoPtr pScrn); -int fbdevHWLinearOffset(ScrnInfoPtr pScrn); -Bool fbdevHWUnmapVidmem(ScrnInfoPtr pScrn); -void* fbdevHWMapMMIO(ScrnInfoPtr pScrn); -Bool fbdevHWUnmapMMIO(ScrnInfoPtr pScrn); - -void fbdevHWSetVideoModes(ScrnInfoPtr pScrn); -DisplayModePtr fbdevHWGetBuildinMode(ScrnInfoPtr pScrn); -void fbdevHWUseBuildinMode(ScrnInfoPtr pScrn); -Bool fbdevHWModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode); -void fbdevHWSave(ScrnInfoPtr pScrn); -void fbdevHWRestore(ScrnInfoPtr pScrn); - -void fbdevHWLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices, +extern _X_EXPORT Bool fbdevHWGetRec(ScrnInfoPtr pScrn); +extern _X_EXPORT void fbdevHWFreeRec(ScrnInfoPtr pScrn); + +extern _X_EXPORT Bool fbdevHWProbe(struct pci_device * pPci, char *device, char **namep); +extern _X_EXPORT Bool fbdevHWInit(ScrnInfoPtr pScrn, struct pci_device * pPci, char *device); + +extern _X_EXPORT char* fbdevHWGetName(ScrnInfoPtr pScrn); +extern _X_EXPORT int fbdevHWGetDepth(ScrnInfoPtr pScrn, int *fbbpp); +extern _X_EXPORT int fbdevHWGetLineLength(ScrnInfoPtr pScrn); +extern _X_EXPORT int fbdevHWGetType(ScrnInfoPtr pScrn); +extern _X_EXPORT int fbdevHWGetVidmem(ScrnInfoPtr pScrn); + +extern _X_EXPORT void* fbdevHWMapVidmem(ScrnInfoPtr pScrn); +extern _X_EXPORT int fbdevHWLinearOffset(ScrnInfoPtr pScrn); +extern _X_EXPORT Bool fbdevHWUnmapVidmem(ScrnInfoPtr pScrn); +extern _X_EXPORT void* fbdevHWMapMMIO(ScrnInfoPtr pScrn); +extern _X_EXPORT Bool fbdevHWUnmapMMIO(ScrnInfoPtr pScrn); + +extern _X_EXPORT void fbdevHWSetVideoModes(ScrnInfoPtr pScrn); +extern _X_EXPORT DisplayModePtr fbdevHWGetBuildinMode(ScrnInfoPtr pScrn); +extern _X_EXPORT void fbdevHWUseBuildinMode(ScrnInfoPtr pScrn); +extern _X_EXPORT Bool fbdevHWModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode); +extern _X_EXPORT void fbdevHWSave(ScrnInfoPtr pScrn); +extern _X_EXPORT void fbdevHWRestore(ScrnInfoPtr pScrn); + +extern _X_EXPORT void fbdevHWLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices, LOCO *colors, VisualPtr pVisual); -ModeStatus fbdevHWValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags); -Bool fbdevHWSwitchMode(int scrnIndex, DisplayModePtr mode, int flags); -void fbdevHWAdjustFrame(int scrnIndex, int x, int y, int flags); -Bool fbdevHWEnterVT(int scrnIndex, int flags); -void fbdevHWLeaveVT(int scrnIndex, int flags); -void fbdevHWDPMSSet(ScrnInfoPtr pScrn, int mode, int flags); - -Bool fbdevHWSaveScreen(ScreenPtr pScreen, int mode); - -xf86SwitchModeProc *fbdevHWSwitchModeWeak(void); -xf86AdjustFrameProc *fbdevHWAdjustFrameWeak(void); -xf86EnterVTProc *fbdevHWEnterVTWeak(void); -xf86LeaveVTProc *fbdevHWLeaveVTWeak(void); -xf86ValidModeProc *fbdevHWValidModeWeak(void); -xf86DPMSSetProc *fbdevHWDPMSSetWeak(void); -xf86LoadPaletteProc *fbdevHWLoadPaletteWeak(void); -SaveScreenProcPtr fbdevHWSaveScreenWeak(void); +extern _X_EXPORT ModeStatus fbdevHWValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags); +extern _X_EXPORT Bool fbdevHWSwitchMode(int scrnIndex, DisplayModePtr mode, int flags); +extern _X_EXPORT void fbdevHWAdjustFrame(int scrnIndex, int x, int y, int flags); +extern _X_EXPORT Bool fbdevHWEnterVT(int scrnIndex, int flags); +extern _X_EXPORT void fbdevHWLeaveVT(int scrnIndex, int flags); +extern _X_EXPORT void fbdevHWDPMSSet(ScrnInfoPtr pScrn, int mode, int flags); + +extern _X_EXPORT Bool fbdevHWSaveScreen(ScreenPtr pScreen, int mode); + +extern _X_EXPORT xf86SwitchModeProc *fbdevHWSwitchModeWeak(void); +extern _X_EXPORT xf86AdjustFrameProc *fbdevHWAdjustFrameWeak(void); +extern _X_EXPORT xf86EnterVTProc *fbdevHWEnterVTWeak(void); +extern _X_EXPORT xf86LeaveVTProc *fbdevHWLeaveVTWeak(void); +extern _X_EXPORT xf86ValidModeProc *fbdevHWValidModeWeak(void); +extern _X_EXPORT xf86DPMSSetProc *fbdevHWDPMSSetWeak(void); +extern _X_EXPORT xf86LoadPaletteProc *fbdevHWLoadPaletteWeak(void); +extern _X_EXPORT SaveScreenProcPtr fbdevHWSaveScreenWeak(void); #endif diff --git a/hw/xfree86/fbdevhw/fbdevhwstub.c b/hw/xfree86/fbdevhw/fbdevhwstub.c index 1c3f2f660..191a6d33d 100644 --- a/hw/xfree86/fbdevhw/fbdevhwstub.c +++ b/hw/xfree86/fbdevhw/fbdevhwstub.c @@ -9,62 +9,62 @@ /* Stubs for the static server on platforms that don't support fbdev */ -_X_EXPORT Bool +Bool fbdevHWGetRec(ScrnInfoPtr pScrn) { return FALSE; } -_X_EXPORT void +void fbdevHWFreeRec(ScrnInfoPtr pScrn) { } -_X_EXPORT Bool +Bool fbdevHWProbe(struct pci_device *pPci, char *device, char **namep) { return FALSE; } -_X_EXPORT Bool +Bool fbdevHWInit(ScrnInfoPtr pScrn, struct pci_device *pPci, char *device) { xf86Msg(X_ERROR, "fbdevhw is not available on this platform\n"); return FALSE; } -_X_EXPORT char* +char* fbdevHWGetName(ScrnInfoPtr pScrn) { return NULL; } -_X_EXPORT int +int fbdevHWGetDepth(ScrnInfoPtr pScrn, int *fbbpp) { return -1; } -_X_EXPORT int +int fbdevHWGetLineLength(ScrnInfoPtr pScrn) { return -1; /* Should cause something spectacular... */ } -_X_EXPORT int +int fbdevHWGetType(ScrnInfoPtr pScrn) { return -1; } -_X_EXPORT int +int fbdevHWGetVidmem(ScrnInfoPtr pScrn) { return -1; } -_X_EXPORT void +void fbdevHWSetVideoModes(ScrnInfoPtr pScrn) { } @@ -75,122 +75,122 @@ fbdevHWGetBuildinMode(ScrnInfoPtr pScrn) return NULL; } -_X_EXPORT void +void fbdevHWUseBuildinMode(ScrnInfoPtr pScrn) { } -_X_EXPORT void* +void* fbdevHWMapVidmem(ScrnInfoPtr pScrn) { return NULL; } -_X_EXPORT int +int fbdevHWLinearOffset(ScrnInfoPtr pScrn) { return 0; } -_X_EXPORT Bool +Bool fbdevHWUnmapVidmem(ScrnInfoPtr pScrn) { return FALSE; } -_X_EXPORT void* +void* fbdevHWMapMMIO(ScrnInfoPtr pScrn) { return NULL; } -_X_EXPORT Bool +Bool fbdevHWUnmapMMIO(ScrnInfoPtr pScrn) { return FALSE; } -_X_EXPORT Bool +Bool fbdevHWModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode) { return FALSE; } -_X_EXPORT void +void fbdevHWSave(ScrnInfoPtr pScrn) { } -_X_EXPORT void +void fbdevHWRestore(ScrnInfoPtr pScrn) { } -_X_EXPORT void +void fbdevHWLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices, LOCO *colors, VisualPtr pVisual) { } -_X_EXPORT ModeStatus +ModeStatus fbdevHWValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) { return MODE_ERROR; } -_X_EXPORT Bool +Bool fbdevHWSwitchMode(int scrnIndex, DisplayModePtr mode, int flags) { return FALSE; } -_X_EXPORT void +void fbdevHWAdjustFrame(int scrnIndex, int x, int y, int flags) { } -_X_EXPORT Bool +Bool fbdevHWEnterVT(int scrnIndex, int flags) { return FALSE; } -_X_EXPORT void +void fbdevHWLeaveVT(int scrnIndex, int flags) { } -_X_EXPORT void +void fbdevHWDPMSSet(ScrnInfoPtr pScrn, int mode, int flags) { } -_X_EXPORT Bool +Bool fbdevHWSaveScreen(ScreenPtr pScreen, int mode) { return FALSE; } -_X_EXPORT xf86SwitchModeProc * +xf86SwitchModeProc * fbdevHWSwitchModeWeak(void) { return fbdevHWSwitchMode; } -_X_EXPORT xf86AdjustFrameProc * +xf86AdjustFrameProc * fbdevHWAdjustFrameWeak(void) { return fbdevHWAdjustFrame; } -_X_EXPORT xf86EnterVTProc * +xf86EnterVTProc * fbdevHWEnterVTWeak(void) { return fbdevHWEnterVT; } -_X_EXPORT xf86LeaveVTProc * +xf86LeaveVTProc * fbdevHWLeaveVTWeak(void) { return fbdevHWLeaveVT; } -_X_EXPORT xf86ValidModeProc * +xf86ValidModeProc * fbdevHWValidModeWeak(void) { return fbdevHWValidMode; } -_X_EXPORT xf86DPMSSetProc * +xf86DPMSSetProc * fbdevHWDPMSSetWeak(void) { return fbdevHWDPMSSet; } -_X_EXPORT xf86LoadPaletteProc * +xf86LoadPaletteProc * fbdevHWLoadPaletteWeak(void) { return fbdevHWLoadPalette; } -_X_EXPORT SaveScreenProcPtr +SaveScreenProcPtr fbdevHWSaveScreenWeak(void) { return fbdevHWSaveScreen; } diff --git a/hw/xfree86/i2c/bt829.c b/hw/xfree86/i2c/bt829.c index 5b705874a..3963ecf47 100644 --- a/hw/xfree86/i2c/bt829.c +++ b/hw/xfree86/i2c/bt829.c @@ -456,7 +456,7 @@ static void write_all(BT829Ptr bt) /* * Public functions */ -_X_EXPORT BT829Ptr bt829_Detect(I2CBusPtr b, I2CSlaveAddr addr) +BT829Ptr bt829_Detect(I2CBusPtr b, I2CSlaveAddr addr) { BT829Ptr bt; I2CByte a; @@ -542,7 +542,7 @@ _X_EXPORT BT829Ptr bt829_Detect(I2CBusPtr b, I2CSlaveAddr addr) return bt; } -_X_EXPORT int bt829_ATIInit(BT829Ptr bt) +int bt829_ATIInit(BT829Ptr bt) { bt->code = 1; bt->len = 0; @@ -555,7 +555,7 @@ _X_EXPORT int bt829_ATIInit(BT829Ptr bt) return 0; } -_X_EXPORT int bt829_SetFormat(BT829Ptr bt, CARD8 format) +int bt829_SetFormat(BT829Ptr bt, CARD8 format) { if ((format < 1) || (format > 7)) return -1; if ((BTVERSION <= BT819) && @@ -571,7 +571,7 @@ _X_EXPORT int bt829_SetFormat(BT829Ptr bt, CARD8 format) return 0; } -_X_EXPORT int bt829_SetMux(BT829Ptr bt, CARD8 mux) +int bt829_SetMux(BT829Ptr bt, CARD8 mux) { if ((mux < 1) || (mux > 3)) return -1; if (mux == bt->mux) return 0; @@ -583,7 +583,7 @@ _X_EXPORT int bt829_SetMux(BT829Ptr bt, CARD8 mux) return 0; } -_X_EXPORT void bt829_SetBrightness(BT829Ptr bt, int brightness) +void bt829_SetBrightness(BT829Ptr bt, int brightness) { brightness = LIMIT(brightness,-1000,999); /* ensure -128 <= brightness <= 127 below */ brightness = (128*brightness)/1000; @@ -593,7 +593,7 @@ _X_EXPORT void bt829_SetBrightness(BT829Ptr bt, int brightness) btwrite_bright(bt); } -_X_EXPORT void bt829_SetContrast(BT829Ptr bt, int contrast) +void bt829_SetContrast(BT829Ptr bt, int contrast) { contrast = LIMIT(contrast,-1000,1000); contrast = (216*(contrast+1000))/1000; @@ -604,7 +604,7 @@ _X_EXPORT void bt829_SetContrast(BT829Ptr bt, int contrast) btwrite_contrast_lo(bt); } -_X_EXPORT void bt829_SetSaturation(BT829Ptr bt, int saturation) +void bt829_SetSaturation(BT829Ptr bt, int saturation) { CARD16 sat_u, sat_v; @@ -620,7 +620,7 @@ _X_EXPORT void bt829_SetSaturation(BT829Ptr bt, int saturation) btwrite_sat_v_lo(bt); } -_X_EXPORT void bt829_SetTint(BT829Ptr bt, int hue) +void bt829_SetTint(BT829Ptr bt, int hue) { hue = LIMIT(hue,-1000,999); /* ensure -128 <= hue <= 127 below */ hue = (128*hue)/1000; @@ -630,7 +630,7 @@ _X_EXPORT void bt829_SetTint(BT829Ptr bt, int hue) btwrite_hue(bt); } -_X_EXPORT int bt829_SetCaptSize(BT829Ptr bt, int width, int height) +int bt829_SetCaptSize(BT829Ptr bt, int width, int height) { if ((width > bt->htotal - 2 * HCROP) || (16 * width < bt->htotal - 32 * HCROP)) return -1; @@ -656,7 +656,7 @@ int bt829_SetCC(BT829Ptr bt) /* FIXME: should take ccmode as a parameter */ return 0; } -_X_EXPORT void bt829_SetOUT_EN(BT829Ptr bt, BOOL out_en) +void bt829_SetOUT_EN(BT829Ptr bt, BOOL out_en) { out_en = (out_en != 0); if (out_en == bt->out_en) return; @@ -665,7 +665,7 @@ _X_EXPORT void bt829_SetOUT_EN(BT829Ptr bt, BOOL out_en) btwrite_vpole(bt); } -_X_EXPORT void bt829_SetP_IO(BT829Ptr bt, CARD8 p_io) +void bt829_SetP_IO(BT829Ptr bt, CARD8 p_io) { if (p_io == bt->p_io) return; bt->p_io = p_io; diff --git a/hw/xfree86/i2c/bt829.h b/hw/xfree86/i2c/bt829.h index 17e6bc7bd..06e488f04 100644 --- a/hw/xfree86/i2c/bt829.h +++ b/hw/xfree86/i2c/bt829.h @@ -37,14 +37,14 @@ typedef struct { } BT829Rec, *BT829Ptr; #define xf86_bt829_Detect bt829_Detect -extern BT829Ptr bt829_Detect(I2CBusPtr b, I2CSlaveAddr addr); +extern _X_EXPORT BT829Ptr bt829_Detect(I2CBusPtr b, I2CSlaveAddr addr); /* ATI card specific initialization */ #define BT829_ATI_ADDR_1 0x8A #define BT829_ATI_ADDR_2 0x88 #define xf86_bt829_ATIInit bt829_ATIInit -extern int bt829_ATIInit(BT829Ptr bt); +extern _X_EXPORT int bt829_ATIInit(BT829Ptr bt); #define BT829_NTSC 1 /* NTSC-M */ #define BT829_NTSC_JAPAN 2 /* NTSC-Japan */ @@ -55,33 +55,33 @@ extern int bt829_ATIInit(BT829Ptr bt); #define BT829_PAL_N_COMB 7 /* PAL-N combination */ #define xf86_bt829_SetFormat bt829_SetFormat -extern int bt829_SetFormat(BT829Ptr bt, CARD8 format); +extern _X_EXPORT int bt829_SetFormat(BT829Ptr bt, CARD8 format); #define BT829_MUX2 1 /* ATI -> composite video */ #define BT829_MUX0 2 /* ATI -> tv tuner */ #define BT829_MUX1 3 /* ATI -> s-video */ #define xf86_bt829_SetMux bt829_SetMux -extern int bt829_SetMux(BT829Ptr bt, CARD8 mux); +extern _X_EXPORT int bt829_SetMux(BT829Ptr bt, CARD8 mux); #define xf86_bt829_SetCaptSize bt829_SetCaptSize -extern int bt829_SetCaptSize(BT829Ptr bt, int width, int height); +extern _X_EXPORT int bt829_SetCaptSize(BT829Ptr bt, int width, int height); #define xf86_bt829_SetBrightness bt829_SetBrightness -extern void bt829_SetBrightness(BT829Ptr bt, int brightness); +extern _X_EXPORT void bt829_SetBrightness(BT829Ptr bt, int brightness); #define xf86_bt829_SetContrast bt829_SetContrast -extern void bt829_SetContrast(BT829Ptr bt, int contrast); +extern _X_EXPORT void bt829_SetContrast(BT829Ptr bt, int contrast); #define xf86_bt829_SetSaturation bt829_SetSaturation -extern void bt829_SetSaturation(BT829Ptr bt, int saturation); +extern _X_EXPORT void bt829_SetSaturation(BT829Ptr bt, int saturation); #define xf86_bt829_SetTint bt829_SetTint -extern void bt829_SetTint(BT829Ptr bt, int hue); /* Hue */ +extern _X_EXPORT void bt829_SetTint(BT829Ptr bt, int hue); /* Hue */ #define xf86_bt829_SetOUT_EN bt829_SetOUT_EN -extern void bt829_SetOUT_EN(BT829Ptr bt, BOOL out_en);/* VPOLE register */ +extern _X_EXPORT void bt829_SetOUT_EN(BT829Ptr bt, BOOL out_en);/* VPOLE register */ #define xf86_bt829_SetP_IO bt829_SetP_IO -extern void bt829_SetP_IO(BT829Ptr bt, CARD8 p_io); /* P_IO register */ +extern _X_EXPORT void bt829_SetP_IO(BT829Ptr bt, CARD8 p_io); /* P_IO register */ -int bt829_SetCC(BT829Ptr bt); +extern _X_EXPORT int bt829_SetCC(BT829Ptr bt); #define BT829SymbolsList \ "bt829_Detect", \ diff --git a/hw/xfree86/i2c/fi1236.c b/hw/xfree86/i2c/fi1236.c index 950bb5b25..110563ed9 100644 --- a/hw/xfree86/i2c/fi1236.c +++ b/hw/xfree86/i2c/fi1236.c @@ -41,7 +41,7 @@ const FI1236_parameters tuner_parms[NUM_TUNERS] = }; -_X_EXPORT FI1236Ptr Detect_FI1236(I2CBusPtr b, I2CSlaveAddr addr) +FI1236Ptr Detect_FI1236(I2CBusPtr b, I2CSlaveAddr addr) { FI1236Ptr f; I2CByte a; @@ -394,7 +394,7 @@ return TUNER_OFF; } /* this function is for external use only */ -_X_EXPORT int TUNER_get_afc_hint(FI1236Ptr f) +int TUNER_get_afc_hint(FI1236Ptr f) { if(f->afc_timer_installed)return TUNER_STILL_TUNING; return f->last_afc_hint; @@ -465,7 +465,7 @@ for(i=0;i<3;i++){ xf86DrvMsg(f->d.pI2CBus->scrnIndex, X_INFO, "MT2032: failed to set frequency\n"); } -_X_EXPORT void FI1236_set_tuner_type(FI1236Ptr f, int type) +void FI1236_set_tuner_type(FI1236Ptr f, int type) { f->type=type; if(type>=NUM_TUNERS)type = NUM_TUNERS-1; @@ -532,7 +532,7 @@ void FI1236_tune(FI1236Ptr f, CARD32 frequency) I2C_WriteRead(&(f->d), (I2CByte *)&(f->tuner_data), 4, NULL, 0); } -_X_EXPORT void TUNER_set_frequency(FI1236Ptr f, CARD32 frequency) +void TUNER_set_frequency(FI1236Ptr f, CARD32 frequency) { if(frequency < f->parm.min_freq) frequency = f->parm.min_freq; if(frequency > f->parm.max_freq) frequency = f->parm.max_freq; @@ -558,7 +558,7 @@ _X_EXPORT void TUNER_set_frequency(FI1236Ptr f, CARD32 frequency) } -_X_EXPORT int FI1236_AFC(FI1236Ptr f) +int FI1236_AFC(FI1236Ptr f) { #if 0 xf86DrvMsg(f->d.pI2CBus->scrnIndex, X_INFO, "AFC: f=%p f->count=%d f->original_frequency=%d f->afc_delta=%d\n", f, f->afc_count, f->original_frequency, f->afc_delta); @@ -601,7 +601,7 @@ _X_EXPORT int FI1236_AFC(FI1236Ptr f) return 0; /* done */ } -_X_EXPORT void fi1236_dump_status(FI1236Ptr f) +void fi1236_dump_status(FI1236Ptr f) { if(f->type==TUNER_TYPE_MT2032){ MT2032_dump_status(f); diff --git a/hw/xfree86/i2c/fi1236.h b/hw/xfree86/i2c/fi1236.h index 9c56e5ae2..8dd7e4fdb 100644 --- a/hw/xfree86/i2c/fi1236.h +++ b/hw/xfree86/i2c/fi1236.h @@ -95,17 +95,17 @@ void FI1236_tune(FI1236Ptr f, CARD32 frequency); "TUNER_set_frequency" #define xf86_Detect_FI1236 Detect_FI1236 -extern FI1236Ptr Detect_FI1236(I2CBusPtr b, I2CSlaveAddr addr); +extern _X_EXPORT FI1236Ptr Detect_FI1236(I2CBusPtr b, I2CSlaveAddr addr); #define xf86_FI1236_set_tuner_type FI1236_set_tuner_type -extern void FI1236_set_tuner_type(FI1236Ptr f, int type); +extern _X_EXPORT void FI1236_set_tuner_type(FI1236Ptr f, int type); #define xf86_TUNER_set_frequency TUNER_set_frequency -extern void TUNER_set_frequency(FI1236Ptr f, CARD32 frequency); +extern _X_EXPORT void TUNER_set_frequency(FI1236Ptr f, CARD32 frequency); #define xf86_FI1236_AFC FI1236_AFC -extern int FI1236_AFC(FI1236Ptr f); +extern _X_EXPORT int FI1236_AFC(FI1236Ptr f); #define xf86_TUNER_get_afc_hint TUNER_get_afc_hint -extern int TUNER_get_afc_hint(FI1236Ptr f); +extern _X_EXPORT int TUNER_get_afc_hint(FI1236Ptr f); #define xf86_fi1236_dump_status fi1236_dump_status -extern void fi1236_dump_status(FI1236Ptr f); +extern _X_EXPORT void fi1236_dump_status(FI1236Ptr f); #endif diff --git a/hw/xfree86/i2c/msp3430.c b/hw/xfree86/i2c/msp3430.c index 0116db339..4bd3a7187 100644 --- a/hw/xfree86/i2c/msp3430.c +++ b/hw/xfree86/i2c/msp3430.c @@ -106,7 +106,7 @@ xf86DrvMsg(m->d.pI2CBus->scrnIndex, X_INFO, "MSP34xx: control=0x%02x%02x\n", #endif /* wrapper */ -_X_EXPORT void InitMSP3430(MSP3430Ptr m) +void InitMSP3430(MSP3430Ptr m) { #if __MSPDEBUG__ > 1 xf86DrvMsg(m->d.pI2CBus->scrnIndex,X_INFO,"InitMSP3430(m->connector=%d, m->standard=%d, m->chip_family=%d)\n", @@ -129,7 +129,7 @@ _X_EXPORT void InitMSP3430(MSP3430Ptr m) | common functions for all MSP34xx chips |----------------------------------------------------------------*/ -_X_EXPORT MSP3430Ptr DetectMSP3430(I2CBusPtr b, I2CSlaveAddr addr) +MSP3430Ptr DetectMSP3430(I2CBusPtr b, I2CSlaveAddr addr) { MSP3430Ptr m; I2CByte a; @@ -249,7 +249,7 @@ _X_EXPORT MSP3430Ptr DetectMSP3430(I2CBusPtr b, I2CSlaveAddr addr) return m; } -_X_EXPORT void ResetMSP3430(MSP3430Ptr m) +void ResetMSP3430(MSP3430Ptr m) { /* Reset the MSP3430 */ SetMSP3430Control(m, 0x00, 0x80, 0x00); @@ -262,7 +262,7 @@ _X_EXPORT void ResetMSP3430(MSP3430Ptr m) m->volume=0; } -_X_EXPORT void MSP3430SetVolume (MSP3430Ptr m, CARD8 value) +void MSP3430SetVolume (MSP3430Ptr m, CARD8 value) { CARD8 result; #if 0 @@ -287,7 +287,7 @@ _X_EXPORT void MSP3430SetVolume (MSP3430Ptr m, CARD8 value) } -_X_EXPORT void MSP3430SetSAP (MSP3430Ptr m, int mode) +void MSP3430SetSAP (MSP3430Ptr m, int mode) { xf86DrvMsg(m->d.pI2CBus->scrnIndex, X_INFO, "Put actual code to change SAP here\n"); diff --git a/hw/xfree86/i2c/msp3430.h b/hw/xfree86/i2c/msp3430.h index 500023b75..8423d1411 100644 --- a/hw/xfree86/i2c/msp3430.h +++ b/hw/xfree86/i2c/msp3430.h @@ -93,15 +93,15 @@ typedef struct { /*----------------------------------------------------------*/ #define xf86_InitMSP3430 InitMSP3430 -extern void InitMSP3430(MSP3430Ptr m); +extern _X_EXPORT void InitMSP3430(MSP3430Ptr m); #define xf86_DetectMSP3430 DetectMSP3430 -extern MSP3430Ptr DetectMSP3430(I2CBusPtr b, I2CSlaveAddr addr); +extern _X_EXPORT MSP3430Ptr DetectMSP3430(I2CBusPtr b, I2CSlaveAddr addr); #define xf86_ResetMSP3430 ResetMSP3430 -extern void ResetMSP3430(MSP3430Ptr m); +extern _X_EXPORT void ResetMSP3430(MSP3430Ptr m); #define xf86_MSP3430SetVolume MSP3430SetVolume -extern void MSP3430SetVolume (MSP3430Ptr m, CARD8 value); +extern _X_EXPORT void MSP3430SetVolume (MSP3430Ptr m, CARD8 value); #define xf86_MSP3430SetSAP MSP3430SetSAP -extern void MSP3430SetSAP (MSP3430Ptr m, int mode); +extern _X_EXPORT void MSP3430SetSAP (MSP3430Ptr m, int mode); #define MSP3430SymbolsList \ "InitMSP3430", \ diff --git a/hw/xfree86/i2c/tda8425.c b/hw/xfree86/i2c/tda8425.c index 6ca10e373..7631a0863 100644 --- a/hw/xfree86/i2c/tda8425.c +++ b/hw/xfree86/i2c/tda8425.c @@ -13,7 +13,7 @@ I2C_WriteRead(&(t->d), data, 2, NULL, 0); \ } -_X_EXPORT TDA8425Ptr Detect_tda8425(I2CBusPtr b, I2CSlaveAddr addr, Bool force) +TDA8425Ptr Detect_tda8425(I2CBusPtr b, I2CSlaveAddr addr, Bool force) { TDA8425Ptr t; @@ -44,7 +44,7 @@ _X_EXPORT TDA8425Ptr Detect_tda8425(I2CBusPtr b, I2CSlaveAddr addr, Bool force) return t; } -_X_EXPORT Bool tda8425_init(TDA8425Ptr t) +Bool tda8425_init(TDA8425Ptr t) { t->stereo = 3; /* 3 = Spacial 2 = Linear 1 = Pseudo 0 = Forced mono */ t->v_left = 0xFF; /* FF - C0 */ @@ -59,7 +59,7 @@ _X_EXPORT Bool tda8425_init(TDA8425Ptr t) return TRUE; } -_X_EXPORT void tda8425_setaudio(TDA8425Ptr t) +void tda8425_setaudio(TDA8425Ptr t) { I2CByte data[2]; @@ -71,7 +71,7 @@ _X_EXPORT void tda8425_setaudio(TDA8425Ptr t) t->mux); } -_X_EXPORT void tda8425_mute(TDA8425Ptr t, Bool mute) +void tda8425_mute(TDA8425Ptr t, Bool mute) { t->mute = mute; tda8425_setaudio(t); diff --git a/hw/xfree86/i2c/tda8425.h b/hw/xfree86/i2c/tda8425.h index 636327cc6..9c33e7f60 100644 --- a/hw/xfree86/i2c/tda8425.h +++ b/hw/xfree86/i2c/tda8425.h @@ -24,13 +24,13 @@ typedef struct { way to autodetect it so we have to _know_ it is there anyway */ #define xf86_Detect_tda8425 Detect_tda8425 -extern TDA8425Ptr Detect_tda8425(I2CBusPtr b, I2CSlaveAddr addr,Bool force); +extern _X_EXPORT TDA8425Ptr Detect_tda8425(I2CBusPtr b, I2CSlaveAddr addr,Bool force); #define xf86_tda8425_init tda8425_init -extern Bool tda8425_init(TDA8425Ptr t); +extern _X_EXPORT Bool tda8425_init(TDA8425Ptr t); #define xf86_tda8425_setaudio tda8425_setaudio -extern void tda8425_setaudio(TDA8425Ptr t); +extern _X_EXPORT void tda8425_setaudio(TDA8425Ptr t); #define xf86_tda8425_mute tda8425_mute -extern void tda8425_mute(TDA8425Ptr t, Bool mute); +extern _X_EXPORT void tda8425_mute(TDA8425Ptr t, Bool mute); #define TDA8425SymbolsList \ "Detect_tda8425", \ diff --git a/hw/xfree86/i2c/tda9850.c b/hw/xfree86/i2c/tda9850.c index 7566012d7..5b0c581ed 100644 --- a/hw/xfree86/i2c/tda9850.c +++ b/hw/xfree86/i2c/tda9850.c @@ -13,7 +13,7 @@ I2C_WriteRead(&(t->d), data, 2, NULL, 0); \ } -_X_EXPORT TDA9850Ptr Detect_tda9850(I2CBusPtr b, I2CSlaveAddr addr) +TDA9850Ptr Detect_tda9850(I2CBusPtr b, I2CSlaveAddr addr) { TDA9850Ptr t; I2CByte a; @@ -53,7 +53,7 @@ _X_EXPORT TDA9850Ptr Detect_tda9850(I2CBusPtr b, I2CSlaveAddr addr) return t; } -_X_EXPORT Bool tda9850_init(TDA9850Ptr t) +Bool tda9850_init(TDA9850Ptr t) { t->stereo = 1; t->sap = 0; @@ -63,7 +63,7 @@ _X_EXPORT Bool tda9850_init(TDA9850Ptr t) return TRUE; } -_X_EXPORT void tda9850_setaudio(TDA9850Ptr t) +void tda9850_setaudio(TDA9850Ptr t) { CARD8 data[2]; @@ -83,7 +83,7 @@ if(t->mux==2) TDA9850(0x06,(t->stereo<<6)|(t->sap<<7)|(t->mute?0x8:0)|(t->sap_mute?0x10:0x0)); } -_X_EXPORT void tda9850_mute(TDA9850Ptr t, Bool mute) +void tda9850_mute(TDA9850Ptr t, Bool mute) { CARD8 data[2]; @@ -93,7 +93,7 @@ t->mute = mute; TDA9850(0x06,(t->stereo<<6)|(t->sap<<7)|(t->mute?0x8:0x0)|(t->sap_mute?0x10:0x0)); } -_X_EXPORT void tda9850_sap_mute(TDA9850Ptr t, Bool sap_mute) +void tda9850_sap_mute(TDA9850Ptr t, Bool sap_mute) { CARD8 data[2]; @@ -103,7 +103,7 @@ t->sap_mute = sap_mute; TDA9850(0x06,(t->stereo<<6)|(t->sap<<7)|(t->mute?0x8:0x0)|(t->sap_mute?0x10:0x0)); } -_X_EXPORT CARD16 tda9850_getstatus(TDA9850Ptr t) +CARD16 tda9850_getstatus(TDA9850Ptr t) { CARD16 status; diff --git a/hw/xfree86/i2c/tda9850.h b/hw/xfree86/i2c/tda9850.h index b78719aa4..d81679510 100644 --- a/hw/xfree86/i2c/tda9850.h +++ b/hw/xfree86/i2c/tda9850.h @@ -16,17 +16,17 @@ typedef struct { #define TDA9850_ADDR_1 0xB4 #define xf86_Detect_tda9850 Detect_tda9850 -extern TDA9850Ptr Detect_tda9850(I2CBusPtr b, I2CSlaveAddr addr); +extern _X_EXPORT TDA9850Ptr Detect_tda9850(I2CBusPtr b, I2CSlaveAddr addr); #define xf86_tda9850_init tda9850_init -extern Bool tda9850_init(TDA9850Ptr t); +extern _X_EXPORT Bool tda9850_init(TDA9850Ptr t); #define xf86_tda9850_setaudio tda9850_setaudio -extern void tda9850_setaudio(TDA9850Ptr t); +extern _X_EXPORT void tda9850_setaudio(TDA9850Ptr t); #define xf86_tda9850_mute tda9850_mute -extern void tda9850_mute(TDA9850Ptr t, Bool mute); +extern _X_EXPORT void tda9850_mute(TDA9850Ptr t, Bool mute); #define xf86_tda9850_sap_mute tda9850_sap_mute -extern void tda9850_sap_mute(TDA9850Ptr t, Bool sap_mute); +extern _X_EXPORT void tda9850_sap_mute(TDA9850Ptr t, Bool sap_mute); #define xf86_tda9850_getstatus tda9850_getstatus -extern CARD16 tda9850_getstatus(TDA9850Ptr t); +extern _X_EXPORT CARD16 tda9850_getstatus(TDA9850Ptr t); #define TDA9850SymbolsList \ "Detect_tda9850", \ diff --git a/hw/xfree86/i2c/tda9885.c b/hw/xfree86/i2c/tda9885.c index ad5aad1ec..4147dfdd7 100644 --- a/hw/xfree86/i2c/tda9885.c +++ b/hw/xfree86/i2c/tda9885.c @@ -8,7 +8,7 @@ #include "i2c_def.h" -_X_EXPORT TDA9885Ptr Detect_tda9885(I2CBusPtr b, I2CSlaveAddr addr) +TDA9885Ptr Detect_tda9885(I2CBusPtr b, I2CSlaveAddr addr) { TDA9885Ptr t; I2CByte a; @@ -51,13 +51,13 @@ _X_EXPORT TDA9885Ptr Detect_tda9885(I2CBusPtr b, I2CSlaveAddr addr) return t; } -_X_EXPORT Bool tda9885_init(TDA9885Ptr t) +Bool tda9885_init(TDA9885Ptr t) { t->forced_mute_audio=1; return TRUE; } -_X_EXPORT void tda9885_getstatus(TDA9885Ptr t) +void tda9885_getstatus(TDA9885Ptr t) { CARD8 value; @@ -69,7 +69,7 @@ t->vif_level=(value >>6) & 1; t->afc_win=(value >> 7)&1; } -_X_EXPORT void tda9885_setparameters(TDA9885Ptr t) +void tda9885_setparameters(TDA9885Ptr t) { CARD8 data[4]; @@ -95,7 +95,7 @@ I2C_WriteRead(&(t->d), data, 4, NULL, 0); xf86DrvMsg(t->d.pI2CBus->scrnIndex,X_INFO,"TDA9885 setparam: B data: %x, C data: %x, E data: %x\n", data[1], data[2], data[3]); } -_X_EXPORT void tda9885_dumpstatus(TDA9885Ptr t) +void tda9885_dumpstatus(TDA9885Ptr t) { xf86DrvMsg(t->d.pI2CBus->scrnIndex,X_INFO,"TDA9885 status: after_reset=%d afc_status=%d (%3.1f kHz off) fm_carrier=%d vif_level=%d afc_win=%d %s\n", t->after_reset, t->afc_status, diff --git a/hw/xfree86/i2c/tda9885.h b/hw/xfree86/i2c/tda9885.h index 08176ba31..004f43d5c 100644 --- a/hw/xfree86/i2c/tda9885.h +++ b/hw/xfree86/i2c/tda9885.h @@ -40,15 +40,15 @@ typedef struct { #define TDA9885_ADDR_4 0x94 #define xf86_Detect_tda9885 Detect_tda9885 -extern TDA9885Ptr Detect_tda9885(I2CBusPtr b, I2CSlaveAddr addr); +extern _X_EXPORT TDA9885Ptr Detect_tda9885(I2CBusPtr b, I2CSlaveAddr addr); #define xf86_tda9885_init tda9885_init -extern Bool tda9885_init(TDA9885Ptr t); +extern _X_EXPORT Bool tda9885_init(TDA9885Ptr t); #define xf86_tda9885_setparameters tda9885_setparameters -extern void tda9885_setparameters(TDA9885Ptr t); +extern _X_EXPORT void tda9885_setparameters(TDA9885Ptr t); #define xf86_tda9885_getstatus tda9885_getstatus -extern void tda9885_getstatus(TDA9885Ptr t); +extern _X_EXPORT void tda9885_getstatus(TDA9885Ptr t); #define xf86_tda9885_dumpstatus tda9885_dumpstatus -extern void tda9885_dumpstatus(TDA9885Ptr t); +extern _X_EXPORT void tda9885_dumpstatus(TDA9885Ptr t); #define TDA9885SymbolsList \ "Detect_tda9885", \ diff --git a/hw/xfree86/i2c/uda1380.c b/hw/xfree86/i2c/uda1380.c index deb4bc9cc..defda3cdc 100644 --- a/hw/xfree86/i2c/uda1380.c +++ b/hw/xfree86/i2c/uda1380.c @@ -31,7 +31,7 @@ #include "uda1380.h" #include "i2c_def.h" -_X_EXPORT UDA1380Ptr Detect_uda1380(I2CBusPtr b, I2CSlaveAddr addr) +UDA1380Ptr Detect_uda1380(I2CBusPtr b, I2CSlaveAddr addr) { UDA1380Ptr t; I2CByte a; @@ -74,7 +74,7 @@ _X_EXPORT UDA1380Ptr Detect_uda1380(I2CBusPtr b, I2CSlaveAddr addr) return t; } -_X_EXPORT Bool uda1380_init(UDA1380Ptr t) +Bool uda1380_init(UDA1380Ptr t) { CARD8 data[3]; CARD16 tmp; @@ -109,7 +109,7 @@ _X_EXPORT Bool uda1380_init(UDA1380Ptr t) return TRUE; } -_X_EXPORT void uda1380_shutdown(UDA1380Ptr t) +void uda1380_shutdown(UDA1380Ptr t) { CARD8 data[3]; Bool ret; @@ -123,7 +123,7 @@ _X_EXPORT void uda1380_shutdown(UDA1380Ptr t) xf86DrvMsg(t->d.pI2CBus->scrnIndex,X_INFO,"UDA1380 failed to shutdown\n"); } -_X_EXPORT void uda1380_setvolume(UDA1380Ptr t, INT32 value) +void uda1380_setvolume(UDA1380Ptr t, INT32 value) { CARD8 data[3]; /* @@ -143,7 +143,7 @@ _X_EXPORT void uda1380_setvolume(UDA1380Ptr t, INT32 value) xf86DrvMsg(t->d.pI2CBus->scrnIndex,X_INFO,"UDA1380 failed to set volume\n"); } -_X_EXPORT void uda1380_mute(UDA1380Ptr t, Bool mute) +void uda1380_mute(UDA1380Ptr t, Bool mute) { CARD8 data[3]; Bool ret; @@ -170,14 +170,14 @@ _X_EXPORT void uda1380_mute(UDA1380Ptr t, Bool mute) } } -_X_EXPORT void uda1380_getstatus(UDA1380Ptr t) +void uda1380_getstatus(UDA1380Ptr t) { } -_X_EXPORT void uda1380_setparameters(UDA1380Ptr t) +void uda1380_setparameters(UDA1380Ptr t) { } -_X_EXPORT void uda1380_dumpstatus(UDA1380Ptr t) +void uda1380_dumpstatus(UDA1380Ptr t) { } diff --git a/hw/xfree86/i2c/uda1380.h b/hw/xfree86/i2c/uda1380.h index 825fccd73..da232f90d 100644 --- a/hw/xfree86/i2c/uda1380.h +++ b/hw/xfree86/i2c/uda1380.h @@ -45,21 +45,21 @@ typedef struct { #define UDA1380_ADDR_2 0x34 #define xf86_Detect_uda1380 Detect_uda1380 -extern UDA1380Ptr Detect_uda1380(I2CBusPtr b, I2CSlaveAddr addr); +extern _X_EXPORT UDA1380Ptr Detect_uda1380(I2CBusPtr b, I2CSlaveAddr addr); #define xf86_uda1380_init uda1380_init -extern Bool uda1380_init(UDA1380Ptr t); +extern _X_EXPORT Bool uda1380_init(UDA1380Ptr t); #define xf86_uda1380_shutdown uda1380_shutdown -extern void uda1380_shutdown(UDA1380Ptr t); +extern _X_EXPORT void uda1380_shutdown(UDA1380Ptr t); #define xf86_uda1380_setvolume uda1380_setvolume -extern void uda1380_setvolume(UDA1380Ptr t, INT32); +extern _X_EXPORT void uda1380_setvolume(UDA1380Ptr t, INT32); #define xf86_uda1380_mute uda1380_mute -extern void uda1380_mute(UDA1380Ptr t, Bool); +extern _X_EXPORT void uda1380_mute(UDA1380Ptr t, Bool); #define xf86_uda1380_setparameters uda1380_setparameters -extern void uda1380_setparameters(UDA1380Ptr t); +extern _X_EXPORT void uda1380_setparameters(UDA1380Ptr t); #define xf86_uda1380_getstatus uda1380_getstatus -extern void uda1380_getstatus(UDA1380Ptr t); +extern _X_EXPORT void uda1380_getstatus(UDA1380Ptr t); #define xf86_uda1380_dumpstatus uda1380_dumpstatus -extern void uda1380_dumpstatus(UDA1380Ptr t); +extern _X_EXPORT void uda1380_dumpstatus(UDA1380Ptr t); #define UDA1380SymbolsList \ "Detect_uda1380", \ diff --git a/hw/xfree86/i2c/xf86i2c.c b/hw/xfree86/i2c/xf86i2c.c index c659b1755..59832d6f9 100644 --- a/hw/xfree86/i2c/xf86i2c.c +++ b/hw/xfree86/i2c/xf86i2c.c @@ -358,7 +358,7 @@ I2CAddress(I2CDevPtr d, I2CSlaveAddr addr) * Don't expect a read- or write-only device will respond otherwise. */ -_X_EXPORT Bool +Bool xf86I2CProbeAddress(I2CBusPtr b, I2CSlaveAddr addr) { int r; @@ -439,7 +439,7 @@ I2CWriteRead(I2CDevPtr d, /* wrapper - for compatibility and convinience */ -_X_EXPORT Bool +Bool xf86I2CWriteRead(I2CDevPtr d, I2CByte *WriteBuffer, int nWrite, I2CByte *ReadBuffer, int nRead) @@ -451,7 +451,7 @@ xf86I2CWriteRead(I2CDevPtr d, /* Read a byte, the only readable register of a device. */ -_X_EXPORT Bool +Bool xf86I2CReadStatus(I2CDevPtr d, I2CByte *pbyte) { return xf86I2CWriteRead(d, NULL, 0, pbyte, 1); @@ -460,7 +460,7 @@ xf86I2CReadStatus(I2CDevPtr d, I2CByte *pbyte) /* Read a byte from one of the registers determined by its sub-address. */ -_X_EXPORT Bool +Bool xf86I2CReadByte(I2CDevPtr d, I2CByte subaddr, I2CByte *pbyte) { return xf86I2CWriteRead(d, &subaddr, 1, pbyte, 1); @@ -470,7 +470,7 @@ xf86I2CReadByte(I2CDevPtr d, I2CByte subaddr, I2CByte *pbyte) * sub-address of the first register. */ -_X_EXPORT Bool +Bool xf86I2CReadBytes(I2CDevPtr d, I2CByte subaddr, I2CByte *pbyte, int n) { return xf86I2CWriteRead(d, &subaddr, 1, pbyte, n); @@ -480,7 +480,7 @@ xf86I2CReadBytes(I2CDevPtr d, I2CByte subaddr, I2CByte *pbyte, int n) * determined by its sub-address. */ -_X_EXPORT Bool +Bool xf86I2CReadWord(I2CDevPtr d, I2CByte subaddr, unsigned short *pword) { I2CByte rb[2]; @@ -495,7 +495,7 @@ xf86I2CReadWord(I2CDevPtr d, I2CByte subaddr, unsigned short *pword) /* Write a byte to one of the registers determined by its sub-address. */ -_X_EXPORT Bool +Bool xf86I2CWriteByte(I2CDevPtr d, I2CByte subaddr, I2CByte byte) { I2CByte wb[2]; @@ -510,7 +510,7 @@ xf86I2CWriteByte(I2CDevPtr d, I2CByte subaddr, I2CByte byte) * sub-address of the first register. */ -_X_EXPORT Bool +Bool xf86I2CWriteBytes(I2CDevPtr d, I2CByte subaddr, I2CByte *WriteBuffer, int nWrite) { @@ -536,7 +536,7 @@ xf86I2CWriteBytes(I2CDevPtr d, I2CByte subaddr, * determined by its sub-address. */ -_X_EXPORT Bool +Bool xf86I2CWriteWord(I2CDevPtr d, I2CByte subaddr, unsigned short word) { I2CByte wb[3]; @@ -555,7 +555,7 @@ xf86I2CWriteWord(I2CDevPtr d, I2CByte subaddr, unsigned short word) * remain uninitialized. */ -_X_EXPORT Bool +Bool xf86I2CWriteVec(I2CDevPtr d, I2CByte *vec, int nValues) { I2CBusPtr b = d->pI2CBus; @@ -595,7 +595,7 @@ xf86I2CWriteVec(I2CDevPtr d, I2CByte *vec, int nValues) * the least significant bit, indicating a read or write access, to zero. */ -_X_EXPORT I2CDevPtr +I2CDevPtr xf86CreateI2CDevRec(void) { return xcalloc(1, sizeof(I2CDevRec)); @@ -605,7 +605,7 @@ xf86CreateI2CDevRec(void) * you should set <unalloc> to free it. */ -_X_EXPORT void +void xf86DestroyI2CDevRec(I2CDevPtr d, Bool unalloc) { if (d) { @@ -640,7 +640,7 @@ xf86DestroyI2CDevRec(I2CDevPtr d, Bool unalloc) * the bus-wide defaults. The function returns TRUE on success. */ -_X_EXPORT Bool +Bool xf86I2CDevInit(I2CDevPtr d) { I2CBusPtr b; @@ -666,7 +666,7 @@ xf86I2CDevInit(I2CDevPtr d) return TRUE; } -_X_EXPORT I2CDevPtr +I2CDevPtr xf86I2CFindDev(I2CBusPtr b, I2CSlaveAddr addr) { I2CDevPtr d; @@ -690,7 +690,7 @@ static I2CBusPtr I2CBusList; * with safe defaults. */ -_X_EXPORT I2CBusPtr +I2CBusPtr xf86CreateI2CBusRec(void) { I2CBusPtr b; @@ -716,7 +716,7 @@ xf86CreateI2CBusRec(void) * first, passing down the <unalloc> option. */ -_X_EXPORT void +void xf86DestroyI2CBusRec(I2CBusPtr b, Bool unalloc, Bool devs_too) { if (b) { @@ -763,7 +763,7 @@ xf86DestroyI2CBusRec(I2CBusPtr b, Bool unalloc, Bool devs_too) * At this point there won't be any traffic on the I2C bus. */ -_X_EXPORT Bool +Bool xf86I2CBusInit(I2CBusPtr b) { /* I2C buses must be identified by a unique scrnIndex @@ -822,7 +822,7 @@ xf86I2CBusInit(I2CBusPtr b) return TRUE; } -_X_EXPORT I2CBusPtr +I2CBusPtr xf86I2CFindBus(int scrnIndex, char *name) { I2CBusPtr p; @@ -840,7 +840,7 @@ xf86I2CFindBus(int scrnIndex, char *name) * Return an array of I2CBusPtr's related to a screen. The caller is * responsible for freeing the array. */ -_X_EXPORT int +int xf86I2CGetScreenBuses(int scrnIndex, I2CBusPtr **pppI2CBus) { I2CBusPtr pI2CBus; diff --git a/hw/xfree86/i2c/xf86i2c.h b/hw/xfree86/i2c/xf86i2c.h index a3413c9c4..f2ded09db 100644 --- a/hw/xfree86/i2c/xf86i2c.h +++ b/hw/xfree86/i2c/xf86i2c.h @@ -50,14 +50,14 @@ typedef struct _I2CBusRec { } I2CBusRec; #define CreateI2CBusRec xf86CreateI2CBusRec -extern I2CBusPtr xf86CreateI2CBusRec(void); +extern _X_EXPORT I2CBusPtr xf86CreateI2CBusRec(void); #define DestroyI2CBusRec xf86DestroyI2CBusRec -extern void xf86DestroyI2CBusRec(I2CBusPtr pI2CBus, Bool unalloc, Bool devs_too); +extern _X_EXPORT void xf86DestroyI2CBusRec(I2CBusPtr pI2CBus, Bool unalloc, Bool devs_too); #define I2CBusInit xf86I2CBusInit -extern Bool xf86I2CBusInit(I2CBusPtr pI2CBus); +extern _X_EXPORT Bool xf86I2CBusInit(I2CBusPtr pI2CBus); -I2CBusPtr xf86I2CFindBus(int scrnIndex, char *name); -int xf86I2CGetScreenBuses(int scrnIndex, I2CBusPtr **pppI2CBus); +extern _X_EXPORT I2CBusPtr xf86I2CFindBus(int scrnIndex, char *name); +extern _X_EXPORT int xf86I2CGetScreenBuses(int scrnIndex, I2CBusPtr **pppI2CBus); /* I2C slave devices */ @@ -77,30 +77,30 @@ typedef struct _I2CDevRec { } I2CDevRec; #define CreateI2CDevRec xf86CreateI2CDevRec -extern I2CDevPtr xf86CreateI2CDevRec(void); -void xf86DestroyI2CDevRec(I2CDevPtr pI2CDev, Bool unalloc); +extern _X_EXPORT I2CDevPtr xf86CreateI2CDevRec(void); +extern _X_EXPORT void xf86DestroyI2CDevRec(I2CDevPtr pI2CDev, Bool unalloc); #define I2CDevInit xf86I2CDevInit -extern Bool xf86I2CDevInit(I2CDevPtr pI2CDev); -I2CDevPtr xf86I2CFindDev(I2CBusPtr, I2CSlaveAddr); +extern _X_EXPORT Bool xf86I2CDevInit(I2CDevPtr pI2CDev); +extern _X_EXPORT I2CDevPtr xf86I2CFindDev(I2CBusPtr, I2CSlaveAddr); /* See descriptions of these functions in xf86i2c.c */ #define I2CProbeAddress xf86I2CProbeAddress -extern Bool xf86I2CProbeAddress(I2CBusPtr pI2CBus, I2CSlaveAddr); +extern _X_EXPORT Bool xf86I2CProbeAddress(I2CBusPtr pI2CBus, I2CSlaveAddr); #define I2C_WriteRead xf86I2CWriteRead -extern Bool xf86I2CWriteRead(I2CDevPtr d, I2CByte *WriteBuffer, int nWrite, +extern _X_EXPORT Bool xf86I2CWriteRead(I2CDevPtr d, I2CByte *WriteBuffer, int nWrite, I2CByte *ReadBuffer, int nRead); #define xf86I2CRead(d, rb, nr) xf86I2CWriteRead(d, NULL, 0, rb, nr) -Bool xf86I2CReadStatus(I2CDevPtr d, I2CByte *pbyte); -Bool xf86I2CReadByte(I2CDevPtr d, I2CByte subaddr, I2CByte *pbyte); -Bool xf86I2CReadBytes(I2CDevPtr d, I2CByte subaddr, I2CByte *pbyte, int n); -Bool xf86I2CReadWord(I2CDevPtr d, I2CByte subaddr, unsigned short *pword); +extern _X_EXPORT Bool xf86I2CReadStatus(I2CDevPtr d, I2CByte *pbyte); +extern _X_EXPORT Bool xf86I2CReadByte(I2CDevPtr d, I2CByte subaddr, I2CByte *pbyte); +extern _X_EXPORT Bool xf86I2CReadBytes(I2CDevPtr d, I2CByte subaddr, I2CByte *pbyte, int n); +extern _X_EXPORT Bool xf86I2CReadWord(I2CDevPtr d, I2CByte subaddr, unsigned short *pword); #define xf86I2CWrite(d, wb, nw) xf86I2CWriteRead(d, wb, nw, NULL, 0) -Bool xf86I2CWriteByte(I2CDevPtr d, I2CByte subaddr, I2CByte byte); -Bool xf86I2CWriteBytes(I2CDevPtr d, I2CByte subaddr, I2CByte *WriteBuffer, int nWrite); -Bool xf86I2CWriteWord(I2CDevPtr d, I2CByte subaddr, unsigned short word); -Bool xf86I2CWriteVec(I2CDevPtr d, I2CByte *vec, int nValues); +extern _X_EXPORT Bool xf86I2CWriteByte(I2CDevPtr d, I2CByte subaddr, I2CByte byte); +extern _X_EXPORT Bool xf86I2CWriteBytes(I2CDevPtr d, I2CByte subaddr, I2CByte *WriteBuffer, int nWrite); +extern _X_EXPORT Bool xf86I2CWriteWord(I2CDevPtr d, I2CByte subaddr, unsigned short word); +extern _X_EXPORT Bool xf86I2CWriteVec(I2CDevPtr d, I2CByte *vec, int nValues); #endif /*_XF86I2C_H */ diff --git a/hw/xfree86/int10/generic.c b/hw/xfree86/int10/generic.c index 2cda75394..0af7c1baa 100644 --- a/hw/xfree86/int10/generic.c +++ b/hw/xfree86/int10/generic.c @@ -116,7 +116,7 @@ read_legacy_video_BIOS(struct pci_device *dev, unsigned char *Buf) } -_X_EXPORT xf86Int10InfoPtr +xf86Int10InfoPtr xf86ExtendedInitInt10(int entityIndex, int Flags) { xf86Int10InfoPtr pInt; @@ -321,14 +321,14 @@ UnmapVRam(xf86Int10InfoPtr pInt) xf86UnMapVidMem(screen, INTPriv(pInt)->vRam, size); } -_X_EXPORT Bool +Bool MapCurrentInt10(xf86Int10InfoPtr pInt) { /* nothing to do here */ return TRUE; } -_X_EXPORT void +void xf86FreeInt10(xf86Int10InfoPtr pInt) { if (!pInt) @@ -345,7 +345,7 @@ xf86FreeInt10(xf86Int10InfoPtr pInt) xfree(pInt); } -_X_EXPORT void * +void * xf86Int10AllocPages(xf86Int10InfoPtr pInt, int num, int *off) { int pagesize = getpagesize(); @@ -373,7 +373,7 @@ xf86Int10AllocPages(xf86Int10InfoPtr pInt, int num, int *off) return (char *)INTPriv(pInt)->base + *off; } -_X_EXPORT void +void xf86Int10FreePages(xf86Int10InfoPtr pInt, void *pbase, int num) { int pagesize = getpagesize(); @@ -486,7 +486,7 @@ write_l(xf86Int10InfoPtr pInt, int addr, CARD32 val) V_ADDR_WB(addr + 3, val >> 24); } -_X_EXPORT pointer +pointer xf86int10Addr(xf86Int10InfoPtr pInt, CARD32 addr) { return V_ADDR(addr); diff --git a/hw/xfree86/int10/helper_exec.c b/hw/xfree86/int10/helper_exec.c index ab559eda9..1c89ce508 100644 --- a/hw/xfree86/int10/helper_exec.c +++ b/hw/xfree86/int10/helper_exec.c @@ -49,7 +49,7 @@ static void SetResetBIOSVars(xf86Int10InfoPtr pInt, Bool set); #define REG pInt -_X_EXPORT int +int setup_int(xf86Int10InfoPtr pInt) { if (pInt != Int10Current) { @@ -78,7 +78,7 @@ setup_int(xf86Int10InfoPtr pInt) return xf86BlockSIGIO(); } -_X_EXPORT void +void finish_int(xf86Int10InfoPtr pInt, int sig) { xf86UnblockSIGIO(sig); @@ -98,20 +98,20 @@ finish_int(xf86Int10InfoPtr pInt, int sig) } /* general software interrupt handler */ -_X_EXPORT CARD32 +CARD32 getIntVect(xf86Int10InfoPtr pInt,int num) { return MEM_RW(pInt, num << 2) + (MEM_RW(pInt, (num << 2) + 2) << 4); } -_X_EXPORT void +void pushw(xf86Int10InfoPtr pInt, CARD16 val) { X86_ESP -= 2; MEM_WW(pInt, ((CARD32) X86_SS << 4) + X86_SP, val); } -_X_EXPORT int +int run_bios_int(int num, xf86Int10InfoPtr pInt) { CARD32 eflags; @@ -157,7 +157,7 @@ run_bios_int(int num, xf86Int10InfoPtr pInt) } /* Debugging stuff */ -_X_EXPORT void +void dump_code(xf86Int10InfoPtr pInt) { int i; @@ -172,7 +172,7 @@ dump_code(xf86Int10InfoPtr pInt) xf86ErrorFVerb(3, "\n"); } -_X_EXPORT void +void dump_registers(xf86Int10InfoPtr pInt) { xf86DrvMsgVerb(pInt->scrnIndex, X_INFO, 3, @@ -192,7 +192,7 @@ dump_registers(xf86Int10InfoPtr pInt) (unsigned long)X86_EIP, (unsigned long)X86_EFLAGS); } -_X_EXPORT void +void stack_trace(xf86Int10InfoPtr pInt) { int i = 0; @@ -212,7 +212,7 @@ stack_trace(xf86Int10InfoPtr pInt) xf86ErrorFVerb(3, "\n"); } -_X_EXPORT int +int port_rep_inb(xf86Int10InfoPtr pInt, CARD16 port, CARD32 base, int d_f, CARD32 count) { @@ -228,7 +228,7 @@ port_rep_inb(xf86Int10InfoPtr pInt, return dst - base; } -_X_EXPORT int +int port_rep_inw(xf86Int10InfoPtr pInt, CARD16 port, CARD32 base, int d_f, CARD32 count) { @@ -244,7 +244,7 @@ port_rep_inw(xf86Int10InfoPtr pInt, return dst - base; } -_X_EXPORT int +int port_rep_inl(xf86Int10InfoPtr pInt, CARD16 port, CARD32 base, int d_f, CARD32 count) { @@ -260,7 +260,7 @@ port_rep_inl(xf86Int10InfoPtr pInt, return dst - base; } -_X_EXPORT int +int port_rep_outb(xf86Int10InfoPtr pInt, CARD16 port, CARD32 base, int d_f, CARD32 count) { @@ -276,7 +276,7 @@ port_rep_outb(xf86Int10InfoPtr pInt, return dst - base; } -_X_EXPORT int +int port_rep_outw(xf86Int10InfoPtr pInt, CARD16 port, CARD32 base, int d_f, CARD32 count) { @@ -292,7 +292,7 @@ port_rep_outw(xf86Int10InfoPtr pInt, return dst - base; } -_X_EXPORT int +int port_rep_outl(xf86Int10InfoPtr pInt, CARD16 port, CARD32 base, int d_f, CARD32 count) { @@ -308,7 +308,7 @@ port_rep_outl(xf86Int10InfoPtr pInt, return dst - base; } -_X_EXPORT CARD8 +CARD8 x_inb(CARD16 port) { CARD8 val; @@ -337,7 +337,7 @@ x_inb(CARD16 port) return val; } -_X_EXPORT CARD16 +CARD16 x_inw(CARD16 port) { CARD16 val; @@ -359,7 +359,7 @@ x_inw(CARD16 port) return val; } -_X_EXPORT void +void x_outb(CARD16 port, CARD8 val) { if ((port == 0x43) && (val == 0)) { @@ -390,7 +390,7 @@ x_outb(CARD16 port, CARD8 val) } } -_X_EXPORT void +void x_outw(CARD16 port, CARD16 val) { @@ -401,7 +401,7 @@ x_outw(CARD16 port, CARD16 val) } } -_X_EXPORT CARD32 +CARD32 x_inl(CARD16 port) { CARD32 val; @@ -414,7 +414,7 @@ x_inl(CARD16 port) return val; } -_X_EXPORT void +void x_outl(CARD16 port, CARD32 val) { if (!pciCfg1out(port, val)) { @@ -424,37 +424,37 @@ x_outl(CARD16 port, CARD32 val) } } -_X_EXPORT CARD8 +CARD8 Mem_rb(CARD32 addr) { return (*Int10Current->mem->rb)(Int10Current, addr); } -_X_EXPORT CARD16 +CARD16 Mem_rw(CARD32 addr) { return (*Int10Current->mem->rw)(Int10Current, addr); } -_X_EXPORT CARD32 +CARD32 Mem_rl(CARD32 addr) { return (*Int10Current->mem->rl)(Int10Current, addr); } -_X_EXPORT void +void Mem_wb(CARD32 addr, CARD8 val) { (*Int10Current->mem->wb)(Int10Current, addr, val); } -_X_EXPORT void +void Mem_ww(CARD32 addr, CARD16 val) { (*Int10Current->mem->ww)(Int10Current, addr, val); } -_X_EXPORT void +void Mem_wl(CARD32 addr, CARD32 val) { (*Int10Current->mem->wl)(Int10Current, addr, val); @@ -613,7 +613,7 @@ pciCfg1outb(CARD16 addr, CARD8 val) return 0; } -_X_EXPORT CARD8 +CARD8 bios_checksum(const CARD8 *start, int size) { CARD8 sum = 0; @@ -641,7 +641,7 @@ bios_checksum(const CARD8 *start, int size) * the driver would have to load the vga-module prior to * doing int10. */ -_X_EXPORT void +void LockLegacyVGA(xf86Int10InfoPtr pInt, legacyVGAPtr vga) { xf86SetCurrentAccess(FALSE, xf86Screens[pInt->scrnIndex]); @@ -660,7 +660,7 @@ LockLegacyVGA(xf86Int10InfoPtr pInt, legacyVGAPtr vga) xf86SetCurrentAccess(TRUE, xf86Screens[pInt->scrnIndex]); } -_X_EXPORT void +void UnlockLegacyVGA(xf86Int10InfoPtr pInt, legacyVGAPtr vga) { xf86SetCurrentAccess(FALSE, xf86Screens[pInt->scrnIndex]); @@ -693,7 +693,7 @@ SetResetBIOSVars(xf86Int10InfoPtr pInt, Bool set) xf86UnMapVidMem(pInt->scrnIndex,base,pagesize); } -_X_EXPORT void +void xf86Int10SaveRestoreBIOSVars(xf86Int10InfoPtr pInt, Bool save) { int pagesize = getpagesize(); @@ -724,7 +724,7 @@ xf86Int10SaveRestoreBIOSVars(xf86Int10InfoPtr pInt, Bool save) } #endif -_X_EXPORT xf86Int10InfoPtr +xf86Int10InfoPtr xf86InitInt10(int entityIndex) { return xf86ExtendedInitInt10(entityIndex, 0); diff --git a/hw/xfree86/int10/helper_mem.c b/hw/xfree86/int10/helper_mem.c index 16d7c175c..6f6ecc2b3 100644 --- a/hw/xfree86/int10/helper_mem.c +++ b/hw/xfree86/int10/helper_mem.c @@ -34,7 +34,7 @@ static const OptionInfoRec INT10Options[] = { }; #ifdef DEBUG -_X_EXPORT void +void dprint(unsigned long start, unsigned long size) { int i,j; @@ -62,7 +62,7 @@ dprint(unsigned long start, unsigned long size) * BIOS. Most of this information was pulled from * dosemu. */ -_X_EXPORT void +void setup_int_vect(xf86Int10InfoPtr pInt) { int i; @@ -105,7 +105,7 @@ setup_int_vect(xf86Int10InfoPtr pInt) } #endif -_X_EXPORT int +int setup_system_bios(void *base_addr) { char *base = (char *) base_addr; @@ -127,7 +127,7 @@ setup_system_bios(void *base_addr) return 1; } -_X_EXPORT void +void reset_int_vect(xf86Int10InfoPtr pInt) { /* @@ -176,7 +176,7 @@ reset_int_vect(xf86Int10InfoPtr pInt) MEM_WW(pInt, (0x6D << 2) + 2, SYS_BIOS >> 4); } -_X_EXPORT void +void set_return_trap(xf86Int10InfoPtr pInt) { /* @@ -191,7 +191,7 @@ set_return_trap(xf86Int10InfoPtr pInt) xf86Int10AllocPages(pInt, 1, &pInt->stackseg); } -_X_EXPORT void * +void * xf86HandleInt10Options(ScrnInfoPtr pScrn, int entityIndex) { EntityInfoPtr pEnt = xf86GetEntityInfo(entityIndex); @@ -220,7 +220,7 @@ xf86HandleInt10Options(ScrnInfoPtr pScrn, int entityIndex) return options; } -_X_EXPORT Bool +Bool int10skip(const void* options) { Bool noint10 = FALSE; @@ -231,7 +231,7 @@ int10skip(const void* options) return noint10; } -_X_EXPORT Bool +Bool int10_check_bios(int scrnIndex, int codeSeg, const unsigned char* vbiosMem) { int size; @@ -258,7 +258,7 @@ int10_check_bios(int scrnIndex, int codeSeg, const unsigned char* vbiosMem) return TRUE; } -_X_EXPORT Bool +Bool initPrimary(const void* options) { Bool initPrimary = FALSE; @@ -269,7 +269,7 @@ initPrimary(const void* options) return initPrimary; } -_X_EXPORT BusType +BusType xf86int10GetBiosLocationType(const xf86Int10InfoPtr pInt) { BusType location_type; @@ -290,7 +290,7 @@ xf86int10GetBiosLocationType(const xf86Int10InfoPtr pInt) return FALSE; \ } -_X_EXPORT Bool +Bool xf86int10GetBiosSegment(xf86Int10InfoPtr pInt, void *base) { unsigned i; diff --git a/hw/xfree86/int10/stub.c b/hw/xfree86/int10/stub.c index 4d9fe520a..58b65782c 100644 --- a/hw/xfree86/int10/stub.c +++ b/hw/xfree86/int10/stub.c @@ -13,56 +13,56 @@ #define _INT10_PRIVATE #include "xf86int10.h" -_X_EXPORT xf86Int10InfoPtr +xf86Int10InfoPtr xf86InitInt10(int entityIndex) { return xf86ExtendedInitInt10(entityIndex, 0); } -_X_EXPORT xf86Int10InfoPtr +xf86Int10InfoPtr xf86ExtendedInitInt10(int entityIndex, int Flags) { return NULL; } -_X_EXPORT Bool +Bool MapCurrentInt10(xf86Int10InfoPtr pInt) { return FALSE; } -_X_EXPORT void +void xf86FreeInt10(xf86Int10InfoPtr pInt) { return; } -_X_EXPORT void * +void * xf86Int10AllocPages(xf86Int10InfoPtr pInt,int num, int *off) { *off = 0; return NULL; } -_X_EXPORT void +void xf86Int10FreePages(xf86Int10InfoPtr pInt, void *pbase, int num) { return; } -_X_EXPORT Bool +Bool xf86Int10ExecSetup(xf86Int10InfoPtr pInt) { return FALSE; } -_X_EXPORT void +void xf86ExecX86int10(xf86Int10InfoPtr pInt) { return; } -_X_EXPORT pointer +pointer xf86int10Addr(xf86Int10InfoPtr pInt, CARD32 addr) { return 0; diff --git a/hw/xfree86/int10/xf86int10.c b/hw/xfree86/int10/xf86int10.c index a7904dc6a..51eb91fbb 100644 --- a/hw/xfree86/int10/xf86int10.c +++ b/hw/xfree86/int10/xf86int10.c @@ -17,7 +17,7 @@ #define REG pInt -_X_EXPORT xf86Int10InfoPtr Int10Current = NULL; +xf86Int10InfoPtr Int10Current = NULL; static int int1A_handler(xf86Int10InfoPtr pInt); #ifndef _PC @@ -27,7 +27,7 @@ static int intE6_handler(xf86Int10InfoPtr pInt); static struct pci_device *findPci(xf86Int10InfoPtr pInt, unsigned short bx); static CARD32 pciSlotBX( const struct pci_device * pvp ); -_X_EXPORT int +int int_handler(xf86Int10InfoPtr pInt) { int num = pInt->num; diff --git a/hw/xfree86/int10/xf86int10.h b/hw/xfree86/int10/xf86int10.h index 2af709b9a..ba9ee5276 100644 --- a/hw/xfree86/int10/xf86int10.h +++ b/hw/xfree86/int10/xf86int10.h @@ -61,15 +61,18 @@ typedef struct { } legacyVGARec, *legacyVGAPtr; /* OS dependent functions */ -xf86Int10InfoPtr xf86InitInt10(int entityIndex); -xf86Int10InfoPtr xf86ExtendedInitInt10(int entityIndex, int Flags); -void xf86FreeInt10(xf86Int10InfoPtr pInt); -void *xf86Int10AllocPages(xf86Int10InfoPtr pInt, int num, int *off); -void xf86Int10FreePages(xf86Int10InfoPtr pInt, void *pbase, int num); -pointer xf86int10Addr(xf86Int10InfoPtr pInt, CARD32 addr); +extern _X_EXPORT xf86Int10InfoPtr xf86InitInt10(int entityIndex); +extern _X_EXPORT xf86Int10InfoPtr xf86ExtendedInitInt10(int entityIndex, + int Flags); +extern _X_EXPORT void xf86FreeInt10(xf86Int10InfoPtr pInt); +extern _X_EXPORT void *xf86Int10AllocPages(xf86Int10InfoPtr pInt, int num, + int *off); +extern _X_EXPORT void xf86Int10FreePages(xf86Int10InfoPtr pInt, void *pbase, + int num); +extern _X_EXPORT pointer xf86int10Addr(xf86Int10InfoPtr pInt, CARD32 addr); /* x86 executor related functions */ -void xf86ExecX86int10(xf86Int10InfoPtr pInt); +extern _X_EXPORT void xf86ExecX86int10(xf86Int10InfoPtr pInt); #ifdef _INT10_PRIVATE @@ -112,12 +115,12 @@ void xf86ExecX86int10(xf86Int10InfoPtr pInt); #define MEM_WL(name, addr, val) (*name->mem->wl)(name, addr, val) /* OS dependent functions */ -Bool MapCurrentInt10(xf86Int10InfoPtr pInt); +extern _X_EXPORT Bool MapCurrentInt10(xf86Int10InfoPtr pInt); /* x86 executor related functions */ -Bool xf86Int10ExecSetup(xf86Int10InfoPtr pInt); +extern _X_EXPORT Bool xf86Int10ExecSetup(xf86Int10InfoPtr pInt); /* int.c */ -extern xf86Int10InfoPtr Int10Current; +extern _X_EXPORT xf86Int10InfoPtr Int10Current; int int_handler(xf86Int10InfoPtr pInt); /* helper_exec.c */ @@ -133,7 +136,7 @@ CARD8 bios_checksum(const CARD8 *start, int size); void LockLegacyVGA(xf86Int10InfoPtr pInt, legacyVGAPtr vga); void UnlockLegacyVGA(xf86Int10InfoPtr pInt, legacyVGAPtr vga); #if defined (_PC) -void xf86Int10SaveRestoreBIOSVars(xf86Int10InfoPtr pInt, Bool save); +extern _X_EXPORT void xf86Int10SaveRestoreBIOSVars(xf86Int10InfoPtr pInt, Bool save); #endif int port_rep_inb(xf86Int10InfoPtr pInt, CARD16 port, CARD32 base, int d_f, CARD32 count); @@ -167,13 +170,13 @@ void setup_int_vect(xf86Int10InfoPtr pInt); int setup_system_bios(void *base_addr); void reset_int_vect(xf86Int10InfoPtr pInt); void set_return_trap(xf86Int10InfoPtr pInt); -void * xf86HandleInt10Options(ScrnInfoPtr pScrn, int entityIndex); +extern _X_EXPORT void * xf86HandleInt10Options(ScrnInfoPtr pScrn, int entityIndex); Bool int10skip(const void* options); Bool int10_check_bios(int scrnIndex, int codeSeg, const unsigned char* vbiosMem); Bool initPrimary(const void* options); -BusType xf86int10GetBiosLocationType(const xf86Int10InfoPtr pInt); -Bool xf86int10GetBiosSegment(xf86Int10InfoPtr pInt, void *base); +extern _X_EXPORT BusType xf86int10GetBiosLocationType(const xf86Int10InfoPtr pInt); +extern _X_EXPORT Bool xf86int10GetBiosSegment(xf86Int10InfoPtr pInt, void *base); #ifdef DEBUG void dprint(unsigned long start, unsigned long size); #endif diff --git a/hw/xfree86/int10/xf86x86emu.c b/hw/xfree86/int10/xf86x86emu.c index a884bf971..83663b0e6 100644 --- a/hw/xfree86/int10/xf86x86emu.c +++ b/hw/xfree86/int10/xf86x86emu.c @@ -28,7 +28,7 @@ x86emu_do_int(int num) } } -_X_EXPORT void +void xf86ExecX86int10(xf86Int10InfoPtr pInt) { int sig = setup_int(pInt); @@ -43,7 +43,7 @@ xf86ExecX86int10(xf86Int10InfoPtr pInt) finish_int(pInt, sig); } -_X_EXPORT Bool +Bool xf86Int10ExecSetup(xf86Int10InfoPtr pInt) { int i; diff --git a/hw/xfree86/loader/Makefile.am b/hw/xfree86/loader/Makefile.am index fa9dbfe5d..d55fe3dda 100644 --- a/hw/xfree86/loader/Makefile.am +++ b/hw/xfree86/loader/Makefile.am @@ -6,7 +6,7 @@ INCLUDES = $(XORG_INCS) -I$(srcdir)/../parser -I$(srcdir)/../dixmods/extmod \ -I$(srcdir)/../ramdac #AM_LDFLAGS = -r -AM_CFLAGS = -DIN_LOADER $(DIX_CFLAGS) $(XORG_CFLAGS) +AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) EXTRA_DIST = \ dlloader.h \ diff --git a/hw/xfree86/loader/loader.c b/hw/xfree86/loader/loader.c index a5e89127f..62058b40a 100644 --- a/hw/xfree86/loader/loader.c +++ b/hw/xfree86/loader/loader.c @@ -181,22 +181,22 @@ _LoaderListPop(int handle) } /* These four are just ABI stubs */ -_X_EXPORT void +void LoaderRefSymbols(const char *sym0, ...) { } -_X_EXPORT void +void LoaderRefSymLists(const char **list0, ...) { } -_X_EXPORT void +void LoaderReqSymLists(const char **list0, ...) { } -_X_EXPORT void +void LoaderReqSymbols(const char *sym0, ...) { } @@ -299,14 +299,14 @@ LoaderHandleOpen(int handle) return handle; } -_X_EXPORT void * +void * LoaderSymbol(const char *sym) { return (DLFindSymbol(sym)); } /* more stub */ -_X_EXPORT int +int LoaderCheckUnresolved(int delay_flag) { return 0; @@ -354,13 +354,13 @@ LoaderSetOptions(unsigned long opts) LoaderOptions |= opts; } -_X_EXPORT Bool +Bool LoaderShouldIgnoreABI(void) { return (LoaderOptions & LDR_OPT_ABI_MISMATCH_NONFATAL) != 0; } -_X_EXPORT int +int LoaderGetABIVersion(const char *abiclass) { struct { diff --git a/hw/xfree86/loader/loaderProcs.h b/hw/xfree86/loader/loaderProcs.h index f468a36a0..3ee56eb48 100644 --- a/hw/xfree86/loader/loaderProcs.h +++ b/hw/xfree86/loader/loaderProcs.h @@ -79,12 +79,12 @@ ModuleDescPtr LoadDriver(const char *, const char *, int, pointer, int *, ModuleDescPtr LoadModule(const char *, const char *, const char **, const char **, pointer, const XF86ModReqInfo *, int *, int *); -ModuleDescPtr LoadSubModule(ModuleDescPtr, const char *, - const char **, const char **, pointer, - const XF86ModReqInfo *, int *, int *); +pointer LoadSubModule(pointer, const char *, + const char **, const char **, pointer, + const XF86ModReqInfo *, int *, int *); ModuleDescPtr DuplicateModule(ModuleDescPtr mod, ModuleDescPtr parent); -void UnloadModule(ModuleDescPtr); -void UnloadSubModule(ModuleDescPtr); +void UnloadModule(pointer); +void UnloadSubModule(pointer); void UnloadDriver(ModuleDescPtr); void LoaderSetPath(const char *path); void LoaderSortExtensions(void); diff --git a/hw/xfree86/loader/loadext.c b/hw/xfree86/loader/loadext.c index d8e615f35..c4033643b 100644 --- a/hw/xfree86/loader/loadext.c +++ b/hw/xfree86/loader/loadext.c @@ -40,7 +40,7 @@ * This should be static, but miinitext wants it. FIXME: make extension * initialization not completely terrible. */ -_X_EXPORT ExtensionModule *ExtensionModuleList = NULL; +ExtensionModule *ExtensionModuleList = NULL; static int numExtensionModules = 0; static ExtensionModule * @@ -66,7 +66,7 @@ NewExtensionModule(void) } } -_X_EXPORT void +void LoadExtension(ExtensionModule * e, Bool builtin) { ExtensionModule *newext; diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c index 2324e78a9..3f754934e 100644 --- a/hw/xfree86/loader/loadmod.c +++ b/hw/xfree86/loader/loadmod.c @@ -469,7 +469,7 @@ FindModule(const char *module, const char *dirname, const char **subdirlist, return name; } -_X_EXPORT char ** +char ** LoaderListDirs(const char **subdirlist, const char **patternlist) { char buf[PATH_MAX + 1]; @@ -563,7 +563,7 @@ LoaderListDirs(const char **subdirlist, const char **patternlist) return listing; } -_X_EXPORT void +void LoaderFreeDirList(char **list) { FreeStringList(list); @@ -745,13 +745,14 @@ AddSibling(ModuleDescPtr head, ModuleDescPtr new) return (new); } -_X_EXPORT ModuleDescPtr -LoadSubModule(ModuleDescPtr parent, const char *module, +pointer +LoadSubModule(pointer _parent, const char *module, const char **subdirlist, const char **patternlist, pointer options, const XF86ModReqInfo * modreq, int *errmaj, int *errmin) { ModuleDescPtr submod; + ModuleDescPtr parent = (ModuleDescPtr)_parent; xf86MsgVerb(X_INFO, 3, "Loading sub module \"%s\"\n", module); @@ -794,7 +795,7 @@ NewModuleDesc(const char *name) return (mdp); } -_X_EXPORT ModuleDescPtr +ModuleDescPtr DuplicateModule(ModuleDescPtr mod, ModuleDescPtr parent) { ModuleDescPtr ret; @@ -1080,10 +1081,10 @@ LoadModule(const char *module, const char *path, const char **subdirlist, modreq, errmaj, errmin, LD_FLAG_GLOBAL); } -_X_EXPORT void -UnloadModule(ModuleDescPtr mod) +void +UnloadModule(pointer mod) { - UnloadModuleOrDriver(mod); + UnloadModuleOrDriver((ModuleDescPtr)mod); } static void @@ -1112,9 +1113,11 @@ UnloadModuleOrDriver(ModuleDescPtr mod) #endif } -_X_EXPORT void -UnloadSubModule(ModuleDescPtr mod) +void +UnloadSubModule(pointer _mod) { + ModuleDescPtr mod = (ModuleDescPtr)_mod; + if (mod == NULL || mod->name == NULL) return; @@ -1160,7 +1163,7 @@ RemoveChild(ModuleDescPtr child) return; } -_X_EXPORT void +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 ef9ac38b4..5acce0024 100644 --- a/hw/xfree86/loader/os.c +++ b/hw/xfree86/loader/os.c @@ -64,7 +64,7 @@ /* Return the OS name, and run-time OS version */ -_X_EXPORT void +void LoaderGetOS(const char **name, int *major, int *minor, int *teeny) { if (name) diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c index 0c069152c..948a56b93 100644 --- a/hw/xfree86/modes/xf86Crtc.c +++ b/hw/xfree86/modes/xf86Crtc.c @@ -53,9 +53,9 @@ * Initialize xf86CrtcConfig structure */ -_X_EXPORT int xf86CrtcConfigPrivateIndex = -1; +int xf86CrtcConfigPrivateIndex = -1; -_X_EXPORT void +void xf86CrtcConfigInit (ScrnInfoPtr scrn, const xf86CrtcConfigFuncsRec *funcs) { @@ -70,7 +70,7 @@ xf86CrtcConfigInit (ScrnInfoPtr scrn, scrn->privates[xf86CrtcConfigPrivateIndex].ptr = config; } -_X_EXPORT void +void xf86CrtcSetSizeRange (ScrnInfoPtr scrn, int minWidth, int minHeight, int maxWidth, int maxHeight) @@ -86,7 +86,7 @@ xf86CrtcSetSizeRange (ScrnInfoPtr scrn, /* * Crtc functions */ -_X_EXPORT xf86CrtcPtr +xf86CrtcPtr xf86CrtcCreate (ScrnInfoPtr scrn, const xf86CrtcFuncsRec *funcs) { @@ -131,7 +131,7 @@ xf86CrtcCreate (ScrnInfoPtr scrn, return crtc; } -_X_EXPORT void +void xf86CrtcDestroy (xf86CrtcPtr crtc) { xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(crtc->scrn); @@ -157,7 +157,7 @@ xf86CrtcDestroy (xf86CrtcPtr crtc) * Return whether any outputs are connected to the specified pipe */ -_X_EXPORT Bool +Bool xf86CrtcInUse (xf86CrtcPtr crtc) { ScrnInfoPtr pScrn = crtc->scrn; @@ -170,7 +170,7 @@ xf86CrtcInUse (xf86CrtcPtr crtc) return FALSE; } -_X_EXPORT void +void xf86CrtcSetScreenSubpixelOrder (ScreenPtr pScreen) { #ifdef RENDER @@ -238,7 +238,7 @@ xf86CrtcSetScreenSubpixelOrder (ScreenPtr pScreen) /** * Sets the given video mode on the given crtc */ -_X_EXPORT Bool +Bool xf86CrtcSetModeTransform (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation, RRTransformPtr transform, int x, int y) { @@ -410,7 +410,7 @@ done: * Sets the given video mode on the given crtc, but without providing * a transform */ -_X_EXPORT Bool +Bool xf86CrtcSetMode (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation, int x, int y) { @@ -575,7 +575,7 @@ xf86OutputInitialRotation (xf86OutputPtr output) return RR_Rotate_0; } -_X_EXPORT xf86OutputPtr +xf86OutputPtr xf86OutputCreate (ScrnInfoPtr scrn, const xf86OutputFuncsRec *funcs, const char *name) @@ -635,7 +635,7 @@ xf86OutputCreate (ScrnInfoPtr scrn, return output; } -_X_EXPORT Bool +Bool xf86OutputRename (xf86OutputPtr output, const char *name) { int len = strlen(name) + 1; @@ -654,7 +654,7 @@ xf86OutputRename (xf86OutputPtr output, const char *name) return TRUE; } -_X_EXPORT void +void xf86OutputUseScreenMonitor (xf86OutputPtr output, Bool use_screen_monitor) { if (use_screen_monitor != output->use_screen_monitor) @@ -664,7 +664,7 @@ xf86OutputUseScreenMonitor (xf86OutputPtr output, Bool use_screen_monitor) } } -_X_EXPORT void +void xf86OutputDestroy (xf86OutputPtr output) { ScrnInfoPtr scrn = output->scrn; @@ -740,7 +740,6 @@ xf86CrtcCloseScreen (int index, ScreenPtr screen) /* * Called at ScreenInit time to set up */ -_X_EXPORT #ifdef RANDR_13_INTERFACE int #else @@ -1446,7 +1445,7 @@ GuessRangeFromModes(MonPtr mon, DisplayModePtr mode) mon->vrefresh[0].lo = 58.0; } -_X_EXPORT void +void xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY) { xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn); @@ -1707,7 +1706,7 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY) */ /* XXX where does this function belong? Here? */ -_X_EXPORT void +void xf86RandR12GetOriginalVirtualSize(ScrnInfoPtr scrn, int *x, int *y); static DisplayModePtr @@ -1802,7 +1801,7 @@ SetCompatOutput(xf86CrtcConfigPtr config) return output; } -_X_EXPORT void +void xf86SetScrnInfoModes (ScrnInfoPtr scrn) { xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn); @@ -2158,7 +2157,7 @@ xf86TargetUserpref(ScrnInfoPtr scrn, xf86CrtcConfigPtr config, * accordingly. */ -_X_EXPORT Bool +Bool xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow) { xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn); @@ -2383,7 +2382,7 @@ xf86PrepareCrtcs (ScrnInfoPtr scrn) * modes (used in EnterVT functions, or at server startup) */ -_X_EXPORT Bool +Bool xf86SetDesiredModes (ScrnInfoPtr scrn) { xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn); @@ -2456,7 +2455,7 @@ xf86SetDesiredModes (ScrnInfoPtr scrn) * - Closer in refresh rate to the requested mode. */ -_X_EXPORT DisplayModePtr +DisplayModePtr xf86OutputFindClosestMode (xf86OutputPtr output, DisplayModePtr desired) { DisplayModePtr best = NULL, scan = NULL; @@ -2519,7 +2518,7 @@ xf86OutputFindClosestMode (xf86OutputPtr output, DisplayModePtr desired) * mode across all outputs that are currently active. */ -_X_EXPORT Bool +Bool xf86SetSingleMode (ScrnInfoPtr pScrn, DisplayModePtr desired, Rotation rotation) { xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn); @@ -2592,7 +2591,7 @@ xf86SetSingleMode (ScrnInfoPtr pScrn, DisplayModePtr desired, Rotation rotation) * If the new mode is off, it will turn off outputs and then CRTCs. * Otherwise, it will affect CRTCs before outputs. */ -_X_EXPORT void +void xf86DPMSSet(ScrnInfoPtr scrn, int mode, int flags) { xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn); @@ -2630,7 +2629,7 @@ xf86DPMSSet(ScrnInfoPtr scrn, int mode, int flags) * Even for monitors with no DPMS support, by the definition of our DPMS hooks, * the outputs will still get disabled (blanked). */ -_X_EXPORT Bool +Bool xf86SaveScreen(ScreenPtr pScreen, int mode) { ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; @@ -2646,7 +2645,7 @@ xf86SaveScreen(ScreenPtr pScreen, int mode) /** * Disable all inactive crtcs and outputs */ -_X_EXPORT void +void xf86DisableUnusedFunctions(ScrnInfoPtr pScrn) { xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); @@ -2702,7 +2701,7 @@ xf86OutputSetEDIDProperty (xf86OutputPtr output, void *data, int data_len) /** * Set the EDID information for the specified output */ -_X_EXPORT void +void xf86OutputSetEDID (xf86OutputPtr output, xf86MonPtr edid_mon) { ScrnInfoPtr scrn = output->scrn; @@ -2770,7 +2769,7 @@ xf86OutputSetEDID (xf86OutputPtr output, xf86MonPtr edid_mon) * Return the list of modes supported by the EDID information * stored in 'output' */ -_X_EXPORT DisplayModePtr +DisplayModePtr xf86OutputGetEDIDModes (xf86OutputPtr output) { ScrnInfoPtr scrn = output->scrn; @@ -2782,7 +2781,7 @@ xf86OutputGetEDIDModes (xf86OutputPtr output) } /* maybe we should care about DDC1? meh. */ -_X_EXPORT xf86MonPtr +xf86MonPtr xf86OutputGetEDID (xf86OutputPtr output, I2CBusPtr pDDCBus) { ScrnInfoPtr scrn = output->scrn; @@ -2801,7 +2800,7 @@ static char *_xf86ConnectorNames[] = { "Component", "LFP", "Proprietary", "HDMI", "DisplayPort", }; -_X_EXPORT char * +char * xf86ConnectorGetName(xf86ConnectorType connector) { return _xf86ConnectorNames[connector]; @@ -2886,7 +2885,7 @@ xf86_covering_crtc(ScrnInfoPtr pScrn, * not that the video shouldn't be displayed */ -_X_EXPORT Bool +Bool xf86_crtc_clip_video_helper(ScrnInfoPtr pScrn, xf86CrtcPtr *crtc_ret, xf86CrtcPtr desired_crtc, @@ -2926,7 +2925,7 @@ xf86_crtc_clip_video_helper(ScrnInfoPtr pScrn, return ret; } -_X_EXPORT xf86_crtc_notify_proc_ptr +xf86_crtc_notify_proc_ptr xf86_wrap_crtc_notify (ScreenPtr screen, xf86_crtc_notify_proc_ptr new) { ScrnInfoPtr scrn = xf86Screens[screen->myNum]; @@ -2938,7 +2937,7 @@ xf86_wrap_crtc_notify (ScreenPtr screen, xf86_crtc_notify_proc_ptr new) return old; } -_X_EXPORT void +void xf86_unwrap_crtc_notify(ScreenPtr screen, xf86_crtc_notify_proc_ptr old) { ScrnInfoPtr scrn = xf86Screens[screen->myNum]; @@ -2947,7 +2946,7 @@ xf86_unwrap_crtc_notify(ScreenPtr screen, xf86_crtc_notify_proc_ptr old) config->xf86_crtc_notify = old; } -_X_EXPORT void +void xf86_crtc_notify(ScreenPtr screen) { ScrnInfoPtr scrn = xf86Screens[screen->myNum]; diff --git a/hw/xfree86/modes/xf86Crtc.h b/hw/xfree86/modes/xf86Crtc.h index 4b6f7d2a1..24195a384 100644 --- a/hw/xfree86/modes/xf86Crtc.h +++ b/hw/xfree86/modes/xf86Crtc.h @@ -638,7 +638,7 @@ typedef struct _xf86CrtcConfig { } xf86CrtcConfigRec, *xf86CrtcConfigPtr; -extern int xf86CrtcConfigPrivateIndex; +extern _X_EXPORT int xf86CrtcConfigPrivateIndex; #define XF86_CRTC_CONFIG_PTR(p) ((xf86CrtcConfigPtr) ((p)->privates[xf86CrtcConfigPrivateIndex].ptr)) @@ -646,11 +646,11 @@ extern int xf86CrtcConfigPrivateIndex; * Initialize xf86CrtcConfig structure */ -void +extern _X_EXPORT void xf86CrtcConfigInit (ScrnInfoPtr scrn, const xf86CrtcConfigFuncsRec *funcs); -void +extern _X_EXPORT void xf86CrtcSetSizeRange (ScrnInfoPtr scrn, int minWidth, int minHeight, int maxWidth, int maxHeight); @@ -658,11 +658,11 @@ xf86CrtcSetSizeRange (ScrnInfoPtr scrn, /* * Crtc functions */ -xf86CrtcPtr +extern _X_EXPORT xf86CrtcPtr xf86CrtcCreate (ScrnInfoPtr scrn, const xf86CrtcFuncsRec *funcs); -void +extern _X_EXPORT void xf86CrtcDestroy (xf86CrtcPtr crtc); @@ -670,61 +670,62 @@ xf86CrtcDestroy (xf86CrtcPtr crtc); * Sets the given video mode on the given crtc */ -Bool +extern _X_EXPORT Bool xf86CrtcSetModeTransform (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation, RRTransformPtr transform, int x, int y); -Bool +extern _X_EXPORT Bool xf86CrtcSetMode (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation, int x, int y); /* * Assign crtc rotation during mode set */ -Bool +extern _X_EXPORT Bool xf86CrtcRotate (xf86CrtcPtr crtc); /* * free shadow memory allocated for all crtcs */ -void +extern _X_EXPORT void xf86RotateFreeShadow(ScrnInfoPtr pScrn); /* * Clean up rotation during CloseScreen */ -void +extern _X_EXPORT void xf86RotateCloseScreen (ScreenPtr pScreen); /** * Return whether any output is assigned to the crtc */ -Bool +extern _X_EXPORT Bool xf86CrtcInUse (xf86CrtcPtr crtc); /* * Output functions */ -xf86OutputPtr +extern _X_EXPORT xf86OutputPtr xf86OutputCreate (ScrnInfoPtr scrn, const xf86OutputFuncsRec *funcs, const char *name); -void +extern _X_EXPORT void xf86OutputUseScreenMonitor (xf86OutputPtr output, Bool use_screen_monitor); -Bool +extern _X_EXPORT Bool xf86OutputRename (xf86OutputPtr output, const char *name); -void +extern _X_EXPORT void xf86OutputDestroy (xf86OutputPtr output); -void +extern _X_EXPORT void xf86ProbeOutputModes (ScrnInfoPtr pScrn, int maxX, int maxY); -void +extern _X_EXPORT void xf86SetScrnInfoModes (ScrnInfoPtr pScrn); +extern _X_EXPORT #ifdef RANDR_13_INTERFACE int #else @@ -732,52 +733,52 @@ Bool #endif xf86CrtcScreenInit (ScreenPtr pScreen); -Bool +extern _X_EXPORT Bool xf86InitialConfiguration (ScrnInfoPtr pScrn, Bool canGrow); -void +extern _X_EXPORT void xf86DPMSSet(ScrnInfoPtr pScrn, int PowerManagementMode, int flags); -Bool +extern _X_EXPORT Bool xf86SaveScreen(ScreenPtr pScreen, int mode); -void +extern _X_EXPORT void xf86DisableUnusedFunctions(ScrnInfoPtr pScrn); -DisplayModePtr +extern _X_EXPORT DisplayModePtr xf86OutputFindClosestMode (xf86OutputPtr output, DisplayModePtr desired); -Bool +extern _X_EXPORT Bool xf86SetSingleMode (ScrnInfoPtr pScrn, DisplayModePtr desired, Rotation rotation); /** * Set the EDID information for the specified output */ -void +extern _X_EXPORT void xf86OutputSetEDID (xf86OutputPtr output, xf86MonPtr edid_mon); /** * Return the list of modes supported by the EDID information * stored in 'output' */ -DisplayModePtr +extern _X_EXPORT DisplayModePtr xf86OutputGetEDIDModes (xf86OutputPtr output); -xf86MonPtr +extern _X_EXPORT xf86MonPtr xf86OutputGetEDID (xf86OutputPtr output, I2CBusPtr pDDCBus); /** * Initialize dga for this screen */ -Bool +extern _X_EXPORT Bool xf86DiDGAInit (ScreenPtr pScreen, unsigned long dga_address); /** * Re-initialize dga for this screen (as when the set of modes changes) */ -Bool +extern _X_EXPORT Bool xf86DiDGAReInit (ScreenPtr pScreen); /* @@ -785,13 +786,13 @@ xf86DiDGAReInit (ScreenPtr pScreen); * the information from the outputs */ -void +extern _X_EXPORT void xf86CrtcSetScreenSubpixelOrder (ScreenPtr pScreen); /* * Get a standard string name for a connector type */ -char * +extern _X_EXPORT char * xf86ConnectorGetName(xf86ConnectorType connector); /* @@ -799,7 +800,7 @@ xf86ConnectorGetName(xf86ConnectorType connector); * modes (used in EnterVT functions, or at server startup) */ -Bool +extern _X_EXPORT Bool xf86SetDesiredModes (ScrnInfoPtr pScrn); /** @@ -808,7 +809,7 @@ xf86SetDesiredModes (ScrnInfoPtr pScrn); * * Driver should call this from ScreenInit function */ -Bool +extern _X_EXPORT Bool xf86_cursors_init (ScreenPtr screen, int max_width, int max_height, int flags); /** @@ -818,25 +819,25 @@ xf86_cursors_init (ScreenPtr screen, int max_width, int max_height, int flags); * * Driver should call this from crtc commit function. */ -void +extern _X_EXPORT void xf86_reload_cursors (ScreenPtr screen); /** * Called from EnterVT to turn the cursors back on */ -void +extern _X_EXPORT void xf86_show_cursors (ScrnInfoPtr scrn); /** * Called by the driver to turn cursors off */ -void +extern _X_EXPORT void xf86_hide_cursors (ScrnInfoPtr scrn); /** * Clean up CRTC-based cursor code. Driver must call this at CloseScreen time. */ -void +extern _X_EXPORT void xf86_cursors_fini (ScreenPtr screen); /* @@ -845,7 +846,7 @@ xf86_cursors_fini (ScreenPtr screen); * wraps xf86XVClipVideoHelper() */ -Bool +extern _X_EXPORT Bool xf86_crtc_clip_video_helper(ScrnInfoPtr pScrn, xf86CrtcPtr *crtc_ret, xf86CrtcPtr desired_crtc, @@ -858,13 +859,13 @@ xf86_crtc_clip_video_helper(ScrnInfoPtr pScrn, INT32 width, INT32 height); -xf86_crtc_notify_proc_ptr +extern _X_EXPORT xf86_crtc_notify_proc_ptr xf86_wrap_crtc_notify (ScreenPtr pScreen, xf86_crtc_notify_proc_ptr new); -void +extern _X_EXPORT void xf86_unwrap_crtc_notify(ScreenPtr pScreen, xf86_crtc_notify_proc_ptr old); -void +extern _X_EXPORT void xf86_crtc_notify(ScreenPtr pScreen); #endif /* _XF86CRTC_H_ */ diff --git a/hw/xfree86/modes/xf86Cursors.c b/hw/xfree86/modes/xf86Cursors.c index 3106f051b..cbaab5738 100644 --- a/hw/xfree86/modes/xf86Cursors.c +++ b/hw/xfree86/modes/xf86Cursors.c @@ -265,7 +265,7 @@ xf86_crtc_hide_cursor (xf86CrtcPtr crtc) } } -_X_EXPORT void +void xf86_hide_cursors (ScrnInfoPtr scrn) { xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); @@ -291,7 +291,7 @@ xf86_crtc_show_cursor (xf86CrtcPtr crtc) } } -_X_EXPORT void +void xf86_show_cursors (ScrnInfoPtr scrn) { xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); @@ -543,7 +543,7 @@ xf86_load_cursor_argb (ScrnInfoPtr scrn, CursorPtr cursor) } } -_X_EXPORT Bool +Bool xf86_cursors_init (ScreenPtr screen, int max_width, int max_height, int flags) { ScrnInfoPtr scrn = xf86Screens[screen->myNum]; @@ -594,7 +594,7 @@ xf86_cursors_init (ScreenPtr screen, int max_width, int max_height, int flags) * Reloads cursor images as needed, then adjusts cursor positions */ -_X_EXPORT void +void xf86_reload_cursors (ScreenPtr screen) { ScrnInfoPtr scrn; @@ -649,7 +649,7 @@ xf86_reload_cursors (ScreenPtr screen) /** * Clean up CRTC-based cursor code */ -_X_EXPORT void +void xf86_cursors_fini (ScreenPtr screen) { ScrnInfoPtr scrn = xf86Screens[screen->myNum]; diff --git a/hw/xfree86/modes/xf86DiDGA.c b/hw/xfree86/modes/xf86DiDGA.c index f40d0abef..0964cefa7 100644 --- a/hw/xfree86/modes/xf86DiDGA.c +++ b/hw/xfree86/modes/xf86DiDGA.c @@ -255,7 +255,7 @@ static DGAFunctionRec xf86_dga_funcs = { NULL }; -_X_EXPORT Bool +Bool xf86DiDGAReInit (ScreenPtr pScreen) { ScrnInfoPtr scrn = xf86Screens[pScreen->myNum]; @@ -267,7 +267,7 @@ xf86DiDGAReInit (ScreenPtr pScreen) return DGAReInitModes (pScreen, xf86_config->dga_modes, xf86_config->dga_nmode); } -_X_EXPORT Bool +Bool xf86DiDGAInit (ScreenPtr pScreen, unsigned long dga_address) { ScrnInfoPtr scrn = xf86Screens[pScreen->myNum]; diff --git a/hw/xfree86/modes/xf86EdidModes.c b/hw/xfree86/modes/xf86EdidModes.c index 2ce4e130b..1413e87a5 100644 --- a/hw/xfree86/modes/xf86EdidModes.c +++ b/hw/xfree86/modes/xf86EdidModes.c @@ -693,7 +693,7 @@ xf86DDCDetectQuirks(int scrnIndex, xf86MonPtr DDC, Bool verbose) * Note that some quirks applying to the mode list are still implemented in * xf86DDCGetModes. */ -_X_EXPORT void +void xf86DDCApplyQuirks(int scrnIndex, xf86MonPtr DDC) { ddc_quirk_t quirks = xf86DDCDetectQuirks (scrnIndex, DDC, FALSE); @@ -759,7 +759,7 @@ xf86DDCSetPreferredRefresh(int scrnIndex, DisplayModePtr modes, best->type |= M_T_PREFERRED; } -_X_EXPORT DisplayModePtr +DisplayModePtr xf86DDCGetModes(int scrnIndex, xf86MonPtr DDC) { int i; @@ -833,7 +833,7 @@ xf86DDCGetModes(int scrnIndex, xf86MonPtr DDC) /* * Fill out MonPtr with xf86MonPtr information. */ -_X_EXPORT void +void xf86DDCMonitorSet(int scrnIndex, MonPtr Monitor, xf86MonPtr DDC) { DisplayModePtr Modes = NULL, Mode; diff --git a/hw/xfree86/modes/xf86Modes.c b/hw/xfree86/modes/xf86Modes.c index 959e37665..033d4aeb4 100644 --- a/hw/xfree86/modes/xf86Modes.c +++ b/hw/xfree86/modes/xf86Modes.c @@ -51,7 +51,7 @@ extern XF86ConfigPtr xf86configptr; * * Exact copy of xf86Mode.c's. */ -_X_EXPORT double +double xf86ModeHSync(const DisplayModeRec *mode) { double hsync = 0.0; @@ -69,7 +69,7 @@ xf86ModeHSync(const DisplayModeRec *mode) * * Exact copy of xf86Mode.c's. */ -_X_EXPORT double +double xf86ModeVRefresh(const DisplayModeRec *mode) { double refresh = 0.0; @@ -88,7 +88,7 @@ xf86ModeVRefresh(const DisplayModeRec *mode) return refresh; } -_X_EXPORT int +int xf86ModeWidth (const DisplayModeRec *mode, Rotation rotation) { switch (rotation & 0xf) { @@ -103,7 +103,7 @@ xf86ModeWidth (const DisplayModeRec *mode, Rotation rotation) } } -_X_EXPORT int +int xf86ModeHeight (const DisplayModeRec *mode, Rotation rotation) { switch (rotation & 0xf) { @@ -119,7 +119,7 @@ xf86ModeHeight (const DisplayModeRec *mode, Rotation rotation) } /** Calculates the memory bandwidth (in MiB/sec) of a mode. */ -_X_EXPORT unsigned int +unsigned int xf86ModeBandwidth(DisplayModePtr mode, int depth) { float a_active, a_total, active_percent, pixels_per_second; @@ -137,7 +137,7 @@ xf86ModeBandwidth(DisplayModePtr mode, int depth) } /** Sets a default mode name of <width>x<height> on a mode. */ -_X_EXPORT void +void xf86SetModeDefaultName(DisplayModePtr mode) { if (mode->name != NULL) @@ -154,7 +154,7 @@ xf86SetModeDefaultName(DisplayModePtr mode) * * Exact copy of xf86Mode.c's. */ -_X_EXPORT void +void xf86SetModeCrtc(DisplayModePtr p, int adjustFlags) { if ((p == NULL) || ((p->type & M_T_CRTC_C) == M_T_BUILTIN)) @@ -205,7 +205,7 @@ xf86SetModeCrtc(DisplayModePtr p, int adjustFlags) /** * Allocates and returns a copy of pMode, including pointers within pMode. */ -_X_EXPORT DisplayModePtr +DisplayModePtr xf86DuplicateMode(const DisplayModeRec *pMode) { DisplayModePtr pNew; @@ -229,7 +229,7 @@ xf86DuplicateMode(const DisplayModeRec *pMode) * * \param modeList doubly-linked mode list */ -_X_EXPORT DisplayModePtr +DisplayModePtr xf86DuplicateModes(ScrnInfoPtr pScrn, DisplayModePtr modeList) { DisplayModePtr first = NULL, last = NULL; @@ -263,7 +263,7 @@ xf86DuplicateModes(ScrnInfoPtr pScrn, DisplayModePtr modeList) * * This isn't in xf86Modes.c, but it might deserve to be there. */ -_X_EXPORT Bool +Bool xf86ModesEqual(const DisplayModeRec *pMode1, const DisplayModeRec *pMode2) { if (pMode1->Clock == pMode2->Clock && @@ -299,7 +299,7 @@ add(char **p, char *new) * * Convenient VRefresh printing was added, though, compared to xf86Mode.c */ -_X_EXPORT void +void xf86PrintModeline(int scrnIndex,DisplayModePtr mode) { char tmp[256]; @@ -345,7 +345,7 @@ xf86PrintModeline(int scrnIndex,DisplayModePtr mode) * * \bug only V_INTERLACE and V_DBLSCAN are supported. Is that enough? */ -_X_EXPORT void +void xf86ValidateModesFlags(ScrnInfoPtr pScrn, DisplayModePtr modeList, int flags) { @@ -364,7 +364,7 @@ xf86ValidateModesFlags(ScrnInfoPtr pScrn, DisplayModePtr modeList, * * \param modeList doubly-linked list of modes. */ -_X_EXPORT void +void xf86ValidateModesSize(ScrnInfoPtr pScrn, DisplayModePtr modeList, int maxX, int maxY, int maxPitch) { @@ -391,7 +391,7 @@ xf86ValidateModesSize(ScrnInfoPtr pScrn, DisplayModePtr modeList, * * \param modeList doubly-linked list of modes. */ -_X_EXPORT void +void xf86ValidateModesSync(ScrnInfoPtr pScrn, DisplayModePtr modeList, MonPtr mon) { @@ -436,7 +436,7 @@ xf86ValidateModesSync(ScrnInfoPtr pScrn, DisplayModePtr modeList, * \param max pointer to maximums of clock ranges * \param n_ranges number of ranges. */ -_X_EXPORT void +void xf86ValidateModesClocks(ScrnInfoPtr pScrn, DisplayModePtr modeList, int *min, int *max, int n_ranges) { @@ -469,7 +469,7 @@ xf86ValidateModesClocks(ScrnInfoPtr pScrn, DisplayModePtr modeList, * * \param modeList doubly-linked list of modes. */ -_X_EXPORT void +void xf86ValidateModesUserConfig(ScrnInfoPtr pScrn, DisplayModePtr modeList) { DisplayModePtr mode; @@ -501,7 +501,7 @@ xf86ValidateModesUserConfig(ScrnInfoPtr pScrn, DisplayModePtr modeList) * \param bandwidth bandwidth in MHz. * \param depth color depth. */ -_X_EXPORT void +void xf86ValidateModesBandwidth(ScrnInfoPtr pScrn, DisplayModePtr modeList, unsigned int bandwidth, int depth) { @@ -518,7 +518,7 @@ xf86ValidateModesBandwidth(ScrnInfoPtr pScrn, DisplayModePtr modeList, } } -_X_EXPORT Bool +Bool xf86ModeIsReduced(const DisplayModeRec *mode) { if ((((mode->HDisplay * 5 / 4) & ~0x07) > mode->HTotal) && @@ -535,7 +535,7 @@ xf86ModeIsReduced(const DisplayModeRec *mode) * * \param modeList doubly-linked list of modes. */ -_X_EXPORT void +void xf86ValidateModesReducedBlanking(ScrnInfoPtr pScrn, DisplayModePtr modeList) { DisplayModePtr mode; @@ -558,7 +558,7 @@ xf86ValidateModesReducedBlanking(ScrnInfoPtr pScrn, DisplayModePtr modeList) * \param verbose determines whether the reason for mode invalidation is * printed. */ -_X_EXPORT void +void xf86PruneInvalidModes(ScrnInfoPtr pScrn, DisplayModePtr *modeList, Bool verbose) { @@ -592,7 +592,7 @@ xf86PruneInvalidModes(ScrnInfoPtr pScrn, DisplayModePtr *modeList, * * \param modes doubly-linked mode list. */ -_X_EXPORT DisplayModePtr +DisplayModePtr xf86ModesAdd(DisplayModePtr modes, DisplayModePtr new) { if (modes == NULL) @@ -658,7 +658,7 @@ xf86GetConfigModes (XF86ConfModeLinePtr conf_mode) /** * Build a mode list from a monitor configuration */ -_X_EXPORT DisplayModePtr +DisplayModePtr xf86GetMonitorModes (ScrnInfoPtr pScrn, XF86ConfMonitorPtr conf_monitor) { DisplayModePtr modes = NULL; @@ -690,7 +690,7 @@ xf86GetMonitorModes (ScrnInfoPtr pScrn, XF86ConfMonitorPtr conf_monitor) /** * Build a mode list containing all of the default modes */ -_X_EXPORT DisplayModePtr +DisplayModePtr xf86GetDefaultModes (Bool interlaceAllowed, Bool doubleScanAllowed) { DisplayModePtr head = NULL, mode; diff --git a/hw/xfree86/modes/xf86Modes.h b/hw/xfree86/modes/xf86Modes.h index 2fb6a374d..74cf5e78b 100644 --- a/hw/xfree86/modes/xf86Modes.h +++ b/hw/xfree86/modes/xf86Modes.h @@ -40,75 +40,75 @@ #include "xf86Rename.h" #endif -double xf86ModeHSync(const DisplayModeRec *mode); -double xf86ModeVRefresh(const DisplayModeRec *mode); -unsigned int xf86ModeBandwidth(DisplayModePtr mode, int depth); +extern _X_EXPORT double xf86ModeHSync(const DisplayModeRec *mode); +extern _X_EXPORT double xf86ModeVRefresh(const DisplayModeRec *mode); +extern _X_EXPORT unsigned int xf86ModeBandwidth(DisplayModePtr mode, int depth); -int +extern _X_EXPORT int xf86ModeWidth (const DisplayModeRec *mode, Rotation rotation); -int +extern _X_EXPORT int xf86ModeHeight (const DisplayModeRec *mode, Rotation rotation); -DisplayModePtr xf86DuplicateMode(const DisplayModeRec *pMode); -DisplayModePtr xf86DuplicateModes(ScrnInfoPtr pScrn, +extern _X_EXPORT DisplayModePtr xf86DuplicateMode(const DisplayModeRec *pMode); +extern _X_EXPORT DisplayModePtr xf86DuplicateModes(ScrnInfoPtr pScrn, DisplayModePtr modeList); -void xf86SetModeDefaultName(DisplayModePtr mode); -void xf86SetModeCrtc(DisplayModePtr p, int adjustFlags); -Bool xf86ModesEqual(const DisplayModeRec *pMode1, +extern _X_EXPORT void xf86SetModeDefaultName(DisplayModePtr mode); +extern _X_EXPORT void xf86SetModeCrtc(DisplayModePtr p, int adjustFlags); +extern _X_EXPORT Bool xf86ModesEqual(const DisplayModeRec *pMode1, const DisplayModeRec *pMode2); -void xf86PrintModeline(int scrnIndex,DisplayModePtr mode); -DisplayModePtr xf86ModesAdd(DisplayModePtr modes, DisplayModePtr new); +extern _X_EXPORT void xf86PrintModeline(int scrnIndex,DisplayModePtr mode); +extern _X_EXPORT DisplayModePtr xf86ModesAdd(DisplayModePtr modes, DisplayModePtr new); -DisplayModePtr xf86DDCGetModes(int scrnIndex, xf86MonPtr DDC); -DisplayModePtr xf86CVTMode(int HDisplay, int VDisplay, float VRefresh, +extern _X_EXPORT DisplayModePtr xf86DDCGetModes(int scrnIndex, xf86MonPtr DDC); +extern _X_EXPORT DisplayModePtr xf86CVTMode(int HDisplay, int VDisplay, float VRefresh, Bool Reduced, Bool Interlaced); -DisplayModePtr xf86GTFMode(int h_pixels, int v_lines, float freq, int interlaced, int margins); +extern _X_EXPORT DisplayModePtr xf86GTFMode(int h_pixels, int v_lines, float freq, int interlaced, int margins); -Bool +extern _X_EXPORT Bool xf86ModeIsReduced(const DisplayModeRec *mode); -void +extern _X_EXPORT void xf86ValidateModesFlags(ScrnInfoPtr pScrn, DisplayModePtr modeList, int flags); -void +extern _X_EXPORT void xf86ValidateModesClocks(ScrnInfoPtr pScrn, DisplayModePtr modeList, int *min, int *max, int n_ranges); -void +extern _X_EXPORT void xf86ValidateModesSize(ScrnInfoPtr pScrn, DisplayModePtr modeList, int maxX, int maxY, int maxPitch); -void +extern _X_EXPORT void xf86ValidateModesSync(ScrnInfoPtr pScrn, DisplayModePtr modeList, MonPtr mon); -void +extern _X_EXPORT void xf86ValidateModesBandwidth(ScrnInfoPtr pScrn, DisplayModePtr modeList, unsigned int bandwidth, int depth); -void +extern _X_EXPORT void xf86ValidateModesReducedBlanking(ScrnInfoPtr pScrn, DisplayModePtr modeList); -void +extern _X_EXPORT void xf86PruneInvalidModes(ScrnInfoPtr pScrn, DisplayModePtr *modeList, Bool verbose); -void +extern _X_EXPORT void xf86ValidateModesFlags(ScrnInfoPtr pScrn, DisplayModePtr modeList, int flags); -void +extern _X_EXPORT void xf86ValidateModesUserConfig(ScrnInfoPtr pScrn, DisplayModePtr modeList); -DisplayModePtr +extern _X_EXPORT DisplayModePtr xf86GetMonitorModes (ScrnInfoPtr pScrn, XF86ConfMonitorPtr conf_monitor); -DisplayModePtr +extern _X_EXPORT DisplayModePtr xf86GetDefaultModes (Bool interlaceAllowed, Bool doubleScanAllowed); -void +extern _X_EXPORT void xf86DDCApplyQuirks(int scrnIndex, xf86MonPtr DDC); #endif /* _XF86MODES_H_ */ diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c index 9d7750fbd..62f1edb5b 100644 --- a/hw/xfree86/modes/xf86RandR12.c +++ b/hw/xfree86/modes/xf86RandR12.c @@ -237,7 +237,7 @@ xf86RandR12SetMode (ScreenPtr pScreen, return ret; } -_X_EXPORT Bool +Bool xf86RandR12SetConfig (ScreenPtr pScreen, Rotation rotation, int rate, @@ -371,7 +371,7 @@ finish: return ret; } -_X_EXPORT Rotation +Rotation xf86RandR12GetRotation(ScreenPtr pScreen) { XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen); @@ -379,7 +379,7 @@ xf86RandR12GetRotation(ScreenPtr pScreen) return randrp->rotation; } -_X_EXPORT Bool +Bool xf86RandR12CreateScreenResources (ScreenPtr pScreen) { ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; @@ -484,7 +484,7 @@ xf86RandR12CreateScreenResources (ScreenPtr pScreen) } -_X_EXPORT Bool +Bool xf86RandR12Init (ScreenPtr pScreen) { rrScrPrivPtr rp; @@ -542,7 +542,7 @@ xf86RandR12Init (ScreenPtr pScreen) return TRUE; } -_X_EXPORT void +void xf86RandR12SetRotations (ScreenPtr pScreen, Rotation rotations) { XF86RandRInfoPtr randrp; @@ -568,7 +568,7 @@ xf86RandR12SetRotations (ScreenPtr pScreen, Rotation rotations) randrp->supported_rotations = rotations; } -_X_EXPORT void +void xf86RandR12SetTransformSupport (ScreenPtr pScreen, Bool transforms) { XF86RandRInfoPtr randrp; @@ -593,7 +593,7 @@ xf86RandR12SetTransformSupport (ScreenPtr pScreen, Bool transforms) #endif } -_X_EXPORT void +void xf86RandR12GetOriginalVirtualSize(ScrnInfoPtr pScrn, int *x, int *y) { ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex]; @@ -1162,7 +1162,7 @@ xf86RandR12CreateScreenResources12 (ScreenPtr pScreen) * to DGA, VidMode or hot key. Tell RandR */ -_X_EXPORT void +void xf86RandR12TellChanged (ScreenPtr pScreen) { ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; @@ -1220,7 +1220,7 @@ xf86RandR12Init12 (ScreenPtr pScreen) #endif -_X_EXPORT Bool +Bool xf86RandR12PreInit (ScrnInfoPtr pScrn) { return TRUE; diff --git a/hw/xfree86/modes/xf86RandR12.h b/hw/xfree86/modes/xf86RandR12.h index 17a2dcc7f..c8d9918cf 100644 --- a/hw/xfree86/modes/xf86RandR12.h +++ b/hw/xfree86/modes/xf86RandR12.h @@ -28,15 +28,15 @@ #include "xf86Rename.h" #endif -Bool xf86RandR12CreateScreenResources (ScreenPtr pScreen); -Bool xf86RandR12Init(ScreenPtr pScreen); -void xf86RandR12SetRotations (ScreenPtr pScreen, Rotation rotation); -void xf86RandR12SetTransformSupport (ScreenPtr pScreen, Bool transforms); -Bool xf86RandR12SetConfig(ScreenPtr pScreen, Rotation rotation, int rate, +extern _X_EXPORT Bool xf86RandR12CreateScreenResources (ScreenPtr pScreen); +extern _X_EXPORT Bool xf86RandR12Init(ScreenPtr pScreen); +extern _X_EXPORT void xf86RandR12SetRotations (ScreenPtr pScreen, Rotation rotation); +extern _X_EXPORT void xf86RandR12SetTransformSupport (ScreenPtr pScreen, Bool transforms); +extern _X_EXPORT Bool xf86RandR12SetConfig(ScreenPtr pScreen, Rotation rotation, int rate, RRScreenSizePtr pSize); -Rotation xf86RandR12GetRotation(ScreenPtr pScreen); -void xf86RandR12GetOriginalVirtualSize(ScrnInfoPtr pScrn, int *x, int *y); -Bool xf86RandR12PreInit (ScrnInfoPtr pScrn); -void xf86RandR12TellChanged (ScreenPtr pScreen); +extern _X_EXPORT Rotation xf86RandR12GetRotation(ScreenPtr pScreen); +extern _X_EXPORT void xf86RandR12GetOriginalVirtualSize(ScrnInfoPtr pScrn, int *x, int *y); +extern _X_EXPORT Bool xf86RandR12PreInit (ScrnInfoPtr pScrn); +extern _X_EXPORT void xf86RandR12TellChanged (ScreenPtr pScreen); #endif /* _XF86_RANDR_H_ */ diff --git a/hw/xfree86/modes/xf86Rotate.c b/hw/xfree86/modes/xf86Rotate.c index d7f7b3b78..9d7b373ae 100644 --- a/hw/xfree86/modes/xf86Rotate.c +++ b/hw/xfree86/modes/xf86Rotate.c @@ -331,7 +331,7 @@ xf86RotateDestroy (xf86CrtcPtr crtc) } } -_X_EXPORT void +void xf86RotateFreeShadow(ScrnInfoPtr pScrn) { xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn); @@ -349,7 +349,7 @@ xf86RotateFreeShadow(ScrnInfoPtr pScrn) } } -_X_EXPORT void +void xf86RotateCloseScreen (ScreenPtr screen) { ScrnInfoPtr scrn = xf86Screens[screen->myNum]; @@ -387,7 +387,7 @@ xf86CrtcFitsScreen (xf86CrtcPtr crtc, struct pict_f_transform *crtc_to_fb) 0 <= b.y1 && b.y2 <= pScreen->height); } -_X_EXPORT Bool +Bool xf86CrtcRotate (xf86CrtcPtr crtc) { ScrnInfoPtr pScrn = crtc->scrn; diff --git a/hw/xfree86/modes/xf86cvt.c b/hw/xfree86/modes/xf86cvt.c index e9c74aa62..1da5fe50b 100644 --- a/hw/xfree86/modes/xf86cvt.c +++ b/hw/xfree86/modes/xf86cvt.c @@ -63,7 +63,7 @@ * want that. -- libv * */ -_X_EXPORT DisplayModePtr +DisplayModePtr xf86CVTMode(int HDisplay, int VDisplay, float VRefresh, Bool Reduced, Bool Interlaced) { diff --git a/hw/xfree86/modes/xf86gtf.c b/hw/xfree86/modes/xf86gtf.c index fed56bd12..9d5d50a2d 100644 --- a/hw/xfree86/modes/xf86gtf.c +++ b/hw/xfree86/modes/xf86gtf.c @@ -102,7 +102,7 @@ * XServer of fbset mode descriptions, from what I can tell). */ -_X_EXPORT DisplayModePtr +DisplayModePtr xf86GTFMode(int h_pixels, int v_lines, float freq, int interlaced, int margins) { DisplayModeRec *mode = xnfcalloc(1, sizeof(DisplayModeRec)); diff --git a/hw/xfree86/os-support/bsd/alpha_video.c b/hw/xfree86/os-support/bsd/alpha_video.c index 9de25f66b..4b54843d7 100644 --- a/hw/xfree86/os-support/bsd/alpha_video.c +++ b/hw/xfree86/os-support/bsd/alpha_video.c @@ -355,7 +355,7 @@ unmapVidMem(int ScreenNum, pointer Base, unsigned long Size) * Read BIOS via mmap()ing DEV_MEM */ -_X_EXPORT int +int xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf, int Len) { @@ -400,7 +400,7 @@ xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf, extern int ioperm(unsigned long from, unsigned long num, int on); -_X_EXPORT Bool +Bool xf86EnableIO() { if (!ioperm(0, 65536, TRUE)) @@ -408,7 +408,7 @@ xf86EnableIO() return FALSE; } -_X_EXPORT void +void xf86DisableIO() { return; @@ -693,22 +693,22 @@ writeSparseNB32(int Value, pointer Base, register unsigned long Offset) return; } -_X_EXPORT void (*xf86WriteMmio8)(int Value, pointer Base, unsigned long Offset) +void (*xf86WriteMmio8)(int Value, pointer Base, unsigned long Offset) = writeDense8; -_X_EXPORT void (*xf86WriteMmio16)(int Value, pointer Base, unsigned long Offset) +void (*xf86WriteMmio16)(int Value, pointer Base, unsigned long Offset) = writeDense16; -_X_EXPORT void (*xf86WriteMmio32)(int Value, pointer Base, unsigned long Offset) +void (*xf86WriteMmio32)(int Value, pointer Base, unsigned long Offset) = writeDense32; -_X_EXPORT void (*xf86WriteMmioNB8)(int Value, pointer Base, unsigned long Offset) +void (*xf86WriteMmioNB8)(int Value, pointer Base, unsigned long Offset) = writeDenseNB8; -_X_EXPORT void (*xf86WriteMmioNB16)(int Value, pointer Base, unsigned long Offset) +void (*xf86WriteMmioNB16)(int Value, pointer Base, unsigned long Offset) = writeDenseNB16; -_X_EXPORT void (*xf86WriteMmioNB32)(int Value, pointer Base, unsigned long Offset) +void (*xf86WriteMmioNB32)(int Value, pointer Base, unsigned long Offset) = writeDenseNB32; -_X_EXPORT int (*xf86ReadMmio8)(pointer Base, unsigned long Offset) +int (*xf86ReadMmio8)(pointer Base, unsigned long Offset) = readDense8; -_X_EXPORT int (*xf86ReadMmio16)(pointer Base, unsigned long Offset) +int (*xf86ReadMmio16)(pointer Base, unsigned long Offset) = readDense16; -_X_EXPORT int (*xf86ReadMmio32)(pointer Base, unsigned long Offset) +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 a0ebdf2e6..466a8a0db 100644 --- a/hw/xfree86/os-support/bsd/arm_video.c +++ b/hw/xfree86/os-support/bsd/arm_video.c @@ -233,7 +233,7 @@ unmapVidMem(int ScreenNum, pointer Base, unsigned long Size) * Read BIOS via mmap()ing DEV_MEM */ -_X_EXPORT int +int xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf, int Len) { @@ -450,7 +450,7 @@ armUnmapVidMem(int ScreenNum, pointer Base, unsigned long Size) #ifdef USE_DEV_IO static int IoFd = -1; -_X_EXPORT Bool +Bool xf86EnableIO() { if (IoFd >= 0) @@ -465,7 +465,7 @@ xf86EnableIO() return TRUE; } -_X_EXPORT void +void xf86DisableIO() { if (IoFd < 0) diff --git a/hw/xfree86/os-support/bsd/bsd_VTsw.c b/hw/xfree86/os-support/bsd/bsd_VTsw.c index 81eec52e3..476a0e957 100644 --- a/hw/xfree86/os-support/bsd/bsd_VTsw.c +++ b/hw/xfree86/os-support/bsd/bsd_VTsw.c @@ -41,7 +41,7 @@ * This function is the signal handler for the VT-switching signal. It * is only referenced inside the OS-support layer. */ -_X_EXPORT void +void xf86VTRequest(int sig) { #if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT) @@ -52,7 +52,7 @@ xf86VTRequest(int sig) return; } -_X_EXPORT Bool +Bool xf86VTSwitchPending() { #if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT) @@ -63,7 +63,7 @@ xf86VTSwitchPending() return FALSE; } -_X_EXPORT Bool +Bool xf86VTSwitchAway() { #if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT) @@ -78,7 +78,7 @@ xf86VTSwitchAway() return FALSE; } -_X_EXPORT Bool +Bool xf86VTSwitchTo() { #if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT) diff --git a/hw/xfree86/os-support/bsd/bsd_apm.c b/hw/xfree86/os-support/bsd/bsd_apm.c index feaed21a2..43eda7421 100644 --- a/hw/xfree86/os-support/bsd/bsd_apm.c +++ b/hw/xfree86/os-support/bsd/bsd_apm.c @@ -108,7 +108,7 @@ bsdPMConfirmEventToOs(int fd, pmEvent event) } } -_X_EXPORT PMClose +PMClose xf86OSPMOpen(void) { int fd; diff --git a/hw/xfree86/os-support/bsd/bsd_bell.c b/hw/xfree86/os-support/bsd/bsd_bell.c index 0d2420102..55eb75231 100644 --- a/hw/xfree86/os-support/bsd/bsd_bell.c +++ b/hw/xfree86/os-support/bsd/bsd_bell.c @@ -41,7 +41,7 @@ #define KBD_FD(i) ((i).kbdFd != -1 ? (i).kbdFd : (i).consoleFd) #endif -_X_EXPORT void +void xf86OSRingBell(int loudness, int pitch, int duration) { #ifdef WSCONS_SUPPORT diff --git a/hw/xfree86/os-support/bsd/bsd_init.c b/hw/xfree86/os-support/bsd/bsd_init.c index 842523991..cbb9e4810 100644 --- a/hw/xfree86/os-support/bsd/bsd_init.c +++ b/hw/xfree86/os-support/bsd/bsd_init.c @@ -152,7 +152,7 @@ static xf86ConsOpen_t xf86ConsTab[] = { }; -_X_EXPORT void +void xf86OpenConsole() { int i, fd = -1; @@ -644,7 +644,7 @@ xf86OpenWScons() #endif /* WSCONS_SUPPORT */ -_X_EXPORT void +void xf86CloseConsole() { #if defined(SYSCONS_SUPPORT) || defined(PCVT_SUPPORT) @@ -704,7 +704,7 @@ xf86CloseConsole() return; } -_X_EXPORT int +int xf86ProcessArgument(int argc, char *argv[], int i) { /* @@ -732,7 +732,7 @@ xf86ProcessArgument(int argc, char *argv[], int i) return(0); } -_X_EXPORT void +void xf86UseMsg() { #if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT) diff --git a/hw/xfree86/os-support/bsd/bsd_kmod.c b/hw/xfree86/os-support/bsd/bsd_kmod.c index b6c755852..34e434188 100644 --- a/hw/xfree86/os-support/bsd/bsd_kmod.c +++ b/hw/xfree86/os-support/bsd/bsd_kmod.c @@ -19,7 +19,7 @@ * Return: * 0 for failure, 1 for success */ -_X_EXPORT int xf86LoadKernelModule(const char *modName) +int xf86LoadKernelModule(const char *modName) { if (kldload(modName) != -1) return 1; diff --git a/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c b/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c index db7dfbcd5..b37070c37 100644 --- a/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c +++ b/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c @@ -153,7 +153,7 @@ bsdPMConfirmEventToOs(int dummyfd, pmEvent event) } } -_X_EXPORT PMClose +PMClose xf86OSPMOpen(void) { int kq; diff --git a/hw/xfree86/os-support/bsd/i386_video.c b/hw/xfree86/os-support/bsd/i386_video.c index 4fc6dd714..10db9c7b8 100644 --- a/hw/xfree86/os-support/bsd/i386_video.c +++ b/hw/xfree86/os-support/bsd/i386_video.c @@ -279,7 +279,7 @@ unmapVidMem(int ScreenNum, pointer Base, unsigned long Size) * Read BIOS via mmap()ing DEV_MEM */ -_X_EXPORT int +int xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf, int Len) { @@ -331,7 +331,7 @@ xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf, static Bool ExtendedEnabled = FALSE; -_X_EXPORT Bool +Bool xf86EnableIO() { if (ExtendedEnabled) @@ -353,7 +353,7 @@ xf86EnableIO() return TRUE; } -_X_EXPORT void +void xf86DisableIO() { if (!ExtendedEnabled) @@ -448,7 +448,7 @@ xf86DisableIO() /***************************************************************************/ /* Set TV output mode */ /***************************************************************************/ -_X_EXPORT void +void xf86SetTVOut(int mode) { switch (xf86Info.consType) @@ -473,7 +473,7 @@ xf86SetTVOut(int mode) return; } -_X_EXPORT void +void xf86SetRGBOut() { switch (xf86Info.consType) diff --git a/hw/xfree86/os-support/bsd/ppc_video.c b/hw/xfree86/os-support/bsd/ppc_video.c index 86b7fb3fa..7e3fcdb2c 100644 --- a/hw/xfree86/os-support/bsd/ppc_video.c +++ b/hw/xfree86/os-support/bsd/ppc_video.c @@ -68,7 +68,7 @@ xf86OSInitVidMem(VidMemInfoPtr pVidMem) } -_X_EXPORT volatile unsigned char *ioBase = MAP_FAILED; +volatile unsigned char *ioBase = MAP_FAILED; static pointer ppcMapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags) @@ -97,7 +97,7 @@ ppcUnmapVidMem(int ScreenNum, pointer Base, unsigned long Size) munmap(Base, Size); } -_X_EXPORT int +int xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf, int Len) { @@ -123,7 +123,7 @@ xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf, return rv; } -_X_EXPORT Bool xf86EnableIO() +Bool xf86EnableIO() { int fd = xf86Info.screenFd; @@ -141,7 +141,7 @@ _X_EXPORT Bool xf86EnableIO() return TRUE; } -_X_EXPORT void xf86DisableIO() +void xf86DisableIO() { if (ioBase != MAP_FAILED) diff --git a/hw/xfree86/os-support/bsd/sparc64_video.c b/hw/xfree86/os-support/bsd/sparc64_video.c index fe3b5e7f2..ea520c49e 100644 --- a/hw/xfree86/os-support/bsd/sparc64_video.c +++ b/hw/xfree86/os-support/bsd/sparc64_video.c @@ -82,7 +82,7 @@ sparc64UnmapVidMem(int ScreenNum, pointer Base, unsigned long Size) munmap(Base, Size); } -_X_EXPORT int +int xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf, int Len) { diff --git a/hw/xfree86/os-support/bus/Pci.c b/hw/xfree86/os-support/bus/Pci.c index 888a9e36d..8c1aa6e2e 100644 --- a/hw/xfree86/os-support/bus/Pci.c +++ b/hw/xfree86/os-support/bus/Pci.c @@ -140,7 +140,7 @@ pciBusFuncs_t *pciBusFuncs = NULL; -_X_EXPORT ADDRESS +ADDRESS pciBusAddrToHostAddr(PCITAG tag, PciAddrType type, ADDRESS addr) { if (pciBusFuncs && pciBusFuncs->pciAddrBusToHost) @@ -149,7 +149,7 @@ pciBusAddrToHostAddr(PCITAG tag, PciAddrType type, ADDRESS addr) return addr; } -_X_EXPORT PCITAG +PCITAG pciTag(int busnum, int devnum, int funcnum) { return(PCI_MAKE_TAG(busnum,devnum,funcnum)); @@ -161,7 +161,7 @@ pciAddrNOOP(PCITAG tag, PciAddrType type, ADDRESS addr) return(addr); } -_X_EXPORT Bool +Bool xf86scanpci(void) { Bool success = FALSE; diff --git a/hw/xfree86/os-support/bus/Sbus.c b/hw/xfree86/os-support/bus/Sbus.c index 2fe34bcaa..0b6205f0b 100644 --- a/hw/xfree86/os-support/bus/Sbus.c +++ b/hw/xfree86/os-support/bus/Sbus.c @@ -41,7 +41,7 @@ #include "xf86sbusBus.h" #include "xf86Sbus.h" -_X_EXPORT int promRootNode; +int promRootNode; static int promFd = -1; static int promCurrentNode; @@ -51,7 +51,7 @@ static int promP1275 = -1; #define MAX_VAL (4096-128-4) static struct openpromio *promOpio; -_X_EXPORT sbusDevicePtr *xf86SbusInfo = NULL; +sbusDevicePtr *xf86SbusInfo = NULL; struct sbus_devtable sbusDeviceTable[] = { { SBUS_DEVICE_BW2, FBTYPE_SUN2BW, "bwtwo", "sunbw2", "Sun Monochrome (bwtwo)" }, @@ -71,7 +71,7 @@ struct sbus_devtable sbusDeviceTable[] = { { 0, 0, NULL } }; -_X_EXPORT int +int promGetSibling(int node) { promOpio->oprom_size = sizeof(int); @@ -84,7 +84,7 @@ promGetSibling(int node) return *(int *)promOpio->oprom_array; } -_X_EXPORT int +int promGetChild(int node) { promOpio->oprom_size = sizeof(int); @@ -97,7 +97,7 @@ promGetChild(int node) return *(int *)promOpio->oprom_array; } -_X_EXPORT char * +char * promGetProperty(const char *prop, int *lenp) { promOpio->oprom_size = MAX_VAL; @@ -109,7 +109,7 @@ promGetProperty(const char *prop, int *lenp) return promOpio->oprom_array; } -_X_EXPORT int +int promGetBool(const char *prop) { promOpio->oprom_size = 0; @@ -180,7 +180,7 @@ promIsP1275(void) #endif } -_X_EXPORT void +void sparcPromClose(void) { if (promOpenCount > 1) { @@ -198,7 +198,7 @@ sparcPromClose(void) promOpenCount = 0; } -_X_EXPORT int +int sparcPromInit(void) { if (promOpenCount) { @@ -224,7 +224,7 @@ sparcPromInit(void) return 0; } -_X_EXPORT char * +char * sparcPromGetProperty(sbusPromNodePtr pnode, const char *prop, int *lenp) { if (promSetNode(pnode)) @@ -232,7 +232,7 @@ sparcPromGetProperty(sbusPromNodePtr pnode, const char *prop, int *lenp) return promGetProperty(prop, lenp); } -_X_EXPORT int +int sparcPromGetBool(sbusPromNodePtr pnode, const char *prop) { if (promSetNode(pnode)) @@ -281,7 +281,7 @@ promWalkGetDriverName(int node, int oldnode) return NULL; } -_X_EXPORT char * +char * sparcDriverName(void) { char *name; @@ -367,7 +367,7 @@ promWalkAssignNodes(int node, int oldnode, int flags, sbusDevicePtr *devicePtrs) promWalkAssignNodes(nextnode, node, PROM_NODE_SIBLING | sbus, devicePtrs); } -_X_EXPORT void +void sparcPromAssignNodes(void) { sbusDevicePtr psdp, *psdpp; @@ -509,7 +509,7 @@ promWalkNode2Pathname(char *path, int parent, int node, int searchNode, int type return 0; } -_X_EXPORT char * +char * sparcPromNode2Pathname(sbusPromNodePtr pnode) { char *ret; @@ -578,7 +578,7 @@ promWalkPathname2Node(char *name, char *regstr, int parent, int type) } } -_X_EXPORT int +int sparcPromPathname2Node(const char *pathName) { int i; @@ -609,7 +609,7 @@ sparcPromPathname2Node(const char *pathName) return i; } -_X_EXPORT pointer +pointer xf86MapSbusMem(sbusDevicePtr psdp, unsigned long offset, unsigned long size) { pointer ret; @@ -636,7 +636,7 @@ xf86MapSbusMem(sbusDevicePtr psdp, unsigned long offset, unsigned long size) return (char *)ret + (offset - off); } -_X_EXPORT void +void xf86UnmapSbusMem(sbusDevicePtr psdp, pointer addr, unsigned long size) { unsigned long mask = getpagesize() - 1; @@ -647,7 +647,7 @@ xf86UnmapSbusMem(sbusDevicePtr psdp, pointer addr, unsigned long size) } /* Tell OS that we are driving the HW cursor ourselves. */ -_X_EXPORT void +void xf86SbusHideOsHwCursor(sbusDevicePtr psdp) { struct fbcursor fbcursor; @@ -668,7 +668,7 @@ xf86SbusHideOsHwCursor(sbusDevicePtr psdp) } /* Set HW cursor colormap. */ -_X_EXPORT void +void xf86SbusSetOsHwCursorCmap(sbusDevicePtr psdp, int bg, int fg) { struct fbcursor fbcursor; diff --git a/hw/xfree86/os-support/bus/bsd_pci.c b/hw/xfree86/os-support/bus/bsd_pci.c index 9b55d3a44..17b52db49 100644 --- a/hw/xfree86/os-support/bus/bsd_pci.c +++ b/hw/xfree86/os-support/bus/bsd_pci.c @@ -48,7 +48,7 @@ #include "pciaccess.h" -_X_EXPORT pointer +pointer xf86MapDomainMemory(int ScreenNum, int Flags, struct pci_device *dev, ADDRESS Base, unsigned long Size) { diff --git a/hw/xfree86/os-support/bus/linuxPci.c b/hw/xfree86/os-support/bus/linuxPci.c index fdd10d1d5..5cb328d43 100644 --- a/hw/xfree86/os-support/bus/linuxPci.c +++ b/hw/xfree86/os-support/bus/linuxPci.c @@ -464,7 +464,7 @@ linuxOpenLegacy(struct pci_device *dev, 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). */ -_X_EXPORT pointer +pointer xf86MapDomainMemory(int ScreenNum, int Flags, struct pci_device *dev, ADDRESS Base, unsigned long Size) { @@ -531,7 +531,7 @@ xf86MapLegacyIO(struct pci_device *dev) return (IOADDRESS)DomainMmappedIO[domain]; } -_X_EXPORT resPtr +resPtr xf86AccResFromOS(resPtr pRes) { struct pci_device *dev; diff --git a/hw/xfree86/os-support/bus/xf86Pci.h b/hw/xfree86/os-support/bus/xf86Pci.h index 3a73678b3..415f0710b 100644 --- a/hw/xfree86/os-support/bus/xf86Pci.h +++ b/hw/xfree86/os-support/bus/xf86Pci.h @@ -251,13 +251,13 @@ typedef enum { /* Public PCI access functions */ -ADDRESS pciBusAddrToHostAddr(PCITAG tag, PciAddrType type, ADDRESS addr); -PCITAG pciTag(int busnum, int devnum, int funcnum); -Bool xf86scanpci(void); +extern _X_EXPORT ADDRESS pciBusAddrToHostAddr(PCITAG tag, PciAddrType type, ADDRESS addr); +extern _X_EXPORT PCITAG pciTag(int busnum, int devnum, int funcnum); +extern _X_EXPORT Bool xf86scanpci(void); /* Domain access functions. Some of these probably shouldn't be public */ -pointer xf86MapDomainMemory(int ScreenNum, int Flags, struct pci_device *dev, +extern _X_EXPORT pointer xf86MapDomainMemory(int ScreenNum, int Flags, struct pci_device *dev, ADDRESS Base, unsigned long Size); -IOADDRESS xf86MapLegacyIO(struct pci_device *dev); +extern _X_EXPORT IOADDRESS xf86MapLegacyIO(struct pci_device *dev); #endif /* _XF86PCI_H */ diff --git a/hw/xfree86/os-support/hurd/hurd_bell.c b/hw/xfree86/os-support/hurd/hurd_bell.c index 732a1cadb..33965a44c 100644 --- a/hw/xfree86/os-support/hurd/hurd_bell.c +++ b/hw/xfree86/os-support/hurd/hurd_bell.c @@ -30,7 +30,7 @@ #include "xf86.h" #include "xf86Priv.h" -_X_EXPORT void +void xf86OSRingBell(int loudness, int pitch, int duration) { return; diff --git a/hw/xfree86/os-support/hurd/hurd_init.c b/hw/xfree86/os-support/hurd/hurd_init.c index 9f5e78403..94e261553 100644 --- a/hw/xfree86/os-support/hurd/hurd_init.c +++ b/hw/xfree86/os-support/hurd/hurd_init.c @@ -43,19 +43,19 @@ #include <assert.h> #include <mach.h> -_X_EXPORT int +int xf86ProcessArgument( int argc,char **argv, int i ) { return 0; } -_X_EXPORT void +void xf86UseMsg() { return; } -_X_EXPORT void +void xf86OpenConsole() { if( serverGeneration == 1 ) @@ -81,7 +81,7 @@ xf86OpenConsole() return; } -_X_EXPORT void +void xf86CloseConsole() { close( xf86Info.consoleFd ); diff --git a/hw/xfree86/os-support/hurd/hurd_video.c b/hw/xfree86/os-support/hurd/hurd_video.c index 87f5e90cb..9f2e2bd01 100644 --- a/hw/xfree86/os-support/hurd/hurd_video.c +++ b/hw/xfree86/os-support/hurd/hurd_video.c @@ -41,7 +41,7 @@ /************************************************************************** * Video Memory Mapping section ***************************************************************************/ -_X_EXPORT pointer +pointer xf86MapVidMem(int ScreenNum,int Flags, unsigned long Base, unsigned long Size) { mach_port_t device,iopl_dev; @@ -95,7 +95,7 @@ xf86MapVidMem(int ScreenNum,int Flags, unsigned long Base, unsigned long Size) return (pointer)addr; } -_X_EXPORT void +void xf86UnMapVidMem(int ScreenNum,pointer Base,unsigned long Size) { kern_return_t err = vm_deallocate(mach_task_self(), (int)Base, Size); @@ -107,7 +107,7 @@ xf86UnMapVidMem(int ScreenNum,pointer Base,unsigned long Size) return; } -_X_EXPORT Bool +Bool xf86LinearVidMem() { return(TRUE); @@ -123,7 +123,7 @@ xf86LinearVidMem() */ extern int ioperm(unsigned long __from, unsigned long __num, int __turn_on); -_X_EXPORT Bool +Bool xf86EnableIO() { if (ioperm(0, 0x10000, 1)) { @@ -135,20 +135,20 @@ xf86EnableIO() return TRUE; } -_X_EXPORT void +void xf86DisableIO() { ioperm(0,0x10000,0); return; } -_X_EXPORT void +void xf86MapReadSideEffects(int ScreenNum, int Flags, pointer Base, unsigned long Size) { } -_X_EXPORT Bool +Bool xf86CheckMTRR(int s) { return FALSE; diff --git a/hw/xfree86/os-support/linux/int10/linux.c b/hw/xfree86/os-support/linux/int10/linux.c index 45ddaa894..8274bbbfb 100644 --- a/hw/xfree86/os-support/linux/int10/linux.c +++ b/hw/xfree86/os-support/linux/int10/linux.c @@ -71,7 +71,7 @@ static Int10LinuxSubModuleState int10LinuxLoadSubModule(ScrnInfoPtr pScrn); #endif /* DoSubModules */ -_X_EXPORT xf86Int10InfoPtr +xf86Int10InfoPtr xf86ExtendedInitInt10(int entityIndex, int Flags) { xf86Int10InfoPtr pInt = NULL; @@ -334,7 +334,7 @@ error0: return NULL; } -_X_EXPORT Bool +Bool MapCurrentInt10(xf86Int10InfoPtr pInt) { pointer addr; @@ -393,7 +393,7 @@ MapCurrentInt10(xf86Int10InfoPtr pInt) return TRUE; } -_X_EXPORT void +void xf86FreeInt10(xf86Int10InfoPtr pInt) { if (!pInt) @@ -422,7 +422,7 @@ xf86FreeInt10(xf86Int10InfoPtr pInt) xfree(pInt); } -_X_EXPORT void * +void * xf86Int10AllocPages(xf86Int10InfoPtr pInt, int num, int *off) { int pagesize = getpagesize(); @@ -451,7 +451,7 @@ xf86Int10AllocPages(xf86Int10InfoPtr pInt, int num, int *off) return ((linuxInt10Priv*)pInt->private)->base + ((i + 1) * pagesize); } -_X_EXPORT void +void xf86Int10FreePages(xf86Int10InfoPtr pInt, void *pbase, int num) { int pagesize = getpagesize(); @@ -500,7 +500,7 @@ void write_l(xf86Int10InfoPtr pInt, int addr, CARD32 val) *((CARD32 *)(memType) addr) = val; } -_X_EXPORT pointer +pointer xf86int10Addr(xf86Int10InfoPtr pInt, CARD32 addr) { if (addr < V_RAM) diff --git a/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c b/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c index ffdc0127f..9412b07a4 100644 --- a/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c +++ b/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c @@ -20,7 +20,7 @@ static int vm86_rep(struct vm86_struct *ptr); static struct vm86_struct vm86_s; -_X_EXPORT Bool +Bool xf86Int10ExecSetup(xf86Int10InfoPtr pInt) { #define VM86S ((struct vm86_struct *)pInt->cpuRegs) @@ -255,7 +255,7 @@ do_vm86(xf86Int10InfoPtr pInt) return 1; } -_X_EXPORT void +void xf86ExecX86int10(xf86Int10InfoPtr pInt) { int sig = setup_int(pInt); diff --git a/hw/xfree86/os-support/linux/lnx_agp.c b/hw/xfree86/os-support/linux/lnx_agp.c index ded9e0fae..4c1722fef 100644 --- a/hw/xfree86/os-support/linux/lnx_agp.c +++ b/hw/xfree86/os-support/linux/lnx_agp.c @@ -43,7 +43,7 @@ static Bool initDone = FALSE; * Close /dev/agpgart. This frees all associated memory allocated during * this server generation. */ -_X_EXPORT Bool +Bool xf86GARTCloseScreen(int screenNum) { if(gartFd != -1) { @@ -116,13 +116,13 @@ GARTInit(int screenNum) return TRUE; } -_X_EXPORT Bool +Bool xf86AgpGARTSupported() { return GARTInit(-1); } -_X_EXPORT AgpInfoPtr +AgpInfoPtr xf86GetAGPInfo(int screenNum) { struct _agp_info agpinf; @@ -165,7 +165,7 @@ xf86GetAGPInfo(int screenNum) * count instead of using acquiredScreen? */ -_X_EXPORT Bool +Bool xf86AcquireGART(int screenNum) { if (screenNum != -1 && !GARTInit(screenNum)) @@ -183,7 +183,7 @@ xf86AcquireGART(int screenNum) return TRUE; } -_X_EXPORT Bool +Bool xf86ReleaseGART(int screenNum) { if (screenNum != -1 && !GARTInit(screenNum)) @@ -213,7 +213,7 @@ xf86ReleaseGART(int screenNum) return FALSE; } -_X_EXPORT int +int xf86AllocateGARTMemory(int screenNum, unsigned long size, int type, unsigned long *physical) { @@ -251,7 +251,7 @@ xf86AllocateGARTMemory(int screenNum, unsigned long size, int type, return alloc.key; } -_X_EXPORT Bool +Bool xf86DeallocateGARTMemory(int screenNum, int key) { if (!GARTInit(screenNum) || acquiredScreen != screenNum) @@ -278,7 +278,7 @@ xf86DeallocateGARTMemory(int screenNum, int key) } /* Bind GART memory with "key" at "offset" */ -_X_EXPORT Bool +Bool xf86BindGARTMemory(int screenNum, int key, unsigned long offset) { struct _agp_bind bind; @@ -321,7 +321,7 @@ xf86BindGARTMemory(int screenNum, int key, unsigned long offset) /* Unbind GART memory with "key" */ -_X_EXPORT Bool +Bool xf86UnbindGARTMemory(int screenNum, int key) { struct _agp_unbind unbind; @@ -353,7 +353,7 @@ xf86UnbindGARTMemory(int screenNum, int key) /* XXX Interface may change. */ -_X_EXPORT Bool +Bool xf86EnableAGP(int screenNum, CARD32 mode) { agp_setup setup; diff --git a/hw/xfree86/os-support/linux/lnx_apm.c b/hw/xfree86/os-support/linux/lnx_apm.c index b1328cd64..16ac80db8 100644 --- a/hw/xfree86/os-support/linux/lnx_apm.c +++ b/hw/xfree86/os-support/linux/lnx_apm.c @@ -133,7 +133,7 @@ lnxPMConfirmEventToOs(int fd, pmEvent event) #endif // HAVE_APM -_X_EXPORT PMClose +PMClose xf86OSPMOpen(void) { PMClose ret = NULL; diff --git a/hw/xfree86/os-support/linux/lnx_axp.c b/hw/xfree86/os-support/linux/lnx_axp.c index e8b6d4749..f7151c8f4 100644 --- a/hw/xfree86/os-support/linux/lnx_axp.c +++ b/hw/xfree86/os-support/linux/lnx_axp.c @@ -131,12 +131,12 @@ extern unsigned int _dense_inb(unsigned long); extern unsigned int _dense_inw(unsigned long); extern unsigned int _dense_inl(unsigned long); -_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; +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; 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_bell.c b/hw/xfree86/os-support/linux/lnx_bell.c index 702dfa675..75cdd3ebc 100644 --- a/hw/xfree86/os-support/linux/lnx_bell.c +++ b/hw/xfree86/os-support/linux/lnx_bell.c @@ -34,7 +34,7 @@ #include "xf86Priv.h" #include "xf86_OSproc.h" -_X_EXPORT void +void xf86OSRingBell(int loudness, int pitch, int duration) { if (xf86Info.consoleFd == -1 || !pitch || !loudness) diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c index d37242ff3..da5ca57cc 100644 --- a/hw/xfree86/os-support/linux/lnx_init.c +++ b/hw/xfree86/os-support/linux/lnx_init.c @@ -93,7 +93,7 @@ drain_console(int fd, void *closure) tcflush(fd, TCIOFLUSH); } -_X_EXPORT void +void xf86OpenConsole(void) { int i, fd = -1; @@ -347,7 +347,7 @@ xf86OpenConsole(void) return; } -_X_EXPORT void +void xf86CloseConsole() { struct vt_mode VT; @@ -419,7 +419,7 @@ xf86CloseConsole() return; } -_X_EXPORT int +int xf86ProcessArgument(int argc, char *argv[], int i) { /* @@ -454,7 +454,7 @@ xf86ProcessArgument(int argc, char *argv[], int i) return(0); } -_X_EXPORT void +void xf86UseMsg() { ErrorF("vtXX use the specified VT number\n"); diff --git a/hw/xfree86/os-support/linux/lnx_kmod.c b/hw/xfree86/os-support/linux/lnx_kmod.c index 4e6f2d25d..0b9493d27 100644 --- a/hw/xfree86/os-support/linux/lnx_kmod.c +++ b/hw/xfree86/os-support/linux/lnx_kmod.c @@ -36,7 +36,7 @@ * Return: * 0 for failure, 1 for success */ -_X_EXPORT int +int xf86LoadKernelModule(const char *modName) { char mpPath[MAX_PATH] = ""; diff --git a/hw/xfree86/os-support/linux/lnx_pci.c b/hw/xfree86/os-support/linux/lnx_pci.c index 2b8356159..8eedfa49f 100644 --- a/hw/xfree86/os-support/linux/lnx_pci.c +++ b/hw/xfree86/os-support/linux/lnx_pci.c @@ -138,7 +138,7 @@ static struct pci_dev *xf86OSLinuxGetPciDevs(void) { } /* Query the kvirt address (64bit) of a BAR range from size for a given TAG */ -_X_EXPORT unsigned long +unsigned long xf86GetOSOffsetFromPCI(PCITAG tag, int space, unsigned long base) { unsigned int ndx; diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c index 688106af4..ed3576638 100644 --- a/hw/xfree86/os-support/linux/lnx_video.c +++ b/hw/xfree86/os-support/linux/lnx_video.c @@ -494,7 +494,7 @@ unmapVidMem(int ScreenNum, pointer Base, unsigned long Size) /***************************************************************************/ #if defined(__powerpc__) -_X_EXPORT volatile unsigned char *ioBase = NULL; +volatile unsigned char *ioBase = NULL; #ifndef __NR_pciconfig_iobase #define __NR_pciconfig_iobase 200 @@ -502,7 +502,7 @@ _X_EXPORT volatile unsigned char *ioBase = NULL; #endif -_X_EXPORT Bool +Bool xf86EnableIO(void) { #if defined(__powerpc__) @@ -551,7 +551,7 @@ xf86EnableIO(void) return TRUE; } -_X_EXPORT void +void xf86DisableIO(void) { if (!ExtendedEnabled) @@ -869,23 +869,23 @@ writeSparseNB32(int Value, pointer Base, register unsigned long Offset) return; } -_X_EXPORT void (*xf86WriteMmio8)(int Value, pointer Base, unsigned long Offset) +void (*xf86WriteMmio8)(int Value, pointer Base, unsigned long Offset) = writeDense8; -_X_EXPORT void (*xf86WriteMmio16)(int Value, pointer Base, unsigned long Offset) +void (*xf86WriteMmio16)(int Value, pointer Base, unsigned long Offset) = writeDense16; -_X_EXPORT void (*xf86WriteMmio32)(int Value, pointer Base, unsigned long Offset) +void (*xf86WriteMmio32)(int Value, pointer Base, unsigned long Offset) = writeDense32; -_X_EXPORT void (*xf86WriteMmioNB8)(int Value, pointer Base, unsigned long Offset) +void (*xf86WriteMmioNB8)(int Value, pointer Base, unsigned long Offset) = writeDenseNB8; -_X_EXPORT void (*xf86WriteMmioNB16)(int Value, pointer Base, unsigned long Offset) +void (*xf86WriteMmioNB16)(int Value, pointer Base, unsigned long Offset) = writeDenseNB16; -_X_EXPORT void (*xf86WriteMmioNB32)(int Value, pointer Base, unsigned long Offset) +void (*xf86WriteMmioNB32)(int Value, pointer Base, unsigned long Offset) = writeDenseNB32; -_X_EXPORT int (*xf86ReadMmio8)(pointer Base, unsigned long Offset) +int (*xf86ReadMmio8)(pointer Base, unsigned long Offset) = readDense8; -_X_EXPORT int (*xf86ReadMmio16)(pointer Base, unsigned long Offset) +int (*xf86ReadMmio16)(pointer Base, unsigned long Offset) = readDense16; -_X_EXPORT int (*xf86ReadMmio32)(pointer Base, unsigned long Offset) +int (*xf86ReadMmio32)(pointer Base, unsigned long Offset) = readDense32; #endif /* __alpha__ */ diff --git a/hw/xfree86/os-support/misc/BUSmemcpy.c b/hw/xfree86/os-support/misc/BUSmemcpy.c index 0500bf6c1..e6ffde97e 100644 --- a/hw/xfree86/os-support/misc/BUSmemcpy.c +++ b/hw/xfree86/os-support/misc/BUSmemcpy.c @@ -31,12 +31,12 @@ Thanks to Linus Torvalds for contributing this code. static unsigned long __memcpy(unsigned long dest, unsigned long src, int n); -_X_EXPORT void +void xf86BusToMem(unsigned char *dst, unsigned char *src, int len) { __memcpy((unsigned long)dst, (unsigned long)src, len); } -_X_EXPORT void +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 b18789a3a..35ced8ceb 100644 --- a/hw/xfree86/os-support/misc/Delay.c +++ b/hw/xfree86/os-support/misc/Delay.c @@ -9,7 +9,7 @@ #include <time.h> -_X_EXPORT void +void xf86UDelay(long usec) { #if 0 diff --git a/hw/xfree86/os-support/misc/SlowBcopy.c b/hw/xfree86/os-support/misc/SlowBcopy.c index be69b9dd1..182a3e6ec 100644 --- a/hw/xfree86/os-support/misc/SlowBcopy.c +++ b/hw/xfree86/os-support/misc/SlowBcopy.c @@ -24,7 +24,7 @@ static int really_slow_bcopy; -_X_EXPORT void +void xf86SetReallySlowBcopy(void) { really_slow_bcopy = 1; @@ -42,7 +42,7 @@ static void xf86_really_slow_bcopy(unsigned char *src, unsigned char *dst, int l #endif /* The outb() isn't needed on my machine, but who knows ... -- ost */ -_X_EXPORT void +void xf86SlowBcopy(unsigned char *src, unsigned char *dst, int len) { #if defined(__i386__) || defined(__amd64__) @@ -67,7 +67,7 @@ xf86SlowBcopy(unsigned char *src, unsigned char *dst, int len) #endif -_X_EXPORT void +void xf86SlowBCopyFromBus(unsigned char *src, unsigned char *dst, int count) { unsigned long addr; @@ -84,7 +84,7 @@ xf86SlowBCopyFromBus(unsigned char *src, unsigned char *dst, int count) } } -_X_EXPORT void +void xf86SlowBCopyToBus(unsigned char *src, unsigned char *dst, int count) { unsigned long addr; diff --git a/hw/xfree86/os-support/sco/VTsw_sco.c b/hw/xfree86/os-support/sco/VTsw_sco.c index b7e890ab8..d126e7869 100644 --- a/hw/xfree86/os-support/sco/VTsw_sco.c +++ b/hw/xfree86/os-support/sco/VTsw_sco.c @@ -48,14 +48,14 @@ * re-arm the signal here. All we need to do now is record the fact that * we got the signal. XFree86 handles the rest. */ -_X_EXPORT void +void xf86VTRequest(int sig) { xf86Info.vtRequestsPending = TRUE; return; } -_X_EXPORT Bool +Bool xf86VTSwitchPending(void) { return(xf86Info.vtRequestsPending ? TRUE : FALSE); @@ -69,7 +69,7 @@ xf86VTSwitchPending(void) static int sco_ledstatus = -1; static unsigned int sco_ledstate = 0; -_X_EXPORT Bool +Bool xf86VTSwitchAway(void) { ev_flush(); @@ -90,7 +90,7 @@ xf86VTSwitchAway(void) * and we need to restore the LED settings to what they were when we * switched away. */ -_X_EXPORT Bool +Bool xf86VTSwitchTo(void) { ev_resume(); diff --git a/hw/xfree86/os-support/sco/sco_init.c b/hw/xfree86/os-support/sco/sco_init.c index 2f3126b53..5f7db3437 100644 --- a/hw/xfree86/os-support/sco/sco_init.c +++ b/hw/xfree86/os-support/sco/sco_init.c @@ -42,7 +42,7 @@ static int sco_console_mode = -1; extern Bool mpxLock; -_X_EXPORT void +void xf86OpenConsole(void) { int i, ioctl_ret; @@ -192,7 +192,7 @@ xf86OpenConsole(void) * to do a soft reset on the card, which really does help settle the * video card down again after coming out of Xfree86. */ -_X_EXPORT void +void xf86CloseConsole(void) { struct vt_mode VT; @@ -224,7 +224,7 @@ xf86CloseConsole(void) close(xf86Info.consoleFd); /* We're done with the device */ } -_X_EXPORT int +int xf86ProcessArgument(int argc, char *argv[], int i) { /* @@ -283,7 +283,7 @@ xf86ProcessArgument(int argc, char *argv[], int i) return(0); } -_X_EXPORT void +void xf86UseMsg(void) { ErrorF("vtXX use the specified VT number\n"); diff --git a/hw/xfree86/os-support/sco/sco_iop.c b/hw/xfree86/os-support/sco/sco_iop.c index 86210d71a..3da4fcf3a 100644 --- a/hw/xfree86/os-support/sco/sco_iop.c +++ b/hw/xfree86/os-support/sco/sco_iop.c @@ -64,7 +64,7 @@ extern long sysi86 (int cmd, ...); static Bool IOEnabled = FALSE; -_X_EXPORT Bool +Bool xf86EnableIO(void) { if (IOEnabled) @@ -79,7 +79,7 @@ xf86EnableIO(void) return TRUE; } -_X_EXPORT void +void xf86DisableIO(void) { if (!IOEnabled) diff --git a/hw/xfree86/os-support/shared/VTsw_noop.c b/hw/xfree86/os-support/shared/VTsw_noop.c index b43908f05..a3cfe40b9 100644 --- a/hw/xfree86/os-support/shared/VTsw_noop.c +++ b/hw/xfree86/os-support/shared/VTsw_noop.c @@ -35,19 +35,19 @@ * No-op functions for OSs without VTs */ -_X_EXPORT Bool +Bool xf86VTSwitchPending() { return(FALSE); } -_X_EXPORT Bool +Bool xf86VTSwitchAway() { return(FALSE); } -_X_EXPORT Bool +Bool xf86VTSwitchTo() { return(TRUE); diff --git a/hw/xfree86/os-support/shared/VTsw_usl.c b/hw/xfree86/os-support/shared/VTsw_usl.c index ea07aae8a..4d473147f 100644 --- a/hw/xfree86/os-support/shared/VTsw_usl.c +++ b/hw/xfree86/os-support/shared/VTsw_usl.c @@ -44,7 +44,7 @@ * This function is the signal handler for the VT-switching signal. It * is only referenced inside the OS-support layer. */ -_X_EXPORT void +void xf86VTRequest(int sig) { signal(sig, (void(*)(int))xf86VTRequest); @@ -52,13 +52,13 @@ xf86VTRequest(int sig) return; } -_X_EXPORT Bool +Bool xf86VTSwitchPending() { return(xf86Info.vtRequestsPending ? TRUE : FALSE); } -_X_EXPORT Bool +Bool xf86VTSwitchAway() { xf86Info.vtRequestsPending = FALSE; @@ -75,7 +75,7 @@ xf86VTSwitchAway() } } -_X_EXPORT Bool +Bool xf86VTSwitchTo() { xf86Info.vtRequestsPending = FALSE; diff --git a/hw/xfree86/os-support/shared/agp_noop.c b/hw/xfree86/os-support/shared/agp_noop.c index 5774bc231..eda466a52 100644 --- a/hw/xfree86/os-support/shared/agp_noop.c +++ b/hw/xfree86/os-support/shared/agp_noop.c @@ -40,63 +40,63 @@ #include "xf86_OSlib.h" #include "xf86OSpriv.h" -_X_EXPORT Bool +Bool xf86GARTCloseScreen(int screenNum) { return FALSE; } -_X_EXPORT Bool +Bool xf86AgpGARTSupported() { return FALSE; } -_X_EXPORT AgpInfoPtr +AgpInfoPtr xf86GetAGPInfo(int screenNum) { return NULL; } -_X_EXPORT Bool +Bool xf86AcquireGART(int screenNum) { return FALSE; } -_X_EXPORT Bool +Bool xf86ReleaseGART(int screenNum) { return FALSE; } -_X_EXPORT int +int xf86AllocateGARTMemory(int screenNum, unsigned long size, int type, unsigned long *physical) { return -1; } -_X_EXPORT Bool +Bool xf86DeallocateGARTMemory(int screenNum, int key) { return FALSE; } -_X_EXPORT Bool +Bool xf86BindGARTMemory(int screenNum, int key, unsigned long offset) { return FALSE; } -_X_EXPORT Bool +Bool xf86UnbindGARTMemory(int screenNum, int key) { return FALSE; } -_X_EXPORT Bool +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 7288239be..67a14f5d6 100644 --- a/hw/xfree86/os-support/shared/bios_devmem.c +++ b/hw/xfree86/os-support/shared/bios_devmem.c @@ -39,7 +39,7 @@ # define DEV_MEM "/dev/mem" #endif -_X_EXPORT int +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 0c368e713..96d56bf1c 100644 --- a/hw/xfree86/os-support/shared/bios_mmap.c +++ b/hw/xfree86/os-support/shared/bios_mmap.c @@ -40,7 +40,7 @@ */ #ifndef __alpha__ -_X_EXPORT int +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 6f6924b59..c93c74c4a 100644 --- a/hw/xfree86/os-support/shared/ia64Pci.c +++ b/hw/xfree86/os-support/shared/ia64Pci.c @@ -60,7 +60,7 @@ static int ia64_port_to_fd(unsigned long port) return (port >> 24) & 0xffffffff; } -_X_EXPORT void outb(unsigned long port, unsigned char val) +void outb(unsigned long port, unsigned char val) { int fd = ia64_port_to_fd(port); @@ -80,7 +80,7 @@ _X_EXPORT void outb(unsigned long port, unsigned char val) return; } -_X_EXPORT void outw(unsigned long port, unsigned short val) +void outw(unsigned long port, unsigned short val) { int fd = ia64_port_to_fd(port); @@ -100,7 +100,7 @@ _X_EXPORT void outw(unsigned long port, unsigned short val) return; } -_X_EXPORT void outl(unsigned long port, unsigned int val) +void outl(unsigned long port, unsigned int val) { int fd = ia64_port_to_fd(port); @@ -120,7 +120,7 @@ _X_EXPORT void outl(unsigned long port, unsigned int val) return; } -_X_EXPORT unsigned int inb(unsigned long port) +unsigned int inb(unsigned long port) { int fd = ia64_port_to_fd(port); unsigned char val; @@ -142,7 +142,7 @@ _X_EXPORT unsigned int inb(unsigned long port) return val; } -_X_EXPORT unsigned int inw(unsigned long port) +unsigned int inw(unsigned long port) { int fd = ia64_port_to_fd(port); unsigned short val; @@ -164,7 +164,7 @@ _X_EXPORT unsigned int inw(unsigned long port) return val; } -_X_EXPORT unsigned int inl(unsigned long port) +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 1d7851a5b..805caccac 100644 --- a/hw/xfree86/os-support/shared/ioperm_noop.c +++ b/hw/xfree86/os-support/shared/ioperm_noop.c @@ -35,13 +35,13 @@ #include "xf86Priv.h" #include "xf86_OSlib.h" -_X_EXPORT Bool +Bool xf86EnableIO() { return TRUE; } -_X_EXPORT void +void xf86DisableIO() { return; diff --git a/hw/xfree86/os-support/shared/kmod_noop.c b/hw/xfree86/os-support/shared/kmod_noop.c index 6525e8414..e86d7472f 100644 --- a/hw/xfree86/os-support/shared/kmod_noop.c +++ b/hw/xfree86/os-support/shared/kmod_noop.c @@ -31,7 +31,7 @@ #include "xf86_OSproc.h" -_X_EXPORT int xf86LoadKernelModule(const char *pathname) +int xf86LoadKernelModule(const char *pathname) { (void) pathname; return 0; /* failure */ diff --git a/hw/xfree86/os-support/shared/pm_noop.c b/hw/xfree86/os-support/shared/pm_noop.c index 7601ff4af..bfac4b1c8 100644 --- a/hw/xfree86/os-support/shared/pm_noop.c +++ b/hw/xfree86/os-support/shared/pm_noop.c @@ -38,7 +38,7 @@ #define XF86_OS_PRIVS #include "xf86_OSproc.h" -_X_EXPORT PMClose +PMClose xf86OSPMOpen(void) { return NULL; diff --git a/hw/xfree86/os-support/shared/posix_tty.c b/hw/xfree86/os-support/shared/posix_tty.c index 316526bdc..697d0e51c 100644 --- a/hw/xfree86/os-support/shared/posix_tty.c +++ b/hw/xfree86/os-support/shared/posix_tty.c @@ -111,7 +111,7 @@ GetBaud (int baudrate) return (0); } -_X_EXPORT int +int xf86OpenSerial (pointer options) { struct termios t; @@ -194,7 +194,7 @@ xf86OpenSerial (pointer options) return (fd); } -_X_EXPORT int +int xf86SetSerial (int fd, pointer options) { struct termios t; @@ -365,7 +365,7 @@ xf86SetSerial (int fd, pointer options) return (r); } -_X_EXPORT int +int xf86SetSerialSpeed (int fd, int speed) { struct termios t; @@ -396,7 +396,7 @@ xf86SetSerialSpeed (int fd, int speed) return (r); } -_X_EXPORT int +int xf86ReadSerial (int fd, void *buf, int count) { int r; @@ -414,7 +414,7 @@ xf86ReadSerial (int fd, void *buf, int count) return (r); } -_X_EXPORT int +int xf86WriteSerial (int fd, const void *buf, int count) { int r; @@ -430,7 +430,7 @@ xf86WriteSerial (int fd, const void *buf, int count) return (r); } -_X_EXPORT int +int xf86CloseSerial (int fd) { int r; @@ -439,7 +439,7 @@ xf86CloseSerial (int fd) return (r); } -_X_EXPORT int +int xf86WaitForInput (int fd, int timeout) { fd_set readfds; @@ -465,7 +465,7 @@ xf86WaitForInput (int fd, int timeout) return (r); } -_X_EXPORT int +int xf86SerialSendBreak (int fd, int duration) { int r; @@ -475,7 +475,7 @@ xf86SerialSendBreak (int fd, int duration) } -_X_EXPORT int +int xf86FlushInput(int fd) { fd_set fds; @@ -576,7 +576,7 @@ getOsStateMask(void) static int osStateMask = 0; -_X_EXPORT int +int xf86SetSerialModemState(int fd, int state) { int ret; @@ -609,7 +609,7 @@ xf86SetSerialModemState(int fd, int state) #endif } -_X_EXPORT int +int xf86GetSerialModemState(int fd) { int ret; @@ -632,7 +632,7 @@ xf86GetSerialModemState(int fd) #endif } -_X_EXPORT int +int xf86SerialModemSetBits(int fd, int bits) { int ret; @@ -654,7 +654,7 @@ xf86SerialModemSetBits(int fd, int bits) #endif } -_X_EXPORT int +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 a45117da7..ef85e3b7e 100644 --- a/hw/xfree86/os-support/shared/sigio.c +++ b/hw/xfree86/os-support/shared/sigio.c @@ -132,7 +132,7 @@ xf86IsPipe (int fd) return S_ISFIFO(buf.st_mode); } -_X_EXPORT int +int xf86InstallSIGIOHandler(int fd, void (*f)(int, void *), void *closure) { struct sigaction sa; @@ -186,7 +186,7 @@ xf86InstallSIGIOHandler(int fd, void (*f)(int, void *), void *closure) return 0; } -_X_EXPORT int +int xf86RemoveSIGIOHandler(int fd) { struct sigaction sa; @@ -236,7 +236,7 @@ xf86RemoveSIGIOHandler(int fd) return ret; } -_X_EXPORT int +int xf86BlockSIGIO (void) { sigset_t set, old; @@ -249,7 +249,7 @@ xf86BlockSIGIO (void) return ret; } -_X_EXPORT void +void xf86UnblockSIGIO (int wasset) { sigset_t set; @@ -262,7 +262,7 @@ xf86UnblockSIGIO (int wasset) } } -_X_EXPORT void +void xf86AssertBlockedSIGIO (char *where) { sigset_t set, old; @@ -275,7 +275,7 @@ xf86AssertBlockedSIGIO (char *where) /* XXX This is a quick hack for the benefit of xf86SetSilkenMouse() */ -_X_EXPORT int +int xf86SIGIOSupported (void) { return 1; diff --git a/hw/xfree86/os-support/shared/sigiostubs.c b/hw/xfree86/os-support/shared/sigiostubs.c index 12fcab1d7..cecec37f7 100644 --- a/hw/xfree86/os-support/shared/sigiostubs.c +++ b/hw/xfree86/os-support/shared/sigiostubs.c @@ -34,36 +34,36 @@ # include "xf86Priv.h" # include "xf86_OSlib.h" -_X_EXPORT int +int xf86InstallSIGIOHandler(int fd, void (*f)(int, void *), void *closure) { return 0; } -_X_EXPORT int +int xf86RemoveSIGIOHandler(int fd) { return 0; } -_X_EXPORT int +int xf86BlockSIGIO (void) { return 0; } -_X_EXPORT void +void xf86UnblockSIGIO (int wasset) { } -_X_EXPORT void +void xf86AssertBlockedSIGIO (char *where) { } /* XXX This is a quick hack for the benefit of xf86SetSilkenMouse() */ -_X_EXPORT Bool +Bool xf86SIGIOSupported () { return FALSE; diff --git a/hw/xfree86/os-support/shared/stdResource.c b/hw/xfree86/os-support/shared/stdResource.c index 405c00f17..8cb101488 100644 --- a/hw/xfree86/os-support/shared/stdResource.c +++ b/hw/xfree86/os-support/shared/stdResource.c @@ -48,7 +48,7 @@ #define xf86StdAccResFromOS xf86AccResFromOS #endif -_X_EXPORT resPtr +resPtr xf86StdAccResFromOS(resPtr ret) { resRange range; diff --git a/hw/xfree86/os-support/shared/vidmem.c b/hw/xfree86/os-support/shared/vidmem.c index 48133d72e..f8a488a56 100644 --- a/hw/xfree86/os-support/shared/vidmem.c +++ b/hw/xfree86/os-support/shared/vidmem.c @@ -161,7 +161,7 @@ checkMtrrOption(VidMapPtr vp) } } -_X_EXPORT void +void xf86MakeNewMapping(int ScreenNum, int Flags, unsigned long Base, unsigned long Size, pointer Vbase) { VidMapPtr vp; @@ -175,7 +175,7 @@ xf86MakeNewMapping(int ScreenNum, int Flags, unsigned long Base, unsigned long S mp->flags = Flags; } -_X_EXPORT void +void xf86InitVidMem(void) { if (!vidMemInfo.initialised) { @@ -184,7 +184,7 @@ xf86InitVidMem(void) } } -_X_EXPORT pointer +pointer xf86MapVidMem(int ScreenNum, int Flags, unsigned long Base, unsigned long Size) { pointer vbase = NULL; @@ -230,7 +230,7 @@ xf86MapVidMem(int ScreenNum, int Flags, unsigned long Base, unsigned long Size) return vbase; } -_X_EXPORT void +void xf86UnMapVidMem(int ScreenNum, pointer Base, unsigned long Size) { VidMapPtr vp; @@ -257,7 +257,7 @@ xf86UnMapVidMem(int ScreenNum, pointer Base, unsigned long Size) removeMapping(vp, mp); } -_X_EXPORT Bool +Bool xf86CheckMTRR(int ScreenNum) { VidMapPtr vp = getVidMapRec(ScreenNum); @@ -274,14 +274,14 @@ xf86CheckMTRR(int ScreenNum) return FALSE; } -_X_EXPORT Bool +Bool xf86LinearVidMem() { xf86InitVidMem(); return vidMemInfo.linearSupported; } -_X_EXPORT void +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 e97ab9ef9..d151bf611 100644 --- a/hw/xfree86/os-support/solaris/sun_agp.c +++ b/hw/xfree86/os-support/solaris/sun_agp.c @@ -66,7 +66,7 @@ static Bool initDone = FALSE; * Close /dev/agpgart. This frees all associated memory allocated during * this server generation. */ -_X_EXPORT Bool +Bool xf86GARTCloseScreen(int screenNum) { if (gartFd != -1) { @@ -110,14 +110,14 @@ GARTInit(int screenNum) return TRUE; } -_X_EXPORT Bool +Bool xf86AgpGARTSupported(void) { return (GARTInit(-1)); } -_X_EXPORT AgpInfoPtr +AgpInfoPtr xf86GetAGPInfo(int screenNum) { agp_info_t agpinf; @@ -150,7 +150,7 @@ xf86GetAGPInfo(int screenNum) return info; } -_X_EXPORT Bool +Bool xf86AcquireGART(int screenNum) { @@ -171,7 +171,7 @@ xf86AcquireGART(int screenNum) return TRUE; } -_X_EXPORT Bool +Bool xf86ReleaseGART(int screenNum) { @@ -200,7 +200,7 @@ xf86ReleaseGART(int screenNum) return FALSE; } -_X_EXPORT int +int xf86AllocateGARTMemory(int screenNum, unsigned long size, int type, unsigned long *physical) { @@ -238,7 +238,7 @@ xf86AllocateGARTMemory(int screenNum, unsigned long size, int type, return alloc.agpa_key; } -_X_EXPORT Bool +Bool xf86DeallocateGARTMemory(int screenNum, int key) { if (!GARTInit(screenNum) || (acquiredScreen != screenNum)) @@ -255,7 +255,7 @@ xf86DeallocateGARTMemory(int screenNum, int key) } /* Bind GART memory with "key" at "offset" */ -_X_EXPORT Bool +Bool xf86BindGARTMemory(int screenNum, int key, unsigned long offset) { agp_bind_t bind; @@ -291,7 +291,7 @@ xf86BindGARTMemory(int screenNum, int key, unsigned long offset) } /* Unbind GART memory with "key" */ -_X_EXPORT Bool +Bool xf86UnbindGARTMemory(int screenNum, int key) { agp_unbind_t unbind; @@ -317,7 +317,7 @@ xf86UnbindGARTMemory(int screenNum, int key) /* XXX Interface may change. */ -_X_EXPORT Bool +Bool xf86EnableAGP(int screenNum, CARD32 mode) { agp_setup_t setup; diff --git a/hw/xfree86/os-support/solaris/sun_apm.c b/hw/xfree86/os-support/solaris/sun_apm.c index d121f3304..7decc900f 100644 --- a/hw/xfree86/os-support/solaris/sun_apm.c +++ b/hw/xfree86/os-support/solaris/sun_apm.c @@ -199,7 +199,7 @@ sunPMConfirmEventToOs(int fd, pmEvent event) } } -_X_EXPORT PMClose +PMClose xf86OSPMOpen(void) { int fd; diff --git a/hw/xfree86/os-support/solaris/sun_bell.c b/hw/xfree86/os-support/solaris/sun_bell.c index 29ecd7300..b25f40d8e 100644 --- a/hw/xfree86/os-support/solaris/sun_bell.c +++ b/hw/xfree86/os-support/solaris/sun_bell.c @@ -48,7 +48,7 @@ #define AUDIO_DEVICE "/dev/audio" -_X_EXPORT void +void xf86OSRingBell(int loudness, int pitch, int duration) { static short samples[BELL_SAMPLES]; diff --git a/hw/xfree86/os-support/solaris/sun_init.c b/hw/xfree86/os-support/solaris/sun_init.c index 4fe5af3ea..795b0c13c 100644 --- a/hw/xfree86/os-support/solaris/sun_init.c +++ b/hw/xfree86/os-support/solaris/sun_init.c @@ -46,7 +46,7 @@ static char fb_dev[PATH_MAX] = "/dev/fb"; static char fb_dev[PATH_MAX] = "/dev/console"; #endif -_X_EXPORT void +void xf86OpenConsole(void) { int i; @@ -209,7 +209,7 @@ xf86OpenConsole(void) } } -_X_EXPORT void +void xf86CloseConsole(void) { #ifdef HAS_USL_VTS @@ -296,7 +296,7 @@ xf86CloseConsole(void) close(xf86Info.consoleFd); } -_X_EXPORT int +int xf86ProcessArgument(int argc, char **argv, int i) { /* @@ -346,7 +346,7 @@ xf86ProcessArgument(int argc, char **argv, int i) return 0; } -_X_EXPORT void xf86UseMsg() +void xf86UseMsg() { #ifdef HAS_USL_VTS ErrorF("vtXX Use the specified VT number\n"); diff --git a/hw/xfree86/os-support/solaris/sun_vid.c b/hw/xfree86/os-support/solaris/sun_vid.c index 3982f631f..2078646b1 100644 --- a/hw/xfree86/os-support/solaris/sun_vid.c +++ b/hw/xfree86/os-support/solaris/sun_vid.c @@ -186,7 +186,7 @@ xf86OSInitVidMem(VidMemInfoPtr pVidMem) /* * Read BIOS via mmap()ing physical memory. */ -_X_EXPORT int +int xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf, int Len) { @@ -235,7 +235,7 @@ xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf, static Bool ExtendedEnabled = FALSE; #endif -_X_EXPORT Bool +Bool xf86EnableIO(void) { #if defined(__i386__) || defined(__i386) || defined(__x86) @@ -251,7 +251,7 @@ xf86EnableIO(void) return TRUE; } -_X_EXPORT void +void xf86DisableIO(void) { #if defined(__i386__) || defined(__i386) || defined(__x86) diff --git a/hw/xfree86/os-support/sysv/sysv_init.c b/hw/xfree86/os-support/sysv/sysv_init.c index afb484e5e..170bb8914 100644 --- a/hw/xfree86/os-support/sysv/sysv_init.c +++ b/hw/xfree86/os-support/sysv/sysv_init.c @@ -43,7 +43,7 @@ static Bool Protect0 = FALSE; static int VTnum = -1; -_X_EXPORT void +void xf86OpenConsole() { int fd; @@ -186,7 +186,7 @@ xf86OpenConsole() return; } -_X_EXPORT void +void xf86CloseConsole() { struct vt_mode VT; @@ -205,7 +205,7 @@ xf86CloseConsole() return; } -_X_EXPORT int +int xf86ProcessArgument(int argc, char *argv[], int i) { /* @@ -242,7 +242,7 @@ xf86ProcessArgument(int argc, char *argv[], int i) return(0); } -_X_EXPORT void +void xf86UseMsg() { ErrorF("vtXX use the specified VT number\n"); diff --git a/hw/xfree86/os-support/sysv/sysv_video.c b/hw/xfree86/os-support/sysv/sysv_video.c index a9bbd6580..43c30621c 100644 --- a/hw/xfree86/os-support/sysv/sysv_video.c +++ b/hw/xfree86/os-support/sysv/sysv_video.c @@ -283,7 +283,7 @@ xf86OSInitVidMem(VidMemInfoPtr pVidMem) static Bool ExtendedEnabled = FALSE; static Bool InitDone = FALSE; -_X_EXPORT Bool +Bool xf86EnableIO() { int i; @@ -302,7 +302,7 @@ xf86EnableIO() return TRUE; } -_X_EXPORT void +void xf86DisableIO() { if (!ExtendedEnabled) diff --git a/hw/xfree86/os-support/xf86_OSproc.h b/hw/xfree86/os-support/xf86_OSproc.h index 664c7cbb9..01f271588 100644 --- a/hw/xfree86/os-support/xf86_OSproc.h +++ b/hw/xfree86/os-support/xf86_OSproc.h @@ -134,36 +134,36 @@ _XFUNCPROTOBEGIN /* public functions */ -extern Bool xf86LinearVidMem(void); -extern Bool xf86CheckMTRR(int); -extern pointer xf86MapVidMem(int, int, unsigned long, unsigned long); -extern void xf86UnMapVidMem(int, pointer, unsigned long); -extern void xf86MapReadSideEffects(int, int, pointer, unsigned long); -extern int xf86ReadBIOS(unsigned long, unsigned long, unsigned char *, int); -extern Bool xf86EnableIO(void); -extern void xf86DisableIO(void); -extern void xf86SetTVOut(int); -extern void xf86SetRGBOut(void); -extern void xf86OSRingBell(int, int, int); -extern void xf86BusToMem(unsigned char *, unsigned char *, int); -extern void xf86MemToBus(unsigned char *, unsigned char *, int); -extern void xf86UDelay(long usec); -extern void xf86SetReallySlowBcopy(void); -extern void xf86SlowBcopy(unsigned char *, unsigned char *, int); -extern int xf86OpenSerial(pointer options); -extern int xf86SetSerial(int fd, pointer options); -extern int xf86SetSerialSpeed(int fd, int speed); -extern int xf86ReadSerial(int fd, void *buf, int count); -extern int xf86WriteSerial(int fd, const void *buf, int count); -extern int xf86CloseSerial(int fd); -extern int xf86FlushInput(int fd); -extern int xf86WaitForInput(int fd, int timeout); -extern int xf86SerialSendBreak(int fd, int duration); -extern int xf86SetSerialModemState(int fd, int state); -extern int xf86GetSerialModemState(int fd); -extern int xf86SerialModemSetBits(int fd, int bits); -extern int xf86SerialModemClearBits(int fd, int bits); -extern int xf86LoadKernelModule(const char *pathname); +extern _X_EXPORT Bool xf86LinearVidMem(void); +extern _X_EXPORT Bool xf86CheckMTRR(int); +extern _X_EXPORT pointer xf86MapVidMem(int, int, unsigned long, unsigned long); +extern _X_EXPORT void xf86UnMapVidMem(int, pointer, unsigned long); +extern _X_EXPORT void xf86MapReadSideEffects(int, int, pointer, unsigned long); +extern _X_EXPORT int xf86ReadBIOS(unsigned long, unsigned long, unsigned char *, int); +extern _X_EXPORT Bool xf86EnableIO(void); +extern _X_EXPORT void xf86DisableIO(void); +extern _X_EXPORT void xf86SetTVOut(int); +extern _X_EXPORT void xf86SetRGBOut(void); +extern _X_EXPORT void xf86OSRingBell(int, int, int); +extern _X_EXPORT void xf86BusToMem(unsigned char *, unsigned char *, int); +extern _X_EXPORT void xf86MemToBus(unsigned char *, unsigned char *, int); +extern _X_EXPORT void xf86UDelay(long usec); +extern _X_EXPORT void xf86SetReallySlowBcopy(void); +extern _X_EXPORT void xf86SlowBcopy(unsigned char *, unsigned char *, int); +extern _X_EXPORT int xf86OpenSerial(pointer options); +extern _X_EXPORT int xf86SetSerial(int fd, pointer options); +extern _X_EXPORT int xf86SetSerialSpeed(int fd, int speed); +extern _X_EXPORT int xf86ReadSerial(int fd, void *buf, int count); +extern _X_EXPORT int xf86WriteSerial(int fd, const void *buf, int count); +extern _X_EXPORT int xf86CloseSerial(int fd); +extern _X_EXPORT int xf86FlushInput(int fd); +extern _X_EXPORT int xf86WaitForInput(int fd, int timeout); +extern _X_EXPORT int xf86SerialSendBreak(int fd, int duration); +extern _X_EXPORT int xf86SetSerialModemState(int fd, int state); +extern _X_EXPORT int xf86GetSerialModemState(int fd); +extern _X_EXPORT int xf86SerialModemSetBits(int fd, int bits); +extern _X_EXPORT int xf86SerialModemClearBits(int fd, int bits); +extern _X_EXPORT int xf86LoadKernelModule(const char *pathname); /* AGP GART interface */ @@ -177,55 +177,55 @@ typedef struct _AgpInfo { unsigned long usedPages; } AgpInfo, *AgpInfoPtr; -extern Bool xf86AgpGARTSupported(void); -extern AgpInfoPtr xf86GetAGPInfo(int screenNum); -extern Bool xf86AcquireGART(int screenNum); -extern Bool xf86ReleaseGART(int screenNum); -extern int xf86AllocateGARTMemory(int screenNum, unsigned long size, int type, +extern _X_EXPORT Bool xf86AgpGARTSupported(void); +extern _X_EXPORT AgpInfoPtr xf86GetAGPInfo(int screenNum); +extern _X_EXPORT Bool xf86AcquireGART(int screenNum); +extern _X_EXPORT Bool xf86ReleaseGART(int screenNum); +extern _X_EXPORT int xf86AllocateGARTMemory(int screenNum, unsigned long size, int type, unsigned long *physical); -extern Bool xf86DeallocateGARTMemory(int screenNum, int key); -extern Bool xf86BindGARTMemory(int screenNum, int key, unsigned long offset); -extern Bool xf86UnbindGARTMemory(int screenNum, int key); -extern Bool xf86EnableAGP(int screenNum, CARD32 mode); -extern Bool xf86GARTCloseScreen(int screenNum); +extern _X_EXPORT Bool xf86DeallocateGARTMemory(int screenNum, int key); +extern _X_EXPORT Bool xf86BindGARTMemory(int screenNum, int key, unsigned long offset); +extern _X_EXPORT Bool xf86UnbindGARTMemory(int screenNum, int key); +extern _X_EXPORT Bool xf86EnableAGP(int screenNum, CARD32 mode); +extern _X_EXPORT Bool xf86GARTCloseScreen(int screenNum); /* These routines are in shared/sigio.c and are not loaded as part of the module. These routines are small, and the code if very POSIX-signal (or OS-signal) specific, so it seemed better to provide more complex wrappers than to wrap each individual function called. */ -extern int xf86InstallSIGIOHandler(int fd, void (*f)(int, void *), void *); -extern int xf86RemoveSIGIOHandler(int fd); -extern int xf86BlockSIGIO (void); -extern void xf86UnblockSIGIO (int); -extern void xf86AssertBlockedSIGIO (char *); -extern Bool xf86SIGIOSupported (void); +extern _X_EXPORT int xf86InstallSIGIOHandler(int fd, void (*f)(int, void *), void *); +extern _X_EXPORT int xf86RemoveSIGIOHandler(int fd); +extern _X_EXPORT int xf86BlockSIGIO (void); +extern _X_EXPORT void xf86UnblockSIGIO (int); +extern _X_EXPORT void xf86AssertBlockedSIGIO (char *); +extern _X_EXPORT Bool xf86SIGIOSupported (void); #ifdef XF86_OS_PRIVS typedef void (*PMClose)(void); -extern void xf86OpenConsole(void); -extern void xf86CloseConsole(void); -extern Bool xf86VTSwitchPending(void); -extern Bool xf86VTSwitchAway(void); -extern Bool xf86VTSwitchTo(void); -extern void xf86VTRequest(int sig); -extern int xf86ProcessArgument(int, char **, int); -extern void xf86UseMsg(void); -extern void xf86ReloadInputDevs(int sig); -extern PMClose xf86OSPMOpen(void); +extern _X_EXPORT void xf86OpenConsole(void); +extern _X_EXPORT void xf86CloseConsole(void); +extern _X_EXPORT Bool xf86VTSwitchPending(void); +extern _X_EXPORT Bool xf86VTSwitchAway(void); +extern _X_EXPORT Bool xf86VTSwitchTo(void); +extern _X_EXPORT void xf86VTRequest(int sig); +extern _X_EXPORT int xf86ProcessArgument(int, char **, int); +extern _X_EXPORT void xf86UseMsg(void); +extern _X_EXPORT void xf86ReloadInputDevs(int sig); +extern _X_EXPORT PMClose xf86OSPMOpen(void); #ifdef NEED_OS_RAC_PROTOS /* RAC-related privs */ /* internal to os-support layer */ -resPtr xf86StdAccResFromOS(resPtr ret); +extern _X_EXPORT resPtr xf86StdAccResFromOS(resPtr ret); /* available to the common layer */ -resPtr xf86AccResFromOS(resPtr ret); +extern _X_EXPORT resPtr xf86AccResFromOS(resPtr ret); #endif /* NEED_OS_RAC_PROTOS */ -extern unsigned long xf86GetOSOffsetFromPCI(PCITAG tag, int space, unsigned long base); +extern _X_EXPORT unsigned long xf86GetOSOffsetFromPCI(PCITAG tag, int space, unsigned long base); -extern void xf86MakeNewMapping(int, int, unsigned long, unsigned long, pointer); -extern void xf86InitVidMem(void); +extern _X_EXPORT void xf86MakeNewMapping(int, int, unsigned long, unsigned long, pointer); +extern _X_EXPORT void xf86InitVidMem(void); #endif /* XF86_OS_PRIVS */ diff --git a/hw/xfree86/parser/Device.c b/hw/xfree86/parser/Device.c index 8f5370bd3..216789fc1 100644 --- a/hw/xfree86/parser/Device.c +++ b/hw/xfree86/parser/Device.c @@ -357,7 +357,7 @@ xf86freeDeviceList (XF86ConfDevicePtr ptr) } } -_X_EXPORT XF86ConfDevicePtr +XF86ConfDevicePtr xf86findDevice (const char *ident, XF86ConfDevicePtr p) { while (p) @@ -370,7 +370,7 @@ xf86findDevice (const char *ident, XF86ConfDevicePtr p) return (NULL); } -_X_EXPORT char * +char * xf86configStrdup (const char *s) { char *tmp; diff --git a/hw/xfree86/parser/Flags.c b/hw/xfree86/parser/Flags.c index 6eb48e367..8f44ea5ec 100644 --- a/hw/xfree86/parser/Flags.c +++ b/hw/xfree86/parser/Flags.c @@ -216,7 +216,7 @@ addNewOption2 (XF86OptionPtr head, char *name, char *val, int used) return ((XF86OptionPtr) xf86addListItem ((glp) head, (glp) new)); } -_X_EXPORT XF86OptionPtr +XF86OptionPtr xf86addNewOption (XF86OptionPtr head, char *name, char *val) { return addNewOption2(head, name, val, 0); @@ -232,7 +232,7 @@ xf86freeFlags (XF86ConfFlagsPtr flags) xf86conffree (flags); } -_X_EXPORT XF86OptionPtr +XF86OptionPtr xf86optionListDup (XF86OptionPtr opt) { XF86OptionPtr newopt = NULL; @@ -249,7 +249,7 @@ xf86optionListDup (XF86OptionPtr opt) return newopt; } -_X_EXPORT void +void xf86optionListFree (XF86OptionPtr opt) { XF86OptionPtr prev; @@ -265,7 +265,7 @@ xf86optionListFree (XF86OptionPtr opt) } } -_X_EXPORT char * +char * xf86optionName(XF86OptionPtr opt) { if (opt) @@ -273,7 +273,7 @@ xf86optionName(XF86OptionPtr opt) return 0; } -_X_EXPORT char * +char * xf86optionValue(XF86OptionPtr opt) { if (opt) @@ -281,7 +281,7 @@ xf86optionValue(XF86OptionPtr opt) return 0; } -_X_EXPORT XF86OptionPtr +XF86OptionPtr xf86newOption(char *name, char *value) { XF86OptionPtr opt; @@ -298,7 +298,7 @@ xf86newOption(char *name, char *value) return opt; } -_X_EXPORT XF86OptionPtr +XF86OptionPtr xf86nextOption(XF86OptionPtr list) { if (!list) @@ -312,7 +312,7 @@ xf86nextOption(XF86OptionPtr list) * NULL */ -_X_EXPORT XF86OptionPtr +XF86OptionPtr xf86findOption (XF86OptionPtr list, const char *name) { while (list) @@ -331,7 +331,7 @@ xf86findOption (XF86OptionPtr list, const char *name) * returned. If the option is not found, a NULL is returned. */ -_X_EXPORT char * +char * xf86findOptionValue (XF86OptionPtr list, const char *name) { XF86OptionPtr p = xf86findOption (list, name); @@ -346,7 +346,7 @@ xf86findOptionValue (XF86OptionPtr list, const char *name) return (NULL); } -_X_EXPORT XF86OptionPtr +XF86OptionPtr xf86optionListCreate( const char **options, int count, int used ) { XF86OptionPtr p = NULL; @@ -383,7 +383,7 @@ xf86optionListCreate( const char **options, int count, int used ) * is used. The end result is a single valid list of options. Duplicates * are freed, and the original lists are no longer guaranteed to be complete. */ -_X_EXPORT XF86OptionPtr +XF86OptionPtr xf86optionListMerge (XF86OptionPtr head, XF86OptionPtr tail) { XF86OptionPtr a, b, ap = NULL, bp = NULL; @@ -428,7 +428,7 @@ xf86optionListMerge (XF86OptionPtr head, XF86OptionPtr tail) return (head); } -_X_EXPORT char * +char * xf86uLongToString(unsigned long i) { char *s; @@ -442,7 +442,7 @@ xf86uLongToString(unsigned long i) return s; } -_X_EXPORT XF86OptionPtr +XF86OptionPtr xf86parseOption(XF86OptionPtr head) { XF86OptionPtr option, cnew, old; @@ -493,7 +493,7 @@ xf86parseOption(XF86OptionPtr head) return (head); } -_X_EXPORT void +void xf86printOptionList(FILE *fp, XF86OptionPtr list, int tabs) { int i; diff --git a/hw/xfree86/parser/Input.c b/hw/xfree86/parser/Input.c index 34ce6cbea..3d9801968 100644 --- a/hw/xfree86/parser/Input.c +++ b/hw/xfree86/parser/Input.c @@ -189,7 +189,7 @@ xf86validateInput (XF86ConfigPtr p) return (TRUE); } -_X_EXPORT XF86ConfInputPtr +XF86ConfInputPtr xf86findInput (const char *ident, XF86ConfInputPtr p) { while (p) @@ -202,7 +202,7 @@ xf86findInput (const char *ident, XF86ConfInputPtr p) return (NULL); } -_X_EXPORT XF86ConfInputPtr +XF86ConfInputPtr xf86findInputByDriver (const char *driver, XF86ConfInputPtr p) { while (p) diff --git a/hw/xfree86/parser/Layout.c b/hw/xfree86/parser/Layout.c index 03afbcc39..5d1348acb 100644 --- a/hw/xfree86/parser/Layout.c +++ b/hw/xfree86/parser/Layout.c @@ -520,7 +520,7 @@ xf86validateLayout (XF86ConfigPtr p) return (TRUE); } -_X_EXPORT XF86ConfLayoutPtr +XF86ConfLayoutPtr xf86findLayout (const char *name, XF86ConfLayoutPtr list) { while (list) diff --git a/hw/xfree86/parser/Monitor.c b/hw/xfree86/parser/Monitor.c index 387307781..9d533125e 100644 --- a/hw/xfree86/parser/Monitor.c +++ b/hw/xfree86/parser/Monitor.c @@ -842,7 +842,7 @@ xf86freeModesList (XF86ConfModesPtr ptr) } } -_X_EXPORT XF86ConfMonitorPtr +XF86ConfMonitorPtr xf86findMonitor (const char *ident, XF86ConfMonitorPtr p) { while (p) @@ -855,7 +855,7 @@ xf86findMonitor (const char *ident, XF86ConfMonitorPtr p) return (NULL); } -_X_EXPORT XF86ConfModesPtr +XF86ConfModesPtr xf86findModes (const char *ident, XF86ConfModesPtr p) { while (p) @@ -868,7 +868,7 @@ xf86findModes (const char *ident, XF86ConfModesPtr p) return (NULL); } -_X_EXPORT XF86ConfModeLinePtr +XF86ConfModeLinePtr xf86findModeLine (const char *ident, XF86ConfModeLinePtr p) { while (p) diff --git a/hw/xfree86/parser/Screen.c b/hw/xfree86/parser/Screen.c index cd3d889c6..dfc02bb72 100644 --- a/hw/xfree86/parser/Screen.c +++ b/hw/xfree86/parser/Screen.c @@ -554,7 +554,7 @@ xf86validateScreen (XF86ConfigPtr p) return (TRUE); } -_X_EXPORT XF86ConfScreenPtr +XF86ConfScreenPtr xf86findScreen (const char *ident, XF86ConfScreenPtr p) { while (p) diff --git a/hw/xfree86/parser/Video.c b/hw/xfree86/parser/Video.c index 2c9c8a0f7..a8912cf44 100644 --- a/hw/xfree86/parser/Video.c +++ b/hw/xfree86/parser/Video.c @@ -282,7 +282,7 @@ xf86freeVideoAdaptorList (XF86ConfVideoAdaptorPtr ptr) } } -_X_EXPORT XF86ConfVideoAdaptorPtr +XF86ConfVideoAdaptorPtr xf86findVideoAdaptor (const char *ident, XF86ConfVideoAdaptorPtr p) { while (p) diff --git a/hw/xfree86/parser/read.c b/hw/xfree86/parser/read.c index 748a2ca3c..b044a6af8 100644 --- a/hw/xfree86/parser/read.c +++ b/hw/xfree86/parser/read.c @@ -90,7 +90,7 @@ xf86validateConfig (XF86ConfigPtr p) return (TRUE); } -_X_EXPORT XF86ConfigPtr +XF86ConfigPtr xf86readConfigFile (void) { int token; @@ -240,7 +240,7 @@ xf86readConfigFile (void) * A pointer to the head of the list is returned to handle the addition of * the first item. */ -_X_EXPORT GenericListPtr +GenericListPtr xf86addListItem (GenericListPtr head, GenericListPtr new) { GenericListPtr p = head; @@ -265,7 +265,7 @@ xf86addListItem (GenericListPtr head, GenericListPtr new) * Test if one chained list contains the other. * In this case both list have the same endpoint (provided they don't loop) */ -_X_EXPORT int +int xf86itemNotSublist(GenericListPtr list_1, GenericListPtr list_2) { GenericListPtr p = list_1; @@ -285,7 +285,7 @@ xf86itemNotSublist(GenericListPtr list_1, GenericListPtr list_2) return (!(last_1 == last_2)); } -_X_EXPORT void +void xf86freeConfig (XF86ConfigPtr p) { if (p == NULL) diff --git a/hw/xfree86/parser/scan.c b/hw/xfree86/parser/scan.c index 4d7508773..7a9bb9305 100644 --- a/hw/xfree86/parser/scan.c +++ b/hw/xfree86/parser/scan.c @@ -522,7 +522,7 @@ xf86tokenString (void) return configRBuf; } -_X_EXPORT int +int xf86pathIsAbsolute(const char *path) { if (path && path[0] == '/') @@ -531,7 +531,7 @@ xf86pathIsAbsolute(const char *path) } /* A path is "safe" if it is relative and if it contains no ".." elements. */ -_X_EXPORT int +int xf86pathIsSafe(const char *path) { if (xf86pathIsAbsolute(path)) @@ -777,7 +777,7 @@ DoSubstitution(const char *template, const char *cmdline, const char *projroot, "%P/lib/X11/%X" #endif -_X_EXPORT const char * +const char * xf86openConfigFile(const char *path, const char *cmdline, const char *projroot) { char *pathcopy; @@ -854,7 +854,7 @@ xf86openConfigFile(const char *path, const char *cmdline, const char *projroot) return configPath; } -_X_EXPORT void +void xf86closeConfigFile (void) { xf86conffree (configPath); @@ -873,7 +873,7 @@ xf86closeConfigFile (void) } } -_X_EXPORT void +void xf86setBuiltinConfig(const char *config[]) { builtinConfig = config; @@ -948,7 +948,7 @@ StringToToken (char *str, xf86ConfigSymTabRec * tab) * Compare two names. The characters '_', ' ', and '\t' are ignored * in the comparison. */ -_X_EXPORT int +int xf86nameCompare (const char *s1, const char *s2) { char c1, c2; @@ -982,7 +982,7 @@ xf86nameCompare (const char *s1, const char *s2) return (c1 - c2); } -_X_EXPORT char * +char * xf86addComment(char *cur, char *add) { char *str; diff --git a/hw/xfree86/parser/write.c b/hw/xfree86/parser/write.c index 6b1eac94a..3b77b9314 100644 --- a/hw/xfree86/parser/write.c +++ b/hw/xfree86/parser/write.c @@ -137,7 +137,7 @@ doWriteConfigFile (const char *filename, XF86ConfigPtr cptr) #ifndef HAS_NO_UIDS -_X_EXPORT int +int xf86writeConfigFile (const char *filename, XF86ConfigPtr cptr) { int ret; diff --git a/hw/xfree86/parser/xf86Optrec.h b/hw/xfree86/parser/xf86Optrec.h index 77a5728bb..77b316a60 100644 --- a/hw/xfree86/parser/xf86Optrec.h +++ b/hw/xfree86/parser/xf86Optrec.h @@ -91,22 +91,22 @@ typedef struct XF86OptionRec, *XF86OptionPtr; -XF86OptionPtr xf86addNewOption(XF86OptionPtr head, char *name, char *val); -XF86OptionPtr xf86optionListDup(XF86OptionPtr opt); -void xf86optionListFree(XF86OptionPtr opt); -char *xf86optionName(XF86OptionPtr opt); -char *xf86optionValue(XF86OptionPtr opt); -XF86OptionPtr xf86newOption(char *name, char *value); -XF86OptionPtr xf86nextOption(XF86OptionPtr list); -XF86OptionPtr xf86findOption(XF86OptionPtr list, const char *name); -char *xf86findOptionValue(XF86OptionPtr list, const char *name); -XF86OptionPtr xf86optionListCreate(const char **options, int count, int used); -XF86OptionPtr xf86optionListMerge(XF86OptionPtr head, XF86OptionPtr tail); -char *xf86configStrdup (const char *s); -int xf86nameCompare (const char *s1, const char *s2); -char *xf86uLongToString(unsigned long i); -XF86OptionPtr xf86parseOption(XF86OptionPtr head); -void xf86printOptionList(FILE *fp, XF86OptionPtr list, int tabs); +extern _X_EXPORT XF86OptionPtr xf86addNewOption(XF86OptionPtr head, char *name, char *val); +extern _X_EXPORT XF86OptionPtr xf86optionListDup(XF86OptionPtr opt); +extern _X_EXPORT void xf86optionListFree(XF86OptionPtr opt); +extern _X_EXPORT char *xf86optionName(XF86OptionPtr opt); +extern _X_EXPORT char *xf86optionValue(XF86OptionPtr opt); +extern _X_EXPORT XF86OptionPtr xf86newOption(char *name, char *value); +extern _X_EXPORT XF86OptionPtr xf86nextOption(XF86OptionPtr list); +extern _X_EXPORT XF86OptionPtr xf86findOption(XF86OptionPtr list, const char *name); +extern _X_EXPORT char *xf86findOptionValue(XF86OptionPtr list, const char *name); +extern _X_EXPORT XF86OptionPtr xf86optionListCreate(const char **options, int count, int used); +extern _X_EXPORT XF86OptionPtr xf86optionListMerge(XF86OptionPtr head, XF86OptionPtr tail); +extern _X_EXPORT char *xf86configStrdup (const char *s); +extern _X_EXPORT int xf86nameCompare (const char *s1, const char *s2); +extern _X_EXPORT char *xf86uLongToString(unsigned long i); +extern _X_EXPORT XF86OptionPtr xf86parseOption(XF86OptionPtr head); +extern _X_EXPORT void xf86printOptionList(FILE *fp, XF86OptionPtr list, int tabs); #endif /* _xf86Optrec_h_ */ diff --git a/hw/xfree86/parser/xf86Parser.h b/hw/xfree86/parser/xf86Parser.h index fd6cc530b..0444b0338 100644 --- a/hw/xfree86/parser/xf86Parser.h +++ b/hw/xfree86/parser/xf86Parser.h @@ -456,29 +456,29 @@ xf86ConfigSymTabRec, *xf86ConfigSymTabPtr; /* * prototypes for public functions */ -extern const char *xf86openConfigFile (const char *, const char *, +extern _X_EXPORT const char *xf86openConfigFile (const char *, const char *, const char *); -extern void xf86setBuiltinConfig(const char *config[]); -extern XF86ConfigPtr xf86readConfigFile (void); -extern void xf86closeConfigFile (void); -extern void xf86freeConfig (XF86ConfigPtr p); -extern int xf86writeConfigFile (const char *, XF86ConfigPtr); -XF86ConfDevicePtr xf86findDevice(const char *ident, XF86ConfDevicePtr p); -XF86ConfLayoutPtr xf86findLayout(const char *name, XF86ConfLayoutPtr list); -XF86ConfMonitorPtr xf86findMonitor(const char *ident, XF86ConfMonitorPtr p); -XF86ConfModesPtr xf86findModes(const char *ident, XF86ConfModesPtr p); -XF86ConfModeLinePtr xf86findModeLine(const char *ident, XF86ConfModeLinePtr p); -XF86ConfScreenPtr xf86findScreen(const char *ident, XF86ConfScreenPtr p); -XF86ConfInputPtr xf86findInput(const char *ident, XF86ConfInputPtr p); -XF86ConfInputPtr xf86findInputByDriver(const char *driver, XF86ConfInputPtr p); -XF86ConfVideoAdaptorPtr xf86findVideoAdaptor(const char *ident, +extern _X_EXPORT void xf86setBuiltinConfig(const char *config[]); +extern _X_EXPORT XF86ConfigPtr xf86readConfigFile (void); +extern _X_EXPORT void xf86closeConfigFile (void); +extern _X_EXPORT void xf86freeConfig (XF86ConfigPtr p); +extern _X_EXPORT int xf86writeConfigFile (const char *, XF86ConfigPtr); +extern _X_EXPORT XF86ConfDevicePtr xf86findDevice(const char *ident, XF86ConfDevicePtr p); +extern _X_EXPORT XF86ConfLayoutPtr xf86findLayout(const char *name, XF86ConfLayoutPtr list); +extern _X_EXPORT XF86ConfMonitorPtr xf86findMonitor(const char *ident, XF86ConfMonitorPtr p); +extern _X_EXPORT XF86ConfModesPtr xf86findModes(const char *ident, XF86ConfModesPtr p); +extern _X_EXPORT XF86ConfModeLinePtr xf86findModeLine(const char *ident, XF86ConfModeLinePtr p); +extern _X_EXPORT XF86ConfScreenPtr xf86findScreen(const char *ident, XF86ConfScreenPtr p); +extern _X_EXPORT XF86ConfInputPtr xf86findInput(const char *ident, XF86ConfInputPtr p); +extern _X_EXPORT XF86ConfInputPtr xf86findInputByDriver(const char *driver, XF86ConfInputPtr p); +extern _X_EXPORT XF86ConfVideoAdaptorPtr xf86findVideoAdaptor(const char *ident, XF86ConfVideoAdaptorPtr p); -GenericListPtr xf86addListItem(GenericListPtr head, GenericListPtr c_new); -int xf86itemNotSublist(GenericListPtr list_1, GenericListPtr list_2); +extern _X_EXPORT GenericListPtr xf86addListItem(GenericListPtr head, GenericListPtr c_new); +extern _X_EXPORT int xf86itemNotSublist(GenericListPtr list_1, GenericListPtr list_2); -int xf86pathIsAbsolute(const char *path); -int xf86pathIsSafe(const char *path); -char *xf86addComment(char *cur, char *add); +extern _X_EXPORT int xf86pathIsAbsolute(const char *path); +extern _X_EXPORT int xf86pathIsSafe(const char *path); +extern _X_EXPORT char *xf86addComment(char *cur, char *add); #endif /* _xf86Parser_h_ */ diff --git a/hw/xfree86/ramdac/BT.c b/hw/xfree86/ramdac/BT.c index 28e82b1ed..5aa27a1f8 100644 --- a/hw/xfree86/ramdac/BT.c +++ b/hw/xfree86/ramdac/BT.c @@ -35,7 +35,7 @@ #include "BTPriv.h" #include "xf86RamDacPriv.h" -_X_EXPORT void +void BTramdacRestore(ScrnInfoPtr pScrn, RamDacRecPtr ramdacPtr, RamDacRegRecPtr ramdacReg) { @@ -50,7 +50,7 @@ BTramdacRestore(ScrnInfoPtr pScrn, RamDacRecPtr ramdacPtr, ramdacReg->DacRegs[i]); } -_X_EXPORT void +void BTramdacSave(ScrnInfoPtr pScrn, RamDacRecPtr ramdacPtr, RamDacRegRecPtr ramdacReg) { @@ -65,7 +65,7 @@ BTramdacSave(ScrnInfoPtr pScrn, RamDacRecPtr ramdacPtr, ramdacReg->DacRegs[i] = (*ramdacPtr->ReadDAC)(pScrn, i); } -_X_EXPORT RamDacHelperRecPtr +RamDacHelperRecPtr BTramdacProbe(ScrnInfoPtr pScrn, RamDacSupportedInfoRecPtr ramdacs/*, RamDacRecPtr ramdacPtr*/) { RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn); @@ -137,7 +137,7 @@ BTramdacProbe(ScrnInfoPtr pScrn, RamDacSupportedInfoRecPtr ramdacs/*, RamDacRecP return ramdacHelperPtr; } -_X_EXPORT void +void BTramdacSetBpp(ScrnInfoPtr pScrn, RamDacRegRecPtr ramdacReg) { /* We need to deal with Direct Colour visuals for 8bpp and other diff --git a/hw/xfree86/ramdac/BT.h b/hw/xfree86/ramdac/BT.h index b3426bada..35d0bdbd9 100644 --- a/hw/xfree86/ramdac/BT.h +++ b/hw/xfree86/ramdac/BT.h @@ -1,10 +1,10 @@ #include "xf86RamDac.h" -RamDacHelperRecPtr BTramdacProbe(ScrnInfoPtr pScrn, RamDacSupportedInfoRecPtr ramdacs); -void BTramdacSave(ScrnInfoPtr pScrn, RamDacRecPtr RamDacRec, RamDacRegRecPtr RamDacRegRec); -void BTramdacRestore(ScrnInfoPtr pScrn, RamDacRecPtr RamDacRec, RamDacRegRecPtr RamDacRegRec); -void BTramdacSetBpp(ScrnInfoPtr pScrn, RamDacRegRecPtr RamDacRegRec); +extern _X_EXPORT RamDacHelperRecPtr BTramdacProbe(ScrnInfoPtr pScrn, RamDacSupportedInfoRecPtr ramdacs); +extern _X_EXPORT void BTramdacSave(ScrnInfoPtr pScrn, RamDacRecPtr RamDacRec, RamDacRegRecPtr RamDacRegRec); +extern _X_EXPORT void BTramdacRestore(ScrnInfoPtr pScrn, RamDacRecPtr RamDacRec, RamDacRegRecPtr RamDacRegRec); +extern _X_EXPORT void BTramdacSetBpp(ScrnInfoPtr pScrn, RamDacRegRecPtr RamDacRegRec); #define ATT20C504_RAMDAC (VENDOR_BT << 16) | 0x00 #define ATT20C505_RAMDAC (VENDOR_BT << 16) | 0x01 diff --git a/hw/xfree86/ramdac/IBM.c b/hw/xfree86/ramdac/IBM.c index e45bd949c..2d9fe4d8f 100644 --- a/hw/xfree86/ramdac/IBM.c +++ b/hw/xfree86/ramdac/IBM.c @@ -39,7 +39,7 @@ #define INITIALFREQERR 100000 -_X_EXPORT unsigned long +unsigned long IBMramdac640CalculateMNPCForClock( unsigned long RefClock, /* In 100Hz units */ unsigned long ReqClock, /* In 100Hz units */ @@ -105,7 +105,7 @@ IBMramdac640CalculateMNPCForClock( return (ActualClock); } -_X_EXPORT unsigned long +unsigned long IBMramdac526CalculateMNPCForClock( unsigned long RefClock, /* In 100Hz units */ unsigned long ReqClock, /* In 100Hz units */ @@ -171,7 +171,7 @@ IBMramdac526CalculateMNPCForClock( return (ActualClock); } -_X_EXPORT void +void IBMramdacRestore(ScrnInfoPtr pScrn, RamDacRecPtr ramdacPtr, RamDacRegRecPtr ramdacReg) { @@ -200,7 +200,7 @@ IBMramdacRestore(ScrnInfoPtr pScrn, RamDacRecPtr ramdacPtr, (*ramdacPtr->WriteData)(pScrn, ramdacReg->DAC[i]); } -_X_EXPORT void +void IBMramdacSave(ScrnInfoPtr pScrn, RamDacRecPtr ramdacPtr, RamDacRegRecPtr ramdacReg) { @@ -225,7 +225,7 @@ IBMramdacSave(ScrnInfoPtr pScrn, RamDacRecPtr ramdacPtr, ramdacReg->DacRegs[i] = (*ramdacPtr->ReadDAC)(pScrn, i); } -_X_EXPORT RamDacHelperRecPtr +RamDacHelperRecPtr IBMramdacProbe(ScrnInfoPtr pScrn, RamDacSupportedInfoRecPtr ramdacs/* , RamDacRecPtr ramdacPtr*/) { RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn); @@ -318,7 +318,7 @@ IBMramdacProbe(ScrnInfoPtr pScrn, RamDacSupportedInfoRecPtr ramdacs/* , RamDacRe return ramdacHelperPtr; } -_X_EXPORT void +void IBMramdac526SetBpp(ScrnInfoPtr pScrn, RamDacRegRecPtr ramdacReg) { ramdacReg->DacRegs[IBMRGB_key_control] = 0x00; /* Disable Chroma Key */ @@ -376,11 +376,11 @@ IBMramdac526SetBpp(ScrnInfoPtr pScrn, RamDacRegRecPtr ramdacReg) } } -_X_EXPORT IBMramdac526SetBppProc *IBMramdac526SetBppWeak(void) { +IBMramdac526SetBppProc *IBMramdac526SetBppWeak(void) { return IBMramdac526SetBpp; } -_X_EXPORT void +void IBMramdac640SetBpp(ScrnInfoPtr pScrn, RamDacRegRecPtr ramdacReg) { unsigned char bpp = 0x00; @@ -606,7 +606,7 @@ IBMramdac640UseHWCursor(ScreenPtr pScr, CursorPtr pCurs) return TRUE; } -_X_EXPORT void +void IBMramdac526HWCursorInit(xf86CursorInfoPtr infoPtr) { infoPtr->MaxWidth = 64; @@ -622,7 +622,7 @@ IBMramdac526HWCursorInit(xf86CursorInfoPtr infoPtr) infoPtr->UseHWCursor = IBMramdac526UseHWCursor; } -_X_EXPORT void +void IBMramdac640HWCursorInit(xf86CursorInfoPtr infoPtr) { infoPtr->MaxWidth = 64; diff --git a/hw/xfree86/ramdac/IBM.h b/hw/xfree86/ramdac/IBM.h index fdb0f5ad1..6fa18b219 100644 --- a/hw/xfree86/ramdac/IBM.h +++ b/hw/xfree86/ramdac/IBM.h @@ -1,24 +1,24 @@ #include <xf86RamDac.h> -RamDacHelperRecPtr IBMramdacProbe(ScrnInfoPtr pScrn, RamDacSupportedInfoRecPtr ramdacs); -void IBMramdacSave(ScrnInfoPtr pScrn, RamDacRecPtr RamDacRec, RamDacRegRecPtr RamDacRegRec); -void IBMramdacRestore(ScrnInfoPtr pScrn, RamDacRecPtr RamDacRec, RamDacRegRecPtr RamDacRegRec); -void IBMramdac526SetBpp(ScrnInfoPtr pScrn, RamDacRegRecPtr RamDacRegRec); -void IBMramdac640SetBpp(ScrnInfoPtr pScrn, RamDacRegRecPtr RamDacRegRec); -unsigned long IBMramdac526CalculateMNPCForClock(unsigned long RefClock, +extern _X_EXPORT RamDacHelperRecPtr IBMramdacProbe(ScrnInfoPtr pScrn, RamDacSupportedInfoRecPtr ramdacs); +extern _X_EXPORT void IBMramdacSave(ScrnInfoPtr pScrn, RamDacRecPtr RamDacRec, RamDacRegRecPtr RamDacRegRec); +extern _X_EXPORT void IBMramdacRestore(ScrnInfoPtr pScrn, RamDacRecPtr RamDacRec, RamDacRegRecPtr RamDacRegRec); +extern _X_EXPORT void IBMramdac526SetBpp(ScrnInfoPtr pScrn, RamDacRegRecPtr RamDacRegRec); +extern _X_EXPORT void IBMramdac640SetBpp(ScrnInfoPtr pScrn, RamDacRegRecPtr RamDacRegRec); +extern _X_EXPORT unsigned long IBMramdac526CalculateMNPCForClock(unsigned long RefClock, unsigned long ReqClock, char IsPixClock, unsigned long MinClock, unsigned long MaxClock, unsigned long *rM, unsigned long *rN, unsigned long *rP, unsigned long *rC); -unsigned long IBMramdac640CalculateMNPCForClock(unsigned long RefClock, +extern _X_EXPORT unsigned long IBMramdac640CalculateMNPCForClock(unsigned long RefClock, unsigned long ReqClock, char IsPixClock, unsigned long MinClock, unsigned long MaxClock, unsigned long *rM, unsigned long *rN, unsigned long *rP, unsigned long *rC); -void IBMramdac526HWCursorInit(xf86CursorInfoPtr infoPtr); -void IBMramdac640HWCursorInit(xf86CursorInfoPtr infoPtr); +extern _X_EXPORT void IBMramdac526HWCursorInit(xf86CursorInfoPtr infoPtr); +extern _X_EXPORT void IBMramdac640HWCursorInit(xf86CursorInfoPtr infoPtr); typedef void IBMramdac526SetBppProc(ScrnInfoPtr, RamDacRegRecPtr); -IBMramdac526SetBppProc *IBMramdac526SetBppWeak(void); +extern _X_EXPORT IBMramdac526SetBppProc *IBMramdac526SetBppWeak(void); #define IBM524_RAMDAC ((VENDOR_IBM << 16) | 0x00) #define IBM524A_RAMDAC ((VENDOR_IBM << 16) | 0x01) diff --git a/hw/xfree86/ramdac/TI.c b/hw/xfree86/ramdac/TI.c index fdc695202..f421fc39a 100644 --- a/hw/xfree86/ramdac/TI.c +++ b/hw/xfree86/ramdac/TI.c @@ -42,7 +42,7 @@ #define TI_MIN_VCO_FREQ 110000 #define TI_MAX_VCO_FREQ 220000 -_X_EXPORT unsigned long +unsigned long TIramdacCalculateMNPForClock( unsigned long RefClock, /* In 100Hz units */ unsigned long ReqClock, /* In 100Hz units */ @@ -123,7 +123,7 @@ TIramdacCalculateMNPForClock( return (ActualClock); } -_X_EXPORT void +void TIramdacRestore(ScrnInfoPtr pScrn, RamDacRecPtr ramdacPtr, RamDacRegRecPtr ramdacReg) { @@ -225,7 +225,7 @@ TIramdacRestore(ScrnInfoPtr pScrn, RamDacRecPtr ramdacPtr, #endif } -_X_EXPORT void +void TIramdacSave(ScrnInfoPtr pScrn, RamDacRecPtr ramdacPtr, RamDacRegRecPtr ramdacReg) { @@ -280,7 +280,7 @@ TIramdacSave(ScrnInfoPtr pScrn, RamDacRecPtr ramdacPtr, TISAVE(TIDAC_ind_curs_ctrl); } -_X_EXPORT RamDacHelperRecPtr +RamDacHelperRecPtr TIramdacProbe(ScrnInfoPtr pScrn, RamDacSupportedInfoRecPtr ramdacs) { RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn); @@ -353,7 +353,7 @@ TIramdacProbe(ScrnInfoPtr pScrn, RamDacSupportedInfoRecPtr ramdacs) return ramdacHelperPtr; } -_X_EXPORT void +void TIramdac3026SetBpp(ScrnInfoPtr pScrn, RamDacRegRecPtr ramdacReg) { switch (pScrn->bitsPerPixel) { @@ -470,7 +470,7 @@ TIramdac3026SetBpp(ScrnInfoPtr pScrn, RamDacRegRecPtr ramdacReg) } } -_X_EXPORT void +void TIramdac3030SetBpp(ScrnInfoPtr pScrn, RamDacRegRecPtr ramdacReg) { switch (pScrn->bitsPerPixel) { @@ -660,7 +660,7 @@ TIramdacUseHWCursor(ScreenPtr pScr, CursorPtr pCurs) return TRUE; } -_X_EXPORT void +void TIramdacHWCursorInit(xf86CursorInfoPtr infoPtr) { infoPtr->MaxWidth = 64; @@ -676,7 +676,7 @@ TIramdacHWCursorInit(xf86CursorInfoPtr infoPtr) infoPtr->UseHWCursor = TIramdacUseHWCursor; } -_X_EXPORT void TIramdacLoadPalette( +void TIramdacLoadPalette( ScrnInfoPtr pScrn, int numColors, int *indices, @@ -714,6 +714,6 @@ _X_EXPORT void TIramdacLoadPalette( } } -_X_EXPORT TIramdacLoadPaletteProc *TIramdacLoadPaletteWeak(void) { +TIramdacLoadPaletteProc *TIramdacLoadPaletteWeak(void) { return TIramdacLoadPalette; } diff --git a/hw/xfree86/ramdac/TI.h b/hw/xfree86/ramdac/TI.h index 5eb94cbc7..f5499f903 100644 --- a/hw/xfree86/ramdac/TI.h +++ b/hw/xfree86/ramdac/TI.h @@ -1,22 +1,22 @@ #include <xf86RamDac.h> -unsigned long TIramdacCalculateMNPForClock(unsigned long RefClock, +extern _X_EXPORT unsigned long TIramdacCalculateMNPForClock(unsigned long RefClock, unsigned long ReqClock, char IsPixClock, unsigned long MinClock, unsigned long MaxClock, unsigned long *rM, unsigned long *rN, unsigned long *rP); -RamDacHelperRecPtr TIramdacProbe(ScrnInfoPtr pScrn, RamDacSupportedInfoRecPtr ramdacs); -void TIramdacSave(ScrnInfoPtr pScrn, RamDacRecPtr RamDacRec, RamDacRegRecPtr RamDacRegRec); -void TIramdacRestore(ScrnInfoPtr pScrn, RamDacRecPtr RamDacRec, RamDacRegRecPtr RamDacRegRec); -void TIramdac3026SetBpp(ScrnInfoPtr pScrn, RamDacRegRecPtr RamDacRegRec); -void TIramdac3030SetBpp(ScrnInfoPtr pScrn, RamDacRegRecPtr RamDacRegRec); -void TIramdacHWCursorInit(xf86CursorInfoPtr infoPtr); -void TIramdacLoadPalette( ScrnInfoPtr pScrn, int numColors, int *indices, +extern _X_EXPORT RamDacHelperRecPtr TIramdacProbe(ScrnInfoPtr pScrn, RamDacSupportedInfoRecPtr ramdacs); +extern _X_EXPORT void TIramdacSave(ScrnInfoPtr pScrn, RamDacRecPtr RamDacRec, RamDacRegRecPtr RamDacRegRec); +extern _X_EXPORT void TIramdacRestore(ScrnInfoPtr pScrn, RamDacRecPtr RamDacRec, RamDacRegRecPtr RamDacRegRec); +extern _X_EXPORT void TIramdac3026SetBpp(ScrnInfoPtr pScrn, RamDacRegRecPtr RamDacRegRec); +extern _X_EXPORT void TIramdac3030SetBpp(ScrnInfoPtr pScrn, RamDacRegRecPtr RamDacRegRec); +extern _X_EXPORT void TIramdacHWCursorInit(xf86CursorInfoPtr infoPtr); +extern _X_EXPORT void TIramdacLoadPalette( ScrnInfoPtr pScrn, int numColors, int *indices, LOCO *colors, VisualPtr pVisual); typedef void TIramdacLoadPaletteProc(ScrnInfoPtr, int, int *, LOCO *, VisualPtr); -TIramdacLoadPaletteProc *TIramdacLoadPaletteWeak(void); +extern _X_EXPORT TIramdacLoadPaletteProc *TIramdacLoadPaletteWeak(void); #define TI3030_RAMDAC (VENDOR_TI << 16) | 0x00 #define TI3026_RAMDAC (VENDOR_TI << 16) | 0x01 diff --git a/hw/xfree86/ramdac/xf86Cursor.c b/hw/xfree86/ramdac/xf86Cursor.c index 50af03b71..2b73b1698 100644 --- a/hw/xfree86/ramdac/xf86Cursor.c +++ b/hw/xfree86/ramdac/xf86Cursor.c @@ -52,7 +52,7 @@ static void xf86CursorQueryBestSize(int, unsigned short*, unsigned short*, static void xf86CursorEnableDisableFBAccess(int, Bool); static Bool xf86CursorSwitchMode(int, DisplayModePtr,int); -_X_EXPORT Bool +Bool xf86InitCursor( ScreenPtr pScreen, xf86CursorInfoPtr infoPtr @@ -395,7 +395,7 @@ xf86CursorMoveCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y) (*ScreenPriv->spriteFuncs->MoveCursor)(pDev, pScreen, x, y); } -_X_EXPORT void +void xf86ForceHWCursor (ScreenPtr pScreen, Bool on) { DeviceIntPtr pDev = inputInfo.pointer; @@ -427,13 +427,13 @@ xf86ForceHWCursor (ScreenPtr pScreen, Bool on) } } -_X_EXPORT xf86CursorInfoPtr +xf86CursorInfoPtr xf86CreateCursorInfoRec(void) { return xcalloc(1, sizeof(xf86CursorInfoRec)); } -_X_EXPORT void +void xf86DestroyCursorInfoRec(xf86CursorInfoPtr infoPtr) { xfree(infoPtr); diff --git a/hw/xfree86/ramdac/xf86Cursor.h b/hw/xfree86/ramdac/xf86Cursor.h index 469f48f01..3f3618b59 100644 --- a/hw/xfree86/ramdac/xf86Cursor.h +++ b/hw/xfree86/ramdac/xf86Cursor.h @@ -25,10 +25,10 @@ typedef struct _xf86CursorInfoRec { } xf86CursorInfoRec, *xf86CursorInfoPtr; -Bool xf86InitCursor(ScreenPtr pScreen, xf86CursorInfoPtr infoPtr); -xf86CursorInfoPtr xf86CreateCursorInfoRec(void); -void xf86DestroyCursorInfoRec(xf86CursorInfoPtr); -void xf86ForceHWCursor (ScreenPtr pScreen, Bool on); +extern _X_EXPORT Bool xf86InitCursor(ScreenPtr pScreen, xf86CursorInfoPtr infoPtr); +extern _X_EXPORT xf86CursorInfoPtr xf86CreateCursorInfoRec(void); +extern _X_EXPORT void xf86DestroyCursorInfoRec(xf86CursorInfoPtr); +extern _X_EXPORT void xf86ForceHWCursor (ScreenPtr pScreen, Bool on); #define HARDWARE_CURSOR_INVERT_MASK 0x00000001 #define HARDWARE_CURSOR_AND_SOURCE_WITH_MASK 0x00000002 diff --git a/hw/xfree86/ramdac/xf86RamDac.c b/hw/xfree86/ramdac/xf86RamDac.c index 360cd479f..70c752e28 100644 --- a/hw/xfree86/ramdac/xf86RamDac.c +++ b/hw/xfree86/ramdac/xf86RamDac.c @@ -33,10 +33,10 @@ #include "xf86RamDacPriv.h" -_X_EXPORT int RamDacHWPrivateIndex = -1; -_X_EXPORT int RamDacScreenPrivateIndex = -1; +int RamDacHWPrivateIndex = -1; +int RamDacScreenPrivateIndex = -1; -_X_EXPORT RamDacRecPtr +RamDacRecPtr RamDacCreateInfoRec() { RamDacRecPtr infoRec; @@ -46,7 +46,7 @@ RamDacCreateInfoRec() return infoRec; } -_X_EXPORT RamDacHelperRecPtr +RamDacHelperRecPtr RamDacHelperCreateInfoRec() { RamDacHelperRecPtr infoRec; @@ -56,19 +56,19 @@ RamDacHelperCreateInfoRec() return infoRec; } -_X_EXPORT void +void RamDacDestroyInfoRec(RamDacRecPtr infoRec) { xfree(infoRec); } -_X_EXPORT void +void RamDacHelperDestroyInfoRec(RamDacHelperRecPtr infoRec) { xfree(infoRec); } -_X_EXPORT Bool +Bool RamDacInit(ScrnInfoPtr pScrn, RamDacRecPtr ramdacPriv) { RamDacScreenRecPtr ramdacScrPtr; @@ -116,7 +116,7 @@ RamDacGetRec(ScrnInfoPtr scrp) return TRUE; } -_X_EXPORT void +void RamDacFreeRec(ScrnInfoPtr pScrn) { RamDacHWRecPtr ramdacHWPtr; @@ -141,13 +141,13 @@ RamDacFreeRec(ScrnInfoPtr pScrn) ramdacScrPtr = NULL; } -_X_EXPORT int +int RamDacGetHWIndex() { return RamDacHWPrivateIndex; } -_X_EXPORT int +int RamDacGetScreenIndex() { return RamDacScreenPrivateIndex; diff --git a/hw/xfree86/ramdac/xf86RamDac.h b/hw/xfree86/ramdac/xf86RamDac.h index 3d2982ecf..4a3900b93 100644 --- a/hw/xfree86/ramdac/xf86RamDac.h +++ b/hw/xfree86/ramdac/xf86RamDac.h @@ -101,21 +101,21 @@ typedef struct _RamdacScreenRec { } RamDacScreenRec, *RamDacScreenRecPtr; #define RAMDACSCRPTR(p) ((RamDacScreenRecPtr)((p)->privates[RamDacGetScreenIndex()].ptr))->RamDacRec -extern int RamDacHWPrivateIndex; -extern int RamDacScreenPrivateIndex; +extern _X_EXPORT int RamDacHWPrivateIndex; +extern _X_EXPORT int RamDacScreenPrivateIndex; typedef struct { int token; } RamDacSupportedInfoRec, *RamDacSupportedInfoRecPtr; -RamDacRecPtr RamDacCreateInfoRec(void); -RamDacHelperRecPtr RamDacHelperCreateInfoRec(void); -void RamDacDestroyInfoRec(RamDacRecPtr RamDacRec); -void RamDacHelperDestroyInfoRec(RamDacHelperRecPtr RamDacRec); -Bool RamDacInit(ScrnInfoPtr pScrn, RamDacRecPtr RamDacRec); -Bool RamDacHandleColormaps(ScreenPtr pScreen, int maxColors, int sigRGBbits, +extern _X_EXPORT RamDacRecPtr RamDacCreateInfoRec(void); +extern _X_EXPORT RamDacHelperRecPtr RamDacHelperCreateInfoRec(void); +extern _X_EXPORT void RamDacDestroyInfoRec(RamDacRecPtr RamDacRec); +extern _X_EXPORT void RamDacHelperDestroyInfoRec(RamDacHelperRecPtr RamDacRec); +extern _X_EXPORT Bool RamDacInit(ScrnInfoPtr pScrn, RamDacRecPtr RamDacRec); +extern _X_EXPORT Bool RamDacHandleColormaps(ScreenPtr pScreen, int maxColors, int sigRGBbits, unsigned int flags); -void RamDacFreeRec(ScrnInfoPtr pScrn); -int RamDacGetHWIndex(void); +extern _X_EXPORT void RamDacFreeRec(ScrnInfoPtr pScrn); +extern _X_EXPORT int RamDacGetHWIndex(void); #endif /* _XF86RAMDAC_H */ diff --git a/hw/xfree86/ramdac/xf86RamDacCmap.c b/hw/xfree86/ramdac/xf86RamDacCmap.c index f4fdb181b..600fe3f07 100644 --- a/hw/xfree86/ramdac/xf86RamDacCmap.c +++ b/hw/xfree86/ramdac/xf86RamDacCmap.c @@ -58,7 +58,7 @@ RamDacLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices, LOCO *colors, } } -_X_EXPORT Bool +Bool RamDacHandleColormaps(ScreenPtr pScreen, int maxColors, int sigRGBbits, unsigned int flags) { diff --git a/hw/xfree86/shadowfb/shadow.c b/hw/xfree86/shadowfb/shadow.c index 7d20a6508..ff775efbd 100644 --- a/hw/xfree86/shadowfb/shadow.c +++ b/hw/xfree86/shadowfb/shadow.c @@ -159,7 +159,7 @@ static DevPrivateKey ShadowGCKey = &ShadowGCKeyIndex; -_X_EXPORT Bool +Bool ShadowFBInit2 ( ScreenPtr pScreen, RefreshAreaFuncPtr preRefreshArea, @@ -212,7 +212,7 @@ ShadowFBInit2 ( return TRUE; } -_X_EXPORT Bool +Bool ShadowFBInit ( ScreenPtr pScreen, RefreshAreaFuncPtr refreshArea diff --git a/hw/xfree86/shadowfb/shadowfb.h b/hw/xfree86/shadowfb/shadowfb.h index 6c9635879..56e0e86fe 100644 --- a/hw/xfree86/shadowfb/shadowfb.h +++ b/hw/xfree86/shadowfb/shadowfb.h @@ -19,7 +19,7 @@ typedef void (*RefreshAreaFuncPtr)(ScrnInfoPtr, int, BoxPtr); * * Returns FALSE in the event of an error. */ -Bool +extern _X_EXPORT Bool ShadowFBInit ( ScreenPtr pScreen, RefreshAreaFuncPtr refreshArea @@ -33,7 +33,7 @@ ShadowFBInit ( * * Returns FALSE in the event of an error */ -Bool +extern _X_EXPORT Bool ShadowFBInit2 ( ScreenPtr pScreen, RefreshAreaFuncPtr preRefreshArea, diff --git a/hw/xfree86/vbe/vbe.c b/hw/xfree86/vbe/vbe.c index 1322962fd..4986b5b29 100644 --- a/hw/xfree86/vbe/vbe.c +++ b/hw/xfree86/vbe/vbe.c @@ -41,13 +41,13 @@ static Bool vbeProbeDDC(vbeInfoPtr pVbe); static const char vbeVersionString[] = "VBE2"; -_X_EXPORT vbeInfoPtr +vbeInfoPtr VBEInit(xf86Int10InfoPtr pInt, int entityIndex) { return VBEExtendedInit(pInt, entityIndex, 0); } -_X_EXPORT vbeInfoPtr +vbeInfoPtr VBEExtendedInit(xf86Int10InfoPtr pInt, int entityIndex, int Flags) { int RealOff; @@ -155,7 +155,7 @@ VBEExtendedInit(xf86Int10InfoPtr pInt, int entityIndex, int Flags) return NULL; } -_X_EXPORT void +void vbeFree(vbeInfoPtr pVbe) { if (!pVbe) @@ -306,7 +306,7 @@ vbeReadEDID(vbeInfoPtr pVbe) return tmp; } -_X_EXPORT xf86MonPtr +xf86MonPtr vbeDoEDID(vbeInfoPtr pVbe, pointer pDDCModule) { xf86MonPtr pMonitor; @@ -339,7 +339,7 @@ vbeDoEDID(vbeInfoPtr pVbe, pointer pDDCModule) #define GET_UNALIGNED2(x) \ ((*(CARD16*)(x)) | (*(((CARD16*)(x) + 1))) << 16) -_X_EXPORT VbeInfoBlock * +VbeInfoBlock * VBEGetVBEInfo(vbeInfoPtr pVbe) { VbeInfoBlock *block = NULL; @@ -423,7 +423,7 @@ VBEGetVBEInfo(vbeInfoPtr pVbe) return (block); } -_X_EXPORT void +void VBEFreeVBEInfo(VbeInfoBlock *block) { xfree(block->OEMStringPtr); @@ -436,7 +436,7 @@ VBEFreeVBEInfo(VbeInfoBlock *block) xfree(block); } -_X_EXPORT Bool +Bool VBESetVBEMode(vbeInfoPtr pVbe, int mode, VbeCRTCInfoBlock *block) { /* @@ -474,7 +474,7 @@ VBESetVBEMode(vbeInfoPtr pVbe, int mode, VbeCRTCInfoBlock *block) return (R16(pVbe->pInt10->ax) == 0x4f); } -_X_EXPORT Bool +Bool VBEGetVBEMode(vbeInfoPtr pVbe, int *mode) { /* @@ -501,7 +501,7 @@ VBEGetVBEMode(vbeInfoPtr pVbe, int *mode) return (FALSE); } -_X_EXPORT VbeModeInfoBlock * +VbeModeInfoBlock * VBEGetModeInfo(vbeInfoPtr pVbe, int mode) { VbeModeInfoBlock *block = NULL; @@ -596,13 +596,13 @@ VBEGetModeInfo(vbeInfoPtr pVbe, int mode) return (block); } -_X_EXPORT void +void VBEFreeModeInfo(VbeModeInfoBlock *block) { xfree(block); } -_X_EXPORT Bool +Bool VBESaveRestore(vbeInfoPtr pVbe, vbeSaveRestoreFunction function, pointer *memory, int *size, int *real_mode_pages) { @@ -701,7 +701,7 @@ VBESaveRestore(vbeInfoPtr pVbe, vbeSaveRestoreFunction function, return TRUE; } -_X_EXPORT Bool +Bool VBEBankSwitch(vbeInfoPtr pVbe, unsigned int iBank, int window) { /* @@ -723,7 +723,7 @@ VBEBankSwitch(vbeInfoPtr pVbe, unsigned int iBank, int window) return (TRUE); } -_X_EXPORT Bool +Bool VBESetGetLogicalScanlineLength(vbeInfoPtr pVbe, vbeScanwidthCommand command, int width, int *pixels, int *bytes, int *max) { @@ -771,7 +771,7 @@ VBESetGetLogicalScanlineLength(vbeInfoPtr pVbe, vbeScanwidthCommand command, return (TRUE); } -_X_EXPORT Bool +Bool VBESetDisplayStart(vbeInfoPtr pVbe, int x, int y, Bool wait_retrace) { pVbe->pInt10->num = 0x10; @@ -787,7 +787,7 @@ VBESetDisplayStart(vbeInfoPtr pVbe, int x, int y, Bool wait_retrace) return (TRUE); } -_X_EXPORT Bool +Bool VBEGetDisplayStart(vbeInfoPtr pVbe, int *x, int *y) { pVbe->pInt10->num = 0x10; @@ -804,7 +804,7 @@ VBEGetDisplayStart(vbeInfoPtr pVbe, int *x, int *y) return (TRUE); } -_X_EXPORT int +int VBESetGetDACPaletteFormat(vbeInfoPtr pVbe, int bits) { /* @@ -834,7 +834,7 @@ VBESetGetDACPaletteFormat(vbeInfoPtr pVbe, int bits) return (bits != 0 ? bits : (pVbe->pInt10->bx >> 8) & 0x00ff); } -_X_EXPORT CARD32 * +CARD32 * VBESetGetPaletteData(vbeInfoPtr pVbe, Bool set, int first, int num, CARD32 *data, Bool secondary, Bool wait_retrace) { @@ -891,7 +891,7 @@ VBESetGetPaletteData(vbeInfoPtr pVbe, Bool set, int first, int num, return (data); } -_X_EXPORT VBEpmi * +VBEpmi * VBEGetVBEpmi(vbeInfoPtr pVbe) { VBEpmi *pmi; @@ -977,7 +977,7 @@ VBECalcVbeModeIndex(vbeModeInfoPtr m, DisplayModePtr mode, int bpp) } #endif -_X_EXPORT void +void VBEVesaSaveRestore(vbeInfoPtr pVbe, vbeSaveRestorePtr vbe_sr, vbeSaveRestoreFunction function) { @@ -1013,7 +1013,7 @@ VBEVesaSaveRestore(vbeInfoPtr pVbe, vbeSaveRestorePtr vbe_sr, } -_X_EXPORT int +int VBEGetPixelClock(vbeInfoPtr pVbe, int mode, int clock) { /* @@ -1041,7 +1041,7 @@ VBEGetPixelClock(vbeInfoPtr pVbe, int mode, int clock) return (pVbe->pInt10->cx); } -_X_EXPORT Bool +Bool VBEDPMSSet(vbeInfoPtr pVbe, int mode) { /* @@ -1074,7 +1074,7 @@ VBEDPMSSet(vbeInfoPtr pVbe, int mode) return (R16(pVbe->pInt10->ax) == 0x4f); } -_X_EXPORT void +void VBEInterpretPanelID(int scrnIndex, struct vbePanelID *data) { ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; @@ -1103,7 +1103,7 @@ VBEInterpretPanelID(int scrnIndex, struct vbePanelID *data) xfree(mode); } -_X_EXPORT struct vbePanelID * +struct vbePanelID * VBEReadPanelID(vbeInfoPtr pVbe) { int RealOff = pVbe->real_mode_base; diff --git a/hw/xfree86/vbe/vbe.h b/hw/xfree86/vbe/vbe.h index 7f05e6b23..b1ec5a9fb 100644 --- a/hw/xfree86/vbe/vbe.h +++ b/hw/xfree86/vbe/vbe.h @@ -37,10 +37,10 @@ typedef struct { #define VBE_VERSION_MAJOR(x) *((CARD8*)(&x) + 1) #define VBE_VERSION_MINOR(x) (CARD8)(x) -vbeInfoPtr VBEInit(xf86Int10InfoPtr pInt, int entityIndex); -vbeInfoPtr VBEExtendedInit(xf86Int10InfoPtr pInt, int entityIndex, int Flags); -void vbeFree(vbeInfoPtr pVbe); -xf86MonPtr vbeDoEDID(vbeInfoPtr pVbe, pointer pDDCModule); +extern _X_EXPORT vbeInfoPtr VBEInit(xf86Int10InfoPtr pInt, int entityIndex); +extern _X_EXPORT vbeInfoPtr VBEExtendedInit(xf86Int10InfoPtr pInt, int entityIndex, int Flags); +extern _X_EXPORT void vbeFree(vbeInfoPtr pVbe); +extern _X_EXPORT xf86MonPtr vbeDoEDID(vbeInfoPtr pVbe, pointer pDDCModule); #pragma pack(1) @@ -99,8 +99,8 @@ struct _VbeInfoBlock { } __attribute__((packed)); /* Return Super VGA Information */ -VbeInfoBlock *VBEGetVBEInfo(vbeInfoPtr pVbe); -void VBEFreeVBEInfo(VbeInfoBlock *block); +extern _X_EXPORT VbeInfoBlock *VBEGetVBEInfo(vbeInfoPtr pVbe); +extern _X_EXPORT void VBEFreeVBEInfo(VbeInfoBlock *block); /* * INT 1 @@ -163,8 +163,8 @@ struct _VbeModeInfoBlock { } __attribute__((packed)); /* Return VBE Mode Information */ -VbeModeInfoBlock *VBEGetModeInfo(vbeInfoPtr pVbe, int mode); -void VBEFreeModeInfo(VbeModeInfoBlock *block); +extern _X_EXPORT VbeModeInfoBlock *VBEGetModeInfo(vbeInfoPtr pVbe, int mode); +extern _X_EXPORT void VBEFreeModeInfo(VbeModeInfoBlock *block); /* * INT2 @@ -189,13 +189,13 @@ struct _VbeCRTCInfoBlock { } __attribute__((packed)); /* VbeCRTCInfoBlock is in the VESA 3.0 specs */ -Bool VBESetVBEMode(vbeInfoPtr pVbe, int mode, VbeCRTCInfoBlock *crtc); +extern _X_EXPORT Bool VBESetVBEMode(vbeInfoPtr pVbe, int mode, VbeCRTCInfoBlock *crtc); /* * INT 3 */ -Bool VBEGetVBEMode(vbeInfoPtr pVbe, int *mode); +extern _X_EXPORT Bool VBEGetVBEMode(vbeInfoPtr pVbe, int *mode); /* * INT 4 @@ -217,7 +217,7 @@ typedef enum { MODE_RESTORE } vbeSaveRestoreFunction; -Bool +extern _X_EXPORT Bool VBESaveRestore(vbeInfoPtr pVbe, vbeSaveRestoreFunction fuction, pointer *memory, int *size, int *real_mode_pages); @@ -225,7 +225,7 @@ VBESaveRestore(vbeInfoPtr pVbe, vbeSaveRestoreFunction fuction, * INT 5 */ -Bool +extern _X_EXPORT Bool VBEBankSwitch(vbeInfoPtr pVbe, unsigned int iBank, int window); /* @@ -251,7 +251,7 @@ typedef enum { #define VBEGetMaxLogicalScanline(pVbe, pixels, bytes, max) \ VBESetGetLogicalScanlineLength(pVbe, SCANWID_GET_MAX, 0, \ pixels, bytes, max) -Bool VBESetGetLogicalScanlineLength(vbeInfoPtr pVbe, +extern _X_EXPORT Bool VBESetGetLogicalScanlineLength(vbeInfoPtr pVbe, vbeScanwidthCommand command, int width, int *pixels, int *bytes, int *max); @@ -260,15 +260,15 @@ Bool VBESetGetLogicalScanlineLength(vbeInfoPtr pVbe, */ /* 16 bit code */ -Bool VBESetDisplayStart(vbeInfoPtr pVbe, int x, int y, Bool wait_retrace); -Bool VBEGetDisplayStart(vbeInfoPtr pVbe, int *x, int *y); +extern _X_EXPORT Bool VBESetDisplayStart(vbeInfoPtr pVbe, int x, int y, Bool wait_retrace); +extern _X_EXPORT Bool VBEGetDisplayStart(vbeInfoPtr pVbe, int *x, int *y); /* * INT 8 */ /* if bits is 0, then it is a GET */ -int VBESetGetDACPaletteFormat(vbeInfoPtr pVbe, int bits); +extern _X_EXPORT int VBESetGetDACPaletteFormat(vbeInfoPtr pVbe, int bits); /* * INT 9 @@ -280,7 +280,7 @@ int VBESetGetDACPaletteFormat(vbeInfoPtr pVbe, int bits); * If setting a palette, it will return the pointer received on success, * NULL on failure. */ -CARD32 *VBESetGetPaletteData(vbeInfoPtr pVbe, Bool set, int first, int num, +extern _X_EXPORT CARD32 *VBESetGetPaletteData(vbeInfoPtr pVbe, Bool set, int first, int num, CARD32 *data, Bool secondary, Bool wait_retrace); #define VBEFreePaletteData(data) xfree(data) @@ -294,7 +294,7 @@ typedef struct _VBEpmi { int tbl_len; } VBEpmi; -VBEpmi *VBEGetVBEpmi(vbeInfoPtr pVbe); +extern _X_EXPORT VBEpmi *VBEGetVBEpmi(vbeInfoPtr pVbe); #define VESAFreeVBEpmi(pmi) xfree(pmi) /* high level helper functions */ @@ -315,12 +315,12 @@ typedef struct { int stateMode; } vbeSaveRestoreRec, *vbeSaveRestorePtr; -void +extern _X_EXPORT void VBEVesaSaveRestore(vbeInfoPtr pVbe, vbeSaveRestorePtr vbe_sr, vbeSaveRestoreFunction function); -int VBEGetPixelClock(vbeInfoPtr pVbe, int mode, int Clock); -Bool VBEDPMSSet(vbeInfoPtr pVbe, int mode); +extern _X_EXPORT int VBEGetPixelClock(vbeInfoPtr pVbe, int mode, int Clock); +extern _X_EXPORT Bool VBEDPMSSet(vbeInfoPtr pVbe, int mode); struct vbePanelID { short hsize; @@ -335,7 +335,7 @@ struct vbePanelID { char reserved[14]; }; -void VBEInterpretPanelID(int scrnIndex, struct vbePanelID *data); -struct vbePanelID *VBEReadPanelID(vbeInfoPtr pVbe); +extern _X_EXPORT void VBEInterpretPanelID(int scrnIndex, struct vbePanelID *data); +extern _X_EXPORT struct vbePanelID *VBEReadPanelID(vbeInfoPtr pVbe); #endif diff --git a/hw/xfree86/vbe/vbeModes.c b/hw/xfree86/vbe/vbeModes.c index 78cca5ae1..fb730a708 100644 --- a/hw/xfree86/vbe/vbeModes.c +++ b/hw/xfree86/vbe/vbeModes.c @@ -89,7 +89,7 @@ GetDepthFlag(vbeInfoPtr pVbe, int id) /* * Find supported mode depths. */ -_X_EXPORT int +int VBEFindSupportedDepths(vbeInfoPtr pVbe, VbeInfoBlock *vbe, int *flags24, int modeTypes) { @@ -269,7 +269,7 @@ CheckMode(ScrnInfoPtr pScrn, vbeInfoPtr pVbe, VbeInfoBlock *vbe, int id, * list. */ -_X_EXPORT DisplayModePtr +DisplayModePtr VBEGetModePool(ScrnInfoPtr pScrn, vbeInfoPtr pVbe, VbeInfoBlock *vbe, int modeTypes) { @@ -343,7 +343,7 @@ VBEGetModePool(ScrnInfoPtr pScrn, vbeInfoPtr pVbe, VbeInfoBlock *vbe, return modePool; } -_X_EXPORT void +void VBESetModeNames(DisplayModePtr pMode) { if (!pMode) @@ -369,7 +369,7 @@ VBESetModeNames(DisplayModePtr pMode) * parameters for each BIOS mode. Note: This is only supported in * VBE version 3.0 or later. */ -_X_EXPORT void +void VBESetModeParameters(ScrnInfoPtr pScrn, vbeInfoPtr pVbe) { DisplayModePtr pMode; @@ -432,7 +432,7 @@ VBESetModeParameters(ScrnInfoPtr pScrn, vbeInfoPtr pVbe) /* * These wrappers are to allow (temporary) funtionality divergences. */ -_X_EXPORT int +int VBEValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes, char **modeNames, ClockRangePtr clockRanges, int *linePitches, int minPitch, int maxPitch, int pitchInc, @@ -445,7 +445,7 @@ VBEValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes, apertureSize, strategy); } -_X_EXPORT void +void VBEPrintModes(ScrnInfoPtr scrp) { xf86PrintModes(scrp); diff --git a/hw/xfree86/vbe/vbeModes.h b/hw/xfree86/vbe/vbeModes.h index c28cdaa37..447798709 100644 --- a/hw/xfree86/vbe/vbeModes.h +++ b/hw/xfree86/vbe/vbeModes.h @@ -67,24 +67,24 @@ typedef struct _VbeModeInfoData { #define V_MODETYPE_VGA 0x02 #define V_MODETYPE_BAD 0x04 -extern int VBEFindSupportedDepths(vbeInfoPtr pVbe, VbeInfoBlock *vbe, +extern _X_EXPORT int VBEFindSupportedDepths(vbeInfoPtr pVbe, VbeInfoBlock *vbe, int *flags24, int modeTypes); -extern DisplayModePtr VBEGetModePool(ScrnInfoPtr pScrn, vbeInfoPtr pVbe, +extern _X_EXPORT DisplayModePtr VBEGetModePool(ScrnInfoPtr pScrn, vbeInfoPtr pVbe, VbeInfoBlock *vbe, int modeTypes); -extern void VBESetModeNames(DisplayModePtr pMode); -extern void VBESetModeParameters(ScrnInfoPtr pScrn, vbeInfoPtr pVbe); +extern _X_EXPORT void VBESetModeNames(DisplayModePtr pMode); +extern _X_EXPORT void VBESetModeParameters(ScrnInfoPtr pScrn, vbeInfoPtr pVbe); /* * Note: These are alternatives to the standard helpers. They should * usually just wrap the standard helpers. */ -extern int VBEValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes, +extern _X_EXPORT int VBEValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes, char **modeNames, ClockRangePtr clockRanges, int *linePitches, int minPitch, int maxPitch, int pitchInc, int minHeight, int maxHeight, int virtualX, int virtualY, int apertureSize, LookupModeFlags strategy); -extern void VBEPrintModes(ScrnInfoPtr scrp); +extern _X_EXPORT void VBEPrintModes(ScrnInfoPtr scrp); #endif /* VBE_MODES_H */ diff --git a/hw/xfree86/vgahw/vgaHW.c b/hw/xfree86/vgahw/vgaHW.c index 85b15d5eb..1c278d119 100644 --- a/hw/xfree86/vgahw/vgaHW.c +++ b/hw/xfree86/vgahw/vgaHW.c @@ -328,7 +328,7 @@ stdWriteEnable(vgaHWPtr hwp, CARD8 value) outb(hwp->PIOOffset + VGA_ENABLE, value); } -_X_EXPORT void +void vgaHWSetStdFuncs(vgaHWPtr hwp) { hwp->writeCrtc = stdWriteCrtc; @@ -535,7 +535,7 @@ mmioWriteEnable(vgaHWPtr hwp, CARD8 value) moutb(VGA_ENABLE, value); } -_X_EXPORT void +void vgaHWSetMmioFuncs(vgaHWPtr hwp, CARD8 *base, int offset) { hwp->writeCrtc = mmioWriteCrtc; @@ -571,7 +571,7 @@ vgaHWSetMmioFuncs(vgaHWPtr hwp, CARD8 *base, int offset) * Protect VGA registers and memory from corruption during loads. */ -_X_EXPORT void +void vgaHWProtect(ScrnInfoPtr pScrn, Bool on) { vgaHWPtr hwp = VGAHWPTR(pScrn); @@ -604,7 +604,7 @@ vgaHWProtect(ScrnInfoPtr pScrn, Bool on) } } -_X_EXPORT vgaHWProtectProc *vgaHWProtectWeak(void) { +vgaHWProtectProc *vgaHWProtectWeak(void) { return vgaHWProtect; } @@ -612,7 +612,7 @@ _X_EXPORT vgaHWProtectProc *vgaHWProtectWeak(void) { * vgaHWBlankScreen -- blank the screen. */ -_X_EXPORT void +void vgaHWBlankScreen(ScrnInfoPtr pScrn, Bool on) { vgaHWPtr hwp = VGAHWPTR(pScrn); @@ -631,7 +631,7 @@ vgaHWBlankScreen(ScrnInfoPtr pScrn, Bool on) vgaHWSeqReset(hwp, FALSE); } -_X_EXPORT vgaHWBlankScreenProc *vgaHWBlankScreenWeak(void) { +vgaHWBlankScreenProc *vgaHWBlankScreenWeak(void) { return vgaHWBlankScreen; } @@ -639,7 +639,7 @@ _X_EXPORT vgaHWBlankScreenProc *vgaHWBlankScreenWeak(void) { * vgaHWSaveScreen -- blank the screen. */ -_X_EXPORT Bool +Bool vgaHWSaveScreen(ScreenPtr pScreen, int mode) { ScrnInfoPtr pScrn = NULL; @@ -670,7 +670,7 @@ vgaHWSaveScreen(ScreenPtr pScreen, int mode) * for this function must be written. */ -_X_EXPORT void +void vgaHWDPMSSet(ScrnInfoPtr pScrn, int PowerManagementMode, int flags) { unsigned char seq1 = 0, crtc17 = 0; @@ -715,7 +715,7 @@ vgaHWDPMSSet(ScrnInfoPtr pScrn, int PowerManagementMode, int flags) * perform a sequencer reset. */ -_X_EXPORT void +void vgaHWSeqReset(vgaHWPtr hwp, Bool start) { if (start) @@ -725,7 +725,7 @@ vgaHWSeqReset(vgaHWPtr hwp, Bool start) } -_X_EXPORT void +void vgaHWRestoreFonts(ScrnInfoPtr scrninfp, vgaRegPtr restore) { #if SAVE_TEXT || SAVE_FONT1 || SAVE_FONT2 @@ -839,7 +839,7 @@ vgaHWRestoreFonts(ScrnInfoPtr scrninfp, vgaRegPtr restore) } -_X_EXPORT void +void vgaHWRestoreMode(ScrnInfoPtr scrninfp, vgaRegPtr restore) { vgaHWPtr hwp = VGAHWPTR(scrninfp); @@ -871,7 +871,7 @@ vgaHWRestoreMode(ScrnInfoPtr scrninfp, vgaRegPtr restore) } -_X_EXPORT void +void vgaHWRestoreColormap(ScrnInfoPtr scrninfp, vgaRegPtr restore) { vgaHWPtr hwp = VGAHWPTR(scrninfp); @@ -897,7 +897,7 @@ vgaHWRestoreColormap(ScrnInfoPtr scrninfp, vgaRegPtr restore) * restore the VGA state */ -_X_EXPORT void +void vgaHWRestore(ScrnInfoPtr scrninfp, vgaRegPtr restore, int flags) { if (flags & VGA_SR_MODE) @@ -910,7 +910,7 @@ vgaHWRestore(ScrnInfoPtr scrninfp, vgaRegPtr restore, int flags) vgaHWRestoreColormap(scrninfp, restore); } -_X_EXPORT void +void vgaHWSaveFonts(ScrnInfoPtr scrninfp, vgaRegPtr save) { #if SAVE_TEXT || SAVE_FONT1 || SAVE_FONT2 @@ -1011,7 +1011,7 @@ vgaHWSaveFonts(ScrnInfoPtr scrninfp, vgaRegPtr save) #endif /* SAVE_TEXT || SAVE_FONT1 || SAVE_FONT2 */ } -_X_EXPORT void +void vgaHWSaveMode(ScrnInfoPtr scrninfp, vgaRegPtr save) { vgaHWPtr hwp = VGAHWPTR(scrninfp); @@ -1055,7 +1055,7 @@ vgaHWSaveMode(ScrnInfoPtr scrninfp, vgaRegPtr save) } -_X_EXPORT void +void vgaHWSaveColormap(ScrnInfoPtr scrninfp, vgaRegPtr save) { vgaHWPtr hwp = VGAHWPTR(scrninfp); @@ -1156,7 +1156,7 @@ vgaHWSaveColormap(ScrnInfoPtr scrninfp, vgaRegPtr save) * save the current VGA state */ -_X_EXPORT void +void vgaHWSave(ScrnInfoPtr scrninfp, vgaRegPtr save, int flags) { if (save == NULL) @@ -1179,7 +1179,7 @@ vgaHWSave(ScrnInfoPtr scrninfp, vgaRegPtr save, int flags) * Return FALSE on failure. */ -_X_EXPORT Bool +Bool vgaHWInit(ScrnInfoPtr scrninfp, DisplayModePtr mode) { unsigned int i; @@ -1399,7 +1399,7 @@ vgaHWInit(ScrnInfoPtr scrninfp, DisplayModePtr mode) * -- TSI @ UQV, 1998.08.21 */ -_X_EXPORT CARD32 +CARD32 vgaHWHBlankKGA(DisplayModePtr mode, vgaRegPtr regp, int nBits, unsigned int Flags) { @@ -1440,7 +1440,7 @@ vgaHWHBlankKGA(DisplayModePtr mode, vgaRegPtr regp, int nBits, * very first scanline in a double- or multi-scanned mode. This last case * needs further investigation. */ -_X_EXPORT CARD32 +CARD32 vgaHWVBlankKGA(DisplayModePtr mode, vgaRegPtr regp, int nBits, unsigned int Flags) { @@ -1532,7 +1532,7 @@ vgaHWAllocRegs(vgaRegPtr regp) } -_X_EXPORT Bool +Bool vgaHWAllocDefaultRegs(vgaRegPtr regp) { regp->numCRTC = VGA_NUM_CRTC; @@ -1544,7 +1544,7 @@ vgaHWAllocDefaultRegs(vgaRegPtr regp) } -_X_EXPORT Bool +Bool vgaHWSetRegCounts(ScrnInfoPtr scrp, int numCRTC, int numSequencer, int numGraphics, int numAttribute) { @@ -1614,7 +1614,7 @@ vgaHWSetRegCounts(ScrnInfoPtr scrp, int numCRTC, int numSequencer, } -_X_EXPORT Bool +Bool vgaHWCopyReg(vgaRegPtr dst, vgaRegPtr src) { vgaHWFreeRegs(dst); @@ -1633,7 +1633,7 @@ vgaHWCopyReg(vgaRegPtr dst, vgaRegPtr src) } -_X_EXPORT Bool +Bool vgaHWGetHWRec(ScrnInfoPtr scrp) { vgaRegPtr regp; @@ -1729,7 +1729,7 @@ vgaHWGetHWRec(ScrnInfoPtr scrp) } -_X_EXPORT void +void vgaHWFreeHWRec(ScrnInfoPtr scrp) { if (vgaHWPrivateIndex >= 0) { @@ -1751,7 +1751,7 @@ vgaHWFreeHWRec(ScrnInfoPtr scrp) } -_X_EXPORT Bool +Bool vgaHWMapMem(ScrnInfoPtr scrp) { vgaHWPtr hwp = VGAHWPTR(scrp); @@ -1781,7 +1781,7 @@ vgaHWMapMem(ScrnInfoPtr scrp) } -_X_EXPORT void +void vgaHWUnmapMem(ScrnInfoPtr scrp) { vgaHWPtr hwp = VGAHWPTR(scrp); @@ -1797,14 +1797,14 @@ vgaHWUnmapMem(ScrnInfoPtr scrp) hwp->Base = NULL; } -_X_EXPORT int +int vgaHWGetIndex() { return vgaHWPrivateIndex; } -_X_EXPORT void +void vgaHWGetIOBase(vgaHWPtr hwp) { hwp->IOBase = (hwp->readMiscOut(hwp) & 0x01) ? @@ -1815,14 +1815,14 @@ vgaHWGetIOBase(vgaHWPtr hwp) } -_X_EXPORT void +void vgaHWLock(vgaHWPtr hwp) { /* Protect CRTC[0-7] */ hwp->writeCrtc(hwp, 0x11, hwp->readCrtc(hwp, 0x11) | 0x80); } -_X_EXPORT void +void vgaHWUnlock(vgaHWPtr hwp) { /* Unprotect CRTC[0-7] */ @@ -1830,14 +1830,14 @@ vgaHWUnlock(vgaHWPtr hwp) } -_X_EXPORT void +void vgaHWEnable(vgaHWPtr hwp) { hwp->writeEnable(hwp, hwp->readEnable(hwp) | 0x01); } -_X_EXPORT void +void vgaHWDisable(vgaHWPtr hwp) { hwp->writeEnable(hwp, hwp->readEnable(hwp) & ~0x01); @@ -1897,7 +1897,7 @@ vgaHWSetOverscan(ScrnInfoPtr pScrn, int overscan) } -_X_EXPORT Bool +Bool vgaHWHandleColormaps(ScreenPtr pScreen) { ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; @@ -1940,7 +1940,7 @@ struct _vgaDdcSave { unsigned char msr; }; -_X_EXPORT void +void vgaHWddc1SetSpeed(ScrnInfoPtr pScrn, xf86ddcSpeed speed) { vgaHWPtr hwp = VGAHWPTR(pScrn); @@ -1999,13 +1999,13 @@ vgaHWddc1SetSpeed(ScrnInfoPtr pScrn, xf86ddcSpeed speed) } } -_X_EXPORT DDC1SetSpeedProc +DDC1SetSpeedProc vgaHWddc1SetSpeedWeak(void) { return vgaHWddc1SetSpeed; } -_X_EXPORT SaveScreenProcPtr vgaHWSaveScreenWeak(void) +SaveScreenProcPtr vgaHWSaveScreenWeak(void) { return vgaHWSaveScreen; } diff --git a/hw/xfree86/vgahw/vgaHW.h b/hw/xfree86/vgahw/vgaHW.h index a38ea7559..0761ddbe0 100644 --- a/hw/xfree86/vgahw/vgaHW.h +++ b/hw/xfree86/vgahw/vgaHW.h @@ -28,7 +28,7 @@ #define DPMS_SERVER #include <X11/extensions/dpms.h> -extern int vgaHWGetIndex(void); +extern _X_EXPORT int vgaHWGetIndex(void); /* * access macro @@ -192,45 +192,45 @@ typedef struct _vgaHWRec { typedef void vgaHWProtectProc(ScrnInfoPtr, Bool); typedef void vgaHWBlankScreenProc(ScrnInfoPtr, Bool); -void vgaHWSetStdFuncs(vgaHWPtr hwp); -void vgaHWSetMmioFuncs(vgaHWPtr hwp, CARD8 *base, int offset); -void vgaHWProtect(ScrnInfoPtr pScrn, Bool on); -vgaHWProtectProc *vgaHWProtectWeak(void); -Bool vgaHWSaveScreen(ScreenPtr pScreen, int mode); -void vgaHWBlankScreen(ScrnInfoPtr pScrn, Bool on); -vgaHWBlankScreenProc *vgaHWBlankScreenWeak(void); -void vgaHWSeqReset(vgaHWPtr hwp, Bool start); -void vgaHWRestoreFonts(ScrnInfoPtr scrninfp, vgaRegPtr restore); -void vgaHWRestoreMode(ScrnInfoPtr scrninfp, vgaRegPtr restore); -void vgaHWRestoreColormap(ScrnInfoPtr scrninfp, vgaRegPtr restore); -void vgaHWRestore(ScrnInfoPtr scrninfp, vgaRegPtr restore, int flags); -void vgaHWSaveFonts(ScrnInfoPtr scrninfp, vgaRegPtr save); -void vgaHWSaveMode(ScrnInfoPtr scrninfp, vgaRegPtr save); -void vgaHWSaveColormap(ScrnInfoPtr scrninfp, vgaRegPtr save); -void vgaHWSave(ScrnInfoPtr scrninfp, vgaRegPtr save, int flags); -Bool vgaHWInit(ScrnInfoPtr scrnp, DisplayModePtr mode); -Bool vgaHWSetRegCounts(ScrnInfoPtr scrp, int numCRTC, int numSequencer, +extern _X_EXPORT void vgaHWSetStdFuncs(vgaHWPtr hwp); +extern _X_EXPORT void vgaHWSetMmioFuncs(vgaHWPtr hwp, CARD8 *base, int offset); +extern _X_EXPORT void vgaHWProtect(ScrnInfoPtr pScrn, Bool on); +extern _X_EXPORT vgaHWProtectProc *vgaHWProtectWeak(void); +extern _X_EXPORT Bool vgaHWSaveScreen(ScreenPtr pScreen, int mode); +extern _X_EXPORT void vgaHWBlankScreen(ScrnInfoPtr pScrn, Bool on); +extern _X_EXPORT vgaHWBlankScreenProc *vgaHWBlankScreenWeak(void); +extern _X_EXPORT void vgaHWSeqReset(vgaHWPtr hwp, Bool start); +extern _X_EXPORT void vgaHWRestoreFonts(ScrnInfoPtr scrninfp, vgaRegPtr restore); +extern _X_EXPORT void vgaHWRestoreMode(ScrnInfoPtr scrninfp, vgaRegPtr restore); +extern _X_EXPORT void vgaHWRestoreColormap(ScrnInfoPtr scrninfp, vgaRegPtr restore); +extern _X_EXPORT void vgaHWRestore(ScrnInfoPtr scrninfp, vgaRegPtr restore, int flags); +extern _X_EXPORT void vgaHWSaveFonts(ScrnInfoPtr scrninfp, vgaRegPtr save); +extern _X_EXPORT void vgaHWSaveMode(ScrnInfoPtr scrninfp, vgaRegPtr save); +extern _X_EXPORT void vgaHWSaveColormap(ScrnInfoPtr scrninfp, vgaRegPtr save); +extern _X_EXPORT void vgaHWSave(ScrnInfoPtr scrninfp, vgaRegPtr save, int flags); +extern _X_EXPORT Bool vgaHWInit(ScrnInfoPtr scrnp, DisplayModePtr mode); +extern _X_EXPORT Bool vgaHWSetRegCounts(ScrnInfoPtr scrp, int numCRTC, int numSequencer, int numGraphics, int numAttribute); -Bool vgaHWCopyReg(vgaRegPtr dst, vgaRegPtr src); -Bool vgaHWGetHWRec(ScrnInfoPtr scrp); -void vgaHWFreeHWRec(ScrnInfoPtr scrp); -Bool vgaHWMapMem(ScrnInfoPtr scrp); -void vgaHWUnmapMem(ScrnInfoPtr scrp); -void vgaHWGetIOBase(vgaHWPtr hwp); -void vgaHWLock(vgaHWPtr hwp); -void vgaHWUnlock(vgaHWPtr hwp); -void vgaHWEnable(vgaHWPtr hwp); -void vgaHWDisable(vgaHWPtr hwp); -void vgaHWDPMSSet(ScrnInfoPtr pScrn, int PowerManagementMode, int flags); -Bool vgaHWHandleColormaps(ScreenPtr pScreen); -void vgaHWddc1SetSpeed(ScrnInfoPtr pScrn, xf86ddcSpeed speed); -CARD32 vgaHWHBlankKGA(DisplayModePtr mode, vgaRegPtr regp, int nBits, +extern _X_EXPORT Bool vgaHWCopyReg(vgaRegPtr dst, vgaRegPtr src); +extern _X_EXPORT Bool vgaHWGetHWRec(ScrnInfoPtr scrp); +extern _X_EXPORT void vgaHWFreeHWRec(ScrnInfoPtr scrp); +extern _X_EXPORT Bool vgaHWMapMem(ScrnInfoPtr scrp); +extern _X_EXPORT void vgaHWUnmapMem(ScrnInfoPtr scrp); +extern _X_EXPORT void vgaHWGetIOBase(vgaHWPtr hwp); +extern _X_EXPORT void vgaHWLock(vgaHWPtr hwp); +extern _X_EXPORT void vgaHWUnlock(vgaHWPtr hwp); +extern _X_EXPORT void vgaHWEnable(vgaHWPtr hwp); +extern _X_EXPORT void vgaHWDisable(vgaHWPtr hwp); +extern _X_EXPORT void vgaHWDPMSSet(ScrnInfoPtr pScrn, int PowerManagementMode, int flags); +extern _X_EXPORT Bool vgaHWHandleColormaps(ScreenPtr pScreen); +extern _X_EXPORT void vgaHWddc1SetSpeed(ScrnInfoPtr pScrn, xf86ddcSpeed speed); +extern _X_EXPORT CARD32 vgaHWHBlankKGA(DisplayModePtr mode, vgaRegPtr regp, int nBits, unsigned int Flags); -CARD32 vgaHWVBlankKGA(DisplayModePtr mode, vgaRegPtr regp, int nBits, +extern _X_EXPORT CARD32 vgaHWVBlankKGA(DisplayModePtr mode, vgaRegPtr regp, int nBits, unsigned int Flags); -Bool vgaHWAllocDefaultRegs(vgaRegPtr regp); +extern _X_EXPORT Bool vgaHWAllocDefaultRegs(vgaRegPtr regp); -DDC1SetSpeedProc vgaHWddc1SetSpeedWeak(void); -SaveScreenProcPtr vgaHWSaveScreenWeak(void); +extern _X_EXPORT DDC1SetSpeedProc vgaHWddc1SetSpeedWeak(void); +extern _X_EXPORT SaveScreenProcPtr vgaHWSaveScreenWeak(void); #endif /* _VGAHW_H */ diff --git a/hw/xfree86/xaa/xaa.h b/hw/xfree86/xaa/xaa.h index d6ccc31e2..7db6b95d5 100644 --- a/hw/xfree86/xaa/xaa.h +++ b/hw/xfree86/xaa/xaa.h @@ -1379,22 +1379,22 @@ typedef struct _XAAInfoRec { #define SET_SYNC_FLAG(infoRec) (infoRec)->NeedToSync = TRUE -Bool +extern _X_EXPORT Bool XAAInit( ScreenPtr pScreen, XAAInfoRecPtr infoRec ); -XAAInfoRecPtr XAACreateInfoRec(void); +extern _X_EXPORT XAAInfoRecPtr XAACreateInfoRec(void); -void +extern _X_EXPORT void XAADestroyInfoRec( XAAInfoRecPtr infoRec ); typedef void (*DepthChangeFuncPtr) (ScrnInfoPtr pScrn, int depth); -Bool +extern _X_EXPORT Bool XAAInitDualFramebufferOverlay( ScreenPtr pScreen, DepthChangeFuncPtr callback diff --git a/hw/xfree86/xaa/xaaBitBlt.c b/hw/xfree86/xaa/xaaBitBlt.c index 5830147a6..ebba74e55 100644 --- a/hw/xfree86/xaa/xaaBitBlt.c +++ b/hw/xfree86/xaa/xaaBitBlt.c @@ -22,7 +22,7 @@ #include "xaalocal.h" -_X_EXPORT RegionPtr +RegionPtr XAABitBlt( DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, diff --git a/hw/xfree86/xaa/xaaBitOrder.c b/hw/xfree86/xaa/xaaBitOrder.c index 22e8261a3..9b124670d 100644 --- a/hw/xfree86/xaa/xaaBitOrder.c +++ b/hw/xfree86/xaa/xaaBitOrder.c @@ -4,10 +4,9 @@ #endif #include <X11/Xmd.h> -#include <X11/Xfuncproto.h> -CARD32 XAAReverseBitOrder(CARD32 v); +#include "xaalocal.h" -_X_EXPORT CARD32 +CARD32 XAAReverseBitOrder(CARD32 v) { return (((0x01010101 & v) << 7) | ((0x02020202 & v) << 5) | diff --git a/hw/xfree86/xaa/xaaBitmap.c b/hw/xfree86/xaa/xaaBitmap.c index cda16870a..f7ae78d3f 100644 --- a/hw/xfree86/xaa/xaaBitmap.c +++ b/hw/xfree86/xaa/xaaBitmap.c @@ -255,7 +255,7 @@ BitmapScanline_Shifted_Inverted_Careful( avoid the invert. */ -_X_EXPORT void +void #ifdef TRIPLE_BITS EXPNAME(XAAWriteBitmapColorExpand3)( #else @@ -373,7 +373,7 @@ SECOND_PASS: #ifndef FIXEDBASE -_X_EXPORT void +void #ifdef TRIPLE_BITS EXPNAME(XAAWriteBitmapScanlineColorExpand3)( #else diff --git a/hw/xfree86/xaa/xaaCpyArea.c b/hw/xfree86/xaa/xaaCpyArea.c index 846cb22eb..6a898cd5f 100644 --- a/hw/xfree86/xaa/xaaCpyArea.c +++ b/hw/xfree86/xaa/xaaCpyArea.c @@ -21,7 +21,7 @@ */ -_X_EXPORT RegionPtr +RegionPtr XAACopyArea( DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, @@ -74,7 +74,7 @@ XAACopyArea( } -_X_EXPORT void +void XAADoBitBlt( DrawablePtr pSrc, DrawablePtr pDst, @@ -193,7 +193,7 @@ XAADoBitBlt( } -_X_EXPORT void +void XAADoImageWrite( DrawablePtr pSrc, DrawablePtr pDst, @@ -222,7 +222,7 @@ XAADoImageWrite( } -_X_EXPORT void +void XAADoImageRead( DrawablePtr pSrc, DrawablePtr pDst, @@ -252,7 +252,7 @@ XAADoImageRead( } -_X_EXPORT void +void XAAScreenToScreenBitBlt( ScrnInfoPtr pScrn, int nbox, diff --git a/hw/xfree86/xaa/xaaCpyPlane.c b/hw/xfree86/xaa/xaaCpyPlane.c index d8ad14473..aa4c0407c 100644 --- a/hw/xfree86/xaa/xaaCpyPlane.c +++ b/hw/xfree86/xaa/xaaCpyPlane.c @@ -39,7 +39,7 @@ static void XAACopyPlaneNtoNColorExpand(DrawablePtr pSrc, DrawablePtr pDst, static unsigned long TmpBitPlane; -_X_EXPORT RegionPtr +RegionPtr XAACopyPlaneColorExpansion( DrawablePtr pSrc, DrawablePtr pDst, @@ -159,7 +159,7 @@ ALLOC_FAILED: } } -_X_EXPORT void +void XAAPushPixelsSolidColorExpansion( GCPtr pGC, PixmapPtr pBitMap, diff --git a/hw/xfree86/xaa/xaaCpyWin.c b/hw/xfree86/xaa/xaaCpyWin.c index 38cbe17b4..31c421e65 100644 --- a/hw/xfree86/xaa/xaaCpyWin.c +++ b/hw/xfree86/xaa/xaaCpyWin.c @@ -21,7 +21,7 @@ Written by Harm Hanemaayer (H.Hanemaayer@inter.nl.net). */ -_X_EXPORT void +void XAACopyWindow( WindowPtr pWin, DDXPointRec ptOldOrg, diff --git a/hw/xfree86/xaa/xaaDashLine.c b/hw/xfree86/xaa/xaaDashLine.c index 9621738f1..63233e05d 100644 --- a/hw/xfree86/xaa/xaaDashLine.c +++ b/hw/xfree86/xaa/xaaDashLine.c @@ -18,7 +18,7 @@ #include "xaalocal.h" -_X_EXPORT void +void #ifdef POLYSEGMENT XAAPolySegmentDashed( DrawablePtr pDrawable, diff --git a/hw/xfree86/xaa/xaaFallback.c b/hw/xfree86/xaa/xaaFallback.c index 42d9fd555..7ab4031f8 100644 --- a/hw/xfree86/xaa/xaaFallback.c +++ b/hw/xfree86/xaa/xaaFallback.c @@ -332,7 +332,7 @@ XAAPushPixelsFallback( XAA_GC_OP_EPILOGUE(pGC); } -_X_EXPORT GCOps XAAFallbackOps = { +GCOps XAAFallbackOps = { XAAFillSpansFallback, XAASetSpansFallback, XAAPutImageFallback, XAACopyAreaFallback, XAACopyPlaneFallback, XAAPolyPointFallback, @@ -346,7 +346,7 @@ _X_EXPORT GCOps XAAFallbackOps = { {NULL} /* devPrivate */ }; -_X_EXPORT GCOps *XAAGetFallbackOps(void) +GCOps *XAAGetFallbackOps(void) { return &XAAFallbackOps; } diff --git a/hw/xfree86/xaa/xaaFillArc.c b/hw/xfree86/xaa/xaaFillArc.c index 33d79b822..d3ebc22fc 100644 --- a/hw/xfree86/xaa/xaaFillArc.c +++ b/hw/xfree86/xaa/xaaFillArc.c @@ -160,7 +160,7 @@ XAAFillArcSliceSolid(DrawablePtr pDraw, GCPtr pGC, xArc *arc) } -_X_EXPORT void +void XAAPolyFillArcSolid(pDraw, pGC, narcs, parcs) DrawablePtr pDraw; GCPtr pGC; diff --git a/hw/xfree86/xaa/xaaFillPoly.c b/hw/xfree86/xaa/xaaFillPoly.c index 138c5a17a..6f11e35ff 100644 --- a/hw/xfree86/xaa/xaaFillPoly.c +++ b/hw/xfree86/xaa/xaaFillPoly.c @@ -115,7 +115,7 @@ extents. */ -_X_EXPORT int +int XAAIsEasyPolygon( DDXPointPtr ptsIn, int count, @@ -194,7 +194,7 @@ XAAIsEasyPolygon( return POLY_IS_EASY; } -_X_EXPORT void +void XAAFillPolygonSolid( DrawablePtr pDraw, GCPtr pGC, @@ -343,7 +343,7 @@ XAAFillPolygonSolid( -_X_EXPORT void +void XAAFillPolygonHelper( ScrnInfoPtr pScrn, DDXPointPtr ptsIn, @@ -658,7 +658,7 @@ CacheBltRectHelper ( \**********************/ -_X_EXPORT void +void XAAFillPolygonStippled( DrawablePtr pDraw, GCPtr pGC, @@ -818,7 +818,7 @@ XAAFillPolygonStippled( \*******************/ -_X_EXPORT void +void XAAFillPolygonTiled( DrawablePtr pDraw, GCPtr pGC, diff --git a/hw/xfree86/xaa/xaaFillRect.c b/hw/xfree86/xaa/xaaFillRect.c index d4449f6cb..7c319bba8 100644 --- a/hw/xfree86/xaa/xaaFillRect.c +++ b/hw/xfree86/xaa/xaaFillRect.c @@ -24,7 +24,7 @@ static void XAARenderCacheBltRects(GCPtr, int, BoxPtr, int, int); static void XAARenderImageWriteRects(GCPtr, int, BoxPtr, int, int); static void XAARenderPixmapCopyRects(GCPtr, int, BoxPtr, int, int); -_X_EXPORT void +void XAAPolyFillRect( DrawablePtr pDraw, GCPtr pGC, @@ -372,7 +372,7 @@ XAARenderPixmapCopyRects( | Solid | \************/ -_X_EXPORT void +void XAAFillSolidRects( ScrnInfoPtr pScrn, int fg, int rop, @@ -399,7 +399,7 @@ XAAFillSolidRects( \*********************/ -_X_EXPORT void +void XAAFillMono8x8PatternRectsScreenOrigin( ScrnInfoPtr pScrn, int fg, int bg, int rop, @@ -449,7 +449,7 @@ XAAFillMono8x8PatternRectsScreenOrigin( SET_SYNC_FLAG(infoRec); } -_X_EXPORT void +void XAAFillMono8x8PatternRects( ScrnInfoPtr pScrn, int fg, int bg, int rop, @@ -511,7 +511,7 @@ XAAFillMono8x8PatternRects( \**********************/ -_X_EXPORT void +void XAAFillColor8x8PatternRectsScreenOrigin( ScrnInfoPtr pScrn, int rop, @@ -546,7 +546,7 @@ XAAFillColor8x8PatternRectsScreenOrigin( SET_SYNC_FLAG(infoRec); } -_X_EXPORT void +void XAAFillColor8x8PatternRects( ScrnInfoPtr pScrn, int rop, @@ -587,7 +587,7 @@ XAAFillColor8x8PatternRects( | Cache Blits | \***************/ -_X_EXPORT void +void XAAFillCacheBltRects( ScrnInfoPtr pScrn, int rop, @@ -709,7 +709,7 @@ XAAFillCacheBltRects( -_X_EXPORT void +void XAAFillCacheExpandRects( ScrnInfoPtr pScrn, int fg, int bg, int rop, @@ -873,7 +873,7 @@ WriteColumn( } } -_X_EXPORT void +void XAAFillImageWriteRects( ScrnInfoPtr pScrn, int rop, @@ -928,7 +928,7 @@ XAAFillImageWriteRects( \*************/ -_X_EXPORT void +void XAAClipAndRenderRects( GCPtr pGC, ClipAndRenderRectsFunc BoxFunc, @@ -1018,7 +1018,7 @@ XAAClipAndRenderRects( } -_X_EXPORT int +int XAAGetRectClipBoxes( GCPtr pGC, BoxPtr pboxClippedBase, diff --git a/hw/xfree86/xaa/xaaGC.c b/hw/xfree86/xaa/xaaGC.c index 46471ec84..e6083d529 100644 --- a/hw/xfree86/xaa/xaaGC.c +++ b/hw/xfree86/xaa/xaaGC.c @@ -27,14 +27,14 @@ static void XAAChangeClip(GCPtr pGC, int type, pointer pvalue, int nrects); static void XAADestroyClip(GCPtr pGC); static void XAACopyClip(GCPtr pgcDst, GCPtr pgcSrc); -_X_EXPORT GCFuncs XAAGCFuncs = { +GCFuncs XAAGCFuncs = { XAAValidateGC, XAAChangeGC, XAACopyGC, XAADestroyGC, XAAChangeClip, XAADestroyClip, XAACopyClip }; extern GCOps XAAPixmapOps; -_X_EXPORT Bool +Bool XAACreateGC(GCPtr pGC) { ScreenPtr pScreen = pGC->pScreen; diff --git a/hw/xfree86/xaa/xaaGCmisc.c b/hw/xfree86/xaa/xaaGCmisc.c index 0946072e5..5823cc064 100644 --- a/hw/xfree86/xaa/xaaGCmisc.c +++ b/hw/xfree86/xaa/xaaGCmisc.c @@ -19,7 +19,7 @@ #include "gcstruct.h" #include "pixmapstr.h" -_X_EXPORT void +void XAAValidateCopyArea( GCPtr pGC, unsigned long changes, @@ -37,7 +37,7 @@ XAAValidateCopyArea( pGC->ops->CopyArea = XAAFallbackOps.CopyArea; } -_X_EXPORT void +void XAAValidatePutImage( GCPtr pGC, unsigned long changes, @@ -56,7 +56,7 @@ XAAValidatePutImage( pGC->ops->PutImage = XAAFallbackOps.PutImage; } -_X_EXPORT void +void XAAValidateCopyPlane( GCPtr pGC, unsigned long changes, @@ -75,7 +75,7 @@ XAAValidateCopyPlane( pGC->ops->CopyPlane = XAAFallbackOps.CopyPlane; } -_X_EXPORT void +void XAAValidatePushPixels( GCPtr pGC, unsigned long changes, @@ -106,7 +106,7 @@ XAAValidatePushPixels( Validate functions if it breaks this assumption */ -_X_EXPORT void +void XAAValidateFillSpans( GCPtr pGC, unsigned long changes, @@ -182,7 +182,7 @@ XAAValidateFillSpans( these, it will need to supply a new Validate functions if it breaks this assumption */ -_X_EXPORT void +void XAAValidatePolyGlyphBlt( GCPtr pGC, unsigned long changes, @@ -237,7 +237,7 @@ XAAValidatePolyGlyphBlt( } } -_X_EXPORT void +void XAAValidateImageGlyphBlt( GCPtr pGC, unsigned long changes, @@ -298,7 +298,7 @@ XAAValidateImageGlyphBlt( } -_X_EXPORT void +void XAAValidatePolylines( GCPtr pGC, unsigned long changes, diff --git a/hw/xfree86/xaa/xaaImage.c b/hw/xfree86/xaa/xaaImage.c index 29ab1c0da..85461c8ad 100644 --- a/hw/xfree86/xaa/xaaImage.c +++ b/hw/xfree86/xaa/xaaImage.c @@ -16,7 +16,7 @@ #include "xaa.h" #include "xaalocal.h" -_X_EXPORT void XAAMoveDWORDS_FixedBase( +void XAAMoveDWORDS_FixedBase( register CARD32* dest, register CARD32* src, register int dwords ) @@ -38,7 +38,7 @@ _X_EXPORT void XAAMoveDWORDS_FixedBase( *dest = *(src + 2); } -_X_EXPORT void XAAMoveDWORDS( +void XAAMoveDWORDS( register CARD32* dest, register CARD32* src, register int dwords ) @@ -60,7 +60,7 @@ _X_EXPORT void XAAMoveDWORDS( *(dest + 2) = *(src + 2); } -_X_EXPORT void XAAMoveDWORDS_FixedSrc( +void XAAMoveDWORDS_FixedSrc( register CARD32* dest, register CARD32* src, register int dwords ) @@ -172,7 +172,7 @@ XAAWritePixmap32To24( } -_X_EXPORT void +void XAAWritePixmap ( ScrnInfoPtr pScrn, int x, int y, int w, int h, @@ -305,7 +305,7 @@ BAD_ALIGNMENT: } -_X_EXPORT void +void XAAWritePixmapScanline ( ScrnInfoPtr pScrn, int x, int y, int w, int h, @@ -388,7 +388,7 @@ BAD_ALIGNMENT: } -_X_EXPORT void +void XAAPutImage( DrawablePtr pDraw, GCPtr pGC, diff --git a/hw/xfree86/xaa/xaaInit.c b/hw/xfree86/xaa/xaaInit.c index dbd91a21d..326da6149 100644 --- a/hw/xfree86/xaa/xaaInit.c +++ b/hw/xfree86/xaa/xaaInit.c @@ -49,22 +49,22 @@ static DevPrivateKey XAAGCKey = &XAAGCKeyIndex; static int XAAPixmapKeyIndex; static DevPrivateKey XAAPixmapKey = &XAAPixmapKeyIndex; -_X_EXPORT DevPrivateKey XAAGetScreenKey(void) { +DevPrivateKey XAAGetScreenKey(void) { return XAAScreenKey; } -_X_EXPORT DevPrivateKey XAAGetGCKey(void) { +DevPrivateKey XAAGetGCKey(void) { return XAAGCKey; } -_X_EXPORT DevPrivateKey XAAGetPixmapKey(void) { +DevPrivateKey XAAGetPixmapKey(void) { return XAAPixmapKey; } /* temp kludge */ static Bool SwitchedOut = FALSE; -_X_EXPORT XAAInfoRecPtr +XAAInfoRecPtr XAACreateInfoRec() { XAAInfoRecPtr infoRec; @@ -76,7 +76,7 @@ XAACreateInfoRec() return infoRec; } -_X_EXPORT void +void XAADestroyInfoRec(XAAInfoRecPtr infoRec) { if(!infoRec) return; @@ -94,7 +94,7 @@ XAADestroyInfoRec(XAAInfoRecPtr infoRec) } -_X_EXPORT Bool +Bool XAAInit(ScreenPtr pScreen, XAAInfoRecPtr infoRec) { ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; diff --git a/hw/xfree86/xaa/xaaInitAccel.c b/hw/xfree86/xaa/xaaInitAccel.c index d8b2e9573..40871424a 100644 --- a/hw/xfree86/xaa/xaaInitAccel.c +++ b/hw/xfree86/xaa/xaaInitAccel.c @@ -109,7 +109,7 @@ static XF86ModuleVersionInfo xaaVersRec = _X_EXPORT XF86ModuleData xaaModuleData = { &xaaVersRec, NULL, NULL }; -_X_EXPORT Bool +Bool XAAInitAccel(ScreenPtr pScreen, XAAInfoRecPtr infoRec) { int index = pScreen->myNum; diff --git a/hw/xfree86/xaa/xaaLine.c b/hw/xfree86/xaa/xaaLine.c index 093d65f0c..7469de179 100644 --- a/hw/xfree86/xaa/xaaLine.c +++ b/hw/xfree86/xaa/xaaLine.c @@ -18,7 +18,7 @@ #include "xaalocal.h" -_X_EXPORT void +void #ifdef POLYSEGMENT XAAPolySegment( DrawablePtr pDrawable, diff --git a/hw/xfree86/xaa/xaaLineMisc.c b/hw/xfree86/xaa/xaaLineMisc.c index 4e19b5529..6cef4bcd5 100644 --- a/hw/xfree86/xaa/xaaLineMisc.c +++ b/hw/xfree86/xaa/xaaLineMisc.c @@ -15,7 +15,7 @@ #include "xaalocal.h" -_X_EXPORT void +void XAASolidHorVertLineAsRects( ScrnInfoPtr pScrn, int x, int y, int len, int dir @@ -29,7 +29,7 @@ XAASolidHorVertLineAsRects( } -_X_EXPORT void +void XAASolidHorVertLineAsTwoPoint( ScrnInfoPtr pScrn, int x, int y, int len, int dir @@ -44,7 +44,7 @@ XAASolidHorVertLineAsTwoPoint( (*infoRec->SubsequentSolidTwoPointLine)(pScrn, x, y, x, y + len, 0); } -_X_EXPORT void +void XAASolidHorVertLineAsBresenham( ScrnInfoPtr pScrn, int x, int y, int len, int dir @@ -60,7 +60,7 @@ XAASolidHorVertLineAsBresenham( } -_X_EXPORT void +void XAAComputeDash(GCPtr pGC) { XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC); diff --git a/hw/xfree86/xaa/xaaNonTEGlyph.c b/hw/xfree86/xaa/xaaNonTEGlyph.c index e291e3187..7431ba2a0 100644 --- a/hw/xfree86/xaa/xaaNonTEGlyph.c +++ b/hw/xfree86/xaa/xaaNonTEGlyph.c @@ -37,7 +37,7 @@ /* if the backing rectangle and text are of the same dimensions then we can draw in one pass */ -_X_EXPORT void +void #ifdef TRIPLE_BITS EXPNAME(XAANonTEGlyphRenderer3)( #else @@ -90,7 +90,7 @@ EXPNAME(XAANonTEGlyphRenderer)( #ifndef FIXEDBASE /* Scanline version of above gets built for LSBFIRST and MSBFIRST */ -_X_EXPORT void +void #ifdef TRIPLE_BITS EXPNAME(XAANonTEGlyphRendererScanline3)( #else diff --git a/hw/xfree86/xaa/xaaNonTEText.c b/hw/xfree86/xaa/xaaNonTEText.c index f8f79ca4e..d32c0bbc5 100644 --- a/hw/xfree86/xaa/xaaNonTEText.c +++ b/hw/xfree86/xaa/xaaNonTEText.c @@ -58,7 +58,7 @@ static int PolyGlyphBltNonTEColorExpansion(ScrnInfoPtr pScrn, ********************************************************************/ -_X_EXPORT int +int XAAPolyText8NonTEColorExpansion( DrawablePtr pDraw, GCPtr pGC, @@ -86,7 +86,7 @@ XAAPolyText8NonTEColorExpansion( } -_X_EXPORT int +int XAAPolyText16NonTEColorExpansion( DrawablePtr pDraw, GCPtr pGC, @@ -116,7 +116,7 @@ XAAPolyText16NonTEColorExpansion( } -_X_EXPORT void +void XAAImageText8NonTEColorExpansion( DrawablePtr pDraw, GCPtr pGC, @@ -141,7 +141,7 @@ XAAImageText8NonTEColorExpansion( } -_X_EXPORT void +void XAAImageText16NonTEColorExpansion( DrawablePtr pDraw, GCPtr pGC, @@ -177,7 +177,7 @@ XAAImageText16NonTEColorExpansion( ********************************************************************/ -_X_EXPORT void +void XAAImageGlyphBltNonTEColorExpansion( DrawablePtr pDraw, GCPtr pGC, @@ -197,7 +197,7 @@ XAAImageGlyphBltNonTEColorExpansion( pGC->pCompositeClip, nglyph, (unsigned char*)pglyphBase, ppci); } -_X_EXPORT void +void XAAPolyGlyphBltNonTEColorExpansion( DrawablePtr pDraw, GCPtr pGC, @@ -541,7 +541,7 @@ PolyGlyphBltNonTEColorExpansion( indicates that part of the text string's bounding box is visible but not necessarily that any of the characters are visible */ -_X_EXPORT void XAANonTEGlyphRenderer( +void XAANonTEGlyphRenderer( ScrnInfoPtr pScrn, int x, int y, int n, NonTEGlyphPtr glyphs, diff --git a/hw/xfree86/xaa/xaaOffscreen.c b/hw/xfree86/xaa/xaaOffscreen.c index 3d88e5851..7c9d53270 100644 --- a/hw/xfree86/xaa/xaaOffscreen.c +++ b/hw/xfree86/xaa/xaaOffscreen.c @@ -27,7 +27,7 @@ #include "xf86fbman.h" #include "servermd.h" -_X_EXPORT void +void XAAMoveOutOffscreenPixmaps(ScreenPtr pScreen) { XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen); @@ -44,7 +44,7 @@ XAAMoveOutOffscreenPixmaps(ScreenPtr pScreen) -_X_EXPORT void +void XAAMoveInOffscreenPixmaps(ScreenPtr pScreen) { XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen); @@ -103,7 +103,7 @@ XAAMoveInOffscreenPixmaps(ScreenPtr pScreen) } -_X_EXPORT void +void XAARemoveAreaCallback(FBAreaPtr area) { XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(area->pScreen); @@ -117,7 +117,7 @@ XAARemoveAreaCallback(FBAreaPtr area) DELIST_OFFSCREEN_PIXMAP(pPix); } -_X_EXPORT void +void XAAMoveOutOffscreenPixmap(PixmapPtr pPix) { ScreenPtr pScreen = pPix->drawable.pScreen; diff --git a/hw/xfree86/xaa/xaaOverlay.c b/hw/xfree86/xaa/xaaOverlay.c index a104e7451..2956a3dbf 100644 --- a/hw/xfree86/xaa/xaaOverlay.c +++ b/hw/xfree86/xaa/xaaOverlay.c @@ -112,7 +112,7 @@ XAASetColorKey8_32( SET_SYNC_FLAG(infoRec); } -_X_EXPORT void +void XAASetupOverlay8_32Planar(ScreenPtr pScreen) { XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen); diff --git a/hw/xfree86/xaa/xaaOverlayDF.c b/hw/xfree86/xaa/xaaOverlayDF.c index f860c991d..8db816e1e 100644 --- a/hw/xfree86/xaa/xaaOverlayDF.c +++ b/hw/xfree86/xaa/xaaOverlayDF.c @@ -164,7 +164,7 @@ static DevPrivateKey XAAOverlayKey = &XAAOverlayKeyIndex; } -_X_EXPORT Bool +Bool XAAInitDualFramebufferOverlay( ScreenPtr pScreen, DepthChangeFuncPtr callback diff --git a/hw/xfree86/xaa/xaaPCache.c b/hw/xfree86/xaa/xaaPCache.c index 76d3f80fc..dbbeac668 100644 --- a/hw/xfree86/xaa/xaaPCache.c +++ b/hw/xfree86/xaa/xaaPCache.c @@ -160,7 +160,7 @@ FreePixmapCachePrivate(XAAPixmapCachePrivatePtr pPriv) xfree(pPriv); } -_X_EXPORT void +void XAAClosePixmapCache(ScreenPtr pScreen) { XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen); @@ -630,7 +630,7 @@ GOT_EM: } -_X_EXPORT void +void XAAInitPixmapCache( ScreenPtr pScreen, RegionPtr areas, @@ -1097,7 +1097,7 @@ static CARD32 StippleMasks[4] = { }; #endif -_X_EXPORT Bool +Bool XAACheckStippleReducibility(PixmapPtr pPixmap) { XAAPixmapPtr pPriv = XAA_GET_PIXMAP_PRIVATE(pPixmap); @@ -1195,7 +1195,7 @@ XAACheckStippleReducibility(PixmapPtr pPixmap) } -_X_EXPORT Bool +Bool XAACheckTileReducibility(PixmapPtr pPixmap, Bool checkMono) { XAAPixmapPtr pPriv = XAA_GET_PIXMAP_PRIVATE(pPixmap); @@ -1401,7 +1401,7 @@ XAACheckTileReducibility(PixmapPtr pPixmap, Bool checkMono) } -_X_EXPORT void XAATileCache( +void XAATileCache( ScrnInfoPtr pScrn, XAACacheInfoPtr pCache, int w, int h @@ -1433,7 +1433,7 @@ _X_EXPORT void XAATileCache( SET_SYNC_FLAG(infoRec); } -_X_EXPORT XAACacheInfoPtr +XAACacheInfoPtr XAACacheTile(ScrnInfoPtr pScrn, PixmapPtr pPix) { int w = pPix->drawable.width; @@ -1495,7 +1495,7 @@ XAACacheTile(ScrnInfoPtr pScrn, PixmapPtr pPix) return pCache; } -_X_EXPORT XAACacheInfoPtr +XAACacheInfoPtr XAACacheMonoStipple(ScrnInfoPtr pScrn, PixmapPtr pPix) { int w = pPix->drawable.width; @@ -1593,7 +1593,7 @@ XAACacheMonoStipple(ScrnInfoPtr pScrn, PixmapPtr pPix) return pCache; } -_X_EXPORT XAACacheInfoPtr +XAACacheInfoPtr XAACachePlanarMonoStipple(ScrnInfoPtr pScrn, PixmapPtr pPix) { int w = pPix->drawable.width; @@ -1657,13 +1657,13 @@ XAACachePlanarMonoStipple(ScrnInfoPtr pScrn, PixmapPtr pPix) return pCache; } -_X_EXPORT XAACachePlanarMonoStippleProc -_X_EXPORT XAAGetCachePlanarMonoStipple(void) +XAACachePlanarMonoStippleProc +XAAGetCachePlanarMonoStipple(void) { return XAACachePlanarMonoStipple; } -_X_EXPORT XAACacheInfoPtr +XAACacheInfoPtr XAACacheStipple(ScrnInfoPtr pScrn, PixmapPtr pPix, int fg, int bg) { int w = pPix->drawable.width; @@ -1742,7 +1742,7 @@ XAACacheStipple(ScrnInfoPtr pScrn, PixmapPtr pPix, int fg, int bg) -_X_EXPORT XAACacheInfoPtr +XAACacheInfoPtr XAACacheMono8x8Pattern(ScrnInfoPtr pScrn, int pat0, int pat1) { XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn); @@ -1773,7 +1773,7 @@ XAACacheMono8x8Pattern(ScrnInfoPtr pScrn, int pat0, int pat1) -_X_EXPORT XAACacheInfoPtr +XAACacheInfoPtr XAACacheColor8x8Pattern(ScrnInfoPtr pScrn, PixmapPtr pPix, int fg, int bg) { XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn); @@ -1843,7 +1843,7 @@ XAACacheColor8x8Pattern(ScrnInfoPtr pScrn, PixmapPtr pPix, int fg, int bg) } -_X_EXPORT void +void XAAWriteBitmapToCache( ScrnInfoPtr pScrn, int x, int y, int w, int h, @@ -1857,7 +1857,7 @@ XAAWriteBitmapToCache( 0, fg, bg, GXcopy, ~0); } -_X_EXPORT void +void XAAWriteBitmapToCacheLinear( ScrnInfoPtr pScrn, int x, int y, int w, int h, @@ -1895,7 +1895,7 @@ XAAWriteBitmapToCacheLinear( } -_X_EXPORT void +void XAAWritePixmapToCache( ScrnInfoPtr pScrn, int x, int y, int w, int h, @@ -1911,7 +1911,7 @@ XAAWritePixmapToCache( -_X_EXPORT void +void XAAWritePixmapToCacheLinear( ScrnInfoPtr pScrn, int x, int y, int w, int h, @@ -1955,7 +1955,7 @@ XAAWritePixmapToCacheLinear( } -_X_EXPORT void +void XAAWriteMono8x8PatternToCache( ScrnInfoPtr pScrn, XAACacheInfoPtr pCache @@ -1997,7 +1997,7 @@ XAAWriteMono8x8PatternToCache( xfree(data); } -_X_EXPORT void +void XAAWriteColor8x8PatternToCache( ScrnInfoPtr pScrn, PixmapPtr pPix, @@ -2093,7 +2093,7 @@ XAAWriteColor8x8PatternToCache( -_X_EXPORT int +int XAAStippledFillChooser(GCPtr pGC) { XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC); @@ -2178,7 +2178,7 @@ XAAStippledFillChooser(GCPtr pGC) } -_X_EXPORT int +int XAAOpaqueStippledFillChooser(GCPtr pGC) { XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC); @@ -2253,7 +2253,7 @@ XAAOpaqueStippledFillChooser(GCPtr pGC) -_X_EXPORT int +int XAATiledFillChooser(GCPtr pGC) { XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC); @@ -2326,7 +2326,7 @@ static int RotateMasksY[4] = { 0xFFFFFFFF, 0x00FFFFFF, 0x0000FFFF, 0x000000FF }; -_X_EXPORT void +void XAARotateMonoPattern( int *pat0, int *pat1, int xorg, int yorg, @@ -2355,7 +2355,7 @@ XAARotateMonoPattern( -_X_EXPORT void +void XAAInvalidatePixmapCache(ScreenPtr pScreen) { XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen); diff --git a/hw/xfree86/xaa/xaaPict.c b/hw/xfree86/xaa/xaaPict.c index 16f49b996..784c649a4 100644 --- a/hw/xfree86/xaa/xaaPict.c +++ b/hw/xfree86/xaa/xaaPict.c @@ -48,7 +48,7 @@ #include "xf86fbman.h" #include "servermd.h" -_X_EXPORT Bool +Bool XAAGetPixelFromRGBA ( CARD32 *pixel, CARD16 red, @@ -91,7 +91,7 @@ XAAGetPixelFromRGBA ( } -_X_EXPORT Bool +Bool XAAGetRGBAFromPixel( CARD32 pixel, CARD16 *red, @@ -154,7 +154,7 @@ XAAGetRGBAFromPixel( /* 8:8:8 + PICT_a8 -> 8:8:8:8 texture */ -_X_EXPORT void +void XAA_888_plus_PICT_a8_to_8888 ( CARD32 color, CARD8 *alphaPtr, /* in bytes */ @@ -180,7 +180,7 @@ XAA_888_plus_PICT_a8_to_8888 ( (pDraw->type == DRAWABLE_WINDOW || \ (pDraw->type == DRAWABLE_PIXMAP && IS_OFFSCREEN_PIXMAP(pDraw))) -_X_EXPORT Bool +Bool XAADoComposite ( CARD8 op, PicturePtr pSrc, @@ -494,7 +494,7 @@ XAACompositeSrcCopy (PicturePtr pSrc, return; } -_X_EXPORT void +void XAAComposite (CARD8 op, PicturePtr pSrc, PicturePtr pMask, @@ -562,7 +562,7 @@ XAAComposite (CARD8 op, XAA_RENDER_EPILOGUE(pScreen, Composite, XAAComposite); } -_X_EXPORT Bool +Bool XAADoGlyphs (CARD8 op, PicturePtr pSrc, PicturePtr pDst, @@ -607,7 +607,7 @@ XAADoGlyphs (CARD8 op, } -_X_EXPORT void +void XAAGlyphs (CARD8 op, PicturePtr pSrc, PicturePtr pDst, diff --git a/hw/xfree86/xaa/xaaROP.c b/hw/xfree86/xaa/xaaROP.c index e05453f22..155daa4ee 100644 --- a/hw/xfree86/xaa/xaaROP.c +++ b/hw/xfree86/xaa/xaaROP.c @@ -14,7 +14,7 @@ #include "xaalocal.h" -_X_EXPORT int XAACopyROP[16] = +int XAACopyROP[16] = { ROP_0, /* GXclear */ ROP_DSa, /* GXand */ @@ -34,7 +34,7 @@ _X_EXPORT int XAACopyROP[16] = ROP_1 /* GXset */ }; -_X_EXPORT int XAACopyROP_PM[16] = +int XAACopyROP_PM[16] = { ROP_0, /* not used */ ROP_DSPnoa, @@ -55,7 +55,7 @@ _X_EXPORT int XAACopyROP_PM[16] = }; -_X_EXPORT int XAAPatternROP[16]= +int XAAPatternROP[16]= { ROP_0, ROP_DPa, @@ -75,7 +75,7 @@ _X_EXPORT int XAAPatternROP[16]= ROP_1 }; -_X_EXPORT int XAAPatternROP_PM[16] = +int XAAPatternROP_PM[16] = { ROP_DPna, ROP_DPSnoa, @@ -95,27 +95,27 @@ _X_EXPORT int XAAPatternROP_PM[16] = ROP_DPo }; -_X_EXPORT int XAAGetCopyROP(int i) +int XAAGetCopyROP(int i) { return XAACopyROP[i]; } -_X_EXPORT int XAAGetCopyROP_PM(int i) +int XAAGetCopyROP_PM(int i) { return XAACopyROP_PM[i]; } -_X_EXPORT int XAAGetPatternROP(int i) +int XAAGetPatternROP(int i) { return XAAPatternROP[i]; } -_X_EXPORT int XAAGetPatternROP_PM(int i) +int XAAGetPatternROP_PM(int i) { return XAAPatternROP_PM[i]; } -_X_EXPORT int +int XAAHelpPatternROP(ScrnInfoPtr pScrn, int *fg, int *bg, int pm, int *rop) { XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn); @@ -150,7 +150,7 @@ XAAHelpPatternROP(ScrnInfoPtr pScrn, int *fg, int *bg, int pm, int *rop) } -_X_EXPORT int +int XAAHelpSolidROP(ScrnInfoPtr pScrn, int *fg, int pm, int *rop) { XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn); diff --git a/hw/xfree86/xaa/xaaRect.c b/hw/xfree86/xaa/xaaRect.c index 35acdb060..0a7e174b7 100644 --- a/hw/xfree86/xaa/xaaRect.c +++ b/hw/xfree86/xaa/xaaRect.c @@ -20,7 +20,7 @@ */ -_X_EXPORT void +void XAAPolyRectangleThinSolid( DrawablePtr pDrawable, GCPtr pGC, diff --git a/hw/xfree86/xaa/xaaSpans.c b/hw/xfree86/xaa/xaaSpans.c index a3859bf8b..46d6d0740 100644 --- a/hw/xfree86/xaa/xaaSpans.c +++ b/hw/xfree86/xaa/xaaSpans.c @@ -32,7 +32,7 @@ static void XAARenderCacheExpandSpans( static void XAARenderPixmapCopySpans( GCPtr, int, DDXPointPtr, int*, int, int, int); -_X_EXPORT void +void XAAFillSpans( DrawablePtr pDraw, GC *pGC, @@ -396,7 +396,7 @@ XAARenderPixmapCopySpans( \****************/ -_X_EXPORT void +void XAAFillSolidSpans( ScrnInfoPtr pScrn, int fg, int rop, @@ -432,7 +432,7 @@ XAAFillSolidSpans( \***************/ -_X_EXPORT void +void XAAFillMono8x8PatternSpansScreenOrigin( ScrnInfoPtr pScrn, int fg, int bg, int rop, @@ -491,7 +491,7 @@ XAAFillMono8x8PatternSpansScreenOrigin( } -_X_EXPORT void +void XAAFillMono8x8PatternSpans( ScrnInfoPtr pScrn, int fg, int bg, int rop, @@ -559,7 +559,7 @@ XAAFillMono8x8PatternSpans( \****************/ -_X_EXPORT void +void XAAFillColor8x8PatternSpansScreenOrigin( ScrnInfoPtr pScrn, int rop, @@ -605,7 +605,7 @@ XAAFillColor8x8PatternSpansScreenOrigin( } -_X_EXPORT void +void XAAFillColor8x8PatternSpans( ScrnInfoPtr pScrn, int rop, @@ -654,7 +654,7 @@ XAAFillColor8x8PatternSpans( \*****************/ -_X_EXPORT void +void XAAFillCacheBltSpans( ScrnInfoPtr pScrn, int rop, @@ -713,7 +713,7 @@ XAAFillCacheBltSpans( \****************/ -_X_EXPORT void +void XAAFillCacheExpandSpans( ScrnInfoPtr pScrn, int fg, int bg, int rop, @@ -774,7 +774,7 @@ XAAFillCacheExpandSpans( -_X_EXPORT void +void XAAClipAndRenderSpans( GCPtr pGC, DDXPointPtr ppt, diff --git a/hw/xfree86/xaa/xaaStateChange.c b/hw/xfree86/xaa/xaaStateChange.c index c88c79cd6..57d8aa318 100644 --- a/hw/xfree86/xaa/xaaStateChange.c +++ b/hw/xfree86/xaa/xaaStateChange.c @@ -1497,7 +1497,7 @@ static Bool XAAStateWrapSetupForCPUToScreenTexture2(ScrnInfoPtr pScrn, int op, #endif /* Setup Function */ -_X_EXPORT Bool +Bool XAAInitStateWrap(ScreenPtr pScreen, XAAInfoRecPtr infoRec) { ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; diff --git a/hw/xfree86/xaa/xaaStipple.c b/hw/xfree86/xaa/xaaStipple.c index de877d274..c1d6f8ab4 100644 --- a/hw/xfree86/xaa/xaaStipple.c +++ b/hw/xfree86/xaa/xaaStipple.c @@ -23,7 +23,7 @@ static CARD32* StippleOver32_Inverted(CARD32*, CARD32*, int, int, int); #define stipple_get_scanline_func EXPNAME(XAAGetStippleScanlineFunc) #endif -_X_EXPORT StippleScanlineProcPtr stipple_scanline_func[6] = { +StippleScanlineProcPtr stipple_scanline_func[6] = { StipplePowerOfTwo, StippleUpTo32, StippleOver32, @@ -32,7 +32,7 @@ _X_EXPORT StippleScanlineProcPtr stipple_scanline_func[6] = { StippleOver32_Inverted }; -_X_EXPORT StippleScanlineProcPtr *stipple_get_scanline_func(void) { +StippleScanlineProcPtr *stipple_get_scanline_func(void) { return stipple_scanline_func; } @@ -83,7 +83,7 @@ _X_EXPORT StippleScanlineProcPtr *stipple_get_scanline_func(void) { #if !defined(FIXEDBASE) && !defined(MSBFIRST) && !defined(TRIPLE_BITS) -_X_EXPORT unsigned int XAAShiftMasks[32] = { +unsigned int XAAShiftMasks[32] = { /* gcc is rather pedantic about SHIFT_R(0xFFFFFFFF,32) */ 0x00000000 , SHIFT_R(0xFFFFFFFF,31), SHIFT_R(0xFFFFFFFF,30), SHIFT_R(0xFFFFFFFF,29), @@ -105,7 +105,7 @@ _X_EXPORT unsigned int XAAShiftMasks[32] = { #endif -_X_EXPORT void +void #ifdef TRIPLE_BITS EXPNAME(XAAFillColorExpandRects3)( #else @@ -241,7 +241,7 @@ SECOND_PASS: -_X_EXPORT void +void #ifdef TRIPLE_BITS EXPNAME(XAAFillColorExpandSpans3)( #else @@ -352,7 +352,7 @@ SECOND_PASS: #ifndef FIXEDBASE -_X_EXPORT void +void #ifdef TRIPLE_BITS EXPNAME(XAAFillScanlineColorExpandRects3)( #else @@ -465,7 +465,7 @@ SECOND_PASS: SET_SYNC_FLAG(infoRec); } -_X_EXPORT void +void #ifdef TRIPLE_BITS EXPNAME(XAAFillScanlineColorExpandSpans3)( #else diff --git a/hw/xfree86/xaa/xaaTEGlyph.c b/hw/xfree86/xaa/xaaTEGlyph.c index 86fb66c6f..41e638e5c 100644 --- a/hw/xfree86/xaa/xaaTEGlyph.c +++ b/hw/xfree86/xaa/xaaTEGlyph.c @@ -78,7 +78,7 @@ static CARD32 *DrawTETextScanlineWidth9(CARD32 *base, unsigned int **glyphp, #define glyph_get_scanline_func EXPNAME(XAAGetGlyphScanlineFunc) -_X_EXPORT GlyphScanlineFuncPtr glyph_scanline_func[32] = { +GlyphScanlineFuncPtr glyph_scanline_func[32] = { DrawTETextScanlineGeneric, DrawTETextScanlineGeneric, DrawTETextScanlineGeneric, DrawTETextScanlineGeneric, DrawTETextScanlineGeneric, @@ -126,7 +126,7 @@ _X_EXPORT GlyphScanlineFuncPtr glyph_scanline_func[32] = { DrawTETextScanlineGeneric, DrawTETextScanlineGeneric }; -_X_EXPORT GlyphScanlineFuncPtr *glyph_get_scanline_func(void) { +GlyphScanlineFuncPtr *glyph_get_scanline_func(void) { return glyph_scanline_func; } @@ -143,7 +143,7 @@ _X_EXPORT GlyphScanlineFuncPtr *glyph_get_scanline_func(void) { /* This gets built for MSBFIRST or LSBFIRST with FIXEDBASE or not. A total of 4 versions */ -_X_EXPORT void +void EXPNAME(XAATEGlyphRenderer)( ScrnInfoPtr pScrn, int x, int y, int w, int h, int skipleft, int startline, @@ -239,7 +239,7 @@ THE_END: ********************************************************************/ -_X_EXPORT void +void EXPNAME(XAATEGlyphRenderer3)( ScrnInfoPtr pScrn, int x, int y, int w, int h, int skipleft, int startline, @@ -340,7 +340,7 @@ THE_END: #ifndef FIXEDBASE /* Scanline version of above gets built for LSBFIRST and MSBFIRST */ -_X_EXPORT void +void EXPNAME(XAATEGlyphRendererScanline)( ScrnInfoPtr pScrn, int x, int y, int w, int h, int skipleft, int startline, @@ -415,7 +415,7 @@ THE_END: SET_SYNC_FLAG(infoRec); } -_X_EXPORT void +void EXPNAME(XAATEGlyphRendererScanline3)( ScrnInfoPtr pScrn, int x, int y, int w, int h, int skipleft, int startline, diff --git a/hw/xfree86/xaa/xaaTEText.c b/hw/xfree86/xaa/xaaTEText.c index 7357862f7..fc445726f 100644 --- a/hw/xfree86/xaa/xaaTEText.c +++ b/hw/xfree86/xaa/xaaTEText.c @@ -50,7 +50,7 @@ static void XAAGlyphBltTEColorExpansion(ScrnInfoPtr pScrn, int xInit, ********************************************************************/ -_X_EXPORT int +int XAAPolyText8TEColorExpansion( DrawablePtr pDraw, GCPtr pGC, @@ -74,7 +74,7 @@ XAAPolyText8TEColorExpansion( } -_X_EXPORT int +int XAAPolyText16TEColorExpansion( DrawablePtr pDraw, GCPtr pGC, @@ -99,7 +99,7 @@ XAAPolyText16TEColorExpansion( } -_X_EXPORT void +void XAAImageText8TEColorExpansion( DrawablePtr pDraw, GCPtr pGC, @@ -123,7 +123,7 @@ XAAImageText8TEColorExpansion( } -_X_EXPORT void +void XAAImageText16TEColorExpansion( DrawablePtr pDraw, GCPtr pGC, @@ -158,7 +158,7 @@ XAAImageText16TEColorExpansion( ********************************************************************/ -_X_EXPORT void +void XAAImageGlyphBltTEColorExpansion( DrawablePtr pDrawable, GCPtr pGC, @@ -178,7 +178,7 @@ XAAImageGlyphBltTEColorExpansion( pGC->pCompositeClip, nglyph, (unsigned char*)pglyphBase, ppci); } -_X_EXPORT void +void XAAPolyGlyphBltTEColorExpansion( DrawablePtr pDrawable, GCPtr pGC, diff --git a/hw/xfree86/xaa/xaaTables.c b/hw/xfree86/xaa/xaaTables.c index b6b7185fa..c7fa28af3 100644 --- a/hw/xfree86/xaa/xaaTables.c +++ b/hw/xfree86/xaa/xaaTables.c @@ -6,7 +6,7 @@ * bit order within a byte. */ -_X_EXPORT unsigned int byte_expand3[256] = +unsigned int byte_expand3[256] = { 0x000000, 0x000007, 0x000038, 0x00003F, 0x0001C0, 0x0001C7, 0x0001F8, 0x0001FF, 0x000E00, 0x000E07, 0x000E38, 0x000E3F, 0x000FC0, 0x000FC7, 0x000FF8, 0x000FFF, @@ -50,7 +50,7 @@ _X_EXPORT unsigned int byte_expand3[256] = * byte. */ -_X_EXPORT unsigned int byte_reversed_expand3[256] = +unsigned int byte_reversed_expand3[256] = { 0x000000, 0x0000E0, 0x00001C, 0x0000FC, 0x008003, 0x0080E3, 0x00801F, 0x0080FF, 0x007000, 0x0070E0, 0x00701C, 0x0070FC, 0x00F003, 0x00F0E3, 0x00F01F, 0x00F0FF, diff --git a/hw/xfree86/xaa/xaaWideLine.c b/hw/xfree86/xaa/xaaWideLine.c index aacc305a3..a684d6676 100644 --- a/hw/xfree86/xaa/xaaWideLine.c +++ b/hw/xfree86/xaa/xaaWideLine.c @@ -785,7 +785,7 @@ XAALineJoin ( } -_X_EXPORT void +void XAAPolylinesWideSolid ( DrawablePtr pDrawable, GCPtr pGC, diff --git a/hw/xfree86/xaa/xaaWrapper.c b/hw/xfree86/xaa/xaaWrapper.c index e8f36ff6b..88418946f 100644 --- a/hw/xfree86/xaa/xaaWrapper.c +++ b/hw/xfree86/xaa/xaaWrapper.c @@ -265,7 +265,7 @@ xaaWrapperListInstalledColormaps(ScreenPtr pScreen, Colormap *pCmapIds) return n; } -_X_EXPORT Bool +Bool xaaSetupWrapper(ScreenPtr pScreen, XAAInfoRecPtr infoPtr, int depth, SyncFunc *func) { Bool ret; diff --git a/hw/xfree86/xaa/xaaWrapper.h b/hw/xfree86/xaa/xaaWrapper.h index a141d8421..f554741c6 100644 --- a/hw/xfree86/xaa/xaaWrapper.h +++ b/hw/xfree86/xaa/xaaWrapper.h @@ -4,7 +4,7 @@ typedef void (*SyncFunc)(ScreenPtr); -Bool xaaSetupWrapper(ScreenPtr pScreen, +extern _X_EXPORT Bool xaaSetupWrapper(ScreenPtr pScreen, XAAInfoRecPtr infoPtr, int depth, SyncFunc *func); #endif diff --git a/hw/xfree86/xaa/xaalocal.h b/hw/xfree86/xaa/xaalocal.h index 69a59050c..5e3d373c6 100644 --- a/hw/xfree86/xaa/xaalocal.h +++ b/hw/xfree86/xaa/xaalocal.h @@ -97,18 +97,18 @@ typedef struct _XAAPixmap { } XAAPixmapRec, *XAAPixmapPtr; -Bool +extern _X_EXPORT Bool XAACreateGC( GCPtr pGC ); -Bool +extern _X_EXPORT Bool XAAInitAccel( ScreenPtr pScreen, XAAInfoRecPtr infoRec ); -RegionPtr +extern _X_EXPORT RegionPtr XAABitBlt( DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, @@ -123,7 +123,7 @@ XAABitBlt( unsigned long bitPlane ); -void +extern _X_EXPORT void XAAScreenToScreenBitBlt( ScrnInfoPtr pScrn, int nbox, @@ -135,7 +135,7 @@ XAAScreenToScreenBitBlt( unsigned int planemask ); -void +extern _X_EXPORT void XAADoBitBlt( DrawablePtr pSrc, DrawablePtr pDst, @@ -144,7 +144,7 @@ XAADoBitBlt( DDXPointPtr pptSrc ); -void +extern _X_EXPORT void XAADoImageWrite( DrawablePtr pSrc, DrawablePtr pDst, @@ -153,7 +153,7 @@ XAADoImageWrite( DDXPointPtr pptSrc ); -void +extern _X_EXPORT void XAADoImageRead( DrawablePtr pSrc, DrawablePtr pDst, @@ -162,7 +162,7 @@ XAADoImageRead( DDXPointPtr pptSrc ); -void +extern _X_EXPORT void XAACopyWindow( WindowPtr pWin, DDXPointRec ptOldOrg, @@ -170,7 +170,7 @@ XAACopyWindow( ); -RegionPtr +extern _X_EXPORT RegionPtr XAACopyArea( DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, @@ -183,56 +183,56 @@ XAACopyArea( int dsty ); -void +extern _X_EXPORT void XAAValidateCopyArea( GCPtr pGC, unsigned long changes, DrawablePtr pDraw ); -void +extern _X_EXPORT void XAAValidatePutImage( GCPtr pGC, unsigned long changes, DrawablePtr pDraw ); -void +extern _X_EXPORT void XAAValidateCopyPlane( GCPtr pGC, unsigned long changes, DrawablePtr pDraw ); -void +extern _X_EXPORT void XAAValidatePushPixels( GCPtr pGC, unsigned long changes, DrawablePtr pDraw ); -void +extern _X_EXPORT void XAAValidateFillSpans( GCPtr pGC, unsigned long changes, DrawablePtr pDraw ); -void +extern _X_EXPORT void XAAValidatePolyGlyphBlt( GCPtr pGC, unsigned long changes, DrawablePtr pDraw ); -void +extern _X_EXPORT void XAAValidateImageGlyphBlt( GCPtr pGC, unsigned long changes, DrawablePtr pDraw ); -void +extern _X_EXPORT void XAAValidatePolylines( GCPtr pGC, unsigned long changes, @@ -240,7 +240,7 @@ XAAValidatePolylines( ); -RegionPtr +extern _X_EXPORT RegionPtr XAACopyPlaneColorExpansion( DrawablePtr pSrc, DrawablePtr pDst, @@ -255,7 +255,7 @@ XAACopyPlaneColorExpansion( ); -void +extern _X_EXPORT void XAAPushPixelsSolidColorExpansion( GCPtr pGC, PixmapPtr pBitMap, @@ -266,7 +266,7 @@ XAAPushPixelsSolidColorExpansion( int yOrg ); -void +extern _X_EXPORT void XAAWriteBitmapColorExpandMSBFirstFixedBase ( ScrnInfoPtr pScrn, int x, int y, int w, int h, @@ -278,7 +278,7 @@ XAAWriteBitmapColorExpandMSBFirstFixedBase ( unsigned int planemask ); -void +extern _X_EXPORT void XAAWriteBitmapColorExpand3MSBFirstFixedBase ( ScrnInfoPtr pScrn, int x, int y, int w, int h, @@ -290,7 +290,7 @@ XAAWriteBitmapColorExpand3MSBFirstFixedBase ( unsigned int planemask ); -void +extern _X_EXPORT void XAAWriteBitmapColorExpandMSBFirst ( ScrnInfoPtr pScrn, int x, int y, int w, int h, @@ -302,7 +302,7 @@ XAAWriteBitmapColorExpandMSBFirst ( unsigned int planemask ); -void +extern _X_EXPORT void XAAWriteBitmapColorExpand3MSBFirst ( ScrnInfoPtr pScrn, int x, int y, int w, int h, @@ -314,7 +314,7 @@ XAAWriteBitmapColorExpand3MSBFirst ( unsigned int planemask ); -void +extern _X_EXPORT void XAAWriteBitmapColorExpandLSBFirstFixedBase ( ScrnInfoPtr pScrn, int x, int y, int w, int h, @@ -326,7 +326,7 @@ XAAWriteBitmapColorExpandLSBFirstFixedBase ( unsigned int planemask ); -void +extern _X_EXPORT void XAAWriteBitmapColorExpand3LSBFirstFixedBase ( ScrnInfoPtr pScrn, int x, int y, int w, int h, @@ -338,7 +338,7 @@ XAAWriteBitmapColorExpand3LSBFirstFixedBase ( unsigned int planemask ); -void +extern _X_EXPORT void XAAWriteBitmapColorExpandLSBFirst ( ScrnInfoPtr pScrn, int x, int y, int w, int h, @@ -350,7 +350,7 @@ XAAWriteBitmapColorExpandLSBFirst ( unsigned int planemask ); -void +extern _X_EXPORT void XAAWriteBitmapColorExpand3LSBFirst ( ScrnInfoPtr pScrn, int x, int y, int w, int h, @@ -363,7 +363,7 @@ XAAWriteBitmapColorExpand3LSBFirst ( ); -void +extern _X_EXPORT void XAAWriteBitmapScanlineColorExpandMSBFirst ( ScrnInfoPtr pScrn, int x, int y, int w, int h, @@ -375,7 +375,7 @@ XAAWriteBitmapScanlineColorExpandMSBFirst ( unsigned int planemask ); -void +extern _X_EXPORT void XAAWriteBitmapScanlineColorExpand3MSBFirst ( ScrnInfoPtr pScrn, int x, int y, int w, int h, @@ -387,7 +387,7 @@ XAAWriteBitmapScanlineColorExpand3MSBFirst ( unsigned int planemask ); -void +extern _X_EXPORT void XAAWriteBitmapScanlineColorExpandMSBFirstFixedBase ( ScrnInfoPtr pScrn, int x, int y, int w, int h, @@ -399,7 +399,7 @@ XAAWriteBitmapScanlineColorExpandMSBFirstFixedBase ( unsigned int planemask ); -void +extern _X_EXPORT void XAAWriteBitmapScanlineColorExpand3MSBFirstFixedBase ( ScrnInfoPtr pScrn, int x, int y, int w, int h, @@ -411,7 +411,7 @@ XAAWriteBitmapScanlineColorExpand3MSBFirstFixedBase ( unsigned int planemask ); -void +extern _X_EXPORT void XAAWriteBitmapScanlineColorExpandLSBFirst ( ScrnInfoPtr pScrn, int x, int y, int w, int h, @@ -423,7 +423,7 @@ XAAWriteBitmapScanlineColorExpandLSBFirst ( unsigned int planemask ); -void +extern _X_EXPORT void XAAWriteBitmapScanlineColorExpand3LSBFirst ( ScrnInfoPtr pScrn, int x, int y, int w, int h, @@ -435,7 +435,7 @@ XAAWriteBitmapScanlineColorExpand3LSBFirst ( unsigned int planemask ); -void +extern _X_EXPORT void XAAWriteBitmapScanlineColorExpandLSBFirstFixedBase ( ScrnInfoPtr pScrn, int x, int y, int w, int h, @@ -447,7 +447,7 @@ XAAWriteBitmapScanlineColorExpandLSBFirstFixedBase ( unsigned int planemask ); -void +extern _X_EXPORT void XAAWriteBitmapScanlineColorExpand3LSBFirstFixedBase ( ScrnInfoPtr pScrn, int x, int y, int w, int h, @@ -459,7 +459,7 @@ XAAWriteBitmapScanlineColorExpand3LSBFirstFixedBase ( unsigned int planemask ); -void +extern _X_EXPORT void XAAWritePixmap ( ScrnInfoPtr pScrn, int x, int y, int w, int h, @@ -471,7 +471,7 @@ XAAWritePixmap ( int bpp, int depth ); -void +extern _X_EXPORT void XAAWritePixmapScanline ( ScrnInfoPtr pScrn, int x, int y, int w, int h, @@ -486,7 +486,7 @@ XAAWritePixmapScanline ( typedef void (*ClipAndRenderRectsFunc)(GCPtr, int, BoxPtr, int, int); -void +extern _X_EXPORT void XAAClipAndRenderRects( GCPtr pGC, ClipAndRenderRectsFunc func, @@ -499,7 +499,7 @@ XAAClipAndRenderRects( typedef void (*ClipAndRenderSpansFunc)(GCPtr, int, DDXPointPtr, int*, int, int, int); -void +extern _X_EXPORT void XAAClipAndRenderSpans( GCPtr pGC, DDXPointPtr ppt, @@ -512,7 +512,7 @@ XAAClipAndRenderSpans( ); -void +extern _X_EXPORT void XAAFillSolidRects( ScrnInfoPtr pScrn, int fg, int rop, @@ -521,7 +521,7 @@ XAAFillSolidRects( BoxPtr pBox ); -void +extern _X_EXPORT void XAAFillMono8x8PatternRects( ScrnInfoPtr pScrn, int fg, int bg, int rop, @@ -532,7 +532,7 @@ XAAFillMono8x8PatternRects( int xorg, int yorg ); -void +extern _X_EXPORT void XAAFillMono8x8PatternRectsScreenOrigin( ScrnInfoPtr pScrn, int fg, int bg, int rop, @@ -544,7 +544,7 @@ XAAFillMono8x8PatternRectsScreenOrigin( ); -void +extern _X_EXPORT void XAAFillColor8x8PatternRectsScreenOrigin( ScrnInfoPtr pScrn, int rop, @@ -555,7 +555,7 @@ XAAFillColor8x8PatternRectsScreenOrigin( XAACacheInfoPtr pCache ); -void +extern _X_EXPORT void XAAFillColor8x8PatternRects( ScrnInfoPtr pScrn, int rop, @@ -566,7 +566,7 @@ XAAFillColor8x8PatternRects( XAACacheInfoPtr pCache ); -void +extern _X_EXPORT void XAAFillCacheBltRects( ScrnInfoPtr pScrn, int rop, @@ -577,7 +577,7 @@ XAAFillCacheBltRects( XAACacheInfoPtr pCache ); -void +extern _X_EXPORT void XAAFillCacheExpandRects( ScrnInfoPtr pScrn, int fg, int bg, int rop, @@ -588,7 +588,7 @@ XAAFillCacheExpandRects( PixmapPtr pPix ); -void +extern _X_EXPORT void XAAFillImageWriteRects( ScrnInfoPtr pScrn, int rop, @@ -599,7 +599,7 @@ XAAFillImageWriteRects( PixmapPtr pPix ); -void +extern _X_EXPORT void XAAPolyFillRect( DrawablePtr pDraw, GCPtr pGC, @@ -608,7 +608,7 @@ XAAPolyFillRect( ); -void +extern _X_EXPORT void XAATEGlyphRendererMSBFirstFixedBase ( ScrnInfoPtr pScrn, int x, int y, int w, int h, int skipleft, int startline, @@ -616,7 +616,7 @@ XAATEGlyphRendererMSBFirstFixedBase ( int fg, int bg, int rop, unsigned planemask ); -void +extern _X_EXPORT void XAATEGlyphRenderer3MSBFirstFixedBase ( ScrnInfoPtr pScrn, int x, int y, int w, int h, int skipleft, int startline, @@ -624,7 +624,7 @@ XAATEGlyphRenderer3MSBFirstFixedBase ( int fg, int bg, int rop, unsigned planemask ); -void +extern _X_EXPORT void XAATEGlyphRendererMSBFirst ( ScrnInfoPtr pScrn, int x, int y, int w, int h, int skipleft, int startline, @@ -632,7 +632,7 @@ XAATEGlyphRendererMSBFirst ( int fg, int bg, int rop, unsigned planemask ); -void +extern _X_EXPORT void XAATEGlyphRenderer3MSBFirst ( ScrnInfoPtr pScrn, int x, int y, int w, int h, int skipleft, int startline, @@ -640,7 +640,7 @@ XAATEGlyphRenderer3MSBFirst ( int fg, int bg, int rop, unsigned planemask ); -void +extern _X_EXPORT void XAATEGlyphRendererLSBFirstFixedBase ( ScrnInfoPtr pScrn, int x, int y, int w, int h, int skipleft, int startline, @@ -649,7 +649,7 @@ XAATEGlyphRendererLSBFirstFixedBase ( ); -void +extern _X_EXPORT void XAATEGlyphRenderer3LSBFirstFixedBase ( ScrnInfoPtr pScrn, int x, int y, int w, int h, int skipleft, int startline, @@ -657,7 +657,7 @@ XAATEGlyphRenderer3LSBFirstFixedBase ( int fg, int bg, int rop, unsigned planemask ); -void +extern _X_EXPORT void XAATEGlyphRendererLSBFirst ( ScrnInfoPtr pScrn, int x, int y, int w, int h, int skipleft, int startline, @@ -665,7 +665,7 @@ XAATEGlyphRendererLSBFirst ( int fg, int bg, int rop, unsigned planemask ); -void +extern _X_EXPORT void XAATEGlyphRenderer3LSBFirst ( ScrnInfoPtr pScrn, int x, int y, int w, int h, int skipleft, int startline, @@ -674,7 +674,7 @@ XAATEGlyphRenderer3LSBFirst ( ); -void +extern _X_EXPORT void XAATEGlyphRendererScanlineMSBFirst ( ScrnInfoPtr pScrn, int x, int y, int w, int h, int skipleft, int startline, @@ -682,7 +682,7 @@ XAATEGlyphRendererScanlineMSBFirst ( int fg, int bg, int rop, unsigned planemask ); -void +extern _X_EXPORT void XAATEGlyphRendererScanline3MSBFirst ( ScrnInfoPtr pScrn, int x, int y, int w, int h, int skipleft, int startline, @@ -690,7 +690,7 @@ XAATEGlyphRendererScanline3MSBFirst ( int fg, int bg, int rop, unsigned planemask ); -void +extern _X_EXPORT void XAATEGlyphRendererScanlineLSBFirst ( ScrnInfoPtr pScrn, int x, int y, int w, int h, int skipleft, int startline, @@ -698,7 +698,7 @@ XAATEGlyphRendererScanlineLSBFirst ( int fg, int bg, int rop, unsigned planemask ); -void +extern _X_EXPORT void XAATEGlyphRendererScanline3LSBFirst ( ScrnInfoPtr pScrn, int x, int y, int w, int h, int skipleft, int startline, @@ -707,28 +707,28 @@ XAATEGlyphRendererScanline3LSBFirst ( ); -extern CARD32 *(*XAAGlyphScanlineFuncMSBFirstFixedBase[32])( +extern _X_EXPORT CARD32 *(*XAAGlyphScanlineFuncMSBFirstFixedBase[32])( CARD32 *base, unsigned int **glyphp, int line, int nglyph, int width ); -extern CARD32 *(*XAAGlyphScanlineFuncMSBFirst[32])( +extern _X_EXPORT CARD32 *(*XAAGlyphScanlineFuncMSBFirst[32])( CARD32 *base, unsigned int **glyphp, int line, int nglyph, int width ); -extern CARD32 *(*XAAGlyphScanlineFuncLSBFirstFixedBase[32])( +extern _X_EXPORT CARD32 *(*XAAGlyphScanlineFuncLSBFirstFixedBase[32])( CARD32 *base, unsigned int **glyphp, int line, int nglyph, int width ); -extern CARD32 *(*XAAGlyphScanlineFuncLSBFirst[32])( +extern _X_EXPORT CARD32 *(*XAAGlyphScanlineFuncLSBFirst[32])( CARD32 *base, unsigned int **glyphp, int line, int nglyph, int width ); -GlyphScanlineFuncPtr *XAAGetGlyphScanlineFuncMSBFirstFixedBase(void); -GlyphScanlineFuncPtr *XAAGetGlyphScanlineFuncMSBFirst(void); -GlyphScanlineFuncPtr *XAAGetGlyphScanlineFuncLSBFirstFixedBase(void); -GlyphScanlineFuncPtr *XAAGetGlyphScanlineFuncLSBFirst(void); +extern _X_EXPORT GlyphScanlineFuncPtr *XAAGetGlyphScanlineFuncMSBFirstFixedBase(void); +extern _X_EXPORT GlyphScanlineFuncPtr *XAAGetGlyphScanlineFuncMSBFirst(void); +extern _X_EXPORT GlyphScanlineFuncPtr *XAAGetGlyphScanlineFuncLSBFirstFixedBase(void); +extern _X_EXPORT GlyphScanlineFuncPtr *XAAGetGlyphScanlineFuncLSBFirst(void); -void +extern _X_EXPORT void XAAFillColorExpandRectsLSBFirst( ScrnInfoPtr pScrn, int fg, int bg, int rop, @@ -739,7 +739,7 @@ XAAFillColorExpandRectsLSBFirst( PixmapPtr pPix ); -void +extern _X_EXPORT void XAAFillColorExpandRects3LSBFirst( ScrnInfoPtr pScrn, int fg, int bg, int rop, @@ -750,7 +750,7 @@ XAAFillColorExpandRects3LSBFirst( PixmapPtr pPix ); -void +extern _X_EXPORT void XAAFillColorExpandRectsLSBFirstFixedBase( ScrnInfoPtr pScrn, int fg, int bg, int rop, @@ -761,7 +761,7 @@ XAAFillColorExpandRectsLSBFirstFixedBase( PixmapPtr pPix ); -void +extern _X_EXPORT void XAAFillColorExpandRects3LSBFirstFixedBase( ScrnInfoPtr pScrn, int fg, int bg, int rop, @@ -772,7 +772,7 @@ XAAFillColorExpandRects3LSBFirstFixedBase( PixmapPtr pPix ); -void +extern _X_EXPORT void XAAFillColorExpandRectsMSBFirst( ScrnInfoPtr pScrn, int fg, int bg, int rop, @@ -783,7 +783,7 @@ XAAFillColorExpandRectsMSBFirst( PixmapPtr pPix ); -void +extern _X_EXPORT void XAAFillColorExpandRects3MSBFirst( ScrnInfoPtr pScrn, int fg, int bg, int rop, @@ -794,7 +794,7 @@ XAAFillColorExpandRects3MSBFirst( PixmapPtr pPix ); -void +extern _X_EXPORT void XAAFillColorExpandRectsMSBFirstFixedBase( ScrnInfoPtr pScrn, int fg, int bg, int rop, @@ -805,7 +805,7 @@ XAAFillColorExpandRectsMSBFirstFixedBase( PixmapPtr pPix ); -void +extern _X_EXPORT void XAAFillColorExpandRects3MSBFirstFixedBase( ScrnInfoPtr pScrn, int fg, int bg, int rop, @@ -816,7 +816,7 @@ XAAFillColorExpandRects3MSBFirstFixedBase( PixmapPtr pPix ); -void +extern _X_EXPORT void XAAFillScanlineColorExpandRectsLSBFirst( ScrnInfoPtr pScrn, int fg, int bg, int rop, @@ -827,7 +827,7 @@ XAAFillScanlineColorExpandRectsLSBFirst( PixmapPtr pPix ); -void +extern _X_EXPORT void XAAFillScanlineColorExpandRects3LSBFirst( ScrnInfoPtr pScrn, int fg, int bg, int rop, @@ -838,7 +838,7 @@ XAAFillScanlineColorExpandRects3LSBFirst( PixmapPtr pPix ); -void +extern _X_EXPORT void XAAFillScanlineColorExpandRectsMSBFirst( ScrnInfoPtr pScrn, int fg, int bg, int rop, @@ -849,7 +849,7 @@ XAAFillScanlineColorExpandRectsMSBFirst( PixmapPtr pPix ); -void +extern _X_EXPORT void XAAFillScanlineColorExpandRects3MSBFirst( ScrnInfoPtr pScrn, int fg, int bg, int rop, @@ -860,7 +860,7 @@ XAAFillScanlineColorExpandRects3MSBFirst( PixmapPtr pPix ); -void +extern _X_EXPORT void XAAFillColorExpandSpansLSBFirst( ScrnInfoPtr pScrn, int fg, int bg, int rop, @@ -873,7 +873,7 @@ XAAFillColorExpandSpansLSBFirst( PixmapPtr pPix ); -void +extern _X_EXPORT void XAAFillColorExpandSpans3LSBFirst( ScrnInfoPtr pScrn, int fg, int bg, int rop, @@ -886,7 +886,7 @@ XAAFillColorExpandSpans3LSBFirst( PixmapPtr pPix ); -void +extern _X_EXPORT void XAAFillColorExpandSpansLSBFirstFixedBase( ScrnInfoPtr pScrn, int fg, int bg, int rop, @@ -899,7 +899,7 @@ XAAFillColorExpandSpansLSBFirstFixedBase( PixmapPtr pPix ); -void +extern _X_EXPORT void XAAFillColorExpandSpans3LSBFirstFixedBase( ScrnInfoPtr pScrn, int fg, int bg, int rop, @@ -912,7 +912,7 @@ XAAFillColorExpandSpans3LSBFirstFixedBase( PixmapPtr pPix ); -void +extern _X_EXPORT void XAAFillColorExpandSpansMSBFirst( ScrnInfoPtr pScrn, int fg, int bg, int rop, @@ -925,7 +925,7 @@ XAAFillColorExpandSpansMSBFirst( PixmapPtr pPix ); -void +extern _X_EXPORT void XAAFillColorExpandSpans3MSBFirst( ScrnInfoPtr pScrn, int fg, int bg, int rop, @@ -938,7 +938,7 @@ XAAFillColorExpandSpans3MSBFirst( PixmapPtr pPix ); -void +extern _X_EXPORT void XAAFillColorExpandSpansMSBFirstFixedBase( ScrnInfoPtr pScrn, int fg, int bg, int rop, @@ -951,7 +951,7 @@ XAAFillColorExpandSpansMSBFirstFixedBase( PixmapPtr pPix ); -void +extern _X_EXPORT void XAAFillColorExpandSpans3MSBFirstFixedBase( ScrnInfoPtr pScrn, int fg, int bg, int rop, @@ -964,7 +964,7 @@ XAAFillColorExpandSpans3MSBFirstFixedBase( PixmapPtr pPix ); -void +extern _X_EXPORT void XAAFillScanlineColorExpandSpansLSBFirst( ScrnInfoPtr pScrn, int fg, int bg, int rop, @@ -977,7 +977,7 @@ XAAFillScanlineColorExpandSpansLSBFirst( PixmapPtr pPix ); -void +extern _X_EXPORT void XAAFillScanlineColorExpandSpans3LSBFirst( ScrnInfoPtr pScrn, int fg, int bg, int rop, @@ -990,7 +990,7 @@ XAAFillScanlineColorExpandSpans3LSBFirst( PixmapPtr pPix ); -void +extern _X_EXPORT void XAAPutImage( DrawablePtr pDraw, GCPtr pGC, @@ -1004,7 +1004,7 @@ XAAPutImage( char *pImage ); -void +extern _X_EXPORT void XAAFillScanlineColorExpandSpansMSBFirst( ScrnInfoPtr pScrn, int fg, int bg, int rop, @@ -1017,7 +1017,7 @@ XAAFillScanlineColorExpandSpansMSBFirst( PixmapPtr pPix ); -void +extern _X_EXPORT void XAAFillScanlineColorExpandSpans3MSBFirst( ScrnInfoPtr pScrn, int fg, int bg, int rop, @@ -1031,32 +1031,32 @@ XAAFillScanlineColorExpandSpans3MSBFirst( ); -extern CARD32 *(*XAAStippleScanlineFuncMSBFirstFixedBase[6])( +extern _X_EXPORT CARD32 *(*XAAStippleScanlineFuncMSBFirstFixedBase[6])( CARD32* base, CARD32* src, int offset, int width, int dwords ); -extern CARD32 *(*XAAStippleScanlineFuncMSBFirst[6])( +extern _X_EXPORT CARD32 *(*XAAStippleScanlineFuncMSBFirst[6])( CARD32* base, CARD32* src, int offset, int width, int dwords ); -extern CARD32 *(*XAAStippleScanlineFuncLSBFirstFixedBase[6])( +extern _X_EXPORT CARD32 *(*XAAStippleScanlineFuncLSBFirstFixedBase[6])( CARD32* base, CARD32* src, int offset, int width, int dwords ); -extern CARD32 *(*XAAStippleScanlineFuncLSBFirst[6])( +extern _X_EXPORT CARD32 *(*XAAStippleScanlineFuncLSBFirst[6])( CARD32* base, CARD32* src, int offset, int width, int dwords ); -StippleScanlineProcPtr *XAAGetStippleScanlineFuncMSBFirstFixedBase(void); -StippleScanlineProcPtr *XAAGetStippleScanlineFuncMSBFirst(void); -StippleScanlineProcPtr *XAAGetStippleScanlineFuncLSBFirstFixedBase(void); -StippleScanlineProcPtr *XAAGetStippleScanlineFuncLSBFirst(void); -StippleScanlineProcPtr *XAAGetStippleScanlineFunc3MSBFirstFixedBase(void); -StippleScanlineProcPtr *XAAGetStippleScanlineFunc3MSBFirst(void); -StippleScanlineProcPtr *XAAGetStippleScanlineFunc3LSBFirstFixedBase(void); -StippleScanlineProcPtr *XAAGetStippleScanlineFunc3LSBFirst(void); +extern _X_EXPORT StippleScanlineProcPtr *XAAGetStippleScanlineFuncMSBFirstFixedBase(void); +extern _X_EXPORT StippleScanlineProcPtr *XAAGetStippleScanlineFuncMSBFirst(void); +extern _X_EXPORT StippleScanlineProcPtr *XAAGetStippleScanlineFuncLSBFirstFixedBase(void); +extern _X_EXPORT StippleScanlineProcPtr *XAAGetStippleScanlineFuncLSBFirst(void); +extern _X_EXPORT StippleScanlineProcPtr *XAAGetStippleScanlineFunc3MSBFirstFixedBase(void); +extern _X_EXPORT StippleScanlineProcPtr *XAAGetStippleScanlineFunc3MSBFirst(void); +extern _X_EXPORT StippleScanlineProcPtr *XAAGetStippleScanlineFunc3LSBFirstFixedBase(void); +extern _X_EXPORT StippleScanlineProcPtr *XAAGetStippleScanlineFunc3LSBFirst(void); -int +extern _X_EXPORT int XAAPolyText8TEColorExpansion( DrawablePtr pDraw, GCPtr pGC, @@ -1065,7 +1065,7 @@ XAAPolyText8TEColorExpansion( char *chars ); -int +extern _X_EXPORT int XAAPolyText16TEColorExpansion( DrawablePtr pDraw, GCPtr pGC, @@ -1074,7 +1074,7 @@ XAAPolyText16TEColorExpansion( unsigned short *chars ); -void +extern _X_EXPORT void XAAImageText8TEColorExpansion( DrawablePtr pDraw, GCPtr pGC, @@ -1083,7 +1083,7 @@ XAAImageText8TEColorExpansion( char *chars ); -void +extern _X_EXPORT void XAAImageText16TEColorExpansion( DrawablePtr pDraw, GCPtr pGC, @@ -1092,7 +1092,7 @@ XAAImageText16TEColorExpansion( unsigned short *chars ); -void +extern _X_EXPORT void XAAImageGlyphBltTEColorExpansion( DrawablePtr pDrawable, GCPtr pGC, @@ -1102,7 +1102,7 @@ XAAImageGlyphBltTEColorExpansion( pointer pglyphBase ); -void +extern _X_EXPORT void XAAPolyGlyphBltTEColorExpansion( DrawablePtr pDrawable, GCPtr pGC, @@ -1113,7 +1113,7 @@ XAAPolyGlyphBltTEColorExpansion( ); -int +extern _X_EXPORT int XAAPolyText8NonTEColorExpansion( DrawablePtr pDraw, GCPtr pGC, @@ -1122,7 +1122,7 @@ XAAPolyText8NonTEColorExpansion( char *chars ); -int +extern _X_EXPORT int XAAPolyText16NonTEColorExpansion( DrawablePtr pDraw, GCPtr pGC, @@ -1131,7 +1131,7 @@ XAAPolyText16NonTEColorExpansion( unsigned short *chars ); -void +extern _X_EXPORT void XAAImageText8NonTEColorExpansion( DrawablePtr pDraw, GCPtr pGC, @@ -1140,7 +1140,7 @@ XAAImageText8NonTEColorExpansion( char *chars ); -void +extern _X_EXPORT void XAAImageText16NonTEColorExpansion( DrawablePtr pDraw, GCPtr pGC, @@ -1149,7 +1149,7 @@ XAAImageText16NonTEColorExpansion( unsigned short *chars ); -void +extern _X_EXPORT void XAAImageGlyphBltNonTEColorExpansion( DrawablePtr pDrawable, GCPtr pGC, @@ -1159,7 +1159,7 @@ XAAImageGlyphBltNonTEColorExpansion( pointer pglyphBase ); -void +extern _X_EXPORT void XAAPolyGlyphBltNonTEColorExpansion( DrawablePtr pDrawable, GCPtr pGC, @@ -1170,7 +1170,7 @@ XAAPolyGlyphBltNonTEColorExpansion( ); -void XAANonTEGlyphRenderer( +extern _X_EXPORT void XAANonTEGlyphRenderer( ScrnInfoPtr pScrn, int x, int y, int n, NonTEGlyphPtr glyphs, @@ -1179,7 +1179,7 @@ void XAANonTEGlyphRenderer( unsigned int planemask ); -void +extern _X_EXPORT void XAAFillSolidSpans( ScrnInfoPtr pScrn, int fg, int rop, @@ -1189,7 +1189,7 @@ XAAFillSolidSpans( int *pwidth, int fSorted ); -void +extern _X_EXPORT void XAAFillMono8x8PatternSpans( ScrnInfoPtr pScrn, int fg, int bg, int rop, @@ -1201,7 +1201,7 @@ XAAFillMono8x8PatternSpans( int xorg, int yorg ); -void +extern _X_EXPORT void XAAFillMono8x8PatternSpansScreenOrigin( ScrnInfoPtr pScrn, int fg, int bg, int rop, @@ -1213,7 +1213,7 @@ XAAFillMono8x8PatternSpansScreenOrigin( int xorg, int yorg ); -void +extern _X_EXPORT void XAAFillColor8x8PatternSpansScreenOrigin( ScrnInfoPtr pScrn, int rop, @@ -1225,7 +1225,7 @@ XAAFillColor8x8PatternSpansScreenOrigin( int xorigin, int yorigin ); -void +extern _X_EXPORT void XAAFillColor8x8PatternSpans( ScrnInfoPtr pScrn, int rop, @@ -1237,7 +1237,7 @@ XAAFillColor8x8PatternSpans( int xorigin, int yorigin ); -void +extern _X_EXPORT void XAAFillCacheBltSpans( ScrnInfoPtr pScrn, int rop, @@ -1250,7 +1250,7 @@ XAAFillCacheBltSpans( int xorg, int yorg ); -void +extern _X_EXPORT void XAAFillCacheExpandSpans( ScrnInfoPtr pScrn, int fg, int bg, int rop, @@ -1263,7 +1263,7 @@ XAAFillCacheExpandSpans( PixmapPtr pPix ); -void +extern _X_EXPORT void XAAFillSpans( DrawablePtr pDrawable, GC *pGC, @@ -1274,14 +1274,14 @@ XAAFillSpans( ); -void +extern _X_EXPORT void XAAInitPixmapCache( ScreenPtr pScreen, RegionPtr areas, pointer data ); -void +extern _X_EXPORT void XAAWriteBitmapToCache( ScrnInfoPtr pScrn, int x, int y, int w, int h, @@ -1290,7 +1290,7 @@ XAAWriteBitmapToCache( int fg, int bg ); -void +extern _X_EXPORT void XAAWriteBitmapToCacheLinear( ScrnInfoPtr pScrn, int x, int y, int w, int h, @@ -1299,7 +1299,7 @@ XAAWriteBitmapToCacheLinear( int fg, int bg ); -void +extern _X_EXPORT void XAAWritePixmapToCache( ScrnInfoPtr pScrn, int x, int y, int w, int h, @@ -1308,7 +1308,7 @@ XAAWritePixmapToCache( int bpp, int depth ); -void +extern _X_EXPORT void XAAWritePixmapToCacheLinear( ScrnInfoPtr pScrn, int x, int y, int w, int h, @@ -1317,26 +1317,26 @@ XAAWritePixmapToCacheLinear( int bpp, int depth ); -void +extern _X_EXPORT void XAASolidHorVertLineAsRects( ScrnInfoPtr pScrn, int x, int y, int len, int dir ); -void +extern _X_EXPORT void XAASolidHorVertLineAsTwoPoint( ScrnInfoPtr pScrn, int x, int y, int len, int dir ); -void +extern _X_EXPORT void XAASolidHorVertLineAsBresenham( ScrnInfoPtr pScrn, int x, int y, int len, int dir ); -void +extern _X_EXPORT void XAAPolyRectangleThinSolid( DrawablePtr pDrawable, GCPtr pGC, @@ -1345,7 +1345,7 @@ XAAPolyRectangleThinSolid( ); -void +extern _X_EXPORT void XAAPolylinesWideSolid ( DrawablePtr pDrawable, GCPtr pGC, @@ -1354,7 +1354,7 @@ XAAPolylinesWideSolid ( DDXPointPtr pPts ); -void +extern _X_EXPORT void XAAFillPolygonSolid( DrawablePtr pDrawable, GCPtr pGC, @@ -1364,7 +1364,7 @@ XAAFillPolygonSolid( DDXPointPtr ptsIn ); -void +extern _X_EXPORT void XAAFillPolygonStippled( DrawablePtr pDrawable, GCPtr pGC, @@ -1375,7 +1375,7 @@ XAAFillPolygonStippled( ); -void +extern _X_EXPORT void XAAFillPolygonTiled( DrawablePtr pDrawable, GCPtr pGC, @@ -1386,7 +1386,7 @@ XAAFillPolygonTiled( ); -int +extern _X_EXPORT int XAAIsEasyPolygon( DDXPointPtr ptsIn, int count, @@ -1397,7 +1397,7 @@ XAAIsEasyPolygon( int shape ); -void +extern _X_EXPORT void XAAFillPolygonHelper( ScrnInfoPtr pScrn, DDXPointPtr ptsIn, @@ -1413,7 +1413,7 @@ XAAFillPolygonHelper( XAACacheInfoPtr pCache ); -void +extern _X_EXPORT void XAAPolySegment( DrawablePtr pDrawable, GCPtr pGC, @@ -1421,7 +1421,7 @@ XAAPolySegment( xSegment *pSeg ); -void +extern _X_EXPORT void XAAPolyLines( DrawablePtr pDrawable, GCPtr pGC, @@ -1430,7 +1430,7 @@ XAAPolyLines( DDXPointPtr pptInit ); -void +extern _X_EXPORT void XAAPolySegmentDashed( DrawablePtr pDrawable, GCPtr pGC, @@ -1438,7 +1438,7 @@ XAAPolySegmentDashed( xSegment *pSeg ); -void +extern _X_EXPORT void XAAPolyLinesDashed( DrawablePtr pDrawable, GCPtr pGC, @@ -1448,44 +1448,44 @@ XAAPolyLinesDashed( ); -void +extern _X_EXPORT void XAAWriteMono8x8PatternToCache(ScrnInfoPtr pScrn, XAACacheInfoPtr pCache); -void +extern _X_EXPORT void XAAWriteColor8x8PatternToCache( ScrnInfoPtr pScrn, PixmapPtr pPix, XAACacheInfoPtr pCache ); -void +extern _X_EXPORT void XAARotateMonoPattern( int *pat0, int *pat1, int xoffset, int yoffset, Bool msbfirst ); -void XAAComputeDash(GCPtr pGC); +extern _X_EXPORT void XAAComputeDash(GCPtr pGC); -void XAAMoveDWORDS_FixedBase( +extern _X_EXPORT void XAAMoveDWORDS_FixedBase( register CARD32* dest, register CARD32* src, register int dwords ); -void XAAMoveDWORDS_FixedSrc( +extern _X_EXPORT void XAAMoveDWORDS_FixedSrc( register CARD32* dest, register CARD32* src, register int dwords ); -void XAAMoveDWORDS( +extern _X_EXPORT void XAAMoveDWORDS( register CARD32* dest, register CARD32* src, register int dwords ); -int +extern _X_EXPORT int XAAGetRectClipBoxes( GCPtr pGC, BoxPtr pboxClippedBase, @@ -1493,54 +1493,54 @@ XAAGetRectClipBoxes( xRectangle *prectInit ); -void +extern _X_EXPORT void XAASetupOverlay8_32Planar(ScreenPtr); -void +extern _X_EXPORT void XAAPolyFillArcSolid(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc *parcs); -XAACacheInfoPtr +extern _X_EXPORT XAACacheInfoPtr XAACacheTile(ScrnInfoPtr Scrn, PixmapPtr pPix); -XAACacheInfoPtr +extern _X_EXPORT XAACacheInfoPtr XAACacheMonoStipple(ScrnInfoPtr Scrn, PixmapPtr pPix); -XAACacheInfoPtr +extern _X_EXPORT XAACacheInfoPtr XAACachePlanarMonoStipple(ScrnInfoPtr Scrn, PixmapPtr pPix); typedef XAACacheInfoPtr (*XAACachePlanarMonoStippleProc)(ScrnInfoPtr, PixmapPtr); -XAACachePlanarMonoStippleProc XAAGetCachePlanarMonoStipple(void); +extern _X_EXPORT XAACachePlanarMonoStippleProc XAAGetCachePlanarMonoStipple(void); -XAACacheInfoPtr +extern _X_EXPORT XAACacheInfoPtr XAACacheStipple(ScrnInfoPtr Scrn, PixmapPtr pPix, int fg, int bg); -XAACacheInfoPtr +extern _X_EXPORT XAACacheInfoPtr XAACacheMono8x8Pattern(ScrnInfoPtr Scrn, int pat0, int pat1); -XAACacheInfoPtr +extern _X_EXPORT XAACacheInfoPtr XAACacheColor8x8Pattern(ScrnInfoPtr Scrn, PixmapPtr pPix, int fg, int bg); -void +extern _X_EXPORT void XAATileCache(ScrnInfoPtr pScrn, XAACacheInfoPtr pCache, int w, int h); -void XAAClosePixmapCache(ScreenPtr pScreen); +extern _X_EXPORT void XAAClosePixmapCache(ScreenPtr pScreen); void XAAInvalidatePixmapCache(ScreenPtr pScreen); -Bool XAACheckStippleReducibility(PixmapPtr pPixmap); -Bool XAACheckTileReducibility(PixmapPtr pPixmap, Bool checkMono); +extern _X_EXPORT Bool XAACheckStippleReducibility(PixmapPtr pPixmap); +extern _X_EXPORT Bool XAACheckTileReducibility(PixmapPtr pPixmap, Bool checkMono); -int XAAStippledFillChooser(GCPtr pGC); -int XAAOpaqueStippledFillChooser(GCPtr pGC); -int XAATiledFillChooser(GCPtr pGC); +extern _X_EXPORT int XAAStippledFillChooser(GCPtr pGC); +extern _X_EXPORT int XAAOpaqueStippledFillChooser(GCPtr pGC); +extern _X_EXPORT int XAATiledFillChooser(GCPtr pGC); -void XAAMoveInOffscreenPixmaps(ScreenPtr pScreen); -void XAAMoveOutOffscreenPixmaps(ScreenPtr pScreen); -void XAARemoveAreaCallback(FBAreaPtr area); -void XAAMoveOutOffscreenPixmap(PixmapPtr pPix); -Bool XAAInitStateWrap(ScreenPtr pScreen, XAAInfoRecPtr infoRec); +extern _X_EXPORT void XAAMoveInOffscreenPixmaps(ScreenPtr pScreen); +extern _X_EXPORT void XAAMoveOutOffscreenPixmaps(ScreenPtr pScreen); +extern _X_EXPORT void XAARemoveAreaCallback(FBAreaPtr area); +extern _X_EXPORT void XAAMoveOutOffscreenPixmap(PixmapPtr pPix); +extern _X_EXPORT Bool XAAInitStateWrap(ScreenPtr pScreen, XAAInfoRecPtr infoRec); #ifdef RENDER -void +extern _X_EXPORT void XAAComposite (CARD8 op, PicturePtr pSrc, PicturePtr pMask, @@ -1555,7 +1555,7 @@ XAAComposite (CARD8 op, CARD16 height); -Bool +extern _X_EXPORT Bool XAADoComposite (CARD8 op, PicturePtr pSrc, PicturePtr pMask, @@ -1570,7 +1570,7 @@ XAADoComposite (CARD8 op, CARD16 height); -void +extern _X_EXPORT void XAAGlyphs (CARD8 op, PicturePtr pSrc, PicturePtr pDst, @@ -1581,7 +1581,7 @@ XAAGlyphs (CARD8 op, GlyphListPtr list, GlyphPtr *glyphs); -Bool +extern _X_EXPORT Bool XAADoGlyphs (CARD8 op, PicturePtr pSrc, PicturePtr pDst, @@ -1595,7 +1595,7 @@ XAADoGlyphs (CARD8 op, /* helpers */ -void +extern _X_EXPORT void XAA_888_plus_PICT_a8_to_8888 ( CARD32 color, CARD8 *alphaPtr, /* in bytes */ @@ -1606,7 +1606,7 @@ XAA_888_plus_PICT_a8_to_8888 ( int height ); -Bool +extern _X_EXPORT Bool XAAGetRGBAFromPixel( CARD32 pixel, CARD16 *red, @@ -1617,7 +1617,7 @@ XAAGetRGBAFromPixel( ); -Bool +extern _X_EXPORT Bool XAAGetPixelFromRGBA ( CARD32 *pixel, CARD16 red, @@ -1630,18 +1630,18 @@ XAAGetPixelFromRGBA ( #endif /* XXX should be static */ -extern GCOps XAAFallbackOps; -extern GCOps *XAAGetFallbackOps(void); -extern GCFuncs XAAGCFuncs; -extern DevPrivateKey XAAGetScreenKey(void); -extern DevPrivateKey XAAGetGCKey(void); -extern DevPrivateKey XAAGetPixmapKey(void); +extern _X_EXPORT GCOps XAAFallbackOps; +extern _X_EXPORT GCOps *XAAGetFallbackOps(void); +extern _X_EXPORT GCFuncs XAAGCFuncs; +extern _X_EXPORT DevPrivateKey XAAGetScreenKey(void); +extern _X_EXPORT DevPrivateKey XAAGetGCKey(void); +extern _X_EXPORT DevPrivateKey XAAGetPixmapKey(void); -extern unsigned int XAAShiftMasks[32]; +extern _X_EXPORT unsigned int XAAShiftMasks[32]; -extern unsigned int byte_expand3[256], byte_reversed_expand3[256]; +extern _X_EXPORT unsigned int byte_expand3[256], byte_reversed_expand3[256]; -CARD32 XAAReverseBitOrder(CARD32 data); +extern _X_EXPORT CARD32 XAAReverseBitOrder(CARD32 data); #define GET_XAASCREENPTR_FROM_SCREEN(pScreen)\ dixLookupPrivate(&(pScreen)->devPrivates, XAAGetScreenKey()) diff --git a/hw/xfree86/xaa/xaarop.h b/hw/xfree86/xaa/xaarop.h index 548993c49..edfd75aec 100644 --- a/hw/xfree86/xaa/xaarop.h +++ b/hw/xfree86/xaa/xaarop.h @@ -294,18 +294,18 @@ #define NO_SRC_ROP(rop) \ ((rop == GXnoop) || (rop == GXset) || (rop == GXclear) || (rop == GXinvert)) -int XAAHelpSolidROP(ScrnInfoPtr pScrn, int *fg, int pm, int *rop); -int XAAHelpPatternROP(ScrnInfoPtr pScrn, int *fg, int *bg, int pm, int *rop); +extern _X_EXPORT int XAAHelpSolidROP(ScrnInfoPtr pScrn, int *fg, int pm, int *rop); +extern _X_EXPORT int XAAHelpPatternROP(ScrnInfoPtr pScrn, int *fg, int *bg, int pm, int *rop); /* XXX These four should be static, but it breaks the 6.7.0 ABI. */ -extern int XAACopyROP[16]; -extern int XAACopyROP_PM[16]; -extern int XAAPatternROP[16]; -extern int XAAPatternROP_PM[16]; +extern _X_EXPORT int XAACopyROP[16]; +extern _X_EXPORT int XAACopyROP_PM[16]; +extern _X_EXPORT int XAAPatternROP[16]; +extern _X_EXPORT int XAAPatternROP_PM[16]; -extern int XAAGetCopyROP(int i); -extern int XAAGetCopyROP_PM(int i); -extern int XAAGetPatternROP(int i); -extern int XAAGetPatternROP_PM(int i); +extern _X_EXPORT int XAAGetCopyROP(int i); +extern _X_EXPORT int XAAGetCopyROP_PM(int i); +extern _X_EXPORT int XAAGetPatternROP(int i); +extern _X_EXPORT int XAAGetPatternROP_PM(int i); #endif /* _XAAROP_H */ diff --git a/hw/xfree86/xf8_16bpp/cfb8_16.h b/hw/xfree86/xf8_16bpp/cfb8_16.h index 3a3a68da7..d847a60c1 100644 --- a/hw/xfree86/xf8_16bpp/cfb8_16.h +++ b/hw/xfree86/xf8_16bpp/cfb8_16.h @@ -28,7 +28,7 @@ /* this has to stay misnamed for ABI reasons */ -_X_EXPORT Bool +extern _X_EXPORT Bool cfb8_16ScreenInit(ScreenPtr pScreen, pointer pbits16, pointer pbits8, int xsize, int ysize, int dpix, int dpiy, int width16, int width8); diff --git a/hw/xfree86/xf8_16bpp/xf8_16module.c b/hw/xfree86/xf8_16bpp/xf8_16module.c index 1a739b040..dd4f011b1 100644 --- a/hw/xfree86/xf8_16bpp/xf8_16module.c +++ b/hw/xfree86/xf8_16bpp/xf8_16module.c @@ -34,7 +34,7 @@ #include "fboverlay.h" #include "cfb8_16.h" -_X_EXPORT Bool +Bool cfb8_16ScreenInit(ScreenPtr pScreen, pointer pbits16, pointer pbits8, int xsize, int ysize, int dpix, int dpiy, int width16, int width8) |