summaryrefslogtreecommitdiff
path: root/hw/xfree86/int10
diff options
context:
space:
mode:
Diffstat (limited to 'hw/xfree86/int10')
-rw-r--r--hw/xfree86/int10/generic.c2
-rw-r--r--hw/xfree86/int10/helper_exec.c60
-rw-r--r--hw/xfree86/int10/helper_mem.c22
-rw-r--r--hw/xfree86/int10/stub.c4
-rw-r--r--hw/xfree86/int10/xf86int10.c4
-rw-r--r--hw/xfree86/int10/xf86x86emu.c2
6 files changed, 47 insertions, 47 deletions
diff --git a/hw/xfree86/int10/generic.c b/hw/xfree86/int10/generic.c
index a9006e216..2cda75394 100644
--- a/hw/xfree86/int10/generic.c
+++ b/hw/xfree86/int10/generic.c
@@ -321,7 +321,7 @@ UnmapVRam(xf86Int10InfoPtr pInt)
xf86UnMapVidMem(screen, INTPriv(pInt)->vRam, size);
}
-Bool
+_X_EXPORT Bool
MapCurrentInt10(xf86Int10InfoPtr pInt)
{
/* nothing to do here */
diff --git a/hw/xfree86/int10/helper_exec.c b/hw/xfree86/int10/helper_exec.c
index e01e80b1f..ab559eda9 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
-int
+_X_EXPORT int
setup_int(xf86Int10InfoPtr pInt)
{
if (pInt != Int10Current) {
@@ -78,7 +78,7 @@ setup_int(xf86Int10InfoPtr pInt)
return xf86BlockSIGIO();
}
-void
+_X_EXPORT void
finish_int(xf86Int10InfoPtr pInt, int sig)
{
xf86UnblockSIGIO(sig);
@@ -98,20 +98,20 @@ finish_int(xf86Int10InfoPtr pInt, int sig)
}
/* general software interrupt handler */
-CARD32
+_X_EXPORT CARD32
getIntVect(xf86Int10InfoPtr pInt,int num)
{
return MEM_RW(pInt, num << 2) + (MEM_RW(pInt, (num << 2) + 2) << 4);
}
-void
+_X_EXPORT void
pushw(xf86Int10InfoPtr pInt, CARD16 val)
{
X86_ESP -= 2;
MEM_WW(pInt, ((CARD32) X86_SS << 4) + X86_SP, val);
}
-int
+_X_EXPORT int
run_bios_int(int num, xf86Int10InfoPtr pInt)
{
CARD32 eflags;
@@ -157,7 +157,7 @@ run_bios_int(int num, xf86Int10InfoPtr pInt)
}
/* Debugging stuff */
-void
+_X_EXPORT void
dump_code(xf86Int10InfoPtr pInt)
{
int i;
@@ -172,7 +172,7 @@ dump_code(xf86Int10InfoPtr pInt)
xf86ErrorFVerb(3, "\n");
}
-void
+_X_EXPORT 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);
}
-void
+_X_EXPORT void
stack_trace(xf86Int10InfoPtr pInt)
{
int i = 0;
@@ -212,7 +212,7 @@ stack_trace(xf86Int10InfoPtr pInt)
xf86ErrorFVerb(3, "\n");
}
-int
+_X_EXPORT 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;
}
-int
+_X_EXPORT 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;
}
-int
+_X_EXPORT 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;
}
-int
+_X_EXPORT 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;
}
-int
+_X_EXPORT 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;
}
-int
+_X_EXPORT 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;
}
-CARD8
+_X_EXPORT CARD8
x_inb(CARD16 port)
{
CARD8 val;
@@ -337,7 +337,7 @@ x_inb(CARD16 port)
return val;
}
-CARD16
+_X_EXPORT CARD16
x_inw(CARD16 port)
{
CARD16 val;
@@ -359,7 +359,7 @@ x_inw(CARD16 port)
return val;
}
-void
+_X_EXPORT void
x_outb(CARD16 port, CARD8 val)
{
if ((port == 0x43) && (val == 0)) {
@@ -390,7 +390,7 @@ x_outb(CARD16 port, CARD8 val)
}
}
-void
+_X_EXPORT void
x_outw(CARD16 port, CARD16 val)
{
@@ -401,7 +401,7 @@ x_outw(CARD16 port, CARD16 val)
}
}
-CARD32
+_X_EXPORT CARD32
x_inl(CARD16 port)
{
CARD32 val;
@@ -414,7 +414,7 @@ x_inl(CARD16 port)
return val;
}
-void
+_X_EXPORT void
x_outl(CARD16 port, CARD32 val)
{
if (!pciCfg1out(port, val)) {
@@ -424,37 +424,37 @@ x_outl(CARD16 port, CARD32 val)
}
}
-CARD8
+_X_EXPORT CARD8
Mem_rb(CARD32 addr)
{
return (*Int10Current->mem->rb)(Int10Current, addr);
}
-CARD16
+_X_EXPORT CARD16
Mem_rw(CARD32 addr)
{
return (*Int10Current->mem->rw)(Int10Current, addr);
}
-CARD32
+_X_EXPORT CARD32
Mem_rl(CARD32 addr)
{
return (*Int10Current->mem->rl)(Int10Current, addr);
}
-void
+_X_EXPORT void
Mem_wb(CARD32 addr, CARD8 val)
{
(*Int10Current->mem->wb)(Int10Current, addr, val);
}
-void
+_X_EXPORT void
Mem_ww(CARD32 addr, CARD16 val)
{
(*Int10Current->mem->ww)(Int10Current, addr, val);
}
-void
+_X_EXPORT void
Mem_wl(CARD32 addr, CARD32 val)
{
(*Int10Current->mem->wl)(Int10Current, addr, val);
@@ -613,7 +613,7 @@ pciCfg1outb(CARD16 addr, CARD8 val)
return 0;
}
-CARD8
+_X_EXPORT 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.
*/
-void
+_X_EXPORT 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]);
}
-void
+_X_EXPORT 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);
}
-void
+_X_EXPORT void
xf86Int10SaveRestoreBIOSVars(xf86Int10InfoPtr pInt, Bool save)
{
int pagesize = getpagesize();
diff --git a/hw/xfree86/int10/helper_mem.c b/hw/xfree86/int10/helper_mem.c
index 6f6ecc2b3..16d7c175c 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
-void
+_X_EXPORT 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.
*/
-void
+_X_EXPORT void
setup_int_vect(xf86Int10InfoPtr pInt)
{
int i;
@@ -105,7 +105,7 @@ setup_int_vect(xf86Int10InfoPtr pInt)
}
#endif
-int
+_X_EXPORT int
setup_system_bios(void *base_addr)
{
char *base = (char *) base_addr;
@@ -127,7 +127,7 @@ setup_system_bios(void *base_addr)
return 1;
}
-void
+_X_EXPORT void
reset_int_vect(xf86Int10InfoPtr pInt)
{
/*
@@ -176,7 +176,7 @@ reset_int_vect(xf86Int10InfoPtr pInt)
MEM_WW(pInt, (0x6D << 2) + 2, SYS_BIOS >> 4);
}
-void
+_X_EXPORT void
set_return_trap(xf86Int10InfoPtr pInt)
{
/*
@@ -191,7 +191,7 @@ set_return_trap(xf86Int10InfoPtr pInt)
xf86Int10AllocPages(pInt, 1, &pInt->stackseg);
}
-void *
+_X_EXPORT void *
xf86HandleInt10Options(ScrnInfoPtr pScrn, int entityIndex)
{
EntityInfoPtr pEnt = xf86GetEntityInfo(entityIndex);
@@ -220,7 +220,7 @@ xf86HandleInt10Options(ScrnInfoPtr pScrn, int entityIndex)
return options;
}
-Bool
+_X_EXPORT Bool
int10skip(const void* options)
{
Bool noint10 = FALSE;
@@ -231,7 +231,7 @@ int10skip(const void* options)
return noint10;
}
-Bool
+_X_EXPORT 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;
}
-Bool
+_X_EXPORT Bool
initPrimary(const void* options)
{
Bool initPrimary = FALSE;
@@ -269,7 +269,7 @@ initPrimary(const void* options)
return initPrimary;
}
-BusType
+_X_EXPORT BusType
xf86int10GetBiosLocationType(const xf86Int10InfoPtr pInt)
{
BusType location_type;
@@ -290,7 +290,7 @@ xf86int10GetBiosLocationType(const xf86Int10InfoPtr pInt)
return FALSE; \
}
-Bool
+_X_EXPORT Bool
xf86int10GetBiosSegment(xf86Int10InfoPtr pInt, void *base)
{
unsigned i;
diff --git a/hw/xfree86/int10/stub.c b/hw/xfree86/int10/stub.c
index 80b619bef..4d9fe520a 100644
--- a/hw/xfree86/int10/stub.c
+++ b/hw/xfree86/int10/stub.c
@@ -25,7 +25,7 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
return NULL;
}
-Bool
+_X_EXPORT Bool
MapCurrentInt10(xf86Int10InfoPtr pInt)
{
return FALSE;
@@ -50,7 +50,7 @@ xf86Int10FreePages(xf86Int10InfoPtr pInt, void *pbase, int num)
return;
}
-Bool
+_X_EXPORT Bool
xf86Int10ExecSetup(xf86Int10InfoPtr pInt)
{
return FALSE;
diff --git a/hw/xfree86/int10/xf86int10.c b/hw/xfree86/int10/xf86int10.c
index 51eb91fbb..a7904dc6a 100644
--- a/hw/xfree86/int10/xf86int10.c
+++ b/hw/xfree86/int10/xf86int10.c
@@ -17,7 +17,7 @@
#define REG pInt
-xf86Int10InfoPtr Int10Current = NULL;
+_X_EXPORT 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 );
-int
+_X_EXPORT int
int_handler(xf86Int10InfoPtr pInt)
{
int num = pInt->num;
diff --git a/hw/xfree86/int10/xf86x86emu.c b/hw/xfree86/int10/xf86x86emu.c
index 7f5b9d41c..a884bf971 100644
--- a/hw/xfree86/int10/xf86x86emu.c
+++ b/hw/xfree86/int10/xf86x86emu.c
@@ -43,7 +43,7 @@ xf86ExecX86int10(xf86Int10InfoPtr pInt)
finish_int(pInt, sig);
}
-Bool
+_X_EXPORT Bool
xf86Int10ExecSetup(xf86Int10InfoPtr pInt)
{
int i;