diff options
| author | Adam Jackson <ajax@redhat.com> | 2008-10-08 23:38:23 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2008-11-24 23:40:02 -0500 |
| commit | 2d427b9cb1594f8f2f66b463033fff5b459962fd (patch) | |
| tree | 0134decaf6e91f98679783911f6f7113ded73a79 | |
| parent | 5bb86bafd6fda296011cbcd5d15a85a6d770ae29 (diff) | |
PCI: Remove config mechanism details.
pciaccess handles this for us now, no need to remember PC arcana.
| -rw-r--r-- | hw/xfree86/os-support/bus/Pci.h | 21 | ||||
| -rw-r--r-- | hw/xfree86/os-support/bus/bsd_pci.c | 1 | ||||
| -rw-r--r-- | hw/xfree86/os-support/bus/linuxPci.c | 1 |
3 files changed, 0 insertions, 23 deletions
diff --git a/hw/xfree86/os-support/bus/Pci.h b/hw/xfree86/os-support/bus/Pci.h index 574a21e3e..285c7a558 100644 --- a/hw/xfree86/os-support/bus/Pci.h +++ b/hw/xfree86/os-support/bus/Pci.h @@ -168,16 +168,6 @@ #endif /* !defined(DEBUGPCI) */ -/* - * PCI Config mechanism definitions - */ -#define PCI_EN 0x80000000 - -#define PCI_CFGMECH1_ADDRESS_REG 0xCF8 -#define PCI_CFGMECH1_DATA_REG 0xCFC - -#define PCI_CFGMECH1_MAXDEV 32 - #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || \ defined(__DragonFly__) || defined(__sun) #define ARCH_PCI_INIT bsdPciInit @@ -205,7 +195,6 @@ typedef struct pci_bus_funcs { * pciBusInfo_t - One structure per defined PCI bus */ typedef struct pci_bus_info { - unsigned char configMech; /* PCI config type to use */ unsigned char numDevices; /* Range of valid devnums */ unsigned char secondary; /* Boolean: bus is a secondary */ int primary_bus; /* Parent bus */ @@ -216,17 +205,7 @@ typedef struct pci_bus_info { #define HOST_NO_BUS ((pciBusInfo_t *)(-1)) -/* configMech values */ -#define PCI_CFG_MECH_UNKNOWN 0 /* Not yet known */ -#define PCI_CFG_MECH_1 1 /* Most machines */ -#define PCI_CFG_MECH_2 2 /* Older PC's */ -#define PCI_CFG_MECH_OTHER 3 /* Something else */ - /* Generic PCI service functions and helpers */ -CARD32 pciCfgMech1Read(PCITAG tag, int offset); -void pciCfgMech1Write(PCITAG tag, int offset, CARD32 val); -void pciCfgMech1SetBits(PCITAG tag, int offset, CARD32 mask, - CARD32 val); ADDRESS pciAddrNOOP(PCITAG tag, PciAddrType type, ADDRESS); extern pciBusInfo_t *pciBusInfo; diff --git a/hw/xfree86/os-support/bus/bsd_pci.c b/hw/xfree86/os-support/bus/bsd_pci.c index 7becc0a17..cfdd98641 100644 --- a/hw/xfree86/os-support/bus/bsd_pci.c +++ b/hw/xfree86/os-support/bus/bsd_pci.c @@ -53,7 +53,6 @@ static pciBusFuncs_t bsd_funcs = { }; static pciBusInfo_t bsd_pci = { - .configMech = PCI_CFG_MECH_OTHER, .numDevices = 32, .secondary = FALSE, .primary_bus = 0, diff --git a/hw/xfree86/os-support/bus/linuxPci.c b/hw/xfree86/os-support/bus/linuxPci.c index 2a03119fa..28b0aec95 100644 --- a/hw/xfree86/os-support/bus/linuxPci.c +++ b/hw/xfree86/os-support/bus/linuxPci.c @@ -80,7 +80,6 @@ static pciBusFuncs_t linuxFuncs0 = { }; static pciBusInfo_t linuxPci0 = { -/* configMech */ PCI_CFG_MECH_OTHER, /* numDevices */ 32, /* secondary */ FALSE, /* primary_bus */ 0, |