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

Export symbols required by the vesa and fbdev drivers. 

This is a minimal set of patches, to have an usable X Server when
compiling it with symbols hidden by default.
This commit is contained in:
Paulo Cesar Pereira de Andrade 2008-11-27 05:34:14 -02:00
parent 74e2669103
commit 74bc792e18
12 changed files with 91 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xfree86/ddc/ddcProperty.c
View File

@ -108,7 +108,7 @@ addRootWindowProperties(ScrnInfoPtr pScrn, xf86MonPtr DDC)
} }
} }
Bool _X_EXPORT Bool
xf86SetDDCproperties(ScrnInfoPtr pScrn, xf86MonPtr DDC) xf86SetDDCproperties(ScrnInfoPtr pScrn, xf86MonPtr DDC)
{ {
if (!pScrn || !pScrn->monitor || !DDC) if (!pScrn || !pScrn->monitor || !DDC)

2
hw/xfree86/ddc/interpret_edid.c
View File

@ -132,7 +132,7 @@ handle_edid_quirks(xf86MonPtr m)
} }
} }
xf86MonPtr _X_EXPORT xf86MonPtr
xf86InterpretEDID(int scrnIndex, Uchar *block) xf86InterpretEDID(int scrnIndex, Uchar *block)
{ {
xf86MonPtr m; xf86MonPtr m;

2
hw/xfree86/ddc/print_edid.c
View File

@ -460,7 +460,7 @@ print_number_sections(int scrnIndex, int num)
num); num);
} }
xf86MonPtr _X_EXPORT xf86MonPtr
xf86PrintEDID(xf86MonPtr m) xf86PrintEDID(xf86MonPtr m)
{ {
CARD16 i, j, n; CARD16 i, j, n;

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

@ -431,7 +431,7 @@ fbdev_open(int scrnIndex, char *dev, char** namep)
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
Bool _X_EXPORT Bool
fbdevHWProbe(struct pci_device * pPci, char *device,char **namep) fbdevHWProbe(struct pci_device * pPci, char *device,char **namep)
{ {
int fd; int fd;
@ -447,7 +447,7 @@ fbdevHWProbe(struct pci_device * pPci, char *device,char **namep)
return TRUE; return TRUE;
} }
Bool _X_EXPORT Bool
fbdevHWInit(ScrnInfoPtr pScrn, struct pci_device * pPci, char *device) fbdevHWInit(ScrnInfoPtr pScrn, struct pci_device * pPci, char *device)
{ {
fbdevHWPtr fPtr; fbdevHWPtr fPtr;
@ -495,14 +495,14 @@ fbdevHWInit(ScrnInfoPtr pScrn, struct pci_device * pPci, char *device)
return TRUE; return TRUE;
} }
char* _X_EXPORT char*
fbdevHWGetName(ScrnInfoPtr pScrn) fbdevHWGetName(ScrnInfoPtr pScrn)
{ {
fbdevHWPtr fPtr = FBDEVHWPTR(pScrn); fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
return fPtr->fix.id; return fPtr->fix.id;
} }
int _X_EXPORT int
fbdevHWGetDepth(ScrnInfoPtr pScrn, int *fbbpp) fbdevHWGetDepth(ScrnInfoPtr pScrn, int *fbbpp)
{ {
fbdevHWPtr fPtr = FBDEVHWPTR(pScrn); fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
@ -518,7 +518,7 @@ fbdevHWGetDepth(ScrnInfoPtr pScrn, int *fbbpp)
return fPtr->var.bits_per_pixel; return fPtr->var.bits_per_pixel;
} }
int _X_EXPORT int
fbdevHWGetLineLength(ScrnInfoPtr pScrn) fbdevHWGetLineLength(ScrnInfoPtr pScrn)
{ {
fbdevHWPtr fPtr = FBDEVHWPTR(pScrn); fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
@ -529,14 +529,14 @@ fbdevHWGetLineLength(ScrnInfoPtr pScrn)
return fPtr->var.xres_virtual*fPtr->var.bits_per_pixel/8; return fPtr->var.xres_virtual*fPtr->var.bits_per_pixel/8;
} }
int _X_EXPORT int
fbdevHWGetType(ScrnInfoPtr pScrn) fbdevHWGetType(ScrnInfoPtr pScrn)
{ {
fbdevHWPtr fPtr = FBDEVHWPTR(pScrn); fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
return fPtr->fix.type; return fPtr->fix.type;
} }
int _X_EXPORT int
fbdevHWGetVidmem(ScrnInfoPtr pScrn) fbdevHWGetVidmem(ScrnInfoPtr pScrn)
{ {
fbdevHWPtr fPtr = FBDEVHWPTR(pScrn); fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
@ -587,7 +587,7 @@ fbdevHWSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode, Bool check)
return TRUE; return TRUE;
} }
void _X_EXPORT void
fbdevHWSetVideoModes(ScrnInfoPtr pScrn) fbdevHWSetVideoModes(ScrnInfoPtr pScrn)
{ {
char **modename; char **modename;
@ -645,7 +645,7 @@ fbdevHWGetBuildinMode(ScrnInfoPtr pScrn)
return &fPtr->buildin; return &fPtr->buildin;
} }
void _X_EXPORT void
fbdevHWUseBuildinMode(ScrnInfoPtr pScrn) fbdevHWUseBuildinMode(ScrnInfoPtr pScrn)
{ {
fbdevHWPtr fPtr = FBDEVHWPTR(pScrn); fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
@ -671,7 +671,7 @@ calculateFbmem_len(fbdevHWPtr fPtr)
} }
void* _X_EXPORT void*
fbdevHWMapVidmem(ScrnInfoPtr pScrn) fbdevHWMapVidmem(ScrnInfoPtr pScrn)
{ {
fbdevHWPtr fPtr = FBDEVHWPTR(pScrn); fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
@ -697,7 +697,7 @@ fbdevHWMapVidmem(ScrnInfoPtr pScrn)
return fPtr->fbmem; return fPtr->fbmem;
} }
int _X_EXPORT int
fbdevHWLinearOffset(ScrnInfoPtr pScrn) fbdevHWLinearOffset(ScrnInfoPtr pScrn)
{ {
fbdevHWPtr fPtr = FBDEVHWPTR(pScrn); fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
@ -706,7 +706,7 @@ fbdevHWLinearOffset(ScrnInfoPtr pScrn)
return fPtr->fboff; return fPtr->fboff;
} }
Bool _X_EXPORT Bool
fbdevHWUnmapVidmem(ScrnInfoPtr pScrn) fbdevHWUnmapVidmem(ScrnInfoPtr pScrn)
{ {
fbdevHWPtr fPtr = FBDEVHWPTR(pScrn); fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
@ -772,7 +772,7 @@ fbdevHWUnmapMMIO(ScrnInfoPtr pScrn)
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
Bool _X_EXPORT Bool
fbdevHWModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode) fbdevHWModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
{ {
fbdevHWPtr fPtr = FBDEVHWPTR(pScrn); fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
@ -815,7 +815,7 @@ fbdevHWModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
/* video mode save/restore */ /* video mode save/restore */
/* TODO: colormap */ /* TODO: colormap */
void _X_EXPORT void
fbdevHWSave(ScrnInfoPtr pScrn) fbdevHWSave(ScrnInfoPtr pScrn)
{ {
fbdevHWPtr fPtr = FBDEVHWPTR(pScrn); fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
@ -826,7 +826,7 @@ fbdevHWSave(ScrnInfoPtr pScrn)
"FBIOGET_VSCREENINFO: %s\n", strerror(errno)); "FBIOGET_VSCREENINFO: %s\n", strerror(errno));
} }
void _X_EXPORT void
fbdevHWRestore(ScrnInfoPtr pScrn) fbdevHWRestore(ScrnInfoPtr pScrn)
{ {
fbdevHWPtr fPtr = FBDEVHWPTR(pScrn); fbdevHWPtr fPtr = FBDEVHWPTR(pScrn);
@ -898,7 +898,7 @@ fbdevHWSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
return TRUE; return TRUE;
} }
void _X_EXPORT void
fbdevHWAdjustFrame(int scrnIndex, int x, int y, int flags) fbdevHWAdjustFrame(int scrnIndex, int x, int y, int flags)
{ {
ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
@ -969,7 +969,7 @@ fbdevHWDPMSSet(ScrnInfoPtr pScrn, int mode, int flags)
"FBIOBLANK: %s\n", strerror(errno)); "FBIOBLANK: %s\n", strerror(errno));
} }
Bool _X_EXPORT Bool
fbdevHWSaveScreen(ScreenPtr pScreen, int mode) fbdevHWSaveScreen(ScreenPtr pScreen, int mode)
{ {
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
@ -991,26 +991,26 @@ fbdevHWSaveScreen(ScreenPtr pScreen, int mode)
return TRUE; return TRUE;
} }
xf86SwitchModeProc * _X_EXPORT xf86SwitchModeProc *
fbdevHWSwitchModeWeak(void) { return fbdevHWSwitchMode; } fbdevHWSwitchModeWeak(void) { return fbdevHWSwitchMode; }
xf86AdjustFrameProc * _X_EXPORT xf86AdjustFrameProc *
fbdevHWAdjustFrameWeak(void) { return fbdevHWAdjustFrame; } fbdevHWAdjustFrameWeak(void) { return fbdevHWAdjustFrame; }
xf86EnterVTProc * _X_EXPORT xf86EnterVTProc *
fbdevHWEnterVTWeak(void) { return fbdevHWEnterVT; } fbdevHWEnterVTWeak(void) { return fbdevHWEnterVT; }
xf86LeaveVTProc * _X_EXPORT xf86LeaveVTProc *
fbdevHWLeaveVTWeak(void) { return fbdevHWLeaveVT; } fbdevHWLeaveVTWeak(void) { return fbdevHWLeaveVT; }
xf86ValidModeProc * _X_EXPORT xf86ValidModeProc *
fbdevHWValidModeWeak(void) { return fbdevHWValidMode; } fbdevHWValidModeWeak(void) { return fbdevHWValidMode; }
xf86DPMSSetProc * _X_EXPORT xf86DPMSSetProc *
fbdevHWDPMSSetWeak(void) { return fbdevHWDPMSSet; } fbdevHWDPMSSetWeak(void) { return fbdevHWDPMSSet; }
xf86LoadPaletteProc * _X_EXPORT xf86LoadPaletteProc *
fbdevHWLoadPaletteWeak(void) { return fbdevHWLoadPalette; } fbdevHWLoadPaletteWeak(void) { return fbdevHWLoadPalette; }
SaveScreenProcPtr _X_EXPORT SaveScreenProcPtr
fbdevHWSaveScreenWeak(void) { return fbdevHWSaveScreen; } fbdevHWSaveScreenWeak(void) { return fbdevHWSaveScreen; }

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

