diff options
| author | Kevin E Martin <kem@kem.org> | 2005-04-01 20:21:38 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2005-04-01 20:21:38 +0000 |
| commit | ef60998a828951e61f1480e29c2fec62e7454bbc (patch) | |
| tree | 1ed0d6a9b358a2950b869de1a8ae7413f367b993 /hw/xfree86 | |
| parent | 33ab2a2abc8c1e4ca9c7139454c60f5ad8a61a94 (diff) | |
bugzilla #2880 (https://bugs.freedesktop.org/show_bug.cgi?id=2880)
attachment #2285 (https://bugs.freedesktop.org/attachment.cgi?id=2285)
Use system method to access PCI config space.
Diffstat (limited to 'hw/xfree86')
| -rw-r--r-- | hw/xfree86/int10/helper_exec.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/hw/xfree86/int10/helper_exec.c b/hw/xfree86/int10/helper_exec.c index 76c2a1e3d..c3d47da2b 100644 --- a/hw/xfree86/int10/helper_exec.c +++ b/hw/xfree86/int10/helper_exec.c @@ -23,10 +23,8 @@ #include "int10Defines.h" #include "xf86int10.h" -#if !defined (_PC) && !defined (_PC_PCI) static int pciCfg1in(CARD16 addr, CARD32 *val); static int pciCfg1out(CARD16 addr, CARD32 val); -#endif #if defined (_PC) static void SetResetBIOSVars(xf86Int10InfoPtr pInt, Bool set); #endif @@ -399,10 +397,8 @@ x_inl(CARD16 port) { CARD32 val; -#if !defined(_PC) && !defined(_PC_PCI) if (!pciCfg1in(port, &val)) -#endif - val = inl(Int10Current->ioBase + port); + val = inl(Int10Current->ioBase + port); #ifdef PRINT_PORT ErrorF(" inl(%#x) = %8.8x\n", port, val); @@ -417,10 +413,8 @@ x_outl(CARD16 port, CARD32 val) ErrorF(" outl(%#x, %8.8x)\n", port, val); #endif -#if !defined(_PC) && !defined(_PC_PCI) if (!pciCfg1out(port, val)) -#endif - outl(Int10Current->ioBase + port, val); + outl(Int10Current->ioBase + port, val); } CARD8 @@ -459,7 +453,6 @@ Mem_wl(CARD32 addr, CARD32 val) (*Int10Current->mem->wl)(Int10Current, addr, val); } -#if !defined(_PC) && !defined(_PC_PCI) static CARD32 PciCfg1Addr = 0; #define TAG(Cfg1Addr) (Cfg1Addr & 0xffff00) @@ -492,7 +485,6 @@ pciCfg1out(CARD16 addr, CARD32 val) } return 0; } -#endif CARD8 bios_checksum(CARD8 *start, int size) |