hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-10-04 22:36:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework

Browse source 
Conflicts:

	hw/xfree86/common/xf86Configure.c
	hw/xfree86/common/xf86Helper.c
	hw/xfree86/common/xf86pciBus.c
	hw/xfree86/int10/helper_exec.c
	hw/xfree86/os-support/bus/Pci.c
	hw/xfree86/os-support/bus/linuxPci.c
	hw/xfree86/os-support/linux/lnx_pci.c
	hw/xfree86/scanpci/Makefile.am
	hw/xfree86/utils/pcitweak/Makefile.am
	hw/xfree86/utils/scanpci/Makefile.am
This commit is contained in:
Ian Romanick 2006-12-08 17:24:15 -08:00
commit e1f73d2208
370 changed files with 17254 additions and 46136 deletions
Download patch file Download diff file Expand all files Collapse all files

11
hw/xfree86/int10/Makefile.am
View file

@ -12,8 +12,12 @@ COMMON_SOURCES = \
xf86int10.c \
xf86int10module.c
if I386_VIDEO
I386_VIDEO_CFLAGS = -D_PC
endif
if INT10_VM86
AM_CFLAGS = -D_PC -D_VM86_LINUX $(XORG_CFLAGS) $(EXTRA_CFLAGS)
AM_CFLAGS = $(I386_VIDEO_CFLAGS) -D_VM86_LINUX $(DIX_CFLAGS) $(XORG_CFLAGS) $(EXTRA_CFLAGS)
INCLUDES = $(XORG_INCS)
libint10_la_SOURCES = \
$(COMMON_SOURCES) \
@ -22,7 +26,8 @@ libint10_la_SOURCES = \
endif
if INT10_X86EMU
AM_CFLAGS = -D_X86EMU -DNO_SYS_HEADERS -D_PC $(XORG_CFLAGS) $(EXTRA_CFLAGS)
AM_CFLAGS = $(I386_VIDEO_CFLAGS) -D_X86EMU -DNO_SYS_HEADERS \
$(XORG_CFLAGS) $(EXTRA_CFLAGS) $(DIX_CFLAGS)
INCLUDES = $(XORG_INCS) -I$(srcdir)/../x86emu
libint10_la_SOURCES = \
$(COMMON_SOURCES) \
@ -32,7 +37,7 @@ libint10_la_SOURCES = \
endif
if INT10_STUB
AM_CFLAGS = -D_PC -D_VM86_LINUX $(XORG_CFLAGS) $(EXTRA_CFLAGS)
AM_CFLAGS = $(I386_VIDEO_CFLAGS) -D_VM86_LINUX $(DIX_CFLAGS) $(XORG_CFLAGS) $(EXTRA_CFLAGS)
libint10_la_SOURCES = stub.c xf86int10module.c
endif

24
hw/xfree86/int10/helper_exec.c
View file

@ -470,13 +470,13 @@ Mem_wl(CARD32 addr, CARD32 val)
static CARD32 PciCfg1Addr = 0;
#define TAG(Cfg1Addr) (Cfg1Addr & 0xffff00)
#define OFFSET(Cfg1Addr) (Cfg1Addr & 0xff)
#define _BUS(x) PCI_BUS_FROM_TAG( TAG(PciCfg1Addr) )
#define _DEV(x) PCI_DEV_FROM_TAG( TAG(PciCfg1Addr) )
#define _FUNC(x) PCI_FUNC_FROM_TAG( TAG(PciCfg1Addr) )
#define GET_DEVICE(_addr) \
pci_device_find_by_slot(0, _BUS(_addr), _DEV(_addr), _FUNC(_addr))
#define _DOM(x) PCI_DOM_FROM_TAG(x)
#define _BUS(x) PCI_BUS_NO_DOMAIN(PCI_BUS_FROM_TAG(x))
#define _DEV(x) PCI_DEV_FROM_TAG(x)
#define _FUNC(x) PCI_FUNC_FROM_TAG(x)
#define GET_DEVICE(_tag) \
pci_device_find_by_slot(_DOM(_tag), _BUS(_tag), _DEV(_tag), _FUNC(_tag))
static int
pciCfg1in(CARD16 addr, CARD32 *val)
@ -486,7 +486,7 @@ pciCfg1in(CARD16 addr, CARD32 *val)
return 1;
}
if (addr == 0xCFC) {
struct pci_device *dev = GET_DEVICE(PciCfg1Addr);
struct pci_device *dev = GET_DEVICE(Int10Current->Tag);
pci_device_cfg_read_u32(dev, val, OFFSET(PciCfg1Addr));
return 1;
@ -502,7 +502,7 @@ pciCfg1out(CARD16 addr, CARD32 val)
return 1;
}
if (addr == 0xCFC) {
struct pci_device *dev = GET_DEVICE(PciCfg1Addr);
struct pci_device *dev = GET_DEVICE(Int10Current->Tag);
pci_device_cfg_write_u32(dev, & val, OFFSET(PciCfg1Addr));
return 1;
@ -522,7 +522,7 @@ pciCfg1inw(CARD16 addr, CARD16 *val)
}
if ((addr >= 0xCFC) && (addr <= 0xCFF)) {
const unsigned offset = addr - 0xCFC;
struct pci_device *dev = GET_DEVICE(PciCfg1Addr);
struct pci_device *dev = GET_DEVICE(Int10Current->Tag);
pci_device_cfg_read_u16(dev, val, OFFSET(PciCfg1Addr) + offset);
return 1;
@ -543,7 +543,7 @@ pciCfg1outw(CARD16 addr, CARD16 val)
}
if ((addr >= 0xCFC) && (addr <= 0xCFF)) {
const unsigned offset = addr - 0xCFC;
struct pci_device *dev = GET_DEVICE(PciCfg1Addr);
struct pci_device *dev = GET_DEVICE(Int10Current->Tag);
pci_device_cfg_write_u16(dev, & val, OFFSET(PciCfg1Addr) + offset);
return 1;
@ -563,7 +563,7 @@ pciCfg1inb(CARD16 addr, CARD8 *val)
}
if ((addr >= 0xCFC) && (addr <= 0xCFF)) {
const unsigned offset = addr - 0xCFC;
struct pci_device *dev = GET_DEVICE(PciCfg1Addr);
struct pci_device *dev = GET_DEVICE(Int10Current->Tag);
pci_device_cfg_read_u8(dev, val, OFFSET(PciCfg1Addr) + offset);
return 1;
@ -584,7 +584,7 @@ pciCfg1outb(CARD16 addr, CARD8 val)
}
if ((addr >= 0xCFC) && (addr <= 0xCFF)) {
const unsigned offset = addr - 0xCFC;
struct pci_device *dev = GET_DEVICE(PciCfg1Addr);
struct pci_device *dev = GET_DEVICE(Int10Current->Tag);
pci_device_cfg_write_u8(dev, & val, OFFSET(PciCfg1Addr) + offset);
return 1;