andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bugzilla #2880 (https://bugs.freedesktop.org/show_bug.cgi?id=2880)

Browse Source 
attachment #2987 (https://bugs.freedesktop.org/attachment.cgi?id=2987)
    Use system method to access PCI config space for inb and inw in
    addition to inl (Olivier Baudron and Kevin Martin).
This commit is contained in:
Kevin E Martin 2005-08-22 21:29:18 +00:00
parent 5557a40a02
commit 4a19a33db6
1 changed files with 87 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,6 +29,10 @@
static int pciCfg1in(CARD16 addr, CARD32 *val);
static int pciCfg1out(CARD16 addr, CARD32 val);
static int pciCfg1inw(CARD16 addr, CARD16 *val);
static int pciCfg1outw(CARD16 addr, CARD16 val);
static int pciCfg1inb(CARD16 addr, CARD8 *val);
static int pciCfg1outb(CARD16 addr, CARD8 val);
#if defined (_PC)
static void SetResetBIOSVars(xf86Int10InfoPtr pInt, Bool set);
#endif
@ -323,6 +327,7 @@ x_inb(CARD16 port)
}
#endif /* __NOT_YET__ */
} else {
if (!pciCfg1inb(port, &val))
val = inb(Int10Current->ioBase + port);
#ifdef PRINT_PORT
ErrorF(" inb(%#x) = %2.2x\n", port, val);
@ -345,6 +350,7 @@ x_inw(CARD16 port)
(void)getsecs(&sec, &usec);
val = (CARD16)(usec / 3);
} else {
if (!pciCfg1inw(port, &val))
val = inw(Int10Current->ioBase + port);
}
#ifdef PRINT_PORT
@ -382,6 +388,7 @@ x_outb(CARD16 port, CARD8 val)
#ifdef PRINT_PORT
ErrorF(" outb(%#x, %2.2x)\n", port, val);
#endif
if (!pciCfg1outb(port, val))
outb(Int10Current->ioBase + port, val);
}
}
@ -393,6 +400,7 @@ x_outw(CARD16 port, CARD16 val)
ErrorF(" outw(%#x, %4.4x)\n", port, val);
#endif
if (!pciCfg1outw(port, val))
outw(Int10Current->ioBase + port, val);
}
@ -484,7 +492,81 @@ pciCfg1out(CARD16 addr, CARD32 val)
return 1;
}
if (addr == 0xCFC) {
pciWriteLong(TAG(PciCfg1Addr), OFFSET(PciCfg1Addr),val);
pciWriteLong(TAG(PciCfg1Addr), OFFSET(PciCfg1Addr), val);
return 1;
}
return 0;
}
static int
pciCfg1inw(CARD16 addr, CARD16 *val)
{
int offset, shift;
if ((addr >= 0xCF8) && (addr <= 0xCFB)) {
shift = (addr - 0xCF8) * 8;
*val = (PciCfg1Addr >> shift) & 0xffff;
return 1;
}
if ((addr >= 0xCFC) && (addr <= 0xCFF)) {
offset = addr - 0xCFC;
*val = pciReadWord(TAG(PciCfg1Addr), OFFSET(PciCfg1Addr) + offset);
return 1;
}
return 0;
}
static int
pciCfg1outw(CARD16 addr, CARD16 val)
{
int offset, shift;
if ((addr >= 0xCF8) && (addr <= 0xCFB)) {
shift = (addr - 0xCF8) * 8;
PciCfg1Addr &= ~(0xffff << shift);
PciCfg1Addr |= ((CARD32) val) << shift;
return 1;
}
if ((addr >= 0xCFC) && (addr <= 0xCFF)) {
offset = addr - 0xCFC;
pciWriteWord(TAG(PciCfg1Addr), OFFSET(PciCfg1Addr) + offset, val);
return 1;
}
return 0;
}
static int
pciCfg1inb(CARD16 addr, CARD8 *val)
{
int offset, shift;
if ((addr >= 0xCF8) && (addr <= 0xCFB)) {
shift = (addr - 0xCF8) * 8;
*val = (PciCfg1Addr >> shift) & 0xff;
return 1;
}
if ((addr >= 0xCFC) && (addr <= 0xCFF)) {
offset = addr - 0xCFC;
*val = pciReadByte(TAG(PciCfg1Addr), OFFSET(PciCfg1Addr) + offset);
return 1;
}
return 0;
}
static int
pciCfg1outb(CARD16 addr, CARD8 val)
{
int offset, shift;
if ((addr >= 0xCF8) && (addr <= 0xCFB)) {
shift = (addr - 0xCF8) * 8;
PciCfg1Addr &= ~(0xff << shift);
PciCfg1Addr |= ((CARD32) val) << shift;
return 1;
}
if ((addr >= 0xCFC) && (addr <= 0xCFF)) {
offset = addr - 0xCFC;
pciWriteByte(TAG(PciCfg1Addr), OFFSET(PciCfg1Addr) + offset, val);
return 1;
}
return 0;