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

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.
This commit is contained in:
Kevin E Martin 2005-04-01 20:21:38 +00:00
parent 33ab2a2abc
commit ef60998a82
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,10 +23,8 @@
#include "int10Defines.h" #include "int10Defines.h"
#include "xf86int10.h" #include "xf86int10.h"
#if !defined (_PC) && !defined (_PC_PCI)
static int pciCfg1in(CARD16 addr, CARD32 *val); static int pciCfg1in(CARD16 addr, CARD32 *val);
static int pciCfg1out(CARD16 addr, CARD32 val); static int pciCfg1out(CARD16 addr, CARD32 val);
#endif
#if defined (_PC) #if defined (_PC)
static void SetResetBIOSVars(xf86Int10InfoPtr pInt, Bool set); static void SetResetBIOSVars(xf86Int10InfoPtr pInt, Bool set);
#endif #endif
@ -399,10 +397,8 @@ x_inl(CARD16 port)
{ {
CARD32 val; CARD32 val;
#if !defined(_PC) && !defined(_PC_PCI)
if (!pciCfg1in(port, &val)) if (!pciCfg1in(port, &val))
#endif val = inl(Int10Current->ioBase + port);
val = inl(Int10Current->ioBase + port);
#ifdef PRINT_PORT #ifdef PRINT_PORT
ErrorF(" inl(%#x) = %8.8x\n", port, val); 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); ErrorF(" outl(%#x, %8.8x)\n", port, val);
#endif #endif
#if !defined(_PC) && !defined(_PC_PCI)
if (!pciCfg1out(port, val)) if (!pciCfg1out(port, val))
#endif outl(Int10Current->ioBase + port, val);
outl(Int10Current->ioBase + port, val);
} }
CARD8 CARD8
@ -459,7 +453,6 @@ Mem_wl(CARD32 addr, CARD32 val)
(*Int10Current->mem->wl)(Int10Current, addr, val); (*Int10Current->mem->wl)(Int10Current, addr, val);
} }
#if !defined(_PC) && !defined(_PC_PCI)
static CARD32 PciCfg1Addr = 0; static CARD32 PciCfg1Addr = 0;
#define TAG(Cfg1Addr) (Cfg1Addr & 0xffff00) #define TAG(Cfg1Addr) (Cfg1Addr & 0xffff00)
@ -492,7 +485,6 @@ pciCfg1out(CARD16 addr, CARD32 val)
} }
return 0; return 0;
} }
#endif
CARD8 CARD8
bios_checksum(CARD8 *start, int size) bios_checksum(CARD8 *start, int size)