@ -21,50 +21,50 @@ fbdevHWFreeRec(ScrnInfoPtr pScrn)
} }
Bool _X_EXPORT Bool
fbdevHWProbe(struct pci_device *pPci, char *device, char **namep) fbdevHWProbe(struct pci_device *pPci, char *device, char **namep)
{ {
return FALSE; return FALSE;
} }
Bool _X_EXPORT Bool
fbdevHWInit(ScrnInfoPtr pScrn, struct pci_device *pPci, char *device) fbdevHWInit(ScrnInfoPtr pScrn, struct pci_device *pPci, char *device)
{ {
xf86Msg(X_ERROR, "fbdevhw is not available on this platform\n"); xf86Msg(X_ERROR, "fbdevhw is not available on this platform\n");
return FALSE; return FALSE;
} }
char* _X_EXPORT char*
fbdevHWGetName(ScrnInfoPtr pScrn) fbdevHWGetName(ScrnInfoPtr pScrn)
{ {
return NULL; return NULL;
} }
int _X_EXPORT int
fbdevHWGetDepth(ScrnInfoPtr pScrn, int *fbbpp) fbdevHWGetDepth(ScrnInfoPtr pScrn, int *fbbpp)
{ {
return -1; return -1;
} }
int _X_EXPORT int
fbdevHWGetLineLength(ScrnInfoPtr pScrn) fbdevHWGetLineLength(ScrnInfoPtr pScrn)
{ {
return -1; /* Should cause something spectacular... */ return -1; /* Should cause something spectacular... */
} }
int _X_EXPORT int
fbdevHWGetType(ScrnInfoPtr pScrn) fbdevHWGetType(ScrnInfoPtr pScrn)
{ {
return -1; return -1;
} }
int _X_EXPORT int
fbdevHWGetVidmem(ScrnInfoPtr pScrn) fbdevHWGetVidmem(ScrnInfoPtr pScrn)
{ {
return -1; return -1;
} }
void _X_EXPORT void
fbdevHWSetVideoModes(ScrnInfoPtr pScrn) fbdevHWSetVideoModes(ScrnInfoPtr pScrn)
{ {
} }
@ -75,24 +75,24 @@ fbdevHWGetBuildinMode(ScrnInfoPtr pScrn)
return NULL; return NULL;
} }
void _X_EXPORT void
fbdevHWUseBuildinMode(ScrnInfoPtr pScrn) fbdevHWUseBuildinMode(ScrnInfoPtr pScrn)
{ {
} }
void* _X_EXPORT void*
fbdevHWMapVidmem(ScrnInfoPtr pScrn) fbdevHWMapVidmem(ScrnInfoPtr pScrn)
{ {
return NULL; return NULL;
} }
int _X_EXPORT int
fbdevHWLinearOffset(ScrnInfoPtr pScrn) fbdevHWLinearOffset(ScrnInfoPtr pScrn)
{ {
return 0; return 0;
} }
Bool _X_EXPORT Bool
fbdevHWUnmapVidmem(ScrnInfoPtr pScrn) fbdevHWUnmapVidmem(ScrnInfoPtr pScrn)
{ {
return FALSE; return FALSE;
@ -110,18 +110,18 @@ fbdevHWUnmapMMIO(ScrnInfoPtr pScrn)
return FALSE; return FALSE;
} }
Bool _X_EXPORT Bool
fbdevHWModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode) fbdevHWModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
{ {
return FALSE; return FALSE;
} }
void _X_EXPORT void
fbdevHWSave(ScrnInfoPtr pScrn) fbdevHWSave(ScrnInfoPtr pScrn)
{ {
} }
void _X_EXPORT void
fbdevHWRestore(ScrnInfoPtr pScrn) fbdevHWRestore(ScrnInfoPtr pScrn)
{ {
} }
@ -144,7 +144,7 @@ fbdevHWSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
return FALSE; return FALSE;
} }
void _X_EXPORT void
fbdevHWAdjustFrame(int scrnIndex, int x, int y, int flags) fbdevHWAdjustFrame(int scrnIndex, int x, int y, int flags)
{ {
} }
@ -165,32 +165,32 @@ fbdevHWDPMSSet(ScrnInfoPtr pScrn, int mode, int flags)
{ {
} }
Bool _X_EXPORT Bool
fbdevHWSaveScreen(ScreenPtr pScreen, int mode) fbdevHWSaveScreen(ScreenPtr pScreen, int mode)
{ {
return FALSE; return FALSE;
} }
xf86SwitchModeProc * _X_EXPORT xf86SwitchModeProc *
fbdevHWSwitchModeWeak(void) { return fbdevHWSwitchMode; } fbdevHWSwitchModeWeak(void) { return fbdevHWSwitchMode; }
xf86AdjustFrameProc * _X_EXPORT xf86AdjustFrameProc *
fbdevHWAdjustFrameWeak(void) { return fbdevHWAdjustFrame; } fbdevHWAdjustFrameWeak(void) { return fbdevHWAdjustFrame; }
xf86EnterVTProc * _X_EXPORT xf86EnterVTProc *
fbdevHWEnterVTWeak(void) { return fbdevHWEnterVT; } fbdevHWEnterVTWeak(void) { return fbdevHWEnterVT; }
xf86LeaveVTProc * _X_EXPORT xf86LeaveVTProc *
fbdevHWLeaveVTWeak(void) { return fbdevHWLeaveVT; } fbdevHWLeaveVTWeak(void) { return fbdevHWLeaveVT; }
xf86ValidModeProc * _X_EXPORT xf86ValidModeProc *
fbdevHWValidModeWeak(void) { return fbdevHWValidMode; } fbdevHWValidModeWeak(void) { return fbdevHWValidMode; }
xf86DPMSSetProc * _X_EXPORT xf86DPMSSetProc *
fbdevHWDPMSSetWeak(void) { return fbdevHWDPMSSet; } fbdevHWDPMSSetWeak(void) { return fbdevHWDPMSSet; }
xf86LoadPaletteProc * _X_EXPORT xf86LoadPaletteProc *
fbdevHWLoadPaletteWeak(void) { return fbdevHWLoadPalette; } fbdevHWLoadPaletteWeak(void) { return fbdevHWLoadPalette; }
SaveScreenProcPtr _X_EXPORT SaveScreenProcPtr
fbdevHWSaveScreenWeak(void) { return fbdevHWSaveScreen; } fbdevHWSaveScreenWeak(void) { return fbdevHWSaveScreen; }

