summaryrefslogtreecommitdiff
path: root/hw/xfree86/int10/helper_mem.c
diff options
context:
space:
mode:
authorPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2008-12-03 05:43:34 -0200
committerPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2008-12-03 05:43:34 -0200
commit49f77fff1495c0a2050fb18f9b1fc627839bbfc2 (patch)
treeeebaec908150abfc0159d9ee941404918f553113 /hw/xfree86/int10/helper_mem.c
parent0b8f8b24f718820a72ebdc52423c2e6a44e848c5 (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/int10/helper_mem.c')
-rw-r--r--hw/xfree86/int10/helper_mem.c22
1 files changed, 11 insertions, 11 deletions
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;