hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-10-04 22:36:10 +00:00
Code Issues Projects Releases Wiki Activity

Rework symbol visibility for easier maintenance

Browse source 
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).
This commit is contained in:
Paulo Cesar Pereira de Andrade 2008-12-03 05:43:34 -02:00
commit 49f77fff14
528 changed files with 5964 additions and 5880 deletions
Download patch file Download diff file Expand all files Collapse all files

24
hw/xfree86/os-support/bsd/alpha_video.c
View file

@ -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;

6
hw/xfree86/os-support/bsd/arm_video.c
View file

@ -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)

8
hw/xfree86/os-support/bsd/bsd_VTsw.c
View file

@ -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)

2
hw/xfree86/os-support/bsd/bsd_apm.c
View file

@ -108,7 +108,7 @@ bsdPMConfirmEventToOs(int fd, pmEvent event)
}
}
_X_EXPORT PMClose
PMClose
xf86OSPMOpen(void)
{
int fd;

2
hw/xfree86/os-support/bsd/bsd_bell.c
View file

@ -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

8
hw/xfree86/os-support/bsd/bsd_init.c
View file

@ -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)

2
hw/xfree86/os-support/bsd/bsd_kmod.c
View file

@ -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;

2
hw/xfree86/os-support/bsd/bsd_kqueue_apm.c
View file

@ -153,7 +153,7 @@ bsdPMConfirmEventToOs(int dummyfd, pmEvent event)
}
}
_X_EXPORT PMClose
PMClose
xf86OSPMOpen(void)
{
int kq;

10
hw/xfree86/os-support/bsd/i386_video.c
View file

@ -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)

8
hw/xfree86/os-support/bsd/ppc_video.c
View file

@ -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)

2
hw/xfree86/os-support/bsd/sparc64_video.c
View file

@ -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)
{

6
hw/xfree86/os-support/bus/Pci.c
View file

@ -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;

36
hw/xfree86/os-support/bus/Sbus.c
View file

@ -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;

2
hw/xfree86/os-support/bus/bsd_pci.c
View file

@ -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)
{

4
hw/xfree86/os-support/bus/linuxPci.c
View file

@ -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;

10
hw/xfree86/os-support/bus/xf86Pci.h
View file

@ -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 */

2
hw/xfree86/os-support/hurd/hurd_bell.c
View file

@ -30,7 +30,7 @@
#include "xf86.h"
#include "xf86Priv.h"
_X_EXPORT void
void
xf86OSRingBell(int loudness, int pitch, int duration)
{
return;

8
hw/xfree86/os-support/hurd/hurd_init.c
View file

@ -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 );

14
hw/xfree86/os-support/hurd/hurd_video.c
View file

@ -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;

12
hw/xfree86/os-support/linux/int10/linux.c
View file

@ -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)

4
hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c
View file

@ -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);

20
hw/xfree86/os-support/linux/lnx_agp.c
View file

@ -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;

2
hw/xfree86/os-support/linux/lnx_apm.c
View file

@ -133,7 +133,7 @@ lnxPMConfirmEventToOs(int fd, pmEvent event)
#endif // HAVE_APM
_X_EXPORT PMClose
PMClose
xf86OSPMOpen(void)
{
PMClose ret = NULL;

12
hw/xfree86/os-support/linux/lnx_axp.c
View file

@ -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;

2
hw/xfree86/os-support/linux/lnx_bell.c
View file

@ -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)

8
hw/xfree86/os-support/linux/lnx_init.c
View file

@ -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");

2
hw/xfree86/os-support/linux/lnx_kmod.c
View file

@ -36,7 +36,7 @@
* Return:
* 0 for failure, 1 for success
*/
_X_EXPORT int
int
xf86LoadKernelModule(const char *modName)
{
char mpPath[MAX_PATH] = "";

2
hw/xfree86/os-support/linux/lnx_pci.c
View file

@ -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;

24
hw/xfree86/os-support/linux/lnx_video.c
View file

@ -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__ */

4
hw/xfree86/os-support/misc/BUSmemcpy.c
View file

@ -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))

2
hw/xfree86/os-support/misc/Delay.c
View file

@ -9,7 +9,7 @@
#include <time.h>
_X_EXPORT void
void
xf86UDelay(long usec)
{
#if 0

8
hw/xfree86/os-support/misc/SlowBcopy.c
View file

@ -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;

8
hw/xfree86/os-support/sco/VTsw_sco.c
View file

@ -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();

8
hw/xfree86/os-support/sco/sco_init.c
View file

@ -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");

4
hw/xfree86/os-support/sco/sco_iop.c
View file

@ -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)

6
hw/xfree86/os-support/shared/VTsw_noop.c
View file

@ -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);

8
hw/xfree86/os-support/shared/VTsw_usl.c
View file

@ -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;

20
hw/xfree86/os-support/shared/agp_noop.c
View file

@ -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;

2
hw/xfree86/os-support/shared/bios_devmem.c
View file

@ -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)
{

2
hw/xfree86/os-support/shared/bios_mmap.c
View file

@ -40,7 +40,7 @@
*/
#ifndef __alpha__
_X_EXPORT int
int
xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,
int Len)
{

12
hw/xfree86/os-support/shared/ia64Pci.c
View file

@ -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;

4
hw/xfree86/os-support/shared/ioperm_noop.c
View file

@ -35,13 +35,13 @@
#include "xf86Priv.h"
#include "xf86_OSlib.h"
_X_EXPORT Bool
Bool
xf86EnableIO()
{
return TRUE;
}
_X_EXPORT void
void
xf86DisableIO()
{
return;

2
hw/xfree86/os-support/shared/kmod_noop.c
View file

@ -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 */

2
hw/xfree86/os-support/shared/pm_noop.c
View file

@ -38,7 +38,7 @@
#define XF86_OS_PRIVS
#include "xf86_OSproc.h"
_X_EXPORT PMClose
PMClose
xf86OSPMOpen(void)
{
return NULL;

26
hw/xfree86/os-support/shared/posix_tty.c
View file

@ -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;

12
hw/xfree86/os-support/shared/sigio.c
View file

@ -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;

12
hw/xfree86/os-support/shared/sigiostubs.c
View file

@ -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;

2
hw/xfree86/os-support/shared/stdResource.c
View file

@ -48,7 +48,7 @@
#define xf86StdAccResFromOS xf86AccResFromOS
#endif
_X_EXPORT resPtr
resPtr
xf86StdAccResFromOS(resPtr ret)
{
resRange range;

14
hw/xfree86/os-support/shared/vidmem.c
View file

@ -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)
{

20
hw/xfree86/os-support/solaris/sun_agp.c
View file

@ -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;

2
hw/xfree86/os-support/solaris/sun_apm.c
View file

@ -199,7 +199,7 @@ sunPMConfirmEventToOs(int fd, pmEvent event)
}
}
_X_EXPORT PMClose
PMClose
xf86OSPMOpen(void)
{
int fd;

2
hw/xfree86/os-support/solaris/sun_bell.c
View file

@ -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];

8
hw/xfree86/os-support/solaris/sun_init.c
View file

@ -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");

6
hw/xfree86/os-support/solaris/sun_vid.c
View file

@ -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)

8
hw/xfree86/os-support/sysv/sysv_init.c
View file

@ -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");

4
hw/xfree86/os-support/sysv/sysv_video.c
View file

@ -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)

122
hw/xfree86/os-support/xf86_OSproc.h
View file

@ -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 */