10
hw/xfree86/int10/generic.c
View File

@ -116,7 +116,7 @@ read_legacy_video_BIOS(struct pci_device *dev, unsigned char *Buf)
} }
xf86Int10InfoPtr _X_EXPORT xf86Int10InfoPtr
xf86ExtendedInitInt10(int entityIndex, int Flags) xf86ExtendedInitInt10(int entityIndex, int Flags)
{ {
xf86Int10InfoPtr pInt; xf86Int10InfoPtr pInt;
@ -328,7 +328,7 @@ MapCurrentInt10(xf86Int10InfoPtr pInt)
return TRUE; return TRUE;
} }
void _X_EXPORT void
xf86FreeInt10(xf86Int10InfoPtr pInt) xf86FreeInt10(xf86Int10InfoPtr pInt)
{ {
if (!pInt) if (!pInt)
@ -345,7 +345,7 @@ xf86FreeInt10(xf86Int10InfoPtr pInt)
xfree(pInt); xfree(pInt);
} }
void * _X_EXPORT void *
xf86Int10AllocPages(xf86Int10InfoPtr pInt, int num, int *off) xf86Int10AllocPages(xf86Int10InfoPtr pInt, int num, int *off)
{ {
int pagesize = getpagesize(); int pagesize = getpagesize();
@ -373,7 +373,7 @@ xf86Int10AllocPages(xf86Int10InfoPtr pInt, int num, int *off)
return (char *)INTPriv(pInt)->base + *off; return (char *)INTPriv(pInt)->base + *off;
} }
void _X_EXPORT void
xf86Int10FreePages(xf86Int10InfoPtr pInt, void *pbase, int num) xf86Int10FreePages(xf86Int10InfoPtr pInt, void *pbase, int num)
{ {
int pagesize = getpagesize(); int pagesize = getpagesize();
@ -486,7 +486,7 @@ write_l(xf86Int10InfoPtr pInt, int addr, CARD32 val)
V_ADDR_WB(addr + 3, val >> 24); V_ADDR_WB(addr + 3, val >> 24);
} }
pointer _X_EXPORT pointer
xf86int10Addr(xf86Int10InfoPtr pInt, CARD32 addr) xf86int10Addr(xf86Int10InfoPtr pInt, CARD32 addr)
{ {
return V_ADDR(addr); return V_ADDR(addr);

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

@ -19,7 +19,7 @@ xf86InitInt10(int entityIndex)
return xf86ExtendedInitInt10(entityIndex, 0); return xf86ExtendedInitInt10(entityIndex, 0);
} }
xf86Int10InfoPtr _X_EXPORT xf86Int10InfoPtr
xf86ExtendedInitInt10(int entityIndex, int Flags) xf86ExtendedInitInt10(int entityIndex, int Flags)
{ {
return NULL; return NULL;
@ -31,20 +31,20 @@ MapCurrentInt10(xf86Int10InfoPtr pInt)
return FALSE; return FALSE;
} }
void _X_EXPORT void
xf86FreeInt10(xf86Int10InfoPtr pInt) xf86FreeInt10(xf86Int10InfoPtr pInt)
{ {
return; return;
} }
void * _X_EXPORT void *
xf86Int10AllocPages(xf86Int10InfoPtr pInt,int num, int *off) xf86Int10AllocPages(xf86Int10InfoPtr pInt,int num, int *off)
{ {
*off = 0; *off = 0;
return NULL; return NULL;
} }
void _X_EXPORT void
xf86Int10FreePages(xf86Int10InfoPtr pInt, void *pbase, int num) xf86Int10FreePages(xf86Int10InfoPtr pInt, void *pbase, int num)
{ {
return; return;
@ -56,13 +56,13 @@ xf86Int10ExecSetup(xf86Int10InfoPtr pInt)
return FALSE; return FALSE;
} }
void _X_EXPORT void
xf86ExecX86int10(xf86Int10InfoPtr pInt) xf86ExecX86int10(xf86Int10InfoPtr pInt)
{ {
return; return;
} }
pointer _X_EXPORT pointer
xf86int10Addr(xf86Int10InfoPtr pInt, CARD32 addr) xf86int10Addr(xf86Int10InfoPtr pInt, CARD32 addr)
{ {
return 0; return 0;

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

@ -28,7 +28,7 @@ x86emu_do_int(int num)
} }
} }
void _X_EXPORT void
xf86ExecX86int10(xf86Int10InfoPtr pInt) xf86ExecX86int10(xf86Int10InfoPtr pInt)
{ {
int sig = setup_int(pInt); int sig = setup_int(pInt);

10
hw/xfree86/os-support/linux/int10/linux.c
View File

@ -71,7 +71,7 @@ static Int10LinuxSubModuleState int10LinuxLoadSubModule(ScrnInfoPtr pScrn);
#endif /* DoSubModules */ #endif /* DoSubModules */
xf86Int10InfoPtr _X_EXPORT xf86Int10InfoPtr
xf86ExtendedInitInt10(int entityIndex, int Flags) xf86ExtendedInitInt10(int entityIndex, int Flags)
{ {
xf86Int10InfoPtr pInt = NULL; xf86Int10InfoPtr pInt = NULL;
@ -392,7 +392,7 @@ MapCurrentInt10(xf86Int10InfoPtr pInt)
return TRUE; return TRUE;
} }
void _X_EXPORT void
xf86FreeInt10(xf86Int10InfoPtr pInt) xf86FreeInt10(xf86Int10InfoPtr pInt)
{ {
if (!pInt) if (!pInt)
@ -421,7 +421,7 @@ xf86FreeInt10(xf86Int10InfoPtr pInt)
xfree(pInt); xfree(pInt);
} }
void * _X_EXPORT void *
xf86Int10AllocPages(xf86Int10InfoPtr pInt, int num, int *off) xf86Int10AllocPages(xf86Int10InfoPtr pInt, int num, int *off)
{ {
int pagesize = getpagesize(); int pagesize = getpagesize();
@ -450,7 +450,7 @@ xf86Int10AllocPages(xf86Int10InfoPtr pInt, int num, int *off)
return ((linuxInt10Priv*)pInt->private)->base + ((i + 1) * pagesize); return ((linuxInt10Priv*)pInt->private)->base + ((i + 1) * pagesize);
} }
void _X_EXPORT void
xf86Int10FreePages(xf86Int10InfoPtr pInt, void *pbase, int num) xf86Int10FreePages(xf86Int10InfoPtr pInt, void *pbase, int num)
{ {
int pagesize = getpagesize(); int pagesize = getpagesize();
@ -499,7 +499,7 @@ void write_l(xf86Int10InfoPtr pInt, int addr, CARD32 val)
*((CARD32 *)(memType) addr) = val; *((CARD32 *)(memType) addr) = val;
} }
pointer _X_EXPORT pointer
xf86int10Addr(xf86Int10InfoPtr pInt, CARD32 addr) xf86int10Addr(xf86Int10InfoPtr pInt, CARD32 addr)
{ {
if (addr < V_RAM) if (addr < V_RAM)

2
hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c
View File

@ -255,7 +255,7 @@ do_vm86(xf86Int10InfoPtr pInt)
return 1; return 1;
} }
void _X_EXPORT void
xf86ExecX86int10(xf86Int10InfoPtr pInt) xf86ExecX86int10(xf86Int10InfoPtr pInt)
{ {
int sig = setup_int(pInt); int sig = setup_int(pInt);

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

@ -47,7 +47,7 @@ VBEInit(xf86Int10InfoPtr pInt, int entityIndex)
return VBEExtendedInit(pInt, entityIndex, 0); return VBEExtendedInit(pInt, entityIndex, 0);
} }
vbeInfoPtr _X_EXPORT vbeInfoPtr
VBEExtendedInit(xf86Int10InfoPtr pInt, int entityIndex, int Flags) VBEExtendedInit(xf86Int10InfoPtr pInt, int entityIndex, int Flags)
{ {
int RealOff; int RealOff;
@ -155,7 +155,7 @@ VBEExtendedInit(xf86Int10InfoPtr pInt, int entityIndex, int Flags)
return NULL; return NULL;
} }
void _X_EXPORT void
vbeFree(vbeInfoPtr pVbe) vbeFree(vbeInfoPtr pVbe)
{ {
if (!pVbe) if (!pVbe)
@ -306,7 +306,7 @@ vbeReadEDID(vbeInfoPtr pVbe)
return tmp; return tmp;
} }
xf86MonPtr _X_EXPORT xf86MonPtr
vbeDoEDID(vbeInfoPtr pVbe, pointer pDDCModule) vbeDoEDID(vbeInfoPtr pVbe, pointer pDDCModule)
{ {
xf86MonPtr pMonitor; xf86MonPtr pMonitor;
@ -339,7 +339,7 @@ vbeDoEDID(vbeInfoPtr pVbe, pointer pDDCModule)
#define GET_UNALIGNED2(x) \ #define GET_UNALIGNED2(x) \
((*(CARD16*)(x)) | (*(((CARD16*)(x) + 1))) << 16) ((*(CARD16*)(x)) | (*(((CARD16*)(x) + 1))) << 16)
VbeInfoBlock * _X_EXPORT VbeInfoBlock *
VBEGetVBEInfo(vbeInfoPtr pVbe) VBEGetVBEInfo(vbeInfoPtr pVbe)
{ {
VbeInfoBlock *block = NULL; VbeInfoBlock *block = NULL;
@ -436,7 +436,7 @@ VBEFreeVBEInfo(VbeInfoBlock *block)
xfree(block); xfree(block);
} }
Bool _X_EXPORT Bool
VBESetVBEMode(vbeInfoPtr pVbe, int mode, VbeCRTCInfoBlock *block) VBESetVBEMode(vbeInfoPtr pVbe, int mode, VbeCRTCInfoBlock *block)
{ {
/* /*
@ -474,7 +474,7 @@ VBESetVBEMode(vbeInfoPtr pVbe, int mode, VbeCRTCInfoBlock *block)
return (R16(pVbe->pInt10->ax) == 0x4f); return (R16(pVbe->pInt10->ax) == 0x4f);
} }
Bool _X_EXPORT Bool
VBEGetVBEMode(vbeInfoPtr pVbe, int *mode) VBEGetVBEMode(vbeInfoPtr pVbe, int *mode)
{ {
/* /*
@ -602,7 +602,7 @@ VBEFreeModeInfo(VbeModeInfoBlock *block)
xfree(block); xfree(block);
} }
Bool _X_EXPORT Bool
VBESaveRestore(vbeInfoPtr pVbe, vbeSaveRestoreFunction function, VBESaveRestore(vbeInfoPtr pVbe, vbeSaveRestoreFunction function,
pointer *memory, int *size, int *real_mode_pages) pointer *memory, int *size, int *real_mode_pages)
{ {
@ -701,7 +701,7 @@ VBESaveRestore(vbeInfoPtr pVbe, vbeSaveRestoreFunction function,
return TRUE; return TRUE;
} }
Bool _X_EXPORT Bool
VBEBankSwitch(vbeInfoPtr pVbe, unsigned int iBank, int window) VBEBankSwitch(vbeInfoPtr pVbe, unsigned int iBank, int window)
{ {
/* /*
@ -723,7 +723,7 @@ VBEBankSwitch(vbeInfoPtr pVbe, unsigned int iBank, int window)
return (TRUE); return (TRUE);
} }
Bool _X_EXPORT Bool
VBESetGetLogicalScanlineLength(vbeInfoPtr pVbe, vbeScanwidthCommand command, VBESetGetLogicalScanlineLength(vbeInfoPtr pVbe, vbeScanwidthCommand command,
int width, int *pixels, int *bytes, int *max) int width, int *pixels, int *bytes, int *max)
{ {
@ -771,7 +771,7 @@ VBESetGetLogicalScanlineLength(vbeInfoPtr pVbe, vbeScanwidthCommand command,
return (TRUE); return (TRUE);
} }
Bool _X_EXPORT Bool
VBESetDisplayStart(vbeInfoPtr pVbe, int x, int y, Bool wait_retrace) VBESetDisplayStart(vbeInfoPtr pVbe, int x, int y, Bool wait_retrace)
{ {
pVbe->pInt10->num = 0x10; pVbe->pInt10->num = 0x10;
@ -804,7 +804,7 @@ VBEGetDisplayStart(vbeInfoPtr pVbe, int *x, int *y)
return (TRUE); return (TRUE);
} }
int _X_EXPORT int
VBESetGetDACPaletteFormat(vbeInfoPtr pVbe, int bits) VBESetGetDACPaletteFormat(vbeInfoPtr pVbe, int bits)
{ {
/* /*
@ -834,7 +834,7 @@ VBESetGetDACPaletteFormat(vbeInfoPtr pVbe, int bits)
return (bits != 0 ? bits : (pVbe->pInt10->bx >> 8) & 0x00ff); return (bits != 0 ? bits : (pVbe->pInt10->bx >> 8) & 0x00ff);
} }
CARD32 * _X_EXPORT CARD32 *
VBESetGetPaletteData(vbeInfoPtr pVbe, Bool set, int first, int num, VBESetGetPaletteData(vbeInfoPtr pVbe, Bool set, int first, int num,
CARD32 *data, Bool secondary, Bool wait_retrace) CARD32 *data, Bool secondary, Bool wait_retrace)
{ {
@ -1013,7 +1013,7 @@ VBEVesaSaveRestore(vbeInfoPtr pVbe, vbeSaveRestorePtr vbe_sr,
} }
int _X_EXPORT int
VBEGetPixelClock(vbeInfoPtr pVbe, int mode, int clock) VBEGetPixelClock(vbeInfoPtr pVbe, int mode, int clock)
{ {
/* /*
@ -1041,7 +1041,7 @@ VBEGetPixelClock(vbeInfoPtr pVbe, int mode, int clock)
return (pVbe->pInt10->cx); return (pVbe->pInt10->cx);
} }
Bool _X_EXPORT Bool
VBEDPMSSet(vbeInfoPtr pVbe, int mode) VBEDPMSSet(vbeInfoPtr pVbe, int mode)
{ {
/* /*

12
hw/xfree86/vbe/vbeModes.c
View File

@ -89,7 +89,7 @@ GetDepthFlag(vbeInfoPtr pVbe, int id)
/* /*
* Find supported mode depths. * Find supported mode depths.
*/ */
int _X_EXPORT int
VBEFindSupportedDepths(vbeInfoPtr pVbe, VbeInfoBlock *vbe, int *flags24, VBEFindSupportedDepths(vbeInfoPtr pVbe, VbeInfoBlock *vbe, int *flags24,
int modeTypes) int modeTypes)
{ {
@ -269,7 +269,7 @@ CheckMode(ScrnInfoPtr pScrn, vbeInfoPtr pVbe, VbeInfoBlock *vbe, int id,
* list. * list.
*/ */
DisplayModePtr _X_EXPORT DisplayModePtr
VBEGetModePool(ScrnInfoPtr pScrn, vbeInfoPtr pVbe, VbeInfoBlock *vbe, VBEGetModePool(ScrnInfoPtr pScrn, vbeInfoPtr pVbe, VbeInfoBlock *vbe,
int modeTypes) int modeTypes)
{ {
@ -343,7 +343,7 @@ VBEGetModePool(ScrnInfoPtr pScrn, vbeInfoPtr pVbe, VbeInfoBlock *vbe,
return modePool; return modePool;
} }
void _X_EXPORT void
VBESetModeNames(DisplayModePtr pMode) VBESetModeNames(DisplayModePtr pMode)
{ {
if (!pMode) if (!pMode)
@ -369,7 +369,7 @@ VBESetModeNames(DisplayModePtr pMode)
* parameters for each BIOS mode. Note: This is only supported in * parameters for each BIOS mode. Note: This is only supported in
* VBE version 3.0 or later. * VBE version 3.0 or later.
*/ */
void _X_EXPORT void
VBESetModeParameters(ScrnInfoPtr pScrn, vbeInfoPtr pVbe) VBESetModeParameters(ScrnInfoPtr pScrn, vbeInfoPtr pVbe)
{ {
DisplayModePtr pMode; DisplayModePtr pMode;
@ -432,7 +432,7 @@ VBESetModeParameters(ScrnInfoPtr pScrn, vbeInfoPtr pVbe)
/* /*
* These wrappers are to allow (temporary) funtionality divergences. * These wrappers are to allow (temporary) funtionality divergences.
*/ */
int _X_EXPORT int
VBEValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes, VBEValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
char **modeNames, ClockRangePtr clockRanges, char **modeNames, ClockRangePtr clockRanges,
int *linePitches, int minPitch, int maxPitch, int pitchInc, int *linePitches, int minPitch, int maxPitch, int pitchInc,
@ -445,7 +445,7 @@ VBEValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
apertureSize, strategy); apertureSize, strategy);
} }
void _X_EXPORT void
VBEPrintModes(ScrnInfoPtr scrp) VBEPrintModes(ScrnInfoPtr scrp)
{ {
xf86PrintModes(scrp); xf86PrintModes(scrp);