From c7e1d31c6aec3a99061c77c4d6f57e2e874e37f1 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Sun, 26 Jun 2005 04:38:12 +0000 Subject: Bug #3628: Fix video driver submodule visibility. --- src/atiadjust.c | 4 ++-- src/aticonsole.c | 8 ++++---- src/atifillin.c | 2 +- src/atipreinit.c | 2 +- src/atiscreen.c | 2 +- src/ativalid.c | 6 +++--- src/r128_driver.c | 23 ++++++++++++----------- src/radeon_driver.c | 28 ++++++++++++++-------------- 8 files changed, 38 insertions(+), 37 deletions(-) diff --git a/src/atiadjust.c b/src/atiadjust.c index 3db016d5..587c066d 100644 --- a/src/atiadjust.c +++ b/src/atiadjust.c @@ -1,6 +1,6 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiadjust.c,v 1.15 2003/04/23 21:51:27 tsi Exp $ */ /* - * Copyright 1997 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -128,7 +128,7 @@ ATIAdjustPreInit * displayed location in video memory. This is used to implement the virtual * window. */ -void +_X_EXPORT void ATIAdjustFrame ( int scrnIndex, diff --git a/src/aticonsole.c b/src/aticonsole.c index b3c09000..6b2deebf 100644 --- a/src/aticonsole.c +++ b/src/aticonsole.c @@ -668,7 +668,7 @@ ATILeaveGraphics * * This function switches to another graphics video state. */ -Bool +_X_EXPORT Bool ATISwitchMode ( int iScreen, @@ -721,7 +721,7 @@ ATISwitchMode * * This function sets the server's virtual console to a graphics video state. */ -Bool +_X_EXPORT Bool ATIEnterVT ( int iScreen, @@ -799,7 +799,7 @@ ATIEnterVT * This function restores the server's virtual console to its state on server * entry. */ -void +_X_EXPORT void ATILeaveVT ( int iScreen, @@ -828,7 +828,7 @@ ATILeaveVT * * This function frees all driver data related to a screen. */ -void +_X_EXPORT void ATIFreeScreen ( int iScreen, diff --git a/src/atifillin.c b/src/atifillin.c index 76df7550..f474a582 100644 --- a/src/atifillin.c +++ b/src/atifillin.c @@ -7,7 +7,7 @@ #include "atifillin.h" -void ATIFillInScreenInfo(ScrnInfoPtr pScreenInfo) +_X_EXPORT void ATIFillInScreenInfo(ScrnInfoPtr pScreenInfo) { pScreenInfo->driverVersion = ATI_VERSION_CURRENT; pScreenInfo->driverName = ATI_DRIVER_NAME; diff --git a/src/atipreinit.c b/src/atipreinit.c index ae9b64ba..45808e05 100644 --- a/src/atipreinit.c +++ b/src/atipreinit.c @@ -385,7 +385,7 @@ ATIPrintNoiseIfRequested * This function is only called once per screen at the start of the first * server generation. */ -Bool +_X_EXPORT Bool ATIPreInit ( ScrnInfoPtr pScreenInfo, diff --git a/src/atiscreen.c b/src/atiscreen.c index 812aa2c3..4846b3ce 100644 --- a/src/atiscreen.c +++ b/src/atiscreen.c @@ -125,7 +125,7 @@ ATIMinBits * * This function is called by DIX to initialise the screen. */ -Bool +_X_EXPORT Bool ATIScreenInit ( int iScreen, diff --git a/src/ativalid.c b/src/ativalid.c index 7c798883..53795848 100644 --- a/src/ativalid.c +++ b/src/ativalid.c @@ -1,6 +1,6 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/ativalid.c,v 1.16 2003/04/23 21:51:31 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/ativalid.c,v 1.17 2003/10/30 17:36:58 tsi Exp $ */ /* - * Copyright 1997 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -34,7 +34,7 @@ * * This checks for hardware-related limits on mode timings. */ -int +_X_EXPORT ModeStatus ATIValidMode ( int iScreen, diff --git a/src/r128_driver.c b/src/r128_driver.c index 61e59d8a..f7315e53 100644 --- a/src/r128_driver.c +++ b/src/r128_driver.c @@ -171,7 +171,7 @@ static const OptionInfoRec R128Options[] = { { -1, NULL, OPTV_NONE, {0}, FALSE } }; -const OptionInfoRec *R128OptionsWeak(void) { return R128Options; } +_X_EXPORT const OptionInfoRec *R128OptionsWeak(void) { return R128Options; } R128RAMRec R128RAM[] = { /* Memory Specifications From RAGE 128 Software Development @@ -2011,7 +2011,7 @@ R128ProbeDDC(ScrnInfoPtr pScrn, int indx) } /* R128PreInit is called once at server startup. */ -Bool R128PreInit(ScrnInfoPtr pScrn, int flags) +_X_EXPORT Bool R128PreInit(ScrnInfoPtr pScrn, int flags) { R128InfoPtr info; xf86Int10InfoPtr pInt10 = NULL; @@ -2294,7 +2294,8 @@ R128BlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadmask) } /* Called at the start of each server generation. */ -Bool R128ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) +_X_EXPORT Bool R128ScreenInit(int scrnIndex, ScreenPtr pScreen, + int argc, char **argv) { ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; R128InfoPtr info = R128PTR(pScrn); @@ -4192,7 +4193,7 @@ static Bool R128SaveScreen(ScreenPtr pScreen, int mode) * The workaround is to switch the mode, then switch to another VT, then * switch back. --AGD */ -Bool R128SwitchMode(int scrnIndex, DisplayModePtr mode, int flags) +_X_EXPORT Bool R128SwitchMode(int scrnIndex, DisplayModePtr mode, int flags) { ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; R128InfoPtr info = R128PTR(pScrn); @@ -4205,8 +4206,8 @@ Bool R128SwitchMode(int scrnIndex, DisplayModePtr mode, int flags) } /* Used to disallow modes that are not supported by the hardware. */ -ModeStatus R128ValidMode(int scrnIndex, DisplayModePtr mode, - Bool verbose, int flags) +_X_EXPORT ModeStatus R128ValidMode(int scrnIndex, DisplayModePtr mode, + Bool verbose, int flags) { ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; R128InfoPtr info = R128PTR(pScrn); @@ -4281,7 +4282,7 @@ ModeStatus R128ValidMode(int scrnIndex, DisplayModePtr mode, /* Adjust viewport into virtual desktop such that (0,0) in viewport space is (x,y) in virtual space. */ -void R128AdjustFrame(int scrnIndex, int x, int y, int flags) +_X_EXPORT void R128AdjustFrame(int scrnIndex, int x, int y, int flags) { ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; R128InfoPtr info = R128PTR(pScrn); @@ -4317,7 +4318,7 @@ void R128AdjustFrame(int scrnIndex, int x, int y, int flags) /* Called when VT switching back to the X server. Reinitialize the video mode. */ -Bool R128EnterVT(int scrnIndex, int flags) +_X_EXPORT Bool R128EnterVT(int scrnIndex, int flags) { ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; R128InfoPtr info = R128PTR(pScrn); @@ -4350,7 +4351,7 @@ Bool R128EnterVT(int scrnIndex, int flags) /* Called when VT switching away from the X server. Restore the original text mode. */ -void R128LeaveVT(int scrnIndex, int flags) +_X_EXPORT void R128LeaveVT(int scrnIndex, int flags) { ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; R128InfoPtr info = R128PTR(pScrn); @@ -4420,7 +4421,7 @@ static Bool R128CloseScreen(int scrnIndex, ScreenPtr pScreen) return (*pScreen->CloseScreen)(scrnIndex, pScreen); } -void R128FreeScreen(int scrnIndex, int flags) +_X_EXPORT void R128FreeScreen(int scrnIndex, int flags) { ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; R128InfoPtr info = R128PTR(pScrn); @@ -4546,7 +4547,7 @@ static int r128_set_backlight_enable(ScrnInfoPtr pScrn, int on) return 0; } -void R128FillInScreenInfo(ScrnInfoPtr pScrn) +_X_EXPORT void R128FillInScreenInfo(ScrnInfoPtr pScrn) { pScrn->driverVersion = R128_VERSION_CURRENT; pScrn->driverName = R128_DRIVER_NAME; diff --git a/src/radeon_driver.c b/src/radeon_driver.c index 7c52fdc1..22ae1657 100644 --- a/src/radeon_driver.c +++ b/src/radeon_driver.c @@ -248,7 +248,7 @@ static const OptionInfoRec RADEONOptions[] = { { -1, NULL, OPTV_NONE, {0}, FALSE } }; -const OptionInfoRec *RADEONOptionsWeak(void) { return RADEONOptions; } +_X_EXPORT const OptionInfoRec *RADEONOptionsWeak(void) { return RADEONOptions; } static const char *vgahwSymbols[] = { "vgaHWFreeHWRec", @@ -4452,8 +4452,7 @@ RADEONProbeDDC(ScrnInfoPtr pScrn, int indx) } } -/* RADEONPreInit is called once at server startup */ -Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags) +_X_EXPORT Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags) { RADEONInfoPtr info; xf86Int10InfoPtr pInt10 = NULL; @@ -4983,7 +4982,8 @@ static void RADEONBlockHandler(int i, pointer blockData, } /* Called at the start of each server generation. */ -Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) +_X_EXPORT Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, + int argc, char **argv) { ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; RADEONInfoPtr info = RADEONPTR(pScrn); @@ -7870,7 +7870,7 @@ static Bool RADEONSaveScreen(ScreenPtr pScreen, int mode) return TRUE; } -Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags) +_X_EXPORT Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags) { ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; RADEONInfoPtr info = RADEONPTR(pScrn); @@ -7959,8 +7959,8 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags) } #ifdef X_XF86MiscPassMessage -Bool RADEONHandleMessage(int scrnIndex, const char* msgtype, - const char* msgval, char** retmsg) +_X_EXPORT Bool RADEONHandleMessage(int scrnIndex, const char* msgtype, + const char* msgval, char** retmsg) { ErrorF("RADEONHandleMessage(%d, \"%s\", \"%s\", retmsg)\n", scrnIndex, msgtype, msgval); @@ -7970,8 +7970,8 @@ Bool RADEONHandleMessage(int scrnIndex, const char* msgtype, #endif /* Used to disallow modes that are not supported by the hardware */ -ModeStatus RADEONValidMode(int scrnIndex, DisplayModePtr mode, - Bool verbose, int flag) +_X_EXPORT ModeStatus RADEONValidMode(int scrnIndex, DisplayModePtr mode, + Bool verbose, int flag) { /* There are problems with double scan mode at high clocks * They're likely related PLL and display buffer settings. @@ -8079,7 +8079,7 @@ void RADEONDoAdjustFrame(ScrnInfoPtr pScrn, int x, int y, int clone) OUTREG(regcntl, crtcoffsetcntl); } -void RADEONAdjustFrame(int scrnIndex, int x, int y, int flags) +_X_EXPORT void RADEONAdjustFrame(int scrnIndex, int x, int y, int flags) { ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; RADEONInfoPtr info = RADEONPTR(pScrn); @@ -8106,7 +8106,7 @@ void RADEONAdjustFrame(int scrnIndex, int x, int y, int flags) /* Called when VT switching back to the X server. Reinitialize the * video mode. */ -Bool RADEONEnterVT(int scrnIndex, int flags) +_X_EXPORT Bool RADEONEnterVT(int scrnIndex, int flags) { ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; RADEONInfoPtr info = RADEONPTR(pScrn); @@ -8168,7 +8168,7 @@ Bool RADEONEnterVT(int scrnIndex, int flags) /* Called when VT switching away from the X server. Restore the * original text mode. */ -void RADEONLeaveVT(int scrnIndex, int flags) +_X_EXPORT void RADEONLeaveVT(int scrnIndex, int flags) { ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; RADEONInfoPtr info = RADEONPTR(pScrn); @@ -8247,7 +8247,7 @@ static Bool RADEONCloseScreen(int scrnIndex, ScreenPtr pScreen) return (*pScreen->CloseScreen)(scrnIndex, pScreen); } -void RADEONFreeScreen(int scrnIndex, int flags) +_X_EXPORT void RADEONFreeScreen(int scrnIndex, int flags) { ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; RADEONInfoPtr info = RADEONPTR(pScrn); @@ -9108,7 +9108,7 @@ static void RADEONSetDynamicClock(ScrnInfoPtr pScrn, int mode) } } -void RADEONFillInScreenInfo(ScrnInfoPtr pScrn) +_X_EXPORT void RADEONFillInScreenInfo(ScrnInfoPtr pScrn) { pScrn->driverVersion = RADEON_VERSION_CURRENT; pScrn->driverName = RADEON_DRIVER_NAME; -- cgit v1.2.3