View | Details | Raw Unified | Return to bug 15300
Collapse All | Expand All

(-)a/hw/xfree86/int10/helper_exec.c (-8 / +8 lines)
Lines 549-555 Mem_wl(CARD32 addr, CARD32 val) Link Here
549
549
550
static CARD32 PciCfg1Addr = 0;
550
static CARD32 PciCfg1Addr = 0;
551
551
552
#define OFFSET(Cfg1Addr) (Cfg1Addr & 0xff)
552
#define PCI_OFFSET(x) ((x) & 0x000000ff)
553
#define PCI_TAG(x)    ((x) & 0x00ffff00)
553
554
554
static int
555
static int
555
pciCfg1in(CARD16 addr, CARD32 *val)
556
pciCfg1in(CARD16 addr, CARD32 *val)
Lines 559-565 pciCfg1in(CARD16 addr, CARD32 *val) Link Here
559
	return 1;
560
	return 1;
560
    }
561
    }
561
    if (addr == 0xCFC) {
562
    if (addr == 0xCFC) {
562
	*val = pciReadLong(Int10Current->Tag, OFFSET(PciCfg1Addr));
563
	*val = pciReadLong(PCI_TAG(PciCfg1Addr), PCI_OFFSET(PciCfg1Addr));
563
	return 1;
564
	return 1;
564
    }
565
    }
565
    return 0;
566
    return 0;
Lines 573-579 pciCfg1out(CARD16 addr, CARD32 val) Link Here
573
	return 1;
574
	return 1;
574
    }
575
    }
575
    if (addr == 0xCFC) {
576
    if (addr == 0xCFC) {
576
	pciWriteLong(Int10Current->Tag, OFFSET(PciCfg1Addr), val);
577
	pciWriteLong(PCI_TAG(PciCfg1Addr), PCI_OFFSET(PciCfg1Addr), val);
577
	return 1;
578
	return 1;
578
    }
579
    }
579
    return 0;
580
    return 0;
Lines 591-597 pciCfg1inw(CARD16 addr, CARD16 *val) Link Here
591
    }
592
    }
592
    if ((addr >= 0xCFC) && (addr <= 0xCFF)) {
593
    if ((addr >= 0xCFC) && (addr <= 0xCFF)) {
593
	offset = addr - 0xCFC;
594
	offset = addr - 0xCFC;
594
	*val = pciReadWord(Int10Current->Tag, OFFSET(PciCfg1Addr) + offset);
595
	*val = pciReadWord(PCI_TAG(PciCfg1Addr), PCI_OFFSET(PciCfg1Addr) + offset);
595
	return 1;
596
	return 1;
596
    }
597
    }
597
    return 0;
598
    return 0;
Lines 610-616 pciCfg1outw(CARD16 addr, CARD16 val) Link Here
610
    }
611
    }
611
    if ((addr >= 0xCFC) && (addr <= 0xCFF)) {
612
    if ((addr >= 0xCFC) && (addr <= 0xCFF)) {
612
	offset = addr - 0xCFC;
613
	offset = addr - 0xCFC;
613
	pciWriteWord(Int10Current->Tag, OFFSET(PciCfg1Addr) + offset, val);
614
	pciWriteWord(PCI_TAG(PciCfg1Addr), PCI_OFFSET(PciCfg1Addr) + offset, val);
614
	return 1;
615
	return 1;
615
    }
616
    }
616
    return 0;
617
    return 0;
Lines 628-634 pciCfg1inb(CARD16 addr, CARD8 *val) Link Here
628
    }
629
    }
629
    if ((addr >= 0xCFC) && (addr <= 0xCFF)) {
630
    if ((addr >= 0xCFC) && (addr <= 0xCFF)) {
630
	offset = addr - 0xCFC;
631
	offset = addr - 0xCFC;
631
	*val = pciReadByte(Int10Current->Tag, OFFSET(PciCfg1Addr) + offset);
632
	*val = pciReadByte(PCI_TAG(PciCfg1Addr), PCI_OFFSET(PciCfg1Addr) + offset);
632
	return 1;
633
	return 1;
633
    }
634
    }
634
    return 0;
635
    return 0;
Lines 647-653 pciCfg1outb(CARD16 addr, CARD8 val) Link Here
647
    }
648
    }
648
    if ((addr >= 0xCFC) && (addr <= 0xCFF)) {
649
    if ((addr >= 0xCFC) && (addr <= 0xCFF)) {
649
	offset = addr - 0xCFC;
650
	offset = addr - 0xCFC;
650
	pciWriteByte(Int10Current->Tag, OFFSET(PciCfg1Addr) + offset, val);
651
	pciWriteByte(PCI_TAG(PciCfg1Addr), PCI_OFFSET(PciCfg1Addr) + offset, val);
651
	return 1;
652
	return 1;
652
    }
653
    }
653
    return 0;
654
    return 0;
654
- 

Return to bug 15300