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

PCI: Remove config mechanism details. 

pciaccess handles this for us now, no need to remember PC arcana.
This commit is contained in:
Adam Jackson 2008-10-08 23:38:23 -04:00
parent 5bb86bafd6
commit 2d427b9cb1
3 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hw/xfree86/os-support/bus/Pci.h
View File

@ -168,16 +168,6 @@
#endif /* !defined(DEBUGPCI) */ #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__) || \ #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || \
defined(__DragonFly__) || defined(__sun) defined(__DragonFly__) || defined(__sun)
#define ARCH_PCI_INIT bsdPciInit #define ARCH_PCI_INIT bsdPciInit
@ -205,7 +195,6 @@ typedef struct pci_bus_funcs {
* pciBusInfo_t - One structure per defined PCI bus * pciBusInfo_t - One structure per defined PCI bus
*/ */
typedef struct pci_bus_info { typedef struct pci_bus_info {
unsigned char configMech; /* PCI config type to use */
unsigned char numDevices; /* Range of valid devnums */ unsigned char numDevices; /* Range of valid devnums */
unsigned char secondary; /* Boolean: bus is a secondary */ unsigned char secondary; /* Boolean: bus is a secondary */
int primary_bus; /* Parent bus */ int primary_bus; /* Parent bus */
@ -216,17 +205,7 @@ typedef struct pci_bus_info {
#define HOST_NO_BUS ((pciBusInfo_t *)(-1)) #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 */ /* 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); ADDRESS pciAddrNOOP(PCITAG tag, PciAddrType type, ADDRESS);
extern pciBusInfo_t *pciBusInfo; extern pciBusInfo_t *pciBusInfo;

1
hw/xfree86/os-support/bus/bsd_pci.c
View File

@ -53,7 +53,6 @@ static pciBusFuncs_t bsd_funcs = {
}; };
static pciBusInfo_t bsd_pci = { static pciBusInfo_t bsd_pci = {
.configMech = PCI_CFG_MECH_OTHER,
.numDevices = 32, .numDevices = 32,
.secondary = FALSE, .secondary = FALSE,
.primary_bus = 0, .primary_bus = 0,

1
hw/xfree86/os-support/bus/linuxPci.c
View File

@ -80,7 +80,6 @@ static pciBusFuncs_t linuxFuncs0 = {
}; };
static pciBusInfo_t linuxPci0 = { static pciBusInfo_t linuxPci0 = {
/* configMech */ PCI_CFG_MECH_OTHER,
/* numDevices */ 32, /* numDevices */ 32,
/* secondary */ FALSE, /* secondary */ FALSE,
/* primary_bus */ 0, /* primary_bus */ 0,